// 消息

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -11,7 +11,7 @@
 		0414BDAB2BC7E9C200225367 /* YHMyPermissionCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0414BDAA2BC7E9C200225367 /* YHMyPermissionCell.swift */; };
 		0414BDAD2BC7F02C00225367 /* YHMyNotifySettingVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0414BDAC2BC7F02C00225367 /* YHMyNotifySettingVC.swift */; };
 		0414BDB22BCCC0A500225367 /* YHCollectionModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0414BDB12BCCC0A500225367 /* YHCollectionModel.swift */; };
-		04174D642BCD52BD000BA46D /* YHTestViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04174D632BCD52BD000BA46D /* YHTestViewController.swift */; };
+		04174D642BCD52BD000BA46D /* YHDeviceInfoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04174D632BCD52BD000BA46D /* YHDeviceInfoViewController.swift */; };
 		04174D732BCD5B74000BA46D /* YHMsgViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04174D672BCD5B74000BA46D /* YHMsgViewModel.swift */; };
 		04174D742BCD5B74000BA46D /* IMAppKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04174D692BCD5B74000BA46D /* IMAppKey.swift */; };
 		04174D762BCD5B74000BA46D /* YHMsgListModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04174D6C2BCD5B74000BA46D /* YHMsgListModel.swift */; };
@@ -461,7 +461,7 @@
 		0414BDAA2BC7E9C200225367 /* YHMyPermissionCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMyPermissionCell.swift; sourceTree = "<group>"; };
 		0414BDAC2BC7F02C00225367 /* YHMyNotifySettingVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMyNotifySettingVC.swift; sourceTree = "<group>"; };
 		0414BDB12BCCC0A500225367 /* YHCollectionModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCollectionModel.swift; sourceTree = "<group>"; };
-		04174D632BCD52BD000BA46D /* YHTestViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHTestViewController.swift; sourceTree = "<group>"; };
+		04174D632BCD52BD000BA46D /* YHDeviceInfoViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHDeviceInfoViewController.swift; sourceTree = "<group>"; };
 		04174D672BCD5B74000BA46D /* YHMsgViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHMsgViewModel.swift; sourceTree = "<group>"; };
 		04174D692BCD5B74000BA46D /* IMAppKey.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IMAppKey.swift; sourceTree = "<group>"; };
 		04174D6C2BCD5B74000BA46D /* YHMsgListModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHMsgListModel.swift; sourceTree = "<group>"; };
@@ -1971,7 +1971,7 @@
 				0414BDAC2BC7F02C00225367 /* YHMyNotifySettingVC.swift */,
 				049A48A72B49417300D0C641 /* YHAboutUsViewController.swift */,
 				048B2A492BC7D9DC00A93BF0 /* YHMyLikeViewController.swift */,
-				04174D632BCD52BD000BA46D /* YHTestViewController.swift */,
+				04174D632BCD52BD000BA46D /* YHDeviceInfoViewController.swift */,
 			);
 			path = C;
 			sourceTree = "<group>";
@@ -2617,7 +2617,7 @@
 				045EEEB92B9F171A0022A143 /* YHWorkMessageSelectTableViewCell.swift in Sources */,
 				044E1E812BC3BBC200A3B4AF /* YHSearchInfomationVC.swift in Sources */,
 				04A7BD0F2BA41C9800BD35A2 /* YHMyDocumentsModel.swift in Sources */,
-				04174D642BCD52BD000BA46D /* YHTestViewController.swift in Sources */,
+				04174D642BCD52BD000BA46D /* YHDeviceInfoViewController.swift in Sources */,
 				A5ACE92E2B4564F7002C94D2 /* YHValidateCodeInputView.swift in Sources */,
 				045EEED82B9F171A0022A143 /* YHQuestionInfo.swift in Sources */,
 				048787D32BCE6B7D0036E221 /* YHServiceOrderAlertView.swift in Sources */,

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

@@ -128,11 +128,9 @@ class YHMessageListVC: YHBaseViewController {
     }
     
     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()
                 // 资料填写

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

@@ -19,38 +19,7 @@ class YHMsgViewModel: NSObject {
         
         let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Message.unreadMsgListApi
         let _ = YHNetRequest.getRequest(url: strUrl) { json, code in
-            
             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 {

galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHTestViewController.swift → galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHDeviceInfoViewController.swift

@@ -8,26 +8,25 @@
 
 import UIKit
 
-class YHTestViewController: YHBaseViewController {
+class YHDeviceInfoViewController: YHBaseViewController {
     
-    lazy var nameLabel: UILabel = {
-        let nameLabel = UILabel()
-        nameLabel.textColor = UIColor(hex:0x121A26)
-        nameLabel.textAlignment = .left
-        nameLabel.font = UIFont.PFSC_M(ofSize:15)
-        nameLabel.numberOfLines = 0
-        return nameLabel
+    lazy var deviceInfoLabel: UILabel = {
+        let label = UILabel()
+        label.textColor = UIColor(hex:0x121A26)
+        label.textAlignment = .left
+        label.font = UIFont.PFSC_M(ofSize:15)
+        label.numberOfLines = 0
+        return label
     }()
 
     override func viewDidLoad() {
         super.viewDidLoad()
         view.backgroundColor = .white
-        view.addSubview(nameLabel)
-        nameLabel.snp.makeConstraints { make in
+        view.addSubview(deviceInfoLabel)
+        deviceInfoLabel.snp.makeConstraints { make in
             make.left.equalToSuperview().offset(20)
             make.right.equalToSuperview().offset(-20)
             make.top.equalToSuperview().offset(k_Height_NavigationtBarAndStatuBar)
-            make.bottom.equalToSuperview()
         }
         
         YHHUD.show(.progress(message: "加载中..."))
@@ -39,9 +38,10 @@ class YHTestViewController: YHBaseViewController {
             YHLoginManager.shared.deviceTokenModel.registerId = registrationID ?? ""
             
             var info = "deviceToken: \n" + (YHLoginManager.shared.deviceTokenModel.deviceToken)
+            info += "\n"
             info += "\nregisterId: \n" +  (YHLoginManager.shared.deviceTokenModel.registerId)
             DispatchQueue.main.async {
-                self.nameLabel.text = info
+                self.deviceInfoLabel.text = info
             }
         }
     }

galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHMySettingViewController.swift

@@ -40,7 +40,8 @@ class YHMySettingViewController: YHBaseViewController, ConstraintRelatableTarget
                 PersonalModuleItem(title: "权限配置".local, type:.permissionSettings),
                 PersonalModuleItem(title: "个人信息收集清单".local, type:.infoCollectList),
                 PersonalModuleItem(title: "第三方信息共享清单".local, type:.infoShareList),
-                PersonalModuleItem(title: "关于我们".local, type:.aboutUs)]
+                PersonalModuleItem(title: "关于我们".local, type:.aboutUs),
+                PersonalModuleItem(title: "设备相关".local, type:.deviceInfo)]
     }()
     
     override func viewDidLoad() {
@@ -98,6 +99,7 @@ extension YHMySettingViewController : UITableViewDelegate, UITableViewDataSource
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         
         if 0 <= indexPath.row && indexPath.row < items.count {
+            
             let item = items[indexPath.row]
             if item.type == .notifySettings {
                 let vc = YHMyNotifySettingVC()
@@ -110,6 +112,10 @@ extension YHMySettingViewController : UITableViewDelegate, UITableViewDataSource
             } else if item.type == .aboutUs {
                 let vc = YHAboutUsViewController()
                 self.navigationController?.pushViewController(vc)
+                
+            } else if item.type == .deviceInfo {
+                let vc = YHDeviceInfoViewController()
+                self.navigationController?.pushViewController(vc)
             }
         }
     }

galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHMyViewController.swift

@@ -25,6 +25,7 @@ enum YHPersonalModuleItemType: Int {
     case infoCollectList
     case infoShareList
     case aboutUs
+    case deviceInfo
 }
 
 class PersonalModuleItem {