选择认证, 选择证书 UI搭建

“张旭”
1 parent ee2711a5
Showing 8 changed files with 328 additions and 97 deletions
metaCode/Classes/Main/HomePage/Controller/DigitalAuth/数字简历相关页面/CNLiveDigitalResumePreViewController.swift
metaCode/Classes/Main/HomePage/Controller/DigitalAuth/数字简历相关页面/CNLiveDigitalResumePreViewSelectRenzhengCerController.swift
metaCode/Classes/Main/HomePage/View/DigitalAuthViews/我的简历cell/CNLiveDigitalResumePreViewSecCell.swift
metaCode/Classes/Main/HomePage/View/DigitalAuthViews/我的简历cell/关联官方认证或证书cell/CNLiveDigitalResumeGuanfangRenzhengCell.swift
metaCode/Classes/Main/HomePage/View/DigitalAuthViews/我的简历cell/关联官方认证或证书cell/CNLiveDigitalResumeSelectCerCell.swift
metaCode/Classes/Main/MinePage/ViewModel/CNLiveMineBaseModel.swift
metaCode/Classes/Main/Model/Vitae/CNLiveVitaeCertificateModel.swift
metaCode/Classes/Main/Model/Vitae/CNLiveVitaeModel.swift
@@ -369,21 +369,6 @@ class CNLiveDigitalResumePreViewController:CNLiveBaseViewController,UITableViewD
         print("moreNavBtnAction")
     }
-    // MARK: - 获取证书数量
-//    func getCetList(){
-//        let vsid = UserInfoManager.shared.userInfo.currentUser?.vsid ?? ""
-//        CNLiveVitaeViewModel.getCerList(vsid: vsid, page: 1, pageSize: 100){ result, respStatue in
-//            if respStatue == .success{
-//                if let res = result as? [CNLiveVitaeCertificateModel]{
-//                    self.threeCerDataArray = res
-//                    self.tableView.reloadData()
-//                }
-//            }else{
-//                showMessage(message: "数据异常")
-//            }
-//            
-//        }
-//    }
     // MARK: - 获取简历数据
     func getVitae(){
@@ -451,33 +436,6 @@ class CNLiveDigitalResumePreViewController:CNLiveBaseViewController,UITableViewD
             }
         }
     }
-//    func getAuthInfoList(){
-//        CNLiveMineViewModel.requestsGETAuthInfoList(page: 1) { [weak self] result, respStatue in
-//            if respStatue == .success {
-//                let listBaseModel = result as! MineAuthListBaseModel
-//                if self != nil{
-//                    var arr = Array<MineAuthListModel>()
-//                    var sussArr = Array<MineAuthListModel>()
-//                    listBaseModel.list.forEach { listMdl in
-//                        if listMdl.userStatus == 1{
-//                            arr.insert(listMdl, at: 0)
-//                            sussArr.append(listMdl)
-//                        }else{
-//                            arr.append(listMdl)
-//                        }
-//                    }
-//                    self!.secTotalDataArray.removeAllObjects()
-//                    self!.secTotalDataArray.addObjects(from: arr)
-//                    self!.succDataArray.removeAllObjects()
-//                    self!.succDataArray.addObjects(from: sussArr)
-//                    self!.tableView.reloadData()
-//                }
-//            }else {
-//
-//            }
-//        }
-//    }
-    
     func saveUpdateVitae(isSave:Bool){
@@ -18,11 +18,36 @@ enum CNLiveViateSelectRenzhengCerType {
 class CNLiveDigitalResumePreViewSelectRenzhengCerController:CNLiveBaseViewController,UITableViewDataSource, UITableViewDelegate{
     var renzhengCerType:CNLiveViateSelectRenzhengCerType = .renzheng
-
-    lazy var dataArray :NSMutableArray = {
-        let dataArray = NSMutableArray()
+    //简历里 认证列表的数据
+    var _digitalListModels : [CNLiveVitaeIdentitiesModel]?
+    var digitalListModels : [CNLiveVitaeIdentitiesModel]? {
+        get{
+            _digitalListModels
+        }
+        set{
+            _digitalListModels = newValue!
+            setupNewUI(models: _digitalListModels!)
+        }
+    }
+    
+    //简历里 证书列表的数据
+    var _cerListModels : [CNLiveVitaeCertificatesModel]?
+    var cerListModels : [CNLiveVitaeCertificatesModel]? {
+        get{
+            _cerListModels
+        }
+        set{
+            _cerListModels = newValue!
+            setupCerNewUI(models: _cerListModels!)
+        }
+    }
+    
+    //认证和证书 数据源
+    lazy var totalDataArray: NSMutableArray = {
+        var dataArray = NSMutableArray()
         return dataArray
     }()
+
     let kCNLiveDigitalResumeGuanfangRenzhengCellIdentifier = "kCNLiveDigitalResumeGuanfangRenzhengCellIdentifier"
     let kCNLiveDigitalResumeSelectCerCellIdentifier = "kCNLiveDigitalResumeSelectCerCellIdentifier"
@@ -82,7 +107,11 @@ class CNLiveDigitalResumePreViewSelectRenzhengCerController:CNLiveBaseViewContro
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
-//        self.getCetList()
+        if self.renzhengCerType == .renzheng{
+            self.getAuthInfoList()
+        }else{
+            self.getCerList()
+        }
     }
     override func viewDidLoad() {
@@ -90,9 +119,11 @@ class CNLiveDigitalResumePreViewSelectRenzhengCerController:CNLiveBaseViewContro
         if self.renzhengCerType == .renzheng{
             titleName = "选择官方认证"
             self.renzhengCerLabel.text = "官方认证"
+            self.addBtn.setTitle("添加官方认证", for: .normal)
         }else{
             titleName = "选择证书"
             self.renzhengCerLabel.text = "技能证书"
+            self.addBtn.setTitle("添加证书", for: .normal)
         }
         navigationBarHidden = false
         self.view.backgroundColor = HexColor("#F5F6FB")
@@ -127,11 +158,20 @@ class CNLiveDigitalResumePreViewSelectRenzhengCerController:CNLiveBaseViewContro
         }
         self.view.addSubview(self.addBtn)
-        self.addBtn.snp.makeConstraints { make in
-            make.top.equalTo(KNavigationHeight)
-            make.right.equalToSuperview().offset(-15)
-            make.width.equalTo(70)
-            make.height.equalTo(53)
+        if self.renzhengCerType == .renzheng{
+            self.addBtn.snp.makeConstraints { make in
+                make.top.equalTo(KNavigationHeight)
+                make.right.equalToSuperview().offset(-15)
+                make.width.equalTo(100)
+                make.height.equalTo(53)
+            }
+        }else{
+            self.addBtn.snp.makeConstraints { make in
+                make.top.equalTo(KNavigationHeight)
+                make.right.equalToSuperview().offset(-15)
+                make.width.equalTo(70)
+                make.height.equalTo(53)
+            }
         }
         self.view.addSubview(self.renzhengCerLabel)
         self.renzhengCerLabel.snp.makeConstraints { make in
@@ -146,17 +186,18 @@ class CNLiveDigitalResumePreViewSelectRenzhengCerController:CNLiveBaseViewContro
     }
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        return 2
+        return self.totalDataArray.count
     }
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-        if indexPath.row == 0{
+        if self.renzhengCerType == .renzheng{
             guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveDigitalResumeGuanfangRenzhengCellIdentifier) as? CNLiveDigitalResumeGuanfangRenzhengCell
             else {
                 let cell = CNLiveDigitalResumeGuanfangRenzhengCell()
                 return cell
             }
-
+            let authListMdl = self.totalDataArray[indexPath.row] as! MineAuthListModel
+            cell.authListModel = authListMdl
             return cell
         }else{
             guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveDigitalResumeSelectCerCellIdentifier) as? CNLiveDigitalResumeSelectCerCell
@@ -164,8 +205,11 @@ class CNLiveDigitalResumePreViewSelectRenzhengCerController:CNLiveBaseViewContro
                 let cell = CNLiveDigitalResumeSelectCerCell()
                 return cell
             }
+            let cerListMdl = self.totalDataArray[indexPath.row] as! CNLiveVitaeCertificateModel
+            cell.cerListMdl = cerListMdl
             return cell
         }
+
     }
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
@@ -180,6 +224,23 @@ class CNLiveDigitalResumePreViewSelectRenzhengCerController:CNLiveBaseViewContro
         }
     }
+    func setupNewUI(models:[CNLiveVitaeIdentitiesModel]){
+        if models.count > 0{
+            
+        }else{
+            
+        }
+    }
+    
+    func setupCerNewUI(models:[CNLiveVitaeCertificatesModel]){
+        if models.count > 0{
+            
+        }else{
+            
+        }
+    }
+    
+    // MARK: - ButtonAction
     @objc func settingBtnAction(){
         //取消
@@ -193,4 +254,93 @@ class CNLiveDigitalResumePreViewSelectRenzhengCerController:CNLiveBaseViewContro
     }
+    // MARK: - 获取证书数量
+    func getCerList(){
+        let vsid = UserInfoManager.shared.userInfo.currentUser?.vsid ?? ""
+        CNLiveVitaeViewModel.getCerList(vsid: vsid, page: 1, pageSize: 100){ result, respStatue in
+            if respStatue == .success{
+                if let res = result as? [CNLiveVitaeCertificateModel]{
+                    var arr = Array<CNLiveVitaeCertificateModel>()
+                    var guanlianNum = 0
+                    res.forEach { cerMdl in
+                        if let cerListArr = self.cerListModels{
+                            for (_,mdl) in cerListArr.enumerated() {
+                                let model = mdl
+                                if cerMdl.id == model.id{
+                                    //已关联
+                                    if cerMdl.status == 0{//审核中:不可关联
+                                        cerMdl.selectStatus = -1
+                                    }else{//审核成功:可关联
+                                        cerMdl.selectStatus = 1
+                                    }
+                                    guanlianNum = guanlianNum + 1
+                                }else{
+                                    //未关联
+                                }
+                            }
+                        }
+                        arr.append(cerMdl)
+
+                    }
+                    self.renzhengCerLabel.text = "技能证书(\(guanlianNum)本)"
+                    
+                    self.totalDataArray.removeAllObjects()
+                    self.totalDataArray.addObjects(from: arr)
+                    self.tableView.reloadData()
+                }
+            }else{
+                showMessage(message: "数据异常")
+            }
+
+        }
+    }
+    //获取认证信息
+    func getAuthInfoList(){
+        CNLiveMineViewModel.requestsGETAuthInfoList(page: 1) { [weak self] result, respStatue in
+            if respStatue == .success {
+                let listBaseModel = result as! MineAuthListBaseModel
+                if self != nil{
+                    var arr = Array<MineAuthListModel>()
+                    var sussArr = Array<MineAuthListModel>()
+                    var guanlianNum = 0
+                    listBaseModel.list.forEach { listMdl in
+                        if let idListArr = self!.digitalListModels{
+                            
+                            for (_,mdl) in idListArr.enumerated() {
+                                let model = mdl
+                                if listMdl.identityId == model.identityId{
+                                    //已关联
+                                    if listMdl.userStatus == 0{//审核中:不可关联
+                                        listMdl.selectStatus = -1
+                                    }else{//审核成功:可关联
+                                        listMdl.selectStatus = 1
+                                    }
+                                    guanlianNum = guanlianNum + 1
+                                }else{
+                                    //未关联
+                                    //                                listMdl.selectStatus = 0
+                                }
+                            }
+                        }
+                        
+                        if listMdl.userStatus == 1{
+                            
+                            arr.insert(listMdl, at: 0)
+                            sussArr.append(listMdl)
+                        }else{
+                            arr.append(listMdl)
+                        }
+                    }
+                    self?.renzhengCerLabel.text = "官方认证(\(guanlianNum)条)"
+                    self!.totalDataArray.removeAllObjects()
+                    self!.totalDataArray.addObjects(from: arr)
+                    self!.tableView.reloadData()
+                }
+            }else {
+
+            }
+        }
+    }
+        
+    
 }
@@ -172,8 +172,8 @@ class CNLiveDigitalResumePreViewSecCell: UITableViewCell, UICollectionViewDelega
         //跳转 选择官方认证身份页面
         let vc = CNLiveDigitalResumePreViewSelectRenzhengCerController()
         vc.renzhengCerType = .renzheng
+        vc.digitalListModels = self.digitalListModels
         navigationViewController().pushViewController(vc, animated: true)
-
     }
 }
@@ -7,19 +7,20 @@
 import Foundation
 import SnapKit
+import Kingfisher
 class CNLiveDigitalResumeGuanfangRenzhengCell:UITableViewCell{
-//    var _userMdl : MineGetUserMsgVerifyUsersModel?
-//    var userMdl : MineGetUserMsgVerifyUsersModel? {
-//        get{
-//            _userMdl
-//        }
-//        set{
-//            _userMdl = newValue!
-//            setupNewUI(model: _userMdl!)
-//        }
-//    }
+    var _authListModel : MineAuthListModel?
+    var authListModel : MineAuthListModel? {
+        get{
+            _authListModel
+        }
+        set{
+            _authListModel = newValue!
+            setupNewUI(model: _authListModel!)
+        }
+    }
     lazy var whiteView :UIView = {
         let whiteView = UIView(frame: CGRect(x: 15, y:0, width: KSreenWidth-15-50, height:75 ))
@@ -52,21 +53,44 @@ class CNLiveDigitalResumeGuanfangRenzhengCell:UITableViewCell{
         whiteView.backgroundColor = .lightGray
         return whiteView
     }()
-    lazy var authedBtn: UIButton = {
-        let  closeBtn = UIButton(type: .custom)
-        closeBtn.frame = CGRect(x: 0, y: 0, width: 46, height: 15)
-        closeBtn.setTitle("已验证", for: .normal)
-        closeBtn.setTitleColor(HexColor("#C58733"), for: .normal)
-        closeBtn.backgroundColor = HexColor("#FBF3EC")
-        closeBtn.setImage(UIImage(named: "mine_jianli_preview_authed"), for: .normal)
-        closeBtn.setTitle("审核中", for: .selected)
-        closeBtn.setTitleColor(HexColor("#6DD400"), for: .selected)
-        closeBtn.titleLabel?.font = Font_11
-        closeBtn.layer.cornerRadius = 4
-        closeBtn.clipsToBounds = true
-        closeBtn.setupButtonImageAndTitlePossitionWith(padding: 2, style: .left)
-        return closeBtn
+    
+    lazy var authBgView :UIView = {
+        let whiteView = UIView(frame: CGRect(x: 15, y:0, width: KSreenWidth-15-50, height:75 ))
+        whiteView.backgroundColor = HexColor("#FBF3EC")
+        whiteView.layer.cornerRadius = 4
+        whiteView.clipsToBounds = true
+        return whiteView
+    }()
+    lazy var authIconImageView :UIImageView = {
+        let whiteView = UIImageView()
+        whiteView.image = UIImage(named: "mine_jianli_preview_authed")
+        return whiteView
+    }()
+    lazy var authTitleLabel: UILabel = {
+        let titleLabel = UILabel()
+        titleLabel.textColor = HexColor("#333333")
+        titleLabel.textAlignment = .center
+        titleLabel.text = "已验证"
+        titleLabel.font = Font_11
+        titleLabel.textColor = HexColor("#C58733")
+        return titleLabel
     }()
+//    lazy var authedBtn: UIButton = {
+//        let  closeBtn = UIButton(type: .custom)
+//        closeBtn.frame = CGRect(x: 0, y: 0, width: 46, height: 15)
+//        closeBtn.setTitle("已验证", for: .normal)
+//        closeBtn.setTitleColor(HexColor("#C58733"), for: .normal)
+//        closeBtn.backgroundColor = HexColor("#FBF3EC")
+//        closeBtn.setImage(UIImage(named: "mine_jianli_preview_authed"), for: .normal)
+//        closeBtn.setImage(UIImage(named: ""), for: .selected)
+//        closeBtn.setTitle("审核中", for: .selected)
+//        closeBtn.setTitleColor(HexColor("#6DD400"), for: .selected)
+//        closeBtn.titleLabel?.font = Font_11
+//        closeBtn.layer.cornerRadius = 4
+//        closeBtn.clipsToBounds = true
+//        closeBtn.setupButtonImageAndTitlePossitionWith(padding: 2, style: .left)
+//        return closeBtn
+//    }()
     override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
@@ -112,19 +136,88 @@ class CNLiveDigitalResumeGuanfangRenzhengCell:UITableViewCell{
             make.right.lessThanOrEqualToSuperview().offset(-60)
         }
-        self.whiteView.addSubview(self.authedBtn)
-        self.authedBtn.snp.makeConstraints { make in
+        self.whiteView.addSubview(self.authBgView)
+        self.authBgView.snp.makeConstraints { make in
             make.left.equalTo(self.nameTitleLabel.snp.right).offset(5)
             make.centerY.equalTo(self.iconImageView.snp.centerY)
             make.width.equalTo(60)
             make.height.equalTo(20)
         }
+        self.authBgView.addSubview(self.authIconImageView)
+        self.authIconImageView.snp.makeConstraints { make in
+            make.left.equalTo(4)
+            make.centerY.equalToSuperview()
+            make.width.equalTo(11)
+            make.height.equalTo(11)
+        }
+        self.authBgView.addSubview(self.authTitleLabel)
+        self.authTitleLabel.snp.makeConstraints { make in
+            make.left.equalTo(self.authIconImageView.snp.right).offset(2)
+            make.centerY.equalToSuperview()
+            make.right.equalToSuperview()
+        }
     }
-    func setupNewUI(model:MineGetUserMsgVerifyUsersModel){
+    func setupNewUI(model:MineAuthListModel){
         //默认未选择
-        
+        self.iconImageView.kf.setImage(with: URL(string: model.icon ?? ""))
+        self.nameTitleLabel.text = model.name ?? ""
+        if model.userStatus == 0{
+            //0审核中
+            self.authIconImageView.isHidden = true
+            self.authBgView.backgroundColor = HexColor("#EBFFD7")
+            self.authTitleLabel.text = "审核中"
+            self.authTitleLabel.textColor = HexColor("#6DD400")
+            self.authBgView.snp.remakeConstraints { make in
+                make.left.equalTo(self.nameTitleLabel.snp.right).offset(5)
+                make.centerY.equalTo(self.iconImageView.snp.centerY)
+                make.width.equalTo(43)
+                make.height.equalTo(20)
+            }
+            self.authTitleLabel.snp.remakeConstraints { make in
+                make.centerX.equalToSuperview()
+                make.centerY.equalToSuperview()
+            }
+        }else if model.userStatus == 1{
+            //1审核成功
+            self.authIconImageView.isHidden = false
+            self.authBgView.backgroundColor = HexColor("#FBF3EC")
+            self.authTitleLabel.text = "已验证"
+            self.authTitleLabel.textColor = HexColor("#C58733")
+            self.authBgView.snp.remakeConstraints { make in
+                make.left.equalTo(self.nameTitleLabel.snp.right).offset(5)
+                make.centerY.equalTo(self.iconImageView.snp.centerY)
+                make.width.equalTo(54)
+                make.height.equalTo(20)
+            }
+            self.authIconImageView.snp.remakeConstraints { make in
+                make.left.equalTo(4)
+                make.centerY.equalToSuperview()
+                make.width.equalTo(11)
+                make.height.equalTo(11)
+            }
+            self.authTitleLabel.snp.remakeConstraints { make in
+                make.centerY.equalToSuperview()
+                make.left.equalTo(15)
+            }
+        }else{
+            
+        }
+        if model.selectStatus == 0{
+            //未关联
+            self.selectBtn.isHidden = false
+            self.selectBtn.isSelected = false
+        }else if model.selectStatus == 1{
+            //已关联
+            self.selectBtn.isHidden = false
+            self.selectBtn.isSelected = true
+        }else if model.selectStatus == -1{
+            //不可选择
+            self.selectBtn.isHidden = true
+        }else{
+            
+        }
     }
@@ -10,16 +10,17 @@ import SnapKit
 class CNLiveDigitalResumeSelectCerCell:UITableViewCell{
-//    var _userMdl : MineGetUserMsgVerifyUsersModel?
-//    var userMdl : MineGetUserMsgVerifyUsersModel? {
-//        get{
-//            _userMdl
-//        }
-//        set{
-//            _userMdl = newValue!
-//            setupNewUI(model: _userMdl!)
-//        }
-//    }
+    var _cerListMdl : CNLiveVitaeCertificateModel?
+    var cerListMdl : CNLiveVitaeCertificateModel? {
+        get{
+            _cerListMdl
+        }
+        set{
+            _cerListMdl = newValue!
+            setupNewUI(model: _cerListMdl!)
+        }
+    }
+    
     lazy var whiteView :UIView = {
         let whiteView = UIView(frame: CGRect(x: 15, y:0, width: KSreenWidth-15-50, height:157 ))
@@ -190,11 +191,31 @@ class CNLiveDigitalResumeSelectCerCell:UITableViewCell{
         }
     }
-    
-    func setupNewUI(model:MineGetUserMsgVerifyUsersModel){
+        
+    func setupNewUI(model:CNLiveVitaeCertificateModel){
+        
+        self.authNameTitleLabel.text = model.title
+        self.nameLevelRightTitleLabel.text = model.lv.count > 0 ? model.lv : "无等级"
+        self.nameNumberRightTitleLabel.text = model.number.count > 0 ? model.number : "无编号"
+        self.nameJiGouRightTitleLabel.text = model.organization.count > 0 ? model.organization : "无机构"
+        if model.selectStatus == 0{
+            //未关联
+            self.selectBtn.isHidden = false
+            self.selectBtn.isSelected = false
+        }else if model.selectStatus == 1{
+            //已关联
+            self.selectBtn.isHidden = false
+            self.selectBtn.isSelected = true
+        }else if model.selectStatus == -1{
+            //不可选择
+            self.selectBtn.isHidden = true
+        }else{
+            
+        }
     }
+    
     @objc func selectBtnAction(button:UIButton){
         button.isSelected = !button.isSelected
         if !button.isSelected{
@@ -376,6 +376,10 @@ final class MineAuthListModel: BaseModel {//,TableCodable {
     var identityId: Int = 0
     var userStatus: Int = 0//0审核中 1审核成功
+    //预览简历-关联认证时 判断 0未关联 1已关联 -1不可选中
+    var selectStatus: Int = 0//0未关联 1已关联 -1不可选中
+
+    
 //    enum CodingKeys: String, CodingTableKey {
 //
 //        typealias Root = MineAuthListModel
@@ -22,7 +22,7 @@ class CNLiveVitaeCertificateModel:BaseModel{
     ///
     var uploadTime:String = ""
     ///
-    var status:Int = 0
+    var status:Int = 0//0审核中 1审核成功
     ///
     var number:String = ""
     ///
@@ -33,6 +33,11 @@ class CNLiveVitaeCertificateModel:BaseModel{
     var organization:String = ""
     ///
     var validity:String = ""
+    
+    
+    //预览简历-关联认证时 判断 0未关联 1已关联 -1不可选中
+    var selectStatus: Int = 0//0未关联 1已关联 -1不可选中
+
 }
 /**
  {
@@ -114,7 +114,7 @@ class CNLiveVitaeWorksModel:BaseModel{
 //简历证书模块
 class CNLiveVitaeCertificatesModel:BaseModel{
     ///
-    var id: Int = 0
+    var id:String = ""
     ///
     var img:String = ""
     ///