Merge commit '81f17d8c' into xiezhaolin

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

@@ -36,11 +36,12 @@ class YHMessageDetailListVC: YHBaseViewController {
         bar.rightBtnClick = {
             [weak self] in
             guard let self = self else { return }
+            let unreadMessages = self.msgArr.filter { !$0.isRead }
+            if unreadMessages.count <= 0 {
+                YHHUD.flash(message: "暂无未读消息~")
+                return
+            }
             YHCommonAlertView.show("清除未读", "确定要清除所有未读提示吗？", "取消", "确认") {
-                if self.msgArr.count <= 0 {
-                    YHHUD.flash(message: "暂无消息~")
-                    return
-                }
                 self.markAllMsgsRead()
             }
         }

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

@@ -49,8 +49,9 @@ class YHMessageListVC: YHBaseViewController {
             bar.rightBtnClick = {
                 [weak self] in
                 guard let self = self else { return }
-                if self.msgArr.count <= 0 {
-                    YHHUD.flash(message: "暂无消息~")
+                let unreadMessages = self.msgArr.filter { $0.unreadCount > 0 }
+                if unreadMessages.count <= 0 {
+                    YHHUD.flash(message: "暂无未读消息~")
                     return
                 }
                 YHCommonAlertView.show("清除未读", "确定要清除所有未读提示吗？", "取消", "确认") {

galaxy/galaxy/Classes/Modules/Message(消息)/V/YHMessageSessionCell.swift

@@ -63,7 +63,7 @@ class YHMessageSessionCell: UITableViewCell {
             make.width.equalTo(width)
         }
         
-        self.detailLabel.text = model.lastMessage
+        self.detailLabel.text = !model.lastMessage.isEmpty ? model.lastMessage : "暂无消息".local
         self.timeLabel.text =  formatTimestamp(Double(model.lastMessageTime))
     }