Merge commit '7b0653a0' into xiezhaolin

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/C/YHMyDocumentsDetailViewController.swift

@@ -806,4 +806,3 @@ extension YHMyDocumentsDetailViewController {
         }
     }
 }
-

galaxy/galaxy/Classes/Modules/Login(登录)/C/YHCodeSueecssViewController.swift

@@ -175,6 +175,7 @@ class YHCodeSueecssViewController: YHBaseViewController {
             if success == false {
                 YHHUD.flash(message: error?.errorMsg ?? "")
             } else {
+                YHLoginManager.shared.loginSuccessActionBlock?()
                 YHHUD.flash(message: "登录成功")
                 self.dismiss(animated: true)
             }

galaxy/galaxy/Classes/Modules/Login(登录)/Server/YHLoginManager.swift

@@ -14,6 +14,10 @@ class YHLoginManager: NSObject {
     var userModel: YHUserModel?
     var deviceTokenModel : YHDeviceTokenModel = YHDeviceTokenModel()
     
+    //检查到未登录的情况下 调用登录界面，在登录成功后，是否需要继续之前的行为
+    typealias Block = () -> ()
+    var loginSuccessActionBlock : Block?
+    
     private override init() {}
     
     func isLogin() -> Bool {

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

@@ -47,8 +47,22 @@ class YHMessageSessionCell: UITableViewCell {
         } else {
             self.nameLabel.text = ""
         }
+        self.badgeLabel.isHidden = model.unreadCount <= 0
+        let unreadCountText =  (model.unreadCount < 100 ? String(model.unreadCount) : "99+")
+        self.badgeLabel.text = unreadCountText
+        self.badgeLabel.snp.updateConstraints { make in
+            var width = badgeHeight
+            if unreadCountText.count < 2 { // 个位数
+                width = badgeHeight
+                
+            } else if unreadCountText.count == 2 { // 两位数
+                width = 22.0
+            } else if unreadCountText.count >= 3 { // 三位数
+                width = 30.0
+            }
+            make.width.equalTo(width)
+        }
         
-        self.badgeLabel.text = (model.unreadCount < 100 ? String(model.unreadCount) : "99+")
         self.detailLabel.text = model.lastMessage
         self.timeLabel.text =  formatTimestamp(Double(model.lastMessageTime))
     }

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

@@ -19,7 +19,37 @@ class YHMsgViewModel: NSObject {
         let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Message.unreadMsgList
         let _ = YHNetRequest.getRequest(url: strUrl) { json, code in
             
-            let dic = json.data
+            var dic = json.data
+            
+            var json = json
+            json.code = 200
+            dic = [
+              "information": [
+                "unread_count": 0,
+                "last_message": "阿法守法所发生的法师打发",
+                "last_message_time": 1586507545,
+                "type": 0
+              ],
+              "certificate": [
+                "unread_count": 3,
+                "last_message": "发生发顺丰大声道发生大发萨法沙发沙发沙发沙发阿斯顿发生发顺丰阿凡达放大第三方",
+                "last_message_time": 1586507545,
+                "type": 0
+              ],
+              "draft": [
+                "unread_count": 100,
+                "last_message": "发生发顺丰大声道发生大发",
+                "last_message_time": 1712737945,
+                "type": 0
+              ],
+              "signature": [
+                "unread_count": 87,
+                "last_message": "发生发",
+                "last_message_time": 1713236425,
+                "type": 0
+              ]
+            ]
+            
             printLog("model 是 ==> \(json)")
             if json.code == 200 {
                 guard let result = YHMsgListModel.deserialize(dict: dic as? Dictionary ) else {