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/Classes/Modules/Message(消息)/C/YHMsgViewController.swift

@@ -10,7 +10,12 @@ import UIKit
 
 class YHMsgViewController: YHBaseViewController {
     
-    var msgArr:[String] = ["","",""]
+    var msgArr:[YHMessageInfoModel] = []
+    lazy var viewModel = {
+        let model = YHMsgViewModel()
+        return model
+    }()
+    
     lazy var tableView: UITableView = {
         
         let tableView = UITableView(frame:.zero, style:.grouped)
@@ -79,6 +84,11 @@ class YHMsgViewController: YHBaseViewController {
         setupUI()
     }
     
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
+        getUnreadMsgList()
+    }
+    
     func setupUI() {
         
         gk_navigationBar.isHidden = true
@@ -96,6 +106,35 @@ class YHMsgViewController: YHBaseViewController {
             make.bottom.equalToSuperview().offset(-k_Height_TabBar)
         }
     }
+    
+    func getUnreadMsgList() {
+        YHHUD.show(.progress(message: "加载中..."))
+        self.viewModel.getUnreadMsgList {
+            [weak self] success, error in
+            guard let self = self else { return }
+            YHHUD.hide()
+            if success, let msgList = viewModel.msgList {
+                msgArr.removeAll()
+                // 资料填写
+                if let infoMsg = msgList.information {
+                    msgArr.append(infoMsg)
+                }
+                // 证件上传
+                if let cerMsg = msgList.certificate {
+                    msgArr.append(cerMsg)
+                }
+                // 文书定稿
+                if let dratMsg = msgList.draft {
+                    msgArr.append(dratMsg)
+                }
+                // 文件签字
+                if let signMsg = msgList.signature {
+                    msgArr.append(signMsg)
+                }
+                self.tableView.reloadData()
+            }
+        }
+    }
 }
 
 extension YHMsgViewController {
@@ -118,6 +157,10 @@ extension YHMsgViewController: UITableViewDelegate, UITableViewDataSource {
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         
         let cell = tableView.dequeueReusableCell(withIdentifier: YHMessageSessionCell.cellReuseIdentifier, for: indexPath) as! YHMessageSessionCell
+        if 0 <= indexPath.row && indexPath.row < msgArr.count {
+            let model = msgArr[indexPath.row]
+            cell.updateModel(model)
+        }
         return cell
     }
     

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

@@ -30,6 +30,37 @@ class YHMessageSessionCell: UITableViewCell {
         setupUI()
     }
     
+    func updateModel(_ model: YHMessageInfoModel) {
+        self.badgeLabel.text = (model.unreadCount < 100 ? String(model.unreadCount) : "99+")
+        self.detailLabel.text = model.lastMessage
+        self.timeLabel.text =  formatTimestamp(Double(model.lastMessageTime))
+    }
+    
+    func formatTimestamp(_ timestamp: TimeInterval) -> String {
+        let currentDate = Date()
+        let calendar = Calendar.current
+        let currentYear = calendar.component(.year, from: currentDate)
+        let currentDay = calendar.component(.day, from: currentDate)
+        
+        let date = Date(timeIntervalSince1970: timestamp)
+        let year = calendar.component(.year, from: date)
+        let day = calendar.component(.day, from: date)
+        
+        let dateFormatter = DateFormatter()
+        
+        if year == currentYear {
+            if day == currentDay {
+                dateFormatter.dateFormat = "HH:mm"
+            } else {
+                dateFormatter.dateFormat = "MM-dd"
+            }
+        } else {
+            dateFormatter.dateFormat = "yyyy-MM-dd"
+        }
+        
+        return dateFormatter.string(from: date)
+    }
+    
     func setupUI() {
         
         self.selectionStyle = .none

galaxy/galaxy/Classes/Tools/NetWork/YHAllApiName.swift

@@ -254,4 +254,10 @@ class YHAllApiName {
         //方案计划
         static let applyPlanApi = "infoflow/assessment/apply_plan"
     }
+    
+    // 消息
+    struct Message {
+        // 获取未读消息列表
+        static let unreadMsgList = "infoflow/unread-message"
+    }
 }

galaxy/galaxy/Classes/Tools/NetWork/YHNetRequest.swift

@@ -90,6 +90,7 @@ class YHNetRequest: NSObject {
         
         requestHeader.add(name:"sign",value:sign)
         requestHeader.add(name: "token", value: YHLoginManager.shared.userModel?.token ?? "-")
+        requestHeader.add(name: "device-id", value: YHLoginManager.shared.userModel?.registerId ?? "")
 //        requestHeader.add(name: "token", value: "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3MTI0NjA1NzQsImkiOjk4OTcwNDI5NjA3NzI0OSwidSI6IumTtuays-mbhuWboiIsInIiOiJzdXBlcl9hcHAifQ.jyBpXSii6nlRIITdOya3GQa5eb5G42Jh9nj39Cncwl8")