修改DB命名

liushiyu
1 parent 96998f93
Showing 5 changed files with 47 additions and 49 deletions
metaCode.xcodeproj/project.pbxproj
metaCode/Classes/Main/DB/CNIdentityDB.swift → metaCode/Classes/Config/Database/CNLiveIdentityDB.swift
metaCode/Classes/Global/CNGlobalEnum.swift
metaCode/Classes/Main/HomePage/Controller/CNMetaCodeHomePageController.swift
metaCode/Classes/Main/HomePage/ViewModel/CNHomePageViewModel.swift
@@ -62,7 +62,7 @@
 		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 /* CNIdentityDB.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C7C62F52A4D72E9007A912E /* CNIdentityDB.swift */; };
+		7C7C62F62A4D72E9007A912E /* CNLiveIdentityDB.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C7C62F52A4D72E9007A912E /* CNLiveIdentityDB.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 */; };
@@ -163,7 +163,7 @@
 		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 /* CNIdentityDB.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNIdentityDB.swift; sourceTree = "<group>"; };
+		7C7C62F52A4D72E9007A912E /* CNLiveIdentityDB.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveIdentityDB.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>"; };
@@ -336,6 +336,14 @@
 			path = Util;
 			sourceTree = "<group>";
 		};
+		79579CAA2AAAE905006E5B38 /* Database */ = {
+			isa = PBXGroup;
+			children = (
+				7C7C62F52A4D72E9007A912E /* CNLiveIdentityDB.swift */,
+			);
+			path = Database;
+			sourceTree = "<group>";
+		};
 		7963988A2A260B3300D045EB /* Classes */ = {
 			isa = PBXGroup;
 			children = (
@@ -408,6 +416,7 @@
 		796398922A260C0100D045EB /* Config */ = {
 			isa = PBXGroup;
 			children = (
+				79579CAA2AAAE905006E5B38 /* Database */,
 				7CD675512A29C04B008354C1 /* CNLiveConfigstant.swift */,
 				790D01812A2D88FC00C5978D /* CNLiveConfigMacro.swift */,
 				790D01902A2DAC5E00C5978D /* CNLiveConfigFontMacro.swift */,
@@ -483,14 +492,6 @@
 			path = Environment;
 			sourceTree = "<group>";
 		};
-		7C7C62F42A4D72BA007A912E /* DB */ = {
-			isa = PBXGroup;
-			children = (
-				7C7C62F52A4D72E9007A912E /* CNIdentityDB.swift */,
-			);
-			path = DB;
-			sourceTree = "<group>";
-		};
 		7C83B43C2A52B899004BF4A4 /* ViewModel */ = {
 			isa = PBXGroup;
 			children = (
@@ -503,7 +504,6 @@
 		7CD675212A26F844008354C1 /* HomePage */ = {
 			isa = PBXGroup;
 			children = (
-				7C7C62F42A4D72BA007A912E /* DB */,
 				7C83B43C2A52B899004BF4A4 /* ViewModel */,
 				7CD6754D2A2840B9008354C1 /* Controller */,
 				7CD675232A26F8F8008354C1 /* View */,
@@ -855,12 +855,12 @@
 				7C83B4442A541F36004BF4A4 /* NSDate+CNLiveExtensions.swift in Sources */,
 				7CD675482A274167008354C1 /* PGIndexBannerSubiew.m in Sources */,
 				790D019F2A2DD66E00C5978D /* CNLiveLoginViewModel.swift in Sources */,
-				7C7C62F62A4D72E9007A912E /* CNIdentityDB.swift in Sources */,
+				7C7C62F62A4D72E9007A912E /* CNLiveIdentityDB.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 */,
+				7C7C62F62A4D72E9007A912E /* CNLiveIdentityDB.swift in Sources */,
 				790B1FB62A41938F0074CF00 /* UIImage+CNLiveExtensions.swift in Sources */,
 				790D019D2A2DCBD000C5978D /* UIView+CNLiveExtensions.swift in Sources */,
 				7C83B4422A541EBF004BF4A4 /* CALayer+CNLiveExtensions.swift in Sources */,
 //
-//  CNMetaCodeDB.swift
+//  CNLiveMetaCodeDB.swift
 //  metaCode
 //  数据库
 //  Created by daojian on 2023/6/29.
@@ -9,10 +9,10 @@ import Foundation
 import WCDBSwift
 ///身份认证表名
-let CNIdentityTableName = "CNIdentityTable"
+let CNLiveIdentityTableName = "CNLiveIdentityTable"
 ///身份model
-class CNIdentityModel: BaseModel,TableCodable {
+class CNLiveIdentityModel: BaseModel,TableCodable {
     var id: String = ""
     var name: String?
     var icon: String?
@@ -20,7 +20,7 @@ class CNIdentityModel: BaseModel,TableCodable {
     var enable: Bool?
     enum CodingKeys: String, CodingTableKey {
-        typealias Root = CNIdentityModel
+        typealias Root = CNLiveIdentityModel
         static let objectRelationalMapping = TableBinding(CodingKeys.self){
             //设置表的主键key为id,用来区分数据唯一性, 如果id为int类型,可以按实现按顺序递增
             BindColumnConstraint(id, isPrimary: true)
@@ -35,7 +35,7 @@ class CNIdentityModel: BaseModel,TableCodable {
 }
 ///身份列表数据库
-class CNIdentityDB :NSObject{
+class CNLiveIdentityDB :NSObject{
     ///数据库
     var database:Database
@@ -44,11 +44,11 @@ class CNIdentityDB :NSObject{
     override init() {
         //数据库地址
-        let filePath = NSHomeDirectory() + "/Documents/DB/CNIdentity.db"
+        let filePath = NSHomeDirectory() + "/Documents/DB/CNLiveIdentity.db"
         database = Database(at: filePath)
         super.init()
-        self.createTable(name: CNIdentityTableName, classType: CNIdentityModel.self)
+        self.createTable(name: CNLiveIdentityTableName, classType: CNLiveIdentityModel.self)
     }
     /// 创建表
@@ -58,8 +58,7 @@ class CNIdentityDB :NSObject{
     private func createTable<Root:TableDecodable>(name:String, classType: Root.Type){
         do{
             try  database.create(table: name, of: classType)
-        }
-        catch{
+        }catch{
             print("创建失败")
         }
@@ -67,27 +66,26 @@ class CNIdentityDB :NSObject{
     /// 新增一条数据
     /// - Parameter object: 数据
-    func insterObject(object: CNIdentityModel){
-        let array: [CNIdentityModel] = [object]
+    func insterObject(object: CNLiveIdentityModel){
+        let array: [CNLiveIdentityModel] = [object]
         self.insterObjects(objects: array)
     }
     ///新增多条数据
-    func insterObjects(objects: Array<CNIdentityModel>){
+    func insterObjects(objects: Array<CNLiveIdentityModel>){
         do{
-            try  database.insert(objects, intoTable: CNIdentityTableName)
-        }
-        catch{
+            try  database.insert(objects, intoTable: CNLiveIdentityTableName)
+        }catch{
             print("增加一条数据失败")
         }
     }
     /// 删除一条数据
     /// - Parameter delete: 被删除的数据
-    func deleteObject(delete: CNIdentityModel){
+    func deleteObject(delete: CNLiveIdentityModel){
         do{
-            try  database.delete(fromTable: CNIdentityTableName, where: CNIdentityModel.Properties.id == delete.id)
+            try  database.delete(fromTable: CNLiveIdentityTableName, where: CNLiveIdentityModel.Properties.id == delete.id)
         }
         catch{
             print("删除一条数据失败")
@@ -95,15 +93,15 @@ class CNIdentityDB :NSObject{
     }
     ///更新一条数据
-    func updateObject(newObject:CNIdentityModel){
+    func updateObject(newObject:CNLiveIdentityModel){
         do{
             //需要更新的字段
-            let updateProperties = [CNIdentityModel.Properties.name,
-                                    CNIdentityModel.Properties.icon,
-                                    CNIdentityModel.Properties.createTime,
-                                    CNIdentityModel.Properties.enable]
+            let updateProperties = [CNLiveIdentityModel.Properties.name,
+                                    CNLiveIdentityModel.Properties.icon,
+                                    CNLiveIdentityModel.Properties.createTime,
+                                    CNLiveIdentityModel.Properties.enable]
-            try database.update(table: CNIdentityTableName, on:updateProperties, with: newObject,where: CNIdentityModel.Properties.id == newObject.id)
+            try database.update(table: CNLiveIdentityTableName, on:updateProperties, with: newObject,where: CNLiveIdentityModel.Properties.id == newObject.id)
         }
         catch{
             print("更新一条数据失败")
@@ -111,9 +109,9 @@ class CNIdentityDB :NSObject{
     }
     ///获取所有数据
-    func searchAllObject()-> Array<CNIdentityModel>{
+    func searchAllObject()-> Array<CNLiveIdentityModel>{
         do{
-            let allData: [CNIdentityModel] =  try database.getObjects(fromTable: CNIdentityTableName)
+            let allData: [CNLiveIdentityModel] =  try database.getObjects(fromTable: CNLiveIdentityTableName)
             return allData
         }
         catch{
@@ -7,7 +7,7 @@
 import Foundation
 ///网络请求响应状态
-enum CNNetworkingResponseType {
+enum CNLiveNetworkingResponseType {
     ///成功
     case success
     ///失败
@@ -386,7 +386,7 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
     }
     //MARK: - 网络请求
     func getUserIdentityApi(){
-        CNHomePageViewModel.getUserIdentityApi { listArray, responseType, errorMsg in
+        CNLiveHomePageViewModel.getUserIdentityApi { listArray, responseType, errorMsg in
             switch responseType{
                 case .success:
                     if(listArray.count>0){
 //
-//  CNHomePageViewModel.swift
+//  CNLiveHomePageViewModel.swift
 //  metaCode
 //
 //  Created by daojian on 2023/7/3.
@@ -9,15 +9,15 @@ import Foundation
 import CNLiveRequestBastKit
 ///请求响应回调
-typealias responseBlock = (_ listArray:Array<CNIdentityModel>, _ responseType:CNNetworkingResponseType, _ errorMsg:String) -> Void
+typealias responseBlock = (_ listArray:Array<CNLiveIdentityModel>, _ responseType:CNLiveNetworkingResponseType, _ errorMsg:String) -> Void
-class CNHomePageViewModel:NSObject {
+class CNLiveHomePageViewModel:NSObject {
     /// 获取身份列表
     class func getUserIdentityApi(resultBlock:@escaping responseBlock){
         //先从本地获取,本地有直接返回
-        let db = CNIdentityDB()
+        let db = CNLiveIdentityDB()
         let allDbArray = db.searchAllObject()
         if(allDbArray.count > 0){
             resultBlock(allDbArray,.success,"")
@@ -46,14 +46,14 @@ class CNHomePageViewModel:NSObject {
                 let data:NSDictionary =  resultDic["data"] as! NSDictionary
                 let list:NSArray      = data["list"] as! NSArray
-                //list数据转CNIdentityModel, 并把model存入本地
+                //list数据转CNLiveIdentityModel, 并把model存入本地
-                var array:Array = Array<CNIdentityModel>()
+                var array:Array = Array<CNLiveIdentityModel>()
                 for index in 0..<list.count{
-                    let item = dictionaryToModel(list[index] as! [String : Any], CNIdentityModel.self, "")
-                    array.append(item as! CNIdentityModel)
+                    let item = dictionaryToModel(list[index] as! [String : Any], CNLiveIdentityModel.self, "")
+                    array.append(item as! CNLiveIdentityModel)
                     //存入数据库
-                    db.insterObject(object: item as! CNIdentityModel)
+                    db.insterObject(object: item as! CNLiveIdentityModel)
                 }
                 resultBlock(array,.success,"")
             }