数字简历预览页

“张旭”
1 parent 8cf2050f
Showing 18 changed files with 1043 additions and 139 deletions
metaCode/Classes/Main/HomePage/Controller/DigitalAuth/工作相关页面/CNLiveVitaeWorkDetailController.swift
metaCode/Classes/Main/HomePage/Controller/DigitalAuth/数字简历相关页面/CNLiveDigitalResumePreViewController.swift
metaCode/Classes/Main/HomePage/View/DigitalAuthViews/我的简历cell/CNLiveDigitalResumePreViewFirCell.swift
metaCode/Classes/Main/HomePage/View/DigitalAuthViews/我的简历cell/CNLiveDigitalResumePreViewSecCell.swift
metaCode/Classes/Main/HomePage/View/DigitalAuthViews/我的简历cell/CNLiveDigitalResumePreviewFiveCell.swift
metaCode/Classes/Main/HomePage/View/DigitalAuthViews/我的简历cell/CNLiveDigitalResumePreviewFourCell.swift
metaCode/Classes/Main/HomePage/View/DigitalAuthViews/我的简历cell/CNLiveDigitalResumePreviewSixCell.swift
metaCode/Classes/Main/HomePage/View/DigitalAuthViews/我的简历cell/CNLiveDigitalResumePreviewThreeCell.swift
metaCode/Classes/Main/Model/Vitae/CNLiveViateWorkModelLayout.swift
metaCode/Supporting Files/Assets.xcassets/MinePage/jianli/mine_jianli_preview_award.imageset/Contents.json
metaCode/Supporting Files/Assets.xcassets/MinePage/jianli/mine_jianli_preview_award.imageset/mine_jianli_preview_award@2x.png
metaCode/Supporting Files/Assets.xcassets/MinePage/jianli/mine_jianli_preview_award.imageset/mine_jianli_preview_award@3x.png
metaCode/Supporting Files/Assets.xcassets/MinePage/jianli/mine_jianli_preview_jianjie.imageset/Contents.json
metaCode/Supporting Files/Assets.xcassets/MinePage/jianli/mine_jianli_preview_jianjie.imageset/mine_jianli_preview_jianjie@2x.png
metaCode/Supporting Files/Assets.xcassets/MinePage/jianli/mine_jianli_preview_jianjie.imageset/mine_jianli_preview_jianjie@3x.png
metaCode/Supporting Files/Assets.xcassets/MinePage/jianli/mine_jianli_preview_work.imageset/Contents.json
metaCode/Supporting Files/Assets.xcassets/MinePage/jianli/mine_jianli_preview_work.imageset/mine_jianli_preview_work@2x.png
metaCode/Supporting Files/Assets.xcassets/MinePage/jianli/mine_jianli_preview_work.imageset/mine_jianli_preview_work@3x.png
@@ -157,11 +157,11 @@ class CNLiveVitaeWorkDetailController:CNLiveBaseViewController,UITableViewDataSo
             for (idx,mdl) in res.enumerated() {
                 if idx == idxPath?.row{
                     if self.workAwardType == .work{
-                        let layout = CNLiveViateWorkModelLayout(model: mdl as! CNLiveVitaeWorksModel,descH: Float(jianjieHeight))
+                        let layout = CNLiveViateWorkModelLayout(model: mdl as! CNLiveVitaeWorksModel,descH: Float(jianjieHeight),isPreview: false)
                         let newWorkModel = layout.getCellHModel()
                         tempArr.append(newWorkModel)
                     }else{
-                        let layout = CNLiveViateAwardModelLayout(model: mdl as! CNLiveVitaeAwardsModel,descH: Float(jianjieHeight))
+                        let layout = CNLiveViateAwardModelLayout(model: mdl as! CNLiveVitaeAwardsModel,descH: Float(jianjieHeight), isPreview: false)
                         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)
+                            let layout = CNLiveViateWorkModelLayout(model: mdl,descH: 40.0,isPreview: 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)
+                            let layout = CNLiveViateAwardModelLayout(model: mdl,descH: 40.0, isPreview: false)
                             let newWorkModel = layout.getCellHModel()
                             self.workListArr.append(newWorkModel)
                         }
@@ -6,11 +6,30 @@
 //  数字简历预览页面
  
 import Foundation
+import JFHeroBrowser
  
+
+///数字简历预览cell类型
+enum CNLiveViatePreviewCellType {
+    ///实名
+    case realName
+    ///官方认证
+    case guanFang
+    ///其他证书
+    case cer
+    ///工作记录
+    case work
+    ///获奖情况
+    case award
+    ///自我介绍
+    case mineJieShao
+}
 class CNLiveDigitalResumePreViewController:CNLiveBaseViewController,UITableViewDataSource, UITableViewDelegate{
  
     //简历model
     var vitaeModel:CNLiveVitaeModel?
+    var sixCellHeight:CGFloat = DefaultPreViewCellHeight+15
+    
  
     lazy var bgImgView :UIImageView = {
         let iconImgView = UIImageView()
@@ -27,6 +46,23 @@ class CNLiveDigitalResumePreViewController:CNLiveBaseViewController,UITableViewD
         return iconImgView
     }()
  
+    //所有cell的type
+    lazy var totalDataArray: NSMutableArray = {
+        var dataArray = NSMutableArray()
+        return dataArray
+    }()
+    //work的数据源
+    lazy var workDataArray: NSMutableArray = {
+        var dataArray = NSMutableArray()
+        return dataArray
+    }()
+    //award的数据源
+    lazy var awardDataArray: NSMutableArray = {
+        var dataArray = NSMutableArray()
+        return dataArray
+    }()
+    
+    
     lazy var secTotalDataArray: NSMutableArray = {
         var dataArray = NSMutableArray()
         return dataArray
@@ -35,11 +71,15 @@ class CNLiveDigitalResumePreViewController:CNLiveBaseViewController,UITableViewD
         var dataArray = NSMutableArray()
         return dataArray
     }()
+    lazy var threeCerDataArray:[CNLiveVitaeCertificateModel] = {
+        var dataArray = [CNLiveVitaeCertificateModel]()
+        return dataArray
+    }()
     let kCNLiveDigitalResumePreViewFirCellIdentifier = "kCNLiveDigitalResumePreViewFirCellIdentifier"
     let kCNLiveDigitalResumePreViewSecCellIdentifier = "kCNLiveDigitalResumePreViewSecCellIdentifier"
     let kCNLiveDigitalResumePreviewThreeCellIdentifier = "kCNLiveDigitalResumePreviewThreeCellIdentifier"
     let kCNLiveDigitalResumePreviewFourCellIdentifier = "kCNLiveDigitalResumePreviewFourCellIdentifier"
-    let kCNLiveDigitalResumePreviewFiveCellIdentifier = "kCNLiveDigitalResumePreviewFiveCellIdentifier"
+//    let kCNLiveDigitalResumePreviewFiveCellIdentifier = "kCNLiveDigitalResumePreviewFiveCellIdentifier"
     let kCNLiveDigitalResumePreviewSixCellIdentifier = "kCNLiveDigitalResumePreviewSixCellIdentifier"
  
     lazy var tableView : UITableView = {
@@ -52,7 +92,7 @@ class CNLiveDigitalResumePreViewController:CNLiveBaseViewController,UITableViewD
         tableView.register(CNLiveDigitalResumePreViewSecCell.self, forCellReuseIdentifier: kCNLiveDigitalResumePreViewSecCellIdentifier)
         tableView.register(CNLiveDigitalResumePreviewThreeCell.self, forCellReuseIdentifier: kCNLiveDigitalResumePreviewThreeCellIdentifier)
         tableView.register(CNLiveDigitalResumePreviewFourCell.self, forCellReuseIdentifier: kCNLiveDigitalResumePreviewFourCellIdentifier)
-        tableView.register(CNLiveDigitalResumePreviewFiveCell.self, forCellReuseIdentifier: kCNLiveDigitalResumePreviewFiveCellIdentifier)
+//        tableView.register(CNLiveDigitalResumePreviewFiveCell.self, forCellReuseIdentifier: kCNLiveDigitalResumePreviewFiveCellIdentifier)
         tableView.register(CNLiveDigitalResumePreviewSixCell.self, forCellReuseIdentifier: kCNLiveDigitalResumePreviewSixCellIdentifier)
         tableView.backgroundColor = .clear
         return tableView
@@ -134,11 +174,12 @@ class CNLiveDigitalResumePreViewController:CNLiveBaseViewController,UITableViewD
     }
  
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        return 6
+        return self.totalDataArray.count
     }
  
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-        if indexPath.row == 0{
+        let cellType = self.totalDataArray[indexPath.row] as! CNLiveViatePreviewCellType
+        if cellType == .realName{
             //我的简历-fir姓名等Cell
             guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveDigitalResumePreViewFirCellIdentifier) as? CNLiveDigitalResumePreViewFirCell
             else {
@@ -146,7 +187,7 @@ class CNLiveDigitalResumePreViewController:CNLiveBaseViewController,UITableViewD
                 return cell
             }
             cell.updateViateDataBlock = {
-                self.vitaeModel = nil
+                
                 self.getVitae()
                 self.getCetList()
             }
@@ -154,7 +195,7 @@ class CNLiveDigitalResumePreViewController:CNLiveBaseViewController,UITableViewD
                 cell.vitaeModel = self.vitaeModel!
             }
             return cell
-        }else if indexPath.row == 1{
+        }else if cellType == .guanFang{
             //官方验证
             guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveDigitalResumePreViewSecCellIdentifier) as? CNLiveDigitalResumePreViewSecCell
             else {
@@ -163,37 +204,107 @@ class CNLiveDigitalResumePreViewController:CNLiveBaseViewController,UITableViewD
             }
             cell.digitalListModels = self.succDataArray as? [MineAuthListModel]
             return cell
-        }else if indexPath.row == 2{
+        }else if cellType == .cer{
             //其他证书
             guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveDigitalResumePreviewThreeCellIdentifier) as? CNLiveDigitalResumePreviewThreeCell
             else {
                 let cell = CNLiveDigitalResumePreviewThreeCell()
                 return cell
             }
+            cell.threeCerDataArray = self.threeCerDataArray
             return cell
-        }else if indexPath.row == 3{
+        }else if cellType == .work{
             //工作记录
             guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveDigitalResumePreviewFourCellIdentifier) as? CNLiveDigitalResumePreviewFourCell
             else {
                 let cell = CNLiveDigitalResumePreviewFourCell()
                 return cell
             }
+            if let workMdl = self.workDataArray[indexPath.row] as? CNLiveVitaeWorksModel{
+                cell.workMdl = workMdl
+                cell.vitaePreviewWorkCellChangedBlock = { workCell,jianjieHeight 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 newWorkModel = layout.getCellHModel()
+                            tempArr.append(newWorkModel)
+                        }else{
+                            tempArr.append(mdl)
+                        }
+                    }
+                    self.workDataArray = NSMutableArray(array: tempArr)
+                    self.tableView.reloadData()
+                }
+                cell.vitaeWorkPreviewVideoPhotoBlock = { images , index in
+                    self.hero.browserMultiSoures(viewModules: images, initIndex: index) {
+                        [
+                            .enableBlurEffect(false),
+                            .heroView(nil),
+                            .imageDidChangeHandle({ imageIndex in
+                                return nil
+                            })
+                        ]
+                    }
+                }
+            }
             return cell
-        }else if indexPath.row == 4{
+        }else if cellType == .award{
             //获奖情况
-            guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveDigitalResumePreviewFiveCellIdentifier) as? CNLiveDigitalResumePreviewFiveCell
+            guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveDigitalResumePreviewFourCellIdentifier) as? CNLiveDigitalResumePreviewFourCell
             else {
-                let cell = CNLiveDigitalResumePreviewFiveCell()
+                let cell = CNLiveDigitalResumePreviewFourCell()
                 return cell
             }
+            if let awardMdl = self.awardDataArray[indexPath.row] as? CNLiveVitaeAwardsModel{
+                cell.awardModel = awardMdl
+                cell.vitaePreviewWorkCellChangedBlock = { workCell,jianjieHeight 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 newWorkModel = layout.getCellHModel()
+                            tempArr.append(newWorkModel)
+                        }else{
+                            tempArr.append(mdl)
+                        }
+                    }
+                    self.awardDataArray = NSMutableArray(array: tempArr)
+                    self.tableView.reloadData()
+                }
+                cell.vitaeWorkPreviewVideoPhotoBlock = { images , index in
+                    self.hero.browserMultiSoures(viewModules: images, initIndex: index) {
+                        [
+                            .enableBlurEffect(false),
+                            .heroView(nil),
+                            .imageDidChangeHandle({ imageIndex in
+                                return nil
+                            })
+                        ]
+                    }
+                }
+            }
             return cell
-        }else if indexPath.row == 5{
+        }else if cellType == .mineJieShao{
             //自我介绍
             guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveDigitalResumePreviewSixCellIdentifier) as? CNLiveDigitalResumePreviewSixCell
             else {
                 let cell = CNLiveDigitalResumePreviewSixCell()
                 return cell
             }
+
+            cell.vitaePreviewSixCellChangedBlock = { sixCell,jianjieHeight in
+                self.sixCellHeight = jianjieHeight+69
+                self.tableView.reloadData()
+
+            }
+            if self.vitaeModel?.vitae?.selfIntroduction.count ?? 0 > 0{
+                cell.vitaeMdl = self.vitaeModel
+            }
             return cell
         }else {
             //未知cell
@@ -206,21 +317,35 @@ class CNLiveDigitalResumePreViewController:CNLiveBaseViewController,UITableViewD
     }
  
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
-        if indexPath.row == 0{
+        let cellType = self.totalDataArray[indexPath.row] as! CNLiveViatePreviewCellType
+        if cellType == .realName{
             return 177+51
-        }else if indexPath.row == 1{
+        }else if cellType == .guanFang{
             return self.succDataArray.count == 0 ?  DefaultPreViewCellHeight+15 : 218+15
-        }else if indexPath.row == 2{
-            return DefaultPreViewCellHeight+15//227+15
-        }else if indexPath.row == 3{
-            return DefaultPreViewCellHeight+15//396+15
-        }else if indexPath.row == 4{
-            return DefaultPreViewCellHeight+15//396+15
-        }else if indexPath.row == 5{
-            return DefaultPreViewCellHeight+15//209+15
-        }else {
+        }else if cellType == .cer{
+            return self.threeCerDataArray.count == 0 ? DefaultPreViewCellHeight+15 : 227+15
+        }else if cellType == .work{
+            if self.vitaeModel?.works.count ?? 0 > 0{
+                //有多个workcell
+                let model = self.workDataArray[indexPath.row] as! CNLiveVitaeWorksModel
+                return CGFloat(model.cellH)
+            }else{
+                return DefaultPreViewCellHeight+15//396+15
+            }
+        }else if cellType == .award{
+            if self.vitaeModel?.awards.count ?? 0 > 0{
+                //有多个awardcell
+                let model = self.awardDataArray[indexPath.row] as! CNLiveVitaeAwardsModel
+                return CGFloat(model.cellH)
+            }else{
+                return DefaultPreViewCellHeight+15//396+15
+            }
+        }else if cellType == .mineJieShao{
+            return self.sixCellHeight
+        }else{
             return 50
         }
+       
     }
  
     @objc func settingBtnAction(){
@@ -237,6 +362,7 @@ class CNLiveDigitalResumePreViewController:CNLiveBaseViewController,UITableViewD
         CNLiveVitaeViewModel.getCerList(vsid: vsid, page: 1, pageSize: 100){ result, respStatue in
             if respStatue == .success{
                 if let res = result as? [CNLiveVitaeCertificateModel]{
+                    self.threeCerDataArray = res
                     self.tableView.reloadData()
                 }
             }else{
@@ -256,8 +382,33 @@ class CNLiveDigitalResumePreViewController:CNLiveBaseViewController,UITableViewD
                         self.saveUpdateVitae(isSave: true)
                     }else{
                         //有简历-刷新页面
+                        self.vitaeModel = nil
                         self.vitaeModel = model
                         self.saveViateModel()
+                        self.totalDataArray.removeAllObjects()
+                        self.workDataArray.removeAllObjects()
+                        self.awardDataArray.removeAllObjects()
+                        self.totalDataArray.addObjects(from: [CNLiveViatePreviewCellType.realName,CNLiveViatePreviewCellType.guanFang,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)
+                            
+                            let layout = CNLiveViateWorkModelLayout(model: mdl ,descH: Float(40.0),isPreview: true)
+                            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 newWorkModel = layout.getCellHModel()
+                            self.awardDataArray.add(newWorkModel)
+                            self.workDataArray.add(CNLiveViatePreviewCellType.award)
+                        }
+                        self.totalDataArray.add(CNLiveViatePreviewCellType.mineJieShao)
+                        self.workDataArray.add(CNLiveViatePreviewCellType.mineJieShao)
+                        self.awardDataArray.add(CNLiveViatePreviewCellType.mineJieShao)
                         self.tableView.reloadData()
                     }
                 }else{
@@ -134,7 +134,12 @@ class CNLiveDigitalResumePreViewFirCell: UITableViewCell {
         self.selectionStyle = .none
  
         self.contentView.addSubview(self.whiteBgView)
-        
+        self.whiteBgView.snp.makeConstraints { make in
+            make.top.equalTo(51)
+            make.bottom.equalToSuperview()
+            make.left.equalTo(15)
+            make.right.equalToSuperview().offset(-15)
+        }
         self.contentView.addSubview(self.jianliIconBgView)
         self.jianliIconBgView.snp.makeConstraints { make in
             make.top.equalTo(21)
@@ -88,6 +88,12 @@ class CNLiveDigitalResumePreViewSecCell: UITableViewCell, UICollectionViewDelega
         self.backgroundColor = .clear
         self.selectionStyle = .none
         self.contentView.addSubview(self.whiteView)
+        self.whiteView.snp.makeConstraints { make in
+            make.top.equalTo(15)
+            make.bottom.equalToSuperview()
+            make.left.equalTo(15)
+            make.right.equalToSuperview().offset(-15)
+        }
         self.whiteView.addSubview(self.myIdentityTitleLabel)
         self.myIdentityTitleLabel.snp.makeConstraints { make in
             make.top.equalToSuperview().offset(adapt_length(length: 15))
+////
+////  CNLiveDigitalResumePreviewFiveCell.swift
+////  metaCode
+////
+////  Created by zx on 2024/8/7.
+////  数字简历-Five 获奖情况cell
 //
-//  CNLiveDigitalResumePreviewFiveCell.swift
-//  metaCode
+//import Foundation
+//import Kingfisher
+//import SnapKit
 //
-//  Created by zx on 2024/8/7.
-//  数字简历-Five 获奖情况cell
-
-import Foundation
-import Kingfisher
-import SnapKit
-
-class CNLiveDigitalResumePreviewFiveCell: UITableViewCell {
-    
-    lazy var whiteView :UIView = {
-        let whiteView = UIView(frame: CGRect(x: 15, y:15, width: KSreenWidth-30, height: DefaultPreViewCellHeight))
-        whiteView.backgroundColor = .white
-        whiteView.layer.cornerRadius = 12
-        whiteView.clipsToBounds = true
-        return whiteView
-    }()
-    lazy var myIdentityTitleLabel: UILabel = {
-        let titleLabel = UILabel()
-        titleLabel.textColor = HexColor("#333333")
-        titleLabel.textAlignment = .center
-        titleLabel.text = "获奖情况"
-        titleLabel.font = BoldFont_16
-        return titleLabel
-    }()
-
-    lazy var zhengshuNoDescTitleLabel: UILabel = {
-        let titleLabel = UILabel()
-        titleLabel.textColor = HexColor("#999999")
-        titleLabel.textAlignment = .left
-        titleLabel.text = "还没有添加获奖情况"
-        titleLabel.font = Font_12
-        return titleLabel
-    }()
-    lazy var zhengshuNoIconImgView :UIImageView = {
-        let iconImgView = UIImageView(frame: CGRect(x: 18, y: 0, width: 60, height: 45))
-        iconImgView.contentMode = .scaleAspectFit
-        iconImgView.image = UIImage(named: "mine_jianli_noaward")
-        return iconImgView
-    }()
-
-    lazy var zhengshuBtn: UIButton = {
-        let  closeBtn = UIButton(type: .custom)
-        closeBtn.setTitle("关联获奖", for: .normal)
-        closeBtn.setTitleColor(HexColor("#1961FE"), for: .normal)
-        closeBtn.titleLabel?.font = BoldFont_14
-        closeBtn.layer.borderColor = HexColor("#1961FE")?.cgColor
-        closeBtn.layer.borderWidth = 0.5
-        closeBtn.layer.cornerRadius = 6
-        closeBtn.clipsToBounds = true
-        closeBtn.addTarget(self, action: #selector(zhengshuBtnAction), for: .touchUpInside)
-        return closeBtn
-    }()
-
-    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
-        super.init(style: style, reuseIdentifier: reuseIdentifier)
-        self.contentView.backgroundColor = .clear
-        self.backgroundColor = .clear
-        self.selectionStyle = .none
-        
-        self.contentView.addSubview(self.whiteView)
-        self.whiteView.addSubview(self.myIdentityTitleLabel)
-        self.myIdentityTitleLabel.snp.makeConstraints { make in
-            make.top.equalToSuperview().offset(adapt_length(length: 15))
-            make.left.equalTo(adapt_length(length: 15))
-        }
-                
-        self.whiteView.addSubview(self.zhengshuBtn)
-        self.zhengshuBtn.snp.makeConstraints { make in
-            make.centerX.equalToSuperview()
-            make.bottom.equalToSuperview().offset(-20)
-            make.width.equalTo(86)
-            make.height.equalTo(34)
-        }
-        
-        self.whiteView.addSubview(self.zhengshuNoDescTitleLabel)
-        self.zhengshuNoDescTitleLabel.snp.makeConstraints { make in
-            make.centerX.equalToSuperview()
-            make.bottom.equalTo(self.zhengshuBtn.snp.top).offset(-10)
-        }
-        self.whiteView.addSubview(self.zhengshuNoIconImgView)
-        self.zhengshuNoIconImgView.snp.makeConstraints { make in
-            make.centerX.equalToSuperview()
-            make.bottom.equalTo(self.zhengshuNoDescTitleLabel.snp.top).offset(-10)
-            make.width.equalTo(60)
-            make.height.equalTo(45)
-        }
-
-    }
-    required init?(coder: NSCoder) {
-        fatalError("init(coder:) has not been implemented")
-    }
-    
-    @objc func zhengshuBtnAction(){
-        //跳转 选择获奖情况页面
-    
-    }
-        
-}
+//class CNLiveDigitalResumePreviewFiveCell: UITableViewCell {
+//    
+//    lazy var whiteView :UIView = {
+//        let whiteView = UIView(frame: CGRect(x: 15, y:15, width: KSreenWidth-30, height: DefaultPreViewCellHeight))
+//        whiteView.backgroundColor = .white
+//        whiteView.layer.cornerRadius = 12
+//        whiteView.clipsToBounds = true
+//        return whiteView
+//    }()
+//    lazy var myIdentityTitleLabel: UILabel = {
+//        let titleLabel = UILabel()
+//        titleLabel.textColor = HexColor("#333333")
+//        titleLabel.textAlignment = .center
+//        titleLabel.text = "获奖情况"
+//        titleLabel.font = BoldFont_16
+//        return titleLabel
+//    }()
+//
+//    lazy var zhengshuNoDescTitleLabel: UILabel = {
+//        let titleLabel = UILabel()
+//        titleLabel.textColor = HexColor("#999999")
+//        titleLabel.textAlignment = .left
+//        titleLabel.text = "还没有添加获奖情况"
+//        titleLabel.font = Font_12
+//        return titleLabel
+//    }()
+//    lazy var zhengshuNoIconImgView :UIImageView = {
+//        let iconImgView = UIImageView(frame: CGRect(x: 18, y: 0, width: 60, height: 45))
+//        iconImgView.contentMode = .scaleAspectFit
+//        iconImgView.image = UIImage(named: "mine_jianli_noaward")
+//        return iconImgView
+//    }()
+//
+//    lazy var zhengshuBtn: UIButton = {
+//        let  closeBtn = UIButton(type: .custom)
+//        closeBtn.setTitle("关联获奖", for: .normal)
+//        closeBtn.setTitleColor(HexColor("#1961FE"), for: .normal)
+//        closeBtn.titleLabel?.font = BoldFont_14
+//        closeBtn.layer.borderColor = HexColor("#1961FE")?.cgColor
+//        closeBtn.layer.borderWidth = 0.5
+//        closeBtn.layer.cornerRadius = 6
+//        closeBtn.clipsToBounds = true
+//        closeBtn.addTarget(self, action: #selector(zhengshuBtnAction), for: .touchUpInside)
+//        return closeBtn
+//    }()
+//
+//    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+//        super.init(style: style, reuseIdentifier: reuseIdentifier)
+//        self.contentView.backgroundColor = .clear
+//        self.backgroundColor = .clear
+//        self.selectionStyle = .none
+//        
+//        self.contentView.addSubview(self.whiteView)
+//        self.whiteView.addSubview(self.myIdentityTitleLabel)
+//        self.myIdentityTitleLabel.snp.makeConstraints { make in
+//            make.top.equalToSuperview().offset(adapt_length(length: 15))
+//            make.left.equalTo(adapt_length(length: 15))
+//        }
+//                
+//        self.whiteView.addSubview(self.zhengshuBtn)
+//        self.zhengshuBtn.snp.makeConstraints { make in
+//            make.centerX.equalToSuperview()
+//            make.bottom.equalToSuperview().offset(-20)
+//            make.width.equalTo(86)
+//            make.height.equalTo(34)
+//        }
+//        
+//        self.whiteView.addSubview(self.zhengshuNoDescTitleLabel)
+//        self.zhengshuNoDescTitleLabel.snp.makeConstraints { make in
+//            make.centerX.equalToSuperview()
+//            make.bottom.equalTo(self.zhengshuBtn.snp.top).offset(-10)
+//        }
+//        self.whiteView.addSubview(self.zhengshuNoIconImgView)
+//        self.zhengshuNoIconImgView.snp.makeConstraints { make in
+//            make.centerX.equalToSuperview()
+//            make.bottom.equalTo(self.zhengshuNoDescTitleLabel.snp.top).offset(-10)
+//            make.width.equalTo(60)
+//            make.height.equalTo(45)
+//        }
+//
+//    }
+//    required init?(coder: NSCoder) {
+//        fatalError("init(coder:) has not been implemented")
+//    }
+//    
+//    @objc func zhengshuBtnAction(){
+//        //跳转 选择获奖情况页面
+//    
+//    }
+//        
+//}
@@ -8,9 +8,45 @@
 import Foundation
 import Kingfisher
 import SnapKit
+import JFHeroBrowser
+
+//cell高度变化
+typealias vitaePreviewWorkCellChangedBlockActionBlock = (_ cell: CNLiveDigitalResumePreviewFourCell ,_ cellHeight:CGFloat) -> Void
  
 class CNLiveDigitalResumePreviewFourCell: UITableViewCell {
  
+    //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 whiteView :UIView = {
         let whiteView = UIView(frame: CGRect(x: 15, y:15, width: KSreenWidth-30, height: DefaultPreViewCellHeight))
         whiteView.backgroundColor = .white
@@ -41,7 +77,105 @@ 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)
         closeBtn.setTitle("关联工作", for: .normal)
@@ -62,12 +196,86 @@ class CNLiveDigitalResumePreviewFourCell: UITableViewCell {
         self.selectionStyle = .none
  
         self.contentView.addSubview(self.whiteView)
+        self.whiteView.snp.makeConstraints { make in
+            make.top.equalTo(15)
+            make.bottom.equalToSuperview()
+            make.left.equalTo(15)
+            make.right.equalToSuperview().offset(-15)
+        }
+        
         self.whiteView.addSubview(self.myIdentityTitleLabel)
         self.myIdentityTitleLabel.snp.makeConstraints { make in
             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)
+        }
+        self.whiteView.addSubview(self.expandBtn)
+        
+        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()
@@ -94,9 +302,270 @@ class CNLiveDigitalResumePreviewFourCell: UITableViewCell {
         fatalError("init(coder:) has not been implemented")
     }
  
-    @objc func zhengshuBtnAction(){
-        //跳转 选择工作记录页面
+    func setupAwardNewUI(model: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.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
+        }
+        
+        if self.expandBtn.isSelected{
+            //展开状态
+            self.jianjieLabel.height = height*CGFloat(lines)
+
+        }else{
+            //收起状态
+            if lines <= 2{
+                //小于2行,按实际行数
+                self.jianjieLabel.height = CGFloat(lines)*height
+            }else{
+                //大于2行, 显示2行
+                self.jianjieLabel.height = 2*height
+            }
+        }
+        
+        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.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 = .center
+                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")
+    }
+    func setupNewUI(model:CNLiveVitaeWorksModel){
+        
+        self.zhengshuNoIconImgView.isHidden = true
+        self.zhengshuNoDescTitleLabel.isHidden = true
+        
+        self.whiteView.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 : "职位"
+        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!
+            }
+        }else{
+            if startDateString == nil || startDateString?.count == 0{
+                self.workTimeTitleLabel.text = ""
+            }else{
+                self.workTimeTitleLabel.text = startDateString!+"~"+endDateString!
+            }
+        }
+                
+        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
+        }
+        
+        if self.expandBtn.isSelected{
+            //展开状态
+            self.jianjieLabel.height = height*CGFloat(lines)
+
+        }else{
+            //收起状态
+            if lines <= 2{
+                //小于2行,按实际行数
+                self.jianjieLabel.height = CGFloat(lines)*height
+            }else{
+                //大于2行, 显示2行
+                self.jianjieLabel.height = 2*height
+            }
+        }
+        
+        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.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 = .center
+                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))
+                }
+            }
+        }
+                
+        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
+        }
+    }
+    
+    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
+
+        if button.isSelected{
+            //文本收起状态,点击展开
+            self.jianjieLabel.height = CGFloat(lines)*height
+        }else{
+            //文本展开状态,点击收起
+            self.jianjieLabel.height = 2*height
+        }
+        self.vitaePreviewWorkCellChangedBlock!(self, self.jianjieLabel.height)
+        
+        self.expandBtn.top = self.jianjieLabel.bottom
+
+    }
+    @objc func zhengshuBtnAction(){
+        if self.workMdl != nil{
+            //跳转 选择工作记录页面
+
+        }else if self.awardModel != nil{
+            //跳转 选择获奖情况页面
+
+        }else{
+            
+        }
+        
+    }
+    @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)
     }
  
 }
@@ -9,8 +9,24 @@ import Foundation
 import Kingfisher
 import SnapKit
  
+//cell高度变化
+typealias vitaePreviewSixCellChangedBlockActionBlock = (_ cell: CNLiveDigitalResumePreviewSixCell ,_ cellHeight:CGFloat) -> Void
+
 class CNLiveDigitalResumePreviewSixCell: UITableViewCell {
-    
+    var vitaePreviewSixCellChangedBlock:vitaePreviewSixCellChangedBlockActionBlock?
+
+    //_vitaeMdl
+    var _vitaeMdl : CNLiveVitaeModel?
+    var vitaeMdl : CNLiveVitaeModel? {
+        get{
+            _vitaeMdl
+        }
+        set{
+            _vitaeMdl = newValue!
+            setupNewUI(model: _vitaeMdl!)
+        }
+    }
+
     lazy var whiteView :UIView = {
         let whiteView = UIView(frame: CGRect(x: 15, y:15, width: KSreenWidth-30, height: DefaultPreViewCellHeight))
         whiteView.backgroundColor = .white
@@ -26,7 +42,46 @@ class CNLiveDigitalResumePreviewSixCell: UITableViewCell {
         titleLabel.font = BoldFont_16
         return titleLabel
     }()
+    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_jianjie")
+        return iconImgView
+    }()
+    ///工作内容描述
+    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 zhengshuNoDescTitleLabel: UILabel = {
         let titleLabel = UILabel()
         titleLabel.textColor = HexColor("#999999")
@@ -62,12 +117,38 @@ class CNLiveDigitalResumePreviewSixCell: UITableViewCell {
         self.selectionStyle = .none
  
         self.contentView.addSubview(self.whiteView)
+        self.whiteView.snp.makeConstraints { make in
+            make.top.equalTo(15)
+            make.bottom.equalToSuperview()
+            make.left.equalTo(15)
+            make.right.equalToSuperview().offset(-15)
+        }
+        
         self.whiteView.addSubview(self.myIdentityTitleLabel)
         self.myIdentityTitleLabel.snp.makeConstraints { make in
             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.jianjieLabel)
+        self.jianjieLabel.snp.makeConstraints { make in
+            make.top.equalTo(self.nameIconImgView.snp.top)
+            make.left.equalTo(self.nameIconImgView.snp.right).offset(10)
+            make.right.equalToSuperview().offset(-20)
+        }
+        self.whiteView.addSubview(self.expandBtn)
+        
+        let lines = jianjieLabel.getRealLabelTextLines()
+        if lines <= 2{
+            self.expandBtn.isHidden = true
+        }else{
+            self.expandBtn.isHidden = false
+        }
         self.whiteView.addSubview(self.zhengshuBtn)
         self.zhengshuBtn.snp.makeConstraints { make in
             make.centerX.equalToSuperview()
@@ -89,11 +170,62 @@ class CNLiveDigitalResumePreviewSixCell: UITableViewCell {
             make.height.equalTo(45)
         }
  
+        self.nameIconImgView.isHidden = true
+        self.jianjieLabel.isHidden = true
     }
     required init?(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
  
+    func setupNewUI(model:CNLiveVitaeModel){
+        self.zhengshuNoIconImgView.isHidden = true
+        self.zhengshuNoDescTitleLabel.isHidden = true
+        self.nameIconImgView.isHidden = false
+        self.jianjieLabel.isHidden = false
+        self.jianjieLabel.text = model.vitae?.selfIntroduction//"描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述"//
+        let lines = jianjieLabel.getRealLabelTextLines()
+        let height = jianjieLabel.qmui_lineHeight
+        if lines <= 2{
+            self.expandBtn.isHidden = true
+        }else{
+            self.expandBtn.isHidden = false
+        }
+        
+        if self.expandBtn.isSelected{
+            //展开状态
+            self.jianjieLabel.height = height*CGFloat(lines)
+
+        }else{
+            //收起状态
+            if lines <= 2{
+                //小于2行,按实际行数
+                self.jianjieLabel.height = CGFloat(lines)*height
+            }else{
+                //大于2行, 显示2行
+                self.jianjieLabel.height = 2*height
+            }
+        }
+    }
+    
+    
+    // MARK: - Action
+    @objc func expandBtnAction(button:UIButton){
+        button.isSelected = !button.isSelected
+        let lines = jianjieLabel.getRealLabelTextLines()
+        let height = jianjieLabel.qmui_lineHeight
+
+        if button.isSelected{
+            //文本收起状态,点击展开
+            self.jianjieLabel.height = CGFloat(lines)*height
+        }else{
+            //文本展开状态,点击收起
+            self.jianjieLabel.height = 2*height
+        }
+        self.vitaePreviewSixCellChangedBlock!(self, self.jianjieLabel.bottom)
+        
+        self.expandBtn.top = self.jianjieLabel.bottom
+
+    }
     @objc func zhengshuBtnAction(){
         //跳转 自我简介页面
  
@@ -8,9 +8,23 @@
 import Foundation
 import Kingfisher
 import SnapKit
+import JFHeroBrowser
+
+var CerHaveDataPreViewCellHeight:CGFloat = 227
  
 class CNLiveDigitalResumePreviewThreeCell: UITableViewCell {
  
+    var _threeCerDataArray : [CNLiveVitaeCertificateModel]?
+    var threeCerDataArray : [CNLiveVitaeCertificateModel]? {
+        get{
+            _threeCerDataArray
+        }
+        set{
+            _threeCerDataArray = newValue!
+            setupNewUI(modelsArr: _threeCerDataArray!)
+        }
+    }
+    
     lazy var whiteView :UIView = {
         let whiteView = UIView(frame: CGRect(x: 15, y:15, width: KSreenWidth-30, height: DefaultPreViewCellHeight))
         whiteView.backgroundColor = .white
@@ -62,6 +76,12 @@ class CNLiveDigitalResumePreviewThreeCell: UITableViewCell {
         self.selectionStyle = .none
  
         self.contentView.addSubview(self.whiteView)
+        self.whiteView.snp.makeConstraints { make in
+            make.top.equalTo(15)
+            make.bottom.equalToSuperview()
+            make.left.equalTo(15)
+            make.right.equalToSuperview().offset(-15)
+        }
         self.whiteView.addSubview(self.myIdentityTitleLabel)
         self.myIdentityTitleLabel.snp.makeConstraints { make in
             make.top.equalToSuperview().offset(adapt_length(length: 15))
@@ -94,6 +114,51 @@ class CNLiveDigitalResumePreviewThreeCell: UITableViewCell {
         fatalError("init(coder:) has not been implemented")
     }
  
+    func setupNewUI(modelsArr:[CNLiveVitaeCertificateModel]){
+        self.whiteView.subviews.forEach { view in
+            if view.tag >= 1000{
+                view.removeFromSuperview()
+            }
+        }
+        if modelsArr.count > 0{
+            //有 证书
+            //计算几行 ,1行3个
+            let totalHang:Int = modelsArr.count / 3
+            if totalHang == 0{
+                self.whiteView.height = CerHaveDataPreViewCellHeight
+            }else{
+                self.whiteView.height = CerHaveDataPreViewCellHeight+CGFloat(totalHang*115)
+            }
+            self.zhengshuNoIconImgView.isHidden = true
+            self.zhengshuNoDescTitleLabel.isHidden = true
+            
+            for i in 0..<modelsArr.count {
+                let imgW:Float = Float((KSreenWidth-80-30)/3.0)
+                let imgH:Float = 101*imgW/85.0
+                let imgGap:Float = 20
+                let imgLeftGap:Float = 20
+                let lie = i%3
+                let hang = i/3
+                let imgView = UIImageView(frame: CGRect(x: CGFloat(imgLeftGap+(imgGap+imgW)*Float(lie)), y: CGFloat((imgH+10)*Float(hang))+46, width: CGFloat(imgW), height: CGFloat(imgH)))
+                imgView.contentMode = .center
+                imgView.tag = 1000+i
+                let cerModel = modelsArr[i]//CNLiveVitaeCertificateModel
+                let imgUrl = cerModel.img
+                imgView.kf.setImage(with: URL(string: imgUrl))
+                imgView.clipsToBounds = true
+                imgView.layer.cornerRadius = 5
+                self.whiteView.addSubview(imgView)
+                
+            }
+             
+        }else{
+            //没有 证书
+            self.whiteView.height = DefaultPreViewCellHeight
+            self.zhengshuNoIconImgView.isHidden = false
+            self.zhengshuNoDescTitleLabel.isHidden = false
+        }
+    }
+    
     @objc func zhengshuBtnAction(){
         //跳转 选择证书页面
  
@@ -24,7 +24,7 @@ class CNLiveViateWorkModelLayout:NSObject{
         }
     }
  
-    init(model:CNLiveVitaeWorksModel,descH:Float){
+    init(model:CNLiveVitaeWorksModel,descH:Float,isPreview:Bool){
         super.init()
         self.workModel = model
         let imgArr = model.imgs.components(separatedBy: ",")
@@ -42,7 +42,7 @@ class CNLiveViateWorkModelLayout:NSObject{
         }else{
             hang = 0
         }
-        let imgWH:Float = Float((KSreenWidth-60-15)/3.0+10)
+        var imgWH:Float = Float((KSreenWidth-60-15)/3.0+10)
         var cityH:Float = 35
         let cityStr = model.city
         if cityStr.count == 0 || cityStr == "请选择"{
@@ -50,7 +50,12 @@ class CNLiveViateWorkModelLayout:NSObject{
         }else{
             cityH = 35
         }
-        _workModel?.cellH = Float(123)+descH+Float(hang*imgWH)+cityH+55
+        if isPreview == false{//工作记录详情页
+            _workModel?.cellH = Float(123)+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
+        }
     }
     func getCellHModel()->CNLiveVitaeWorksModel{
         return _workModel!
@@ -76,7 +81,7 @@ class CNLiveViateAwardModelLayout:NSObject{
         }
     }
  
-    init(model:CNLiveVitaeAwardsModel,descH:Float){
+    init(model:CNLiveVitaeAwardsModel,descH:Float,isPreview:Bool){
         super.init()
         self.awardModel = model
         let imgArr = model.imgs.components(separatedBy: ",")
@@ -94,8 +99,13 @@ class CNLiveViateAwardModelLayout:NSObject{
         }else{
             hang = 0
         }
-        let imgWH:Float = Float((KSreenWidth-60-15)/3.0+10)
-        _awardModel?.cellH = Float(123)+descH+Float(hang*imgWH)+55
+        var imgWH:Float = Float((KSreenWidth-60-15)/3.0+10)
+        if isPreview == false{//获奖详情页
+            _awardModel?.cellH = Float(123)+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
+        }
     }
     func getCellHModel()->CNLiveVitaeAwardsModel{
         return _awardModel!
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "mine_jianli_preview_award@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "mine_jianli_preview_award@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "mine_jianli_preview_jianjie@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "mine_jianli_preview_jianjie@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "mine_jianli_preview_work@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "mine_jianli_preview_work@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}