Merge commit '5866a6d7' into xiezhaolin

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

@@ -13,8 +13,8 @@ class YHMessageDetailListVC: YHBaseViewController {
     var type:Int = -1
     var msgArr:[YHDetailMessageModel] = []
     // 滑动过程中出现在屏幕上的未读消息集合
-    var visiblemsgIdSet = Set<String>()
-    var visibleMsgArr = [YHDetailMessageModel]()
+    var visibleUnreadMsgIdSet = Set<String>()
+    var visibleUnreadMsgArr = [YHDetailMessageModel]()
     
     lazy var viewModel = {
         let model = YHMsgViewModel()
@@ -160,10 +160,9 @@ class YHMessageDetailListVC: YHBaseViewController {
     }
     
     func markAppearMessagsReaded() {
-        
         var msgIds:[Int] = []
         var resultArr:[YHDetailMessageModel] = []
-            for msgItem in visibleMsgArr {
+        for msgItem in visibleUnreadMsgArr {
             if let msgId = Int(msgItem.id), msgItem.isRead == false  {
                 msgIds.append(msgId)
                 resultArr.append(msgItem)
@@ -180,13 +179,6 @@ class YHMessageDetailListVC: YHBaseViewController {
                 self.tableView.reloadData()
                 return
             }
-//                var msg = "标记已读失败"
-//                if let error = error {
-//                    if error.errorMsg.count > 0 {
-//                        msg = error.errorMsg
-//                    }
-//                }
-//                YHHUD.flash(message: msg)
         }
     }
 }
@@ -218,6 +210,17 @@ extension YHMessageDetailListVC: UITableViewDelegate, UITableViewDataSource {
             let item = msgArr[indexPath.row]
             printLog("order_id: \(item.orderId)")
             
+            if !item.isRead, let msgId = Int(item.id), msgId > 0 { // 消息为未读消息
+                self.viewModel.readMessages(type: self.type, msgIds: [msgId], isAllRead: false) { 
+                    [weak self] success, error in
+                    guard let self = self else { return }
+                    if success {
+                        item.isRead = true
+                        self.tableView.reloadData()
+                    }
+                }
+            }
+            
             if self.type == YHMessageType.infoFill.rawValue { // 资料填写
                 if let orderId = Int(item.orderId), orderId > 0 {
                     let vc = YHInformationPerfectListVC()
@@ -281,20 +284,19 @@ extension YHMessageDetailListVC: UITableViewDelegate, UITableViewDataSource {
     
     // 累计出现在屏幕上的未读消息集合
     func addUpAppearUnreadMessages() {
-        
         let visibleCells = tableView.visibleCells as! [YHDetailMessageCell]
         if visibleCells.count <= 0 { return }
         for cell in visibleCells {
             if let msgItem = cell.model {
                 if !msgItem.isRead {
-                    if !visiblemsgIdSet.contains(msgItem.id) {
-                        visiblemsgIdSet.insert(msgItem.id)
-                        visibleMsgArr.append(msgItem)
+                    if !visibleUnreadMsgIdSet.contains(msgItem.id) {
+                        visibleUnreadMsgIdSet.insert(msgItem.id)
+                        visibleUnreadMsgArr.append(msgItem)
                     }
                 }
             }
         }
-        printLog("visiblemsgIdSet:/n \(visiblemsgIdSet)")
+        printLog("visiblemsgIdSet:/n \(visibleUnreadMsgIdSet)")
     }
 }
 

galaxy/galaxy/Classes/Modules/Mine（我的）/V/YHUserInfoHeaderView.swift

@@ -190,7 +190,7 @@ class YHUserInfoHeaderView: UIView {
     }
     
     func showCount(_ count: Int)-> String {        
-        return count < 10000 ? String(count) : String(format: "%.1fw", Double(count)/Double(10000))
+        return count < 10000 ? String(count) : String(format: "%.1fw", Double(count/1000)/10.0)
     }
     
     private func createUI() {