提交我的界面添加审核失败界面

liushiyu
1 parent c68704b0
Showing 15 changed files with 239 additions and 31 deletions
metaCode.xcodeproj/project.pbxproj
metaCode/Classes/Common/Util/CNLiveCommonBaseModel.swift
metaCode/Classes/Config/Database/CNLiveSaveAuthDataSourceDB.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/CNLiveMineSubBodyListView.swift
metaCode/Classes/Main/MinePage/ViewModel/CNLiveMineBaseModel.swift
metaCode/Classes/Main/MinePage/ViewModel/CNLiveMineViewModel.swift
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_auth_result_header_failer.imageset/Contents.json
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_auth_result_header_failer.imageset/mine_auth_result_header_failer@2x.png
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_auth_result_header_failer.imageset/mine_auth_result_header_failer@3x.png
@@ -52,6 +52,7 @@
 		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 */; };
 		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 */; };
@@ -155,6 +156,7 @@
 		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>"; };
 		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>"; };
@@ -346,6 +348,7 @@
 			isa = PBXGroup;
 			children = (
 				7C7C62F52A4D72E9007A912E /* CNLiveIdentityDB.swift */,
+				79BA085C2AB18E8300D01875 /* CNLiveSaveAuthDataSourceDB.swift */,
 			);
 			path = Database;
 			sourceTree = "<group>";
@@ -853,6 +856,7 @@
 				7963989D2A260E6200D045EB /* CNLiveBaseViewController.swift in Sources */,
 				798A44FB2A30999900815935 /* CNLiveAlertTool.swift in Sources */,
 				790D01A52A2DF65E00C5978D /* CNLiveLoginPickerView.swift in Sources */,
+				79BA085D2AB18E8300D01875 /* CNLiveSaveAuthDataSourceDB.swift in Sources */,
 				79282A3C2A2EDC2500B5F8CF /* NSString+CNLiveExtensions.swift in Sources */,
 				790B1FB82A41B6A60074CF00 /* CNLiveMineMessageViewController.swift in Sources */,
 				798A44F22A30674200815935 /* CNLiveMineSubBodyListView.swift in Sources */,
@@ -8,10 +8,21 @@
 import Foundation
 import UIKit
 import HandyJSON
+import WCDBSwift
 class BaseModel: HandyJSON {
-    required init() {}
+    var database:Database
+    
+    required init() {
+        //数据库地址
+        let filePath = NSHomeDirectory() + "/Documents/DB/CNLiveBaseModel.db"
+        database = Database(at: filePath)
+        
+//        super.init()
+        
+//        try database.create(table: NSStringFromClass(self), of: BaseModel.self)
+    }
     func mapping(mapper: HelpingMapper) {
+//
+//  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("创建失败")
+        }
+    }
+}
@@ -40,14 +40,6 @@ class CNLiveMineAddInfoViewController : CNLiveBaseViewController, UITableViewDel
     lazy var dataArray: NSMutableArray = {
         var dataArray = NSMutableArray()
-        if _show_type == .info {
-            dataArray.add(["image":"mine_header_icon_defult_ava","name":"志愿者身份","number":"证件编号：410800111127954"])
-            dataArray.add(["image":"mine_header_icon_defult_ava","name":"退伍军人身份","number":"证件编号：410800111127912"])
-            dataArray.add(["image":"mine_header_icon_defult_ava","name":"退伍军人身份","number":"证件编号：410800111127934"])
-            dataArray.add(["image":"mine_header_icon_defult_ava","name":"退伍军人身份","number":"证件编号：410800111127956"])
-            dataArray.add(["image":"mine_header_icon_defult_ava","name":"退伍军人身份","number":"证件编号：410800111127967"])
-            dataArray.add(["image":"mine_header_icon_defult_ava","name":"退伍军人身份","number":"证件编号：410800111127978"])
-        }
         return dataArray
     }()
@@ -105,6 +97,9 @@ class CNLiveMineAddInfoViewController : CNLiveBaseViewController, UITableViewDel
         case .none:
             break
         }
+        if _show_type == .info || _show_type == .add {
+            showLoading(message: "")
+        }
         loadData()
         addRefreshView()
         navigationBarHidden = false
@@ -114,7 +109,6 @@ class CNLiveMineAddInfoViewController : CNLiveBaseViewController, UITableViewDel
             make.left.right.bottom.equalToSuperview()
         }
     }
-
     private func loadData() {
         if _show_type == .add {
@@ -153,10 +147,35 @@ class CNLiveMineAddInfoViewController : CNLiveBaseViewController, UITableViewDel
                 }
             }
         }
+        if _show_type == .info {
+            CNLiveMineViewModel.requestsGETAuthInfoList(page: pageNum) { [weak self] result, respStatue in
+                if respStatue == .success {
+                    let listBaseModel = result as! MineAuthListBaseModel
+                    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.total == listBaseModel.pageNum {
+                        self!.tableView.mj_footer?.endRefreshing()
+                        self!.tableView.mj_footer?.endRefreshingWithNoMoreData()
+                        self!.tableView.reloadData()
+                    }
+                }else if (respStatue == .noNetwork) {
+                    self!.network_type = .noNetwork
+                    self!.tableView.reloadEmptyDataSet()
+                } else {
+                    self!.network_type = .failed
+                    self!.tableView.reloadEmptyDataSet()
+                }
+            }
+        }
     }
     private func addRefreshView() {
-        if _show_type == .add {
+        if _show_type == .add || _show_type == .info {
             tableView.mj_header = MJRefreshNormalHeader.init(refreshingBlock: {[weak self] in
                 self!.pageNum = 1
                 self!.loadData()
@@ -259,8 +278,8 @@ extension CNLiveMineAddInfoViewController {
             guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveMineStandInfoTableViewIdentifier) as? MineStandInfoTableViewCell else {
                 return MineStandInfoTableViewCell()
             }
-            let dict = dataArray[indexPath.row] as! Dictionary<String, Any>
-            cell.setupWithDataSource(icon: dict["image"] as! String, name: dict["name"] as! String,number: dict["number"] as! String)
+            let authModel = dataArray[indexPath.row] as! MineAuthListModel
+            cell.setupWithDataSource(icon: authModel.icon!, name: authModel.name!,number: "\(authModel.code)")
             cell.userInteractionEnabledWhileDragging = false
             return cell
         }
@@ -299,17 +318,7 @@ extension CNLiveMineAddInfoViewController {
     func tableView(_ tableView: UITableView, moveRowAt sourceIndexPath: IndexPath,
                    to destinationIndexPath: IndexPath) {
         objc_sync_enter(self)
-        print("交换之前===>\(dataArray)")
         swap(&dataArray[sourceIndexPath.row], &dataArray[destinationIndexPath.row])
-        print("交换之后===>\(dataArray)")
-//        let dict: Dictionary = dataArray[sourceIndexPath.row] as! Dictionary<String, Any>
-//        dataArray.remove(sourceIndexPath.row)
-//        if destinationIndexPath.row > dataArray.count {
-//            dataArray.append(dict)
-//        } else {
-//            dataArray.insert(dict, at: destinationIndexPath.row)
-//        }
         objc_sync_exit(self)
-//        tableView.reloadData()
     }
 }
@@ -7,6 +7,11 @@
 import Foundation
+enum CNLiveMineAuthResultShowType {
+    case detail//认证身份详情界面
+    case result_success//身份信息结果页成功
+    case result_failer//身份信息结果页失败
+}
 class CNLiveMineAuthResultViewController: CNLiveBaseViewController {
@@ -14,7 +19,8 @@ class CNLiveMineAuthResultViewController: CNLiveBaseViewController {
         let mainView = UIImageView()
         mainView.backgroundColor = .white
         mainView.contentMode = .scaleToFill
-        mainView.image = UIImage(named: "mIne_auth_result_header_icon")
+        mainView.isHidden = !(_show_type == .result_success || _show_type == .result_failer)
+        mainView.image = UIImage(named: (_show_type == .result_success ? "mine_auth_result_header_success" : "mine_auth_result_header_failer"))
         return mainView
     }()
@@ -48,9 +54,11 @@ class CNLiveMineAuthResultViewController: CNLiveBaseViewController {
     }()
     var _listModel:StandListModel!
-    init(listModel:StandListModel) {
+    var _show_type:CNLiveMineAuthResultShowType!
+    init(listModel:StandListModel,show_type:CNLiveMineAuthResultShowType) {
        super.init(nibName:nil, bundle:nil)
         _listModel = listModel
+        _show_type = show_type
     }
     required init?(coder: NSCoder) {
@@ -107,6 +115,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]
+        }
     }
 }
@@ -106,7 +106,7 @@ class CNLiveMineInputViewController : CNLiveBaseViewController, UITableViewDeleg
             if respStatue == .success {
                 showMessage(message: "上传成功")
                 DispatchQueue.main.asyncAfter(deadline: .now()+1) { [self] in
-                    self.navigationController?.pushViewController(CNLiveMineAuthResultViewController.init(listModel: _listModel), animated: true)
+                    self.navigationController?.pushViewController(CNLiveMineAuthResultViewController.init(listModel: _listModel,show_type: .result_success), animated: true)
                 }
             }
         }
@@ -155,7 +155,7 @@ class MineStandInfoTableViewCell: UITableViewCell {
     }()
     public func setupWithDataSource(icon: String, name: String,number: String) {
-        iconView.image = UIImage(named: icon)
+        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
     }
@@ -7,7 +7,7 @@
 import Foundation
 import HandyJSON
-
+import WCDBSwift
 class UpdateInfoModel: BaseModel {
@@ -175,7 +175,7 @@ class MineStandInfoBaseModel: BaseModel {
 class MineStandInfoModel: BaseModel {
     var authInfoId: Int = 0
     var name: String?
-    var inputType: Int = 0//1 文本输入 2数字输入 3下拉选择 4后台生成时间 5后台生成编码
+    var inputType: Int = 0//1 文本输入 2数字输入 3下拉选择 4后台生成时间 5后台生成编码 6头像类型
     var sort: Int = 0
     var nonEmpty: Bool = false
     var input: Bool = false
@@ -183,3 +183,60 @@ class MineStandInfoModel: BaseModel {
     var value: String? = ""//自己定义的值
     var children = [MineStandInfoModel]()
 }
+
+
+class MineAuthListBaseModel: BaseModel {
+    required init() {}
+    
+    var prePage: Int = 0
+    var pageSize: Int = 0
+    var startRow: Int = 0
+    var navigateLastPage: Int = 0
+    var firstPage: Int = 0
+    var nextPage: Int = 0
+    var size: Int = 0
+    var endRow: Int = 0
+    var isLastPage: Bool = false
+    var hasNextPage: Bool = false
+    var navigateFirstPage: Int = 0
+    var lastPage: Int = 0
+    var total: Int = 0
+    var list = [MineAuthListModel]()
+    var navigatepageNums = [Int]()
+    var isFirstPage: Bool = false
+    var hasPreviousPage: Bool = false
+    var navigatePages: Int = 0
+    var pageNum: Int = 0
+    var pages: Int = 0
+}
+
+final class MineAuthListModel: BaseModel, TableCodable {
+
+    required init() {}
+    
+    var cardImg: String? = ""
+    var name: String? = ""
+    var icon: String? = ""
+    var authTime: Int = 0
+    var code: Int = 0
+    var identityId: Int = 0
+    var userStatus: Int = 0
+    
+    enum CodingKeys: String, CodingTableKey {
+        typealias Root = MineAuthListModel
+        static let objectRelationalMapping = TableBinding(CodingKeys.self){
+            //设置表的主键key为id,用来区分数据唯一性, 如果id为int类型,可以按实现按顺序递增
+            BindColumnConstraint(identityId, isPrimary: true)
+        }
+        case identityId         //不修改数据库字段名,和属性名保持一直
+        case name       //不修改数据库字段名,和属性名保持一直
+        case icon
+        case cardImg
+        case authTime
+        case code
+        case userStatus
+    }
+}
+
+
+
@@ -25,6 +25,12 @@ enum CNLiveMineResponseType {
     case noNetwork
     case unkonw
 }
+
+enum CNLiveMineSortType {
+    case homepage //主页
+    case authlist //我的身份信息列表界面
+    case minelist //我的界面->我的身份
+}
 typealias resultBlock = (_ type: CNLiveMineRequestType,_ result: Bool) -> Void
 typealias resultNewsBlock = (_ result: Any,_ respStatue :CNLiveMineResponseType) -> Void
 class CNLiveMineViewModel: NSObject {
@@ -252,7 +258,6 @@ class CNLiveMineViewModel: NSObject {
         param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "sid")
         param.setValue("10", forKey: "pageSize")
         param.setValue("\(page)", forKey: "page")
-        showLoading(message: "")
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
         CNLiveNetworking.setupShowDataResult(false)
         CNLiveNetworking.requestNetwork(with: .GET, urlString: APPBaseMCUrl+"/identityApi/allList", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
@@ -281,6 +286,44 @@ class CNLiveMineViewModel: NSObject {
         }
     }
+    /// 获取已认证身份列表
+    /// - Parameters:
+    ///   - page: 页数
+    ///   - resultBlock: 数据返回
+    static func requestsGETAuthInfoList(page: NSInteger, resultBlock: @escaping resultNewsBlock) {
+        let param = NSMutableDictionary()
+        param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "sid")
+        param.setValue("1", forKey: "type") //0正在审核  1已认证  -1审核失败
+        param.setValue("\(page)", forKey: "page")
+        param.setValue("10", forKey: "pageSize")
+        CNLiveNetworking.setAllowRequestDefaultArgument(true)
+        CNLiveNetworking.setupShowDataResult(false)
+        CNLiveNetworking.requestNetwork(with: .GET, urlString: APPBaseMCUrl+"/identityApi/myList", param: param as! [String: String], cacheType: .networkOnly) { task, result, error in
+            hiddenLoading()
+            if (error == nil) {
+                let resp = result as! NSDictionary
+                let errorCode = "\(resp["errorCode"] ?? "0")"
+                if (errorCode == "0") {
+                    let listModel = dictionaryToModel(resp as! [String : Any], MineAuthListBaseModel.self,"data") as! MineAuthListBaseModel
+                    resultBlock(listModel,.success)
+                } else {
+                    showMessage(message: resp["errorMessage"] as! String)
+                    resultBlock(NSNull(),.failed)
+                }
+            } else {
+                if page > 1 {
+                    if CNLiveNetworking.isNetworking() {
+                        showMessage(message: "获取失败")
+                        resultBlock(NSNull(),.failed)
+                    } else {
+                        showMessage(message: "似乎与网络断开链接")
+                        resultBlock(NSNull(),.noNetwork)
+                    }
+                }
+            }
+        }
+    }
+    
     /// 上传用户认证信息接口
     /// - Parameters:
     ///   - infos: 认证信息数据
@@ -448,6 +491,18 @@ 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
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "mine_auth_result_header_failer@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "mine_auth_result_header_failer@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}