Merge branch 'develop' into feature/publishNew

RainbowPlanet/RainbowPlanet/AppDelegate/AppDelegate+HandleOpen.swift

@@ -56,7 +56,7 @@ extension AppDelegate {
         UMessage.setAutoAlert(false)
         RouterManager.shared.UMPush(pushModel: PushModel(JSONString: userInfo.description) ?? PushModel())
 
-        // 接受笑死通知
+        // 接受通知
         UMessage.didReceiveRemoteNotification(userInfo)
     }
 

RainbowPlanet/RainbowPlanet/AppDelegate/AppDelegate+Window.swift

@@ -56,6 +56,7 @@ extension AppDelegate {
                     self?.setNoLoginOut()
                 }else {
                     self?.window?.rootViewController = BaseTabbarViewController.shared.tabBarViewController()
+                    
                     self?.setData()
                 }
             }

RainbowPlanet/RainbowPlanet/AppDelegate/AppDelegate.swift

@@ -8,6 +8,7 @@
 
 import UIKit
 import Kingfisher
+import SwiftyJSON
 
 @UIApplicationMain
 class AppDelegate: UIResponder, UIApplicationDelegate {

RainbowPlanet/RainbowPlanet/Base/RootViewController/RootViewController.swift

@@ -8,6 +8,7 @@
 
 import UIKit
 import SnapKit
+import SwiftyJSON
 
 class RootViewController: BaseViewController {
     

RainbowPlanet/RainbowPlanet/Manager/UMManager/UMManager.swift

@@ -201,7 +201,7 @@ extension UMManager:UNUserNotificationCenterDelegate {
             UMessage.didReceiveRemoteNotification(userInfo)
             
         }else {
-            //应用处于前台时的本地推送接受
+            //应用处于后台时的本地推送接受
         }
     }
 }