提交身份认证界面

liushiyu
1 parent ee9b8554
Showing 11 changed files with 536 additions and 95 deletions
metaCode.xcodeproj/project.pbxproj
metaCode/Classes/Config/Database/CNLiveSaveAuthDB.swift
metaCode/Classes/Config/Database/CNLiveSaveAuthDataSourceDB.swift
metaCode/Classes/Config/Database/CNLiveSaveStandDB.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveMineAddInfoViewController.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveMineAuthResultViewController.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveMineInputViewController.swift
metaCode/Classes/Main/MinePage/View/CNLiveMineBodyListView.swift
metaCode/Classes/Main/MinePage/View/CNLiveMineSubBodyListView.swift
metaCode/Classes/Main/MinePage/ViewModel/CNLiveMineBaseModel.swift
metaCode/Classes/Main/MinePage/ViewModel/CNLiveMineViewModel.swift
@@ -52,7 +52,8 @@
 		798A44FF2A30A0A800815935 /* CNLiveInputFeedBackViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 798A44FE2A30A0A800815935 /* CNLiveInputFeedBackViewController.swift */; };
 		79A68C4A2A26E6CE00DC3B43 /* (null) in Sources */ = {isa = PBXBuildFile; };
 		79A68C4C2A26EA6000DC3B43 /* (null) in Sources */ = {isa = PBXBuildFile; };
-		79BA085D2AB18E8300D01875 /* CNLiveSaveAuthDataSourceDB.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79BA085C2AB18E8300D01875 /* CNLiveSaveAuthDataSourceDB.swift */; };
+		79BA085D2AB18E8300D01875 /* CNLiveSaveAuthDB.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79BA085C2AB18E8300D01875 /* CNLiveSaveAuthDB.swift */; };
+		79EABB892AB4497700F3A4E2 /* CNLiveSaveStandDB.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79EABB882AB4497700F3A4E2 /* CNLiveSaveStandDB.swift */; };
 		79F4B1162A32B96B00993C03 /* CNLiveMineInfoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79F4B1152A32B96B00993C03 /* CNLiveMineInfoViewController.swift */; };
 		79F4B11A2A32F21400993C03 /* CNLiveMineNickViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79F4B1192A32F21400993C03 /* CNLiveMineNickViewController.swift */; };
 		79F4B11C2A33036E00993C03 /* CNLiveMineInfoAlertView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79F4B11B2A33036E00993C03 /* CNLiveMineInfoAlertView.swift */; };
@@ -156,7 +157,8 @@
 		798A44FC2A309EBA00815935 /* CNLiveTypeFeedBackViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveTypeFeedBackViewController.swift; sourceTree = "<group>"; };
 		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>"; };
-		79BA085C2AB18E8300D01875 /* CNLiveSaveAuthDataSourceDB.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveSaveAuthDataSourceDB.swift; sourceTree = "<group>"; };
+		79BA085C2AB18E8300D01875 /* CNLiveSaveAuthDB.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveSaveAuthDB.swift; sourceTree = "<group>"; };
+		79EABB882AB4497700F3A4E2 /* CNLiveSaveStandDB.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveSaveStandDB.swift; sourceTree = "<group>"; };
 		79F4B1152A32B96B00993C03 /* CNLiveMineInfoViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveMineInfoViewController.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>"; };
@@ -348,7 +350,8 @@
 			isa = PBXGroup;
 			children = (
 				7C7C62F52A4D72E9007A912E /* CNLiveIdentityDB.swift */,
-				79BA085C2AB18E8300D01875 /* CNLiveSaveAuthDataSourceDB.swift */,
+				79BA085C2AB18E8300D01875 /* CNLiveSaveAuthDB.swift */,
+				79EABB882AB4497700F3A4E2 /* CNLiveSaveStandDB.swift */,
 			);
 			path = Database;
 			sourceTree = "<group>";
@@ -856,7 +859,7 @@
 				7963989D2A260E6200D045EB /* CNLiveBaseViewController.swift in Sources */,
 				798A44FB2A30999900815935 /* CNLiveAlertTool.swift in Sources */,
 				790D01A52A2DF65E00C5978D /* CNLiveLoginPickerView.swift in Sources */,
-				79BA085D2AB18E8300D01875 /* CNLiveSaveAuthDataSourceDB.swift in Sources */,
+				79BA085D2AB18E8300D01875 /* CNLiveSaveAuthDB.swift in Sources */,
 				79282A3C2A2EDC2500B5F8CF /* NSString+CNLiveExtensions.swift in Sources */,
 				790B1FB82A41B6A60074CF00 /* CNLiveMineMessageViewController.swift in Sources */,
 				798A44F22A30674200815935 /* CNLiveMineSubBodyListView.swift in Sources */,
@@ -866,6 +869,7 @@
 				7CD675482A274167008354C1 /* PGIndexBannerSubiew.m in Sources */,
 				790D019F2A2DD66E00C5978D /* CNLiveLoginViewModel.swift in Sources */,
 				7C7C62F62A4D72E9007A912E /* CNLiveIdentityDB.swift in Sources */,
+				79EABB892AB4497700F3A4E2 /* CNLiveSaveStandDB.swift in Sources */,
 				790B1FB62A41938F0074CF00 /* UIImage+CNLiveExtensions.swift in Sources */,
 				790D019D2A2DCBD000C5978D /* UIView+CNLiveExtensions.swift in Sources */,
 				790B1FB62A41938F0074CF00 /* UIImage+CNLiveExtensions.swift in Sources */,
+//
+//  CNLiveSaveAuthDataSourceDB.swift
+//  metaCode
+//
+//  Created by open on 2023/9/13.
+//
+
+import Foundation
+import WCDBSwift
+
+///身份认证表名
+let CNLiveAuthListTableName = "CNLiveAuthListTable"
+
+class CNLiveSaveAuthDB : NSObject{
+    
+    ///数据库
+    var database: Database
+    
+    static let shared = CNLiveSaveAuthDB()
+    
+    //重新init方法为私有,不让外部调用
+    private override init() {
+        //数据库地址
+        let filePath = NSHomeDirectory() + "/Documents/DB/CNLiveAuthListTable.db"
+        database = Database(at: filePath)
+        
+        super.init()
+        do {
+            try database.create(table: CNLiveAuthListTableName, of: MineAuthListModel.self)
+        } catch {
+            print("创建失败")
+        }
+    }
+    
+    /// 新增一条数据
+    /// - Parameter object: 数据
+    func insterObject(object: MineAuthListModel){
+        let array: [MineAuthListModel] = [object]
+        do{
+            try  database.insert(array, intoTable: CNLiveAuthListTableName)
+        }catch{
+            print("增加一条数据失败")
+        }
+    }
+    
+    /// 批量增加数据
+    /// - Parameter objects: 数据组
+    func insertObjects(objects: [MineAuthListModel]) {
+        if objects.count > 0 {
+            do{
+                try  database.insert(objects, intoTable: CNLiveAuthListTableName)
+            }catch{
+                print("增加一条数据失败")
+            }
+        }else{
+            print("数据为空")
+        }
+    }
+    
+    /// 删除一条数据
+    /// - Parameter delete: 被删除的数据
+    func deleteObject(delete: MineAuthListModel){
+        
+        do{
+            try database.delete(fromTable: CNLiveAuthListTableName, where: MineAuthListModel.Properties.identityId == delete.identityId)
+        }catch{
+            print("删除一条数据失败")
+        }
+    }
+    
+    /// 删除本地所有数据
+    func deleteAllObjects() {
+        do {
+            try database.delete(fromTable: CNLiveAuthListTableName)
+        } catch {
+            print("数据删除失败")
+        }
+    }
+    
+    
+    /// 更新一条数据
+    /// - Parameter newObject: 更新的数据源
+    func updateObject(newObject: MineAuthListModel) {
+        do{
+            //需要更新的字段
+            let updateProperties = [MineAuthListModel.Properties.name,
+                                    MineAuthListModel.Properties.icon,
+                                    MineAuthListModel.Properties.cardImg,
+                                    MineAuthListModel.Properties.authTime,
+                                    MineAuthListModel.Properties.code,
+                                    MineAuthListModel.Properties.userStatus,]
+            
+            try database.update(table: CNLiveAuthListTableName, on:updateProperties, with: newObject,where: MineAuthListModel.Properties.identityId == newObject.identityId)
+        }catch{
+            print("更新一条数据失败")
+        }
+    }
+    
+    /// 更新多条数据
+    /// - Parameter newObjects: 新数据数组
+    func updateObjects(newObjects: [MineAuthListModel]) {
+        do {
+            let tempArray = NSMutableArray()
+            for _ in newObjects {
+                //需要更新的字段
+                let updateProperties = [MineAuthListModel.Properties.name,
+                                        MineAuthListModel.Properties.icon,
+                                        MineAuthListModel.Properties.cardImg,
+                                        MineAuthListModel.Properties.authTime,
+                                        MineAuthListModel.Properties.code,
+                                        MineAuthListModel.Properties.userStatus,]
+                tempArray.add(updateProperties)
+            }
+            try database.update(table: CNLiveAuthListTableName, on: tempArray as! [PropertyConvertible], with: newObjects)
+        } catch {
+            print("更新多条数据失败")
+        }
+    }
+    
+    
+    /// 获取所有数据
+    /// - Returns: 返回查找的所以数据
+    func searchAllObject() -> Array<MineAuthListModel>{
+        do{
+            let allData: [MineAuthListModel] =  try database.getObjects(fromTable: CNLiveAuthListTableName)
+            return allData
+        }catch{
+            print("获取失败")
+            return []
+        }
+    }
+    
+    /// 获取所有数据唯一值id
+    /// - Returns: 返回查找的所以数据
+    func searchAllObjectId() -> Array<String>{
+        do{
+            let allData: [MineAuthListModel] =  try database.getObjects(fromTable: CNLiveAuthListTableName)
+            let tempArray = NSMutableArray.init()
+            for item in allData {
+                tempArray.add("\(item.identityId)")
+            }
+            return tempArray as! Array<String>
+        }catch{
+            print("获取失败")
+            return []
+        }
+    }
+    
+    /// 通过id获取特定数据
+    /// - Parameter identityId: id
+    /// - Returns: 返回查找的数据
+    func searchOneObject(identityId: String) -> MineAuthListModel{
+        do {
+            let searchPropertie = [MineAuthListModel.Properties.identityId]
+            let array: [MineAuthListModel] =  try database.getObjects(on: searchPropertie, fromTable: CNLiveAuthListTableName, where: MineAuthListModel.Properties.identityId == identityId)
+            return array.count > 0 ? array.first! : MineAuthListModel.init()
+        } catch {
+            print("获取失败")
+            return MineAuthListModel.init()
+        }
+    }
+}
-//
-//  CNLiveSaveAuthDataSourceDB.swift
-//  metaCode
-//
-//  Created by open on 2023/9/13.
-//
-
-import Foundation
-import WCDBSwift
-
-///身份认证表名
-let CNLiveAuthListTableName = "CNLiveAuthListTable"
-
-
-class CNLiveAuthListDB : NSObject{
-    
-    ///数据库
-    var database:Database
-    
-    //重新init方法为私有,不让外部调用
-    override init() {
-        
-        //数据库地址
-        let filePath = NSHomeDirectory() + "/Documents/DB/CNLiveAuthListTable.db"
-        database = Database(at: filePath)
-        
-        super.init()
-        do {
-            try database.create(table: CNLiveAuthListTableName, of: MineAuthListModel.self)
-        } catch {
-            print("创建失败")
-        }
-    }
-}
+//
+//  CNLiveSaveStanDB.swift
+//  metaCode
+//
+//  Created by open on 2023/9/15.
+//
+
+import Foundation
+import WCDBSwift
+
+///身份列表表名  identityApi/allList 接口数据存储
+let CNLiveStandListTableName = "CNLiveStandListTableName"
+class CNLiveSaveStandDB: NSObject {
+    
+    ///数据库
+    var database: Database
+    
+    static let shared = CNLiveSaveStandDB()
+    
+    //重新init方法为私有,不让外部调用
+    private override init() {
+        //数据库地址
+        let filePath = NSHomeDirectory() + "/Documents/DB/CNLiveStandListTableName.db"
+        database = Database(at: filePath)
+        
+        super.init()
+        do {
+            try database.create(table: CNLiveStandListTableName, of: StandListModel.self)
+        } catch {
+            print("创建失败")
+        }
+    }
+    
+    /// 新增一条数据
+    /// - Parameter object: 数据
+    func insterObject(object: StandListModel){
+        let array: [StandListModel] = [object]
+        do{
+            try  database.insert(array, intoTable: CNLiveStandListTableName)
+        }catch{
+            print("增加一条数据失败")
+        }
+    }
+    
+    /// 批量增加数据
+    /// - Parameter objects: 数据组
+    func insertObjects(objects: [StandListModel]) {
+        if objects.count > 0 {
+            do{
+                try  database.insert(objects, intoTable: CNLiveStandListTableName)
+            }catch{
+                print("增加一条数据失败")
+            }
+        }else{
+            print("数据为空")
+        }
+    }
+    
+    /// 删除一条数据
+    /// - Parameter delete: 被删除的数据
+    func deleteObject(delete: StandListModel){
+        
+        do{
+            try database.delete(fromTable: CNLiveStandListTableName, where: StandListModel.Properties.id == delete.id)
+        }catch{
+            print("删除一条数据失败")
+        }
+    }
+    
+    /// 删除本地所有数据
+    func deleteAllObjects() {
+        do {
+            try database.delete(fromTable: CNLiveStandListTableName)
+        } catch {
+            print("数据删除失败")
+        }
+    }
+    
+    
+    /// 更新一条数据
+    /// - Parameter newObject: 更新的数据源
+    func updateObject(newObject: StandListModel){
+        do{
+            //需要更新的字段
+            let updateProperties = [StandListModel.Properties.name,
+                                    StandListModel.Properties.enable,
+                                    StandListModel.Properties.createTime,
+                                    StandListModel.Properties.createTimeString,
+                                    StandListModel.Properties.timeString,
+                                    StandListModel.Properties.auth,
+                                    StandListModel.Properties.backgroundImg,
+                                    StandListModel.Properties.backgroundColor,
+                                    StandListModel.Properties.backgroundColour,
+                                    StandListModel.Properties.description,
+                                    StandListModel.Properties.cardImg,
+                                    StandListModel.Properties.downPath,]
+            
+            try database.update(table: CNLiveStandListTableName, on:updateProperties, with: newObject,where: StandListModel.Properties.id == newObject.id)
+        }catch{
+            print("更新一条数据失败")
+        }
+    }
+    
+    /// 更新多条数据
+    /// - Parameter newObjects: 新数据数组
+    func updateObjects(newObjects: [StandListModel]) {
+        do {
+            let tempArray = NSMutableArray()
+            for _ in newObjects {
+                //需要更新的字段
+                let updateProperties = [StandListModel.Properties.name,
+                                        StandListModel.Properties.enable,
+                                        StandListModel.Properties.createTime,
+                                        StandListModel.Properties.createTimeString,
+                                        StandListModel.Properties.timeString,
+                                        StandListModel.Properties.auth,
+                                        StandListModel.Properties.backgroundImg,
+                                        StandListModel.Properties.backgroundColor,
+                                        StandListModel.Properties.backgroundColour,
+                                        StandListModel.Properties.description,
+                                        StandListModel.Properties.cardImg,
+                                        StandListModel.Properties.downPath,]
+                tempArray.add(updateProperties)
+            }
+            try database.update(table: CNLiveStandListTableName, on: tempArray as! [PropertyConvertible], with: newObjects)
+        } catch {
+            print("更新多条数据失败")
+        }
+    }
+    
+    
+    /// 获取所有数据
+    /// - Returns: 返回查找的所以数据
+    func searchAllObject() -> Array<StandListModel>{
+        do{
+            let allData: [StandListModel] =  try database.getObjects(fromTable: CNLiveStandListTableName)
+            return allData
+        }catch{
+            print("获取失败")
+            return []
+        }
+    }
+    
+    /// 获取所有数据唯一值id
+    /// - Returns: 返回查找的所以数据
+    func searchAllObjectId() -> Array<String>{
+        do{
+            let allData: [StandListModel] =  try database.getObjects(fromTable: CNLiveStandListTableName)
+            let tempArray = NSMutableArray.init()
+            for item in allData {
+                tempArray.add("\(item.id)")
+            }
+            return tempArray as! Array<String>
+        }catch{
+            print("获取失败")
+            return []
+        }
+    }
+    
+    /// 通过id获取特定数据
+    /// - Parameter identityId: id
+    /// - Returns: 返回查找的数据
+    func searchOneObject(identityId: String) -> StandListModel{
+        do {
+            let searchPropertie = [StandListModel.Properties.id]
+            let array: [StandListModel] =  try database.getObjects(on: searchPropertie, fromTable: CNLiveStandListTableName, where: StandListModel.Properties.id == identityId)
+            return array.count > 0 ? array.first! : StandListModel.init()
+        } catch {
+            print("获取失败")
+            return StandListModel.init()
+        }
+    }
+    
+}
@@ -154,12 +154,14 @@ class CNLiveMineAddInfoViewController : CNLiveBaseViewController, UITableViewDel
                     if listBaseModel.pageNum == 1 {
                         self!.dataArray.removeAllObjects()
                         self!.dataArray.addObjects(from: (result as! MineAuthListBaseModel).list)
-                        self!.tableView.reloadData()
-                        self!.tableView.mj_header?.endRefreshing()
-                        self!.tableView.mj_footer?.endRefreshing()
                     }
+                    if listBaseModel.pageNum > 1 {
+                        self!.dataArray.addObjects(from: (result as! MineAuthListBaseModel).list)
+                    }
+                    self!.tableView.reloadData()
+                    self!.tableView.mj_header?.endRefreshing()
+                    self!.tableView.mj_footer?.endRefreshing()
                     if listBaseModel.total == listBaseModel.pageNum {
-                        self!.tableView.mj_footer?.endRefreshing()
                         self!.tableView.mj_footer?.endRefreshingWithNoMoreData()
                         self!.tableView.reloadData()
                     }
@@ -271,7 +273,7 @@ extension CNLiveMineAddInfoViewController {
                 return MineStandInfoTableViewCell()
             }
             let listModel = listArray[indexPath.row]
-            cell.setupWithDataSource(icon: listModel.poster, name: listModel.title,number: listModel.subTitle, time: listModel.createTimeString)
+            cell.setupWithMessageDataSource(icon: listModel.poster, name: listModel.title,number: listModel.subTitle, time: listModel.createTimeString)
             cell.userInteractionEnabledWhileDragging = true
             return cell
         } else {
@@ -279,7 +281,7 @@ extension CNLiveMineAddInfoViewController {
                 return MineStandInfoTableViewCell()
             }
             let authModel = dataArray[indexPath.row] as! MineAuthListModel
-            cell.setupWithDataSource(icon: authModel.icon!, name: authModel.name!,number: "\(authModel.code)")
+            cell.setupWithAuthDataSource(icon: authModel.icon!, name: authModel.name!,number: authModel.code!)
             cell.userInteractionEnabledWhileDragging = false
             return cell
         }
@@ -319,6 +321,8 @@ extension CNLiveMineAddInfoViewController {
                    to destinationIndexPath: IndexPath) {
         objc_sync_enter(self)
         swap(&dataArray[sourceIndexPath.row], &dataArray[destinationIndexPath.row])
+        CNLiveSaveAuthDB.shared.deleteAllObjects()
+        CNLiveSaveAuthDB.shared.insertObjects(objects: dataArray as! [MineAuthListModel])
         objc_sync_exit(self)
     }
 }
@@ -116,13 +116,14 @@ class CNLiveMineAuthResultViewController: CNLiveBaseViewController {
     @objc func sendInfoActionMothod() {
         if _show_type == .result_failer || _show_type == .result_success {
-            let tempArray = NSMutableArray.init()
-            self.navigationController?.viewControllers.forEach({ item in
-                if (item.isKind(of: NSClassFromString("CNLiveMineInputViewController")!)) {
-                    tempArray.remove(item)
-                }
-            })
-            self.navigationController?.viewControllers = tempArray as! [CNLiveBaseViewController]
+//            let tempArray = NSMutableArray.init()
+//            self.navigationController?.viewControllers.forEach({ item in
+//                if (item.isKind(of: NSClassFromString("CNLiveMineInputViewController")!)) {
+//                    tempArray.remove(item)
+//                }
+//            })
+//            self.navigationController?.viewControllers = tempArray as! [CNLiveBaseViewController]
+            self.navigationController?.popToViewController(CNLiveMineAddInfoViewController.init(show_type: .add), animated: true)
         }
     }
 }
@@ -7,8 +7,10 @@
 import Foundation
 import EmptyDataSet_Swift
+import HXPHPicker
-class CNLiveMineInputViewController : CNLiveBaseViewController, UITableViewDelegate, UITableViewDataSource, EmptyDataSetSource, EmptyDataSetDelegate{
+typealias resultUploadImageBlock = (_ url: String) -> Void
+class CNLiveMineInputViewController : CNLiveBaseViewController, UITableViewDelegate, UITableViewDataSource, EmptyDataSetSource, EmptyDataSetDelegate, PhotoPickerControllerDelegate{
     let kMineBodyInputAuthCellIdentifier = "kMineBodyInputAuthCellIdentifier"
     lazy var tableView: UITableView = {
@@ -40,8 +42,10 @@ class CNLiveMineInputViewController : CNLiveBaseViewController, UITableViewDeleg
     lazy var dataArray: NSMutableArray = {
         return NSMutableArray.init()
     }()
-    
+
+    var select_image: UIImage!
     var _listModel:StandListModel!
+    var tempCell:MineBodyInputAuthCell!
     init(listModel:StandListModel) {
        super.init(nibName:nil, bundle:nil)
         _listModel = listModel
@@ -102,16 +106,31 @@ class CNLiveMineInputViewController : CNLiveBaseViewController, UITableViewDeleg
     @objc func sendInfoActionMothod() {
-        CNLiveMineViewModel.requestsPOSTAuthInfo(identityId: "\(_listModel.id)", infos: self.dataArray) { [self] result, respStatue in
-            if respStatue == .success {
-                showMessage(message: "上传成功")
-                DispatchQueue.main.asyncAfter(deadline: .now()+1) { [self] in
-                    self.navigationController?.pushViewController(CNLiveMineAuthResultViewController.init(listModel: _listModel,show_type: .result_success), animated: true)
+        setupWithContentUploadImage { [self] url in
+            self.tempCell._infoModel?.value = url
+            CNLiveMineViewModel.requestsPOSTAuthInfo(identityId: "\(_listModel.id)", infos: self.dataArray) { [self] result, respStatue in
+                if respStatue == .success {
+                    showMessage(message: "上传成功")
+                    DispatchQueue.main.asyncAfter(deadline: .now()+1) { [self] in
+                        self.navigationController?.pushViewController(CNLiveMineAuthResultViewController.init(listModel: _listModel,show_type: .result_success), animated: true)
+                    }
                 }
             }
         }
     }
+    private func setupWithContentUploadImage(resultUploadImageBlock: @escaping resultUploadImageBlock) {
+        if select_image != nil {
+            UploadManager.uploadImage(imageData: select_image.jpegData(compressionQuality: 1.0)! as NSData, progressBlock: {key, progress in
+                print("获取进度==>\(progress)")
+            }, successBlock: { key,url in
+                resultUploadImageBlock(url)
+            })
+        } else {
+            resultUploadImageBlock("")
+        }
+    }
+    
     func setupHeaderAndFooter(is_last: Bool) -> UIView {
         let mainView = UIView.init(frame: CGRect(x: 0, y: 0, width: Int(KSreenWidth), height: 10));
@@ -142,15 +161,36 @@ extension CNLiveMineInputViewController {
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         let cell = tableView.dequeueReusableCell(withIdentifier: kMineBodyInputAuthCellIdentifier) as! MineBodyInputAuthCell
-        cell.setListModel(infoModel: self.dataArray[indexPath.row] as! MineStandInfoModel, is_last: indexPath.row == self.dataArray.count - 1) { [weak self] in
-            let is_result = self?.inspectResult()
-            self?.setupWithSendBtnStatue(statue: is_result ?? true)
+        cell.setListModel(infoModel: self.dataArray[indexPath.row] as! MineStandInfoModel, is_last: indexPath.row == self.dataArray.count - 1) {[weak self] type in
+            if type == .end {
+                let is_result = self?.inspectResult()
+                self?.setupWithSendBtnStatue(statue: is_result ?? true)
+            }
+            if type == .select {
+                var crop = PhotoCroppingConfiguration.init()
+                crop.isRoundCrop = true
+                let configuration = PhotoEditorConfiguration()
+                configuration.state = .cropping
+                configuration.cropping = crop
+                configuration.fixedCropState = true
+                let config = PhotoTools.getWXPickerConfig()
+                config.selectMode = .single
+                config.selectOptions = .photo
+                config.photoEditor = configuration
+                config.maximumSelectedPhotoCount = 1
+                let pickerController = PhotoPickerController(picker: config)
+                pickerController.pickerDelegate = self
+                pickerController.isOriginal = false
+                self?.navigationController?.present(pickerController, animated: true, completion: nil)
+                self?.tempCell = cell
+            }
         }
         return cell
     }
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
-        return 50
+        let infoModel = self.dataArray[indexPath.row] as! MineStandInfoModel
+        return infoModel.inputType == 6 ? 70 : 50
     }
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
@@ -169,6 +209,19 @@ extension CNLiveMineInputViewController {
         }
     }
+    func pickerController(_ pickerController: PhotoPickerController,
+                            didFinishSelection result: PickerResult) {
+        result.getImage { [weak self] (image, photoAsset, index) in
+            if let image = image {
+                self?.select_image = image
+            }else {
+                print("failed")
+            }
+        } completionHandler: { [weak self] (images) in
+            self?.tempCell.iconView.image = images.first
+        }
+    }
+    
     private func inspectResult() -> Bool {
         var is_result: Bool = true
         for item in self.dataArray {
@@ -615,7 +615,12 @@ class MIneBodyFiveViewCell: UITableViewCell {
     }
 }
-typealias resultInputBlock = () -> Void
+enum CNLiveBodyInputAuthShowType {
+    case end//输入结束后
+    case select//选择图片
+}
+
+typealias resultInputBlock = (_ type: CNLiveBodyInputAuthShowType) -> Void
 class MineBodyInputAuthCell: UITableViewCell, UITextFieldDelegate {
     lazy var mainView: UIView = {
@@ -643,6 +648,22 @@ class MineBodyInputAuthCell: UITableViewCell, UITextFieldDelegate {
         return contentField
     }()
+    lazy var tapGesture = UITapGestureRecognizer()
+    lazy var iconView: UIImageView = {
+        let  iconView = UIImageView.init()
+        iconView.backgroundColor = .white
+        iconView.image = UIImage.imageWithColor(color: HexColor("#f6f6f6")!, size: CGSizeMake(30, 30))
+        iconView.contentMode = .scaleToFill
+        iconView.clipsToBounds = true
+        iconView.layer.cornerRadius = 5
+        iconView.layer.masksToBounds = true
+        iconView.isHidden = true
+        iconView.isUserInteractionEnabled = true
+        tapGesture.addTarget(self, action: #selector(setupSelectButtonAction))
+        iconView.addGestureRecognizer(tapGesture)
+        return iconView
+    }()
+    
     lazy var moreBtn: UIButton = {
         let moreBtn = UIButton.init(type: .custom)
         moreBtn.setImage(UIImage(named: "mine_header_message_gray_more"), for: .normal)
@@ -668,6 +689,7 @@ class MineBodyInputAuthCell: UITableViewCell, UITextFieldDelegate {
         mainView.addSubview(nameLabel)
         mainView.addSubview(moreBtn)
         mainView.addSubview(contentField)
+        mainView.addSubview(iconView)
         mainView.addSubview(moreBtn)
         mainView.addSubview(line_label)
         setConstrainta()
@@ -681,7 +703,7 @@ class MineBodyInputAuthCell: UITableViewCell, UITextFieldDelegate {
     }
-    fileprivate var _infoModel : MineStandInfoModel?
+    var _infoModel : MineStandInfoModel?
     fileprivate var _resultInputBlock : resultInputBlock?
     func setListModel(infoModel: MineStandInfoModel, is_last: Bool,resultInputBlock: @escaping resultInputBlock) {
         _infoModel = infoModel
@@ -703,9 +725,10 @@ class MineBodyInputAuthCell: UITableViewCell, UITextFieldDelegate {
                 make.centerY.equalToSuperview()
                 make.right.equalTo(moreBtn.snp.left)
             }
-        }else if (infoModel.inputType == 4) {//禁止输入  显示下拉时间显示
-            contentField.isUserInteractionEnabled = false
+        }else if (infoModel.inputType == 6) {//禁止输入  显示证件照
+            contentField.isHidden = true
             moreBtn.isHidden = false
+            iconView.isHidden = false
             contentField.snp.remakeConstraints { make in
                 make.centerY.equalToSuperview()
                 make.right.equalTo(moreBtn.snp.left)
@@ -736,6 +759,12 @@ class MineBodyInputAuthCell: UITableViewCell, UITextFieldDelegate {
             make.centerY.equalToSuperview()
             make.right.equalToSuperview().offset(-5)
         }
+        iconView.snp.makeConstraints { make in
+            make.centerY.equalToSuperview()
+            make.right.equalTo(moreBtn.snp.left)
+            make.height.equalTo(50)
+            make.width.equalTo(35)
+        }
         line_label.snp.makeConstraints { make in
             make.centerX.equalToSuperview()
             make.bottom.equalToSuperview().offset(-1)
@@ -750,6 +779,10 @@ class MineBodyInputAuthCell: UITableViewCell, UITextFieldDelegate {
     func textFieldDidEndEditing(_ textField: UITextField) {
         _infoModel?.value = textField.text ?? ""
-        _resultInputBlock!()
+        _resultInputBlock!(.end)
+    }
+    
+    @objc func setupSelectButtonAction() {
+        _resultInputBlock!(.select)
     }
 }
@@ -154,13 +154,13 @@ class MineStandInfoTableViewCell: UITableViewCell {
         return timeLabel
     }()
-    public func setupWithDataSource(icon: String, name: String,number: String) {
+    public func setupWithAuthDataSource(icon: String, name: String,number: String) {
         iconView.kf.setImage(with: URL(string: icon), placeholder: UIImage.imageWithColor(color: HexColor("#f9f9f9")!, size: CGSize(width: 50, height: 50)))
         titleLabel.text = name
         numberLabel.text = number
     }
-    public func setupWithDataSource(icon: String, name: String,number: String, time: String) {
+    public func setupWithMessageDataSource(icon: String, name: String,number: String, time: String) {
         if !icon.isEmpty {
             iconView.kf.setImage(with: URL(string: icon), placeholder: UIImage.imageWithColor(color: HexColor("#f9f9f9")!, size: CGSize(width: 40, height: 40)))
         } else {
@@ -201,6 +201,7 @@ class MineStandInfoTableViewCell: UITableViewCell {
         titleLabel.snp.makeConstraints { make in
             make.centerY.equalToSuperview().offset(-15)
             make.left.equalTo(iconView.snp.right).offset(10)
+            make.right.equalToSuperview().offset(-10)
         }
         numberLabel.snp.makeConstraints { make in
             make.centerY.equalToSuperview().offset(15)
@@ -110,6 +110,7 @@ class NewsListModel: BaseModel {
     }
 }
+// !!!: /api/identityApi/allList 接口数据
 class StandListBaseModel: BaseModel {
     var prePage: Int = 0
     var pageSize: Int = 0
@@ -133,7 +134,7 @@ class StandListBaseModel: BaseModel {
     var pages: Int = 0
 }
-class StandListModel: BaseModel {
+final class StandListModel: BaseModel, TableCodable {
     var icon: String?
     var name: String?
@@ -176,8 +177,30 @@ class StandListModel: BaseModel {
                 return tuple
             })
     }
+    
+    enum CodingKeys: String, CodingTableKey {
+        typealias Root = StandListModel
+        static let objectRelationalMapping = TableBinding(CodingKeys.self){
+            //设置表的主键key为id,用来区分数据唯一性, 如果id为int类型,可以按实现按顺序递增
+            BindColumnConstraint(id, isPrimary: true)
+        }
+        case id         //不修改数据库字段名,和属性名保持一直
+        case name       //不修改数据库字段名,和属性名保持一直
+        case enable
+        case createTime
+        case createTimeString
+        case timeString
+        case auth
+        case backgroundImg
+        case backgroundColor
+        case backgroundColour
+        case description
+        case cardImg
+        case downPath
+    }
 }
+// !!!: /api/identityApi/getIdentity 接口标记
 class MineStandInfoBaseModel: BaseModel {
     var authInfos = [MineStandInfoModel]()
     var icon: String?
@@ -197,7 +220,7 @@ class MineStandInfoModel: BaseModel {
     var children = [MineStandInfoModel]()
 }
-
+// !!!: api/identityApi/myList  数据返回
 class MineAuthListBaseModel: BaseModel {
     required init() {}
@@ -223,7 +246,7 @@ class MineAuthListBaseModel: BaseModel {
     var pages: Int = 0
 }
-final class MineAuthListModel: BaseModel, TableCodable {
+final class MineAuthListModel: BaseModel , TableCodable {
     required init() {}
@@ -231,7 +254,7 @@ final class MineAuthListModel: BaseModel, TableCodable {
     var name: String? = ""
     var icon: String? = ""
     var authTime: Int = 0
-    var code: Int = 0
+    var code: String? = ""
     var identityId: Int = 0
     var userStatus: Int = 0
@@ -25,13 +25,6 @@ enum CNLiveMineResponseType {
     case noNetwork
     case unkonw
 }
-
-enum CNLiveMineSortType {
-    case homepage //主页
-    case authlist //我的身份信息列表界面
-    case minelist //我的界面->我的身份
-}
-
 enum CNLiveMineGetWriteType {
     case nodate //未填写
     case havedate //已填写
@@ -271,8 +264,43 @@ class CNLiveMineViewModel: NSObject {
                 let resp = result as! NSDictionary
                 let errorCode = "\(resp["errorCode"] ?? "0")"
                 if (errorCode == "0") {
-                    let newsModel = dictionaryToModel(resp as! [String : Any], StandListBaseModel.self,"data") as! StandListBaseModel
-                    resultBlock(newsModel,.success)
+                    let listModel = dictionaryToModel(resp as! [String : Any], StandListBaseModel.self,"data") as! StandListBaseModel
+                    
+                    if CNLiveSaveStandDB.shared.searchAllObject().count > 0 {
+                        //第一页
+                        if page == 1 {
+                            //在这里主要判断是不是有删除身份的情况
+//                            let no_id_auths = CNLiveSaveStandDB.shared.searchAllObjectId()
+//                            if no_id_auths.count == listModel.list.count {
+//                                //对获取的数据进行数据更新
+//                                CNLiveSaveStandDB.shared.updateObjects(newObjects: listModel.list)
+//
+//                            } else {//说明服务器有增加/减少的情况
+//
+//                            }
+                            let have_id_auths = CNLiveSaveAuthDB.shared.searchAllObjectId()
+                            let have_auths = NSMutableArray()
+                            let no_auths = NSMutableArray()
+                            for item in listModel.list {
+                                item.auth ? have_auths.add(item) : no_auths.add(item)
+                            }
+                            if have_auths.count == have_id_auths.count {
+                                for item in have_auths {
+                                    
+                                }
+                            }
+                            CNLiveSaveStandDB.shared.deleteAllObjects()
+                            CNLiveSaveStandDB.shared.insertObjects(objects: listModel.list)
+                        }else{
+                            
+                        }
+                        
+                    }else{
+                        CNLiveSaveStandDB.shared.insertObjects(objects: listModel.list)
+                    }
+
+                    
+                    resultBlock(listModel,.success)
                 } else {
                     showMessage(message: resp["errorMessage"] as! String)
                     resultBlock(NSNull(),.failed)
@@ -310,6 +338,9 @@ class CNLiveMineViewModel: NSObject {
                 let errorCode = "\(resp["errorCode"] ?? "0")"
                 if (errorCode == "0") {
                     let listModel = dictionaryToModel(resp as! [String : Any], MineAuthListBaseModel.self,"data") as! MineAuthListBaseModel
+                    
+                    
+                    
                     resultBlock(listModel,.success)
                 } else {
                     showMessage(message: resp["errorMessage"] as! String)
@@ -344,7 +375,8 @@ class CNLiveMineViewModel: NSObject {
             let key = (info as! MineStandInfoModel).name ?? ""
             let authInfoId = (info as! MineStandInfoModel).authInfoId
             let inputType = (info as! MineStandInfoModel).inputType
-            if value.count == 0 {
+            let nonEmpty = (info as! MineStandInfoModel).nonEmpty
+            if value.count == 0 && nonEmpty {
                 if inputType == 3 {
                     showMessage(message: "请选择\(key)")
                     return
@@ -502,18 +534,6 @@ class CNLiveMineViewModel: NSObject {
         }
     }
-    
-    /// 首页及身份认证界面数据获取及排序
-    /// - Parameters:
-    ///   - sortType: 回去数据来源
-    ///   - resultBlock: 数据返回
-    static func requestHomePageDataSourceList(sortType: CNLiveMineSortType,resultBlock: @escaping resultBlock) {
-//        CNLiveMineViewModel.requestsGETAuthInfoList(page: 1) { result, respStatue in
-//
-//        }
-        
-    }
-    
     /// 获取十位时间戳
     static var timeStamp: Int {
         let timeInterval: TimeInterval = NSDate().timeIntervalSince1970