预览时数据变更

“张旭”
1 parent 9ba0bf0a
Showing 5 changed files with 183 additions and 73 deletions
metaCode/Classes/Main/HomePage/Controller/DigitalAuth/数字简历相关页面/CNLiveDigitalResumeController.swift
metaCode/Classes/Main/HomePage/Controller/DigitalAuth/数字简历相关页面/CNLiveDigitalResumePreViewController.swift
metaCode/Classes/Main/HomePage/Controller/DigitalAuth/数字简历相关页面/CNLiveDigitalResumePreViewMineJianJieController.swift
metaCode/Classes/Main/HomePage/View/DigitalAuthViews/我的简历cell/CNLiveDigitalResumePreviewFourCell.swift
metaCode/Classes/Main/HomePage/View/DigitalAuthViews/我的简历cell/CNLiveDigitalResumePreviewSixCell.swift
@@ -7,19 +7,8 @@
 import Foundation
-///数字简历页面类型
-enum CNLiveResumeType {
-    ///默认状态
-    case normal
-    ///我的简历
-    case mineResume
-    ///预览简历
-    case previewResume
-}
-
 class CNLiveDigitalResumeController:CNLiveBaseViewController,UITableViewDataSource, UITableViewDelegate{
-    var resumeType:CNLiveResumeType = .normal
     var certificatesCount:Int = 0//证书数量
     //简历model
@@ -24,8 +24,18 @@ enum CNLiveViatePreviewCellType {
     ///自我介绍
     case mineJieShao
 }
+///数字简历页面类型
+enum CNLiveResumeType {
+    ///默认数字简历
+    case normal
+    ///预览简历
+    case previewResume
+}
+
 class CNLiveDigitalResumePreViewController:CNLiveBaseViewController,UITableViewDataSource, UITableViewDelegate{
+    var resumeType:CNLiveResumeType = .normal
+
     //简历model
     var vitaeModel:CNLiveVitaeModel?
     var sixCellHeight:CGFloat = DefaultPreViewCellHeight+15
@@ -61,12 +71,28 @@ class CNLiveDigitalResumePreViewController:CNLiveBaseViewController,UITableViewD
         var dataArray = NSMutableArray()
         return dataArray
     }()
+    //所有cell的preView type
+    lazy var totalPreViewDataArray: NSMutableArray = {
+        var dataArray = NSMutableArray()
+        return dataArray
+    }()
+    //workPreView的数据源
+    lazy var workPreViewDataArray: NSMutableArray = {
+        var dataArray = NSMutableArray()
+        return dataArray
+    }()
+    //awardPreView的数据源
+    lazy var awardPreViewDataArray: NSMutableArray = {
+        var dataArray = NSMutableArray()
+        return dataArray
+    }()
     //简历-官方认证数据
     lazy var succDataArray: NSMutableArray = {
         var dataArray = NSMutableArray()
         return dataArray
     }()
+    //简历-证书数据
     lazy var threeCerDataArray:[CNLiveVitaeCertificatesModel] = {
         var dataArray = [CNLiveVitaeCertificatesModel]()
         return dataArray
@@ -119,6 +145,8 @@ class CNLiveDigitalResumePreViewController:CNLiveBaseViewController,UITableViewD
         let  nextBtn = UIButton(type: .custom)
         nextBtn.setTitle("预览数字简历", for: .normal)
         nextBtn.setTitleColor(.white, for: .normal)
+        nextBtn.setTitle("退出预览", for: .selected)
+        nextBtn.setTitleColor(.white, for: .selected)
         nextBtn.backgroundColor = HexColor("#1961FE")
         nextBtn.layer.cornerRadius = 20
         nextBtn.clipsToBounds = true
@@ -179,11 +207,20 @@ class CNLiveDigitalResumePreViewController:CNLiveBaseViewController,UITableViewD
     }
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        return self.totalDataArray.count
+        if self.resumeType == .normal{
+            return self.totalDataArray.count
+        }else{
+            return self.totalPreViewDataArray.count
+        }
     }
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-        let cellType = self.totalDataArray[indexPath.row] as! CNLiveViatePreviewCellType
+        var cellType = CNLiveViatePreviewCellType.realName
+        if self.resumeType == .normal{
+            cellType = self.totalDataArray[indexPath.row] as! CNLiveViatePreviewCellType
+        }else{
+            cellType = self.totalPreViewDataArray[indexPath.row] as! CNLiveViatePreviewCellType
+        }
         if cellType == .realName{
             //我的简历-fir姓名等Cell
             guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveDigitalResumePreViewFirCellIdentifier) as? CNLiveDigitalResumePreViewFirCell
@@ -192,9 +229,7 @@ class CNLiveDigitalResumePreViewController:CNLiveBaseViewController,UITableViewD
                 return cell
             }
             cell.updateViateDataBlock = {
-                
                 self.getVitae()
-//                self.getCetList()
             }
             if self.vitaeModel?.vitae?.id ?? 0 > 0{
                 cell.vitaeModel = self.vitaeModel!
@@ -225,10 +260,22 @@ class CNLiveDigitalResumePreViewController:CNLiveBaseViewController,UITableViewD
                 let cell = CNLiveDigitalResumePreviewFourCell()
                 return cell
             }
-            if let workMdl = self.workDataArray[indexPath.row] as? CNLiveVitaeWorksModel{
+            cell.cellType = .work
+            var workModel:CNLiveVitaeWorksModel? = nil
+            if self.resumeType == .normal{
+                workModel = self.workDataArray[indexPath.row] as? CNLiveVitaeWorksModel
+            }else{
+                workModel = self.workPreViewDataArray[indexPath.row] as? CNLiveVitaeWorksModel
+            }
+            if let workMdl = workModel{
                 cell.workMdl = workMdl
                 cell.vitaePreviewWorkCellChangedBlock = { workCell,jianjieHeight,isExpand in
-                    let res = self.workDataArray
+                    var res = self.workDataArray
+                    if self.resumeType == .normal{
+                        res = self.workDataArray
+                    }else{
+                        res = self.workPreViewDataArray
+                    }
                     var tempArr = Array<Any>()
                     let idxPath = tableView.indexPath(for: workCell)
                     for (idx,mdl) in res.enumerated() {
@@ -240,7 +287,11 @@ class CNLiveDigitalResumePreViewController:CNLiveBaseViewController,UITableViewD
                             tempArr.append(mdl)
                         }
                     }
-                    self.workDataArray = NSMutableArray(array: tempArr)
+                    if self.resumeType == .normal{
+                        self.workDataArray = NSMutableArray(array: tempArr)
+                    }else{
+                        self.workPreViewDataArray = NSMutableArray(array: tempArr)
+                    }
                     self.tableView.reloadData()
                 }
                 cell.vitaeWorkPreviewVideoPhotoBlock = { images , index in
@@ -263,10 +314,22 @@ class CNLiveDigitalResumePreViewController:CNLiveBaseViewController,UITableViewD
                 let cell = CNLiveDigitalResumePreviewFourCell()
                 return cell
             }
-            if let awardMdl = self.awardDataArray[indexPath.row] as? CNLiveVitaeAwardsModel{
+            cell.cellType = .award
+            var awardModel:CNLiveVitaeAwardsModel?
+            if self.resumeType == .normal{
+                awardModel = self.awardDataArray[indexPath.row] as? CNLiveVitaeAwardsModel
+            }else{
+                awardModel = self.awardPreViewDataArray[indexPath.row] as? CNLiveVitaeAwardsModel
+            }
+            if let awardMdl = awardModel{
                 cell.awardModel = awardMdl
                 cell.vitaePreviewWorkCellChangedBlock = { workCell,jianjieHeight ,isExpand in
-                    let res = self.awardDataArray
+                    var res = self.awardDataArray
+                    if self.resumeType == .normal{
+                        res = self.awardDataArray
+                    }else{
+                        res = self.awardPreViewDataArray
+                    }
                     var tempArr = Array<Any>()
                     let idxPath = tableView.indexPath(for: workCell)
                     for (idx,mdl) in res.enumerated() {
@@ -278,7 +341,11 @@ class CNLiveDigitalResumePreViewController:CNLiveBaseViewController,UITableViewD
                             tempArr.append(mdl)
                         }
                     }
-                    self.awardDataArray = NSMutableArray(array: tempArr)
+                    if self.resumeType == .normal{
+                        self.awardDataArray = NSMutableArray(array: tempArr)
+                    }else{
+                        self.awardPreViewDataArray = NSMutableArray(array: tempArr)
+                    }
                     self.tableView.reloadData()
                 }
                 cell.vitaeWorkPreviewVideoPhotoBlock = { images , index in
@@ -301,7 +368,7 @@ class CNLiveDigitalResumePreViewController:CNLiveBaseViewController,UITableViewD
                 let cell = CNLiveDigitalResumePreviewSixCell()
                 return cell
             }
-
+            cell.vitaeMdl = self.vitaeModel
             cell.vitaePreviewSixCellChangedBlock = { sixCell,jianjieHeight,isExpand in
                 self.vitaeModel?.vitae?.isExpand = isExpand
                 self.sixCellHeight = jianjieHeight+69
@@ -317,12 +384,14 @@ class CNLiveDigitalResumePreViewController:CNLiveBaseViewController,UITableViewD
         }
     }
-    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
-        
-    }
-    
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
-        let cellType = self.totalDataArray[indexPath.row] as! CNLiveViatePreviewCellType
+        var cellType = CNLiveViatePreviewCellType.realName
+        if self.resumeType == .normal{
+            cellType = self.totalDataArray[indexPath.row] as! CNLiveViatePreviewCellType
+        }else{
+            cellType = self.totalPreViewDataArray[indexPath.row] as! CNLiveViatePreviewCellType
+        }
+        
         if cellType == .realName{
             return 177+51
         }else if cellType == .guanFang{
@@ -332,16 +401,26 @@ class CNLiveDigitalResumePreViewController:CNLiveBaseViewController,UITableViewD
         }else if cellType == .work{
             if self.vitaeModel?.works.count ?? 0 > 0{
                 //有多个workcell
-                let model = self.workDataArray[indexPath.row] as! CNLiveVitaeWorksModel
-                return CGFloat(model.cellH)
+                if self.resumeType == .normal{
+                    let model = self.workDataArray[indexPath.row] as! CNLiveVitaeWorksModel
+                    return CGFloat(model.cellH)
+                }else{
+                    let model = self.workPreViewDataArray[indexPath.row] as! CNLiveVitaeWorksModel
+                    return CGFloat(model.cellH)
+                }
             }else{
                 return DefaultPreViewCellHeight+15//396+15
             }
         }else if cellType == .award{
             if self.vitaeModel?.awards.count ?? 0 > 0{
                 //有多个awardcell
-                let model = self.awardDataArray[indexPath.row] as! CNLiveVitaeAwardsModel
-                return CGFloat(model.cellH)
+                if self.resumeType == .normal{
+                    let model = self.awardDataArray[indexPath.row] as! CNLiveVitaeAwardsModel
+                    return CGFloat(model.cellH)
+                }else{
+                    let model = self.awardPreViewDataArray[indexPath.row] as! CNLiveVitaeAwardsModel
+                    return CGFloat(model.cellH)
+                }
             }else{
                 return DefaultPreViewCellHeight+15//396+15
             }
@@ -358,7 +437,16 @@ class CNLiveDigitalResumePreViewController:CNLiveBaseViewController,UITableViewD
         currentViewController()?.navigationController?.pushViewController(vc, animated: true)
     }
     @objc func previewBtnAction(){
-        
+        if self.resumeType == .normal{
+            //预览数字简历
+            self.resumeType = .previewResume
+            self.previewBtn.isSelected = true
+        }else{
+            //退出预览数字简历
+            self.resumeType = .normal
+            self.previewBtn.isSelected = false
+        }
+        self.tableView.reloadData()
     }
     @objc func moreNavBtnAction(){
@@ -382,7 +470,6 @@ class CNLiveDigitalResumePreViewController:CNLiveBaseViewController,UITableViewD
                         //官方认证
                         var arr = Array<CNLiveVitaeIdentitiesModel>()
-                        var sussArr = Array<CNLiveVitaeIdentitiesModel>()
                         model.identities.forEach { listMdl in
                             arr.append(listMdl)
                         }
@@ -394,29 +481,57 @@ class CNLiveDigitalResumePreViewController:CNLiveBaseViewController,UITableViewD
                         self.saveViateModel()
                         self.totalDataArray.removeAllObjects()
+                        self.totalPreViewDataArray.removeAllObjects()
                         self.workDataArray.removeAllObjects()
                         self.awardDataArray.removeAllObjects()
+                        self.workPreViewDataArray.removeAllObjects()
+                        self.awardPreViewDataArray.removeAllObjects()
                         self.totalDataArray.addObjects(from: [CNLiveViatePreviewCellType.realName,CNLiveViatePreviewCellType.guanFang,CNLiveViatePreviewCellType.cer])
+                        self.totalPreViewDataArray.add(CNLiveViatePreviewCellType.realName)
+                        self.workPreViewDataArray.add(CNLiveViatePreviewCellType.realName)
+                        self.awardPreViewDataArray.add(CNLiveViatePreviewCellType.realName)
+                        
+                        if self.succDataArray.count > 0{
+                            self.totalPreViewDataArray.add(CNLiveViatePreviewCellType.guanFang)
+                            self.workPreViewDataArray.add(CNLiveViatePreviewCellType.guanFang)
+                            self.awardPreViewDataArray.add(CNLiveViatePreviewCellType.guanFang)
+                        }
+                        if self.threeCerDataArray.count > 0{
+                            self.totalPreViewDataArray.add(CNLiveViatePreviewCellType.cer)
+                            self.workPreViewDataArray.add(CNLiveViatePreviewCellType.cer)
+                            self.awardPreViewDataArray.add(CNLiveViatePreviewCellType.cer)
+                        }
                         self.workDataArray.addObjects(from: [CNLiveViatePreviewCellType.realName,CNLiveViatePreviewCellType.guanFang,CNLiveViatePreviewCellType.cer])
                         self.awardDataArray.addObjects(from: [CNLiveViatePreviewCellType.realName,CNLiveViatePreviewCellType.guanFang,CNLiveViatePreviewCellType.cer])
                         for (_,mdl) in self.vitaeModel!.works.enumerated() {
                             self.totalDataArray.add(CNLiveViatePreviewCellType.work)
-                            
+                            self.totalPreViewDataArray.add(CNLiveViatePreviewCellType.work)
+
                             let layout = CNLiveViateWorkModelLayout(model: mdl ,descH: Float(40.0),isPreview: true, isExpand: false)
                             let newWorkModel = layout.getCellHModel()
                             self.workDataArray.add(newWorkModel)
                             self.awardDataArray.add(CNLiveViatePreviewCellType.work)
+                            self.workPreViewDataArray.add(newWorkModel)
+                            self.awardPreViewDataArray.add(CNLiveViatePreviewCellType.work)
                         }
                         for (_,mdl) in self.vitaeModel!.awards.enumerated() {
                             self.totalDataArray.add(CNLiveViatePreviewCellType.award)
+                            self.totalPreViewDataArray.add(CNLiveViatePreviewCellType.award)
                             let layout = CNLiveViateAwardModelLayout(model: mdl ,descH: Float(40.0),isPreview: true, isExpand: false)
                             let newWorkModel = layout.getCellHModel()
                             self.awardDataArray.add(newWorkModel)
                             self.workDataArray.add(CNLiveViatePreviewCellType.award)
+                            self.awardPreViewDataArray.add(newWorkModel)
+                            self.workPreViewDataArray.add(CNLiveViatePreviewCellType.award)
                         }
                         self.totalDataArray.add(CNLiveViatePreviewCellType.mineJieShao)
                         self.workDataArray.add(CNLiveViatePreviewCellType.mineJieShao)
                         self.awardDataArray.add(CNLiveViatePreviewCellType.mineJieShao)
+                        if model.vitae?.selfIntroduction.count ?? 0 > 0{
+                            self.totalPreViewDataArray.add(CNLiveViatePreviewCellType.mineJieShao)
+                            self.workPreViewDataArray.add(CNLiveViatePreviewCellType.mineJieShao)
+                            self.awardPreViewDataArray.add(CNLiveViatePreviewCellType.mineJieShao)
+                        }
                         self.tableView.reloadData()
                     }
                 }else{
@@ -279,11 +279,11 @@ class CNLiveDigitalResumePreViewMineJianJieController:CNLiveBaseViewController, 
     @objc func addWorkBtnAction(){
         //提交
-        if self.textView.text.count > 0{
+//        if self.textView.text.count > 0{
             self.saveJianJie(introduction:self.textView.text)
-        }else{
-            showMessage(message: "请输入自我介绍")
-        }
+//        }else{
+//            showMessage(message: "请输入自我介绍")
+//        }
     }
 }
@@ -15,6 +15,8 @@ typealias vitaePreviewWorkCellChangedBlockActionBlock = (_ cell: CNLiveDigitalRe
 class CNLiveDigitalResumePreviewFourCell: UITableViewCell {
+    var cellType:CNLiveViateWorkAwardType = .work
+    
     //workModel
     var _workMdl : CNLiveVitaeWorksModel?
     var workMdl : CNLiveVitaeWorksModel? {
@@ -587,12 +589,12 @@ class CNLiveDigitalResumePreviewFourCell: UITableViewCell {
     }
     @objc func zhengshuBtnAction(){
-        if self.workMdl != nil{
+        if self.cellType == .work{
             //跳转 选择工作记录页面
             let vc = CNLiveVitaeWorkDetailController()
             vc.workAwardType = .work
             navigationViewController().pushViewController(vc, animated: true)
-        }else if self.awardModel != nil{
+        }else if self.cellType == .award{
             //跳转 选择获奖情况页面
             let vc = CNLiveVitaeWorkDetailController()
             vc.workAwardType = .award
@@ -185,44 +185,48 @@ class CNLiveDigitalResumePreviewSixCell: UITableViewCell {
     }
     func setupNewUI(model:CNLiveVitaeModel){
-        self.zhengshuNoIconImgView.isHidden = true
-        self.zhengshuNoDescTitleLabel.isHidden = true
-        self.nameIconImgView.isHidden = false
-        self.jianjieLabel.isHidden = false
-        self.jianjieLabel.text = model.vitae?.selfIntroduction//"描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述"//
-        let lines = jianjieLabel.getRealLabelTextLines()
-        let height = jianjieLabel.qmui_lineHeight
-        if lines <= 2{
-            self.expandBtn.isHidden = true
-        }else{
-            self.expandBtn.isHidden = false
-        }
-        
-        var jienjieH:CGFloat = 0
-        if model.vitae!.isExpand{
-            //展开状态
-            jienjieH = height*CGFloat(lines)
-            self.jianjieLabel.numberOfLines = 0
+        if model.vitae?.selfIntroduction.count == 0{
+            self.zhengshuNoIconImgView.isHidden = false
+            self.zhengshuNoDescTitleLabel.isHidden = false
         }else{
-            //收起状态
+            self.zhengshuNoIconImgView.isHidden = true
+            self.zhengshuNoDescTitleLabel.isHidden = true
+            self.nameIconImgView.isHidden = false
+            self.jianjieLabel.isHidden = false
+            self.jianjieLabel.text = model.vitae?.selfIntroduction//"描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述"//
+            let lines = jianjieLabel.getRealLabelTextLines()
+            let height = jianjieLabel.qmui_lineHeight
             if lines <= 2{
-                //小于2行,按实际行数
-                jienjieH = CGFloat(lines)*height+2
+                self.expandBtn.isHidden = true
             }else{
-                //大于2行, 显示2行
-                jienjieH = 2*height+2
+                self.expandBtn.isHidden = false
             }
-            self.jianjieLabel.numberOfLines = 2
-        }
-        self.expandBtn.isSelected = model.vitae!.isExpand
-        self.jianjieLabel.snp.remakeConstraints { make in
-            make.top.equalTo(self.myIdentityTitleLabel.snp.bottom).offset(10)
-            make.left.equalTo(self.nameIconImgView.snp.right).offset(10)
-            make.right.equalToSuperview().offset(-20)
-            make.height.equalTo(jienjieH)
+            
+            var jienjieH:CGFloat = 0
+            if model.vitae!.isExpand{
+                //展开状态
+                jienjieH = height*CGFloat(lines)
+                self.jianjieLabel.numberOfLines = 0
+            }else{
+                //收起状态
+                if lines <= 2{
+                    //小于2行,按实际行数
+                    jienjieH = CGFloat(lines)*height+2
+                }else{
+                    //大于2行, 显示2行
+                    jienjieH = 2*height+2
+                }
+                self.jianjieLabel.numberOfLines = 2
+            }
+            self.expandBtn.isSelected = model.vitae!.isExpand
+            self.jianjieLabel.snp.remakeConstraints { make in
+                make.top.equalTo(self.myIdentityTitleLabel.snp.bottom).offset(10)
+                make.left.equalTo(self.nameIconImgView.snp.right).offset(10)
+                make.right.equalToSuperview().offset(-20)
+                make.height.equalTo(jienjieH)
+            }
+            self.expandBtn.top = self.jianjieLabel.top+jienjieH
         }
-        self.expandBtn.top = self.jianjieLabel.top+jienjieH
-
     }