no message

Palmwms.xcodeproj/project.pbxproj

@@ -756,8 +756,8 @@
 			baseConfigurationReference = 2A3092547F488EFD2FBE5F24 /* Pods.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CODE_SIGN_IDENTITY = "iPhone Developer: 云霄 曹 (WM8ZU7YY98)";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: 云霄 曹 (WM8ZU7YY98)";
+				CODE_SIGN_IDENTITY = "iPhone Developer";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				ENABLE_BITCODE = NO;
 				GCC_PREFIX_HEADER = "$(SRCROOT)/Palmwms/Tools/Macro/PrefixHeader.pch";
 				HEADER_SEARCH_PATHS = (
@@ -780,7 +780,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.gomore.palmwms;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE = "e922dce2-c5d3-497c-8fa8-132e12cff6c0";
+				PROVISIONING_PROFILE = "";
 				TARGETED_DEVICE_FAMILY = 1;
 				USER_HEADER_SEARCH_PATHS = "$(PODS_ROOT)/**";
 			};
@@ -791,8 +791,8 @@
 			baseConfigurationReference = B94AB6672F835AEC7D22B9F4 /* Pods.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CODE_SIGN_IDENTITY = "iPhone Developer: 云霄 曹 (WM8ZU7YY98)";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: 云霄 曹 (WM8ZU7YY98)";
+				CODE_SIGN_IDENTITY = "iPhone Developer";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				ENABLE_BITCODE = NO;
 				GCC_PREFIX_HEADER = "$(SRCROOT)/Palmwms/Tools/Macro/PrefixHeader.pch";
 				HEADER_SEARCH_PATHS = (
@@ -815,7 +815,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.gomore.palmwms;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE = "e922dce2-c5d3-497c-8fa8-132e12cff6c0";
+				PROVISIONING_PROFILE = "";
 				TARGETED_DEVICE_FAMILY = 1;
 				USER_HEADER_SEARCH_PATHS = "$(PODS_ROOT)/**";
 			};

Palmwms/BaseViewController.h

@@ -13,6 +13,8 @@
 @interface BaseViewController : UIViewController
 
 
+
+
 /**
  *  自定义返回按钮
  *

Palmwms/BaseViewController.m

@@ -11,7 +11,7 @@
 #import "OfflineMapsManager.h"
 #import "AppDelegate.h"
 
-#define DOWNLOAD_MAP @"MAP"
+NSString *const DOWNLOAD_MAP = @"MAP";
 
 @interface BaseViewController ()<OfflineMapsManagerDelegate>
 
@@ -33,11 +33,25 @@
 - (MBProgressHUD *)hud
 {
     if (!_hud) {
-        _hud = [MBProgressHUD showHUDAddedTo:SHARED_APPDELEGATE.window animated:YES];
+        _hud = [MBProgressHUD showHUDAddedTo:[[self class] hudShowWindow] animated:YES];
     }
     return _hud;
 }
 
+#pragma mark - 获取显示window
++ (UIWindow *)hudShowWindow {
+    UIWindow *showWindow = nil;
+    NSArray *windows = [[UIApplication sharedApplication] windows];
+    if ([windows count] >= 2) {
+        showWindow = [windows objectAtIndex:1];
+    }
+    else {
+        showWindow = [[UIApplication sharedApplication] keyWindow];
+    }
+    return showWindow;
+}
+
+
 - (OfflineMapsManager *)offline
 {
     _offline = [OfflineMapsManager manager];
@@ -77,28 +91,31 @@
     if ([self.offline isDownloadMaps]) {
         if (SHARED_APPDELEGATE.isWIFI) {
             if (![[NSUserDefaults standardUserDefaults] boolForKey:DOWNLOAD_MAP]) {
-                UIAlertController *alertVC = [UIAlertController alertControllerWithTitle:nil message:@"是否下载当前城市离线地图以节省流量?" preferredStyle:UIAlertControllerStyleActionSheet];
-                [alertVC addAction:[UIAlertAction actionWithTitle:@"取消" style:UIAlertActionStyleCancel handler:nil]];
-                [alertVC addAction:[UIAlertAction actionWithTitle:@"确认" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
-                    [self.offline startDownloadOfflineMaps:^(BOOL boolValue) {
-                    }];
-                }]];
-                [alertVC addAction:[UIAlertAction actionWithTitle:@"不再提示" style:UIAlertActionStyleDestructive handler:^(UIAlertAction * _Nonnull action) {
-                    [[NSUserDefaults standardUserDefaults] setBool:YES forKey:DOWNLOAD_MAP];
-                    [[NSUserDefaults standardUserDefaults] synchronize];
-                }]];
-                [self presentViewController:alertVC animated:YES completion:nil];
+                if (self.offline.downLoadState != 1 && self.offline.downLoadState != 2) {
+                    UIAlertController *alertVC = [UIAlertController alertControllerWithTitle:nil message:@"是否下载当前城市离线地图以节省流量?" preferredStyle:UIAlertControllerStyleActionSheet];
+                    [alertVC addAction:[UIAlertAction actionWithTitle:@"取消" style:UIAlertActionStyleCancel handler:nil]];
+                    [alertVC addAction:[UIAlertAction actionWithTitle:@"确认" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
+                        [self.offline startDownloadOfflineMaps:^(BOOL boolValue) {
+                        }];
+                    }]];
+                    [alertVC addAction:[UIAlertAction actionWithTitle:@"不再提示" style:UIAlertActionStyleDestructive handler:^(UIAlertAction * _Nonnull action) {
+                        [[NSUserDefaults standardUserDefaults] setBool:YES forKey:DOWNLOAD_MAP];
+                        [[NSUserDefaults standardUserDefaults] synchronize];
+                    }]];
+                    [self presentViewController:alertVC animated:YES completion:nil];
+                }
             }
         }
     }
 }
 
 
-
 #pragma mark - 下载进度回调
 - (void)offlineMapsDownloadProgress:(double)progress
 {
-    [self ShowProgressView:progress withTitle:@"正在下载离线地图"];
+    if (self.offline.downLoadState != 4) {
+       [self ShowProgressView:progress withTitle:@"正在下载离线地图"];
+    }
 }
 
 #pragma mark - 下载状态
@@ -107,12 +124,12 @@
     switch (state) {
         case 1://正在下载
         {
-            
+            self.offline.downLoadState = 1;
         }
             break;
         case 2://等待下载
         {
-            
+            self.offline.downLoadState = 2;
         }
             break;
         case 3://已暂停
@@ -177,7 +194,7 @@
 #pragma mark -渐隐提示框回调
 - (void)SHOWPrompttext:(NSString *)Text ComcpleteBlock:(void(^)())completed
 {
-    MBProgressHUD *hud = [MBProgressHUD showHUDAddedTo:SHARED_APPDELEGATE.window animated:YES];
+    MBProgressHUD *hud = [MBProgressHUD showHUDAddedTo:[[self class] hudShowWindow] animated:YES];
     hud.label.text = Text;
     hud.contentColor = MainColor;
     hud.label.font = [UIFont systemFontOfSize:18];
@@ -203,7 +220,6 @@
     self.hud.removeFromSuperViewOnHide = YES;
 }
 
-
 #pragma mark -进度条
 - (void)ShowProgressView:(double)progress withTitle:(NSString *)message
 {
@@ -222,6 +238,7 @@
 {
     NSLog(@"取消下载");
     [self.offline pauseDownloadOfflineMaps];
+//    [self RemoveMBProgressHUDLoding];
 }
 
 #pragma mark -移除MBProgressHUD等待视图
@@ -235,7 +252,7 @@
 #pragma mark -显示成功的提示框
 - (void)SuccessMBProgressView:(NSString *)successString timeDelay:(NSTimeInterval)time finish:(void (^)())complete
 {
-    MBProgressHUD *hud = [MBProgressHUD showHUDAddedTo:SHARED_APPDELEGATE.window animated:YES];
+    MBProgressHUD *hud = [MBProgressHUD showHUDAddedTo:[[self class] hudShowWindow] animated:YES];
     UIImage *image = [[UIImage imageNamed:@"Checkmark"] imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];
     UIImageView *imageView = [[UIImageView alloc] initWithImage:image];
     hud.customView = imageView;
@@ -254,7 +271,7 @@
 #pragma mark -显示信息的提示框
 - (void)ErrorMBProgressView:(NSString *)errorString
 {
-    MBProgressHUD *hud = [MBProgressHUD showHUDAddedTo:SHARED_APPDELEGATE.window animated:YES];
+    MBProgressHUD *hud = [MBProgressHUD showHUDAddedTo:[[self class] hudShowWindow] animated:YES];
     UIImage *image = [[UIImage imageNamed:@"Checkmark"] imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];
     UIImageView *imageView = [[UIImageView alloc] initWithImage:image];
     hud.customView = imageView;
@@ -269,7 +286,7 @@
 - (void)SHOWPrompttext:(NSString *)Text
 {
 
-    MBProgressHUD *hud = [MBProgressHUD showHUDAddedTo:SHARED_APPDELEGATE.window animated:YES];
+    MBProgressHUD *hud = [MBProgressHUD showHUDAddedTo:[[self class] hudShowWindow] animated:YES];
     hud.mode = MBProgressHUDModeText;
     hud.label.text = Text;
     hud.contentColor = MainColor;

Palmwms/Class/Login/LoginViewController.m

@@ -95,7 +95,6 @@
 #pragma mark - 确认登陆
 - (void)loginButtonClickAction:(UIButton *)sender
 {
-
     [self CreateMBProgressHUDLoding:@"登录中"];
     NSDictionary *dict = [NSDictionary dictionaryWithObjectsAndKeys:self.userNameTextField.text,@"username",self.passWordTextField.text,@"password", nil];
     WS(weakSelf);

Palmwms/Class/Main/Map/Contrillers/DeliveryTrackingViewController.h

@@ -8,6 +8,8 @@
 
 #import "BaseViewController.h"
 
+
+
 @interface DeliveryTrackingViewController : BaseViewController
 
 @end

Palmwms/Class/Main/Map/Contrillers/MainViewController.m

@@ -17,6 +17,8 @@
  *  当前控制器
  */
 @property (nonatomic,strong) BaseViewController *currentVC;
+
+
 @property (nonatomic,strong) CoordinateAcquisitionViewController *coordinateVC;
 @property (nonatomic,strong) DeliveryTrackingViewController *DeliveryVC;
 

Palmwms/Class/Main/Map/Contrillers/OrderListViewController.m

@@ -20,6 +20,7 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
     
+    
     self.orderTableView.tableFooterView = [UIView new];
     [self uiConfigAction];
 }
@@ -50,7 +51,6 @@
     cell.orderBillStateLabel.text = model.state;
     cell.orderBillStateLabel.textColor = [self returnColorFromOrderBillState:model.state];
     cell.orderTitleLabel.text = [NSString stringWithFormat:@"单号:%@",model.billNumber];
-    
     return cell;
 }
 

Palmwms/Class/OfflineMapsHelp/OfflineMapsManager.h

@@ -33,6 +33,12 @@
 @property (nonatomic,strong) BMKOfflineMap *offlineMap;
 @property (nonatomic,assign) int locationCityId;
 
+/**
+ *  下载状态
+ */
+@property (nonatomic,assign) int downLoadState;
+
+
 + (instancetype)manager;
 
 /**

Palmwms/Tools/Macro/urlInformation.h

@@ -26,13 +26,11 @@
  */
 #define CHANGEPASSWORD @"driver/modifyPassword"
 
-
 /**
  *  更新版本通知
  */
 #define UPLOADVERSION @"uploadVersion"
 
-
 /**
  * 查询配送单
  */
@@ -48,13 +46,11 @@
  */
 #define QUERYDEPOT @"depot/getByCode?code="
 
-
 /**
  *  更新送货单详情店铺状态
  */
 #define ORDERDETAILSSTATE @"busbillDtl/updateState?id=%@&state=%@"
 
-
 /**
  *  上传店铺坐标
  */