添加更新弹框，对接界面数据，添加空白视图

liushiyu
1 parent bd330553
Showing 35 changed files with 1074 additions and 152 deletions
metaCode.xcodeproj/project.pbxproj
metaCode/Classes/Common/Base/CNLiveBaseTabBarViewController.swift
metaCode/Classes/Common/Util/CNLiveCommonQiniuTool.swift
metaCode/Classes/Constant/CNLiveConstant.swift
metaCode/Classes/Environment/CNLiveEnvironment.swift
metaCode/Classes/Extensions/NSObject+CNLiveJSONTool.swift
metaCode/Classes/Extensions/UIImage+CNLiveColorImage.swift
metaCode/Classes/Main/LoginPage/Controller/CNLiveLoginViewController.swift
metaCode/Classes/Main/LoginPage/ViewModel/CNLiveLoginViewModel.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveInputFeedBackViewController.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveMineAddInfoViewController.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveMineInfoViewController.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveMineMessageViewController.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveMineNickViewController.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveTypeFeedBackViewController.swift
metaCode/Classes/Main/MinePage/View/CNLiveMineHeaderView.swift
metaCode/Classes/Main/MinePage/View/CNLiveMineInfoAlertView.swift
metaCode/Classes/Main/MinePage/View/CNLiveMineSubBodyListView.swift
metaCode/Classes/Main/MinePage/ViewModel/CNLiveMineBaseModel.swift
metaCode/Classes/Main/MinePage/ViewModel/CNLiveMineViewModel.swift
@@ -9,6 +9,9 @@
 /* Begin PBXBuildFile section */
 		0D39E93D7229931C86EB1161 /* Pods_metaCode_metaCodeUITests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D879B49B1E42F1584DD75E /* Pods_metaCode_metaCodeUITests.framework */; };
 		1DD2808DF02C120276F99F4D /* Pods_metaCode.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F1C55A719CFEE073C06D37CE /* Pods_metaCode.framework */; };
+		790B1FB42A4153E90074CF00 /* CNLiveMineBaseModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 790B1FB32A4153E90074CF00 /* CNLiveMineBaseModel.swift */; };
+		790B1FB62A41938F0074CF00 /* UIImage+CNLiveColorImage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 790B1FB52A41938F0074CF00 /* UIImage+CNLiveColorImage.swift */; };
+		790B1FB82A41B6A60074CF00 /* CNLiveMineMessageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 790B1FB72A41B6A60074CF00 /* CNLiveMineMessageViewController.swift */; };
 		790D01822A2D88FC00C5978D /* CNLiveConfigMacro.swift in Sources */ = {isa = PBXBuildFile; fileRef = 790D01812A2D88FC00C5978D /* CNLiveConfigMacro.swift */; };
 		790D01852A2D89E100C5978D /* UIColor+CNHexColor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 790D01842A2D89E100C5978D /* UIColor+CNHexColor.swift */; };
 		790D018B2A2D8B3300C5978D /* CNLiveLoginViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 790D018A2A2D8B3300C5978D /* CNLiveLoginViewController.swift */; };
@@ -100,6 +103,9 @@
 		63D879B49B1E42F1584DD75E /* Pods_metaCode_metaCodeUITests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_metaCode_metaCodeUITests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		67F8190701D1AB7F7724E8BA /* Pods-metaCodeTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-metaCodeTests.release.xcconfig"; path = "Target Support Files/Pods-metaCodeTests/Pods-metaCodeTests.release.xcconfig"; sourceTree = "<group>"; };
 		721865F548C997EFAE525B6F /* Pods-metaCode-metaCodeUITests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-metaCode-metaCodeUITests.release.xcconfig"; path = "Target Support Files/Pods-metaCode-metaCodeUITests/Pods-metaCode-metaCodeUITests.release.xcconfig"; sourceTree = "<group>"; };
+		790B1FB32A4153E90074CF00 /* CNLiveMineBaseModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveMineBaseModel.swift; sourceTree = "<group>"; };
+		790B1FB52A41938F0074CF00 /* UIImage+CNLiveColorImage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIImage+CNLiveColorImage.swift"; sourceTree = "<group>"; };
+		790B1FB72A41B6A60074CF00 /* CNLiveMineMessageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveMineMessageViewController.swift; sourceTree = "<group>"; };
 		790D01812A2D88FC00C5978D /* CNLiveConfigMacro.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CNLiveConfigMacro.swift; sourceTree = "<group>"; };
 		790D01842A2D89E100C5978D /* UIColor+CNHexColor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIColor+CNHexColor.swift"; sourceTree = "<group>"; };
 		790D018A2A2D8B3300C5978D /* CNLiveLoginViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveLoginViewController.swift; sourceTree = "<group>"; };
@@ -226,6 +232,7 @@
 				798A44EF2A305BC200815935 /* UIButton+CNLiveExtension.swift */,
 				79396EEC2A319F220053E1AF /* NSObject+CNLiveCurrentVC.swift */,
 				79BDDCBD2A3C3FC8008560FC /* NSObject+CNLiveJSONTool.swift */,
+				790B1FB52A41938F0074CF00 /* UIImage+CNLiveColorImage.swift */,
 			);
 			path = Extensions;
 			sourceTree = "<group>";
@@ -294,6 +301,7 @@
 				79396EF02A31C21B0053E1AF /* CNLiveInfoShowViewController.swift */,
 				79F4B1152A32B96B00993C03 /* CNLiveMineInfoViewController.swift */,
 				79F4B1192A32F21400993C03 /* CNLiveMineNickViewController.swift */,
+				790B1FB72A41B6A60074CF00 /* CNLiveMineMessageViewController.swift */,
 			);
 			path = Controller;
 			sourceTree = "<group>";
@@ -423,6 +431,7 @@
 			isa = PBXGroup;
 			children = (
 				7978A8422A396632007C86B8 /* CNLiveMineViewModel.swift */,
+				790B1FB32A4153E90074CF00 /* CNLiveMineBaseModel.swift */,
 			);
 			path = ViewModel;
 			sourceTree = "<group>";
@@ -805,10 +814,12 @@
 				798A44FB2A30999900815935 /* CNLiveAlertTool.swift in Sources */,
 				790D01A52A2DF65E00C5978D /* CNLiveLoginPickerView.swift in Sources */,
 				79282A3C2A2EDC2500B5F8CF /* NSString+CNLiveExtensions.swift in Sources */,
+				790B1FB82A41B6A60074CF00 /* CNLiveMineMessageViewController.swift in Sources */,
 				798A44F22A30674200815935 /* CNLiveMineSubBodyListView.swift in Sources */,
 				790D01822A2D88FC00C5978D /* CNLiveConfigMacro.swift in Sources */,
 				7CD675482A274167008354C1 /* PGIndexBannerSubiew.m in Sources */,
 				790D019F2A2DD66E00C5978D /* CNLiveLoginViewModel.swift in Sources */,
+				790B1FB62A41938F0074CF00 /* UIImage+CNLiveColorImage.swift in Sources */,
 				790D019D2A2DCBD000C5978D /* UIView+CNGradient.swift in Sources */,
 				798A44F72A3077ED00815935 /* CNLiveHotButton.swift in Sources */,
 				7CD6753D2A2740B0008354C1 /* CNMainView.swift in Sources */,
@@ -843,6 +854,7 @@
 				7CD675422A2740F8008354C1 /* CNCustomIndexView.swift in Sources */,
 				790D01912A2DAC5E00C5978D /* CNLiveConfigFontMacro.swift in Sources */,
 				790D01852A2D89E100C5978D /* UIColor+CNHexColor.swift in Sources */,
+				790B1FB42A4153E90074CF00 /* CNLiveMineBaseModel.swift in Sources */,
 				7978A8432A396632007C86B8 /* CNLiveMineViewModel.swift in Sources */,
 				798A44EE2A305AAC00815935 /* CNLiveBaseNavigationController.swift in Sources */,
 				7CD675422A2740F8008354C1 /* CNCustomIndexView.swift in Sources */,
@@ -1048,7 +1060,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0;
+				MARKETING_VERSION = 0.9;
 				PRODUCT_BUNDLE_IDENTIFIER = com.cnlive.metaCode.debug;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -1082,7 +1094,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0;
+				MARKETING_VERSION = 0.9;
 				PRODUCT_BUNDLE_IDENTIFIER = com.cnlive.metaCode.debug;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -34,6 +34,8 @@ class CNLiveBaseTabBarViewController: UITabBarController
         self.setUpTabBar()
         self.setupBackgroup()
+        
+        selectedIndex = 1
     }
@@ -43,6 +45,12 @@ class CNLiveBaseTabBarViewController: UITabBarController
     override func viewDidAppear(_ animated: Bool) {
         super.viewDidAppear(animated)
         print("获取用户用户数据=====>\(UserInfoManager.shared.userInfo.uid)")
+        
+        CNLiveMineViewModel.requestSystemNews { result, respStatue in
+            if respStatue == .success {
+                UpdataAlertView.showUpdataView(updataModel: result as! UpdateInfoModel)
+            }
+        }
     }
     // MARK: - 控制器的信息
     func setUpTabBar() {
@@ -10,13 +10,12 @@ import Qiniu
 import YYCategories
 import CNLiveRequestBastKit
-typealias ProgressBlcok = (String,CGFloat)
-typealias SuccessBlock = (String,String)
+typealias ProgressBlcok = (_ key: String,_ percent: CGFloat) -> Void
+typealias SuccessBlock = (_ key: String,_ url: String) -> Void
 class UploadManager: NSObject {
-    var successBlock: SuccessBlock?
-    var progressBlcok: ProgressBlcok?
-    private var _qnUploadManager = QNUploadManager()
+    var uploadModels = NSMutableArray()
+    var qnUploadManager = QNUploadManager()
     static let shared = UploadManager()
     private override init() {
         super.init()
@@ -26,48 +25,77 @@ class UploadManager: NSObject {
                 builder?.recorder = try QNFileRecorder(folder: "元码")
             } catch {}
         }
-        _qnUploadManager = QNUploadManager(configuration: config)
+        qnUploadManager = QNUploadManager(configuration: config)
     }
-    static func uploadImage(imageData: NSData, progressBlock: ProgressBlcok, successBlock: SuccessBlock) {
+    /// 上传图片
+    /// - Parameters:
+    ///   - imageData: 图片数据
+    ///   - progressBlock: 进度回调
+    ///   - successBlock: 成功回调
+    static func uploadImage(imageData: NSData, progressBlock:@escaping ProgressBlcok, successBlock: @escaping SuccessBlock) {
         let key = UploadManager.createImageFileName()
-        UploadManager.shared.successBlock = successBlock
-        UploadManager.shared.progressBlcok = progressBlock
-        UploadManager.uploadData(data: imageData, key: key)
+        UploadManager.uploadData(madiaData: imageData, key: key, progress: progressBlock, success: successBlock)
     }
-    /// 上传图片
+    /// 上传到七牛
     /// - Parameters:
     ///   - data: 上传数据
     ///   - key: key
     ///   - uploadProgress: 上传进度
     ///   - resultBlock: 结果
-    static private func uploadData(data: NSData, key: String) {
-        
+    static private func uploadData(madiaData: NSData, key: String, progress: ProgressBlcok?, success: SuccessBlock?) {
+        let param = NSMutableDictionary()
+        param.setValue(APPId, forKey: "appId")
+        param.setValue("POST", forKey: "verb")
+        param.setValue("2", forKey: "storageType")
+        param.setValue(kBucketName_QN, forKey: "bucket")
+        showLoading(message: "上传处理中...")
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
         CNLiveNetworking.setupShowDataResult(false)
-        CNLiveNetworking.requestNetwork(with: .POST, urlString: "\(CNLiveEnvironmentManager.shared.baseUrl_shop)/Api/Index3/getQiniuToken", param: [:], cacheType: .networkOnly) { task, result, error in
+        CNLiveNetworking.requestNetwork(with: .POST, urlString: "\(CNLiveEnvironmentManager.shared.img_token_url)/vod_epg/getUploadAuthForApp", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
+            hiddenLoading()
             if (error == nil) {
                 let resp = result as! NSDictionary
-                let errorCode = "\(resp["code"] ?? 0)"
+                let errorCode = "\(resp["errorCode"] ?? 0)"
                 if (errorCode == "0") {
                     let data = resp["data"] as! Dictionary<String, Any>
                     let token = data["token"] as! String
                     if token.isNotBlank() {
-                        var uploadModel = QiNiuUploadModel.init()
+                        let uploadModel = QiNiuUploadModel.init()
                         uploadModel.isCancel = false
                         uploadModel.key = key
                         let uploadOption = QNUploadOption.init(mime: nil, progressHandler: { key, percent in
                             DispatchQueue.main.async {
-//                                UploadManager.shared.progressBlock
+                                progress!(key!, CGFloat(percent))
                             }
                         }, params: nil, checkCrc: false) {
                             return uploadModel.isCancel
                         }
+                        uploadModel.uploadOption = uploadOption!
+                        UploadManager.shared.uploadModels.add(uploadModel)
+                        showLoading(message: "上传中...")
+                        let url_key = "http://wjjtest.ys2.cnliveimg.com/"+key
+                        UploadManager.shared.qnUploadManager?.put(madiaData as Data, key: key, token: token, complete: { info, key, resp in
+                            hiddenLoading()
+                            //删除上传选项
+                            UploadManager.shared.uploadModels.remove(uploadModel)
+                            if info?.statusCode == 200 {
+                                if success != nil {
+                                    success!(key!, url_key)
+                                }
+                            } else {
+                                if info?.statusCode == -999 {
+                                    showMessage(message: "上传取消")
+                                } else {
+                                    showLoading(message: "上传失败")
+                                }
+                            }
+                        }, option: uploadOption)
                     }
                 } else {
                     showMessage(message: resp["message"] as! String)
@@ -81,9 +109,7 @@ class UploadManager: NSObject {
     /// 设置图片名称
     /// - Returns: 图片名
     static private func createImageFileName() -> String {
-        let date = NSDate()
-        let currentTimeInterval = NSDate(timeIntervalSince1970: 0)
-        let imageName = "802/mateCode/img/\(date.string(withFormat: "yyyyMMdd") ?? "0000")/\(arc4random()%10).jpg"
+        let imageName = "802/mateCode/img/\(NSDate().string(withFormat: "yyyyMMdd") ?? "0000")/\(arc4random()).jpg"
         return imageName
     }
 }
@@ -19,6 +19,9 @@ let KNavigationHeight:CGFloat = (KStatusBarHeight + 44)
 ///tabbar高度
 let KTabBarHeight:CGFloat = (KStatusBarHeight == 44 ? 83 : 49)
+//MARK: - 常用三方key
+let kBucketName_QN:String = "mam-wjjtest-802"
+
 //MARK: - 常用背景色
 ///控制器背景色
 let KVCBackgroupColor = UIColor("#F9F9F9")
@@ -15,6 +15,8 @@ let APPKey: String = CNLiveEnvironmentManager.shared.appKey
 let APPBaseUrl: String! = CNLiveEnvironmentManager.shared.baseUrl
 ///当前应用的Secret
 let APPSecret: String = CNLiveEnvironmentManager.shared.appSecret
+///当前应用的部分请求接口
+let APPBaseMCUrl: String = CNLiveEnvironmentManager.shared.base_mc_url
 ///当前APP的环境
 let APPCurrentEnvironment: CNLiveEnvironment = CNLiveEnvironmentManager.shared.currentEnvironment
@@ -46,7 +48,9 @@ class CNLiveEnvironmentManager: NSObject{
     var appKey: String
     var baseUrl: String
     var appSecret: String
-    var baseUrl_shop: String
+    var base_mc_url: String
+    var img_token_url: String
+    
     ///当前环境
     var currentEnvironment: CNLiveEnvironment
@@ -57,7 +61,8 @@ class CNLiveEnvironmentManager: NSObject{
         self.appKey = ""
         self.baseUrl = ""
         self.appSecret = ""
-        self.baseUrl_shop = ""
+        self.base_mc_url = ""
+        self.img_token_url = ""
         self.currentEnvironment = .development
     }
     //重新copy 和 mutableCopy 方法
@@ -90,7 +95,8 @@ class CNLiveEnvironmentManager: NSObject{
         self.appKey = "ae3a7ad3e4b9beb7cfe2078db648ebb89aa249ca2e82ac"
         self.appSecret = "3cc9f12db322a3d3656012ef929604cf6d6847471535f9"
         self.baseUrl = "https://api.cnlive.com"
-        self.baseUrl_shop = "https://wjjshop.cnlive.com"
+        self.img_token_url = "https://api.cnlive.com/open/api2"
+        self.base_mc_url = "https://metacode.cnlive.com/api"
     }
     //testFlight 环境配置
     func testFlightEnvironment(){
@@ -98,7 +104,8 @@ class CNLiveEnvironmentManager: NSObject{
         self.appKey = "ae3a7ad3e4b9beb7cfe2078db648ebb89aa249ca2e82ac"
         self.appSecret = "3cc9f12db322a3d3656012ef929604cf6d6847471535f9"
         self.baseUrl = "https://api.cnlive.com"
-        self.baseUrl_shop = "https://wjjshop.cnlive.com"
+        self.img_token_url = "https://api.cnlive.com/open/api2"
+        self.base_mc_url = "https://metacode.cnlive.com/api"
     }
     //production 生产环境配置
     func productionEnvironment(){
@@ -106,7 +113,8 @@ class CNLiveEnvironmentManager: NSObject{
         self.appKey = "064f392f84dfe7bbe9f1eabeda53ea02044213019b0406"
         self.appSecret = "68b5cc42fbdb466d56c2e22b00b1494feec8149f9dd32e"
         self.baseUrl = "https://api.cnlive.com"
-        self.baseUrl_shop = "https://managemall.cnlive.com"
+        self.img_token_url = "https://api.cnlive.com/open/api2"
+        self.base_mc_url = "https://metacode.cnlive.com/api"
     }
 }
@@ -35,7 +35,7 @@ func jsonArrayToModel(_ jsonArrayStr:String, _ modelType:HandyJSON.Type) -&gt;[Base
     let data = jsonArrayStr.data(using: String.Encoding.utf8)
     let peoplesArray = try! JSONSerialization.jsonObject(with:data!, options: JSONSerialization.ReadingOptions()) as? [AnyObject]
     for people in peoplesArray! {
-        modelArray.append(dictionaryToModel(people as! [String : Any], modelType))
+        modelArray.append(dictionaryToModel(people as! [String : Any], modelType,""))
     }
     return modelArray
@@ -43,14 +43,14 @@ func jsonArrayToModel(_ jsonArrayStr:String, _ modelType:HandyJSON.Type) -&gt;[Base
 /**
  *  字典转对象
  */
-func dictionaryToModel(_ dictionStr:[String:Any],_ modelType:HandyJSON.Type) -> BaseModel {
+func dictionaryToModel(_ dictionStr:[String:Any],_ modelType:HandyJSON.Type,_ path: String) -> BaseModel {
     if dictionStr.count == 0 {
         #if DEBUG
             print("dictionaryToModel:字符串为空")
         #endif
         return BaseModel()
     }
-    return modelType.deserialize(from: dictionStr) as! BaseModel
+    return modelType.deserialize(from: dictionStr, designatedPath: path) as! BaseModel
 }
 /**
+//
+//  UIImage+CNLiveColorImage.swift
+//  metaCode
+//
+//  Created by open on 2023/6/20.
+//
+
+import Foundation
+
+extension UIImage {
+    class func imageWithColor(color: UIColor, size: CGSize) -> UIImage {
+        let rect = CGRect(x: 0, y: 0, width: size.width, height: size.height)
+        UIGraphicsBeginImageContextWithOptions(rect.size, false, 0)
+        let context = UIGraphicsGetCurrentContext()
+        context?.setFillColor(color.cgColor)
+        context?.fill(rect)
+        let image = UIGraphicsGetImageFromCurrentImageContext()
+        UIGraphicsEndImageContext()
+        return image!
+    }
+}
@@ -254,17 +254,17 @@ class CNLiveLoginViewController : CNLiveBaseViewController, UITextViewDelegate {
 extension CNLiveLoginViewController {
     @objc func changeCityNumberMothod(sender : UIButton) {
-        CNLiveLoginPickerView.showSelectView { [self] text in
-            country = text
-            areaButton.setTitle("+\(text)", for: .normal)
-            areaButton.setTitle("+\(text)", for: .highlighted)
+        CNLiveLoginPickerView.showSelectView { [weak self] text in
+            self!.country = text
+            self!.areaButton.setTitle("+\(text)", for: .normal)
+            self!.areaButton.setTitle("+\(text)", for: .highlighted)
         }
     }
     @objc func sendVerifiCodeMothod(sender : UIButton) {
         view.endEditing(true)
-        CNLiveLoginViewModel.requestVerCodeAction(phone: phoneText.text ?? "", code: country) { [self] in
-            setupCountdownAction(sender: sender)
+        CNLiveLoginViewModel.requestVerCodeAction(phone: phoneText.text ?? "", code: country) { [weak self] in
+            self!.setupCountdownAction(sender: sender)
         }
     }
@@ -17,6 +17,11 @@ typealias resultLoginBlock = () -&gt; Void
 class CNLiveLoginViewModel : NSObject {
+    /// 获取验证码
+    /// - Parameters:
+    ///   - phone: 手机号
+    ///   - code: 验证码
+    ///   - resultBlock: 登陆结果
     static func requestVerCodeAction(phone: String, code: String, resultBlock: @escaping resultCodeBlock) {
         if !phone.isNotBlank() {
@@ -52,6 +57,12 @@ class CNLiveLoginViewModel : NSObject {
         }
     }
+    /// 登陆
+    /// - Parameters:
+    ///   - userName: 手机号
+    ///   - countryCode: 国家区号
+    ///   - verCode: 验证码
+    ///   - resultBlock: 结果回调
     static func requestLoginAction(userName: String, countryCode: String, verCode: String, resultBlock: @escaping resultLoginBlock) {
         if !userName.isNotBlank() {
             showMessage(message: "请输入手机号")
@@ -91,7 +102,7 @@ class CNLiveLoginViewModel : NSObject {
                     if resp.allKeys.contains(where: { item in
                         return item as! String == "data"
                     }) {
-                        let userInfoModel = dictionaryToModel(resp["data"] as! [String : Any], UserInfoModel.self)
+                        let userInfoModel = dictionaryToModel(resp as! [String : Any], UserInfoModel.self,"data")
                         UserInfoManager.cacheUserInfo(userInfo: userInfoModel as! UserInfoModel)
                         UserDefaults.standard.set(true,forKey: "is_login")
                         resultBlock()
@@ -103,22 +114,5 @@ class CNLiveLoginViewModel : NSObject {
                 showMessage(message: "登陆失败")
             }
         }
-//        DispatchQueue.main.asyncAfter(deadline: .now()+0.5, execute: {
-//            hiddenLoading()
-//            let resp = CNLiveLoginViewModel.dict() as NSDictionary
-//            let errorCode = resp["errorCode"]
-//            if (errorCode as! String == "0") {
-//                if resp.allKeys.contains(where: { item in
-//                    return item as! String == "data"
-//                }) {
-//                    let userInfoModel = JsonUtil.dictionaryToModel(resp["data"] as! [String : Any], UserInfoModel.self)
-//                    UserInfoManager.cacheUserInfo(userInfo: userInfoModel as! UserInfoModel)
-//                    UserDefaults.standard.set(true,forKey: "is_login")
-//                    resultBlock()
-//                }
-//            } else {
-//                showMessage(message: resp["errorMessage"] as! String)
-//            }
-//        })
     }
 }
@@ -59,12 +59,14 @@ class CNLiveInputFeedBackViewController: CNLiveBaseViewController, UITextViewDel
     }()
     lazy var photoView: MinePhotoUploadView = {
-        let pView = MinePhotoUploadView.init(frame: .zero) { [self] index in
+        
+        let pView = MinePhotoUploadView.init(frame: .zero, resutBlock: { [weak self] index, imageUrl in
             let mString = NSMutableAttributedString(string: "上传截图 (选填 \(index)/3)")
             mString.addAttributes([.foregroundColor: UIColor.black,.font: BoldFont_18], range: NSRange(location: 0, length: 4))
             mString.addAttributes([.foregroundColor: HexColor("#B4B4B4")!,.font: Font_14], range: NSRange(location: 4, length: 9))
-            photoLabel.attributedText = mString
-        }
+            self!.photoLabel.attributedText = mString
+            self!.imageUrlArray.replaceObject(at: Int(index)! - 1, with: imageUrl)
+        })
         pView.backgroundColor = .clear
         return pView
     }()
@@ -109,6 +111,8 @@ class CNLiveInputFeedBackViewController: CNLiveBaseViewController, UITextViewDel
         return sendButton
     }()
+    lazy var imageUrlArray: NSMutableArray = ["","",""]
+    
     required init?(coder aDecoder:NSCoder) {
        fatalError("init(coder:) has not been implemented")
     }
@@ -208,9 +212,12 @@ class CNLiveInputFeedBackViewController: CNLiveBaseViewController, UITextViewDel
     }
     @objc func sendInfoActionMothod() {
-        let array = photoView.selectedImages
-        array.remove("")
-        print("获取的图片:\(array) 内容:\(p_textView.text ?? "") 手机号:\(mobileField.text ?? "")")
+        CNLiveMineViewModel.requestFeedBack(text: p_textView.text ?? "", contactWay: UserInfoManager.shared.userInfo.mobile, images: imageUrlArray) { result in
+            if result {
+                showMessage(message: "内容提交成功")
+                self.navigationController?.popViewController(animated: true)
+            }
+        }
     }
 }
@@ -14,6 +14,7 @@ enum CNLiveMineInfoShowType {
     case message//消息中心
 }
+
 class CNLiveMineAddInfoViewController : CNLiveBaseViewController, UITableViewDelegate, UITableViewDataSource, UITableViewDragDelegate, UITableViewDropDelegate, DZNEmptyDataSetSource, DZNEmptyDataSetDelegate{
     let kCNLiveMineInfoLListTableViewIdentifier = "kCNLiveMineInfoLListTableViewIdentifier"
@@ -37,7 +38,7 @@ class CNLiveMineAddInfoViewController : CNLiveBaseViewController, UITableViewDel
     }()
     lazy var dataArray: NSMutableArray = {
-        let dataArray = NSMutableArray()
+        var dataArray = NSMutableArray()
         if _show_type == .add {
             dataArray.add(["image":"mine_header_icon_defult_ava","name":"志愿者身份"])
             dataArray.add(["image":"mine_header_icon_defult_ava","name":"退伍军人身份"])
@@ -46,13 +47,14 @@ class CNLiveMineAddInfoViewController : CNLiveBaseViewController, UITableViewDel
             dataArray.add(["image":"mine_header_icon_defult_ava","name":"志愿者身份","number":"证件编号：410800111127954"])
             dataArray.add(["image":"mine_header_icon_defult_ava","name":"退伍军人身份","number":"证件编号：410800111127954"])
         }
-        if _show_type == .message {
-//            dataArray.add(["image":"mine_header_icon_defult_ava","name":"志愿者云","number":"志愿者大礼包发放中，快来领取吧！","time":"03-12"])
-//            dataArray.add(["image":"mine_header_icon_defult_ava","name":"志愿者·志愿云","number":"志愿者大礼包快来领取吧～","time":"03-12"])
-        }
         return dataArray
     }()
+    private lazy var listArray: Array<NewsListModel> = {
+        let listArray = Array<NewsListModel>()
+        return listArray
+    }()
+    
     lazy var setButton = {
         let setButton = UIButton.init(type: .custom)
         setButton.frame = CGRectMake(KSreenWidth - 35, (get_system_nav_height() - (get_system_statusBar_height() + 20))/2 + get_system_statusBar_height(), 20, 20)
@@ -73,6 +75,7 @@ class CNLiveMineAddInfoViewController : CNLiveBaseViewController, UITableViewDel
         return copyButton
     }()
+    var network_type: CNLiveMineResponseType!
     var _show_type:CNLiveMineInfoShowType!
     init(show_type:CNLiveMineInfoShowType) {
        super.init(nibName:nil, bundle:nil)
@@ -93,8 +96,10 @@ class CNLiveMineAddInfoViewController : CNLiveBaseViewController, UITableViewDel
             tableView.dragInteractionEnabled = true
         case .message:
             titleName = "消息中心"
-            topNavView.addSubview(setButton)
-            topNavView.addSubview(copyButton)
+            loadData()
+//            topNavView.addSubview(setButton)
+//            topNavView.addSubview(copyButton)
+
         case .none:
             break
         }
@@ -107,6 +112,21 @@ class CNLiveMineAddInfoViewController : CNLiveBaseViewController, UITableViewDel
         }
     }
+    func loadData() {
+        CNLiveMineViewModel.requestMessage { [weak self] result, respStatue in
+            self!.network_type = respStatue
+            if respStatue == .success {
+                DispatchQueue.main.asyncAfter(deadline: .now()+2) {
+                    self!.listArray = (result as! NewsModel).list
+                    self!.tableView.reloadData()
+                }
+            }else{
+                self!.tableView.reloadEmptyDataSet()
+            }
+        }
+    }
+    
+    
     @objc func noteSetAction() {
     }
@@ -117,23 +137,52 @@ class CNLiveMineAddInfoViewController : CNLiveBaseViewController, UITableViewDel
 extension CNLiveMineAddInfoViewController {
     func image(forEmptyDataSet scrollView: UIScrollView!) -> UIImage! {
-        return UIImage(named: "mine_list_source_empty")
+        if network_type == .failed  || network_type == .unkonw {
+            return UIImage(named: "mine_list_source_unusual_failed")
+        }
+        if _show_type == .message && listArray.count == 0 {
+            return UIImage(named: "mine_list_source_unusual_empty")
+        }
+        if network_type == .noNetwork {
+            return UIImage(named: "mine_list_source_unusual_noNet")
+        }
+        return UIImage(named: "mine_list_source_unusual_empty")
     }
     func title(forEmptyDataSet scrollView: UIScrollView!) -> NSAttributedString! {
         var defult_string = ""
+        if network_type == .failed  || network_type == .unkonw {
+            defult_string = "接口请求错误,刷新试试～"
+        }
+        if network_type == .noNetwork {
+            defult_string = "网络开小差了,刷新试试～"
+        }
         switch _show_type {
         case .add:
             defult_string = "暂时没有可添加的身份～"
         case .info:
             defult_string = "暂时没有身份信息～"
         case .message:
-            defult_string = "暂时没有可读的消息～"
+            if listArray.count == 0 && network_type == .success{
+                defult_string = "暂时没有可读的消息～"
+            }
         case .none:
             break
         }
         return NSAttributedString(string: defult_string, attributes: [.font: Font_17,.foregroundColor: HexColor("#666666")!])
     }
+    func buttonTitle(forEmptyDataSet scrollView: UIScrollView!, for state: UIControl.State) -> NSAttributedString! {
+        if _show_type == .message && (network_type == .failed || network_type == .noNetwork) {
+            let attributes = [NSAttributedString.Key.font:Font_16_Fit,
+                              NSAttributedString.Key.foregroundColor: HexColor("#609BFF")]
+            return NSAttributedString(string: "刷新", attributes: attributes as [NSAttributedString.Key : Any])
+        }
+        return nil
+    }
+    
+    func emptyDataSet(_ scrollView: UIScrollView!, didTap button: UIButton!) {
+        loadData()
+    }
 }
@@ -143,6 +192,9 @@ extension CNLiveMineAddInfoViewController {
         return 1
     }
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        if _show_type == .message {
+            return listArray.count
+        }
         return dataArray.count
     }
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
@@ -159,8 +211,8 @@ extension CNLiveMineAddInfoViewController {
             guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveMineStandInfoTableViewIdentifier) as? MineStandInfoTableViewCell else {
                 return MineStandInfoTableViewCell()
             }
-            let dict = dataArray[indexPath.row] as! Dictionary<String, Any>
-            cell.setupWithDataSource(icon: dict["image"] as! String, name: dict["name"] as! String,number: dict["number"] as! String, time: dict["time"] as! String)
+            let listModel = listArray[indexPath.row]
+            cell.setupWithDataSource(icon: listModel.poster, name: listModel.title,number: listModel.subTitle, time: listModel.createTimeString)
             cell.userInteractionEnabledWhileDragging = true
             return cell
         } else {
@@ -173,6 +225,12 @@ extension CNLiveMineAddInfoViewController {
             return cell
         }
     }
+    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+        if _show_type == .message {
+            let listModel = listArray[indexPath.row]
+            self.navigationController?.pushViewController(CNLiveMineMessageViewController.init(listModel: listModel), animated: true)
+        }
+    }
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
         return 100
     }
@@ -123,10 +123,12 @@ class CNLiveMineInfoViewController: CNLiveBaseViewController, PhotoPickerControl
     }
     @objc func changeSendAction() {
-        CNLiveMineViewModel.requestUploadIconAction(_select_image) { [self] in
-            //再这里进行图片上传
-            self.reslut(_select_image)
-            self.navigationController?.popViewController(animated: true)
+        CNLiveMineViewModel.requestUploadIconAction(_select_image) { [weak self] statue in
+            if statue {
+                //再这里进行图片上传
+                self!.reslut(self!._select_image)
+                self!.navigationController?.popViewController(animated: true)
+            }
         }
     }
@@ -153,17 +155,17 @@ extension CNLiveMineInfoViewController {
     func pickerController(_ pickerController: PhotoPickerController,
                             didFinishSelection result: PickerResult) {
-        result.getImage { [self] (image, photoAsset, index) in
+        result.getImage { [weak self] (image, photoAsset, index) in
             if let image = image {
-                _select_image = image
+                self!._select_image = image
             }else {
                 print("failed")
             }
-        } completionHandler: { [self] (images) in
-            imageView.image = images.first
-            cancelBtn.isHidden = false
-            sendBtn.isHidden = false
-            changeBtn.isHidden = true
+        } completionHandler: { [weak self] (images) in
+            self!.imageView.image = images.first
+            self!.cancelBtn.isHidden = false
+            self!.sendBtn.isHidden = false
+            self!.changeBtn.isHidden = true
         }
     }
 }
+//
+//  CNLiveMineMessageViewController.swift
+//  metaCode
+//
+//  Created by open on 2023/6/20.
+//
+
+import Foundation
+
+class CNLiveMineMessageViewController: CNLiveBaseViewController, UITableViewDelegate, UITableViewDataSource {
+    
+    let kCNLiveMineMessageIdentifier = "kCNLiveMineMessageIdentifier"
+    var _listModel : NewsListModel!
+    init(listModel: NewsListModel) {
+        super.init(nibName: nil, bundle: nil)
+        _listModel = listModel
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    lazy var tableView: UITableView = {
+        let tableView = UITableView(frame: .zero, style: .plain)
+        tableView.backgroundColor = HexColor("#F7F8FA")
+        tableView.delegate = self
+        tableView.dataSource = self
+        tableView.separatorStyle = .none
+        tableView.tableFooterView = UIView.init()
+        tableView.tableHeaderView = UIView.init()
+        tableView.register(MessageDescTableViewCell.self, forCellReuseIdentifier: kCNLiveMineMessageIdentifier)
+        return tableView
+    }()
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        navigationBarHidden = false
+        titleName = _listModel.title
+        
+        view.addSubview(tableView)
+        tableView.snp.makeConstraints { make in
+            make.top.equalTo(get_system_nav_height())
+            make.left.right.bottom.equalToSuperview()
+        }
+    }
+    
+}
+
+extension CNLiveMineMessageViewController {
+    func numberOfSections(in tableView: UITableView) -> Int {
+        return 1
+    }
+    
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        return 1
+    }
+    
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveMineMessageIdentifier) as? MessageDescTableViewCell else {
+            return MessageDescTableViewCell()
+        }
+        cell.setupWithDataSource(listModel: _listModel)
+        return cell
+    }
+    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        return 100 + _listModel.textHeight
+    }
+    
+}
@@ -86,10 +86,12 @@ class CNLiveMineNickViewController: CNLiveBaseViewController, UITextFieldDelegat
     @objc func clickSaveAction() {
-        CNLiveMineViewModel.requestUpdateUserInfoAction(type: .nickName, value: nickField.text ?? "", resultBlock: { [self] in
-            let userInfo = UserInfoManager.shared.userInfo
-            userInfo.nickName = nickField.text ?? ""
-            UserInfoManager.cacheUserInfo(userInfo: userInfo)
+        CNLiveMineViewModel.requestUpdateUserInfoAction(type: .nickName, value: nickField.text ?? "", resultBlock: { [weak self] result in
+            if result {
+                let userInfo = UserInfoManager.shared.userInfo
+                userInfo.nickName = self!.nickField.text ?? ""
+                UserInfoManager.cacheUserInfo(userInfo: userInfo)
+            }
         })
     }
@@ -287,13 +287,13 @@ extension CNLiveTypeFeedBackViewController {
                 self.navigationController?.pushViewController(mineInfoVC, animated: true)
             }
             if indexPath.section == 2 {
-                MineInfoAlertView.showSelectView(showType: .gender) { [self] text in
-                    updateWithDataSource()
+                MineInfoAlertView.showSelectView(showType: .gender) { [weak self] text in
+                    self!.updateWithDataSource()
                 }
             }
             if indexPath.section == 3 {
-                MineInfoAlertView.showSelectView(showType: .birthday) { [self] text in
-                    updateWithDataSource()
+                MineInfoAlertView.showSelectView(showType: .birthday) { [weak self] text in
+                    self!.updateWithDataSource()
                 }
             }
         }
@@ -139,7 +139,7 @@ class MineAboutHeaderView: UIView {
 }
-typealias ClickResultBlock = (_ index: String) ->Void
+typealias ClickResultBlock = (_ index: String,_ imageUrl: String) ->Void
 class MinePhotoUploadView: UIView, PhotoPickerControllerDelegate {
     lazy var imageView01: UIImageView = {
@@ -252,22 +252,34 @@ extension MinePhotoUploadView {
     func pickerController(_ pickerController: PhotoPickerController,
                             didFinishSelection result: PickerResult) {
-        result.getImage { [self] (image, photoAsset, index) in
+        result.getImage { [weak self] (image, photoAsset, index) in
             if let image = image {
-                temp_imageView.image = image
-                if temp_imageView == imageView01 {
-                    imageView02.isHidden = false
-                    selectedImages.replaceObject(at: 0, with: image)
-                    _resutBlock!("1")
+                self!.temp_imageView.image = image
+                if self!.temp_imageView == self!.imageView01 {
+                    UploadManager.uploadImage(imageData: image.jpegData(compressionQuality: 1.0)! as NSData, progressBlock: {key, progress in
+                        print("获取进度==>\(progress)")
+                    }, successBlock: { [weak self] key,url in
+                        self!.imageView02.isHidden = false
+                        self!.selectedImages.replaceObject(at: 0, with: image)
+                        self!._resutBlock!("1",url)
+                    })
                 }
-                if temp_imageView == imageView02 {
-                    imageView03.isHidden = false
-                    selectedImages.replaceObject(at: 1, with: image)
-                    _resutBlock!("2")
+                if self!.temp_imageView == self!.imageView02 {
+                    UploadManager.uploadImage(imageData: image.jpegData(compressionQuality: 1.0)! as NSData, progressBlock: {key, progress in
+                        print("获取进度==>\(progress)")
+                    }, successBlock: { [weak self] key,url in
+                        self!.imageView03.isHidden = false
+                        self!.selectedImages.replaceObject(at: 1, with: image)
+                        self!._resutBlock!("2",url)
+                    })
                 }
-                if temp_imageView == imageView03 {
-                    selectedImages.replaceObject(at: 2, with: image)
-                    _resutBlock!("3")
+                if self!.temp_imageView == self!.imageView03 {
+                    UploadManager.uploadImage(imageData: image.jpegData(compressionQuality: 1.0)! as NSData, progressBlock: {key, progress in
+                        print("获取进度==>\(progress)")
+                    }, successBlock: { [weak self] key,url in
+                        self!.selectedImages.replaceObject(at: 2, with: image)
+                        self!._resutBlock!("3",url)
+                    })
                 }
             }else {
                 print("failed")
@@ -310,16 +310,18 @@ class MineInfoAlertView: UIView {
         if type == .gender {
             value = gender ?? ""
         }
-        CNLiveMineViewModel.requestUpdateUserInfoAction(type: type!, value: value) { [self] in
-            let userInfo = UserInfoManager.shared.userInfo
-            if type == .gender {
-                userInfo.gender = (value  == "m" ? "男" : "女")
-            }
-            if type == .birthday {
-                userInfo.birthday = value
+        CNLiveMineViewModel.requestUpdateUserInfoAction(type: type!, value: value) { [weak self] statue in
+            if statue {
+                let userInfo = UserInfoManager.shared.userInfo
+                if self!.type == .gender {
+                    userInfo.gender = (value  == "m" ? "男" : "女")
+                }
+                if self!.type == .birthday {
+                    userInfo.birthday = value
+                }
+                UserInfoManager.cacheUserInfo(userInfo: userInfo)
+                self!.result!(value)
             }
-            UserInfoManager.cacheUserInfo(userInfo: userInfo)
-            result!(value)
         }
     }
@@ -343,3 +345,184 @@ class MineInfoAlertView: UIView {
         gender = "m"
     }
 }
+
+
+class UpdataAlertView: UIView {
+    
+    lazy var grayMaskView: UIView = {
+       let grayMaskView = UIView()
+       grayMaskView.backgroundColor = UIColor.black.withAlphaComponent(0.2)
+       return grayMaskView
+    }()
+    
+    lazy var backView: UIView = {
+        let backView = UIView()
+        backView.backgroundColor = .clear
+        backView.layer.cornerRadius = 15
+        backView.layer.masksToBounds = true
+        return backView
+    }()
+    
+    lazy var contentView : UIView = {
+        let contentView = UIView.init()
+        contentView.backgroundColor = .white
+        contentView.layer.cornerRadius = 15
+        contentView.clipsToBounds = true
+        return contentView
+    }()
+    
+    lazy var headerView: UIImageView = {
+        let headerView = UIImageView.init()
+        headerView.backgroundColor = .clear
+        headerView.image = UIImage(named: "main_apper_alert_header_updata")
+        headerView.contentMode = .scaleToFill
+        return headerView
+    }()
+    
+    lazy var versionLabel: UILabel = {
+        let versionLabel = UILabel.init()
+        versionLabel.backgroundColor = .clear
+        versionLabel.textColor = .white
+        versionLabel.font = BoldFont_18_Fit
+        return versionLabel
+    }()
+    
+    lazy var descLabel: UILabel = {
+        let descLabel = UILabel.init()
+        descLabel.textColor = HexColor("#333333")
+        descLabel.font = Font_15
+        descLabel.lineBreakMode = .byWordWrapping
+        descLabel.numberOfLines = 0
+        return descLabel
+    }()
+    
+    lazy var updataButton: UIButton = {
+        let updataButton = UIButton(type: .custom)
+        updataButton.setTitle("立即更新", for: .normal)
+        updataButton.setTitleColor(.white, for: .normal)
+        updataButton.titleLabel?.font = BoldFont_16_Fit
+        updataButton.layer.cornerRadius = 20
+        updataButton.layer.masksToBounds = true
+        updataButton.addTarget(self, action: #selector(sendLoginActionMothod), for: .touchUpInside)
+        return updataButton
+    }()
+    
+    lazy var cancelButton: UIButton = {
+        let cancelButton = UIButton(type: .custom)
+        cancelButton.setTitleColor(HexColor("#999999"), for: .normal)
+        cancelButton.setTitle("下次再说", for: .normal)
+        cancelButton.titleLabel?.font = Font_13
+        cancelButton.backgroundColor = .white
+        cancelButton.addTarget(self, action: #selector(setupCloseButtonAction), for: .touchUpInside)
+        return cancelButton
+    }()
+    
+    var _updateModel: UpdateInfoModel?
+    init(frame: CGRect, updateModel: UpdateInfoModel) {
+        super.init(frame: frame)
+        
+        _updateModel = updateModel
+        addSubview(grayMaskView)
+        addSubview(backView)
+        backView.addSubview(headerView)
+        headerView.addSubview(versionLabel)
+        backView.addSubview(contentView)
+        contentView.addSubview(descLabel)
+        contentView.addSubview(updataButton)
+        contentView.addSubview(cancelButton)
+        
+        cancelButton.isHidden = ((_updateModel?.isForce) == nil)
+        versionLabel.text = updateModel.version
+        
+        let paraph = NSMutableParagraphStyle()
+        paraph.lineSpacing = 10
+        let attributes = [NSAttributedString.Key.font:Font_16_Fit,
+                          NSAttributedString.Key.paragraphStyle: paraph]
+        descLabel.attributedText = NSAttributedString(string: updateModel.upgradePoint, attributes: attributes)
+        
+        
+        setConstraints()
+    }
+    
+    func setConstraints() {
+        grayMaskView.snp.makeConstraints { make in
+            make.edges.equalToSuperview()
+        }
+        backView.snp.makeConstraints { make in
+            make.center.equalToSuperview()
+            make.width.equalTo(KSreenWidth - 60)
+            make.height.equalTo((KSreenWidth - 60) * 1.4)
+        }
+        headerView.snp.makeConstraints { make in
+            make.centerX.equalToSuperview()
+            make.top.left.right.equalToSuperview()
+            make.height.equalTo(200)
+        }
+        versionLabel.snp.makeConstraints { make in
+            make.left.equalToSuperview().offset(23)
+            make.bottom.equalToSuperview().offset(-55)
+        }
+        contentView.snp.makeConstraints { make in
+            make.centerX.equalToSuperview()
+            make.top.equalTo(headerView.snp.bottom).offset(-15)
+            make.left.right.equalToSuperview()
+            make.height.equalTo((KSreenWidth - 60) * 1.4 - 185)
+        }
+        descLabel.snp.makeConstraints { make in
+            make.centerX.equalToSuperview()
+            make.top.equalToSuperview().offset(45)
+            make.left.equalToSuperview().offset(20)
+            make.right.equalToSuperview().offset(-20)
+        }
+        cancelButton.snp.makeConstraints { make in
+            make.centerX.equalToSuperview()
+            make.bottom.equalToSuperview().offset(-20)
+            make.width.equalTo(KSreenWidth - 100)
+            make.height.equalTo(20)
+        }
+        updataButton.snp.makeConstraints { make in
+            make.centerX.equalToSuperview()
+            if ((_updateModel?.isForce) == nil) {
+                make.bottom.equalToSuperview().offset(-30)
+            } else {
+                make.bottom.equalToSuperview().offset(-50)
+            }
+            make.left.equalToSuperview().offset(30)
+            make.right.equalToSuperview().offset(-30)
+            make.height.equalTo(40)
+        }
+
+        updataButton.setGradient(colors: [UIColor(red: 103/255.0, green: 197/255.0, blue: 255/255.0, alpha: 1),UIColor(red: 96/255.0, green: 154/255.0, blue: 255/255.0, alpha: 1)], startPoint: CGPoint(x: 0, y: 0.5), endPoint: CGPoint(x: 1, y: 0.5))
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    static public func showUpdataView(updataModel: UpdateInfoModel){
+        
+        let updateView = UpdataAlertView(frame: .zero, updateModel: updataModel)
+        
+        let window = UIApplication.shared.windows.last
+        window?.addSubview(updateView)
+        updateView.snp.makeConstraints { make in
+            make.edges.equalToSuperview()
+        }
+        window?.layoutIfNeeded()
+        updateView.alpha = 0
+        UIView.animate(withDuration: 0.1) {
+            updateView.alpha = 1
+        }
+    }
+    
+    
+    @objc func sendLoginActionMothod() -> Void {
+        print("跳转到appstore")
+        showMessage(message: "跳转到AppStore")
+    }
+    
+    @objc func setupCloseButtonAction() -> Void {
+        removeFromSuperview()
+    }
+    
+}
@@ -146,7 +146,11 @@ class MineStandInfoTableViewCell: UITableViewCell {
     }
     public func setupWithDataSource(icon: String, name: String,number: String, time: String) {
-        iconView.image = UIImage(named: icon)
+        if !icon.isEmpty {
+            iconView.kf.setImage(with: URL(string: icon), placeholder: UIImage.imageWithColor(color: HexColor("#f9f9f9")!, size: CGSize(width: 40, height: 40)))
+        } else {
+            iconView.image = UIImage.imageWithColor(color: HexColor("#f9f9f9")!, size: CGSize(width: 40, height: 40))
+        }
         titleLabel.text = name
         numberLabel.text = number
         timeLabel.text = time
@@ -259,3 +263,152 @@ class MineFeedBackListCollectViewCell : UICollectionViewCell {
         fatalError("init(coder:) has not been implemented")
     }
 }
+
+
+class MessageDescTableViewCell: UITableViewCell {
+    
+    lazy var timeLabel: UILabel = {
+        let timeLabel = UILabel.init()
+        timeLabel.textColor = HexColor("#9F9F9F")
+        timeLabel.font = Font_13
+        timeLabel.textAlignment = .center
+        return timeLabel
+    }()
+    
+    lazy var iconView: UIImageView = {
+        let iconView = UIImageView.init()
+        iconView.backgroundColor = .white
+        iconView.layer.cornerRadius = 20
+        iconView.layer.masksToBounds = true
+        iconView.contentMode = .scaleToFill
+        iconView.image = UIImage.imageWithColor(color: .red, size: CGSizeMake(40, 40))
+        return iconView
+    }()
+    
+    lazy var cView: UIView = {
+        let cView = UIView.init()
+        cView.backgroundColor = .white
+        cView.layer.cornerRadius = 10
+        cView.layer.masksToBounds = true
+        return cView
+    }()
+    
+    lazy var contentLabel: UILabel = {
+        let contentLabel = UILabel.init()
+        contentLabel.backgroundColor = .white
+        contentLabel.textColor = HexColor("#666666")
+        contentLabel.lineBreakMode = .byCharWrapping
+        contentLabel.numberOfLines = 0
+        contentLabel.font = Font_14_Fit
+        return contentLabel
+    }()
+    
+    lazy var lineLabel: UILabel = {
+        let lineLabel = UILabel.init()
+        lineLabel.backgroundColor = HexColor("#EAEAEA")
+        return lineLabel
+    }()
+    
+    lazy var textButton: UIButton = {
+        let textButton = UIButton.init(type: .custom)
+        textButton.setTitle("查看详情", for: .normal)
+        textButton.setTitleColor(HexColor("#609BFF"), for: .normal)
+        textButton.titleLabel?.font = Font_13
+        textButton.addTarget(self, action: #selector(textButtonAction), for: .touchUpInside)
+        return textButton
+    }()
+    
+    lazy var textView: UIImageView = {
+        let textView = UIImageView.init()
+        textView.image = UIImage(named: "mine_header_message_blue_more")
+        textView.contentMode = .scaleToFill
+        textView.backgroundColor = .white
+        return textView
+    }()
+    
+    
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+        self.selectionStyle = .none
+        self.backgroundColor = .clear
+        
+        addSubview(timeLabel)
+        addSubview(iconView)
+        addSubview(cView)
+        cView.addSubview(contentLabel)
+        cView.addSubview(lineLabel)
+        cView.addSubview(textButton)
+        cView.addSubview(textView)
+     
+        setConstraints()
+    }
+    
+    func setConstraints() {
+        timeLabel.snp.makeConstraints { make in
+            make.centerX.equalToSuperview()
+            make.top.equalToSuperview().offset(10)
+        }
+        iconView.snp.makeConstraints { make in
+            make.top.equalTo(timeLabel.snp.bottom).offset(10)
+            make.left.equalToSuperview().offset(10)
+            make.size.equalTo(40)
+        }
+        cView.snp.makeConstraints { make in
+            make.top.equalTo(timeLabel.snp.bottom).offset(10)
+            make.left.equalTo(iconView.snp.right).offset(10)
+            make.right.equalToSuperview().offset(-30)
+            make.height.equalTo(0)
+        }
+        textButton.snp.makeConstraints { make in
+            make.bottom.equalToSuperview().offset(-10)
+            make.right.equalToSuperview().offset(-20)
+            make.height.equalTo(20)
+        }
+        textView.snp.makeConstraints { make in
+            make.centerY.equalTo(textButton)
+            make.height.equalTo(10)
+            make.right.equalToSuperview().offset(-10)
+            make.width.equalTo(5)
+        }
+        lineLabel.snp.makeConstraints { make in
+            make.bottom.equalTo(textButton.snp.top).offset(-10)
+            make.left.equalToSuperview().offset(10)
+            make.right.equalToSuperview().offset(-10)
+            make.height.equalTo(1)
+        }
+        contentLabel.snp.makeConstraints { make in
+            make.left.top.equalToSuperview().offset(10)
+            make.right.equalToSuperview().offset(-10)
+            make.width.equalTo(KSreenWidth - 110)
+            make.height.equalTo(0)
+        }
+    }
+    
+    public func setupWithDataSource(listModel: NewsListModel) {
+        let paraph = NSMutableParagraphStyle()
+        paraph.lineSpacing = 10
+        let attributes = [NSAttributedString.Key.font:Font_16_Fit,
+                          NSAttributedString.Key.paragraphStyle: paraph]
+        contentLabel.attributedText = NSAttributedString(string: listModel.content, attributes: attributes)
+        timeLabel.text = listModel.timeString
+        if listModel.poster.isEmpty {
+            iconView.image = UIImage.imageWithColor(color: .red, size: CGSizeMake(40, 40))
+        } else {
+            iconView.kf.setImage(with: URL(string: listModel.poster), placeholder: UIImage.imageWithColor(color: .red, size: CGSizeMake(40, 40)))
+        }
+        cView.snp.updateConstraints { make in
+            make.height.equalTo(listModel.textHeight + 60)
+        }
+        contentLabel.snp.updateConstraints { make in
+            make.height.equalTo(listModel.textHeight)
+        }
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    @objc func textButtonAction() {
+        
+    }
+}
+//
+//  CNLiveMineBaseModel.swift
+//  metaCode
+//
+//  Created by open on 2023/6/20.
+//
+
+import Foundation
+import HandyJSON
+
+
+class UpdateInfoModel: BaseModel {
+    
+    required init() {}
+    
+    var id:String = ""
+    var appId:String = ""
+    var appType:String = ""
+    var version:String = ""
+    var versionCode:String = ""
+    var isForce:Bool = false//是不是强制更新
+    var apkUrl:String = ""
+    var upgradePoint:String = ""
+    var status:String = ""
+    var createTime:String = ""
+}
+
+class NewsModel: BaseModel {
+    required init() {}
+    
+    var prePage: Int = 0
+    var pageSize: Int = 0
+    var startRow: Int = 0
+    var navigateLastPage: Int = 0
+    var firstPage: Int = 0
+    var nextPage: Int = 0
+    var size: Int = 0
+    var endRow: Int = 0
+    var isLastPage: Bool = false
+    var hasNextPage: Bool = false
+    var navigateFirstPage: Int = 0
+    var lastPage: Int = 0
+    var total: Int = 0
+    var list = [NewsListModel]()
+    var navigatepageNums = [Int]()
+    var isFirstPage: Bool = false
+    var hasPreviousPage: Bool = false
+    var navigatePages: Int = 0
+    var pageNum: Int = 0
+    var pages: Int = 0
+}
+
+
+class NewsListModel: BaseModel {
+    var content: String = ""
+    var status: Int = 0
+    var id: Int = 0
+    var poster: String = ""
+    var title: String = ""
+    var sid: String = ""
+    var createTime: Int = 0
+    var createTimeString: String = ""
+    var timeString: String = ""
+    var subTitle: String = ""
+    var read: Bool = false
+    
+    var textHeight: CGFloat {
+        get {
+            let paraph = NSMutableParagraphStyle()
+            paraph.lineSpacing = 10
+            let attributes = [NSAttributedString.Key.font:Font_16_Fit,
+                              NSAttributedString.Key.paragraphStyle: paraph]
+            let h = content.boundingRect(with: CGSize(width: KSreenWidth - 110, height: CGFloat(MAXFLOAT)), options: .usesLineFragmentOrigin, attributes: attributes, context: nil).size.height
+            return h
+        }
+    }
+    
+    override func mapping(mapper: HelpingMapper) {
+        mapper <<<
+            self.createTime <-- TransformOf(fromJSON: { [weak self] (raw) -> Int in
+                if (raw ?? 0)! > 0 {
+                    let date = NSDate(timeIntervalSince1970: TimeInterval((raw!)/1000))
+                    let dateFormatter = DateFormatter()
+                    dateFormatter.locale = Locale.init(identifier: "zh_CN")
+                    dateFormatter.dateFormat = "MM-dd"
+                    self?.createTimeString = dateFormatter.string(from: date as Date)
+                    let dateFormatter_time = DateFormatter()
+                    dateFormatter_time.locale = Locale.init(identifier: "zh_CN")
+                    dateFormatter_time.dateFormat = "yyyy年MM月dd日 HH:mm"
+                    self?.timeString = dateFormatter_time.string(from: date as Date)
+                }
+                return raw!
+            }, toJSON: { (tuple) -> Int? in
+                return tuple
+            })
+//        mapper <<<
+//            self.content <-- TransformOf(fromJSON: { result -> String in
+//                return result! + "金正恩和老兵有说有笑，欣赏着精彩绝伦的烟花表演，一起憧憬朝鲜走向繁荣富强。金正恩最后面向全体朝鲜老兵进行90度的鞠躬，再次对他们表达深深的尊重和感激。他没有忘记为国家立下汗马功劳的朝鲜老兵，更没有忘记老一辈。"
+//            }, toJSON: { result -> String? in
+//                return result
+//            })
+    }
+}
@@ -15,16 +15,21 @@ enum CNLiveMineRequestType {
     case location
     case birthday
 }
-// 成功
-typealias resultSuccessBlock = () -> Void
-
+enum CNLiveMineResponseType {
+    case success
+    case failed
+    case noNetwork
+    case unkonw
+}
+typealias resultBlock = (_ result: Bool) -> Void
+typealias resultNewsBlock = (_ result: Any,_ respStatue :CNLiveMineResponseType) -> Void
 class CNLiveMineViewModel: NSObject {
     /// 提交更新用户单项数据
     /// - Parameters:
     ///   - type: nickName-昵称，gender-性别，email-邮箱, location-联系方式,birthday-生日yyyy-MM-dd
     ///   - value: 对应的信息，性别，m：男、f：女、n：未知
-    static func requestUpdateUserInfoAction(type: CNLiveMineRequestType,value: String, resultBlock: @escaping resultSuccessBlock) {
+    static func requestUpdateUserInfoAction(type: CNLiveMineRequestType,value: String, resultBlock: @escaping resultBlock) {
         let param = NSMutableDictionary.init()
         if type == .nickName {
@@ -60,12 +65,14 @@ class CNLiveMineViewModel: NSObject {
                 let errorCode = resp["errorCode"]
                 if (errorCode as! String == "0") {
                     showMessage(message: "更改成功")
-                    resultBlock()
+                    resultBlock(true)
                 } else {
                     showMessage(message: resp["errorMessage"] as! String)
+                    resultBlock(false)
                 }
             } else {
                 showMessage(message: "修改信息失败")
+                resultBlock(false)
             }
         }
     }
@@ -75,47 +82,53 @@ class CNLiveMineViewModel: NSObject {
     /// - Parameters:
     ///   - image: 头像
     ///   - resultBlock: 返回
-    static func requestUploadIconAction(_ image: UIImage,resultBlock: @escaping resultSuccessBlock) {
+    static func requestUploadIconAction(_ image: UIImage,resultBlock: @escaping resultBlock) {
-        CNLiveMineViewModel.requestAccessTokenAction() {
-            let param = NSMutableDictionary.init()
-            param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "uid")
-            param.setValue(UserInfoManager.shared.userInfo.token, forKey: "token")
-            param.setValue(UserInfoManager.shared.userInfo.access_token, forKey: "access_token")
-            showLoading(message: "修改头像中...")
-            CNLiveNetworking.setAllowRequestDefaultArgument(true)
-            CNLiveNetworking.setupShowDataResult(false)
-            CNLiveNetworking.uploadNetwork(withURLString: "/open/api2/user/updateUserFaceById", param: param as? [AnyHashable : Any]) { formData in
-                let imageData = image.jpegData(compressionQuality: 1.0)
-                formData?.appendPart(withFileData: imageData! as Data, name: "face", fileName: ".jpg", mimeType: "image/jpg")
-            } progressBlock: { progress in
-                print("已上传==>\(progress!.fractionCompleted*100)")
-            } completionBlock: { task, result, error in
-                hiddenLoading()
-                if (error == nil) {
-                    let resp = result as! NSDictionary
-                    let errorCode = resp["errorCode"]
-                    if (errorCode as! String == "0") {
-                        showMessage(message: "头像更改成功")
-                        let data = resp["data"] as! Dictionary<String, Any>
-                        let userInfo = UserInfoManager.shared.userInfo
-                        userInfo.faceUrl = data["faceUrl"] as! String
-                        userInfo.bigFaceUrl = data["bigFaceUrl"] as! String
-                        UserInfoManager.cacheUserInfo(userInfo: userInfo)
-                        resultBlock()
+        CNLiveMineViewModel.requestAccessTokenAction() { result in
+            if result {
+                let param = NSMutableDictionary.init()
+                param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "uid")
+                param.setValue(UserInfoManager.shared.userInfo.token, forKey: "token")
+                param.setValue(UserInfoManager.shared.userInfo.access_token, forKey: "access_token")
+                showLoading(message: "修改头像中...")
+                CNLiveNetworking.setAllowRequestDefaultArgument(true)
+                CNLiveNetworking.setupShowDataResult(false)
+                CNLiveNetworking.uploadNetwork(withURLString: "/open/api2/user/updateUserFaceById", param: param as? [AnyHashable : Any]) { formData in
+                    let imageData = image.jpegData(compressionQuality: 1.0)
+                    formData?.appendPart(withFileData: imageData! as Data, name: "face", fileName: ".jpg", mimeType: "image/jpg")
+                } progressBlock: { progress in
+                    print("已上传==>\(progress!.fractionCompleted*100)")
+                } completionBlock: { task, result, error in
+                    hiddenLoading()
+                    if (error == nil) {
+                        let resp = result as! NSDictionary
+                        let errorCode = resp["errorCode"]
+                        if (errorCode as! String == "0") {
+                            showMessage(message: "头像更改成功")
+                            let data = resp["data"] as! Dictionary<String, Any>
+                            let userInfo = UserInfoManager.shared.userInfo
+                            userInfo.faceUrl = data["faceUrl"] as! String
+                            userInfo.bigFaceUrl = data["bigFaceUrl"] as! String
+                            UserInfoManager.cacheUserInfo(userInfo: userInfo)
+                            resultBlock(true)
+                        } else {
+                            showMessage(message: resp["errorMessage"] as! String)
+                            resultBlock(false)
+                        }
                     } else {
-                        showMessage(message: resp["errorMessage"] as! String)
+                        showMessage(message: "头像更改成功")
+                        resultBlock(false)
                     }
-                } else {
-                    showMessage(message: "头像更改成功")
                 }
+            } else {
+                resultBlock(false)
             }
         }
     }
     /// 获取access_token
     /// - Parameter resultBlock: 结果返回
-    static func requestAccessTokenAction(resultBlock: @escaping resultSuccessBlock) {
+    static func requestAccessTokenAction(resultBlock: @escaping resultBlock) {
         //当前时间大于最大允许时间则表明当前access_token已经过期需要重新请求
         if CNLiveMineViewModel.timeStamp > NSNumber(string: UserInfoManager.shared.userInfo.expires_in)?.intValue ?? 0 {
             let param = NSMutableDictionary.init()
@@ -136,16 +149,129 @@ class CNLiveMineViewModel: NSObject {
                         let expires_in = data["expires_in"] as! NSNumber
                         userInfo.expires_in = "\(expires_in.intValue+CNLiveMineViewModel.timeStamp)"
                         UserInfoManager.cacheUserInfo(userInfo: userInfo)
-                        resultBlock()
+                        resultBlock(true)
                     } else {
                         showMessage(message: resp["errorMessage"] as! String)
+                        resultBlock(false)
                     }
                 } else {
                     showMessage(message: "修改头像失败")
+                    resultBlock(false)
                 }
             }
         } else {
-            resultBlock()
+            resultBlock(false)
+        }
+    }
+    
+    /// 上传反馈意见接口
+    /// - Parameter resultBlock: 成功回调
+    static func requestFeedBack(text: String,contactWay: String,images: NSMutableArray,resultBlock: @escaping resultBlock) {
+        if (text.count == 0) {
+            showMessage(message: "反馈内容不能为空")
+            return
+        }
+        images.remove("")
+        let imageUrl = NSMutableString()
+        if images.count > 0 {
+            images.forEach { image_url in
+                imageUrl.append(image_url as! String)
+                imageUrl.append(",")
+            }
+            imageUrl.deleteCharacters(in: NSRange(location: imageUrl.length - 1, length: 1))
+        }
+        let param = NSMutableDictionary()
+        param.setValue(imageUrl, forKey: "images")
+        param.setValue(text, forKey: "text")
+        param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "sid")
+        param.setValue(contactWay, forKey: "contactWay")
+        param.setValue(UserInfoManager.shared.userInfo.nickName, forKey: "contactName")
+        param.setValue("", forKey: "category")
+        param.setValue("ios", forKey: "plat")
+        param.setValue(Bundle.main.infoDictionary?["CFBundleVersion"] as! String, forKey: "version")
+        param.setValue(UIDevice.current.identifierForVendor?.uuidString.replacingOccurrences(of: "-", with: "") ?? "", forKey: "deviceId")
+        showLoading(message: "")
+        CNLiveNetworking.setAllowRequestDefaultArgument(true)
+        CNLiveNetworking.setupShowDataResult(false)
+        CNLiveNetworking.requestNetwork(with: .POST, urlString: APPBaseMCUrl+"/commonApi/collectFeedback", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
+            hiddenLoading()
+            if (error == nil) {
+                let resp = result as! NSDictionary
+                let errorCode = "\(resp["errorCode"] ?? "0")"
+                if (errorCode == "0") {
+                    resultBlock(true)
+                } else {
+                    showMessage(message: resp["errorMessage"] as! String)
+                    resultBlock(false)
+                }
+            } else {
+                showMessage(message: "提交失败")
+                resultBlock(false)
+            }
+        }
+    }
+    
+    /// 获取系统消息
+    /// - Parameter resultBlock: 结果返回
+    static func requestMessage(resultBlock: @escaping resultNewsBlock) {
+        showLoading(message: "")
+        CNLiveNetworking.setAllowRequestDefaultArgument(true)
+        CNLiveNetworking.setupShowDataResult(false)
+        CNLiveNetworking.requestNetwork(with: .GET, urlString: APPBaseMCUrl+"/newsApi/getNews", param: ["sid":UserInfoManager.shared.userInfo.uid], cacheType: .networkOnly) { task, result, error in
+            hiddenLoading()
+            if (error == nil) {
+                let resp = result as! NSDictionary
+                let errorCode = "\(resp["errorCode"] ?? "0")"
+                if (errorCode == "0") {
+                    let newsModel = dictionaryToModel(resp as! [String : Any], NewsModel.self,"data") as! NewsModel
+                    resultBlock(newsModel,.success)
+                } else {
+                    showMessage(message: resp["errorMessage"] as! String)
+                    resultBlock(NSNull(),.failed)
+                }
+            } else {
+                if CNLiveNetworking.isNetworking() {
+                    showMessage(message: "获取失败")
+                    resultBlock(NSNull(),.failed)
+                } else {
+                    showMessage(message: "似乎与网络断开链接")
+                    resultBlock(NSNull(),.noNetwork)
+                }
+            }
+        }
+    }
+    
+    /// 获取最新app版本
+    /// - Parameter resultBlock: 结果回调
+    static func requestSystemNews(resultBlock: @escaping resultNewsBlock) {
+        let param = NSMutableDictionary()
+        param.setValue("2", forKey: "appType")
+        CNLiveNetworking.setAllowRequestDefaultArgument(true)
+        CNLiveNetworking.setupShowDataResult(false)
+        CNLiveNetworking.requestNetwork(with: .GET, urlString: APPBaseMCUrl+"/commonApi/getVersion", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
+            if (error == nil) {
+                let resp = result as! NSDictionary
+                let errorCode = "\(resp["errorCode"] ?? "0")"
+                if (errorCode == "0") {
+                    let userInfoModel = dictionaryToModel(resp as! [String : Any], UpdateInfoModel.self,"data") as! UpdateInfoModel
+                    let ver1 = "\(userInfoModel.version.split(separator: "_").last ?? "0")"
+                    let ver2 = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as! String
+                    print("获取的新版本号=>\(ver1),原来的版本号=>\(ver2)")
+                    if CNLiveMineViewModel.compare(v1: ver1, v2: ver2) {
+                        resultBlock(userInfoModel,.success)
+                    } else {
+                       print("没有新版本")
+                    }
+                } else {
+                    resultBlock(NSNull(),.failed)
+                }
+            } else {
+                if CNLiveNetworking.isNetworking() {
+                    resultBlock(NSNull(),.failed)
+                } else {
+                    resultBlock(NSNull(),.noNetwork)
+                }
+            }
         }
     }
@@ -155,4 +281,51 @@ class CNLiveMineViewModel: NSObject {
         let timeStamp = Int(timeInterval)
         return timeStamp
     }
+    
+    /// 比较版本大小,返回是否需要更新
+    /// - Parameters:
+    ///   - v1: 版本1-新版本
+    ///   - v2: 版本2-当前版本
+    /// - Returns: true:v1>v2  false: v1<=v2
+    static fileprivate func compare(v1: String, v2: String) -> Bool {
+        
+        if v1.isEmpty && v2.isEmpty || v1.isEmpty {
+            return false
+        }
+        
+        if v2.isEmpty {
+            return true
+        }
+        
+        let array1 = v1.components(separatedBy: ".")
+        let array2 = v2.components(separatedBy: ".")
+        let mineCount = array1.count > array2.count ? (array2.count - 1) : (array1.count - 1)
+        
+        var value1: Int = 0
+        var value2: Int = 0
+        
+        for i in 0...mineCount {
+            
+            if !(array1[i]).isPurnInt() || !(array2[i]).isPurnInt() {
+                return false
+            }
+            value1 = Int(array1[i])!
+            value2 = Int(array2[i])!
+            
+            //v1版本字段大于v2版本字段
+            if value1 > value2 {
+                return true
+            } else if (value1 < value2) {
+                return false
+            }
+            //v1版本==v2版本字段 继续循环
+        }
+        if array1.count > array2.count {
+            return true
+        } else if (array1.count <= array2.count) {
+            return false
+        }
+        return false
+    }
+    
 }
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "mine_header_message_blue_more@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "mine_header_message_blue_more@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "mine_list_source_unusual_failed@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "mine_list_source_unusual_failed@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "mine_list_source_unusual_noNet@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "mine_list_source_unusual_noNet@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "main_apper_alert_header_updata@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "main_apper_alert_header_updata@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}