From 05b3fb791d92751eec584ab21e3a862ffb047b97 Mon Sep 17 00:00:00 2001 From: Ilya Grechuhin Date: Thu, 8 Dec 2016 14:01:19 +0300 Subject: [PATCH] [traffic] [ios] Fixed traffic states handling. --- .../TrafficButton/MWMTrafficButtonViewController.mm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/TrafficButton/MWMTrafficButtonViewController.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/TrafficButton/MWMTrafficButtonViewController.mm index f87520e24b..353c014f3a 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/TrafficButton/MWMTrafficButtonViewController.mm +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/TrafficButton/MWMTrafficButtonViewController.mm @@ -141,14 +141,13 @@ NSArray * imagesWithName(NSString * name) UIImageView * iv = btn.imageView; // Traffic state machine: https://confluence.mail.ru/pages/viewpage.action?pageId=103680959 + [iv stopAnimating]; switch ([MWMTrafficManager state]) { case TrafficManager::TrafficState::Disabled: - [iv stopAnimating]; btn.imageName = @"btn_traffic_off"; break; case TrafficManager::TrafficState::Enabled: - [iv stopAnimating]; btn.imageName = @"btn_traffic_on"; break; case TrafficManager::TrafficState::WaitingData: @@ -158,20 +157,23 @@ NSArray * imagesWithName(NSString * name) [iv startAnimating]; break; case TrafficManager::TrafficState::Outdated: - [iv stopAnimating]; btn.imageName = @"btn_traffic_outdated"; break; case TrafficManager::TrafficState::NoData: + btn.imageName = @"btn_traffic_on"; [MWMToast showWithText:L(@"traffic_state_no_data")]; break; case TrafficManager::TrafficState::NetworkError: + btn.imageName = @"btn_traffic_off"; [MWMTrafficManager enableTraffic:NO]; [[MWMAlertViewController activeAlertController] presentNoConnectionAlert]; break; case TrafficManager::TrafficState::ExpiredApp: + btn.imageName = @"btn_traffic_on"; [MWMToast showWithText:L(@"traffic_state_expired_app")]; break; case TrafficManager::TrafficState::ExpiredData: + btn.imageName = @"btn_traffic_on"; [MWMToast showWithText:L(@"traffic_state_expired_data")]; break; }