提示toast 添加修改头像逻辑

liushiyu
1 parent f89b8f7b
Showing 23 changed files with 557 additions and 290 deletions
Podfile
metaCode.xcodeproj/project.pbxproj
metaCode/Classes/Common/Base/CNLiveBaseTabBarViewController.swift
metaCode/Classes/Common/Base/CNLiveBaseMoel.swift → metaCode/Classes/Common/Util/CNLiveCommonBaseModel.swift
metaCode/Classes/Common/Util/CNLiveCommonJsonUtil.swift
metaCode/Classes/Common/Util/CNLiveCommonQiniuTool.swift
metaCode/Classes/Config/CNLiveConfigUserInfo.swift
metaCode/Classes/CustomView/CNLiveTips.swift
metaCode/Classes/Extensions/NSObject+CNLiveCurrentVC.swift
metaCode/Classes/Extensions/UIButton+CNLiveExtension.swift
metaCode/Classes/Main/LoginPage/Controller/CNLiveLoginViewController.swift
metaCode/Classes/Main/LoginPage/View/CNLiveLoginPickerView.swift
metaCode/Classes/Main/LoginPage/ViewModel/CNLiveLoginModel.swift
metaCode/Classes/Main/LoginPage/ViewModel/CNLiveLoginViewModel.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveInfoShowViewController.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveMineInfoViewController.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveMineNickViewController.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveMineViewController.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveTypeFeedBackViewController.swift
metaCode/Classes/Main/MinePage/View/CNLiveMineHeaderView.swift
@@ -6,6 +6,7 @@ source &#39;https://cdn.cocoapods.org&#39;
 source 'http://bj.gitlab.cnlive.com/ios-team/CNLiveRepos.git'
 source 'http://bj.gitlab.cnlive.com/DSIOSTeam/DSSpecRepos.git'
+use_frameworks!
 target 'metaCode' do
   # Comment the next line if you don't want to use dynamic frameworks
@@ -26,10 +27,10 @@ target &#39;metaCode&#39; do
   pod 'MBProgressHUD'
   #模型转换工具
   pod 'HandyJSON'
-  #轻量级缓存工具
-  pod 'SwiftyUserDefaults'
   #图片视频选择器
   pod 'HXPHPicker'
+  #七牛
+  pod 'Qiniu'
   #加载GIF
   pod 'SwiftGifOrigin', '~> 1.7.0'
@@ -20,10 +20,12 @@
 		790D01A52A2DF65E00C5978D /* CNLiveLoginPickerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 790D01A42A2DF65E00C5978D /* CNLiveLoginPickerView.swift */; };
 		790D01A72A2DF84C00C5978D /* countries.plist in Resources */ = {isa = PBXBuildFile; fileRef = 790D01A62A2DF84C00C5978D /* countries.plist */; };
 		79282A3C2A2EDC2500B5F8CF /* NSString+CNLiveExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79282A3B2A2EDC2500B5F8CF /* NSString+CNLiveExtensions.swift */; };
-		79282A3E2A2EFDA000B5F8CF /* CNLiveLoginModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79282A3D2A2EFDA000B5F8CF /* CNLiveLoginModel.swift */; };
 		79282A402A2F055100B5F8CF /* CNLiveConfigUserInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79282A3F2A2F055100B5F8CF /* CNLiveConfigUserInfo.swift */; };
 		79282A442A2F1C1E00B5F8CF /* CNLiveLoginAuthView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79282A432A2F1C1E00B5F8CF /* CNLiveLoginAuthView.swift */; };
 		79282A462A2F457D00B5F8CF /* CNLiveMineViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79282A452A2F457D00B5F8CF /* CNLiveMineViewController.swift */; };
+		792E57D72A3AA2AC005834DB /* CNLiveCommonJsonUtil.swift in Sources */ = {isa = PBXBuildFile; fileRef = 792E57D62A3AA2AC005834DB /* CNLiveCommonJsonUtil.swift */; };
+		792E57D92A3AA2F2005834DB /* CNLiveCommonBaseModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 792E57D82A3AA2F2005834DB /* CNLiveCommonBaseModel.swift */; };
+		792E57DB2A3AE9F4005834DB /* CNLiveCommonQiniuTool.swift in Sources */ = {isa = PBXBuildFile; fileRef = 792E57DA2A3AE9F4005834DB /* CNLiveCommonQiniuTool.swift */; };
 		79396EED2A319F220053E1AF /* NSObject+CNLiveCurrentVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79396EEC2A319F220053E1AF /* NSObject+CNLiveCurrentVC.swift */; };
 		79396EF12A31C21B0053E1AF /* CNLiveInfoShowViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79396EF02A31C21B0053E1AF /* CNLiveInfoShowViewController.swift */; };
 		796398942A260C0100D045EB /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7963988D2A260C0100D045EB /* AppDelegate.swift */; };
@@ -35,7 +37,6 @@
 		798A44EE2A305AAC00815935 /* CNLiveBaseNavigationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 798A44ED2A305AAC00815935 /* CNLiveBaseNavigationController.swift */; };
 		798A44F02A305BC200815935 /* UIButton+CNLiveExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 798A44EF2A305BC200815935 /* UIButton+CNLiveExtension.swift */; };
 		798A44F22A30674200815935 /* CNLiveMineSubBodyListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 798A44F12A30674200815935 /* CNLiveMineSubBodyListView.swift */; };
-		798A44F62A3077ED00815935 /* CNLiveTips.swift in Sources */ = {isa = PBXBuildFile; fileRef = 798A44F42A3077ED00815935 /* CNLiveTips.swift */; };
 		798A44F72A3077ED00815935 /* CNLiveHotButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 798A44F52A3077ED00815935 /* CNLiveHotButton.swift */; };
 		798A44F92A30835400815935 /* CNLiveHelpFeedBackViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 798A44F82A30835400815935 /* CNLiveHelpFeedBackViewController.swift */; };
 		798A44FB2A30999900815935 /* CNLiveAlertTool.swift in Sources */ = {isa = PBXBuildFile; fileRef = 798A44FA2A30999900815935 /* CNLiveAlertTool.swift */; };
@@ -44,7 +45,6 @@
 		79A68C4A2A26E6CE00DC3B43 /* (null) in Sources */ = {isa = PBXBuildFile; };
 		79A68C4C2A26EA6000DC3B43 /* (null) in Sources */ = {isa = PBXBuildFile; };
 		79F4B1162A32B96B00993C03 /* CNLiveMineInfoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79F4B1152A32B96B00993C03 /* CNLiveMineInfoViewController.swift */; };
-		79F4B1182A32C5FA00993C03 /* CNLiveBaseMoel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79F4B1172A32C5FA00993C03 /* CNLiveBaseMoel.swift */; };
 		79F4B11A2A32F21400993C03 /* CNLiveMineNickViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79F4B1192A32F21400993C03 /* CNLiveMineNickViewController.swift */; };
 		79F4B11C2A33036E00993C03 /* CNLiveMineInfoAlertView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79F4B11B2A33036E00993C03 /* CNLiveMineInfoAlertView.swift */; };
 		7C2703302A36CBE30061EC50 /* CNCertificationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C27032F2A36CBE30061EC50 /* CNCertificationView.swift */; };
@@ -110,10 +110,12 @@
 		790D01A42A2DF65E00C5978D /* CNLiveLoginPickerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveLoginPickerView.swift; sourceTree = "<group>"; };
 		790D01A62A2DF84C00C5978D /* countries.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = countries.plist; sourceTree = "<group>"; };
 		79282A3B2A2EDC2500B5F8CF /* NSString+CNLiveExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSString+CNLiveExtensions.swift"; sourceTree = "<group>"; };
-		79282A3D2A2EFDA000B5F8CF /* CNLiveLoginModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveLoginModel.swift; sourceTree = "<group>"; };
 		79282A3F2A2F055100B5F8CF /* CNLiveConfigUserInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveConfigUserInfo.swift; sourceTree = "<group>"; };
 		79282A432A2F1C1E00B5F8CF /* CNLiveLoginAuthView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveLoginAuthView.swift; sourceTree = "<group>"; };
 		79282A452A2F457D00B5F8CF /* CNLiveMineViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveMineViewController.swift; sourceTree = "<group>"; };
+		792E57D62A3AA2AC005834DB /* CNLiveCommonJsonUtil.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveCommonJsonUtil.swift; sourceTree = "<group>"; };
+		792E57D82A3AA2F2005834DB /* CNLiveCommonBaseModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveCommonBaseModel.swift; sourceTree = "<group>"; };
+		792E57DA2A3AE9F4005834DB /* CNLiveCommonQiniuTool.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveCommonQiniuTool.swift; sourceTree = "<group>"; };
 		79396EEC2A319F220053E1AF /* NSObject+CNLiveCurrentVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSObject+CNLiveCurrentVC.swift"; sourceTree = "<group>"; };
 		79396EF02A31C21B0053E1AF /* CNLiveInfoShowViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveInfoShowViewController.swift; sourceTree = "<group>"; };
 		7963988D2A260C0100D045EB /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
@@ -125,7 +127,6 @@
 		798A44ED2A305AAC00815935 /* CNLiveBaseNavigationController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveBaseNavigationController.swift; sourceTree = "<group>"; };
 		798A44EF2A305BC200815935 /* UIButton+CNLiveExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIButton+CNLiveExtension.swift"; sourceTree = "<group>"; };
 		798A44F12A30674200815935 /* CNLiveMineSubBodyListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveMineSubBodyListView.swift; sourceTree = "<group>"; };
-		798A44F42A3077ED00815935 /* CNLiveTips.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CNLiveTips.swift; sourceTree = "<group>"; };
 		798A44F52A3077ED00815935 /* CNLiveHotButton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CNLiveHotButton.swift; sourceTree = "<group>"; };
 		798A44F82A30835400815935 /* CNLiveHelpFeedBackViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveHelpFeedBackViewController.swift; sourceTree = "<group>"; };
 		798A44FA2A30999900815935 /* CNLiveAlertTool.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveAlertTool.swift; sourceTree = "<group>"; };
@@ -133,7 +134,6 @@
 		798A44FE2A30A0A800815935 /* CNLiveInputFeedBackViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveInputFeedBackViewController.swift; sourceTree = "<group>"; };
 		79A68C512A26F59C00DC3B43 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = metaCode/Info.plist; sourceTree = "<group>"; };
 		79F4B1152A32B96B00993C03 /* CNLiveMineInfoViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveMineInfoViewController.swift; sourceTree = "<group>"; };
-		79F4B1172A32C5FA00993C03 /* CNLiveBaseMoel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveBaseMoel.swift; sourceTree = "<group>"; };
 		79F4B1192A32F21400993C03 /* CNLiveMineNickViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveMineNickViewController.swift; sourceTree = "<group>"; };
 		79F4B11B2A33036E00993C03 /* CNLiveMineInfoAlertView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveMineInfoAlertView.swift; sourceTree = "<group>"; };
 		7C27032F2A36CBE30061EC50 /* CNCertificationView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNCertificationView.swift; sourceTree = "<group>"; };
@@ -242,7 +242,6 @@
 			isa = PBXGroup;
 			children = (
 				790D019E2A2DD66E00C5978D /* CNLiveLoginViewModel.swift */,
-				79282A3D2A2EFDA000B5F8CF /* CNLiveLoginModel.swift */,
 			);
 			path = ViewModel;
 			sourceTree = "<group>";
@@ -296,6 +295,16 @@
 			path = Controller;
 			sourceTree = "<group>";
 		};
+		792E57D52A3AA28E005834DB /* Util */ = {
+			isa = PBXGroup;
+			children = (
+				792E57D62A3AA2AC005834DB /* CNLiveCommonJsonUtil.swift */,
+				792E57D82A3AA2F2005834DB /* CNLiveCommonBaseModel.swift */,
+				792E57DA2A3AE9F4005834DB /* CNLiveCommonQiniuTool.swift */,
+			);
+			path = Util;
+			sourceTree = "<group>";
+		};
 		7963988A2A260B3300D045EB /* Classes */ = {
 			isa = PBXGroup;
 			children = (
@@ -359,6 +368,7 @@
 		796398912A260C0100D045EB /* Common */ = {
 			isa = PBXGroup;
 			children = (
+				792E57D52A3AA28E005834DB /* Util */,
 				7963989B2A260E6200D045EB /* Base */,
 			);
 			path = Common;
@@ -391,7 +401,6 @@
 				7963989C2A260E6200D045EB /* CNLiveBaseViewController.swift */,
 				7C4931282A2D8BA8000E44B4 /* CNLiveBaseTabBarViewController.swift */,
 				798A44ED2A305AAC00815935 /* CNLiveBaseNavigationController.swift */,
-				79F4B1172A32C5FA00993C03 /* CNLiveBaseMoel.swift */,
 			);
 			path = Base;
 			sourceTree = "<group>";
@@ -418,7 +427,6 @@
 		798A44F32A3077ED00815935 /* CustomView */ = {
 			isa = PBXGroup;
 			children = (
-				798A44F42A3077ED00815935 /* CNLiveTips.swift */,
 				798A44F52A3077ED00815935 /* CNLiveHotButton.swift */,
 				798A44FA2A30999900815935 /* CNLiveAlertTool.swift */,
 			);
@@ -798,20 +806,21 @@
 				7C4931382A307BDB000E44B4 /* CNHomePageGuideView.swift in Sources */,
 				7CD6753E2A2740B0008354C1 /* CNPayMoneyCodeView.swift in Sources */,
 				7CD675402A2740B0008354C1 /* CNCollectMoneyCodeView.swift in Sources */,
+				792E57D92A3AA2F2005834DB /* CNLiveCommonBaseModel.swift in Sources */,
 				798A44FD2A309EBA00815935 /* CNLiveTypeFeedBackViewController.swift in Sources */,
 				7CD6754F2A2840B9008354C1 /* CNMetaCodeHomePageController.swift in Sources */,
+				792E57DB2A3AE9F4005834DB /* CNLiveCommonQiniuTool.swift in Sources */,
 				7CD675472A274167008354C1 /* NewPagedFlowView.m in Sources */,
-				798A44F62A3077ED00815935 /* CNLiveTips.swift in Sources */,
 				79F4B11A2A32F21400993C03 /* CNLiveMineNickViewController.swift in Sources */,
 				798A44FF2A30A0A800815935 /* CNLiveInputFeedBackViewController.swift in Sources */,
 				79282A442A2F1C1E00B5F8CF /* CNLiveLoginAuthView.swift in Sources */,
 				7C2703302A36CBE30061EC50 /* CNCertificationView.swift in Sources */,
+				792E57D72A3AA2AC005834DB /* CNLiveCommonJsonUtil.swift in Sources */,
 				790D01A32A2DDBA300C5978D /* CNLiveConfigManager.swift in Sources */,
 				7C2703332A36CC660061EC50 /* CNLiveGlobalBlock.swift in Sources */,
 				798A44EA2A30135D00815935 /* CNLiveMineBodyListView.swift in Sources */,
 				798A44F92A30835400815935 /* CNLiveHelpFeedBackViewController.swift in Sources */,
 				79A68C4A2A26E6CE00DC3B43 /* (null) in Sources */,
-				79282A3E2A2EFDA000B5F8CF /* CNLiveLoginModel.swift in Sources */,
 				790D01852A2D89E100C5978D /* UIColor+CNHexColor.swift in Sources */,
 				79396EED2A319F220053E1AF /* NSObject+CNLiveCurrentVC.swift in Sources */,
 				7C4931312A2F142F000E44B4 /* CNHomePageBackgroupView.swift in Sources */,
@@ -824,7 +833,6 @@
 				798A44EE2A305AAC00815935 /* CNLiveBaseNavigationController.swift in Sources */,
 				7CD675422A2740F8008354C1 /* CNCustomIndexView.swift in Sources */,
 				7C4931292A2D8BA8000E44B4 /* CNLiveBaseTabBarViewController.swift in Sources */,
-				79F4B1182A32C5FA00993C03 /* CNLiveBaseMoel.swift in Sources */,
 				79F4B1162A32B96B00993C03 /* CNLiveMineInfoViewController.swift in Sources */,
 				7CD6753F2A2740B0008354C1 /* CNTopCollectMoneyRemindView.swift in Sources */,
 				7CD6753C2A2740B0008354C1 /* CNBottomPayMoneyRemindView.swift in Sources */,
@@ -39,12 +39,10 @@ class CNLiveBaseTabBarViewController: UITabBarController
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
-        
     }
     override func viewDidAppear(_ animated: Bool) {
         super.viewDidAppear(animated)
-        
-        
+        print("获取用户用户数据=====>\(UserInfoManager.shared.userInfo.uid)")
     }
     // MARK: - 控制器的信息
     func setUpTabBar() {
 //
-//  CNLiveBaseMoel.swift
+//  CNLiveCommonBaseModel.swift
 //  metaCode
 //
-//  Created by open on 2023/6/9.
+//  Created by open on 2023/6/15.
 //
 import Foundation
+import UIKit
 import HandyJSON
 class BaseModel: HandyJSON {
     required init() {}
-    
+
     func mapping(mapper: HelpingMapper) {
     }
+//
+//  CNLiveCommonJsonUtil.swift
+//  metaCode
+//
+//  Created by open on 2023/6/15.
+//
+
+import Foundation
+
+import UIKit
+import HandyJSON
+
+class JsonUtil: NSObject {
+        /**
+         *  Json转对象
+         */
+        static func jsonToModel(_ jsonStr:String,_ modelType:HandyJSON.Type) -> BaseModel {
+            if jsonStr == "" || jsonStr.count == 0 {
+                #if DEBUG
+                    print("jsonoModel:字符串为空")
+                #endif
+                return BaseModel()
+            }
+            return modelType.deserialize(from: jsonStr)  as! BaseModel
+
+        }
+
+        /**
+         *  Json转数组对象
+         */
+        static func jsonArrayToModel(_ jsonArrayStr:String, _ modelType:HandyJSON.Type) ->[BaseModel] {
+            if jsonArrayStr == "" || jsonArrayStr.count == 0 {
+                #if DEBUG
+                    print("jsonToModelArray:字符串为空")
+                #endif
+                return []
+            }
+            var modelArray:[BaseModel] = []
+            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))
+            }
+            return modelArray
+
+        }
+
+        /**
+         *  字典转对象
+         */
+        static func dictionaryToModel(_ dictionStr:[String:Any],_ modelType:HandyJSON.Type) -> BaseModel {
+            if dictionStr.count == 0 {
+                #if DEBUG
+                    print("dictionaryToModel:字符串为空")
+                #endif
+                return BaseModel()
+            }
+            return modelType.deserialize(from: dictionStr) as! BaseModel
+        }
+
+        /**
+         *  对象转JSON
+         */
+        static func modelToJson(_ model:BaseModel?) -> String {
+            if model == nil {
+                #if DEBUG
+                    print("modelToJson:model为空")
+                #endif
+                 return ""
+            }
+            return (model?.toJSONString())!
+        }
+
+        /**
+         *  对象转字典
+         */
+        static func modelToDictionary(_ model:BaseModel?) -> [String:Any] {
+            if model == nil {
+                #if DEBUG
+                    print("modelToJson:model为空")
+                #endif
+                return [:]
+            }
+            return (model?.toJSON())!
+        }
+}
+//
+//  CNLiveCommonQiniuTool.swift
+//  metaCode
+//
+//  Created by open on 2023/6/15.
+//
+
+import Foundation
+import Qiniu
+
+class UploadManager: NSObject {
+    
+    private let _qnUploadManager = QNUploadManager()
+    static let shared = UploadManager()
+    private override init() {
+        super.init()
+        let config = QNConfiguration.build { builder in
+            builder?.useHttps = true;
+            do {
+                builder?.recorder = try QNFileRecorder(folder: "元码")
+            } catch {}
+        }
+//        _qnUploadManager = QNUploadManager(configuration: config)
+    }
+    
+    
+    
+}
@@ -6,62 +6,113 @@
 //
 import Foundation
-import SwiftyUserDefaults
+import UIKit
+import HandyJSON
-extension DefaultsKeys {
+class UserInfoModel: BaseModel {
-    var userInfoKey: DefaultsKey<CNLiveLoginModel?>{
-        DefaultsKey.init("userInfo")
-    }
+    required init() {}
+    
+    var appId:String = ""
+    var appleUid:String = ""
+    var bigFaceUrl:String = ""
+    var birthday:String = ""
+    var countryCode:String = ""
+    var email:String = ""
+    var extInfo:String = ""
+    var faceUrl:String = ""
+    var frmId:String = ""
+    var gender:String = ""
+    var hUid:String = ""
+    var isNewUser:String = ""
+    var location:String = ""
+    var mobile:String = ""
+    var newAccount:String = ""
+    var nickName:String = ""
+    var platformId:String = ""
+    var qqUid:String = ""
+    var renrenUid:String = ""
+    var sinaUid:String = ""
+    var token:String = ""
+    var uid:String = ""
+    var wxUid:String = ""
+    var access_token:String = ""
+    var expires_in:String = ""//过期时间
+    override func mapping(mapper: HelpingMapper) {
+
+        mapper <<<
+            self.gender <-- TransformOf(fromJSON: { (rawString) -> String? in
+                
+                if let _str = rawString {
+                    
+                    if _str == "m" || _str == "男"  {
+                        return "男"
+                    }
+                    if _str == "f" || _str == "女" {
+                        return "女"
+                    }
+                }
+                return "未知"
+            }, toJSON: { (srcString) -> String? in
+                return srcString
+            })
+    }
 }
 class UserInfoManager: NSObject {
     static let shared = UserInfoManager()
-    public var is_login: Bool {
-        get {
-            return userInfo.uid.lengthOfBytes(using: .utf8) > 0
-        }
-    }
-    
-    fileprivate var _userInfo : CNLiveLoginModel?
-    private(set) var userInfo: CNLiveLoginModel {
+    fileprivate var _userInfo : UserInfoModel?
+    private(set) var userInfo: UserInfoModel {
         set {
             _userInfo = newValue
         }
         get {
-            if (_userInfo != nil && (_userInfo?.uid.lengthOfBytes(using: .utf8))! > 0) {
+            if _userInfo != nil && (_userInfo?.uid.count)! > 0 {
                 return _userInfo!
             }
-            return readUserInfo()
+            return UserInfoManager.readUserInfo()
         }
     }
     private override init() {}
     /// 缓存用户数据
-    /// - Parameter userInfo: 用户数据
-    public func cacheUserInfo(userInfo: CNLiveLoginModel) {
-        _userInfo = userInfo
-        Defaults[\.userInfoKey] = userInfo
+    /// - Parameter userInfo: 用户数据 存储字符串
+    static public func cacheUserInfo(userInfo: UserInfoModel) {
+        UserInfoManager.clearUserInfo()
+        UserInfoManager.shared._userInfo = userInfo
+        //JsonUtil.modelToJson(userInfo)
+        UserDefaults.standard.set(userInfo.toJSONString(), forKey: "mateCode_userInfo")
+        if UserDefaults.standard.synchronize() {
+            print("用户信息存储成功")
+        }
     }
     /// 读取用户数据
     /// - Returns: 用户数据
-    public func readUserInfo() -> CNLiveLoginModel {
-        if (Defaults.hasKey(\.userInfoKey)) {
-            return Defaults[\.userInfoKey]!
-        }else{
-            return CNLiveLoginModel()
+    static public func readUserInfo() -> UserInfoModel {
+        let user_info = UserDefaults.standard.object(forKey: "mateCode_userInfo")
+        if user_info == nil && (user_info as! String).count == 0 {
+            print("获取用户信息失败")
+            return UserInfoModel()
         }
+        let userInfo = JsonUtil.jsonToModel(user_info as! String, UserInfoModel.self) as! UserInfoModel
+        UserInfoManager.shared._userInfo = userInfo
+        return userInfo
     }
-    public func clearUserInfo() {
-        _userInfo = nil
-        Defaults.remove(\.userInfoKey)
+    static public func clearUserInfo() {
+        UserDefaults.standard.removeObject(forKey: "mateCode_userInfo")
+        UserInfoManager.shared._userInfo = nil
+        if UserDefaults.standard.synchronize() {
+            print("用户信息删除成功")
+        }
     }
 }
+
+
-//
-//  CNLiveTips.swift
-//  metaCode
-//
-//  Created by open on 2023/6/5.
-//
-
-import Foundation
-import UIKit
-import YYCategories
-import MBProgressHUD
-
-class tip {
-    
-    static func showMessage(message : String) {
-        
-        if !message.isNotBlank() {
-            return
-        }
-        
-        let delegate = UIApplication.shared.delegate as! AppDelegate
-        
-        let bgView = UIView.init()
-        bgView.backgroundColor = UIColor(white: 0.1, alpha: 0.7)
-        bgView.layer.cornerRadius = 8.0
-        bgView.clipsToBounds = true
-        delegate.window?.addSubview(bgView)
-        
-        let remindLab = UILabel.init()
-        remindLab.textColor = .white
-        remindLab.font = Font_15_Fit
-        remindLab.textAlignment = .center
-        remindLab.numberOfLines = 1
-        remindLab.backgroundColor = .clear
-        remindLab.text = message
-        bgView.addSubview(remindLab)
-        
-        var width = message.boundingRect(with: CGSize(width: CGFloat(MAXFLOAT), height:  delegate.window?.bounds.size.height ?? 0), options:.usesLineFragmentOrigin, attributes: [NSAttributedString.Key.font:Font_15_Fit], context: nil).size.width
-        if width >  (delegate.window?.bounds.size.width ?? 0)/4.0 * 3.0 {
-            width =  (delegate.window?.bounds.size.width ?? 0)/4.0 * 3.0
-        }
-        
-        let height = message.boundingRect(with: CGSize(width: width, height: CGFloat(MAXFLOAT)), options: .usesLineFragmentOrigin, attributes: [NSAttributedString.Key.font:Font_15_Fit], context: nil).size.height
-        
-        bgView.bounds = CGRect(x: 0, y: 0, width: width + 20, height: height + 20)
-        bgView.layer.position = CGPoint(x:  (delegate.window?.bounds.size.width ?? 0) / 2.0, y: ( (delegate.window?.bounds.size.height ?? 0) - CNLiveConfigManager.shared.keyboardDisplayHeight) / 2.0)
-        
-        remindLab.bounds = CGRect(x: 0, y: 0, width: width, height: height)
-        remindLab.layer.position = CGPoint(x: bgView.bounds.size.width / 2, y: bgView.bounds.size.height / 2)
-        
-        UIView.animate(withDuration: 1, delay: 1, options: .curveEaseOut) {
-            bgView.alpha = 0
-        } completion: { finish in
-            bgView.removeFromSuperview()
-        }
-    }
-    
-    static func showLoading(message: String) {
-        
-        let delegate = UIApplication.shared.delegate as! AppDelegate
-        
-        delegate.window?.subviews.forEach({ view in
-            if view.isKind(of: MBProgressHUD.layerClass) {
-                let hub = view as! MBProgressHUD
-                hub.removeFromSuperview()
-            }
-        })
-        
-        let hub = MBProgressHUD.showAdded(to: delegate.window!, animated: true)
-        hub.mode = .indeterminate
-        hub.animationType = .fade
-        hub.contentColor = .white
-        hub.bezelView.backgroundColor = .black
-        hub.label.textColor = .white
-        if message.isNotBlank() {
-            hub.label.text = message
-        }
-    }
-    
-    static func hiddenLoading() {
-        let delegate = UIApplication.shared.delegate as! AppDelegate
-        MBProgressHUD.hide(for: delegate.window!, animated: true)
-    }
-    
-}
-
@@ -6,6 +6,7 @@
 //
 import Foundation
+import MBProgressHUD
 func currentViewController() -> (UIViewController?) {
    var window = UIApplication.shared.keyWindow
@@ -42,3 +43,77 @@ private func currentVC(_ vc :UIViewController?) -&gt; UIViewController? {
        return vc
     }
  }
+
+
+/// 弹框提示
+/// - Parameter message: 内容提示
+func showMessage(message: String) {
+    if !message.isNotBlank() {
+        return
+    }
+    
+    let delegate = UIApplication.shared.delegate as! AppDelegate
+    
+    let bgView = UIView.init()
+    bgView.backgroundColor = UIColor(white: 0.1, alpha: 0.7)
+    bgView.layer.cornerRadius = 8.0
+    bgView.clipsToBounds = true
+    delegate.window?.addSubview(bgView)
+    
+    let remindLab = UILabel.init()
+    remindLab.textColor = .white
+    remindLab.font = Font_15_Fit
+    remindLab.textAlignment = .center
+    remindLab.numberOfLines = 1
+    remindLab.backgroundColor = .clear
+    remindLab.text = message
+    bgView.addSubview(remindLab)
+    
+    var width = message.boundingRect(with: CGSize(width: CGFloat(MAXFLOAT), height:  delegate.window?.bounds.size.height ?? 0), options:.usesLineFragmentOrigin, attributes: [NSAttributedString.Key.font:Font_15_Fit], context: nil).size.width
+    if width >  (delegate.window?.bounds.size.width ?? 0)/4.0 * 3.0 {
+        width =  (delegate.window?.bounds.size.width ?? 0)/4.0 * 3.0
+    }
+    
+    let height = message.boundingRect(with: CGSize(width: width, height: CGFloat(MAXFLOAT)), options: .usesLineFragmentOrigin, attributes: [NSAttributedString.Key.font:Font_15_Fit], context: nil).size.height
+    
+    bgView.bounds = CGRect(x: 0, y: 0, width: width + 20, height: height + 20)
+    bgView.layer.position = CGPoint(x:  (delegate.window?.bounds.size.width ?? 0) / 2.0, y: ( (delegate.window?.bounds.size.height ?? 0) - CNLiveConfigManager.shared.keyboardDisplayHeight) / 2.0)
+    
+    remindLab.bounds = CGRect(x: 0, y: 0, width: width, height: height)
+    remindLab.layer.position = CGPoint(x: bgView.bounds.size.width / 2, y: bgView.bounds.size.height / 2)
+    
+    UIView.animate(withDuration: 1, delay: 1, options: .curveEaseOut) {
+        bgView.alpha = 0
+    } completion: { finish in
+        bgView.removeFromSuperview()
+    }
+}
+
+/// 展示等待框
+/// - Parameter message: 提示词
+func showLoading(message: String) {
+    let delegate = UIApplication.shared.delegate as! AppDelegate
+    
+    delegate.window?.subviews.forEach({ view in
+        if view.isKind(of: MBProgressHUD.layerClass) {
+            let hub = view as! MBProgressHUD
+            hub.removeFromSuperview()
+        }
+    })
+    
+    let hub = MBProgressHUD.showAdded(to: delegate.window!, animated: true)
+    hub.mode = .indeterminate
+    hub.animationType = .fade
+    hub.contentColor = .white
+    hub.bezelView.backgroundColor = .black
+    hub.label.textColor = .white
+    if message.isNotBlank() {
+        hub.label.text = message
+    }
+}
+
+/// 隐藏提示词
+func hiddenLoading() {
+    let delegate = UIApplication.shared.delegate as! AppDelegate
+    MBProgressHUD.hide(for: delegate.window!, animated: true)
+}
@@ -9,12 +9,12 @@ import Foundation
 extension UIButton {
-    /// 根据图片生成UIBarButtonItem
+    /// 根据图片生成UIButton
     static func imageItem(imageName:String,target:AnyObject,action:Selector) -> UIButton {
         return customItem(title: "", titleColor: UIColor.white, imageName: imageName, target: target, action: action,contentHorizontalAlignment: .center)
     }
-    /// 根据文字生成UIBarButtonItem
+    /// 根据文字生成UIButton
     static func textItem(title:String,titleColor:UIColor,target:AnyObject,action:Selector) -> UIButton {
         return customItem(title: title, titleColor: titleColor, imageName: "", target: target, action: action,contentHorizontalAlignment: .center)
     }
@@ -24,7 +24,7 @@ extension UIButton {
         return customItem(title: "", titleColor: UIColor.white, imageName: imageName, target: target, action: action,contentHorizontalAlignment: .left,isBack: true)
     }
-    /// 快速初始化一个UIBarButtonItem，内部是按钮
+    /// 快速初始化一个UIButton，内部是按钮
     static func customItem(title:String,titleColor:UIColor,imageName:String,target:AnyObject,action:Selector,
                               contentHorizontalAlignment:UIControl.ContentHorizontalAlignment,isBack:Bool=false) -> UIButton {
         let button = UIButton()
@@ -15,7 +15,7 @@ class CNLiveLoginViewController : CNLiveBaseViewController, UITextViewDelegate {
     lazy var headerView : UIImageView = {
         let headerView = UIImageView()
         headerView.backgroundColor = .white
-        headerView.contentMode = .scaleAspectFit
+        headerView.contentMode = .scaleToFill
         headerView.image = UIImage(named: "Login_page_header_icon")
         return headerView
     }()
@@ -25,7 +25,7 @@ class CNLiveLoginViewController : CNLiveBaseViewController, UITextViewDelegate {
         areaButton.backgroundColor = .white
         areaButton.setTitle("+86", for: .normal)
         areaButton.setTitle("+86", for: .highlighted)
-        areaButton.titleLabel?.font = BoldFont_16_Fit
+        areaButton.titleLabel?.font = BoldFont_16
         areaButton.setTitleColor(HexColor("#333333"), for: .normal)
         areaButton.setTitleColor(HexColor("#333333"), for: .highlighted)
         areaButton.addTarget(self, action: #selector(changeCityNumberMothod), for: .touchUpInside)
@@ -112,7 +112,7 @@ class CNLiveLoginViewController : CNLiveBaseViewController, UITextViewDelegate {
         areaButton.snp.makeConstraints { make in
             make.centerY.equalTo(phoneV)
             make.left.equalTo(phoneV.left).offset(40)
-            make.width.lessThanOrEqualTo(45)
+            make.width.lessThanOrEqualTo(50)
         }
         let v_line = UILabel.init()
@@ -169,7 +169,7 @@ class CNLiveLoginViewController : CNLiveBaseViewController, UITextViewDelegate {
         codeButton.backgroundColor = .white
         codeButton.setTitle("获取验证码", for: .normal)
         codeButton.setTitle("获取验证码", for: .highlighted)
-        codeButton.titleLabel?.font = Font_16_Fit
+        codeButton.titleLabel?.font = Font_16
         codeButton.setTitleColor(HexColor("#0066FE"), for: .normal)
         codeButton.setTitleColor(HexColor("#0066FE"), for: .highlighted)
         codeButton.addTarget(self, action: #selector(sendVerifiCodeMothod), for: .touchUpInside)
@@ -278,23 +278,22 @@ extension CNLiveLoginViewController {
     @objc func sendLoginActionMothod(sender : UIButton) {
         if !is_agree {
-            tip.showMessage(message: "请先阅读并同意协议")
+            showMessage(message: "请先阅读并同意协议")
             return
         }
         view.endEditing(true)
         CNLiveLoginViewModel.requestLoginAction(userName: phoneText.text ?? "", countryCode: country, verCode: veriText.text ?? "") {
-            UserInfoManager.shared.clearUserInfo()
             let window = UIApplication.shared.delegate?.window
             window??.rootViewController = CNLiveBaseTabBarViewController.init()
         }
     }
     @objc func pushAgreeActionMothod() {
-        tip.showMessage(message: "APP用户服务协议")
+        self.navigationController?.pushViewController(CNLiveInfoShowViewController.init(show_type: .service), animated: true)
     }
     @objc func pushInfoActionMothod() {
-        tip.showMessage(message: "个人信息保护政策")
+        self.navigationController?.pushViewController(CNLiveInfoShowViewController.init(show_type: .privacy), animated: true)
     }
 }
@@ -163,12 +163,14 @@ extension CNLiveLoginPickerView {
     }
     func pickerView(_ pickerView: UIPickerView, titleForRow row: Int, forComponent component: Int) -> String? {
-        let param = country_array[row] as! NSMutableDictionary
-        return param["name"] as? String
+        let param = country_array[row] as! NSDictionary
+        let name = param["name"] as? String
+        let code = param["code"] as? String
+        return "\(name ?? "")"+"(+\(code ?? ""))"
     }
     func pickerView(_ pickerView: UIPickerView, didSelectRow row: Int, inComponent component: Int) {
-        let param = country_array[row] as! NSMutableDictionary
+        let param = country_array[row] as! NSDictionary
         result_string = param["code"] as! String
     }
 }
-//
-//  CNLiveLoginModel.swift
-//  metaCode
-//
-//  Created by open on 2023/6/6.
-//
-
-import Foundation
-import SwiftyUserDefaults
-import HandyJSON
-
-class CNLiveLoginModel : BaseModel, DefaultsSerializable, Codable {
-    
-
-    required init() {}
-    
-    var appId:String = ""
-    var appleUid:String = ""
-    var bigFaceUrl:String = ""
-    var birthday:String = ""
-    var countryCode:String = ""
-    var email:String = ""
-    var extInfo:String = ""
-    var faceUrl:String = ""
-    var frmId:String = ""
-    var gender:String = ""
-    var hUid:String = ""
-    var isNewUser:String = ""
-    var location:String = ""
-    var mobile:String = ""
-    var newAccount:String = ""
-    var nickName:String = ""
-    var platformId:String = ""
-    var qqUid:String = ""
-    var renrenUid:String = ""
-    var sinaUid:String = ""
-    var token:String = ""
-    var uid:String = ""
-    var wxUid:String = ""
-    
-    override func mapping(mapper: HelpingMapper) {
-        mapper.specify(property: &gender) { rawString -> String in
-            var g = "未知"
-            if rawString == "m" {
-                g = "男"
-            } else {
-                g = "女"
-            }
-            return g
-        }
-    }
-    
-}
@@ -7,9 +7,10 @@
 import Foundation
 import YYCategories
-import HandyJSON
 import CNLiveRequestBastKit
-import SwiftyUserDefaults
+import HandyJSON
+
+import MJExtension
 //验证码发送成功回调
 typealias resultCodeBlock = () -> Void
@@ -21,84 +22,105 @@ class CNLiveLoginViewModel : NSObject {
     static func requestVerCodeAction(phone: String, code: String, resultBlock: @escaping resultCodeBlock) {
         if !phone.isNotBlank() {
-            tip.showMessage(message: "请输入手机号")
+            showMessage(message: "请输入手机号")
             return
         }
         if phone.lengthOfBytes(using: .utf8) >= 20 {
-            tip.showMessage(message: "手机号格式不正确")
+            showMessage(message: "手机号格式不正确")
             return
         }
         if !phone.isPurnInt() {
-            tip.showMessage(message: "手机号格式不正确")
+            showMessage(message: "手机号格式不正确")
             return
         }
-        tip.showLoading(message: "")
+        showLoading(message: "")
         let param = ["mobile":phone,"countryCode":code]
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
         CNLiveNetworking.setupShowDataResult(false)
         CNLiveNetworking.requestNetwork(with: .POST, urlString: "/open/api2/user/sendVerifyCode", param: param, cacheType: .networkOnly) { task, result, error in
-            tip.hiddenLoading()
+            hiddenLoading()
             if (error == nil) {
                 let resp = result as! NSDictionary
                 let errorCode = resp["errorCode"]
                 if (errorCode as! String == "0") {
-                    tip.showMessage(message: "验证码已发送")
+                    showMessage(message: "验证码已发送")
                     resultBlock()
                 } else {
-                    tip.showMessage(message: resp["errorMessage"] as! String)
+                    showMessage(message: resp["errorMessage"] as! String)
                 }
             } else{
-                tip.showMessage(message: "获取验证码失败")
+                showMessage(message: "获取验证码失败")
             }
         }
     }
     static func requestLoginAction(userName: String, countryCode: String, verCode: String, resultBlock: @escaping resultLoginBlock) {
         if !userName.isNotBlank() {
-            tip.showMessage(message: "请输入手机号")
+            showMessage(message: "请输入手机号")
             return
         }
         if userName.lengthOfBytes(using: .utf8) >= 20 {
-            tip.showMessage(message: "手机号格式不正确")
+            showMessage(message: "手机号格式不正确")
             return
         }
         if !userName.isPurnInt() {
-            tip.showMessage(message: "手机号格式不正确")
+            showMessage(message: "手机号格式不正确")
             return
         }
         if !verCode.isNotBlank() {
-            tip.showMessage(message: "请输入验证码")
+            showMessage(message: "请输入验证码")
             return
         }
         if verCode.lengthOfBytes(using: .utf8) >= 20 {
-            tip.showMessage(message: "验证码格式不正确")
+            showMessage(message: "验证码格式不正确")
             return
         }
         if !verCode.isPurnInt() {
-            tip.showMessage(message: "验证码格式不正确")
+            showMessage(message: "验证码格式不正确")
             return
         }
-        tip.showLoading(message: "")
+        showLoading(message: "")
         let param = ["userName":userName,"countryCode":countryCode,"verificationCode":verCode,"inviterId":""]
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
         CNLiveNetworking.setupShowDataResult(false)
         CNLiveNetworking.requestNetwork(with: .POST, urlString: "/open/api2/user/loginInMetaCode", param: param, cacheType: .networkOnly) { task, result, error in
-            tip.hiddenLoading()
+            hiddenLoading()
             if (error == nil) {
                 let resp = result as! NSDictionary
                 let errorCode = resp["errorCode"]
                 if (errorCode as! String == "0") {
-                    if let res = JSONDeserializer<CNLiveLoginModel>.deserializeFrom(dict: resp, designatedPath: "data") {
-                        Defaults.userInfoKey = res
+                    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 {
-                    tip.showMessage(message: resp["errorMessage"] as! String)
+                    showMessage(message: resp["errorMessage"] as! String)
                 }
             } else {
-                tip.showMessage(message: "登陆失败")
+                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)
+//            }
+//        })
     }
 }
@@ -7,13 +7,15 @@
 import Foundation
 import YYCategories
+import WebKit
 enum ListShowInfoType {
     case service
     case privacy
+    case yinsi
 }
-class CNLiveInfoShowViewController: CNLiveBaseViewController {
+class CNLiveInfoShowViewController: CNLiveBaseViewController, WKNavigationDelegate, WKUIDelegate {
     var _show_type:ListShowInfoType!
     init(show_type:ListShowInfoType) {
@@ -29,42 +31,79 @@ class CNLiveInfoShowViewController: CNLiveBaseViewController {
         fatalError("init(coder:) has not been implemented")
     }
+    lazy var webView: WKWebView = {
+        let config = WKWebViewConfiguration()
+        let webView = WKWebView.init(frame: .zero, configuration: config)
+        webView.backgroundColor = .white
+        webView.allowsBackForwardNavigationGestures = true
+        webView.navigationDelegate = self
+        webView.uiDelegate = self
+        return webView
+    }()
+    
     override func viewDidLoad() {
         super.viewDidLoad()
         var attrString =  ""
         switch _show_type {
-        case .service:
-            titleName = "APP用户服务协议"
-            attrString = "欢迎您使用元码，我们非常重视您的个人信息保护，并采取了有效措施保障您的信息安全，请您充分了解: \n为保障APP账号安全，元码APP需向您申请获取电话状态权限。 \n请您务必阅读APP《个人信息保护政策》，以充分了解我们如何处理您的个人信息。"
-        case .privacy:
-            titleName = "个人信息保护政策"
-            attrString = "欢迎您使用元码，我们非常重视您的个人信息保护，并采取了有效措施保障您的信息安全，请您充分了解: \n为保障APP账号安全，元码APP需向您申请获取电话状态权限 \n请您务必阅读APP《个人信息保护政策》，以充分了解我们如何处理您的个人信息。"
-        case .none:
-            break
-        }
+            case .service:
+                titleName = "APP用户服务协议"
+                attrString = "https://wjjh5.cnlive.com/yuanmaYhxy.html"
+            case .privacy:
+                titleName = "个人信息保护政策"
+                attrString = "https://wjjh5.cnlive.com/yuanmaYszc.html"
+            case .yinsi:
+                titleName = "隐私协议"
+                attrString = "https://wjjh5.cnlive.com/yuanmaYszc.html"
+            case .none:
+                break
+            }
-        let paraph = NSMutableParagraphStyle()
-        paraph.lineSpacing = 10
-        let attributes = [NSAttributedString.Key.font:Font_16_Fit,
-                          NSAttributedString.Key.paragraphStyle: paraph]
-        let h = attrString.boundingRect(with: CGSize(width: KSreenWidth - 40, height: CGFloat(MAXFLOAT)), options: .usesLineFragmentOrigin, attributes: attributes, context: nil).size.height + 40
-        let textView = UITextView.init()
-        textView.attributedText = NSAttributedString(string: attrString, attributes: attributes)
-        textView.textColor = HexColor("#666666")
-        textView.layer.cornerRadius = 10
-        textView.layer.masksToBounds = true
-        textView.textAlignment  = .left
-        textView.contentMode = .scaleAspectFill
-        textView.contentInset = UIEdgeInsets(top: 10, left: 10, bottom: 10, right: 10)
-        textView.sizeToFit()
-        view.addSubview(textView)
-        textView.snp.makeConstraints { make in
-            make.centerX.equalToSuperview()
-            make.top.equalToSuperview().offset(get_system_nav_height() + 10)
-            make.left.equalToSuperview().offset(10)
-            make.right.equalToSuperview().offset(-10)
-            make.height.equalTo(h)
+        view.addSubview(webView)
+        webView.snp.makeConstraints { make in
+            make.top.equalToSuperview().offset(get_system_nav_height())
+            make.left.right.bottom.equalToSuperview()
         }
+        
+        webView.load(URLRequest(url: URL(string: attrString)!, cachePolicy: .returnCacheDataElseLoad))
     }
+    
+//    override func viewDidLoad() {
+//        super.viewDidLoad()
+//        var attrString =  ""
+//        switch _show_type {
+//        case .service:
+//            titleName = "APP用户服务协议"
+//            attrString = "欢迎您使用元码，我们非常重视您的个人信息保护，并采取了有效措施保障您的信息安全，请您充分了解: \n为保障APP账号安全，元码APP需向您申请获取电话状态权限。 \n请您务必阅读APP《个人信息保护政策》，以充分了解我们如何处理您的个人信息。"
+//        case .privacy:
+//            titleName = "个人信息保护政策"
+//            attrString = "欢迎您使用元码，我们非常重视您的个人信息保护，并采取了有效措施保障您的信息安全，请您充分了解: \n为保障APP账号安全，元码APP需向您申请获取电话状态权限 \n请您务必阅读APP《个人信息保护政策》，以充分了解我们如何处理您的个人信息。"
+//        case .none:
+//            break
+//        }
+//
+//        let paraph = NSMutableParagraphStyle()
+//        paraph.lineSpacing = 10
+//        let attributes = [NSAttributedString.Key.font:Font_16_Fit,
+//                          NSAttributedString.Key.paragraphStyle: paraph]
+//        let h = attrString.boundingRect(with: CGSize(width: KSreenWidth - 40, height: CGFloat(MAXFLOAT)), options: .usesLineFragmentOrigin, attributes: attributes, context: nil).size.height + 40
+//        let textView = UITextView.init()
+//        textView.attributedText = NSAttributedString(string: attrString, attributes: attributes)
+//        textView.textColor = HexColor("#666666")
+//        textView.layer.cornerRadius = 10
+//        textView.layer.masksToBounds = true
+//        textView.textAlignment  = .left
+//        textView.contentMode = .scaleAspectFill
+//        textView.contentInset = UIEdgeInsets(top: 10, left: 10, bottom: 10, right: 10)
+//        textView.sizeToFit()
+//        view.addSubview(textView)
+//        textView.snp.makeConstraints { make in
+//            make.centerX.equalToSuperview()
+//            make.top.equalToSuperview().offset(get_system_nav_height() + 10)
+//            make.left.equalToSuperview().offset(10)
+//            make.right.equalToSuperview().offset(-10)
+//            make.height.equalTo(h)
+//        }
+//    }
+    
 }
@@ -17,7 +17,8 @@ class CNLiveMineInfoViewController: CNLiveBaseViewController, PhotoPickerControl
         imageView.backgroundColor = .clear
         imageView.contentMode = .scaleToFill
         imageView.image = UIImage(named: "mine_header_icon_defult_ava")
-        imageView.image = _image
+        imageView.kf.indicatorType = .activity
+        imageView.kf.setImage(with: URL(string: UserInfoManager.shared.userInfo.bigFaceUrl), placeholder: UIImage(named: "mine_header_icon_defult_ava"))
         return imageView
     }()
@@ -57,12 +58,10 @@ class CNLiveMineInfoViewController: CNLiveBaseViewController, PhotoPickerControl
     }()
     var _select_image: UIImage!
-    var _image:UIImage!
     var reslut: ClickInfoResultBlock
-    init(image:UIImage, result: @escaping ClickInfoResultBlock) {
+    init(result: @escaping ClickInfoResultBlock) {
         self.reslut = result
        super.init(nibName:nil, bundle:nil)
-        _image = image
     }
     required init?(coder: NSCoder) {
@@ -106,10 +105,12 @@ class CNLiveMineInfoViewController: CNLiveBaseViewController, PhotoPickerControl
             make.width.equalTo((KSreenWidth - 60)*0.65)
         }
         sendBtn.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))
+        
     }
     override var preferredStatusBarStyle: UIStatusBarStyle {
-      return .lightContent
+    
+        return .lightContent
     }
     @objc func changeCancelAction() {
@@ -117,8 +118,11 @@ class CNLiveMineInfoViewController: CNLiveBaseViewController, PhotoPickerControl
     }
     @objc func changeSendAction() {
-        self.reslut(_select_image)
-        self.navigationController?.popViewController(animated: true)
+        CNLiveMineViewModel.requestUploadIconAction(_select_image) { [self] in
+            //再这里进行图片上传
+            self.reslut(_select_image)
+            self.navigationController?.popViewController(animated: true)
+        }
     }
     @objc func changeAvatarAction() {
@@ -89,7 +89,7 @@ class CNLiveMineNickViewController: CNLiveBaseViewController, UITextFieldDelegat
         CNLiveMineViewModel.requestUpdateUserInfoAction(type: .nickName, value: nickField.text ?? "", resultBlock: { [self] in
             let userInfo = UserInfoManager.shared.userInfo
             userInfo.nickName = nickField.text ?? ""
-            UserInfoManager.shared.cacheUserInfo(userInfo: userInfo)
+            UserInfoManager.cacheUserInfo(userInfo: userInfo)
         })
     }
@@ -39,11 +39,16 @@ class CNLiveMineViewController : CNLiveBaseViewController, UITableViewDelegate, 
         let array01 : [Dictionary] = [["name":"添加身份","icon":"mine_list_icon_add_identity"]]
         dataArray.add(array01)
         let array02 : [Dictionary] = [["name":"帮助与反馈","icon":"mine_list_icon_help_feedback"],
-                                    ["name":"更多设置","icon":"mine_list_icon_set_more"]]
+                                     ["name":"更多设置","icon":"mine_list_icon_set_more"]]
         dataArray.add(array02)
         return dataArray
     }()
+    lazy var headerView: MineHeaderView = {
+        let headerView = MineHeaderView.init(frame: CGRect(x: 0, y: 0, width: KSreenWidth, height: 80))
+        return headerView
+    }()
+    
     override func viewDidLoad() {
         super.viewDidLoad()
         view.backgroundColor = HexColor("#f9f9f9")
@@ -61,6 +66,12 @@ class CNLiveMineViewController : CNLiveBaseViewController, UITableViewDelegate, 
         }
     }
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
+        headerView.updateHeaderView()
+        tableView.reloadData()
+    }
+    
     override var preferredStatusBarStyle: UIStatusBarStyle {
       return .lightContent
     }
@@ -124,7 +135,6 @@ extension CNLiveMineViewController {
     func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
         if section == 0 {
-            let headerView = MineHeaderView.init(frame: CGRect(x: 0, y: 0, width: KSreenWidth, height: 80))
             return headerView
         }
         return UIView.init()
@@ -187,7 +187,8 @@ class CNLiveTypeFeedBackViewController : CNLiveBaseViewController, UITableViewDe
     @objc func logoutAction() -> Void {
         AlertTool.systemActionSheet(title: nil, message: nil, actionTitles: ["退出登录"]) { index in
             if index == 1 {
-                UserInfoManager.shared.clearUserInfo()
+                UserDefaults.standard.set(false,forKey: "is_login")
+                UserInfoManager.clearUserInfo()
                 let window = UIApplication.shared.delegate?.window
                 window??.rootViewController = CNLiveLoginViewController.init()
             }
@@ -276,9 +277,9 @@ extension CNLiveTypeFeedBackViewController {
         if _show_type == .info {
             if indexPath.section == 0 {
                 let cell = tableView.cellForRow(at: indexPath) as! MineBodyTwoListViewCell
-                let vc = CNLiveMineInfoViewController.init(image: cell.avatarView.image!) { image in
+                let vc = CNLiveMineInfoViewController.init(result: { image in
                     cell.avatarView.image = image
-                }
+                })
                 self.navigationController?.pushViewController(vc, animated: true)
             }
             if indexPath.section == 1 {
@@ -286,13 +287,11 @@ extension CNLiveTypeFeedBackViewController {
                 self.navigationController?.pushViewController(mineInfoVC, animated: true)
             }
             if indexPath.section == 2 {
-                let cell = tableView.cellForRow(at: indexPath) as! MineBodyTwoListViewCell
                 MineInfoAlertView.showSelectView(showType: .gender) { [self] text in
                     updateWithDataSource()
                 }
             }
             if indexPath.section == 3 {
-                let cell = tableView.cellForRow(at: indexPath) as! MineBodyTwoListViewCell
                 MineInfoAlertView.showSelectView(showType: .birthday) { [self] text in
                     updateWithDataSource()
                 }
@@ -62,7 +62,10 @@ class MineHeaderView : UIView {
             make.right.equalToSuperview().offset(-15)
             make.size.equalTo(30)
         }
-        
+        updateHeaderView()
+    }
+    
+    public func updateHeaderView() {
         iconView.kf.indicatorType = .activity
         iconView.kf.setImage(with: URL(string: UserInfoManager.shared.userInfo.bigFaceUrl), placeholder: UIImage(named: "mine_header_icon_defult_ava"))
         nameLabel.text = UserInfoManager.shared.userInfo.nickName
@@ -171,9 +171,11 @@ class MineInfoAlertView: UIView {
         wBtn.isSelected = UserInfoManager.shared.userInfo.gender == "男"
         mBtn.isSelected = UserInfoManager.shared.userInfo.gender == "女"
-        mView.isHidden = UserInfoManager.shared.userInfo.gender == "男"
-        wView.isHidden = UserInfoManager.shared.userInfo.gender == "女"
-        
+        if UserInfoManager.shared.userInfo.gender != "未知" {
+            mView.isHidden = UserInfoManager.shared.userInfo.gender == "男"
+            wView.isHidden = UserInfoManager.shared.userInfo.gender == "女"
+        }
+
         setConstraints()
     }
@@ -311,17 +313,12 @@ class MineInfoAlertView: UIView {
         CNLiveMineViewModel.requestUpdateUserInfoAction(type: type!, value: value) { [self] in
             let userInfo = UserInfoManager.shared.userInfo
             if type == .gender {
-                if (value == "m") {
-                    userInfo.gender = "男"
-                }
-                if (value == "f") {
-                    userInfo.gender = "女"
-                }
+                userInfo.gender = (value  == "m" ? "男" : "女")
             }
             if type == .birthday {
                 userInfo.birthday = value
             }
-            UserInfoManager.shared.cacheUserInfo(userInfo: userInfo)
+            UserInfoManager.cacheUserInfo(userInfo: userInfo)
             result!(value)
         }
     }
@@ -15,13 +15,11 @@ enum CNLiveMineRequestType {
     case location
     case birthday
 }
-// 修改用户信息成功
+// 成功
 typealias resultSuccessBlock = () -> Void
 class CNLiveMineViewModel: NSObject {
-
-    
     /// 提交更新用户单项数据
     /// - Parameters:
     ///   - type: nickName-昵称，gender-性别，email-邮箱, location-联系方式,birthday-生日yyyy-MM-dd
@@ -52,23 +50,109 @@ class CNLiveMineViewModel: NSObject {
         }
         param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "uid")
         param.setValue(UserInfoManager.shared.userInfo.token, forKey: "token")
-        tip.showLoading(message: "")
+        showLoading(message: "")
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
         CNLiveNetworking.setupShowDataResult(false)
         CNLiveNetworking.requestNetwork(with: .POST, urlString: "/open/api2/user/updateUserById", param: param as! [String : Any], cacheType: .networkOnly) { task, result, error in
-            tip.hiddenLoading()
+            hiddenLoading()
             if (error == nil) {
                 let resp = result as! NSDictionary
                 let errorCode = resp["errorCode"]
                 if (errorCode as! String == "0") {
-                    tip.showMessage(message: "更改成功")
+                    showMessage(message: "更改成功")
                     resultBlock()
                 } else {
-                    tip.showMessage(message: resp["errorMessage"] as! String)
+                    showMessage(message: resp["errorMessage"] as! String)
                 }
             } else {
-                tip.showMessage(message: "修改信息失败")
+                showMessage(message: "修改信息失败")
+            }
+        }
+    }
+    
+    
+    /// 上传并修改头像
+    /// - Parameters:
+    ///   - image: 头像
+    ///   - resultBlock: 返回
+    static func requestUploadIconAction(_ image: UIImage,resultBlock: @escaping resultSuccessBlock) {
+             
+        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()
+                    } else {
+                        showMessage(message: resp["errorMessage"] as! String)
+                    }
+                } else {
+                    showMessage(message: "头像更改成功")
+                }
             }
         }
     }
+    
+    /// 获取access_token
+    /// - Parameter resultBlock: 结果返回
+    static func requestAccessTokenAction(resultBlock: @escaping resultSuccessBlock) {
+        //当前时间大于最大允许时间则表明当前access_token已经过期需要重新请求
+        if CNLiveMineViewModel.timeStamp > NSNumber(string: UserInfoManager.shared.userInfo.expires_in)?.intValue ?? 0 {
+            let param = NSMutableDictionary.init()
+            param.setValue("802_li40qhp922", forKey: "appId")
+            param.setValue("3cc9f12db322a3d3656012ef929604cf6d6847471535f9", forKey: "secret")
+            showLoading(message: "")
+            CNLiveNetworking.setAllowRequestDefaultArgument(false)
+            CNLiveNetworking.setupShowDataResult(false)
+            CNLiveNetworking.requestNetwork(with: .POST, urlString: "/open/api2/token", param: (param as! [AnyHashable : Any]), cacheType: .networkOnly) { task, result, error in
+                hiddenLoading()
+                if (error == nil) {
+                    let resp = result as! NSDictionary
+                    let errorCode = "\(resp["errorCode"] ?? 0)"
+                    if (errorCode == "0") {
+                        let data = resp["data"] as! Dictionary<String, Any>
+                        let userInfo = UserInfoManager.shared.userInfo
+                        userInfo.access_token = data["access_token"] as! String
+                        let expires_in = data["expires_in"] as! NSNumber
+                        userInfo.expires_in = "\(expires_in.intValue+CNLiveMineViewModel.timeStamp)"
+                        UserInfoManager.cacheUserInfo(userInfo: userInfo)
+                        resultBlock()
+                    } else {
+                        showMessage(message: resp["errorMessage"] as! String)
+                    }
+                } else {
+                    showMessage(message: "修改头像失败")
+                }
+            }
+        } else {
+            resultBlock()
+        }
+    }
+    
+    /// 获取十位时间戳
+    static var timeStamp: Int {
+        let timeInterval: TimeInterval = NSDate().timeIntervalSince1970
+        let timeStamp = Int(timeInterval)
+        return timeStamp
+    }
 }
@@ -8,7 +8,6 @@
 import UIKit
 import CNLiveRequestBastKit
 import IQKeyboardManagerSwift
-import SwiftyUserDefaults
 @main
 class AppDelegate: UIResponder, UIApplicationDelegate {
@@ -21,8 +20,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         window = UIWindow.init(frame: UIScreen.main.bounds)
         window?.backgroundColor = KVCBackgroupColor
-        window?.rootViewController = UserInfoManager.shared.is_login ? CNLiveBaseTabBarViewController.init() : CNLiveLoginViewController.init()
-//        window?.rootViewController = CNLiveBaseTabBarViewController.init()
+        let is_login = UserDefaults.standard.bool(forKey: "is_login")
+        window?.rootViewController = is_login ? CNLiveBaseTabBarViewController.init() : CNLiveLoginViewController.init()
         window?.makeKeyAndVisible()