// 消息跳转

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

@@ -319,8 +319,9 @@ extension YHHomeHoldViewPageViewController {
         
         NotificationCenter.default.addObserver(self, selector: #selector(didRefreshMessageCount), name: YhConstant.YhNotification.didQiYuUnReadMsgCountChangeNotification, object: nil)
         
+        NotificationCenter.default.addObserver(self, selector: #selector(didJumpToNewsTab), name: YhConstant.YhNotification.didJumpToHomePageNewsTabNotification, object: nil)
         
-        
+        NotificationCenter.default.addObserver(self, selector: #selector(didJumpToLifeTab), name: YhConstant.YhNotification.didJumpToHomePageLifeTabNotification, object: nil)
         
         for i in 0..<arrItemTitles.count {
             if i == 0 {
@@ -371,10 +372,18 @@ extension YHHomeHoldViewPageViewController {
         
     }
     
-
+    // 跳转到资讯tab
+    @objc func didJumpToNewsTab() {
+        jumpToItemIndex(itemIndex: 3)
+    }
+    
+    @objc func didJumpToLifeTab() {
+        jumpToItemIndex(itemIndex: 2)
+    }
     
     func jumpToItemIndex(itemIndex : Int) {
         self.segmentedView.selectItemAt(index: itemIndex)
+        self.listContainerView.didClickSelectedItem(at: itemIndex)
     }
 }
 

galaxy/galaxy/Classes/Modules/Message(消息)/C/YHMessageListVC.swift

@@ -19,7 +19,8 @@ class YHMessageListVC: YHBaseViewController {
     
     private var isGoYHManagerFlag : Bool = false
     
-    private let serviceCenterViewModel : YHServiceCenterMainViewModel = YHServiceCenterMainViewModel()
+    private let serviceCenterMainViewModel : YHServiceCenterMainViewModel = YHServiceCenterMainViewModel()
+    private let serviceCenterViewModel = YHServiceCenterViewModel()
 
     var isNotifyEnabled = false
     lazy var tableView: UITableView = {
@@ -184,7 +185,10 @@ class YHMessageListVC: YHBaseViewController {
         }
         
         self.requestOrderStatus { 
-            isHidden in
+            status in
+            
+            // status == 1 时是文案段阶段， 当过了文案段阶段需要隐藏文案段相关消息
+            let isHidden = (status != 1)
             
             self.viewModel.getUnreadMsgList {
                 [weak self] success, error in
@@ -234,9 +238,9 @@ class YHMessageListVC: YHBaseViewController {
                     }
                     
                     // 身份续签
-//                    if !self.viewModel.msgList.renewal.lastMessage.isEmpty {
-//                        hasUnreadMsg = true
-//                    }
+                    if !self.viewModel.msgList.renewal.lastMessage.isEmpty {
+                        hasUnreadMsg = true
+                    }
                     
                     if hasUnreadMsg {
                         if !isHidden {
@@ -249,7 +253,7 @@ class YHMessageListVC: YHBaseViewController {
                        
                         msgArr.append(self.viewModel.msgList.approval)
                         msgArr.append(self.viewModel.msgList.goToHK)
-//                        msgArr.append(self.viewModel.msgList.renewal)
+                        msgArr.append(self.viewModel.msgList.renewal)
 
                     }
                 }
@@ -260,29 +264,25 @@ class YHMessageListVC: YHBaseViewController {
         }
     }
     
-    func requestOrderStatus(callback:((_ isHidden: Bool)->())?) {
+    func requestOrderStatus(callback:((_ status: Int)->())?) {
         // 先获取订单列表
-        self.serviceCenterViewModel.getContactList {
+        self.serviceCenterMainViewModel.getContactList {
             [weak self] success, error in
             guard let self = self else { return }
             if success == true {
-                if let orderInfo = serviceCenterViewModel.arrContactList.first {
+                if let orderInfo = serviceCenterMainViewModel.arrContactList.first {
                     // 请求申请结果
-                    self.serviceCenterViewModel.getStageInformation(params: ["orderId": orderInfo.id]) {
+                    self.serviceCenterViewModel.getServiceMainData(orderId: orderInfo.id) {
                         [weak self] success, error in
                         guard let self = self else { return }
-                        if self.serviceCenterViewModel.personInfoModel.type != 1 { // 身份申请完成之后
-                            callback?(true)
-                                
-                        } else {
-                            callback?(false)
-                        }
+                        callback?(self.serviceCenterViewModel.mainModel.stage)
                     }
+                    
                 } else {
-                    callback?(false)
+                    callback?(0)
                 }
             } else {
-                callback?(false)
+                callback?(0)
             }
         }
     }

galaxy/galaxy/Classes/Tools/Helper/YhConstant.swift

@@ -294,6 +294,14 @@ extension YhConstant {
         
         //获取灰度参数
         public static let didRevUatParam = Notification.Name(rawValue: "com.yinhe.didRevUatParam")
-
+        
+        // 跳转通知
+        // 跳转到首页资讯tab
+        public static let didJumpToHomePageNewsTabNotification = Notification.Name(rawValue: "com.yinhe.homePage.news")
+        
+        // 跳转到首页生活tab
+        public static let didJumpToHomePageLifeTabNotification = Notification.Name(rawValue: "com.yinhe.homePage.life")
+        
+        
     }
 }