银河管家增加灰度逻辑控制

galaxy/galaxy/Classes/Modules/ButlerServiceManager(银河管家)/VM/YHButlerServiceViewModel.swift

@@ -15,7 +15,6 @@ class YHButlerServiceViewModel {
         let params: [String : Any] = ["yh_id": id]
         let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.QiYu.userInfomation
         let _ = YHNetRequest.getRequest(url: strUrl, params: params) { json, code in
-            let dic = json.data
             guard let data = json.data, let jsonData = try? JSONSerialization.data(withJSONObject: data, options: []), let dataString = jsonData.string(encoding: .utf8) else {
                 callBackBlock(nil, YHErrorModel())
                 return

galaxy/galaxy/Classes/Modules/ButlerServiceManager(银河管家)/YHButlerServiceManager.swift

@@ -27,38 +27,23 @@ class YHButlerServiceManager: NSObject {
         
         NotificationCenter.default.addObserver(self, selector: #selector(loginSuccess), name: YhConstant.YhNotification.didLoginSuccessNotifiction, object: nil)
         NotificationCenter.default.addObserver(self, selector: #selector(logoutSuccess), name: YhConstant.YhNotification.didLogoutSuccessNotifiction, object: nil)
+        NotificationCenter.default.addObserver(self, selector: #selector(didRevUatParam), name: YhConstant.YhNotification.didRevUatParam, object: nil)
     }
     
     deinit {
         NotificationCenter.default.removeObserver(self)
     }
-    
+        
     func setupSDK() {
         let qyOption = QYSDKOption(appKey: YhConstant.QiYuSDK.appKey)
         qyOption.appName = YhConstant.QiYuSDK.appName
         QYSDK.shared().register(with: qyOption)
-        updateSDKAccountInfo(completion: { [weak self] _ in
-            self?.lastMessage = self?.getLastMessage()
-        })
-    }
-        
-    /// 必须在初始化后调用
-    func getLastMessage() -> YHButlerServiceMessage? {
-        guard let message = getSessionList().first else {
-            return nil
-        }
-        return YHButlerServiceMessageHandler.handleSessionMessage(sessionMessage: message)
-    }
-    
-    func updateUserInfo(userId: String, userData: String, completion: @escaping (Bool) -> Void) {
-        let userInfo = QYUserInfo()
-        userInfo.userId = userId
-        userInfo.data = userData
-        QYSDK.shared().setUserInfo(userInfo) { success, error in
-            completion(success)
+        guard isUatAllowed() else {
+            return
         }
+        initSDKAccountAndLastMessage()
     }
-    
+            
     func updateApnsToken(token: Data) {
         QYSDK.shared().updateApnsToken(token)
     }
@@ -91,20 +76,49 @@ class YHButlerServiceManager: NSObject {
             })
         }
     }
+}
+
+
+extension YHButlerServiceManager {
+    // MARK: - 常用公开方法
     
-    private func logoutCurrentUser(completion: @escaping (Bool) -> Void) {
-        QYSDK.shared().logout { flag in
-            completion(flag)
-        }
+    /// 灰度打开
+    func isUatAllowed() -> Bool {
+        let allowed = YHUatHelper.shared.getUatModuleStatusBy(module: YHUatModules.QiYu_Service) == 1
+        return allowed || true
     }
     
+    /// 初始化SDK用户信息
+    func initSDKAccountAndLastMessage() {
+        updateSDKAccountInfo(completion: { [weak self] _ in
+            self?.lastMessage = self?.getLastMessage()
+        })
+    }
+        
+    /// 必须在初始化后调用
+    func getLastMessage() -> YHButlerServiceMessage? {
+        guard let message = getSessionList().first else {
+            return nil
+        }
+        return YHButlerServiceMessageHandler.handleSessionMessage(sessionMessage: message)
+    }
 }
 
 extension YHButlerServiceManager {
-    // MARK: - 私有登录登出的处理逻辑
+    // MARK: - 私有方法以及登录登出的处理逻辑
+    
+    @objc private func didRevUatParam() {
+        guard isUatAllowed() else {
+            return
+        }
+        initSDKAccountAndLastMessage()
+    }
     
     @objc private func loginSuccess() {
-        setupInfomationForQiYu(completion: { _ in })
+        guard isUatAllowed() else {
+            return
+        }
+        initSDKAccountAndLastMessage()
     }
     
     @objc private func logoutSuccess() {
@@ -121,6 +135,15 @@ extension YHButlerServiceManager {
         }
     }
     
+    private func updateUserInfo(userId: String, userData: String, completion: @escaping (Bool) -> Void) {
+        let userInfo = QYUserInfo()
+        userInfo.userId = userId
+        userInfo.data = userData
+        QYSDK.shared().setUserInfo(userInfo) { success, error in
+            completion(success)
+        }
+    }
+    
     private func setupInfomationForQiYu(completion: @escaping (Bool) -> Void) {
         guard let userId = YHLoginManager.shared.userModel?.id, userId.count > 0 else {
             completion(false)
@@ -133,12 +156,21 @@ extension YHButlerServiceManager {
         }
     }
     
-    /// 启动先判断是否当前登录账号是SDK账号，如果不相同，先登出，再用新账号信息写入
+    /// 启动先判断是否当前登录账号是SDK账号
     private func updateSDKAccountInfo(completion: @escaping (Bool) -> Void) {
-        guard let userId = YHLoginManager.shared.userModel?.id, userId.count > 0, QYSDK.shared().currentUserID() != userId else {
-            completion(true)
+        // 如果未登录直接退出设置
+        guard let userId = YHLoginManager.shared.userModel?.id, userId.count > 0 else {
+            completion(false)
             return
         }
+        // 如果新旧账号相同，直接设置用户账号信息
+        guard QYSDK.shared().currentUserID() != userId else {
+            setupInfomationForQiYu(completion: { done in
+                completion(done)
+            })
+            return
+        }
+        // 如果新旧账号不相同，先登出SDK，再用新账号信息写入，
         logoutCurrentUser { [weak self] success in
             if success {
                 self?.setupInfomationForQiYu(completion: { done in
@@ -149,6 +181,12 @@ extension YHButlerServiceManager {
             }
         }
     }
+    
+    private func logoutCurrentUser(completion: @escaping (Bool) -> Void) {
+        QYSDK.shared().logout { flag in
+            completion(flag)
+        }
+    }
 }
 
 extension YHButlerServiceManager {

galaxy/galaxy/Classes/Modules/Home(首页)/C/YHHomePageViewController.swift

@@ -104,9 +104,16 @@ class YHHomePageViewController: YHBaseViewController {
 //MARK: - 私有方法
 private extension YHHomePageViewController {
     func updateMgrItem() {
+        // 页面已经加载了
+        guard view.window != nil, isViewLoaded, homeHeaderView.superview != nil else {
+            return
+        }
+        guard YHButlerServiceManager.shared.isUatAllowed(), YHLoginManager.shared.isLogin() else {
+            return
+        }
         needUpdateMgrItem = false
         let showButler = true
-        let serviceMessage = YHButlerServiceManager.shared.lastMessage
+        let serviceMessage = YHButlerServiceManager.shared.getLastMessage()
         
         self.homeHeaderView.orderTipsView.customerServiceMessage = YHButlerServiceHomeInfoMessage(showButler: showButler, serviceMessage: serviceMessage)
     }
@@ -308,8 +315,16 @@ private extension YHHomePageViewController {
         }
     }
     
+    @objc func didRevUatParam() {
+        guard serviceCenterMainReqVM.arrContactList.count > 0 else {
+            return
+        }
+        updateMgrItem()
+    }
+    
     func setupNotification() {
         NotificationCenter.default.addObserver(self, selector: #selector(didQiYuReceiveNewMsg), name: YhConstant.YhNotification.didQiYuReceiveNewMsgNotification, object: nil)
+        NotificationCenter.default.addObserver(self, selector: #selector(didRevUatParam), name: YhConstant.YhNotification.didRevUatParam, object: nil)
     }
 }
 

galaxy/galaxy/Classes/Modules/Home(首页)/V/YHOrderTipsView.swift

@@ -73,7 +73,7 @@ class YHOrderTipsView: UIView {
                 mgrItem.updateMessageState(didReadMessage: customerServiceMessage?.serviceMessage?.isRead ?? true)
             } else {
                 updateItems()
-                mgrItem.updateManagerTipsItemView(message: customerServiceMessage?.serviceMessage?.content, didReadMessage: customerServiceMessage?.serviceMessage?.isRead == true)
+                mgrItem.updateManagerTipsItemView(message: customerServiceMessage?.serviceMessage?.content ?? "一对一专属服务", didReadMessage: customerServiceMessage?.serviceMessage?.isRead ?? true)
             }
         }
     }