Merge branch 'master' of http://bj.gitlab.cnlive.com/ios-team/CNLiveMateCode

# Conflicts: # metaCode.xcodeproj/project.pbxproj

Merge branch 'master' of http://bj.gitlab.cnlive.com/ios-team/CNLiveMateCode
# Conflicts: # metaCode.xcodeproj/project.pbxproj
liushiyu
2 parents 2f2f775a fcaf1aae
Showing 23 changed files with 751 additions and 41 deletions
Podfile
metaCode.xcodeproj/project.pbxproj
metaCode/Classes/Common/Util/CNLiveCommonQiniuTool.swift
metaCode/Classes/DB/CNMetaCodeDB.swift
metaCode/Classes/Environment/CNLiveEnvironment.swift
metaCode/Classes/Extensions/CALayer+CNLiveExtensions.swift
metaCode/Classes/Extensions/NSDate+CNLiveExtensions.swift
metaCode/Classes/Extensions/NSString+CNLiveExtensions.swift
metaCode/Classes/Extensions/UIView+CNLiveExtensions.swift
metaCode/Classes/Global/CNGlobalEnum.swift
metaCode/Classes/GlobalBlock/CNLiveGlobalBlock.swift → metaCode/Classes/Global/CNLiveGlobalBlock.swift
metaCode/Classes/Main/DB/CNIdentityDB.swift
metaCode/Classes/Main/HomePage/Controller/CNMetaCodeHomePageController.swift
metaCode/Classes/Main/HomePage/View/CNDownSlideView.swift
metaCode/Classes/Main/HomePage/View/CNDownSlideViewRemindView.swift
metaCode/Classes/Main/HomePage/View/CNMainView.swift
metaCode/Classes/Main/HomePage/View/CNUpSlideView.swift
metaCode/Classes/Main/HomePage/View/CNUpSlideViewRemindView.swift
metaCode/Classes/Main/HomePage/ViewModel/CNHomePageViewModel.swift
metaCode/Classes/Main/LoginPage/ViewModel/CNLiveLoginViewModel.swift
@@ -12,7 +12,7 @@ target &#39;metaCode&#39; do
   # Comment the next line if you don't want to use dynamic frameworks
   use_frameworks!
-  pod 'YYCategories'
+#  pod 'YYCategories'
   # Pods for metaCode
   #网络请求基础库
@@ -62,7 +62,11 @@
 		7C4931342A307B58000E44B4 /* slide_down.gif in Resources */ = {isa = PBXBuildFile; fileRef = 7C4931332A307B58000E44B4 /* slide_down.gif */; };
 		7C4931362A307B60000E44B4 /* slide_up.gif in Resources */ = {isa = PBXBuildFile; fileRef = 7C4931352A307B60000E44B4 /* slide_up.gif */; };
 		7C4931382A307BDB000E44B4 /* CNHomePageGuideView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C4931372A307BDB000E44B4 /* CNHomePageGuideView.swift */; };
-		7C7C62F62A4D72E9007A912E /* CNMetaCodeDB.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C7C62F52A4D72E9007A912E /* CNMetaCodeDB.swift */; };
+		7C7C62F62A4D72E9007A912E /* CNIdentityDB.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C7C62F52A4D72E9007A912E /* CNIdentityDB.swift */; };
+		7C83B43E2A52B8BA004BF4A4 /* CNHomePageViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C83B43D2A52B8BA004BF4A4 /* CNHomePageViewModel.swift */; };
+		7C83B4402A52BB2B004BF4A4 /* CNGlobalEnum.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C83B43F2A52BB2B004BF4A4 /* CNGlobalEnum.swift */; };
+		7C83B4422A541EBF004BF4A4 /* CALayer+CNLiveExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C83B4412A541EBF004BF4A4 /* CALayer+CNLiveExtensions.swift */; };
+		7C83B4442A541F36004BF4A4 /* NSDate+CNLiveExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C83B4432A541F36004BF4A4 /* NSDate+CNLiveExtensions.swift */; };
 		7CD675292A270F6A008354C1 /* WJColorChange.m in Sources */ = {isa = PBXBuildFile; fileRef = 7CD675282A270F6A008354C1 /* WJColorChange.m */; };
 		7CD6753C2A2740B0008354C1 /* CNUpSlideViewRemindView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CD675372A2740B0008354C1 /* CNUpSlideViewRemindView.swift */; };
 		7CD6753D2A2740B0008354C1 /* CNMainView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CD675382A2740B0008354C1 /* CNMainView.swift */; };
@@ -159,7 +163,11 @@
 		7C4931332A307B58000E44B4 /* slide_down.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = slide_down.gif; sourceTree = "<group>"; };
 		7C4931352A307B60000E44B4 /* slide_up.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = slide_up.gif; sourceTree = "<group>"; };
 		7C4931372A307BDB000E44B4 /* CNHomePageGuideView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNHomePageGuideView.swift; sourceTree = "<group>"; };
-		7C7C62F52A4D72E9007A912E /* CNMetaCodeDB.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNMetaCodeDB.swift; sourceTree = "<group>"; };
+		7C7C62F52A4D72E9007A912E /* CNIdentityDB.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNIdentityDB.swift; sourceTree = "<group>"; };
+		7C83B43D2A52B8BA004BF4A4 /* CNHomePageViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNHomePageViewModel.swift; sourceTree = "<group>"; };
+		7C83B43F2A52BB2B004BF4A4 /* CNGlobalEnum.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNGlobalEnum.swift; sourceTree = "<group>"; };
+		7C83B4412A541EBF004BF4A4 /* CALayer+CNLiveExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CALayer+CNLiveExtensions.swift"; sourceTree = "<group>"; };
+		7C83B4432A541F36004BF4A4 /* NSDate+CNLiveExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSDate+CNLiveExtensions.swift"; sourceTree = "<group>"; };
 		7CD675262A270F69008354C1 /* metaCode-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "metaCode-Bridging-Header.h"; sourceTree = "<group>"; };
 		7CD675272A270F6A008354C1 /* WJColorChange.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WJColorChange.h; sourceTree = "<group>"; };
 		7CD675282A270F6A008354C1 /* WJColorChange.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WJColorChange.m; sourceTree = "<group>"; };
@@ -236,10 +244,12 @@
 				790D01842A2D89E100C5978D /* UIColor+CNLiveExtensions.swift */,
 				7C49312C2A2DB9FA000E44B4 /* UITabBar+CNLiveExtensions.swift */,
 				790D019C2A2DCBD000C5978D /* UIView+CNLiveExtensions.swift */,
+				7C83B4412A541EBF004BF4A4 /* CALayer+CNLiveExtensions.swift */,
 				79282A3B2A2EDC2500B5F8CF /* NSString+CNLiveExtensions.swift */,
 				798A44EF2A305BC200815935 /* UIButton+CNLiveExtensions.swift */,
 				79396EEC2A319F220053E1AF /* NSObject+CNLiveExtensions.swift */,
 				790B1FB52A41938F0074CF00 /* UIImage+CNLiveExtensions.swift */,
+				7C83B4432A541F36004BF4A4 /* NSDate+CNLiveExtensions.swift */,
 			);
 			path = Extensions;
 			sourceTree = "<group>";
@@ -329,9 +339,8 @@
 		7963988A2A260B3300D045EB /* Classes */ = {
 			isa = PBXGroup;
 			children = (
-				7C7C62F42A4D72BA007A912E /* DB */,
 				7C2703342A3AFD130061EC50 /* Environment */,
-				7C2703312A36CC430061EC50 /* GlobalBlock */,
+				7C2703312A36CC430061EC50 /* Global */,
 				798A44F32A3077ED00815935 /* CustomView */,
 				790D01832A2D89E100C5978D /* Extensions */,
 				796398912A260C0100D045EB /* Common */,
@@ -457,12 +466,13 @@
 			path = CustomView;
 			sourceTree = "<group>";
 		};
-		7C2703312A36CC430061EC50 /* GlobalBlock */ = {
+		7C2703312A36CC430061EC50 /* Global */ = {
 			isa = PBXGroup;
 			children = (
 				7C2703322A36CC660061EC50 /* CNLiveGlobalBlock.swift */,
+				7C83B43F2A52BB2B004BF4A4 /* CNGlobalEnum.swift */,
 			);
-			path = GlobalBlock;
+			path = Global;
 			sourceTree = "<group>";
 		};
 		7C2703342A3AFD130061EC50 /* Environment */ = {
@@ -476,14 +486,25 @@
 		7C7C62F42A4D72BA007A912E /* DB */ = {
 			isa = PBXGroup;
 			children = (
-				7C7C62F52A4D72E9007A912E /* CNMetaCodeDB.swift */,
+				7C7C62F52A4D72E9007A912E /* CNIdentityDB.swift */,
 			);
 			path = DB;
 			sourceTree = "<group>";
 		};
+		7C83B43C2A52B899004BF4A4 /* ViewModel */ = {
+			isa = PBXGroup;
+			children = (
+				7C83B43D2A52B8BA004BF4A4 /* CNHomePageViewModel.swift */,
+			);
+			name = ViewModel;
+			path = HomePage/ViewModel;
+			sourceTree = "<group>";
+		};
 		7CD675212A26F844008354C1 /* HomePage */ = {
 			isa = PBXGroup;
 			children = (
+				7C7C62F42A4D72BA007A912E /* DB */,
+				7C83B43C2A52B899004BF4A4 /* ViewModel */,
 				7CD6754D2A2840B9008354C1 /* Controller */,
 				7CD675232A26F8F8008354C1 /* View */,
 			);
@@ -830,18 +851,25 @@
 				790B1FB82A41B6A60074CF00 /* CNLiveMineMessageViewController.swift in Sources */,
 				798A44F22A30674200815935 /* CNLiveMineSubBodyListView.swift in Sources */,
 				790D01822A2D88FC00C5978D /* CNLiveConfigMacro.swift in Sources */,
+				7C83B4402A52BB2B004BF4A4 /* CNGlobalEnum.swift in Sources */,
+				7C83B4442A541F36004BF4A4 /* NSDate+CNLiveExtensions.swift in Sources */,
 				7CD675482A274167008354C1 /* PGIndexBannerSubiew.m in Sources */,
 				790D019F2A2DD66E00C5978D /* CNLiveLoginViewModel.swift in Sources */,
+				7C7C62F62A4D72E9007A912E /* CNIdentityDB.swift in Sources */,
+				790B1FB62A41938F0074CF00 /* UIImage+CNLiveExtensions.swift in Sources */,
+				790D019D2A2DCBD000C5978D /* UIView+CNLiveExtensions.swift in Sources */,
 				790B1FB62A41938F0074CF00 /* UIImage+CNLiveExtensions.swift in Sources */,
 				790D019D2A2DCBD000C5978D /* UIView+CNLiveExtensions.swift in Sources */,
 				7C7C62F62A4D72E9007A912E /* CNMetaCodeDB.swift in Sources */,
 				790B1FB62A41938F0074CF00 /* UIImage+CNLiveExtensions.swift in Sources */,
 				790D019D2A2DCBD000C5978D /* UIView+CNLiveExtensions.swift in Sources */,
+				7C83B4422A541EBF004BF4A4 /* CALayer+CNLiveExtensions.swift in Sources */,
 				798A44F72A3077ED00815935 /* CNLiveHotButton.swift in Sources */,
 				7CD6753D2A2740B0008354C1 /* CNMainView.swift in Sources */,
 				793CAF522A58FCA200882EF4 /* CNLiveMineExchangeViewController.swift in Sources */,
 				7CD675522A29C04B008354C1 /* CNLiveConfigstant.swift in Sources */,
 				79282A402A2F055100B5F8CF /* CNLiveConfigUserInfo.swift in Sources */,
+				7C83B43E2A52B8BA004BF4A4 /* CNHomePageViewModel.swift in Sources */,
 				7C4931382A307BDB000E44B4 /* CNHomePageGuideView.swift in Sources */,
 				7CD6753E2A2740B0008354C1 /* CNUpSlideView.swift in Sources */,
 				7CD675402A2740B0008354C1 /* CNDownSlideView.swift in Sources */,
@@ -7,7 +7,6 @@
 import Foundation
 import Qiniu
-import YYCategories
 import CNLiveRequestBastKit
 typealias ProgressBlcok = (_ key: String,_ percent: CGFloat) -> Void
-//
-//  CNMetaCodeDB.swift
-//  metaCode
-//  数据库
-//  Created by daojian on 2023/6/29.
-//
-
-import Foundation
-
@@ -11,8 +11,8 @@ import Foundation
 let APPId: String  = CNLiveEnvironmentManager.shared.appId
 ///当前应用的APPKey
 let APPKey: String = CNLiveEnvironmentManager.shared.appKey
-///当前应用的网络请求域名
-let APPBaseUrl: String! = CNLiveEnvironmentManager.shared.baseUrl
+///当前应用的登录请求域名
+let APPLoginHost: String! = CNLiveEnvironmentManager.shared.loginHost
 ///当前应用的Secret
 let APPSecret: String = CNLiveEnvironmentManager.shared.appSecret
 ///当前应用的部分请求接口
@@ -46,12 +46,14 @@ class CNLiveEnvironmentManager: NSObject{
     var appId: String
     var appKey: String
-    var baseUrl: String
     var appSecret: String
+    ///登录接口域名
+    var loginHost: String
+    /// 码云项目的主域名
     var base_mc_url: String
+    /// 获取IM token 请求域名
     var img_token_url: String
-    
     ///当前环境
     var currentEnvironment: CNLiveEnvironment
@@ -59,7 +61,7 @@ class CNLiveEnvironmentManager: NSObject{
     private override init() {
         self.appId = ""
         self.appKey = ""
-        self.baseUrl = ""
+        self.loginHost = ""
         self.appSecret = ""
         self.base_mc_url = ""
         self.img_token_url = ""
@@ -94,7 +96,7 @@ class CNLiveEnvironmentManager: NSObject{
         self.appId = "802_li40qhp922"
         self.appKey = "ae3a7ad3e4b9beb7cfe2078db648ebb89aa249ca2e82ac"
         self.appSecret = "3cc9f12db322a3d3656012ef929604cf6d6847471535f9"
-        self.baseUrl = "https://api.cnlive.com"
+        self.loginHost = "https://api.cnlive.com"
         self.img_token_url = "https://api.cnlive.com/open/api2"
         self.base_mc_url = "https://metacode.cnlive.com/api"
     }
@@ -103,7 +105,7 @@ class CNLiveEnvironmentManager: NSObject{
         self.appId = "802_li40qhp922"
         self.appKey = "ae3a7ad3e4b9beb7cfe2078db648ebb89aa249ca2e82ac"
         self.appSecret = "3cc9f12db322a3d3656012ef929604cf6d6847471535f9"
-        self.baseUrl = "https://api.cnlive.com"
+        self.loginHost = "https://api.cnlive.com"
         self.img_token_url = "https://api.cnlive.com/open/api2"
         self.base_mc_url = "https://metacode.cnlive.com/api"
     }
@@ -112,7 +114,7 @@ class CNLiveEnvironmentManager: NSObject{
         self.appId = "769_li40lrkt53"
         self.appKey = "064f392f84dfe7bbe9f1eabeda53ea02044213019b0406"
         self.appSecret = "68b5cc42fbdb466d56c2e22b00b1494feec8149f9dd32e"
-        self.baseUrl = "https://api.cnlive.com"
+        self.loginHost = "https://api.cnlive.com"
         self.img_token_url = "https://api.cnlive.com/open/api2"
         self.base_mc_url = "https://metacode.cnlive.com/api"
     }
+//
+//  CALayer+CNLiveExtensions.swift
+//  metaCode
+//
+//  Created by daojian on 2023/7/4.
+//
+
+import Foundation
+
+extension CALayer{
+    
+    public var left:CGFloat{
+        
+        set{
+            
+            var frame = self.frame
+            
+            frame.origin.x = newValue
+            
+            self.frame = frame
+            
+        }
+        
+        get{
+            
+            return self.frame.origin.x
+            
+        }
+        
+    }
+    
+    public var top:CGFloat{
+        
+        set{
+            
+            var frame = self.frame
+            
+            frame.origin.y = newValue
+            
+            self.frame = frame
+            
+        }
+        
+        get{
+            
+            return self.frame.origin.y
+            
+        }
+        
+    }
+    
+    public var right:CGFloat{
+        
+        set{
+            
+            var frame = self.frame
+            
+            frame.origin.x = newValue - frame.size.width
+            
+            self.frame = frame
+            
+        }
+        
+        get{
+            
+            return self.frame.origin.x + self.frame.size.width
+            
+        }
+        
+    }
+    
+    public var bottom:CGFloat{
+        
+        set{
+            
+            var frame = self.frame
+            
+            frame.origin.y = newValue - frame.size.height
+            
+            self.frame = frame
+            
+        }
+        
+        get{
+            
+            return self.frame.origin.y + self.frame.size.height
+            
+        }
+        
+    }
+    public var center:CGPoint{
+        set{
+            var frame = self.frame;
+            frame.origin.x = newValue.x - frame.size.width * 0.5;
+            frame.origin.y = newValue.y - frame.size.height * 0.5;
+            self.frame = frame;
+        }
+        
+        get{
+            
+            return CGPointMake(self.frame.origin.x + self.frame.size.width * 0.5,
+                               self.frame.origin.y + self.frame.size.height * 0.5);
+        }
+    }
+    public var centerX:CGFloat{
+        
+        set{
+            
+            var  frame = self.frame;
+            frame.origin.x = newValue - frame.size.width * 0.5;
+            self.frame = frame;
+            
+        }
+        
+        get{
+            
+            return self.frame.origin.x + self.frame.size.width * 0.5;
+            
+        }
+        
+    }
+    
+    public var centerY:CGFloat{
+        
+        set{
+            
+            var frame = self.frame;
+            frame.origin.y = newValue - frame.size.height * 0.5;
+            self.frame = frame;
+        }
+        
+        get{
+            
+            return self.frame.origin.y + self.frame.size.height * 0.5;
+
+        }
+        
+    }
+    
+    public var width:CGFloat{
+        
+        set{
+            
+            var frame = self.frame
+            
+            frame.size.width = newValue
+            
+            self.frame = frame
+            
+        }
+        
+        get{
+            
+            return self.frame.size.width
+            
+        }
+        
+    }
+    
+   public var height:CGFloat{
+        
+        set{
+            
+            var frame = self.frame
+            
+            frame.size.height = newValue
+            
+            self.frame = frame
+            
+        }
+        
+        get{
+            
+            return self.frame.size.height
+            
+        }
+        
+    }
+    
+
+    public var origin:CGPoint{
+        set{
+            var frame = self.frame
+            frame.origin = newValue
+            self.frame = frame
+        }
+        
+        get{
+            return self.frame.origin
+        }
+    }
+    
+    public var size:CGSize {
+        set{
+            var frame = self.frame;
+            frame.size = newValue;
+            self.frame = frame;
+        }
+        
+        get{
+            return self.frame.size
+        }
+    }
+}
+//
+//  NSDate+CNLiveExtensions.swift
+//  metaCode
+//
+//  Created by daojian on 2023/7/4.
+//
+
+import Foundation
+
+extension NSDate{
+    
+    func string(withFormat format:String)->String{
+        let formatter: DateFormatter = DateFormatter()
+        formatter.dateFormat = format
+        formatter.locale = Locale.current
+        return formatter.string(from: self as Date)
+    }
+    
+}
@@ -18,4 +18,21 @@ extension NSString {
         var val:Int = 0
         return scan.scanInt(&val) && scan.isAtEnd
     }
+    
+    
+    /// 当前字符串是否为空
+    /// - Returns: YES:不为空, NO为空
+    func isNotBlank()->Bool {
+       
+        let blank:NSCharacterSet = NSCharacterSet.whitespacesAndNewlines as NSCharacterSet
+
+        let count = self.length
+        for i in (0..<count) {
+            let c: unichar = self.character(at: i)
+            if(!blank.characterIsMember(c)){
+                return true
+            }
+        }
+        return false;
+    }
 }
@@ -57,4 +57,182 @@ extension UIView {
         maskLayer.path = maskPath.cgPath
         self.layer.mask = maskLayer
     }
+    
+    
+    public var left:CGFloat{
+        
+        set{
+            
+            var frame = self.frame
+            
+            frame.origin.x = newValue
+            
+            self.frame = frame
+            
+        }
+        
+        get{
+            
+            return self.frame.origin.x
+            
+        }
+        
+    }
+    
+    public var top:CGFloat{
+        
+        set{
+            
+            var frame = self.frame
+            
+            frame.origin.y = newValue
+            
+            self.frame = frame
+            
+        }
+        
+        get{
+            
+            return self.frame.origin.y
+            
+        }
+        
+    }
+    
+    public var right:CGFloat{
+        
+        set{
+            
+            var frame = self.frame
+            
+            frame.origin.x = newValue - frame.size.width
+            
+            self.frame = frame
+            
+        }
+        
+        get{
+            
+            return self.frame.origin.x + self.frame.size.width
+            
+        }
+        
+    }
+    
+    public var bottom:CGFloat{
+        
+        set{
+            
+            var frame = self.frame
+            
+            frame.origin.y = newValue - frame.size.height
+            
+            self.frame = frame
+            
+        }
+        
+        get{
+            
+            return self.frame.origin.y + self.frame.size.height
+            
+        }
+        
+    }
+    
+    public var centerX:CGFloat{
+        
+        set{
+            
+            self.center = CGPoint(x:newValue, y:self.center.x)
+            
+        }
+        
+        get{
+            
+            return self.center.x
+            
+        }
+        
+    }
+    
+    public var centerY:CGFloat{
+        
+        set{
+            
+            self.center = CGPoint(x:self.center.x, y:newValue)
+            
+        }
+        
+        get{
+            
+            return self.center.y
+            
+        }
+        
+    }
+    
+    public var width:CGFloat{
+        
+        set{
+            
+            var frame = self.frame
+            
+            frame.size.width = newValue
+            
+            self.frame = frame
+            
+        }
+        
+        get{
+            
+            return self.frame.size.width
+            
+        }
+        
+    }
+    
+   public var height:CGFloat{
+        
+        set{
+            
+            var frame = self.frame
+            
+            frame.size.height = newValue
+            
+            self.frame = frame
+            
+        }
+        
+        get{
+            
+            return self.frame.size.height
+            
+        }
+        
+    }
+    
+
+    public var origin:CGPoint{
+        set{
+            var frame = self.frame
+            frame.origin = newValue
+            self.frame = frame
+        }
+        
+        get{
+            return self.frame.origin
+        }
+    }
+    
+    public var size:CGSize {
+        set{
+            var frame = self.frame;
+            frame.size = newValue;
+            self.frame = frame;
+        }
+        
+        get{
+            return self.frame.size
+        }
+    }
 }
+//
+//  CNGlobalEnum.swift
+//  metaCode
+//
+//  Created by daojian on 2023/7/3.
+//
+
+import Foundation
+///网络请求响应状态
+enum CNNetworkingResponseType {
+    ///成功
+    case success
+    ///失败
+    case failed
+    ///无网
+    case noNetwork
+}
+//
+//  CNMetaCodeDB.swift
+//  metaCode
+//  数据库
+//  Created by daojian on 2023/6/29.
+//
+
+import Foundation
+import WCDBSwift
+
+///身份认证表名
+let CNIdentityTableName = "CNIdentityTable"
+
+///身份model
+class CNIdentityModel: BaseModel,TableCodable {
+    var id: String = ""
+    var name: String?
+    var icon: String?
+    var createTime: String?
+    var enable: Bool?
+    
+    enum CodingKeys: String, CodingTableKey {
+        typealias Root = CNIdentityModel
+        static let objectRelationalMapping = TableBinding(CodingKeys.self){
+            //设置表的主键key为id,用来区分数据唯一性, 如果id为int类型,可以按实现按顺序递增
+            BindColumnConstraint(id, isPrimary: true)
+        }
+        case id         //不修改数据库字段名,和属性名保持一直
+        case name       //不修改数据库字段名,和属性名保持一直
+        case icon
+        case createTime
+        case enable
+    }
+    
+}
+
+///身份列表数据库
+class CNIdentityDB :NSObject{
+    
+    ///数据库
+    var database:Database
+    
+    //重新init方法为私有,不让外部调用
+    override init() {
+        
+        //数据库地址
+        let filePath = NSHomeDirectory() + "/Documents/DB/CNIdentity.db"
+        database = Database(at: filePath)
+        
+        super.init()
+        self.createTable(name: CNIdentityTableName, classType: CNIdentityModel.self)
+    }
+    
+    /// 创建表
+    /// - Parameters:
+    ///   - name: 表名
+    ///   - classType: class类型,当前class需要实现 TableCodable
+    private func createTable<Root:TableDecodable>(name:String, classType: Root.Type){
+        do{
+            try  database.create(table: name, of: classType)
+        }
+        catch{
+            print("创建失败")
+        }
+                
+    }
+    
+    /// 新增一条数据
+    /// - Parameter object: 数据
+    func insterObject(object: CNIdentityModel){
+        let array: [CNIdentityModel] = [object]
+        self.insterObjects(objects: array)
+    }
+    
+    ///新增多条数据
+    func insterObjects(objects: Array<CNIdentityModel>){
+        do{
+            try  database.insert(objects, intoTable: CNIdentityTableName)
+        }
+        catch{
+            print("增加一条数据失败")
+        }
+    }
+    
+    /// 删除一条数据
+    /// - Parameter delete: 被删除的数据
+    func deleteObject(delete: CNIdentityModel){
+        
+        do{
+            try  database.delete(fromTable: CNIdentityTableName, where: CNIdentityModel.Properties.id == delete.id)
+        }
+        catch{
+            print("删除一条数据失败")
+        }
+    }
+    
+    ///更新一条数据
+    func updateObject(newObject:CNIdentityModel){
+        do{
+            //需要更新的字段
+            let updateProperties = [CNIdentityModel.Properties.name,
+                                    CNIdentityModel.Properties.icon,
+                                    CNIdentityModel.Properties.createTime,
+                                    CNIdentityModel.Properties.enable]
+            
+            try database.update(table: CNIdentityTableName, on:updateProperties, with: newObject,where: CNIdentityModel.Properties.id == newObject.id)
+        }
+        catch{
+            print("更新一条数据失败")
+        }
+    }
+    
+    ///获取所有数据
+    func searchAllObject()-> Array<CNIdentityModel>{
+        do{
+            let allData: [CNIdentityModel] =  try database.getObjects(fromTable: CNIdentityTableName)
+            return allData
+        }
+        catch{
+            print("获取失败")
+            return []
+        }
+        
+
+    }
+
+}
+
+
+
@@ -7,8 +7,8 @@
 import Foundation
 import UIKit
-import YYCategories
 import SwiftGifOrigin
+import CNLiveRequestBastKit
 let Width: CGFloat  = UIScreen.main.bounds.size.width
 let Height: CGFloat = UIScreen.main.bounds.size.height
@@ -98,7 +98,7 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
     private var tabBarY:CGFloat = 0.0
     ///用户身份认证状态
-    private var identityStatus: UserIdentityStatus = .haveBeenCertified
+    private var identityStatus: UserIdentityStatus = .notCertified
     // MARK: - 懒加载
     ///数据源
@@ -139,9 +139,11 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
         self.tabBarY = (self.tabBarController?.tabBar.top)!
-        for i in (0..<5) {
-            self.dataArray.add("122")
-        }
+//        for i in (0..<5) {
+//            self.dataArray.add("122")
+//        }
+        
+        self.getUserIdentityApi()
         self.setupUI()
@@ -154,14 +156,52 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
         print("uid = ",UserInfoManager.shared.userInfo.uid)
         print("1111")
+        
+//        let db = CNIdentityDB()
+//
+//
+//        let model = CNIdentityModel()
+//        model.id = "q_123"
+//        model.name = "小米"
+//        db.insterObject(object: model)
+//
+//        let model2 = CNIdentityModel()
+//        model2.id = "a_451"
+//        model2.name = "小明"
+//        db.insterObject(object: model2)
+//
+//        let model4 = CNIdentityModel()
+//        model4.id = "3_234"
+//        model4.name = "小张"
+//        db.insterObject(object: model4)
+//
+//
+//        let time:DispatchTime = DispatchTime.now() + 2.0
+//        DispatchQueue.main.asyncAfter(deadline: time, execute: DispatchWorkItem(block: {
+//
+//            let modelNew = CNIdentityModel()
+//            modelNew.id = "a_451"
+//            modelNew.name = "小张"
+//            modelNew.icon = "http://apple.com"
+//            modelNew.createTime = "1234555223"
+//            modelNew.enable = true
+//            db.updateObject(newObject: modelNew)
+//
+//            let allData = CNIdentityDB().searchAllObject()
+//            print(allData)
+//
+//        }))
+
+        
     }
     override func viewDidAppear(_ animated: Bool) {
         super.viewDidAppear(animated)
         self.view.height = KSreenHeight
         self.topNavView.isHidden = true
-        
     }
+    
+    
     // MARK: - 添加UI
     func setupUI(){
         self.view.backgroundColor = KVCBackgroupColor
@@ -344,5 +384,27 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
             }
         }
     }
+    //MARK: - 网络请求
+    func getUserIdentityApi(){
+        CNHomePageViewModel.getUserIdentityApi { listArray, responseType, errorMsg in
+            switch responseType{
+                case .success:
+                    if(listArray.count>0){
+                        self.addCertificationView.isHidden = true
+                        self.addCertificationView.removeFromSuperview()
+                        self.dataArray.addObjects(from: listArray)
+                        self.addPageView()
+                        self.identityStatus = .haveBeenCertified
+                    }else{
+                        self.identityStatus = .notCertified
+                    }
+                   
+                case .failed:
+                    showMessage(message: errorMsg)
+                case .noNetwork:
+                    showMessage(message: "网络未连接")
+                }
+        }
+    }
 }
@@ -7,7 +7,6 @@
 import Foundation
 import UIKit
-import YYCategories
 typealias backBlock = ()->Void;
@@ -6,7 +6,6 @@
 //
 import Foundation
-import YYCategories
 ///下滑显示提醒View
 class CNDownSlideViewRemindView : UIView{
@@ -6,7 +6,6 @@
 //
 import Foundation
-import YYCategories
 ///旋转动画时间
 let KTransformAnimationTime:CGFloat  = 0.75;
@@ -6,7 +6,6 @@
 //
 import Foundation
-import YYCategories
 import WebKit
 ///上滑显示的VIew
@@ -6,7 +6,6 @@
 //
 import Foundation
-import YYCategories
 /// 上拉显示提醒View
 class CNUpSlideViewRemindView:UIView{
+//
+//  CNHomePageViewModel.swift
+//  metaCode
+//
+//  Created by daojian on 2023/7/3.
+//
+
+import Foundation
+import CNLiveRequestBastKit
+
+///请求响应回调
+typealias responseBlock = (_ listArray:Array<CNIdentityModel>, _ responseType:CNNetworkingResponseType, _ errorMsg:String) -> Void
+
+class CNHomePageViewModel:NSObject {
+    
+    /// 获取身份列表
+    class func getUserIdentityApi(resultBlock:@escaping responseBlock){
+        
+        //先从本地获取,本地有直接返回
+        let db = CNIdentityDB()
+        let allDbArray = db.searchAllObject()
+        if(allDbArray.count > 0){
+            resultBlock(allDbArray,.success,"")
+            return
+        }
+        
+        //从网络获取
+        CNLiveNetworking.setAllowRequestDefaultArgument(false)
+        CNLiveNetworking.setupShowDataResult(false)
+        CNLiveNetworking.requestNetwork(with: .GET, urlString: "\(APPBaseMCUrl)/identityApi/list?sid=\(UserInfoManager.shared.userInfo.uid)&page=1&pageSize=1000", param: nil, cacheType: .networkOnly) { task , result, error in
+            
+            if((error) != nil){
+                //网络请求失败
+                if CNLiveNetworking.isNetworking(){
+                    resultBlock([],.failed,error?.localizedDescription ?? "请求失败")
+                }else{
+                    resultBlock([],.noNetwork,"无网络连接")
+                }
+                return
+            }
+            
+            let resultDic:NSDictionary = result as! NSDictionary
+            
+            let errorCode:String = "\(resultDic["errorCode"]!)"
+            if (errorCode == "0"){
+                let data:NSDictionary =  resultDic["data"] as! NSDictionary
+                let list:NSArray      = data["list"] as! NSArray
+                
+                //list数据转CNIdentityModel, 并把model存入本地
+                
+                var array:Array = Array<CNIdentityModel>()
+                for index in 0..<list.count{
+                    let item = dictionaryToModel(list[index] as! [String : Any], CNIdentityModel.self, "")
+                    array.append(item as! CNIdentityModel)
+                    //存入数据库
+                    db.insterObject(object: item as! CNIdentityModel)
+                }
+                resultBlock(array,.success,"")
+            }
+            else{
+                let errorMessage:String = resultDic["errorMessage"] as! String
+                showMessage(message: errorMessage)
+                resultBlock([],.failed,errorMessage)
+            }
+            
+        }
+        
+    }
+    
+    
+}
@@ -6,7 +6,6 @@
 //
 import Foundation
-import YYCategories
 import CNLiveRequestBastKit
 import HandyJSON
@@ -6,7 +6,6 @@
 //
 import Foundation
-import YYCategories
 import WebKit
 enum ListShowInfoType {
@@ -57,7 +57,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         CNLiveNetworking.setupSignKey(APPKey)
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
         CNLiveNetworking.setResponseSerializerType(.JSON)
-        CNLiveNetworking.setupBaseURL(APPBaseUrl)
+        CNLiveNetworking.setupBaseURL(APPLoginHost)
     }
@@ -11,7 +11,6 @@
 #import "NewPagedFlowView.h"
 //#import<CNLiveCommonCategory/UIColor+CNLiveExtension.h>
-//#import<YYCategories/YYCategories.h>
 @interface NewPagedFlowView ()