数字简历页-显示全部工作记录数字简历页-一个工作记录区块

“张旭”
1 parent 93a65866
Showing 5 changed files with 732 additions and 503 deletions
metaCode.xcodeproj/project.pbxproj
metaCode/Classes/Main/HomePage/Controller/DigitalAuth/数字简历相关页面/CNLiveDigitalResumePreViewController.swift
metaCode/Classes/Main/HomePage/View/DigitalAuthViews/我的简历cell/CNLiveDigitalResumePreviewFourCell.swift
metaCode/Classes/Main/HomePage/View/DigitalAuthViews/我的简历cell/CNLiveDigitalResumePreviewFourWorkAwardCell.swift
metaCode/Classes/Main/Model/Vitae/CNLiveViateWorkModelLayout.swift
@@ -167,6 +167,7 @@
 		19B153CF2BC540FF0018906C /* CNLivePayOrderInfoModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19B153CE2BC540FF0018906C /* CNLivePayOrderInfoModel.swift */; };
 		19B153D22BC623980018906C /* CNLiveShopPayNeedPaymentCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19B153D12BC623980018906C /* CNLiveShopPayNeedPaymentCell.swift */; };
 		19B153D42BC623BE0018906C /* CNLiveShopPayWeChatAlipayCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19B153D32BC623BE0018906C /* CNLiveShopPayWeChatAlipayCell.swift */; };
+		19BAF0342C7831DB00BD7CC0 /* CNLiveDigitalResumePreviewFourWorkAwardCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19BAF0332C7831DB00BD7CC0 /* CNLiveDigitalResumePreviewFourWorkAwardCell.swift */; };
 		19BB1FDF2AEA3A450094D962 /* CNSlideBaseNavigationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19BB1FDE2AEA3A450094D962 /* CNSlideBaseNavigationController.swift */; };
 		19BB1FE12AEB5C220094D962 /* CNLiveShopConsoleController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19BB1FE02AEB5C220094D962 /* CNLiveShopConsoleController.swift */; };
 		19BB1FE32AEB8B7C0094D962 /* CNLiveShopConsoleViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19BB1FE22AEB8B7C0094D962 /* CNLiveShopConsoleViewModel.swift */; };
@@ -518,6 +519,7 @@
 		19B153CE2BC540FF0018906C /* CNLivePayOrderInfoModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLivePayOrderInfoModel.swift; sourceTree = "<group>"; };
 		19B153D12BC623980018906C /* CNLiveShopPayNeedPaymentCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopPayNeedPaymentCell.swift; sourceTree = "<group>"; };
 		19B153D32BC623BE0018906C /* CNLiveShopPayWeChatAlipayCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopPayWeChatAlipayCell.swift; sourceTree = "<group>"; };
+		19BAF0332C7831DB00BD7CC0 /* CNLiveDigitalResumePreviewFourWorkAwardCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveDigitalResumePreviewFourWorkAwardCell.swift; sourceTree = "<group>"; };
 		19BB1FDE2AEA3A450094D962 /* CNSlideBaseNavigationController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNSlideBaseNavigationController.swift; sourceTree = "<group>"; };
 		19BB1FE02AEB5C220094D962 /* CNLiveShopConsoleController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopConsoleController.swift; sourceTree = "<group>"; };
 		19BB1FE22AEB8B7C0094D962 /* CNLiveShopConsoleViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopConsoleViewModel.swift; sourceTree = "<group>"; };
@@ -787,6 +789,7 @@
 				1909DCAA2C649C10001E7986 /* CNLiveDigitalResumePreViewSecCollectionCell.swift */,
 				1909DCA12C637353001E7986 /* CNLiveDigitalResumePreviewThreeCell.swift */,
 				1909DCA42C63736C001E7986 /* CNLiveDigitalResumePreviewFourCell.swift */,
+				19BAF0332C7831DB00BD7CC0 /* CNLiveDigitalResumePreviewFourWorkAwardCell.swift */,
 				1909DCA62C637378001E7986 /* CNLiveDigitalResumePreviewFiveCell.swift */,
 				1909DCA82C63738C001E7986 /* CNLiveDigitalResumePreviewSixCell.swift */,
 			);
@@ -2188,6 +2191,7 @@
 				191732EF2B075C3A007BCC04 /* CNLiveCreateShopClassifyViewController.swift in Sources */,
 				1938BD302B4B8A3500390A34 /* CNLiveHomePageViewModel.swift in Sources */,
 				19C735CC2C11A1F400CACF4E /* CNLiveDigitalThreeCollectCell.swift in Sources */,
+				19BAF0342C7831DB00BD7CC0 /* CNLiveDigitalResumePreviewFourWorkAwardCell.swift in Sources */,
 				798A44F22A30674200815935 /* CNLiveMineSubBodyListView.swift in Sources */,
 				799172382AF090CD00DC01A8 /* CNLiveShopBodyListView.swift in Sources */,
 				19565ED42AF9FEB4007D6727 /* CNLiveShopAddEditGoodsModel.swift in Sources */,
@@ -278,15 +278,15 @@ class CNLiveDigitalResumePreViewController:CNLiveBaseViewController,UITableViewD
             }else{
                 cell.zhengshuBtn.isHidden = true
             }
-            var workModel:CNLiveVitaeWorksModel? = nil
+            var workModel:[CNLiveVitaeWorksModel]? = nil
             if self.resumeType == .normal{
-                workModel = self.workDataArray[indexPath.row] as? CNLiveVitaeWorksModel
+                workModel = self.workDataArray as? [CNLiveVitaeWorksModel]
             }else{
-                workModel = self.workPreViewDataArray[indexPath.row] as? CNLiveVitaeWorksModel
+                workModel = self.workPreViewDataArray as? [CNLiveVitaeWorksModel]
             }
             if let workMdl = workModel{
-                cell.workMdl = workMdl
-                cell.vitaePreviewWorkCellChangedBlock = { workCell,jianjieHeight,isExpand in
+                cell.workMdls = workMdl
+                cell.vitaePreviewWorkCellChangedBlock = { index ,jianjieHeight,isExpand in
                     var res = self.workDataArray
                     if self.resumeType == .normal{
                         res = self.workDataArray
@@ -294,9 +294,9 @@ class CNLiveDigitalResumePreViewController:CNLiveBaseViewController,UITableViewD
                         res = self.workPreViewDataArray
                     }
                     var tempArr = Array<Any>()
-                    let idxPath = tableView.indexPath(for: workCell)
+//                    let idxPath = tableView.indexPath(for: workCell)
                     for (idx,mdl) in res.enumerated() {
-                        if idx == idxPath?.row{
+                        if idx == index{
                             let layout = CNLiveViateWorkModelLayout(model: mdl as! CNLiveVitaeWorksModel,descH: Float(jianjieHeight),isPreview: true, isExpand: isExpand)
                             let newWorkModel = layout.getCellHModel()
                             tempArr.append(newWorkModel)
@@ -337,15 +337,15 @@ class CNLiveDigitalResumePreViewController:CNLiveBaseViewController,UITableViewD
             }else{
                 cell.zhengshuBtn.isHidden = true
             }
-            var awardModel:CNLiveVitaeAwardsModel?
+            var awardModels:[CNLiveVitaeAwardsModel]?
             if self.resumeType == .normal{
-                awardModel = self.awardDataArray[indexPath.row] as? CNLiveVitaeAwardsModel
+                awardModels = self.awardDataArray as? [CNLiveVitaeAwardsModel]
             }else{
-                awardModel = self.awardPreViewDataArray[indexPath.row] as? CNLiveVitaeAwardsModel
+                awardModels = self.awardPreViewDataArray as? [CNLiveVitaeAwardsModel]
             }
-            if let awardMdl = awardModel{
-                cell.awardModel = awardMdl
-                cell.vitaePreviewWorkCellChangedBlock = { workCell,jianjieHeight ,isExpand in
+            if let awardMdls = awardModels{
+                cell.awardModels = awardMdls
+                cell.vitaePreviewWorkCellChangedBlock = { index ,jianjieHeight,isExpand in
                     var res = self.awardDataArray
                     if self.resumeType == .normal{
                         res = self.awardDataArray
@@ -353,9 +353,9 @@ class CNLiveDigitalResumePreViewController:CNLiveBaseViewController,UITableViewD
                         res = self.awardPreViewDataArray
                     }
                     var tempArr = Array<Any>()
-                    let idxPath = tableView.indexPath(for: workCell)
+//                    let idxPath = tableView.indexPath(for: workCell)
                     for (idx,mdl) in res.enumerated() {
-                        if idx == idxPath?.row{
+                        if idx == index{
                             let layout = CNLiveViateAwardModelLayout(model: mdl as! CNLiveVitaeAwardsModel,descH: Float(jianjieHeight),isPreview: true, isExpand: isExpand)
                             let newWorkModel = layout.getCellHModel()
                             tempArr.append(newWorkModel)
@@ -429,11 +429,23 @@ class CNLiveDigitalResumePreViewController:CNLiveBaseViewController,UITableViewD
             if self.vitaeModel?.works.count ?? 0 > 0{
                 //有多个workcell
                 if self.resumeType == .normal{
-                    let model = self.workDataArray[indexPath.row] as! CNLiveVitaeWorksModel
-                    return CGFloat(model.cellH)
+                    //计算cellheight
+                    var cellH:Float = 58+54//顶部和底部
+                    self.workDataArray.forEach { model in
+                        let mdl = model as! CNLiveVitaeWorksModel
+                        cellH = cellH + mdl.cellH
+                    }
+                    return CGFloat(cellH)+15
                 }else{
-                    let model = self.workPreViewDataArray[indexPath.row] as! CNLiveVitaeWorksModel
-                    return CGFloat(model.cellH)
+                    //计算cellheight
+                    var cellH:Float = 58+54//顶部和底部
+                    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
@@ -442,11 +454,25 @@ 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)
+//                    let model = self.awardDataArray[indexPath.row] as! CNLiveVitaeAwardsModel
+//                    return CGFloat(model.cellH)
+                    //计算cellheight
+                    var cellH:Float = 58+54//顶部和底部
+                    self.awardDataArray.forEach { model in
+                        let mdl = model as! CNLiveVitaeAwardsModel
+                        cellH = cellH + mdl.cellH
+                    }
+                    return CGFloat(cellH)+15
                 }else{
-                    let model = self.awardPreViewDataArray[indexPath.row] as! CNLiveVitaeAwardsModel
-                    return CGFloat(model.cellH)
+//                    let model = self.awardPreViewDataArray[indexPath.row] as! CNLiveVitaeAwardsModel
+//                    return CGFloat(model.cellH)
+                    //计算cellheight
+                    var cellH:Float = 58+54//顶部和底部
+                    self.awardPreViewDataArray.forEach { model in
+                        let mdl = model as! CNLiveVitaeAwardsModel
+                        cellH = cellH + mdl.cellH
+                    }
+                    return CGFloat(cellH)+15
                 }
             }else{
                 return DefaultPreViewCellHeight+15//396+15
@@ -531,53 +557,55 @@ class CNLiveDigitalResumePreViewController:CNLiveBaseViewController,UITableViewD
                         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)
+//                        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)
+//                            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.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)
+//                        self.workDataArray.addObjects(from: [CNLiveViatePreviewCellType.realName,CNLiveViatePreviewCellType.guanFang,CNLiveViatePreviewCellType.cer])
+//                        self.awardDataArray.addObjects(from: [CNLiveViatePreviewCellType.realName,CNLiveViatePreviewCellType.guanFang,CNLiveViatePreviewCellType.cer])
+                        self.totalDataArray.add(CNLiveViatePreviewCellType.work)
+                        self.totalPreViewDataArray.add(CNLiveViatePreviewCellType.work)
+                        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.awardDataArray.add(CNLiveViatePreviewCellType.work)
                             self.workPreViewDataArray.add(newWorkModel)
-                            self.awardPreViewDataArray.add(CNLiveViatePreviewCellType.work)
+//                            self.awardPreViewDataArray.add(CNLiveViatePreviewCellType.work)
                         }
                         if self.vitaeModel!.vitae!.showAwards == true{
+                            self.totalDataArray.add(CNLiveViatePreviewCellType.award)
+                            self.totalPreViewDataArray.add(CNLiveViatePreviewCellType.award)
                             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.workDataArray.add(CNLiveViatePreviewCellType.award)
                                 self.awardPreViewDataArray.add(newWorkModel)
-                                self.workPreViewDataArray.add(CNLiveViatePreviewCellType.award)
+//                                self.workPreViewDataArray.add(CNLiveViatePreviewCellType.award)
                             }
                         }else{
                             print("false")
                         }
                         self.totalDataArray.add(CNLiveViatePreviewCellType.mineJieShao)
-                        self.workDataArray.add(CNLiveViatePreviewCellType.mineJieShao)
-                        self.awardDataArray.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.workPreViewDataArray.add(CNLiveViatePreviewCellType.mineJieShao)
+//                            self.awardPreViewDataArray.add(CNLiveViatePreviewCellType.mineJieShao)
                         }
                         self.tableView.reloadData()
                     }
@@ -10,44 +10,55 @@ import Kingfisher
 import SnapKit
 import JFHeroBrowser
-//cell高度变化
-typealias vitaePreviewWorkCellChangedBlockActionBlock = (_ cell: CNLiveDigitalResumePreviewFourCell ,_ cellHeight:CGFloat ,_ isExpand:Bool) -> Void
-class CNLiveDigitalResumePreviewFourCell: UITableViewCell {
+class CNLiveDigitalResumePreviewFourCell: UITableViewCell,UITableViewDelegate,UITableViewDataSource {
     var cellType:CNLiveViateWorkAwardType = .work
+    var cellH:Float = 58+45+37+54//默认顶部,空视图,底部高度
     //workModel
-    var _workMdl : CNLiveVitaeWorksModel?
-    var workMdl : CNLiveVitaeWorksModel? {
+    var _workMdls : [CNLiveVitaeWorksModel]?
+    var workMdls : [CNLiveVitaeWorksModel]? {
         get{
-            _workMdl
+            _workMdls
         }
         set{
-            _workMdl = newValue!
-            setupNewUI(model: _workMdl!)
+            _workMdls = newValue!
+            setupNewUI(models: _workMdls!)
         }
     }
     //awardModel
-    var _awardModel : CNLiveVitaeAwardsModel?
-    var awardModel : CNLiveVitaeAwardsModel? {
+    var _awardModels : [CNLiveVitaeAwardsModel]?
+    var awardModels : [CNLiveVitaeAwardsModel]? {
         get{
-            _awardModel
+            _awardModels
         }
         set{
-            _awardModel = newValue!
-            setupAwardNewUI(model: _awardModel!)
+            _awardModels = newValue!
+            setupAwardNewUI(models: _awardModels!)
         }
     }
-    
+        
     lazy var images: [HeroBrowserViewModuleBaseProtocol] = {
         var list: [HeroBrowserViewModuleBaseProtocol] = []
         return list
     }()
-    
+
     var vitaeWorkPreviewVideoPhotoBlock:VitaeWorkPreviewVideoPhotoBlock?
     var vitaePreviewWorkCellChangedBlock:vitaePreviewWorkCellChangedBlockActionBlock?
+
+    let kCNLiveDigitalResumePreviewFourWorkAwardCellIdentifier = "kCNLiveDigitalResumePreviewFourWorkAwardCellIdentifier"
+    lazy var tableView : UITableView = {
+        let tableView = UITableView(frame: CGRect(x: 0, y: 0, width: KSreenWidth-30, height: 50), style: .plain)
+        tableView.dataSource = self
+        tableView.delegate = self
+        tableView.separatorStyle = .none
+        tableView.tableFooterView = UIView.init()
+        tableView.backgroundColor = .clear
+        tableView.register(CNLiveDigitalResumePreviewFourWorkAwardCell.self, forCellReuseIdentifier: kCNLiveDigitalResumePreviewFourWorkAwardCellIdentifier)
+        return tableView
+    }()
     lazy var whiteView :UIView = {
         let whiteView = UIView(frame: CGRect(x: 15, y:15, width: KSreenWidth-30, height: DefaultPreViewCellHeight))
@@ -79,104 +90,6 @@ class CNLiveDigitalResumePreviewFourCell: UITableViewCell {
         iconImgView.image = UIImage(named: "mine_jianli_preview_workNoData")
         return iconImgView
     }()
-    //有内容
-    lazy var nameIconImgView :UIImageView = {
-        let iconImgView = UIImageView(frame: CGRect(x: 15, y: 0, width: 25, height: 25))
-        iconImgView.contentMode = .scaleAspectFit
-        iconImgView.image = UIImage(named: "mine_jianli_preview_work")
-        return iconImgView
-    }()
-    lazy var workProfessionTitleLabel: UILabel = {
-        let titleLabel = UILabel()
-        titleLabel.textColor = HexColor("#333333")
-        titleLabel.textAlignment = .left
-        titleLabel.text = "行业"
-        titleLabel.font = BoldFont_16
-        titleLabel.adjustsFontSizeToFitWidth = true
-        return titleLabel
-    }()
-    lazy var realImgView :UIImageView = {
-        let iconImgView = UIImageView()
-        iconImgView.image = UIImage(named: "mine_jianli_zhenshi")
-        return iconImgView
-    }()
-    lazy var workNameTitleLabel: UILabel = {
-        let titleLabel = UILabel()
-        titleLabel.textColor = HexColor("#333333")
-        titleLabel.textAlignment = .left
-        titleLabel.text = "工作岗位"
-        titleLabel.font = Font_14
-        titleLabel.adjustsFontSizeToFitWidth = true
-        return titleLabel
-    }()
-    lazy var workPositionTitleLabel: UILabel = {
-        let titleLabel = UILabel()
-        titleLabel.textColor = HexColor("#333333")
-        titleLabel.textAlignment = .left
-        titleLabel.text = "公司名称"
-        titleLabel.font = Font_14
-        titleLabel.adjustsFontSizeToFitWidth = true
-        return titleLabel
-    }()
-    lazy var workTimeTitleLabel: UILabel = {
-        let titleLabel = UILabel()
-        titleLabel.textColor = HexColor("#333333")
-        titleLabel.textAlignment = .left
-        titleLabel.text = "工作时间"
-        titleLabel.font = Font_14
-        titleLabel.adjustsFontSizeToFitWidth = true
-        return titleLabel
-    }()
-    ///工作内容描述
-    lazy var jianjieLabel: UILabel = {
-        let titleLabel = UILabel.init(frame: CGRectMake(50, 162, KSreenWidth-60, 40))
-        titleLabel.textColor = HexColor("#999999")
-        titleLabel.textAlignment = .left
-        titleLabel.font = Font_14
-        titleLabel.backgroundColor = .clear// UIColor(red:0.98, green:0.98, blue:0.98, alpha:1.00)
-        titleLabel.text = "描述"
-        titleLabel.numberOfLines = 0
-        var lines = titleLabel.getRealLabelTextLines()
-        let height = titleLabel.qmui_lineHeight
-        if lines > 2 {
-            lines = 2
-        }
-        titleLabel.height = height*CGFloat(lines)
-        return titleLabel
-    }()
-    //展开,收起
-    lazy var expandBtn: UIButton = {
-        let expandBtn = UIButton.init(type: .custom)
-        expandBtn.backgroundColor = .clear
-        
-        expandBtn.frame = CGRect(x: self.jianjieLabel.right-60, y: self.jianjieLabel.bottom+10, width: 60, height: 30)
-        expandBtn.setTitle("更多", for: .normal)
-        expandBtn.setTitle("收起", for: .selected)
-
-        expandBtn.setTitleColor(HexColor("#1B64FE"), for: .normal)
-        expandBtn.setImage(UIImage(named: "homepage_unfold"), for: .normal)
-        expandBtn.setImage(UIImage(named: "homepage_fold"), for: .selected)
-        expandBtn.titleLabel?.font = Font_14
-        expandBtn.setupButtonImageAndTitlePossitionWith(padding: 5, style: .right)
-        expandBtn.addTarget(self, action: #selector(expandBtnAction), for: .touchUpInside)
-        return expandBtn
-    }()
-    
-    lazy var dingweiImgView :UIImageView = {
-        let iconImgView = UIImageView()
-        iconImgView.image = UIImage(named: "mine_jinali_workdingwei")
-        return iconImgView
-    }()
-    lazy var workDingWeiTitleLabel: UILabel = {
-        let titleLabel = UILabel()
-        titleLabel.textColor = HexColor("#999999")
-        titleLabel.textAlignment = .left
-        titleLabel.text = ""
-        titleLabel.font = Font_11
-        titleLabel.adjustsFontSizeToFitWidth = true
-        return titleLabel
-    }()
-    
     lazy var zhengshuBtn: UIButton = {
         let  closeBtn = UIButton(type: .custom)
@@ -210,81 +123,6 @@ class CNLiveDigitalResumePreviewFourCell: UITableViewCell {
             make.top.equalToSuperview().offset(adapt_length(length: 15))
             make.left.equalTo(adapt_length(length: 15))
         }
-        self.whiteView.addSubview(self.nameIconImgView)
-        self.nameIconImgView.snp.makeConstraints { make in
-            make.top.equalTo(self.myIdentityTitleLabel.snp.bottom).offset(15)
-            make.left.equalTo(15)
-            make.width.height.equalTo(25)
-        }
-        self.whiteView.addSubview(self.workProfessionTitleLabel)
-        self.workProfessionTitleLabel.snp.makeConstraints { make in
-            make.top.equalTo(self.myIdentityTitleLabel.snp.bottom).offset(15)
-            make.left.equalTo(50)
-        }
-
-        self.whiteView.addSubview(self.realImgView)
-        self.realImgView.snp.makeConstraints { make in
-            make.right.equalToSuperview().offset(-15)
-            make.centerY.equalTo(self.workProfessionTitleLabel.snp.centerY)
-            make.width.equalTo(80)
-            make.height.equalTo(80.0*78/403)
-            make.left.greaterThanOrEqualTo(self.workProfessionTitleLabel.snp.right).offset(5)
-        }
-        self.whiteView.addSubview(self.workNameTitleLabel)
-        self.workNameTitleLabel.snp.makeConstraints { make in
-            make.top.equalTo(self.workProfessionTitleLabel.snp.bottom).offset(6)
-            make.left.equalTo(50)
-            make.right.equalToSuperview().offset(-15)
-        }
-        
-        self.whiteView.addSubview(self.workPositionTitleLabel)
-        self.workPositionTitleLabel.snp.makeConstraints { make in
-            make.top.equalTo(self.workNameTitleLabel.snp.bottom).offset(5)
-            make.left.equalTo(self.workNameTitleLabel.snp.left)
-            make.right.equalToSuperview().offset(-15)
-        }
-        
-        self.whiteView.addSubview(self.workTimeTitleLabel)
-        self.workTimeTitleLabel.snp.makeConstraints { make in
-            make.top.equalTo(self.workPositionTitleLabel.snp.bottom).offset(5)
-            make.left.equalTo(self.workPositionTitleLabel.snp.left)
-            make.right.equalToSuperview().offset(-15)
-        }
-        self.whiteView.addSubview(self.jianjieLabel)
-        self.jianjieLabel.snp.makeConstraints { 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(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{
-            self.expandBtn.isHidden = true
-        }else{
-            self.expandBtn.isHidden = false
-        }
-        
-        self.whiteView.addSubview(self.dingweiImgView)
-        self.dingweiImgView.snp.makeConstraints { make in
-            make.left.equalTo(self.workNameTitleLabel.snp.left)
-            make.bottom.equalToSuperview().offset(-72)
-            make.width.equalTo(10)
-            make.height.equalTo(10)
-        }
-        self.whiteView.addSubview(self.workDingWeiTitleLabel)
-        self.workDingWeiTitleLabel.snp.makeConstraints { make in
-            make.left.equalTo(self.dingweiImgView.snp.right).offset(3)
-            make.centerY.equalTo(self.dingweiImgView.snp.centerY)
-        }
-        
         self.whiteView.addSubview(self.zhengshuBtn)
         self.zhengshuBtn.snp.makeConstraints { make in
             make.centerX.equalToSuperview()
@@ -293,6 +131,13 @@ class CNLiveDigitalResumePreviewFourCell: UITableViewCell {
             make.height.equalTo(34)
         }
+        self.whiteView.addSubview(self.tableView)
+        self.tableView.snp.makeConstraints { make in
+            make.top.equalTo(self.myIdentityTitleLabel.snp.bottom)
+            make.left.right.equalToSuperview()
+            make.bottom.equalTo(self.zhengshuBtn.snp.top)
+        }
+        
         self.whiteView.addSubview(self.zhengshuNoDescTitleLabel)
         self.zhengshuNoDescTitleLabel.snp.makeConstraints { make in
             make.centerX.equalToSuperview()
@@ -311,283 +156,74 @@ class CNLiveDigitalResumePreviewFourCell: UITableViewCell {
         fatalError("init(coder:) has not been implemented")
     }
-    func setupAwardNewUI(model:CNLiveVitaeAwardsModel){
+    func setupAwardNewUI(models:[CNLiveVitaeAwardsModel]){
         self.myIdentityTitleLabel.text = "获奖情况"
-        self.realImgView.isHidden = true
-        
-        self.zhengshuNoIconImgView.isHidden = true
-        self.zhengshuNoDescTitleLabel.isHidden = true
-        
-        self.whiteView.subviews.forEach { view in
-            if view.tag >= 1000{
-                view.removeFromSuperview()
-            }
+        self.zhengshuBtn.setTitle("管理获奖情况", for: .normal)
+        if models.count > 0{
+            self.zhengshuNoIconImgView.isHidden = true
+            self.zhengshuNoDescTitleLabel.isHidden = true
         }
-        self.workProfessionTitleLabel.text = model.title.count > 0 ? model.title : "获奖名称"
-        self.workNameTitleLabel.isHidden = true
-        self.workPositionTitleLabel.text = model.company
-        let startDateString = convertTimestampStringToDateString(timestampString: model.time)
-        if startDateString == nil || startDateString?.count == 0{
-            self.workTimeTitleLabel.text = ""
-            self.workTimeTitleLabel.isHidden = true
-        }else{
-            self.workTimeTitleLabel.text = startDateString!
-            self.workTimeTitleLabel.isHidden = false
-
-        }
-                
-        self.jianjieLabel.text = model.description//"描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述"
-        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.isExpand{
-            //展开状态
-            jienjieH = height*CGFloat(lines)
-            self.jianjieLabel.numberOfLines = 0
-        }else{
-            //收起状态
-            if lines <= 2{
-                //小于2行,按实际行数
-                jienjieH = CGFloat(lines)*height
-            }else{
-                //大于2行, 显示2行
-                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{
-            for i in 0..<imgArr.count {
-                let imgGap:Float = 10
-                let imgLeftGap:Float = 50
-                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.top+jienjieH+10, width: CGFloat(imgWH), height: CGFloat(imgWH)))
-                imgView.isUserInteractionEnabled = true
-                imgView.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(imgViewTapAciton)))
-                imgView.tag = 1000+i
-                imgView.contentMode = .scaleAspectFit
-                let imgUrl = imgArr[i]
-                imgView.clipsToBounds = true
-                imgView.layer.cornerRadius = 5
-                self.whiteView.addSubview(imgView)
-                
-                if imgUrl.contains("vitae_video_"){
-                    //是视频
-                    let thumbailImgUrl = "http://wjjtest.ys2.cnliveimg.com/802/mateCode/img/vitae_photo_0/2024/08/02/3977195366.jpg"
-                    let vm = HeroBrowserVideoViewModule(thumbailImgUrl: thumbailImgUrl, videoUrl: imgUrl, provider: HeroNetworkImageProvider.shared, autoPlay: true)
-                    self.images.append(vm)
-                    imgView.kf.setImage(with: URL(string: thumbailImgUrl),placeholder: UIImage(color: UIColor.lightGray, size: imgView.size))
-                    
-                    let playBtn = UIButton(type: .custom)
-                    playBtn.frame = imgView.bounds
-                    playBtn.setImage(UIImage(named: "short_video_play"), for: .normal)
-                    playBtn.addTarget(self, action: #selector(playBtnAction(btn:)), for: .touchUpInside)
-                    playBtn.clipsToBounds = true
-                    playBtn.layer.cornerRadius = 5
-                    playBtn.tag = 1000+i
-                    imgView.addSubview(playBtn)
-                }else if imgUrl.contains("vitae_photo_"){
-                    //是图片
-                    self.images.append(HeroBrowserNetworkImageViewModule(thumbailImgUrl: nil, originImgUrl: imgUrl))
-                    imgView.kf.setImage(with: URL(string: imgUrl))
-                }else{
-                    //默认图片
-                    self.images.append(HeroBrowserNetworkImageViewModule(thumbailImgUrl: nil, originImgUrl: imgUrl))
-                    imgView.kf.setImage(with: URL(string: imgUrl))
-                }
-            }
-        }
-                
-        self.workDingWeiTitleLabel.isHidden = true
-        self.dingweiImgView.isHidden = true
-        self.zhengshuBtn.setTitle("管理获奖情况", for: .normal)
-        self.nameIconImgView.image = UIImage(named: "mine_jianli_preview_award")
+        self.tableView.reloadData()
     }
-    func setupNewUI(model:CNLiveVitaeWorksModel){
+    func setupNewUI(models:[CNLiveVitaeWorksModel]){
         self.myIdentityTitleLabel.text = "工作记录"
-        self.realImgView.isHidden = false
+        self.zhengshuBtn.setTitle("管理工作记录", for: .normal)
-        self.zhengshuNoIconImgView.isHidden = true
-        self.zhengshuNoDescTitleLabel.isHidden = true
-        
-        self.whiteView.subviews.forEach { view in
-            if view.tag >= 1000{
-                view.removeFromSuperview()
-            }
+        if models.count > 0{
+            self.zhengshuNoIconImgView.isHidden = true
+            self.zhengshuNoDescTitleLabel.isHidden = true
         }
-        self.workProfessionTitleLabel.text = model.profession.count > 0 ? model.profession : "行业"
-        self.workNameTitleLabel.text = model.position.count > 0 ? model.position : "职位"
-        self.workPositionTitleLabel.text = model.companyName
-
-        let startDateString = convertTimestampStringToDateString(timestampString: model.startWorkingDate)
-        let endDateString = convertTimestampStringToDateString(timestampString: model.endWorkingDate)
-        if endDateString == nil || endDateString?.count == 0{
-            if startDateString == nil || startDateString?.count == 0{
-                self.workTimeTitleLabel.text = ""
-            }else{
-                self.workTimeTitleLabel.text = startDateString!
-            }
+        self.tableView.reloadData()
+    }
+    
+    
+    // MARK: - UITableViewDelegate
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        if self.cellType == .work{
+            return self.workMdls?.count ?? 0
         }else{
-            if startDateString == nil || startDateString?.count == 0{
-                self.workTimeTitleLabel.text = ""
-            }else{
-                self.workTimeTitleLabel.text = startDateString!+"~"+endDateString!
-            }
+            return self.awardModels?.count ?? 0
         }
-                
-        self.jianjieLabel.text = model.jobDuties//"描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述"
-        let lines = jianjieLabel.getRealLabelTextLines()
-        let height = jianjieLabel.qmui_lineHeight
-        if lines <= 2{
-            self.expandBtn.isHidden = true
-        }else{
-            self.expandBtn.isHidden = false
+    }
+    
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveDigitalResumePreviewFourWorkAwardCellIdentifier) as? CNLiveDigitalResumePreviewFourWorkAwardCell
+        else {
+            let cell = CNLiveDigitalResumePreviewFourWorkAwardCell()
+            return cell
         }
-        
-        var jienjieH:CGFloat = 0
-        if model.isExpand{
-            //展开状态
-            jienjieH = height*CGFloat(lines)
-            self.jianjieLabel.numberOfLines = 0
+        if self.cellType == .work{
+            //工作记录
+            let workMdl = self.workMdls?[indexPath.row]
+            cell.workMdl = workMdl
         }else{
-            //收起状态
-            if lines <= 2{
-                //小于2行,按实际行数
-                jienjieH = CGFloat(lines)*height
-            }else{
-                //大于2行, 显示2行
-                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)
+            //获奖情况
+            let awardMdl = self.awardModels?[indexPath.row]
+            cell.awardModel = awardMdl
         }
-        self.expandBtn.top = self.jianjieLabel.top+jienjieH
-        
-        let imgArr =  model.imgs.components(separatedBy: ",")
-        if imgArr.count > 0{
-            for i in 0..<imgArr.count {
-                let imgGap:Float = 10
-                let imgLeftGap:Float = 50
-                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.top+jienjieH+10, width: CGFloat(imgWH), height: CGFloat(imgWH)))
-                imgView.isUserInteractionEnabled = true
-                imgView.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(imgViewTapAciton)))
-                imgView.tag = 1000+i
-                imgView.contentMode = .scaleAspectFit
-                let imgUrl = imgArr[i]
-                imgView.clipsToBounds = true
-                imgView.layer.cornerRadius = 5
-                self.whiteView.addSubview(imgView)
-                
-                if imgUrl.contains("vitae_video_"){
-                    //是视频
-                    let thumbailImgUrl = "http://wjjtest.ys2.cnliveimg.com/802/mateCode/img/vitae_photo_0/2024/08/02/3977195366.jpg"
-                    let vm = HeroBrowserVideoViewModule(thumbailImgUrl: thumbailImgUrl, videoUrl: imgUrl, provider: HeroNetworkImageProvider.shared, autoPlay: true)
-                    self.images.append(vm)
-                    imgView.kf.setImage(with: URL(string: thumbailImgUrl),placeholder: UIImage(color: UIColor.lightGray, size: imgView.size))
-                    
-                    let playBtn = UIButton(type: .custom)
-                    playBtn.frame = imgView.bounds
-                    playBtn.setImage(UIImage(named: "short_video_play"), for: .normal)
-                    playBtn.addTarget(self, action: #selector(playBtnAction(btn:)), for: .touchUpInside)
-                    playBtn.clipsToBounds = true
-                    playBtn.layer.cornerRadius = 5
-                    playBtn.tag = 1000+i
-                    imgView.addSubview(playBtn)
-                }else if imgUrl.contains("vitae_photo_"){
-                    //是图片
-                    self.images.append(HeroBrowserNetworkImageViewModule(thumbailImgUrl: nil, originImgUrl: imgUrl))
-                    imgView.kf.setImage(with: URL(string: imgUrl))
-                }else{
-                    //默认图片
-                    self.images.append(HeroBrowserNetworkImageViewModule(thumbailImgUrl: nil, originImgUrl: imgUrl))
-                    imgView.kf.setImage(with: URL(string: imgUrl))
-                }
-            }
+        cell.vitaeWorkPreviewVideoPhotoBlock = { images , index in
+            self.vitaeWorkPreviewVideoPhotoBlock?(self.images, index)
         }
-                
-        let cityStr = model.city
-        if cityStr.count == 0 || cityStr == "请选择"{
-            self.workDingWeiTitleLabel.isHidden = true
-            self.dingweiImgView.isHidden = true
-        }else{
-            self.dingweiImgView.isHidden = false
-            self.workDingWeiTitleLabel.isHidden = false
-            self.workDingWeiTitleLabel.text = model.city
+        cell.vitaePreviewWorkCellChangedBlock = {index ,jianjieHeight,isExpand in
+            self.vitaePreviewWorkCellChangedBlock?(index ,jianjieHeight,isExpand)
+            
         }
-        
-        self.zhengshuBtn.setTitle("管理工作记录", for: .normal)
-        self.nameIconImgView.image = UIImage(named: "mine_jianli_preview_work")
-
+        return cell
     }
-    
-    func convertTimestampStringToDateString(timestampString: String) -> String? {
-        // 首先，将毫秒时间戳字符串转换为TimeInterval（秒）
-        guard let timestampMilliseconds = Double(timestampString) else {
-            return nil
+    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        if self.cellType == .work{
+            //工作记录
+            let workMdl = self.workMdls?[indexPath.row]
+            return CGFloat(workMdl?.cellH ?? 0)
+        }else{
+            //获奖情况
+            let awardMdl = self.awardModels?[indexPath.row]
+            return CGFloat(awardMdl?.cellH ?? 0)
         }
-        let timestampSeconds = timestampMilliseconds / 1000.0
-        // 然后，将TimeInterval转换为Date对象
-        let date = Date(timeIntervalSince1970: timestampSeconds)
-        // 接着，设置DateFormatter的格式
-        let formatter = DateFormatter()
-        formatter.dateFormat = "yyyy.MM.dd" // 设置为你想要的日期格式
-        // 最后，使用DateFormatter将Date对象格式化为字符串
-        return formatter.string(from: date)
     }
     // MARK: - Action
-    @objc func expandBtnAction(button:UIButton){
-        button.isSelected = !button.isSelected
-        let lines = jianjieLabel.getRealLabelTextLines()
-        let height = jianjieLabel.qmui_lineHeight
-
-        var jienjieH:CGFloat = 0
-        if button.isSelected{
-            //文本收起状态,点击展开
-            jienjieH = CGFloat(lines)*height
-        }else{
-            //文本展开状态,点击收起
-            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, jienjieH, button.isSelected)
-        
-        self.expandBtn.top = self.jianjieLabel.top + jienjieH
-
-    }
     @objc func zhengshuBtnAction(){
         if self.cellType == .work{
             //跳转 选择工作记录页面
@@ -603,15 +239,5 @@ class CNLiveDigitalResumePreviewFourCell: UITableViewCell {
         }
     }
-    @objc func playBtnAction(btn:UIButton){
-        let index = btn.tag-1000
-        self.vitaeWorkPreviewVideoPhotoBlock?(self.images, index)
-    }
-    @objc func imgViewTapAciton(ges: UITapGestureRecognizer){
-        let imgView = ges.view as! UIImageView
-        let index = imgView.tag-1000
-        
-        self.vitaeWorkPreviewVideoPhotoBlock?(self.images, index)
-    }
-        
+    
 }
+//
+//  CNLiveDigitalResumePreviewFourWorkAwardCell.swift
+//  metaCode
+//
+//  Created by zx on 2024/8/23.
+//
+
+import Foundation
+import JFHeroBrowser
+
+//cell高度变化
+typealias vitaePreviewWorkCellChangedBlockActionBlock = (_ index:Int ,_ cellHeight:CGFloat ,_ isExpand:Bool) -> Void
+
+class CNLiveDigitalResumePreviewFourWorkAwardCell:UITableViewCell{
+    
+    var cellType:CNLiveViateWorkAwardType = .work
+    
+    //workModel
+    var _workMdl : CNLiveVitaeWorksModel?
+    var workMdl : CNLiveVitaeWorksModel? {
+        get{
+            _workMdl
+        }
+        set{
+            _workMdl = newValue!
+            setupNewUI(model: _workMdl!)
+        }
+    }
+    
+    //awardModel
+    var _awardModel : CNLiveVitaeAwardsModel?
+    var awardModel : CNLiveVitaeAwardsModel? {
+        get{
+            _awardModel
+        }
+        set{
+            _awardModel = newValue!
+            setupAwardNewUI(model: _awardModel!)
+        }
+    }
+    
+    lazy var images: [HeroBrowserViewModuleBaseProtocol] = {
+        var list: [HeroBrowserViewModuleBaseProtocol] = []
+        return list
+    }()
+
+    var vitaeWorkPreviewVideoPhotoBlock:VitaeWorkPreviewVideoPhotoBlock?
+    var vitaePreviewWorkCellChangedBlock:vitaePreviewWorkCellChangedBlockActionBlock?
+    
+    //有内容
+    lazy var nameIconImgView :UIImageView = {
+        let iconImgView = UIImageView(frame: CGRect(x: 15, y: 0, width: 25, height: 25))
+        iconImgView.contentMode = .scaleAspectFit
+        iconImgView.image = UIImage(named: "mine_jianli_preview_work")
+        return iconImgView
+    }()
+    lazy var workProfessionTitleLabel: UILabel = {
+        let titleLabel = UILabel()
+        titleLabel.textColor = HexColor("#333333")
+        titleLabel.textAlignment = .left
+        titleLabel.text = "行业"
+        titleLabel.font = BoldFont_16
+        titleLabel.adjustsFontSizeToFitWidth = true
+        return titleLabel
+    }()
+    lazy var realImgView :UIImageView = {
+        let iconImgView = UIImageView()
+        iconImgView.image = UIImage(named: "mine_jianli_zhenshi")
+        return iconImgView
+    }()
+    lazy var workNameTitleLabel: UILabel = {
+        let titleLabel = UILabel()
+        titleLabel.textColor = HexColor("#333333")
+        titleLabel.textAlignment = .left
+        titleLabel.text = "工作岗位"
+        titleLabel.font = Font_14
+        titleLabel.adjustsFontSizeToFitWidth = true
+        return titleLabel
+    }()
+    lazy var workPositionTitleLabel: UILabel = {
+        let titleLabel = UILabel()
+        titleLabel.textColor = HexColor("#333333")
+        titleLabel.textAlignment = .left
+        titleLabel.text = "公司名称"
+        titleLabel.font = Font_14
+        titleLabel.adjustsFontSizeToFitWidth = true
+        return titleLabel
+    }()
+    lazy var workTimeTitleLabel: UILabel = {
+        let titleLabel = UILabel()
+        titleLabel.textColor = HexColor("#333333")
+        titleLabel.textAlignment = .left
+        titleLabel.text = "工作时间"
+        titleLabel.font = Font_14
+        titleLabel.adjustsFontSizeToFitWidth = true
+        return titleLabel
+    }()
+    ///工作内容描述
+    lazy var jianjieLabel: UILabel = {
+        let titleLabel = UILabel.init(frame: CGRectMake(50, 162, KSreenWidth-60, 40))
+        titleLabel.textColor = HexColor("#999999")
+        titleLabel.textAlignment = .left
+        titleLabel.font = Font_14
+        titleLabel.backgroundColor = .clear// UIColor(red:0.98, green:0.98, blue:0.98, alpha:1.00)
+        titleLabel.text = "描述"
+        titleLabel.numberOfLines = 0
+        var lines = titleLabel.getRealLabelTextLines()
+        let height = titleLabel.qmui_lineHeight
+        if lines > 2 {
+            lines = 2
+        }
+        titleLabel.height = height*CGFloat(lines)
+        return titleLabel
+    }()
+    //展开,收起
+    lazy var expandBtn: UIButton = {
+        let expandBtn = UIButton.init(type: .custom)
+        expandBtn.backgroundColor = .clear
+        
+        expandBtn.frame = CGRect(x: self.jianjieLabel.right-60, y: self.jianjieLabel.bottom+10, width: 60, height: 30)
+        expandBtn.setTitle("更多", for: .normal)
+        expandBtn.setTitle("收起", for: .selected)
+
+        expandBtn.setTitleColor(HexColor("#1B64FE"), for: .normal)
+        expandBtn.setImage(UIImage(named: "homepage_unfold"), for: .normal)
+        expandBtn.setImage(UIImage(named: "homepage_fold"), for: .selected)
+        expandBtn.titleLabel?.font = Font_14
+        expandBtn.setupButtonImageAndTitlePossitionWith(padding: 5, style: .right)
+        expandBtn.addTarget(self, action: #selector(expandBtnAction), for: .touchUpInside)
+        return expandBtn
+    }()
+    lazy var imagesTotalView :UIView = {
+        let whiteBgView = UIView()
+        whiteBgView.tag = 1100
+        return whiteBgView
+    }()
+    lazy var dingweiImgView :UIImageView = {
+        let iconImgView = UIImageView()
+        iconImgView.image = UIImage(named: "mine_jinali_workdingwei")
+        return iconImgView
+    }()
+    lazy var workDingWeiTitleLabel: UILabel = {
+        let titleLabel = UILabel()
+        titleLabel.textColor = HexColor("#999999")
+        titleLabel.textAlignment = .left
+        titleLabel.text = ""
+        titleLabel.font = Font_11
+        titleLabel.adjustsFontSizeToFitWidth = true
+        return titleLabel
+    }()
+    
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+        self.contentView.backgroundColor = .clear
+        self.backgroundColor = .clear
+        self.selectionStyle = .none
+        self.initUI()
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    func initUI(){
+        self.contentView.addSubview(self.nameIconImgView)
+        self.nameIconImgView.snp.makeConstraints { make in
+            make.top.equalTo(10)
+            make.left.equalTo(15)
+            make.width.height.equalTo(25)
+        }
+        self.contentView.addSubview(self.workProfessionTitleLabel)
+        self.workProfessionTitleLabel.snp.makeConstraints { make in
+            make.centerY.equalTo(self.nameIconImgView.snp.centerY)
+            make.left.equalTo(50)
+        }
+
+        self.contentView.addSubview(self.realImgView)
+        self.realImgView.snp.makeConstraints { make in
+            make.right.equalToSuperview().offset(-15)
+            make.centerY.equalTo(self.workProfessionTitleLabel.snp.centerY)
+            make.width.equalTo(80)
+            make.height.equalTo(80.0*78/403)
+            make.left.greaterThanOrEqualTo(self.workProfessionTitleLabel.snp.right).offset(5)
+        }
+        self.contentView.addSubview(self.workNameTitleLabel)
+        self.workNameTitleLabel.snp.makeConstraints { make in
+            make.top.equalTo(self.workProfessionTitleLabel.snp.bottom).offset(6)
+            make.left.equalTo(50)
+            make.right.equalToSuperview().offset(-15)
+        }
+        
+        self.contentView.addSubview(self.workPositionTitleLabel)
+        self.workPositionTitleLabel.snp.makeConstraints { make in
+            make.top.equalTo(self.workNameTitleLabel.snp.bottom).offset(5)
+            make.left.equalTo(self.workNameTitleLabel.snp.left)
+            make.right.equalToSuperview().offset(-15)
+        }
+        
+        self.contentView.addSubview(self.workTimeTitleLabel)
+        self.workTimeTitleLabel.snp.makeConstraints { make in
+            make.top.equalTo(self.workPositionTitleLabel.snp.bottom).offset(5)
+            make.left.equalTo(self.workPositionTitleLabel.snp.left)
+            make.right.equalToSuperview().offset(-15)
+        }
+        self.contentView.addSubview(self.jianjieLabel)
+        self.jianjieLabel.snp.makeConstraints { 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(40)
+        }
+        self.contentView.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{
+            self.expandBtn.isHidden = true
+        }else{
+            self.expandBtn.isHidden = false
+        }
+        
+        self.contentView.addSubview(self.imagesTotalView)
+        self.imagesTotalView.snp.makeConstraints { make in
+            make.left.equalToSuperview()
+            make.bottom.equalToSuperview()
+            make.width.equalToSuperview()
+            make.top.equalTo(self.jianjieLabel.snp.bottom).offset(10)
+        }
+        self.contentView.addSubview(self.dingweiImgView)
+        self.dingweiImgView.snp.makeConstraints { make in
+            make.left.equalTo(self.workNameTitleLabel.snp.left)
+            make.bottom.equalToSuperview().offset(-15)
+            make.width.equalTo(10)
+            make.height.equalTo(10)
+        }
+        self.contentView.addSubview(self.workDingWeiTitleLabel)
+        self.workDingWeiTitleLabel.snp.makeConstraints { make in
+            make.left.equalTo(self.dingweiImgView.snp.right).offset(3)
+            make.centerY.equalTo(self.dingweiImgView.snp.centerY)
+        }
+        
+
+    }
+    
+    func setupNewUI(model:CNLiveVitaeWorksModel){
+        self.realImgView.isHidden = false
+        self.imagesTotalView.subviews.forEach { view in
+            if view.tag >= 1000{
+                view.removeFromSuperview()
+            }
+        }
+        self.workProfessionTitleLabel.text = model.profession.count > 0 ? model.profession : "行业"
+        self.workNameTitleLabel.text = model.position.count > 0 ? model.position : "职位"
+        if model.companyName.count > 0{
+            self.workPositionTitleLabel.text = model.companyName
+            self.workPositionTitleLabel.isHidden = false
+        }else{
+            self.workPositionTitleLabel.isHidden = true
+            self.workTimeTitleLabel.snp.remakeConstraints { make in
+                make.top.equalTo(self.workNameTitleLabel.snp.bottom).offset(5)
+                make.left.equalTo(self.workPositionTitleLabel.snp.left)
+                make.right.equalToSuperview().offset(-15)
+            }
+        }
+
+        let startDateString = convertTimestampStringToDateString(timestampString: model.startWorkingDate)
+        let endDateString = convertTimestampStringToDateString(timestampString: model.endWorkingDate)
+        if endDateString == nil || endDateString?.count == 0{
+            if startDateString == nil || startDateString?.count == 0{
+                self.workTimeTitleLabel.text = ""
+            }else{
+                self.workTimeTitleLabel.text = startDateString!
+            }
+        }else{
+            if startDateString == nil || startDateString?.count == 0{
+                self.workTimeTitleLabel.text = ""
+            }else{
+                self.workTimeTitleLabel.text = startDateString!+"~"+endDateString!
+            }
+        }
+                
+        self.jianjieLabel.text = model.jobDuties//"描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述"
+        self.jianjieLabel.sizeToFit()
+        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.isExpand{
+            //展开状态
+            jienjieH = height*CGFloat(lines)
+            self.jianjieLabel.numberOfLines = 0
+        }else{
+            //收起状态
+            if lines <= 2{
+                //小于2行,按实际行数
+                jienjieH = CGFloat(lines)*height
+                self.jianjieLabel.numberOfLines = 1
+            }else{
+                //大于2行, 显示2行
+                jienjieH = 2*height+2
+                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{
+            for i in 0..<imgArr.count {
+                let imgGap:Float = 10
+                let imgLeftGap:Float = 50
+                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)), 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.bottom+10, width: CGFloat(imgWH), height: CGFloat(imgWH)))
+                imgView.isUserInteractionEnabled = true
+                imgView.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(imgViewTapAciton)))
+                imgView.tag = 1000+i
+                imgView.contentMode = .scaleAspectFit
+                let imgUrl = imgArr[i]
+                imgView.clipsToBounds = true
+                imgView.layer.cornerRadius = 5
+                self.imagesTotalView.addSubview(imgView)
+                
+                if imgUrl.contains("vitae_video_"){
+                    //是视频
+                    let thumbailImgUrl = "http://wjjtest.ys2.cnliveimg.com/802/mateCode/img/vitae_photo_0/2024/08/02/3977195366.jpg"
+                    let vm = HeroBrowserVideoViewModule(thumbailImgUrl: thumbailImgUrl, videoUrl: imgUrl, provider: HeroNetworkImageProvider.shared, autoPlay: true)
+                    self.images.append(vm)
+                    imgView.kf.setImage(with: URL(string: thumbailImgUrl),placeholder: UIImage(color: UIColor.lightGray, size: imgView.size))
+                    
+                    let playBtn = UIButton(type: .custom)
+                    playBtn.frame = imgView.bounds
+                    playBtn.setImage(UIImage(named: "short_video_play"), for: .normal)
+                    playBtn.addTarget(self, action: #selector(playBtnAction(btn:)), for: .touchUpInside)
+                    playBtn.clipsToBounds = true
+                    playBtn.layer.cornerRadius = 5
+                    playBtn.tag = 1000+i
+                    imgView.addSubview(playBtn)
+                }else if imgUrl.contains("vitae_photo_"){
+                    //是图片
+                    self.images.append(HeroBrowserNetworkImageViewModule(thumbailImgUrl: nil, originImgUrl: imgUrl))
+                    imgView.kf.setImage(with: URL(string: imgUrl))
+                }else{
+                    //默认图片
+                    self.images.append(HeroBrowserNetworkImageViewModule(thumbailImgUrl: nil, originImgUrl: imgUrl))
+                    imgView.kf.setImage(with: URL(string: imgUrl))
+                }
+            }
+        }
+                
+        let cityStr = model.city
+        if cityStr.count == 0 || cityStr == "请选择"{
+            self.workDingWeiTitleLabel.isHidden = true
+            self.dingweiImgView.isHidden = true
+            self.imagesTotalView.snp.remakeConstraints { make in
+                make.left.equalToSuperview()
+                make.bottom.equalToSuperview()
+                make.width.equalToSuperview()
+                make.top.equalTo(self.jianjieLabel.snp.bottom).offset(10)
+            }
+
+        }else{
+            self.dingweiImgView.isHidden = false
+            self.workDingWeiTitleLabel.isHidden = false
+            self.workDingWeiTitleLabel.text = model.city
+            self.imagesTotalView.snp.remakeConstraints { make in
+                make.left.equalToSuperview()
+                make.bottom.equalTo(self.dingweiImgView.snp.top).offset(-5)
+                make.width.equalToSuperview()
+                make.top.equalTo(self.jianjieLabel.snp.bottom).offset(10)
+            }
+        }
+        self.nameIconImgView.image = UIImage(named: "mine_jianli_preview_work")
+        
+    }
+    func setupAwardNewUI(model:CNLiveVitaeAwardsModel){
+        self.realImgView.isHidden = true
+        self.imagesTotalView.subviews.forEach { view in
+            if view.tag >= 1000{
+                view.removeFromSuperview()
+            }
+        }
+
+        self.workProfessionTitleLabel.text = model.title.count > 0 ? model.title : "获奖名称"
+        self.workNameTitleLabel.isHidden = true
+        if model.company.count > 0{
+            self.workPositionTitleLabel.text = model.company
+            self.workPositionTitleLabel.isHidden = false
+        }else{
+            self.workPositionTitleLabel.isHidden = true
+            self.workTimeTitleLabel.snp.remakeConstraints { make in
+                make.top.equalTo(self.workNameTitleLabel.snp.bottom).offset(5)
+                make.left.equalTo(self.workPositionTitleLabel.snp.left)
+                make.right.equalToSuperview().offset(-15)
+            }
+        }
+
+        let startDateString = convertTimestampStringToDateString(timestampString: model.time)
+        if startDateString == nil || startDateString?.count == 0{
+            self.workTimeTitleLabel.text = ""
+            self.workTimeTitleLabel.isHidden = true
+        }else{
+            self.workTimeTitleLabel.text = startDateString!
+            self.workTimeTitleLabel.isHidden = false
+
+        }
+                
+        self.jianjieLabel.text = model.description//"描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述"
+        self.jianjieLabel.sizeToFit()
+        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.isExpand{
+            //展开状态
+            jienjieH = height*CGFloat(lines)
+            self.jianjieLabel.numberOfLines = 0
+        }else{
+            //收起状态
+            if lines <= 2{
+                //小于2行,按实际行数
+                jienjieH = CGFloat(lines)*height
+                self.jianjieLabel.numberOfLines = 1
+            }else{
+                //大于2行, 显示2行
+                jienjieH = 2*height+2
+                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{
+            for i in 0..<imgArr.count {
+                let imgGap:Float = 10
+                let imgLeftGap:Float = 50
+                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)), 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.bottom+10, width: CGFloat(imgWH), height: CGFloat(imgWH)))
+                imgView.isUserInteractionEnabled = true
+                imgView.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(imgViewTapAciton)))
+                imgView.tag = 1000+i
+                imgView.contentMode = .scaleAspectFit
+                let imgUrl = imgArr[i]
+                imgView.clipsToBounds = true
+                imgView.layer.cornerRadius = 5
+                self.imagesTotalView.addSubview(imgView)
+                
+                if imgUrl.contains("vitae_video_"){
+                    //是视频
+                    let thumbailImgUrl = "http://wjjtest.ys2.cnliveimg.com/802/mateCode/img/vitae_photo_0/2024/08/02/3977195366.jpg"
+                    let vm = HeroBrowserVideoViewModule(thumbailImgUrl: thumbailImgUrl, videoUrl: imgUrl, provider: HeroNetworkImageProvider.shared, autoPlay: true)
+                    self.images.append(vm)
+                    imgView.kf.setImage(with: URL(string: thumbailImgUrl),placeholder: UIImage(color: UIColor.lightGray, size: imgView.size))
+                    
+                    let playBtn = UIButton(type: .custom)
+                    playBtn.frame = imgView.bounds
+                    playBtn.setImage(UIImage(named: "short_video_play"), for: .normal)
+                    playBtn.addTarget(self, action: #selector(playBtnAction(btn:)), for: .touchUpInside)
+                    playBtn.clipsToBounds = true
+                    playBtn.layer.cornerRadius = 5
+                    playBtn.tag = 1000+i
+                    imgView.addSubview(playBtn)
+                }else if imgUrl.contains("vitae_photo_"){
+                    //是图片
+                    self.images.append(HeroBrowserNetworkImageViewModule(thumbailImgUrl: nil, originImgUrl: imgUrl))
+                    imgView.kf.setImage(with: URL(string: imgUrl))
+                }else{
+                    //默认图片
+                    self.images.append(HeroBrowserNetworkImageViewModule(thumbailImgUrl: nil, originImgUrl: imgUrl))
+                    imgView.kf.setImage(with: URL(string: imgUrl))
+                }
+            }
+        }
+                
+        self.workDingWeiTitleLabel.isHidden = true
+        self.dingweiImgView.isHidden = true
+        self.nameIconImgView.image = UIImage(named: "mine_jianli_preview_award")
+        self.imagesTotalView.snp.remakeConstraints { make in
+            make.left.equalToSuperview()
+            make.bottom.equalToSuperview()
+            make.width.equalToSuperview()
+            make.top.equalTo(self.jianjieLabel.snp.bottom).offset(10)
+        }
+    }
+    
+    func convertTimestampStringToDateString(timestampString: String) -> String? {
+        // 首先，将毫秒时间戳字符串转换为TimeInterval（秒）
+        guard let timestampMilliseconds = Double(timestampString) else {
+            return nil
+        }
+        let timestampSeconds = timestampMilliseconds / 1000.0
+        // 然后，将TimeInterval转换为Date对象
+        let date = Date(timeIntervalSince1970: timestampSeconds)
+        // 接着，设置DateFormatter的格式
+        let formatter = DateFormatter()
+        formatter.dateFormat = "yyyy.MM.dd" // 设置为你想要的日期格式
+        // 最后，使用DateFormatter将Date对象格式化为字符串
+        return formatter.string(from: date)
+    }
+
+    // MARK: - Action
+    @objc func expandBtnAction(button:UIButton){
+        button.isSelected = !button.isSelected
+        let lines = jianjieLabel.getRealLabelTextLines()
+        let height = jianjieLabel.qmui_lineHeight
+
+        var jienjieH:CGFloat = 0
+        if button.isSelected{
+            //文本收起状态,点击展开
+            jienjieH = CGFloat(lines)*height
+        }else{
+            //文本展开状态,点击收起
+            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!(button.tag, jienjieH, button.isSelected)
+        
+        self.expandBtn.top = self.jianjieLabel.top + jienjieH
+
+    }
+    
+    @objc func playBtnAction(btn:UIButton){
+        let index = btn.tag-1000
+        self.vitaeWorkPreviewVideoPhotoBlock?(self.images, index)
+    }
+    @objc func imgViewTapAciton(ges: UITapGestureRecognizer){
+        let imgView = ges.view as! UIImageView
+        let index = imgView.tag-1000
+        
+        self.vitaeWorkPreviewVideoPhotoBlock?(self.images, index)
+    }
+
+}
@@ -63,7 +63,7 @@ class CNLiveViateWorkModelLayout:NSObject{
             _workModel?.cellH = Float(123-25)+companyH+descH+Float(hang*imgWH)+cityH+55
         }else{//预览工作记录
             imgWH = Float((Float(KSreenWidth)-30-40-50)/3.0+10)
-            _workModel?.cellH = Float(162)+descH+Float(hang*imgWH)+cityH+55
+            _workModel?.cellH = Float(162-58-25)+companyH+descH+Float(hang*imgWH)+cityH//+55
         }
     }
     func getCellHModel()->CNLiveVitaeWorksModel{
@@ -121,7 +121,7 @@ class CNLiveViateAwardModelLayout:NSObject{
             _awardModel?.cellH = Float(123-25)+companyH+descH+Float(hang*imgWH)+55
         }else{//预览获奖
             imgWH = Float((Float(KSreenWidth)-30-40-50)/3.0+10)
-            _awardModel?.cellH = Float(162)+descH+Float(hang*imgWH)+55
+            _awardModel?.cellH = Float(162-58-25)+companyH+descH+Float(hang*imgWH)//+55
         }
     }
     func getCellHModel()->CNLiveVitaeAwardsModel{