Merge branch 'develop' into feature/RongCloudIM

# Conflicts:
#	RainbowPlanet/RainbowPlanet/AppDelegate/AppDelegate+Window.swift

RainbowPlanet/RainbowPlanet.xcodeproj/project.pbxproj

@@ -5998,7 +5998,7 @@
 				CODE_SIGN_ENTITLEMENTS = NotificationService/NotificationService.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 10;
+				CURRENT_PROJECT_VERSION = 11;
 				DEVELOPMENT_TEAM = C6GA87VLB8;
 				INFOPLIST_FILE = NotificationService/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
@@ -6023,7 +6023,7 @@
 				CODE_SIGN_ENTITLEMENTS = NotificationService/NotificationService.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 10;
+				CURRENT_PROJECT_VERSION = 11;
 				DEVELOPMENT_TEAM = C6GA87VLB8;
 				INFOPLIST_FILE = NotificationService/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
@@ -6170,7 +6170,7 @@
 				CODE_SIGN_ENTITLEMENTS = "RainbowPlanet/Supporting Files/RainbowPlanet.entitlements";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 10;
+				CURRENT_PROJECT_VERSION = 11;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = C6GA87VLB8;
 				ENABLE_BITCODE = NO;
@@ -6425,7 +6425,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
 				COPY_PHASE_STRIP = YES;
-				CURRENT_PROJECT_VERSION = 10;
+				CURRENT_PROJECT_VERSION = 11;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = C6GA87VLB8;
 				ENABLE_BITCODE = NO;

RainbowPlanet/RainbowPlanet/AppDelegate/AppDelegate+Window.swift

@@ -25,13 +25,6 @@ extension AppDelegate {
         //基础配置
         DispatchQueue.global(qos: .default).async {
             [weak self] in
-            
-            /// 设置全局的tabbar
-            self?.setTabbarAppearence()
-            /// 设置全局的navigation
-            self?.setNavBarAppearence()
-            /// 设置全局的TableView
-            self?.setTableViewAppearance()
             /// 城市转换
             self?.setBaiduToCityFactory()
             /// 授权处理
@@ -42,10 +35,18 @@ extension AppDelegate {
             DeliveryMethodTypeModel.shared().setModel(model: deliveryMethodTypeModel)
             //网络监听
             //        AlamofireReachabilityManager.shared.reachability()
-            
+
+            DispatchQueue.main.async {
+                /// 设置全局的tabbar
+                self?.setTabbarAppearence()
+                /// 设置全局的navigation
+                self?.setNavBarAppearence()
+                /// 设置全局的TableView
+                self?.setTableViewAppearance()
+                //键盘处理
+                IQKeyboardManagerSwiftManager.shared().initIQKeyboardManagerSwift()
+            }
         }
-        //键盘处理
-        IQKeyboardManagerSwiftManager.shared().initIQKeyboardManagerSwift()
 
     }