no message

RainbowPlanet/RainbowPlanet/AppDelegate/AppDelegate+HandleOpen.swift

@@ -58,12 +58,7 @@ extension AppDelegate {
     func application(_ application: UIApplication, didReceiveRemoteNotification userInfo: [AnyHashable : Any]) {
         //关闭友盟自带的弹出框
         UMessage.setAutoAlert(true)
-        if #available(iOS 9.0, *)  {
-            if #available(iOS 10.0, *){
-            }else {
-                UMessage.didReceiveRemoteNotification(userInfo)
-            }
-        }
+        UMessage.didReceiveRemoteNotification(userInfo)
     }
 
     /// 获取设备的 DeviceToken
@@ -74,5 +69,6 @@ extension AppDelegate {
             tokenString += hexString
         }
         NXLLog("获取设备的 DeviceToken:\(tokenString)")
+        UMessage.registerDeviceToken(deviceToken)
     }
 }

RainbowPlanet/RainbowPlanet/AppDelegate/AppDelegate+Window.swift

@@ -64,7 +64,11 @@ extension AppDelegate {
 
     /// 设置Login
     func setLoginController() {
+        //移除友盟别名
+        UMManager.shared.removeAlias()
+        //移除本地用户信息
         UserModel.shared().removeLoginModel()
+        //移除快递信息
         DeliveryMethodTypeModel.shared().removeLoginModel()
         self.window?.rootViewController = BaseNavigationViewController.init(rootViewController: RegisterLoginViewController())
     }

RainbowPlanet/RainbowPlanet/Manager/UMManager/UMManager.swift

@@ -120,6 +120,7 @@ public extension UMManager {
             }
         }
 
+        //注册通知
         UMessage.registerForRemoteNotifications(launchOptions: launchOptions, entity: _entity) { (granted, error) in
 
             if granted {
@@ -132,8 +133,24 @@ public extension UMManager {
         UMessage.openDebugMode(true)
         UMessage.setAutoAlert(true)
         UMessage.setWebViewClassString("UMWebViewController")
-        UMessage.addLaunch()
+        UMessage.addLaunch() //开屏图
     }
+    
+    /// 添加别名
+    func addAlias() {
+        UMessage.addAlias(UserModel.shared().getModel()?.mobile ?? "", type: "CHXQ_MOBILE", response: { (data, error) in })
+    }
+    
+    /// 重置别名
+    func setAlias() {
+        UMessage.setAlias(UserModel.shared().getModel()?.mobile ?? "", type: "CHXQ_MOBILE", response: { (data, error) in })
+    }
+    
+    /// 移除别名
+    func removeAlias() {
+        UMessage.removeAlias(UserModel.shared().getModel()?.mobile ?? "", type: "CHXQ_MOBILE", response: { (data, error) in })
+    }
+    
 }
 
 // MARK: 分享

RainbowPlanet/RainbowPlanet/Modules/RegisterLoginModule/BindPhoneNumber/ViewController/BindPhoneNumberViewController.swift

@@ -52,6 +52,8 @@ class BindPhoneNumberViewController: BaseViewController {
             [weak self] (phoneNumber,sms,invitationCode) in
             SwiftMoyaNetWorkServiceUser.shared().userBindMobileApi(mobile: phoneNumber, smsCode: sms, unionId: UserModel.shared().getModel()?.unionId ?? "", openId: UserModel.shared().getModel()?.openId ?? "", invitationCode: invitationCode, completion: { [weak self] (data) -> (Void) in
                 if self?.bindPhoneNumberVCType == .weixinlogin { //跳转性别
+                    // 设置友盟别名
+                    UMManager.shared.addAlias()
                     if UserModel.shared().getModel()?.isNewMember == 1 {
                         VirusViewModel.shared.registeredVirueRecordAddApi(completion: {
                             self?.present(GenderSelectionViewController(), animated: true, completion: {
@@ -73,7 +75,9 @@ class BindPhoneNumberViewController: BaseViewController {
                 }else if self?.bindPhoneNumberVCType == .accountSecuritySet  { //设置密码
                         let vc = SetPasswordViewController()
                         self?.navigationController?.pushViewController(vc, animated: true)
-                }else if self?.bindPhoneNumberVCType == .accountSecurityBindMobile  { //绑定手机
+                }else if self?.bindPhoneNumberVCType == .accountSecurityBindMobile  { //更换手机
+                    //友盟重置别名
+                    UMManager.shared.setAlias()
                     NotificationCenter.default.post(name: NSNotification.Name(rawValue: "AccountSecurity"), object: nil)
                     self?.navigationController?.popViewController(animated: true)
                 }

RainbowPlanet/RainbowPlanet/Modules/RegisterLoginModule/MobileLogin/ViewController/MobileLoginViewController.swift

@@ -42,7 +42,8 @@ class MobileLoginViewController: BaseViewController {
         mobileLoginView.loginBlock = {
             (phoneNumber,sms,invitationCode) in
             SwiftMoyaNetWorkServiceUser.shared().userMobileRegisterApi(mobile: phoneNumber, sms_code: sms,invitationCode:invitationCode, completion: { [weak self] (data) -> (Void) in
-                
+                // 设置友盟别名
+                UMManager.shared.addAlias()
                 if UserModel.shared().getModel()?.isNewMember == 1 {
                     VirusViewModel.shared.registeredVirueRecordAddApi(completion: {
                         //设置性别话题
@@ -53,6 +54,10 @@ class MobileLoginViewController: BaseViewController {
                 }else if(UserModel.shared().getModel()?.gender == nil || UserModel.shared().getModel()?.gender == 0) {//设置性别话题
                     self?.present(GenderSelectionViewController(), animated: true, completion: {
                         
+                    })
+                }else if UserModel.shared().getModel()?.isFollowSuggestTopic == 0  { //设置话题
+                    self?.present(TopicSelectionViewController(), animated: true, completion: {
+                        
                     })
                 }else {// 设置首页
                     kAppDelegate.setTabbarController()

RainbowPlanet/RainbowPlanet/Modules/RegisterLoginModule/PasswordLogin/ViewController/PasswordLoginViewController.swift

@@ -32,6 +32,8 @@ class PasswordLoginViewController: BaseViewController {
         passwordLoginView.loginBlock = {
             [weak self] (phoneNumber,password) in
             SwiftMoyaNetWorkServiceUser.shared().userMobileLoginApi(mobile: phoneNumber, password: password, completion: { (data) -> (Void) in
+                // 设置友盟别名
+                UMManager.shared.addAlias()
                 kAppDelegate.setTabbarController()
             })
         }

RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceApi/SwiftMoyaServiceUser/SwiftMoyaNetWorkServiceUser.swift

@@ -119,6 +119,7 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
         let parameters = Dictionary<String,Any>()
         SwiftProgressHUD.shared().showWait()
         SwiftMoyaNetWorkManager.shared.requestAny(target: MultiTarget(SwiftMoyaServiceUserApi.userLogout(parameters: parameters))) { (data) in
+            // 设置友盟别名
             kAppDelegate.setLoginController()
             SwiftProgressHUD.shared().hide()
         }

RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceManger/SwiftMoyaNetWorkManager/ApiMacro.swift

@@ -9,8 +9,8 @@
 import Foundation
 
 let kPersonalService = false
-let kDevelopSever = false
-let kBetaSever = true
+let kDevelopSever = true
+let kBetaSever = false
 let kProductSever = false
 
 // MARK: - 数据服务器
@@ -29,8 +29,8 @@ public func kApiDataPrefix() -> String {
 }
 
 let kVirusPersonalService = false
-let kVirusDevelopSever = false
-let kVirusBetaSever = true
+let kVirusDevelopSever = true
+let kVirusBetaSever = false
 let kVirusProductSever = false
 
 // MARK: - Virus
@@ -49,8 +49,8 @@ public func kApiVirusPrefix() -> String {
 }
 
 let kH5PersonalService = false
-let kH5DevelopSever = false
-let kH5BetaSever = true
+let kH5DevelopSever = true
+let kH5BetaSever = false
 let kH5ProductSever = false
 
 // MARK: - H5