添加审核接口

liushiyu
1 parent b59f60ee
Showing 10 changed files with 149 additions and 28 deletions
metaCode.xcodeproj/project.pbxproj
metaCode/Classes/Config/CNLiveConfigManager.swift
metaCode/Classes/Config/CNLiveConfigUserInfo.swift
metaCode/Classes/Extensions/UITableViewCell+CNLiveExtension.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveMineAuthResultViewController.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveMineInputViewController.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveMineViewController.swift
metaCode/Classes/Main/MinePage/View/CNLiveMineBodyListView.swift
metaCode/Classes/Main/MinePage/ViewModel/CNLiveMineBaseModel.swift
metaCode/Classes/Main/MinePage/ViewModel/CNLiveMineViewModel.swift
@@ -54,6 +54,7 @@
 		79A68C4A2A26E6CE00DC3B43 /* (null) in Sources */ = {isa = PBXBuildFile; };
 		79A68C4C2A26EA6000DC3B43 /* (null) in Sources */ = {isa = PBXBuildFile; };
 		79BA085D2AB18E8300D01875 /* CNLiveSaveAuthDB.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79BA085C2AB18E8300D01875 /* CNLiveSaveAuthDB.swift */; };
+		79E496E32AB9357000127BF8 /* UITableViewCell+CNLiveExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79E496E22AB9357000127BF8 /* UITableViewCell+CNLiveExtension.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 */; };
@@ -160,6 +161,7 @@
 		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 /* CNLiveSaveAuthDB.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveSaveAuthDB.swift; sourceTree = "<group>"; };
+		79E496E22AB9357000127BF8 /* UITableViewCell+CNLiveExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UITableViewCell+CNLiveExtension.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>"; };
@@ -260,6 +262,7 @@
 				79396EEC2A319F220053E1AF /* NSObject+CNLiveExtensions.swift */,
 				790B1FB52A41938F0074CF00 /* UIImage+CNLiveExtensions.swift */,
 				7C83B4432A541F36004BF4A4 /* NSDate+CNLiveExtensions.swift */,
+				79E496E22AB9357000127BF8 /* UITableViewCell+CNLiveExtension.swift */,
 			);
 			path = Extensions;
 			sourceTree = "<group>";
@@ -430,6 +433,7 @@
 		796398922A260C0100D045EB /* Config */ = {
 			isa = PBXGroup;
 			children = (
+				79E496E42AB936E200127BF8 /* Tool */,
 				79579CAA2AAAE905006E5B38 /* Database */,
 				7CD675512A29C04B008354C1 /* CNLiveConfigstant.swift */,
 				790D01812A2D88FC00C5978D /* CNLiveConfigMacro.swift */,
@@ -489,6 +493,13 @@
 			path = CustomView;
 			sourceTree = "<group>";
 		};
+		79E496E42AB936E200127BF8 /* Tool */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			path = Tool;
+			sourceTree = "<group>";
+		};
 		7C2703312A36CC430061EC50 /* Global */ = {
 			isa = PBXGroup;
 			children = (
@@ -881,6 +892,7 @@
 				7C7C62F62A4D72E9007A912E /* CNLiveIdentityDB.swift in Sources */,
 				790B1FB62A41938F0074CF00 /* UIImage+CNLiveExtensions.swift in Sources */,
 				790D019D2A2DCBD000C5978D /* UIView+CNLiveExtensions.swift in Sources */,
+				79E496E32AB9357000127BF8 /* UITableViewCell+CNLiveExtension.swift in Sources */,
 				7C83B4422A541EBF004BF4A4 /* CALayer+CNLiveExtensions.swift in Sources */,
 				798A44F72A3077ED00815935 /* CNLiveHotButton.swift in Sources */,
 				7CD6753D2A2740B0008354C1 /* CNMainView.swift in Sources */,
@@ -46,7 +46,13 @@ class ConfigManager : NSObject {
     @objc private func keyboardDidHideNotification(notification : Notification) {
         ConfigManager.shared.keyboardDisplayHeight = 0
     }
-    
-    
-    
+}
+
+extension Notification.Name {
+    struct StandAuth {
+        //认证身份成功通知
+        public static let StandAuthNotificationSuccess = Notification.Name("StandAuthNotificationSuccess")
+        //认证身份失败通知
+        public static let StandAuthNotificationUnSuccess = Notification.Name("StandAuthNotificationUnSuccess")
+    }
 }
@@ -147,7 +147,11 @@ class StandSortManager: NSObject {
     /// - Returns: 返回信息
     static private func readStandSort() -> NSArray {
         let indexs = UserDefaults.standard.object(forKey: sort_key)
-        if indexs == nil && (indexs as! NSArray).count == 0 {
+        if indexs == nil {
+            print("获取排序信息失败")
+            return []
+        }
+        if (indexs as! NSArray).count == 0 {
             print("获取排序信息失败")
             return []
         }
+//
+//  UITableViewCell+CNLiveExtension.swift
+//  metaCode
+//
+//  Created by open on 2023/9/19.
+//
+
+import Foundation
+
+extension UITableViewCell {
+
+    
+}
@@ -53,10 +53,18 @@ class CNLiveMineAuthResultViewController: CNLiveBaseViewController {
         return sendButton
     }()
  
+    /// 已认证-身份卡片
+    lazy var iDCardView:CNIDCardView = {
+        let iDCardView:CNIDCardView = CNIDCardView(frame: CGRect(x: (KSreenWidth - 40)/2, y: get_system_nav_height()+30, width: KSreenWidth - 40, height: (KSreenWidth-40) * 0.64))
+        iDCardView.isHidden = true
+        return iDCardView
+    }()
+    
+    var _status: UIStatusBarStyle! = .lightContent
     var _listModel:StandListModel!
     var _show_type:CNLiveMineAuthResultShowType!
     init(listModel:StandListModel,show_type:CNLiveMineAuthResultShowType) {
-       super.init(nibName:nil, bundle:nil)
+        super.init(nibName:nil, bundle:nil)
         _listModel = listModel
         _show_type = show_type
     }
@@ -67,7 +75,7 @@ class CNLiveMineAuthResultViewController: CNLiveBaseViewController {
  
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
-
+        
     }
  
     override func viewDidLoad() {
@@ -79,6 +87,7 @@ class CNLiveMineAuthResultViewController: CNLiveBaseViewController {
         titleName = "添加\(_listModel.name!)"
         titleLabel.textColor = .white
         leftBtnWhite = true
+        _status = .lightContent
         setNeedsStatusBarAppearanceUpdate()
  
  
@@ -106,24 +115,52 @@ class CNLiveMineAuthResultViewController: CNLiveBaseViewController {
             make.height.equalTo(40)
             make.width.equalTo(150)
         }
+        view.addSubview(iDCardView)
+        iDCardView.snp.makeConstraints { make in
+            make.centerX.equalToSuperview()
+            make.top.equalToSuperview().offset(get_system_nav_height()+30)
+            make.height.equalTo((KSreenWidth-40) * 0.64)
+            make.width.equalTo(KSreenWidth-40)
+        }
         sendButton.setGradient(colors: [UIColor(red: 103/255.0, green: 197/255.0, blue: 255/255.0, alpha: 1),UIColor(red: 96/255.0, green: 154/255.0, blue: 255/255.0, alpha: 1)], startPoint: CGPoint(x: 0, y: 0.5), endPoint: CGPoint(x: 1, y: 0.5))
+        
+        CNLiveMineViewModel.startKeepTimeWithStand(id: "\(_listModel.id)") { [weak self] result, respStatue in
+            if respStatue == .success {
+                self?.titleLabel.textColor = .black
+                self?.leftBtnWhite = false
+                self?.mainView.isHidden = true
+                self?.iDCardView.isHidden = false
+                self?.iDCardView.idModel = self?._listModel
+                self?.tipName.text = "恭喜您通过认证"
+                self?.tipDesc.text = "您已是中国网公益服务志愿者！"
+                self?._status = .default
+                self?.setNeedsStatusBarAppearanceUpdate()
+            }else{
+                self?.iDCardView.isHidden = true
+                self?.mainView.image = UIImage(named: "mine_auth_result_header_failer")
+                self?.tipName.text = "审核失败"
+                self?.tipDesc.text = "请您修改后重新提交"
+            }
+        }
     }
  
  
     override var preferredStatusBarStyle: UIStatusBarStyle {
-      return .lightContent
+        return _status
     }
  
     @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]
-            self.navigationController?.popToViewController(CNLiveMineAddInfoViewController.init(show_type: .add), animated: true)
+            let tempArray = NSMutableArray.init()
+            self.navigationController?.viewControllers.forEach({ item in
+                if (item.isKind(of: CNLiveMineInputViewController.self)) {
+                    tempArray.remove(item)
+                }else{
+                    tempArray.add(item)
+                }
+            })
+            self.navigationController?.viewControllers = tempArray as! [CNLiveBaseViewController]
+            self.navigationController?.popViewController(animated: true)
         }
     }
 }
@@ -82,6 +82,7 @@ class CNLiveMineInputViewController : CNLiveBaseViewController, UITableViewDeleg
     }
  
     private func loadStandInfoData() {
+        showLoading(message: "")
         CNLiveMineViewModel.requestsStandInfo(identityId: "\(_listModel.id)", type: .nodate) {[weak self] result, respStatue in
             if respStatue == .success {
                 self?.dataArray.addObjects(from: result as! [Any])
@@ -105,7 +106,6 @@ class CNLiveMineInputViewController : CNLiveBaseViewController, UITableViewDeleg
     }
  
     @objc func sendInfoActionMothod() {
-        
         setupWithContentUploadImage { [self] url in
             self.tempCell._infoModel?.value = url
             CNLiveMineViewModel.requestsPOSTAuthInfo(identityId: "\(_listModel.id)", infos: self.dataArray) { [self] result, respStatue in
@@ -102,7 +102,7 @@ extension CNLiveMineViewController {
         }
         if indexPath.section == 1 {
             let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveMineOneViewCellIdentifier) as! MineBodyOneListViewCell
-            
+            cell.reloadWithData()
             return cell
         }
         let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveMineTwoViewCellIdentifier) as! MineBodyTwoListViewCell
@@ -68,15 +68,15 @@ class MineBodyOneListViewCell : UITableViewCell {
         mainView.addSubview(lookBtn)
  
         setupConstraints()
-        
-        
+    }
+    
+    public func reloadWithData() {
         let tempArray = StandSortManager.sortMyListData(auths: CNLiveSaveAuthDB.shared.searchAllObject() as NSArray) as! [MineAuthListModel]
         if tempArray.count == 0 {
             tipLabel.isHidden = false
         }else{
-            for item in tempArray {
-                let authModel = item
-//                setupWithIconsView(authModel: authModel, index: index)
+            for (index, item) in tempArray.enumerated() {
+                setupWithIconsView(authModel: item, index: index)
             }
         }
     }
@@ -84,17 +84,17 @@ class MineBodyOneListViewCell : UITableViewCell {
     private func setupWithIconsView(authModel: MineAuthListModel,index: NSInteger) {
  
         let iconView = UIImageView.init()
-        iconView.layer.cornerRadius = 10
+        iconView.layer.cornerRadius = 20
         iconView.layer.masksToBounds = true
         iconView.clipsToBounds = true
         iconView.contentMode = .scaleToFill
         iconView.backgroundColor = .white
-        iconView.kf.setImage(with: URL(string: authModel.icon ?? ""), placeholder: UIImage.imageWithColor(color: HexColor("#f9f9f9")!, size: CGSize(width: 20, height: 20)))
+        iconView.kf.setImage(with: URL(string: authModel.icon ?? ""), placeholder: UIImage.imageWithColor(color: HexColor("#f9f9f9")!, size: CGSize(width: 40, height: 40)))
         mainView.addSubview(iconView)
         iconView.snp.makeConstraints { make in
-            make.centerY.equalToSuperview()
-            make.left.equalToSuperview().offset(10+(20 * index)-(index>1 ? 3:0))
-            make.size.equalTo(20)
+            make.centerY.equalToSuperview().offset(20)
+            make.left.equalToSuperview().offset(10+(40 * index) - (index > 0 ? 10 : 0))
+            make.size.equalTo(40)
         }
  
     }
@@ -714,6 +714,7 @@ class MineBodyInputAuthCell: UITableViewCell, UITextFieldDelegate {
         super.init(style: style, reuseIdentifier: reuseIdentifier)
         selectionStyle = .none
         backgroundColor = .clear
+        contentView.backgroundColor = .clear
  
         addSubview(mainView)
         mainView.addSubview(nameLabel)
@@ -208,6 +208,12 @@ class MineStandInfoBaseModel: BaseModel {
     var icon: String?
     var name: String?
     var identityId: Int = 0
+    var code: String?
+    var cardImg: String?
+    var authTime: Int = 0
+    var userStatus: Int = 0
+    var upPath: String?
+    var downPath: String?
 }
  
 class MineStandInfoModel: BaseModel {
@@ -28,6 +28,7 @@ enum CNLiveMineResponseType {
 enum CNLiveMineGetWriteType {
     case nodate //未填写
     case havedate //已填写
+    case effect //效验接口
 }
 typealias resultBlock = (_ type: CNLiveMineRequestType,_ result: Bool) -> Void
 typealias resultNewsBlock = (_ result: Any,_ respStatue :CNLiveMineResponseType) -> Void
@@ -435,7 +436,6 @@ class CNLiveMineViewModel: NSObject {
         let param = NSMutableDictionary()
         param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "sid")
         param.setValue(identityId, forKey: "identityId")
-        showLoading(message: "")
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
         CNLiveNetworking.setupShowDataResult(false)
         CNLiveNetworking.requestNetwork(with: .GET, urlString: APPBaseMCUrl+"/identityApi/getIdentity", param: param as! [String: String], cacheType: .networkOnly) { task, result, error in
@@ -453,6 +453,8 @@ class CNLiveMineViewModel: NSObject {
                             }
                         }
                         resultBlock(tempArray,.success)
+                    }else if (type == .effect) {
+                        resultBlock(newsModel,.success)
                     }else {
                         let tempArray = NSMutableArray.init(array: newsModel.authInfos)
                         resultBlock(tempArray,.success)
@@ -541,6 +543,46 @@ class CNLiveMineViewModel: NSObject {
         }
     }
  
+    /// 结果检查逻辑
+    /// - Parameter id: 当前身份
+    static func startKeepTimeWithStand(id: String, resultBlock: @escaping resultNewsBlock) {
+        // 定义需要计时的时间
+        var timeCount = 20
+        // 在global线程里创建一个时间源
+        let codeTimer = DispatchSource.makeTimerSource(queue: DispatchQueue.global())
+        // 设定这个时间源是每秒循环一次，立即开始
+        codeTimer.schedule(deadline: .now(), repeating: .seconds(1))
+        // 设定时间源的触发事件
+        codeTimer.setEventHandler {
+            // 每秒计时一次
+            timeCount = timeCount - 1
+            // 时间到了取消时间源
+            if timeCount <= 0 {
+                codeTimer.cancel()
+            }
+            // 返回主线程处理一些事件，更新UI等等
+            DispatchQueue.main.async {
+                showLoading(message: "")
+                CNLiveMineViewModel.requestsStandInfo(identityId: id, type: .effect) { result, respStatue in
+                    if respStatue == .success {
+                        let listBaseModel = result as! MineStandInfoBaseModel
+                        if listBaseModel.authTime > 0 {
+                            showMessage(message: listBaseModel.name!.count > 0 ? "恭喜您通过认证，您已是\(listBaseModel.name ?? "")" : "恭喜您通过认证")
+                            resultBlock(listBaseModel, .success)
+                            NotificationCenter.default.post(name: Notification.Name.StandAuth.StandAuthNotificationSuccess, object: nil)
+                        } else {
+                            showMessage(message: "审核失败，请您修改后重新提交")
+                            resultBlock(listBaseModel, .failed)
+                            NotificationCenter.default.post(name: Notification.Name.StandAuth.StandAuthNotificationUnSuccess, object: nil)
+                        }
+                    }
+                }
+            }
+        }
+        // 启动时间源
+        codeTimer.resume()
+    }
+    
     /// 获取十位时间戳
     static var timeStamp: Int {
         let timeInterval: TimeInterval = NSDate().timeIntervalSince1970