工作记录列表页面

“张旭”
1 parent 4243ac84
Showing 15 changed files with 740 additions and 21 deletions
Podfile
metaCode.xcodeproj/project.pbxproj
metaCode/Classes/Main/HomePage/Controller/DigitalAuth/工作相关页面/CNLiveVitaeWorkDetailController.swift
metaCode/Classes/Main/HomePage/View/DigitalAuthViews/DigitalResume/CNLiveDigitalResumeCell.swift
metaCode/Classes/Main/HomePage/View/DigitalAuthViews/Vitae/Work/CNLiveVitaeWorkCell.swift
metaCode/Classes/Main/HomePage/ViewModel/Vitae/CNLiveVitaeViewModel.swift
metaCode/Classes/Main/MinePage/View/CNLiveMineInfoAlertView.swift
metaCode/Classes/Main/Model/Vitae/CNLiveViateWorkModelLayout.swift
metaCode/Classes/Main/Model/Vitae/CNLiveVitaeModel.swift
metaCode/Supporting Files/Assets.xcassets/MinePage/jianli/mine_jianli_workBg.imageset/Contents.json
metaCode/Supporting Files/Assets.xcassets/MinePage/jianli/mine_jianli_workBg.imageset/mine_jianli_workBg@2x.png
metaCode/Supporting Files/Assets.xcassets/MinePage/jianli/mine_jianli_workBg.imageset/mine_jianli_workBg@3x.png
metaCode/Supporting Files/Assets.xcassets/MinePage/jianli/mine_jinali_workdingwei.imageset/Contents.json
metaCode/Supporting Files/Assets.xcassets/MinePage/jianli/mine_jinali_workdingwei.imageset/mine_jinali_workdingwei@2x.png
metaCode/Supporting Files/Assets.xcassets/MinePage/jianli/mine_jinali_workdingwei.imageset/mine_jinali_workdingwei@3x.png
@@ -65,7 +65,8 @@ target &#39;metaCode&#39; do
   #图片浏览器
   pod 'SKPhotoBrowser', :git => 'https://gitee.com/mirrors/SKPhotoBrowser.git'
-  
+  #图片视频混合浏览器
+  pod 'JFHeroBrowser'
   #视频播放器
   pod 'PLPlayerKit'
   #UI框架
@@ -142,6 +142,9 @@
 		1965FA402AFB38AA00F0F435 /* CNLiveAddGoodsSelectUploadImageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1965FA3F2AFB38AA00F0F435 /* CNLiveAddGoodsSelectUploadImageView.swift */; };
 		1965FA422AFB79EA00F0F435 /* CNLiveGoodsCategoryController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1965FA412AFB79EA00F0F435 /* CNLiveGoodsCategoryController.swift */; };
 		197325D22BB11C18002E41A3 /* DatabaseManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 197325D12BB11C18002E41A3 /* DatabaseManager.swift */; };
+		1975636E2C5A2EB2004E0F42 /* CNLiveVitaeWorkDetailController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1975636D2C5A2EB2004E0F42 /* CNLiveVitaeWorkDetailController.swift */; };
+		197563712C5A3151004E0F42 /* CNLiveVitaeWorkCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 197563702C5A3151004E0F42 /* CNLiveVitaeWorkCell.swift */; };
+		197563752C5B62FE004E0F42 /* CNLiveViateWorkModelLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 197563742C5B62FE004E0F42 /* CNLiveViateWorkModelLayout.swift */; };
 		19864E3F2BEF6A3300586E72 /* CNLiveDownSlideRealHotListCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19864E3E2BEF6A3300586E72 /* CNLiveDownSlideRealHotListCell.swift */; };
 		19864E412BF6090400586E72 /* CNLiveDuanJuDetailCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19864E402BF6090400586E72 /* CNLiveDuanJuDetailCell.swift */; };
 		19AB90642BB412C700B6A79B /* CNLiveDownslideOperationManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19AB90632BB412C700B6A79B /* CNLiveDownslideOperationManager.swift */; };
@@ -475,6 +478,9 @@
 		1965FA3F2AFB38AA00F0F435 /* CNLiveAddGoodsSelectUploadImageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveAddGoodsSelectUploadImageView.swift; sourceTree = "<group>"; };
 		1965FA412AFB79EA00F0F435 /* CNLiveGoodsCategoryController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveGoodsCategoryController.swift; sourceTree = "<group>"; };
 		197325D12BB11C18002E41A3 /* DatabaseManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DatabaseManager.swift; sourceTree = "<group>"; };
+		1975636D2C5A2EB2004E0F42 /* CNLiveVitaeWorkDetailController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveVitaeWorkDetailController.swift; sourceTree = "<group>"; };
+		197563702C5A3151004E0F42 /* CNLiveVitaeWorkCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveVitaeWorkCell.swift; sourceTree = "<group>"; };
+		197563742C5B62FE004E0F42 /* CNLiveViateWorkModelLayout.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveViateWorkModelLayout.swift; sourceTree = "<group>"; };
 		19864E3E2BEF6A3300586E72 /* CNLiveDownSlideRealHotListCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveDownSlideRealHotListCell.swift; sourceTree = "<group>"; };
 		19864E402BF6090400586E72 /* CNLiveDuanJuDetailCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveDuanJuDetailCell.swift; sourceTree = "<group>"; };
 		19AB90632BB412C700B6A79B /* CNLiveDownslideOperationManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveDownslideOperationManager.swift; sourceTree = "<group>"; };
@@ -814,6 +820,7 @@
 			isa = PBXGroup;
 			children = (
 				192ED4832C5742510057244C /* CNLiveVitaeAddWorkController.swift */,
+				1975636D2C5A2EB2004E0F42 /* CNLiveVitaeWorkDetailController.swift */,
 			);
 			path = "工作相关页面";
 			sourceTree = "<group>";
@@ -824,6 +831,7 @@
 				192ED4862C575EC90057244C /* CNLiveVitaeAddWorkFirCell.swift */,
 				192ED4892C5771930057244C /* CNLiveVitaeAddWorkSecCell.swift */,
 				192ED48B2C57719F0057244C /* CNLiveVitaeAddWorkThreeCell.swift */,
+				197563702C5A3151004E0F42 /* CNLiveVitaeWorkCell.swift */,
 			);
 			path = Work;
 			sourceTree = "<group>";
@@ -1282,6 +1290,7 @@
 				19DFE6452C41099900E428AE /* CNLiveVitaeModel.swift */,
 				192ED4622C4A642F0057244C /* CNLiveAddrAreaModel.swift */,
 				192ED4752C524EA10057244C /* CNLiveVitaeCertificateModel.swift */,
+				197563742C5B62FE004E0F42 /* CNLiveViateWorkModelLayout.swift */,
 			);
 			path = Vitae;
 			sourceTree = "<group>";
@@ -2139,6 +2148,7 @@
 				1938BD3D2B4BDD4B00390A34 /* CNLiveAlbumCell.swift in Sources */,
 				19E9D1622B3BBB2E00D0FB30 /* CNLiveFileManager.swift in Sources */,
 				79E496E82AB9674300127BF8 /* NSMutableAttributedString+CNLiveExtensions.swift in Sources */,
+				197563752C5B62FE004E0F42 /* CNLiveViateWorkModelLayout.swift in Sources */,
 				19DFE64B2C4516B000E428AE /* CNLiveDigitalResumeSecCell.swift in Sources */,
 				19DFE6462C41099900E428AE /* CNLiveVitaeModel.swift in Sources */,
 				19CC4D472ADD006600308E2A /* CNDownSlideSingleCourseCell.swift in Sources */,
@@ -2158,6 +2168,7 @@
 				192ED4802C5488AD0057244C /* CNLiveVitaeCerAddPhotoController.swift in Sources */,
 				1917334E2B2C1A08007BCC04 /* CNLiveSelectCouponTapView.swift in Sources */,
 				19C0F76F2BDB4CE10097CC8F /* CNBindingManageModel.swift in Sources */,
+				197563712C5A3151004E0F42 /* CNLiveVitaeWorkCell.swift in Sources */,
 				191733272B148BB1007BCC04 /* CNLivePlayerFastForwardPreviewView.swift in Sources */,
 				7CD675522A29C04B008354C1 /* CNLiveConfigstant.swift in Sources */,
 				79282A402A2F055100B5F8CF /* CNLiveConfigUserInfo.swift in Sources */,
@@ -2258,6 +2269,7 @@
 				7C4931312A2F142F000E44B4 /* CNHomePageBackgroupView.swift in Sources */,
 				19BB1FF22AF21A950094D962 /* CNLliveShopDetailBannerCell.swift in Sources */,
 				1938BD432B4E34B200390A34 /* CNHomepageDuanJuDetailViewController.swift in Sources */,
+				1975636E2C5A2EB2004E0F42 /* CNLiveVitaeWorkDetailController.swift in Sources */,
 				19DFE6432C41039600E428AE /* CNLiveVitaeViewModel.swift in Sources */,
 				790D018B2A2D8B3300C5978D /* CNLiveLoginViewController.swift in Sources */,
 				19C735D02C12F5F600CACF4E /* CNLiveRealNameCell.swift in Sources */,
+//
+//  CNLiveVitaeWorkDetailController.swift
+//  metaCode
+//
+//  Created by zx on 2024/7/31.
+//  工作记录页面(工作记录详情)
+
+import Foundation
+import SnapKit
+
+class CNLiveVitaeWorkDetailController:CNLiveBaseViewController,UITableViewDataSource, UITableViewDelegate{
+    var jianjieLblHeight:CGFloat = 40
+    var cellHeights:Array<CGFloat> = Array()
+
+    lazy var bgImgView :UIImageView = {
+        let iconImgView = UIImageView()
+        iconImgView.image = UIImage(named: "mine_jianli_workBg")
+        return iconImgView
+    }()
+    lazy var yuanmaLabel: UILabel = {
+        let titleLabel = UILabel()
+        titleLabel.textColor = HexColor("#333333")
+        titleLabel.text = "工作记录"
+        titleLabel.font = BoldFont_24
+        titleLabel.adjustsFontSizeToFitWidth=true
+        return titleLabel
+    }()
+
+    lazy var yuanmaDescLabel: UILabel = {
+        let titleLabel = UILabel()
+        titleLabel.textColor = HexColor("#333333")
+        titleLabel.text = "共 1 条"
+        titleLabel.font = Font_16
+        return titleLabel
+    }()
+    
+    let kCNLiveVitaeWorkCellIdentifier = "kCNLiveVitaeWorkCellIdentifier"
+
+    lazy var tableView : UITableView = {
+        let tableView = UITableView(frame: .zero, style: .plain)
+        tableView.dataSource = self
+        tableView.delegate = self
+        tableView.separatorStyle = .none
+        tableView.tableFooterView = UIView.init()
+        tableView.register(CNLiveVitaeWorkCell.self, forCellReuseIdentifier: kCNLiveVitaeWorkCellIdentifier)
+        tableView.backgroundColor = .clear
+        return tableView
+    }()
+    lazy var bottomZhiNanWhiteView :UIView = {
+        let bottomNavView = UIView()
+        bottomNavView.backgroundColor = .white
+        return bottomNavView
+    }()
+    lazy var addWorkBtn: UIButton = {
+        let  nextBtn = UIButton(type: .custom)
+        nextBtn.setTitle("添加工作记录", for: .normal)
+        nextBtn.setTitleColor(.white, for: .normal)
+        nextBtn.backgroundColor = HexColor("#1961FE")
+        nextBtn.layer.cornerRadius = 20
+        nextBtn.clipsToBounds = true
+        nextBtn.addTarget(self, action: #selector(addWorkBtnAction), for: .touchUpInside)
+        return nextBtn
+    }()
+    lazy var workListArr :Array<CNLiveVitaeWorksModel> = {
+        let dataArray = Array<CNLiveVitaeWorksModel>()
+        return dataArray
+    }()
+    
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
+        self.getWorkList()
+    }
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        titleName = "工作记录"
+        navigationBarHidden = false
+        self.initUI()
+    }
+    
+    deinit {}
+    func initUI(){
+        self.view.backgroundColor = HexColor("#F9F9F9")
+        
+        self.view.addSubview(self.bgImgView)
+        self.bgImgView.snp.makeConstraints { make in
+            make.top.equalTo(KNavigationHeight)
+            make.left.right.equalToSuperview()
+            make.height.equalTo(KSreenWidth*457/375)
+        }
+        self.bgImgView.addSubview(self.yuanmaLabel)
+        self.yuanmaLabel.snp.makeConstraints { make in
+            make.top.equalTo(59)
+            make.left.equalTo(adapt_length(length: 30))
+        }
+        self.bgImgView.addSubview(self.yuanmaDescLabel)
+        self.yuanmaDescLabel.snp.makeConstraints { make in
+            make.top.equalTo(self.yuanmaLabel.snp.bottom).offset(adapt_length(length: 5))
+            make.left.equalTo(adapt_length(length: 30))
+        }
+        
+        self.view.addSubview(self.tableView)
+        self.tableView.snp.makeConstraints { make in
+            make.top.equalTo(150+KNavigationHeight)
+            make.left.right.equalToSuperview()
+            make.bottom.equalToSuperview().offset(-60)
+        }
+        
+        self.view.addSubview(self.bottomZhiNanWhiteView)
+        self.bottomZhiNanWhiteView.snp.makeConstraints { make in
+            make.top.equalTo(self.tableView.snp.bottom)
+            make.bottom.left.right.equalToSuperview()
+        }
+        
+        self.bottomZhiNanWhiteView.addSubview(self.addWorkBtn)
+        self.addWorkBtn.snp.makeConstraints { make in
+            make.left.equalTo(15)
+            make.right.equalToSuperview().offset(-15)
+            make.top.equalTo(10)
+            make.height.equalTo(40)
+        }
+
+    }
+    
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        return self.workListArr.count
+    }
+    
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveVitaeWorkCellIdentifier) as? CNLiveVitaeWorkCell
+        else {
+            let cell = CNLiveVitaeWorkCell()
+            return cell
+        }
+        let model = workListArr[indexPath.row]
+        cell.workModel = model
+        cell.vitaeWorkCellChangedBlock = { workCell,jianjieHeight in
+            let res = self.workListArr
+            var tempArr = Array<CNLiveVitaeWorksModel>()
+            let idxPath = tableView.indexPath(for: workCell)
+            for (idx,mdl) in res.enumerated() {
+                if idx == idxPath?.row{
+                    let layout = CNLiveViateWorkModelLayout(model: mdl,descH: Float(jianjieHeight))
+                    let newWorkModel = layout.getCellHModel()
+                    tempArr.append(newWorkModel)
+                }else{
+                    tempArr.append(mdl)
+                }
+            }
+            self.workListArr = Array(tempArr)
+            self.tableView.reloadData()
+        }
+
+        return cell
+    }
+    
+    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+        
+    }
+    
+    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        let model = self.workListArr[indexPath.row] 
+        return CGFloat(model.cellH)
+    }
+    
+    @objc func addWorkBtnAction(){
+        self.navigationController?.pushViewController(CNLiveVitaeAddWorkController(), animated: true)
+    }
+    
+    func getWorkList(){
+        let vsid = UserInfoManager.shared.userInfo.currentUser?.vsid ?? ""
+        CNLiveVitaeViewModel.getWorkList(vsid: vsid){ result, respStatus in
+            if respStatus == .success{
+                if let res = result as? [CNLiveVitaeWorksModel]{
+                    self.workListArr = Array()
+                    for mdl in res {
+                        let layout = CNLiveViateWorkModelLayout(model: mdl,descH: 40.0)
+                        let newWorkModel = layout.getCellHModel()
+                        self.workListArr.append(newWorkModel)
+                    }
+                    self.tableView.reloadData()
+                    self.yuanmaDescLabel.text = "共 \(res.count) 条"
+                }
+            }else{
+                showMessage(message: "数据异常")
+            }
+            
+        }
+    }
+}
@@ -543,12 +543,14 @@ class CNLiveDigitalResumeCell: UITableViewCell {
     }
     @objc func gongzuoDetailTitleLabelAciton(){
         //工作记录
-        
-        //有工作->工作记录页面
-        
-        //无工作->新增工作记录页面
-        navigationViewController().pushViewController(CNLiveVitaeAddWorkController(), animated: true)
-
+        let works = self.vitaeModel?.works
+        if works?.count ?? 0 > 0{
+            //有工作->工作记录页面
+            navigationViewController().pushViewController(CNLiveVitaeWorkDetailController(), animated: true)
+        }else{
+            //无工作->新增工作记录页面
+            navigationViewController().pushViewController(CNLiveVitaeAddWorkController(), animated: true)
+        }
     }
     @objc func huojiangDetailTitleLabelAciton(){
+//
+//  CNLiveVitaeWorkCell.swift
+//  metaCode
+//
+//  Created by zx on 2024/7/31.
+//  简历-工作记录详情cell
+
+import Foundation
+import QMUIKit
+import SwiftUI
+import SnapKit
+import Kingfisher
+import SKPhotoBrowser
+
+
+//cell高度变化
+typealias vitaeWorkCellChangedBlockActionBlock = (_ cell: CNLiveVitaeWorkCell ,_ cellHeight:CGFloat) -> Void
+
+class CNLiveVitaeWorkCell: UITableViewCell{
+    var images = [SKPhoto]()
+    var vitaeWorkCellChangedBlock:vitaeWorkCellChangedBlockActionBlock?
+    
+    //简历workModel
+    var _workModel : CNLiveVitaeWorksModel?
+    var workModel : CNLiveVitaeWorksModel? {
+        get{
+            _workModel
+        }
+        set{
+            _workModel = newValue!
+            setupNewUI(model: _workModel!)
+        }
+    }
+    
+    lazy var whiteBgView :UIView = {
+        let whiteBgView = UIView()
+        whiteBgView.backgroundColor = .white
+        whiteBgView.layer.cornerRadius = 12
+        whiteBgView.clipsToBounds = true
+        return whiteBgView
+    }()
+    lazy var workTitleLabel: UILabel = {
+        let titleLabel = UILabel()
+        titleLabel.textColor = HexColor("#333333")
+        titleLabel.textAlignment = .left
+        titleLabel.text = "职业"
+        titleLabel.font = BoldFont_16
+        return titleLabel
+    }()
+    lazy var line1View :UIView = {
+        let whiteBgView = UIView()
+        whiteBgView.backgroundColor = HexColor("#EBEBEB")
+        return whiteBgView
+    }()
+    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 jianjieLabel: UILabel = {
+        let titleLabel = UILabel.init(frame: CGRectMake(15, 113, 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 line2View :UIView = {
+        let whiteBgView = UIView()
+        whiteBgView.backgroundColor = HexColor("#EBEBEB")
+        return whiteBgView
+    }()
+    lazy var realImgView :UIImageView = {
+        let iconImgView = UIImageView()
+        iconImgView.image = UIImage(named: "mine_jianli_zhenshi")
+        return iconImgView
+    }()
+    lazy var deleteBtn: UIButton = {
+        let  closeBtn = UIButton(type: .custom)
+        closeBtn.setTitle("删除", for: .normal)
+        closeBtn.setTitleColor(HexColor("#999999"), for: .normal)
+        closeBtn.titleLabel?.font = Font_13
+        closeBtn.layer.cornerRadius = 12
+        closeBtn.clipsToBounds = true
+        closeBtn.layer.borderColor = HexColor("#999999")?.cgColor
+        closeBtn.layer.borderWidth = 0.5
+        closeBtn.addTarget(self, action: #selector(deleteBtnAction), for: .touchUpInside)
+        return closeBtn
+    }()
+    lazy var editBtn: UIButton = {
+        let  closeBtn = UIButton(type: .custom)
+        closeBtn.setTitle("编辑", for: .normal)
+        closeBtn.setTitleColor(HexColor("#1961FE"), for: .normal)
+        closeBtn.titleLabel?.font = Font_13
+        closeBtn.layer.cornerRadius = 12
+        closeBtn.clipsToBounds = true
+        closeBtn.layer.borderColor = HexColor("#1961FE")?.cgColor
+        closeBtn.layer.borderWidth = 0.5
+        closeBtn.addTarget(self, action: #selector(editBtnAction), for: .touchUpInside)
+        return closeBtn
+    }()
+
+        
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+        self.selectionStyle = .none
+        self.backgroundColor = .clear
+        self.contentView.backgroundColor = .clear
+        
+        self.contentView.addSubview(self.whiteBgView)
+        self.whiteBgView.snp.makeConstraints { make in
+            make.top.equalTo(15)
+            make.bottom.equalToSuperview()
+            make.left.equalTo(15)
+            make.right.equalToSuperview().offset(-15)
+        }
+        self.whiteBgView.addSubview(self.workTitleLabel)
+        self.workTitleLabel.snp.makeConstraints { make in
+            make.top.equalTo(15)
+            make.left.equalTo(15)
+        }
+        self.whiteBgView.addSubview(self.line1View)
+        self.line1View.snp.makeConstraints { make in
+            make.height.equalTo(0.5)
+            make.left.equalTo(15)
+            make.right.equalToSuperview().offset(-15)
+            make.top.equalTo(self.workTitleLabel.snp.bottom).offset(15)
+        }
+        self.whiteBgView.addSubview(self.workNameTitleLabel)
+        self.workNameTitleLabel.snp.makeConstraints { make in
+            make.top.equalTo(self.line1View.snp.bottom).offset(15)
+            make.left.equalTo(15)
+            make.right.equalToSuperview().offset(-15)
+        }
+        self.whiteBgView.addSubview(self.workPositionTitleLabel)
+        self.workPositionTitleLabel.snp.makeConstraints { make in
+            make.top.equalTo(self.workNameTitleLabel.snp.bottom).offset(5)
+            make.left.equalTo(15)
+            make.right.equalToSuperview().offset(-15)
+        }
+        
+        self.whiteBgView.addSubview(self.jianjieLabel)
+        self.whiteBgView.addSubview(self.expandBtn)
+        
+        let lines = jianjieLabel.getRealLabelTextLines()
+        if lines <= 2{
+            self.expandBtn.isHidden = true
+        }else{
+            self.expandBtn.isHidden = false
+        }
+        
+        self.whiteBgView.addSubview(self.dingweiImgView)
+        self.dingweiImgView.snp.makeConstraints { make in
+            make.left.equalTo(15)
+            make.bottom.equalToSuperview().offset(-72)
+            make.width.equalTo(10)
+            make.height.equalTo(10)
+        }
+        self.whiteBgView.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.whiteBgView.addSubview(self.line2View)
+        self.line2View.snp.makeConstraints { make in
+            make.height.equalTo(0.5)
+            make.left.equalTo(15)
+            make.right.equalToSuperview().offset(-15)
+            make.top.equalTo(self.workDingWeiTitleLabel.snp.bottom).offset(15)
+        }
+        self.whiteBgView.addSubview(self.realImgView)
+        self.realImgView.snp.makeConstraints { make in
+            make.left.equalTo(20)
+            make.bottom.equalToSuperview().offset(-20)
+            make.width.equalTo(80)
+            make.height.equalTo(80.0*78/403)
+        }
+        self.whiteBgView.addSubview(self.editBtn)
+        self.editBtn.snp.makeConstraints { make in
+            make.right.equalToSuperview().offset(-15)
+            make.bottom.equalToSuperview().offset(-15)
+            make.width.equalTo(70)
+            make.height.equalTo(24)
+        }
+        self.whiteBgView.addSubview(self.deleteBtn)
+        self.deleteBtn.snp.makeConstraints { make in
+            make.right.equalTo(self.editBtn.snp.left).offset(-10)
+            make.bottom.equalToSuperview().offset(-15)
+            make.width.equalTo(70)
+            make.height.equalTo(24)
+        }
+        
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    func setupNewUI(model:CNLiveVitaeWorksModel){
+        self.whiteBgView.subviews.forEach { view in
+            if view.tag >= 1000{
+                view.removeFromSuperview()
+            }
+        }
+        self.workTitleLabel.text = model.profession
+
+        let startDateString = convertTimestampStringToDateString(timestampString: model.startWorkingDate)
+        let endDateString = convertTimestampStringToDateString(timestampString: model.endWorkingDate)
+        if endDateString == nil || endDateString?.count == 0{
+            self.workNameTitleLabel.text = model.position+" | "+(startDateString ?? "")
+        }else{
+            self.workNameTitleLabel.text = model.position+" | "+(startDateString ?? "")+" - "+endDateString!
+        }
+        self.workPositionTitleLabel.text = model.companyName
+        
+        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 imgWH:Float = Float((KSreenWidth-60-15)/3.0)
+                let imgGap:Float = 7.5
+                let imgLeftGap:Float = 15
+                let lie = i%3
+                let hang = i/3
+                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.kf.setImage(with: URL(string: imgUrl))
+                imgView.clipsToBounds = true
+                imgView.layer.cornerRadius = 5
+                self.whiteBgView.addSubview(imgView)
+                
+                let photo = SKPhoto.photoWithImageURL(imgUrl)
+                photo.shouldCachePhotoURLImage = false
+                photo.photoURL = imgUrl
+                self.images.append(photo)
+            }
+        }
+                
+        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.vitaeWorkCellChangedBlock!(self, self.jianjieLabel.height)
+        
+        self.expandBtn.top = self.jianjieLabel.bottom
+
+    }
+    @objc func editBtnAction(){
+        
+    }
+    @objc func deleteBtnAction(){
+        
+    }
+    
+    @objc func imgViewTapAciton(ges: UITapGestureRecognizer){
+        let imgView = ges.view as! UIImageView
+        let index = imgView.tag-1000
+        
+        let browser = SKPhotoBrowser(photos: self.images)
+        browser.initializePageIndex(index)
+        currentViewController()?.present(browser, animated: true)
+    }
+
+}
+
@@ -42,7 +42,7 @@ class CNLiveVitaeViewModel:NSObject{
                 resultBlock(NSNull(),.failed)
             }
         }
-
+        
     }
     /*
      保存简历/更新简历
@@ -107,7 +107,7 @@ class CNLiveVitaeViewModel:NSObject{
             showMessage(message: "上传失败")
             resultBlock(NSNull(),.failed)
         }
-
+        
     }
     /// 获取省市区县列表
@@ -123,7 +123,7 @@ class CNLiveVitaeViewModel:NSObject{
         custom_param.setValue(CNLiveMCEnvironmentManager.shared.appId_wjj, forKey: "appId")
         custom_param.setValue(CNLiveMCEnvironmentManager.shared.appKey_wjj, forKey: "appKey")
         CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
-
+        
         CNLiveNetworking.requestNetwork(with: .POST, urlString: "https://managemall.cnlive.com"+"/Api/Index3/getCityList", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
             hiddenLoading()
             if (error == nil) {
@@ -146,7 +146,7 @@ class CNLiveVitaeViewModel:NSObject{
         values.addEntries(from: ["lv":lv])
         values.addEntries(from: ["number":number])
         values.addEntries(from: ["organization":organization])
-//        values.addEntries(from: ["status":status])
+        //        values.addEntries(from: ["status":status])
         values.addEntries(from: ["time":time])
         values.addEntries(from: ["title":title])
         values.addEntries(from: ["uploadTime":uploadTime])
@@ -191,9 +191,9 @@ class CNLiveVitaeViewModel:NSObject{
             showMessage(message: "上传失败")
             resultBlock(NSNull(),.failed)
         }
-
+        
     }
-
+    
     /*
      获取证书列表
@@ -229,7 +229,7 @@ class CNLiveVitaeViewModel:NSObject{
                 resultBlock(NSNull(),.failed)
             }
         }
-
+        
     }
     /*
@@ -287,9 +287,49 @@ class CNLiveVitaeViewModel:NSObject{
             showMessage(message: "上传失败")
             resultBlock(NSNull(),.failed)
         }
-
+        
     }
+    
+    /*
+     获取工作记录列表
+     参数 vsid 实名对象id
+     参数 type 1简历信息 2官方认证 3证书 4工作经历 4获奖情况
+     */
+    static func getWorkList(vsid:String,resultBlock: @escaping downSlideResultBlock) {
+        let param = NSMutableDictionary()
+        param.setValue(vsid, forKey: "vsid")
+        param.setValue("4", forKey: "type")
+        CNLiveNetworking.setAllowRequestDefaultArgument(true)
+        CNLiveNetworking.setupShowDataResult(false)
+        CNLiveNetworking.setupDSRequest(true)
+        let custom_param = NSMutableDictionary()
+        custom_param.setValue(CNLiveMCEnvironmentManager.shared.appId, forKey: "appId")
+        custom_param.setValue(CNLiveMCEnvironmentManager.shared.appKey, forKey: "appKey")
+        CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
+        
+        CNLiveNetworking.requestNetwork(with: .GET, urlString: APPBaseMCUrl+"/userApi/getVitae", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
+            hiddenLoading()
+            if (error == nil) {
+                let resp = result as! NSDictionary
+                if resp["errorCode"] as! Int == 0{
+                    let dataArr = resp["data"] as! Array<[String : Any]>
+                    var worksArr = Array<CNLiveVitaeWorksModel>()
+                    for (_,dic) in dataArr.enumerated() {
+                        let model =  newDictionaryToModel(dic, CNLiveVitaeWorksModel.self) as! CNLiveVitaeWorksModel
+                        worksArr.append(model)
+                    }
+                    resultBlock(worksArr,.success)
+                }else{
+                    resultBlock(NSNull(),.failed)
+                }
+            }else{
+                resultBlock(NSNull(),.failed)
+            }
+        }
+
+    }
+    
 }
@@ -112,7 +112,7 @@ class MineInfoAlertView: UIView {
         }
         if UserInfoManager.shared.userInfo.birthday.count > 0 && self.type == .birthday{
             let dateFomatter = DateFormatter()
-            dateFomatter.dateFormat = "yyyy-MM-dd"
+            dateFomatter.dateFormat = "yyyy.MM.dd"
             dateFomatter.locale = Locale.init(identifier: "zh_CN")
             let date = dateFomatter.date(from: UserInfoManager.shared.userInfo.birthday)
             datePicker.setDate(date!, animated: true)
@@ -313,7 +313,7 @@ class MineInfoAlertView: UIView {
     @objc func dateChangeAction(sender: UIDatePicker) {
         let formatter = DateFormatter()
-        formatter.dateFormat = "yyyy-MM-dd"
+        formatter.dateFormat = "yyyy.MM.dd"
         if self.type == .birthday{
             birthday = formatter.string(from: datePicker.date)
         }
@@ -336,7 +336,7 @@ class MineInfoAlertView: UIView {
             value = selectDay ?? ""
             if value.count == 0{
                 let formatter = DateFormatter()
-                formatter.dateFormat = "yyyy-MM-dd"
+                formatter.dateFormat = "yyyy.MM.dd"
                 let date = formatter.string(from: datePicker.date)
                 print("获取到的时间是:\(date)")
                 result!(date)
@@ -632,7 +632,7 @@ class MineStandListAlertView: UIView, UIPickerViewDelegate, UIPickerViewDataSour
         }
         if UserInfoManager.shared.userInfo.birthday.count > 0 {
             let dateFomatter = DateFormatter()
-            dateFomatter.dateFormat = "yyyy-MM-dd"
+            dateFomatter.dateFormat = "yyyy.MM.dd"
             dateFomatter.locale = Locale.init(identifier: "zh_CN")
             let date = dateFomatter.date(from: UserInfoManager.shared.userInfo.birthday)
             datePicker.setDate(date!, animated: true)
@@ -706,7 +706,7 @@ class MineStandListAlertView: UIView, UIPickerViewDelegate, UIPickerViewDataSour
             text = formatter.string(from: datePicker.date)
         }else{
             let formatter = DateFormatter()
-            formatter.dateFormat = "yyyy-MM-dd"
+            formatter.dateFormat = "yyyy.MM.dd"
             text = formatter.string(from: datePicker.date)
         }
@@ -866,7 +866,7 @@ class MineStandListAlertView: UIView, UIPickerViewDelegate, UIPickerViewDataSour
     @objc func dateChangeAction(sender: UIDatePicker) {
         let formatter = DateFormatter()
-        formatter.dateFormat = "yyyy-MM-dd"
+        formatter.dateFormat = "yyyy.MM.dd"
         let date = formatter.string(from: datePicker.date)
         print("获取到的时间是:\(date)")
         text = date
+//
+//  CNLiveViateWorkModelLayout.swift
+//  metaCode
+//
+//  Created by zx on 2024/8/1.
+//
+
+import Foundation
+
+
+class CNLiveViateWorkModelLayout:NSObject{
+    
+    ///cell高度
+    var cellH:CGFloat = 0.0
+//    var descH:Float = 40.0
+    
+    var _workModel : CNLiveVitaeWorksModel?
+    var workModel : CNLiveVitaeWorksModel? {
+        get{
+            _workModel
+        }
+        set{
+            _workModel = newValue
+        }
+    }
+    
+    init(model:CNLiveVitaeWorksModel,descH:Float){
+        super.init()
+        self.workModel = model
+        let imgArr = model.imgs.components(separatedBy: ",")
+        var hang:Float = 1
+        if imgArr.count > 0{
+            if imgArr.count <= 3{
+                hang = 1
+            }else if imgArr.count <= 6{
+                hang = 2
+            }else if imgArr.count <= 9{
+                hang = 3
+            }else{
+                hang = 4
+            }
+        }else{
+            hang = 0
+        }
+        let imgWH:Float = Float((KSreenWidth-60-15)/3.0+10)
+        _workModel?.cellH = Float(123)+descH+Float(hang*imgWH)+90
+    }
+    func getCellHModel()->CNLiveVitaeWorksModel{
+        return _workModel!
+    }
+    
+}
@@ -104,6 +104,9 @@ class CNLiveVitaeWorksModel:BaseModel{
     ///
     var imgs:String = ""
+    ///cell高度
+    var cellH: Float = 0
+    
 }
 //简历证书模块
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "mine_jianli_workBg@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "mine_jianli_workBg@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "mine_jinali_workdingwei@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "mine_jinali_workdingwei@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}