工作和获奖,自我介绍展开收起变换高度

“张旭”
1 parent 50490bba
Showing 8 changed files with 113 additions and 46 deletions
metaCode/Classes/Main/HomePage/Controller/DigitalAuth/工作相关页面/CNLiveVitaeWorkDetailController.swift
metaCode/Classes/Main/HomePage/Controller/DigitalAuth/数字简历相关页面/CNLiveDigitalResumePreViewController.swift
metaCode/Classes/Main/HomePage/View/DigitalAuthViews/Vitae/Work/CNLiveVitaeWorkCell.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/Model/Vitae/CNLiveViateWorkModelLayout.swift
metaCode/Classes/Main/Model/Vitae/CNLiveVitaeModel.swift
@@ -150,18 +150,18 @@ class CNLiveVitaeWorkDetailController:CNLiveBaseViewController,UITableViewDataSo
             let model = workListArr[indexPath.row] as! CNLiveVitaeAwardsModel
             cell.awardModel = model
         }
-        cell.vitaeWorkCellChangedBlock = { workCell,jianjieHeight in
+        cell.vitaeWorkCellChangedBlock = { workCell,jianjieHeight,isExpand in
             let res = self.workListArr
             var tempArr = Array<Any>()
             let idxPath = tableView.indexPath(for: workCell)
             for (idx,mdl) in res.enumerated() {
                 if idx == idxPath?.row{
                     if self.workAwardType == .work{
-                        let layout = CNLiveViateWorkModelLayout(model: mdl as! CNLiveVitaeWorksModel,descH: Float(jianjieHeight),isPreview: false)
+                        let layout = CNLiveViateWorkModelLayout(model: mdl as! CNLiveVitaeWorksModel,descH: Float(jianjieHeight),isPreview: false, isExpand: isExpand)
                         let newWorkModel = layout.getCellHModel()
                         tempArr.append(newWorkModel)
                     }else{
-                        let layout = CNLiveViateAwardModelLayout(model: mdl as! CNLiveVitaeAwardsModel,descH: Float(jianjieHeight), isPreview: false)
+                        let layout = CNLiveViateAwardModelLayout(model: mdl as! CNLiveVitaeAwardsModel,descH: Float(jianjieHeight), isPreview: false, isExpand: isExpand)
                         let newWorkModel = layout.getCellHModel()
                         tempArr.append(newWorkModel)
                     }
@@ -217,7 +217,7 @@ class CNLiveVitaeWorkDetailController:CNLiveBaseViewController,UITableViewDataSo
                     if let res = result as? [CNLiveVitaeWorksModel]{
                         self.workListArr = Array()
                         for mdl in res {
-                            let layout = CNLiveViateWorkModelLayout(model: mdl,descH: 40.0,isPreview: false)
+                            let layout = CNLiveViateWorkModelLayout(model: mdl,descH: 40.0,isPreview: false, isExpand: false)
                             let newWorkModel = layout.getCellHModel()
                             self.workListArr.append(newWorkModel)
                         }
@@ -235,7 +235,7 @@ class CNLiveVitaeWorkDetailController:CNLiveBaseViewController,UITableViewDataSo
                     if let res = result as? [CNLiveVitaeAwardsModel]{
                         self.workListArr = Array()
                         for mdl in res {
-                            let layout = CNLiveViateAwardModelLayout(model: mdl,descH: 40.0, isPreview: false)
+                            let layout = CNLiveViateAwardModelLayout(model: mdl,descH: 40.0, isPreview: false, isExpand: false)
                             let newWorkModel = layout.getCellHModel()
                             self.workListArr.append(newWorkModel)
                         }
@@ -222,13 +222,13 @@ class CNLiveDigitalResumePreViewController:CNLiveBaseViewController,UITableViewD
             }
             if let workMdl = self.workDataArray[indexPath.row] as? CNLiveVitaeWorksModel{
                 cell.workMdl = workMdl
-                cell.vitaePreviewWorkCellChangedBlock = { workCell,jianjieHeight in
+                cell.vitaePreviewWorkCellChangedBlock = { workCell,jianjieHeight,isExpand in
                     let res = self.workDataArray
                     var tempArr = Array<Any>()
                     let idxPath = tableView.indexPath(for: workCell)
                     for (idx,mdl) in res.enumerated() {
                         if idx == idxPath?.row{
-                            let layout = CNLiveViateWorkModelLayout(model: mdl as! CNLiveVitaeWorksModel,descH: Float(jianjieHeight),isPreview: true)
+                            let layout = CNLiveViateWorkModelLayout(model: mdl as! CNLiveVitaeWorksModel,descH: Float(jianjieHeight),isPreview: true, isExpand: isExpand)
                             let newWorkModel = layout.getCellHModel()
                             tempArr.append(newWorkModel)
                         }else{
@@ -260,13 +260,13 @@ class CNLiveDigitalResumePreViewController:CNLiveBaseViewController,UITableViewD
             }
             if let awardMdl = self.awardDataArray[indexPath.row] as? CNLiveVitaeAwardsModel{
                 cell.awardModel = awardMdl
-                cell.vitaePreviewWorkCellChangedBlock = { workCell,jianjieHeight in
+                cell.vitaePreviewWorkCellChangedBlock = { workCell,jianjieHeight ,isExpand in
                     let res = self.awardDataArray
                     var tempArr = Array<Any>()
                     let idxPath = tableView.indexPath(for: workCell)
                     for (idx,mdl) in res.enumerated() {
                         if idx == idxPath?.row{
-                            let layout = CNLiveViateAwardModelLayout(model: mdl as! CNLiveVitaeAwardsModel,descH: Float(jianjieHeight),isPreview: true)
+                            let layout = CNLiveViateAwardModelLayout(model: mdl as! CNLiveVitaeAwardsModel,descH: Float(jianjieHeight),isPreview: true, isExpand: isExpand)
                             let newWorkModel = layout.getCellHModel()
                             tempArr.append(newWorkModel)
                         }else{
@@ -297,10 +297,10 @@ class CNLiveDigitalResumePreViewController:CNLiveBaseViewController,UITableViewD
                 return cell
             }
-            cell.vitaePreviewSixCellChangedBlock = { sixCell,jianjieHeight in
+            cell.vitaePreviewSixCellChangedBlock = { sixCell,jianjieHeight,isExpand in
+                self.vitaeModel?.vitae?.isExpand = isExpand
                 self.sixCellHeight = jianjieHeight+69
                 self.tableView.reloadData()
-
             }
             if self.vitaeModel?.vitae?.selfIntroduction.count ?? 0 > 0{
                 cell.vitaeMdl = self.vitaeModel
@@ -383,6 +383,8 @@ class CNLiveDigitalResumePreViewController:CNLiveBaseViewController,UITableViewD
                     }else{
                         //有简历-刷新页面
                         self.vitaeModel = nil
+                        model.vitae?.selfIntroduction = "哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈"
+                        self.sixCellHeight = DefaultPreViewCellHeight+15
                         self.vitaeModel = model
                         self.saveViateModel()
                         self.totalDataArray.removeAllObjects()
@@ -394,14 +396,14 @@ class CNLiveDigitalResumePreViewController:CNLiveBaseViewController,UITableViewD
                         for (_,mdl) in self.vitaeModel!.works.enumerated() {
                             self.totalDataArray.add(CNLiveViatePreviewCellType.work)
-                            let layout = CNLiveViateWorkModelLayout(model: mdl ,descH: Float(40.0),isPreview: true)
+                            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)
                         }
                         for (_,mdl) in self.vitaeModel!.awards.enumerated() {
                             self.totalDataArray.add(CNLiveViatePreviewCellType.award)
-                            let layout = CNLiveViateAwardModelLayout(model: mdl ,descH: Float(40.0),isPreview: true)
+                            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)
@@ -13,7 +13,7 @@ import Kingfisher
 import JFHeroBrowser
 //cell高度变化
-typealias vitaeWorkCellChangedBlockActionBlock = (_ cell: CNLiveVitaeWorkCell ,_ cellHeight:CGFloat) -> Void
+typealias vitaeWorkCellChangedBlockActionBlock = (_ cell: CNLiveVitaeWorkCell ,_ cellHeight:CGFloat,_ isExpand:Bool) -> Void
 typealias VitaeWorkPreviewVideoPhotoBlock = (_ images: [HeroBrowserViewModuleBaseProtocol] ,_ index:Int) -> Void
 //刷新tableView
 typealias VitaeWorkListBlock = () -> Void
@@ -482,7 +482,7 @@ class CNLiveVitaeWorkCell: UITableViewCell{
             //文本展开状态,点击收起
             self.jianjieLabel.height = 2*height
         }
-        self.vitaeWorkCellChangedBlock!(self, self.jianjieLabel.height)
+        self.vitaeWorkCellChangedBlock!(self, self.jianjieLabel.height, button.isSelected)
         self.expandBtn.top = self.jianjieLabel.bottom
@@ -47,7 +47,7 @@ class CNLiveDigitalResumePreViewSecCell: UITableViewCell, UICollectionViewDelega
     lazy var zhengshuBtn: UIButton = {
         let  closeBtn = UIButton(type: .custom)
-        closeBtn.setTitle("关联验证", for: .normal)
+        closeBtn.setTitle("关联认证", for: .normal)
         closeBtn.setTitleColor(HexColor("#1961FE"), for: .normal)
         closeBtn.titleLabel?.font = BoldFont_14
         closeBtn.layer.borderColor = HexColor("#1961FE")?.cgColor
@@ -11,7 +11,7 @@ import SnapKit
 import JFHeroBrowser
 //cell高度变化
-typealias vitaePreviewWorkCellChangedBlockActionBlock = (_ cell: CNLiveDigitalResumePreviewFourCell ,_ cellHeight:CGFloat) -> Void
+typealias vitaePreviewWorkCellChangedBlockActionBlock = (_ cell: CNLiveDigitalResumePreviewFourCell ,_ cellHeight:CGFloat ,_ isExpand:Bool) -> Void
 class CNLiveDigitalResumePreviewFourCell: UITableViewCell {
@@ -253,8 +253,15 @@ class CNLiveDigitalResumePreviewFourCell: UITableViewCell {
             make.top.equalTo(self.workTimeTitleLabel.snp.bottom).offset(10)
             make.left.equalTo(self.workTimeTitleLabel.snp.left)
             make.right.equalToSuperview().offset(-20)
+            make.height.equalTo(40)
         }
         self.whiteView.addSubview(self.expandBtn)
+        self.expandBtn.snp.makeConstraints { make in
+            make.top.equalTo(self.jianjieLabel.snp.bottom)
+            make.right.equalTo(self.jianjieLabel.snp.right)
+            make.width.equalTo(60)
+            make.height.equalTo(30)
+        }
         let lines = jianjieLabel.getRealLabelTextLines()
         if lines <= 2{
@@ -337,20 +344,30 @@ class CNLiveDigitalResumePreviewFourCell: UITableViewCell {
             self.expandBtn.isHidden = false
         }
-        if self.expandBtn.isSelected{
+        var jienjieH:CGFloat = 0
+        if model.isExpand{
             //展开状态
-            self.jianjieLabel.height = height*CGFloat(lines)
-
+            jienjieH = height*CGFloat(lines)
+            self.jianjieLabel.numberOfLines = 0
         }else{
             //收起状态
             if lines <= 2{
                 //小于2行,按实际行数
-                self.jianjieLabel.height = CGFloat(lines)*height
+                jienjieH = CGFloat(lines)*height
             }else{
                 //大于2行, 显示2行
-                self.jianjieLabel.height = 2*height
+                jienjieH = 2*height
             }
+            self.jianjieLabel.numberOfLines = 2
         }
+        self.expandBtn.isSelected = model.isExpand
+        self.jianjieLabel.snp.remakeConstraints { make in
+            make.top.equalTo(self.workTimeTitleLabel.snp.bottom).offset(10)
+            make.left.equalTo(self.workTimeTitleLabel.snp.left)
+            make.right.equalToSuperview().offset(-20)
+            make.height.equalTo(jienjieH)
+        }
+        self.expandBtn.top = self.jianjieLabel.top+jienjieH
         let imgArr =  model.imgs.components(separatedBy: ",")
         if imgArr.count > 0{
@@ -360,7 +377,7 @@ class CNLiveDigitalResumePreviewFourCell: UITableViewCell {
                 let lie = i%3
                 let hang = i/3
                 let imgWH:Float = Float((Float(KSreenWidth)-30-40-imgLeftGap)/3.0)
-                let imgView = UIImageView(frame: CGRect(x: CGFloat(imgLeftGap+(imgGap+imgWH)*Float(lie)), y: CGFloat((imgWH+10)*Float(hang))+self.jianjieLabel.bottom+10, width: CGFloat(imgWH), height: CGFloat(imgWH)))
+                let imgView = UIImageView(frame: CGRect(x: CGFloat(imgLeftGap+(imgGap+imgWH)*Float(lie)), y: CGFloat((imgWH+10)*Float(hang))+self.jianjieLabel.top+jienjieH+10, width: CGFloat(imgWH), height: CGFloat(imgWH)))
                 imgView.isUserInteractionEnabled = true
                 imgView.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(imgViewTapAciton)))
                 imgView.tag = 1000+i
@@ -441,20 +458,30 @@ class CNLiveDigitalResumePreviewFourCell: UITableViewCell {
             self.expandBtn.isHidden = false
         }
-        if self.expandBtn.isSelected{
+        var jienjieH:CGFloat = 0
+        if model.isExpand{
             //展开状态
-            self.jianjieLabel.height = height*CGFloat(lines)
-
+            jienjieH = height*CGFloat(lines)
+            self.jianjieLabel.numberOfLines = 0
         }else{
             //收起状态
             if lines <= 2{
                 //小于2行,按实际行数
-                self.jianjieLabel.height = CGFloat(lines)*height
+                jienjieH = CGFloat(lines)*height
             }else{
                 //大于2行, 显示2行
-                self.jianjieLabel.height = 2*height
+                jienjieH = 2*height
             }
+            self.jianjieLabel.numberOfLines = 2
         }
+        self.expandBtn.isSelected = model.isExpand
+        self.jianjieLabel.snp.remakeConstraints { make in
+            make.top.equalTo(self.workTimeTitleLabel.snp.bottom).offset(10)
+            make.left.equalTo(self.workTimeTitleLabel.snp.left)
+            make.right.equalToSuperview().offset(-20)
+            make.height.equalTo(jienjieH)
+        }
+        self.expandBtn.top = self.jianjieLabel.top+jienjieH
         let imgArr =  model.imgs.components(separatedBy: ",")
         if imgArr.count > 0{
@@ -464,7 +491,7 @@ class CNLiveDigitalResumePreviewFourCell: UITableViewCell {
                 let lie = i%3
                 let hang = i/3
                 let imgWH:Float = Float((Float(KSreenWidth)-30-40-imgLeftGap)/3.0)
-                let imgView = UIImageView(frame: CGRect(x: CGFloat(imgLeftGap+(imgGap+imgWH)*Float(lie)), y: CGFloat((imgWH+10)*Float(hang))+self.jianjieLabel.bottom+10, width: CGFloat(imgWH), height: CGFloat(imgWH)))
+                let imgView = UIImageView(frame: CGRect(x: CGFloat(imgLeftGap+(imgGap+imgWH)*Float(lie)), y: CGFloat((imgWH+10)*Float(hang))+self.jianjieLabel.top+jienjieH+10, width: CGFloat(imgWH), height: CGFloat(imgWH)))
                 imgView.isUserInteractionEnabled = true
                 imgView.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(imgViewTapAciton)))
                 imgView.tag = 1000+i
@@ -533,16 +560,24 @@ class CNLiveDigitalResumePreviewFourCell: UITableViewCell {
         let lines = jianjieLabel.getRealLabelTextLines()
         let height = jianjieLabel.qmui_lineHeight
+        var jienjieH:CGFloat = 0
         if button.isSelected{
             //文本收起状态,点击展开
-            self.jianjieLabel.height = CGFloat(lines)*height
+            jienjieH = CGFloat(lines)*height
         }else{
             //文本展开状态,点击收起
-            self.jianjieLabel.height = 2*height
+            jienjieH = 2*height
+        }
+        self.jianjieLabel.snp.remakeConstraints { make in
+            make.top.equalTo(self.workTimeTitleLabel.snp.bottom).offset(10)
+            make.left.equalTo(self.workTimeTitleLabel.snp.left)
+            make.right.equalToSuperview().offset(-20)
+            make.height.equalTo(jienjieH)
         }
-        self.vitaePreviewWorkCellChangedBlock!(self, self.jianjieLabel.height)
-        self.expandBtn.top = self.jianjieLabel.bottom
+        self.vitaePreviewWorkCellChangedBlock!(self, jienjieH, button.isSelected)
+        
+        self.expandBtn.top = self.jianjieLabel.top + jienjieH
     }
     @objc func zhengshuBtnAction(){
@@ -10,7 +10,7 @@ import Kingfisher
 import SnapKit
 //cell高度变化
-typealias vitaePreviewSixCellChangedBlockActionBlock = (_ cell: CNLiveDigitalResumePreviewSixCell ,_ cellHeight:CGFloat) -> Void
+typealias vitaePreviewSixCellChangedBlockActionBlock = (_ cell: CNLiveDigitalResumePreviewSixCell ,_ cellHeight:CGFloat, _ isExpand:Bool) -> Void
 class CNLiveDigitalResumePreviewSixCell: UITableViewCell {
     var vitaePreviewSixCellChangedBlock:vitaePreviewSixCellChangedBlockActionBlock?
@@ -142,6 +142,13 @@ class CNLiveDigitalResumePreviewSixCell: UITableViewCell {
             make.right.equalToSuperview().offset(-20)
         }
         self.whiteView.addSubview(self.expandBtn)
+        self.expandBtn.snp.makeConstraints { make in
+            make.top.equalTo(self.jianjieLabel.snp.bottom)
+            make.right.equalTo(self.jianjieLabel.snp.right)
+            make.width.equalTo(60)
+            make.height.equalTo(30)
+        }
+
         let lines = jianjieLabel.getRealLabelTextLines()
         if lines <= 2{
@@ -191,20 +198,31 @@ class CNLiveDigitalResumePreviewSixCell: UITableViewCell {
             self.expandBtn.isHidden = false
         }
-        if self.expandBtn.isSelected{
+        var jienjieH:CGFloat = 0
+        if model.vitae!.isExpand{
             //展开状态
-            self.jianjieLabel.height = height*CGFloat(lines)
-
+            jienjieH = height*CGFloat(lines)
+            self.jianjieLabel.numberOfLines = 0
         }else{
             //收起状态
             if lines <= 2{
                 //小于2行,按实际行数
-                self.jianjieLabel.height = CGFloat(lines)*height
+                jienjieH = CGFloat(lines)*height+2
             }else{
                 //大于2行, 显示2行
-                self.jianjieLabel.height = 2*height
+                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
+
     }
@@ -213,17 +231,24 @@ class CNLiveDigitalResumePreviewSixCell: UITableViewCell {
         button.isSelected = !button.isSelected
         let lines = jianjieLabel.getRealLabelTextLines()
         let height = jianjieLabel.qmui_lineHeight
-
+        
+        var jienjieH:CGFloat = 0
         if button.isSelected{
             //文本收起状态,点击展开
-            self.jianjieLabel.height = CGFloat(lines)*height
+            jienjieH = CGFloat(lines)*height
         }else{
             //文本展开状态,点击收起
-            self.jianjieLabel.height = 2*height
+            jienjieH = 2*height+2
+        }
+        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.vitaePreviewSixCellChangedBlock!(self, self.jianjieLabel.bottom)
+        self.vitaePreviewSixCellChangedBlock!(self, self.jianjieLabel.top + jienjieH, button.isSelected)
-        self.expandBtn.top = self.jianjieLabel.bottom
+        self.expandBtn.top = self.jianjieLabel.top + jienjieH
     }
     @objc func zhengshuBtnAction(){
@@ -24,8 +24,9 @@ class CNLiveViateWorkModelLayout:NSObject{
         }
     }
-    init(model:CNLiveVitaeWorksModel,descH:Float,isPreview:Bool){
+    init(model:CNLiveVitaeWorksModel,descH:Float,isPreview:Bool,isExpand:Bool){
         super.init()
+        model.isExpand = isExpand
         self.workModel = model
         let imgArr = model.imgs.components(separatedBy: ",")
         var hang:Float = 1
@@ -81,8 +82,9 @@ class CNLiveViateAwardModelLayout:NSObject{
         }
     }
-    init(model:CNLiveVitaeAwardsModel,descH:Float,isPreview:Bool){
+    init(model:CNLiveVitaeAwardsModel,descH:Float,isPreview:Bool,isExpand:Bool){
         super.init()
+        model.isExpand = isExpand
         self.awardModel = model
         let imgArr = model.imgs.components(separatedBy: ",")
         var hang:Float = 1
@@ -47,6 +47,7 @@ class CNLiveVitaeVitaeModel:BaseModel{
     var showAwards:Bool = false
     ///
     var updateTime:String = ""
+    var isExpand:Bool = false//自我介绍是否展开
 }
 //简历身份模块
 class CNLiveVitaeIdentitiesModel:BaseModel{
@@ -106,6 +107,7 @@ class CNLiveVitaeWorksModel:BaseModel{
     ///cell高度
     var cellH: Float = 0
+    var isExpand:Bool = false//是否展开
 }
@@ -156,6 +158,7 @@ class CNLiveVitaeAwardsModel:BaseModel{
     ///cell高度
     var cellH: Float = 0
+    var isExpand:Bool = false//是否展开
 }
 /**
  "data": {