数字简历页面-预览时cell高度重新计算

“张旭”
1 parent 3f92d228
Showing 5 changed files with 83 additions and 18 deletions
metaCode/Classes/Main/HomePage/Controller/DigitalAuth/数字简历相关页面/CNLiveDigitalResumePreViewController.swift
metaCode/Classes/Main/HomePage/View/DigitalAuthViews/我的简历cell/CNLiveDigitalResumePreViewSecCell.swift
metaCode/Classes/Main/HomePage/View/DigitalAuthViews/我的简历cell/CNLiveDigitalResumePreviewFourCell.swift
metaCode/Classes/Main/HomePage/View/DigitalAuthViews/我的简历cell/CNLiveDigitalResumePreviewSixCell.swift
metaCode/Classes/Main/HomePage/View/DigitalAuthViews/我的简历cell/CNLiveDigitalResumePreviewThreeCell.swift
@@ -39,8 +39,7 @@ class CNLiveDigitalResumePreViewController:CNLiveBaseViewController,UITableViewD
  
     //简历model
     var vitaeModel:CNLiveVitaeModel?
-    var sixCellHeight:CGFloat = DefaultPreViewCellHeight+15
-    
+    var sixCellHeight:CGFloat = 165+15
  
     lazy var bgImgView :UIImageView = {
         let iconImgView = UIImageView()
@@ -249,6 +248,7 @@ class CNLiveDigitalResumePreViewController:CNLiveBaseViewController,UITableViewD
             }else{
                 cell.zhengshuBtn.isHidden = true
             }
+            cell.resumeType = self.resumeType
             cell.digitalListModels = self.succDataArray as? [CNLiveVitaeIdentitiesModel]
             return cell
         }else if cellType == .cer{
@@ -278,6 +278,7 @@ class CNLiveDigitalResumePreViewController:CNLiveBaseViewController,UITableViewD
             }else{
                 cell.zhengshuBtn.isHidden = true
             }
+            cell.resumeType = self.resumeType
             var workModel:[CNLiveVitaeWorksModel]? = nil
             if self.resumeType == .normal{
                 workModel = self.workDataArray as? [CNLiveVitaeWorksModel]
@@ -337,6 +338,7 @@ class CNLiveDigitalResumePreViewController:CNLiveBaseViewController,UITableViewD
             }else{
                 cell.zhengshuBtn.isHidden = true
             }
+            cell.resumeType = self.resumeType
             var awardModels:[CNLiveVitaeAwardsModel]?
             if self.resumeType == .normal{
                 awardModels = self.awardDataArray as? [CNLiveVitaeAwardsModel]
@@ -422,16 +424,34 @@ class CNLiveDigitalResumePreViewController:CNLiveBaseViewController,UITableViewD
         if cellType == .realName{
             return 177+51
         }else if cellType == .guanFang{
-//            return self.succDataArray.count == 0 ?  DefaultPreViewCellHeight+15 : 15+58+100+10+34+20
             let cellH:CGFloat = DefaultPreViewCellHeight
             if self.succDataArray.count == 0{
                 return cellH
             }else{
-                let hang:CGFloat = CGFloat((self.succDataArray.count-1)/3+1)
-                return 65+100*hang+10+34+20
+                if self.resumeType == .normal{
+                    let hang:CGFloat = CGFloat((self.succDataArray.count-1)/3+1)
+                    return 65+100*hang+10+34+20
+                }else{
+                    let hang:CGFloat = CGFloat((self.succDataArray.count-1)/3+1)
+                    return 65+100*hang+10
+                }
             }
         }else if cellType == .cer{
-            return self.threeCerDataArray.count == 0 ? DefaultPreViewCellHeight+15 : 227+15
+//            return self.threeCerDataArray.count == 0 ? DefaultPreViewCellHeight+15 : (self.resumeType == .normal ? 227+15 : 227+15-34)
+            let cellH:CGFloat = DefaultPreViewCellHeight+15
+            if self.threeCerDataArray.count == 0{
+                return cellH
+            }else{
+                let imgW:CGFloat = CGFloat((KSreenWidth-80-30)/3.0)
+                let imgH:CGFloat = 101*imgW/85.0
+                if self.resumeType == .normal{
+                    let hang:CGFloat = CGFloat((self.threeCerDataArray.count-1)/3+1)
+                    return 61+imgH*hang+10+34+20
+                }else{
+                    let hang:CGFloat = CGFloat((self.succDataArray.count-1)/3+1)
+                    return 61+imgH*hang+10+20
+                }
+            }
         }else if cellType == .work{
             if self.vitaeModel?.works.count ?? 0 > 0{
                 //有多个workcell
@@ -445,14 +465,12 @@ class CNLiveDigitalResumePreViewController:CNLiveBaseViewController,UITableViewD
                     return CGFloat(cellH)+15
                 }else{
                     //计算cellheight
-                    var cellH:Float = 58+54//顶部和底部
+                    var cellH:Float = 58//顶部
                     self.workPreViewDataArray.forEach { model in
                         let mdl = model as! CNLiveVitaeWorksModel
                         cellH = cellH + mdl.cellH
                     }
                     return CGFloat(cellH)+15
-//                    let model = self.workPreViewDataArray[indexPath.row] as! CNLiveVitaeWorksModel
-//                    return CGFloat(model.cellH)
                 }
             }else{
                 return DefaultPreViewCellHeight+15//396+15
@@ -461,8 +479,6 @@ class CNLiveDigitalResumePreViewController:CNLiveBaseViewController,UITableViewD
             if self.vitaeModel?.awards.count ?? 0 > 0{
                 //有多个awardcell
                 if self.resumeType == .normal{
-//                    let model = self.awardDataArray[indexPath.row] as! CNLiveVitaeAwardsModel
-//                    return CGFloat(model.cellH)
                     //计算cellheight
                     var cellH:Float = 58+54//顶部和底部
                     self.awardDataArray.forEach { model in
@@ -471,10 +487,8 @@ class CNLiveDigitalResumePreViewController:CNLiveBaseViewController,UITableViewD
                     }
                     return CGFloat(cellH)+15
                 }else{
-//                    let model = self.awardPreViewDataArray[indexPath.row] as! CNLiveVitaeAwardsModel
-//                    return CGFloat(model.cellH)
                     //计算cellheight
-                    var cellH:Float = 58+54//顶部和底部
+                    var cellH:Float = 58//顶部
                     self.awardPreViewDataArray.forEach { model in
                         let mdl = model as! CNLiveVitaeAwardsModel
                         cellH = cellH + mdl.cellH
@@ -485,7 +499,13 @@ class CNLiveDigitalResumePreViewController:CNLiveBaseViewController,UITableViewD
                 return DefaultPreViewCellHeight+15//396+15
             }
         }else if cellType == .mineJieShao{
-            return self.sixCellHeight
+//            return self.resumeType == .normal ? self.sixCellHeight : self.sixCellHeight-54
+            let cellH:CGFloat = self.sixCellHeight
+            if self.resumeType == .normal{
+                return cellH
+            }else{
+                return cellH-34
+            }
         }else{
             return 50
         }
@@ -536,7 +556,7 @@ class CNLiveDigitalResumePreViewController:CNLiveBaseViewController,UITableViewD
                     }else{
                         //有简历-刷新页面
                         self.vitaeModel = nil
-                        self.sixCellHeight = DefaultPreViewCellHeight+15
+                        self.sixCellHeight = 165+15
                         self.vitaeModel = model
  
                         //官方认证
@@ -13,6 +13,7 @@ var DefaultPreViewCellHeight:CGFloat = 193
 var HaveDataPreViewCellHeight:CGFloat = 218
  
 class CNLiveDigitalResumePreViewSecCell: UITableViewCell, UICollectionViewDelegate, UICollectionViewDataSource {
+    var resumeType:CNLiveResumeType = .normal
  
     lazy var whiteView :UIView = {
         let whiteView = UIView(frame: CGRect(x: 15, y:15, width: KSreenWidth-30, height: DefaultPreViewCellHeight))
@@ -149,6 +150,22 @@ class CNLiveDigitalResumePreViewSecCell: UITableViewCell, UICollectionViewDelega
             self.zhengshuNoIconImgView.isHidden = true
             self.zhengshuNoDescTitleLabel.isHidden = true
             self.zhengshuNoIconImgView.isHidden = true
+            
+            if self.resumeType == .normal{
+                self.threeCollectionView.snp.remakeConstraints { make in
+                    make.left.equalToSuperview().offset(adapt_length(length: 18))
+                    make.top.equalTo(self.myIdentityTitleLabel.snp.bottom).offset(15)
+                    make.bottom.equalToSuperview().offset(-34-20-10)
+                    make.width.equalToSuperview().offset(adapt_length(length: -36))
+                }
+            }else{//预览
+                self.threeCollectionView.snp.remakeConstraints { make in
+                    make.left.equalToSuperview().offset(adapt_length(length: 18))
+                    make.top.equalTo(self.myIdentityTitleLabel.snp.bottom).offset(15)
+                    make.bottom.equalToSuperview().offset(-10)
+                    make.width.equalToSuperview().offset(adapt_length(length: -36))
+                }
+            }
         }else{
             //没有 已审核身份
             self.whiteView.height = DefaultPreViewCellHeight
@@ -12,7 +12,8 @@ import JFHeroBrowser
  
  
 class CNLiveDigitalResumePreviewFourCell: UITableViewCell,UITableViewDelegate,UITableViewDataSource {
-    
+    var resumeType:CNLiveResumeType = .normal
+
     var cellType:CNLiveViateWorkAwardType = .work
     var cellH:Float = 58+45+37+54//默认顶部,空视图,底部高度
  
@@ -162,6 +163,19 @@ class CNLiveDigitalResumePreviewFourCell: UITableViewCell,UITableViewDelegate,UI
         if models.count > 0{
             self.zhengshuNoIconImgView.isHidden = true
             self.zhengshuNoDescTitleLabel.isHidden = true
+            if self.resumeType == .normal{
+                self.tableView.snp.remakeConstraints { make in
+                    make.top.equalTo(self.myIdentityTitleLabel.snp.bottom)
+                    make.left.right.equalToSuperview()
+                    make.bottom.equalTo(self.zhengshuBtn.snp.top)
+                }
+            }else{
+                self.tableView.snp.remakeConstraints { make in
+                    make.top.equalTo(self.myIdentityTitleLabel.snp.bottom)
+                    make.left.right.equalToSuperview()
+                    make.bottom.equalToSuperview().offset(-10)
+                }
+            }
         }
  
         self.tableView.reloadData()
@@ -173,6 +187,19 @@ class CNLiveDigitalResumePreviewFourCell: UITableViewCell,UITableViewDelegate,UI
         if models.count > 0{
             self.zhengshuNoIconImgView.isHidden = true
             self.zhengshuNoDescTitleLabel.isHidden = true
+            if self.resumeType == .normal{
+                self.tableView.snp.remakeConstraints { make in
+                    make.top.equalTo(self.myIdentityTitleLabel.snp.bottom)
+                    make.left.right.equalToSuperview()
+                    make.bottom.equalTo(self.zhengshuBtn.snp.top)
+                }
+            }else{
+                self.tableView.snp.remakeConstraints { make in
+                    make.top.equalTo(self.myIdentityTitleLabel.snp.bottom)
+                    make.left.right.equalToSuperview()
+                    make.bottom.equalToSuperview().offset(-10)
+                }
+            }
         }
         self.tableView.reloadData()
     }
@@ -13,6 +13,7 @@ import SnapKit
 typealias vitaePreviewSixCellChangedBlockActionBlock = (_ cell: CNLiveDigitalResumePreviewSixCell ,_ cellHeight:CGFloat, _ isExpand:Bool) -> Void
  
 class CNLiveDigitalResumePreviewSixCell: UITableViewCell {
+    var resumeType:CNLiveResumeType = .normal
     var vitaePreviewSixCellChangedBlock:vitaePreviewSixCellChangedBlockActionBlock?
  
     //_vitaeMdl
@@ -13,7 +13,7 @@ import JFHeroBrowser
 var CerHaveDataPreViewCellHeight:CGFloat = 227
  
 class CNLiveDigitalResumePreviewThreeCell: UITableViewCell {
-    
+    var resumeType:CNLiveResumeType = .normal
     var _threeCerDataArray : [CNLiveVitaeCertificatesModel]?
     var threeCerDataArray : [CNLiveVitaeCertificatesModel]? {
         get{