// 消息

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

@@ -82,6 +82,17 @@ class YHMessageListVC: YHBaseViewController {
         return view
     }()
     
+    lazy var managerSession: YHMessageInfoModel = {
+        let mgrMsg = YHMessageInfoModel()
+        mgrMsg.type = YHMessageType.yinheManager.rawValue
+        mgrMsg.unreadCount = YHButlerServiceManager.shared.unreadCount
+        if let lastMsg = YHButlerServiceManager.shared.getLastMessage() {
+            mgrMsg.lastMessage = lastMsg.content
+            mgrMsg.lastMessageTime = Int64(lastMsg.timeStamp)
+        }
+        return mgrMsg
+    }()
+    
     override func viewDidLoad() {
         super.viewDidLoad()
         setupUI()
@@ -106,14 +117,7 @@ class YHMessageListVC: YHBaseViewController {
         
         // 银河管家 始终放在第一位
         if YHButlerServiceManager.shared.isUatAllowed() {
-            let mgrMsg = YHMessageInfoModel()
-            mgrMsg.type = YHMessageType.yinheManager.rawValue
-            mgrMsg.unreadCount = YHButlerServiceManager.shared.unreadCount
-            if let lastMsg = YHButlerServiceManager.shared.getLastMessage() {
-                mgrMsg.lastMessage = lastMsg.content
-                mgrMsg.lastMessageTime = Int64(lastMsg.timeStamp)
-            }
-            msgArr.append(mgrMsg)
+            msgArr.append(self.managerSession)
         }
         
         self.tableView.reloadData()
@@ -185,10 +189,10 @@ class YHMessageListVC: YHBaseViewController {
                 guard let self = self else { return }
                 
                 // 保留第一个元素银河管家，删除其他元素
-                if msgArr.count > 1 {
-                    msgArr.removeSubrange(1..<msgArr.count)
+                msgArr.removeAll()
+                if YHButlerServiceManager.shared.isUatAllowed() {
+                    msgArr.append(self.managerSession)
                 }
-                
 
                 if success {
                     var hasUnreadMsg = false
@@ -366,16 +370,11 @@ extension YHMessageListVC {
             return
         }
 
-        for msg in msgArr {
-            if msg.type == YHMessageType.yinheManager.rawValue { // 银河管家
-                msg.unreadCount = YHButlerServiceManager.shared.unreadCount
-                if let lastMsg = YHButlerServiceManager.shared.getLastMessage() {
-                    msg.lastMessage = lastMsg.content
-                    msg.lastMessageTime = Int64(lastMsg.timeStamp)
-                    self.tableView.reloadData()
-                    break
-                }
-            }
+        self.managerSession.unreadCount = YHButlerServiceManager.shared.unreadCount
+        if let lastMsg = YHButlerServiceManager.shared.getLastMessage() {
+            self.managerSession.lastMessage = lastMsg.content
+            self.managerSession.lastMessageTime = Int64(lastMsg.timeStamp)
+            self.tableView.reloadData()
         }
     }
 }
@@ -432,10 +431,8 @@ extension YHMessageListVC: UITableViewDelegate, UITableViewDataSource {
                     YHHUD.hide()
                     if success {
                         //YHButlerServiceManager.shared.clearUnreadCount()
-                        if let managerSession = self.msgArr.first, managerSession.type == YHMessageType.yinheManager.rawValue {
-                            managerSession.unreadCount = 0
-                            self.tableView.reloadData()
-                        }
+                        self.managerSession.unreadCount = 0
+                        self.tableView.reloadData()
                     }
                 }
                 return