Merge branch 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into develop

* 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS:
  //  消息
  // 消息

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -16,7 +16,7 @@
 		04174D742BCD5B74000BA46D /* IMAppKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04174D692BCD5B74000BA46D /* IMAppKey.swift */; };
 		04174D752BCD5B74000BA46D /* YHMessageListModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04174D6B2BCD5B74000BA46D /* YHMessageListModel.swift */; };
 		04174D762BCD5B74000BA46D /* YHMsgListModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04174D6C2BCD5B74000BA46D /* YHMsgListModel.swift */; };
-		04174D772BCD5B74000BA46D /* YHInformationFillVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04174D6E2BCD5B74000BA46D /* YHInformationFillVC.swift */; };
+		04174D772BCD5B74000BA46D /* YHMessageDetailListVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04174D6E2BCD5B74000BA46D /* YHMessageDetailListVC.swift */; };
 		04174D782BCD5B74000BA46D /* YHMsgViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04174D6F2BCD5B74000BA46D /* YHMsgViewController.swift */; };
 		04174D792BCD5B74000BA46D /* YHMessageSessionCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04174D712BCD5B74000BA46D /* YHMessageSessionCell.swift */; };
 		04174D7A2BCD5B74000BA46D /* YHInformationFillCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04174D722BCD5B74000BA46D /* YHInformationFillCell.swift */; };
@@ -461,7 +461,7 @@
 		04174D692BCD5B74000BA46D /* IMAppKey.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IMAppKey.swift; sourceTree = "<group>"; };
 		04174D6B2BCD5B74000BA46D /* YHMessageListModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHMessageListModel.swift; sourceTree = "<group>"; };
 		04174D6C2BCD5B74000BA46D /* YHMsgListModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHMsgListModel.swift; sourceTree = "<group>"; };
-		04174D6E2BCD5B74000BA46D /* YHInformationFillVC.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHInformationFillVC.swift; sourceTree = "<group>"; };
+		04174D6E2BCD5B74000BA46D /* YHMessageDetailListVC.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHMessageDetailListVC.swift; sourceTree = "<group>"; };
 		04174D6F2BCD5B74000BA46D /* YHMsgViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHMsgViewController.swift; sourceTree = "<group>"; };
 		04174D712BCD5B74000BA46D /* YHMessageSessionCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHMessageSessionCell.swift; sourceTree = "<group>"; };
 		04174D722BCD5B74000BA46D /* YHInformationFillCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHInformationFillCell.swift; sourceTree = "<group>"; };
@@ -951,7 +951,7 @@
 		04174D6D2BCD5B74000BA46D /* C */ = {
 			isa = PBXGroup;
 			children = (
-				04174D6E2BCD5B74000BA46D /* YHInformationFillVC.swift */,
+				04174D6E2BCD5B74000BA46D /* YHMessageDetailListVC.swift */,
 				04174D6F2BCD5B74000BA46D /* YHMsgViewController.swift */,
 			);
 			path = C;
@@ -2757,7 +2757,7 @@
 				A5ACE93C2B4564F7002C94D2 /* UIColor+Extension.swift in Sources */,
 				045EEEC02B9F171A0022A143 /* YHOtherInfoFillViewModel.swift in Sources */,
 				045EEEF22B9F171A0022A143 /* YHChildBasicInfoVC.swift in Sources */,
-				04174D772BCD5B74000BA46D /* YHInformationFillVC.swift in Sources */,
+				04174D772BCD5B74000BA46D /* YHMessageDetailListVC.swift in Sources */,
 				A592BFEF2B9AB720004C04A9 /* YHWholeScreenTipsView.swift in Sources */,
 				045EEEF42B9F171A0022A143 /* YHSpouseBasicInfoVC.swift in Sources */,
 				A5FD63C32B63438A00D1D9DA /* YHContactMainItemStatusModel.swift in Sources */,

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

@@ -8,7 +8,7 @@
 
 import UIKit
 
-class YHInformationFillVC: YHBaseViewController {
+class YHMessageDetailListVC: YHBaseViewController {
     
     var type:Int = -1
     var msgArr:[YHDetailMessageModel] = []
@@ -32,7 +32,7 @@ class YHInformationFillVC: YHBaseViewController {
             [weak self] in
             guard let self = self else { return }
             YHCommonAlertView.show("清除未读", "确定要清除所有未读提示吗？", "取消", "确认") {
-                
+                self.markAllMsgsRead()
             }
         }
         return bar
@@ -91,10 +91,35 @@ class YHInformationFillVC: YHBaseViewController {
             self.tableView.reloadData()
         }
     }
-
+    
+    func markAllMsgsRead() {
+        YHHUD.show(.progress(message: "清除中..."))
+        self.viewModel.readMessages(type:self.type, msgIds:nil, isAllRead:true) {
+            [weak self] success, error in
+            YHHUD.hide()
+            guard let self = self else { return }
+            if success {
+                YHHUD.flash(message: "清除成功")
+                for item in self.msgArr {
+                    item.isRead = true
+                }
+                self.tableView.reloadData()
+                return
+            }
+            
+            if let error = error {
+                var msg = "清除失败"
+                if error.errorMsg.count > 0 {
+                    msg = error.errorMsg
+                }
+                YHHUD.flash(message: msg)
+                return
+            }
+        }
+    }
 }
 
-extension YHInformationFillVC: UITableViewDelegate, UITableViewDataSource {
+extension YHMessageDetailListVC: UITableViewDelegate, UITableViewDataSource {
     
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         return msgArr.count

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

@@ -46,10 +46,12 @@ class YHMsgViewController: YHBaseViewController {
         bar.rightBtnClick = {
             [weak self] in
             guard let self = self else { return }
-            YHCommonAlertView.show("清除未读", "确定要清除所有未读提示吗？", "取消", "确认") {
-                let vc = YHInformationFillVC()
-                vc.type = 1
-                self.navigationController?.pushViewController(vc)
+            bar.rightBtnClick = {
+                [weak self] in
+                guard let self = self else { return }
+                YHCommonAlertView.show("清除未读", "确定要清除所有未读提示吗？", "取消", "确认") {
+                    self.markAllMsgsRead()
+                }
             }
         }
         return bar
@@ -141,6 +143,32 @@ class YHMsgViewController: YHBaseViewController {
             }
         }
     }
+    
+    func markAllMsgsRead() {
+        YHHUD.show(.progress(message: "清除中..."))
+        self.viewModel.readMessages(type:nil, msgIds:nil, isAllRead:true) {
+            [weak self] success, error in
+            YHHUD.hide()
+            guard let self = self else { return }
+            if success {
+                YHHUD.flash(message: "清除成功")
+                for item in self.msgArr {
+                    item.unreadCount = 0
+                }
+                self.tableView.reloadData()
+                return
+            }
+            
+            if let error = error {
+                var msg = "清除失败"
+                if error.errorMsg.count > 0 {
+                    msg = error.errorMsg
+                }
+                YHHUD.flash(message: msg)
+                return
+            }
+        }
+    }
 }
 
 extension YHMsgViewController {
@@ -178,7 +206,7 @@ extension YHMsgViewController: UITableViewDelegate, UITableViewDataSource {
        
         if 0 <= indexPath.row && indexPath.row < msgArr.count {
             let msgItem = msgArr[indexPath.row]
-            let vc = YHInformationFillVC()
+            let vc = YHMessageDetailListVC()
             vc.type = msgItem.type
             self.navigationController?.pushViewController(vc)
         }

galaxy/galaxy/Classes/Modules/Message(消息)/VM/YHMsgViewModel.swift

@@ -108,12 +108,23 @@ class YHMsgViewModel: NSObject {
         }
     }
     
-    func readMessages(type:Int, msgIds:[Int], _ callBackBlock:@escaping (_ success: Bool, _ error:YHErrorModel?)->()) {
+    func readMessages(type:Int?, msgIds:[Int]?, isAllRead:Bool?, _ callBackBlock:@escaping (_ success: Bool, _ error:YHErrorModel?)->()) {
         
         let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Message.readMsg
         
-        let params:[String : Any] = ["type": type,
-                                     "ids": msgIds]
+        var params:[String : Any] = [:]
+        if let type = type {
+            params["type"] = type
+        }
+        if let msgIds = msgIds, msgIds.count > 0 {
+            params["ids"] = msgIds
+        }
+        
+        if let isAllRead = isAllRead {
+            params["all_read"] = isAllRead
+        }
+        printLog("params 是 ==> \(params)")
+        
         let _ = YHNetRequest.postRequest(url: strUrl, params: params) { json, code in
             
             let dic = json.data