Commit 2f2875aa authored by Steven杜宇's avatar Steven杜宇

// 消息

parent 14bd9a91
...@@ -82,6 +82,17 @@ class YHMessageListVC: YHBaseViewController { ...@@ -82,6 +82,17 @@ class YHMessageListVC: YHBaseViewController {
return view 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() { override func viewDidLoad() {
super.viewDidLoad() super.viewDidLoad()
setupUI() setupUI()
...@@ -106,14 +117,7 @@ class YHMessageListVC: YHBaseViewController { ...@@ -106,14 +117,7 @@ class YHMessageListVC: YHBaseViewController {
// 银河管家 始终放在第一位 // 银河管家 始终放在第一位
if YHButlerServiceManager.shared.isUatAllowed() { if YHButlerServiceManager.shared.isUatAllowed() {
let mgrMsg = YHMessageInfoModel() msgArr.append(self.managerSession)
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)
} }
self.tableView.reloadData() self.tableView.reloadData()
...@@ -185,10 +189,10 @@ class YHMessageListVC: YHBaseViewController { ...@@ -185,10 +189,10 @@ class YHMessageListVC: YHBaseViewController {
guard let self = self else { return } guard let self = self else { return }
// 保留第一个元素银河管家,删除其他元素 // 保留第一个元素银河管家,删除其他元素
if msgArr.count > 1 { msgArr.removeAll()
msgArr.removeSubrange(1..<msgArr.count) if YHButlerServiceManager.shared.isUatAllowed() {
msgArr.append(self.managerSession)
} }
if success { if success {
var hasUnreadMsg = false var hasUnreadMsg = false
...@@ -366,16 +370,11 @@ extension YHMessageListVC { ...@@ -366,16 +370,11 @@ extension YHMessageListVC {
return return
} }
for msg in msgArr { self.managerSession.unreadCount = YHButlerServiceManager.shared.unreadCount
if msg.type == YHMessageType.yinheManager.rawValue { // 银河管家 if let lastMsg = YHButlerServiceManager.shared.getLastMessage() {
msg.unreadCount = YHButlerServiceManager.shared.unreadCount self.managerSession.lastMessage = lastMsg.content
if let lastMsg = YHButlerServiceManager.shared.getLastMessage() { self.managerSession.lastMessageTime = Int64(lastMsg.timeStamp)
msg.lastMessage = lastMsg.content self.tableView.reloadData()
msg.lastMessageTime = Int64(lastMsg.timeStamp)
self.tableView.reloadData()
break
}
}
} }
} }
} }
...@@ -432,10 +431,8 @@ extension YHMessageListVC: UITableViewDelegate, UITableViewDataSource { ...@@ -432,10 +431,8 @@ extension YHMessageListVC: UITableViewDelegate, UITableViewDataSource {
YHHUD.hide() YHHUD.hide()
if success { if success {
//YHButlerServiceManager.shared.clearUnreadCount() //YHButlerServiceManager.shared.clearUnreadCount()
if let managerSession = self.msgArr.first, managerSession.type == YHMessageType.yinheManager.rawValue { self.managerSession.unreadCount = 0
managerSession.unreadCount = 0 self.tableView.reloadData()
self.tableView.reloadData()
}
} }
} }
return return
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment