工作记录列表页-编辑几次-职业和岗位为空了(编辑-删除图片保存行业和岗位都"") fir he threecell 都是nil

“张旭”
1 parent 1eb764bb
Showing 10 changed files with 324 additions and 81 deletions
metaCode.xcodeproj/project.pbxproj
metaCode/Classes/Main/HomePage/Controller/DigitalAuth/工作相关页面/CNLiveVitaeAddWorkController.swift
metaCode/Classes/Main/HomePage/Controller/DigitalAuth/工作相关页面/CNLiveVitaeWorkDetailController.swift
metaCode/Classes/Main/HomePage/Controller/DigitalAuth/数字简历相关页面/CNLiveDigitalResumePreViewController.swift
metaCode/Classes/Main/HomePage/View/DigitalAuthViews/Vitae/Work/CNLiveVitaeAddWorkFirCell.swift
metaCode/Classes/Main/HomePage/View/DigitalAuthViews/Vitae/Work/CNLiveVitaeAddWorkThreeCell.swift
metaCode/Classes/Main/HomePage/View/DigitalAuthViews/Vitae/Work/CNLiveVitaeWorkCell.swift
metaCode/Classes/Main/HomePage/View/DigitalAuthViews/我的简历cell/CNLiveDigitalResumePreviewFourWorkAwardCell.swift
metaCode/Classes/Main/Model/Vitae/CNLiveViateWorkModelLayout.swift
metaCode/Classes/Main/Model/Vitae/CNLiveVitaeModel.swift
@@ -2632,7 +2632,7 @@
 				CODE_SIGN_ENTITLEMENTS = metaCode/metaCode.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.1.2.24.08.26.13;
+				CURRENT_PROJECT_VERSION = 1.1.2.24.08.28.17;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = 94X49GG3ZW;
 				ENABLE_BITCODE = NO;
@@ -2888,7 +2888,7 @@
 				CODE_SIGN_ENTITLEMENTS = metaCode/metaCode.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.1.2.24.08.26.13;
+				CURRENT_PROJECT_VERSION = 1.1.2.24.08.28.17;
 				DEVELOPMENT_TEAM = 94X49GG3ZW;
 				ENABLE_BITCODE = NO;
 				ENABLE_MODULE_VERIFIER = NO;
@@ -21,7 +21,24 @@ class CNLiveVitaeAddWorkController:CNLiveBaseViewController,UITableViewDataSourc
     var workAwardType:CNLiveViateWorkAwardType = .work
     var hangHeight:CGFloat = (KSreenWidth-90)/3.0+10
+    
+    var firZhiyeStr = ""
+    var firGangweiStr = ""
+    var firStartStr = ""
+    var firEndStr = ""
+    
+    var firAwardName = ""
+    var firAwardStart = ""
+    var firAwardCompany = ""
+    
+    var threeCompanyStr = ""
+    var threeWorkDiDianStr = ""
+
+    var firCell:CNLiveVitaeAddWorkFirCell?
+    var threeCell:CNLiveVitaeAddWorkThreeCell?
     var secCell:CNLiveVitaeAddWorkSecCell?
+    
+    
     var seleArr:Array<String>?
     var seleVideoUrl:String = ""
@@ -157,11 +174,42 @@ class CNLiveVitaeAddWorkController:CNLiveBaseViewController,UITableViewDataSourc
             }
             if self.workAwardType == .work{
                 cell.workAwardType = .work
+                cell.updateAddWorkFirCellBlock = {firCell,zhiyeStr,gangwei,start,end in
+                    if zhiyeStr.count > 0{
+                        self.firZhiyeStr = zhiyeStr
+                    }
+                    if gangwei.count > 0{
+                        self.firGangweiStr = gangwei
+                    }
+                    if start.count > 0{
+                        self.firStartStr = start
+                    }
+                    if end.count > 0{
+                        self.firEndStr = end
+                    }
+                    if firCell != nil{
+                        self.firCell = firCell
+                    }
+                }
                 if self.workModel != nil{
                     cell.workModel = self.workModel!
                 }
             }else{
                 cell.workAwardType = .award
+                cell.updateAddAwardFirCellBlock = {firCell,awardName,start,company in
+                    if awardName.count > 0{
+                        self.firAwardName = awardName
+                    }
+                    if start.count > 0{
+                        self.firAwardStart = start
+                    }
+                    if company.count > 0{
+                        self.firAwardCompany = company
+                    }
+                    if firCell != nil{
+                        self.firCell = firCell
+                    }
+                }
                 if self.awardModel != nil{
                     cell.awardModel = self.awardModel!
                 }
@@ -213,6 +261,17 @@ class CNLiveVitaeAddWorkController:CNLiveBaseViewController,UITableViewDataSourc
                 let cell = CNLiveVitaeAddWorkThreeCell()
                 return cell
             }
+            cell.updateAddWorkThreeCellBlock = {threeCell,company,workDiDian in
+                if company.count > 0{
+                    self.threeCompanyStr = company
+                }
+                if workDiDian.count > 0{
+                    self.threeWorkDiDianStr = workDiDian
+                }
+                if threeCell != nil{
+                    self.threeCell = threeCell
+                }
+            }
             if self.workModel != nil{
                 cell.workModel = self.workModel!
             }
@@ -283,21 +342,26 @@ class CNLiveVitaeAddWorkController:CNLiveBaseViewController,UITableViewDataSourc
             let threeCell = self.tableView.cellForRow(at: IndexPath(row: 2, section: 0)) as? CNLiveVitaeAddWorkThreeCell
             //判断非空
-            if firCell?.weizhiRightTitleLabel.text?.count == 0 || firCell?.weizhiRightTitleLabel.text == "请选择"{
-                showMessage(message: "请选择职业")
-                return
-            }
-            if firCell?.phoneTextFiled.text?.count == 0 || firCell?.phoneTextFiled.text == "请填写"{
-                showMessage(message: "请填写岗位名称")
-                return
-            }
-            if firCell?.canjiaRightTitleLabel.text?.count == 0 || firCell?.canjiaRightTitleLabel.text == "请选择"{
-                showMessage(message: "请选择开始时间")
-                return
-            }
-            if firCell?.endTimeRightTitleLabel.text?.count == 0 || firCell?.endTimeRightTitleLabel.text == "请选择"{
-                showMessage(message: "请选择结束时间")
-                return
+            if firCell != nil{
+                if firCell?.weizhiRightTitleLabel.text?.count == 0 || firCell?.weizhiRightTitleLabel.text == "请选择"{
+                    showMessage(message: "请选择职业")
+                    return
+                }
+                if firCell?.phoneTextFiled.text?.count == 0 || firCell?.phoneTextFiled.text == "请填写"{
+                    showMessage(message: "请填写岗位名称")
+                    return
+                }
+                if firCell?.canjiaRightTitleLabel.text?.count == 0 || firCell?.canjiaRightTitleLabel.text == "请选择"{
+                    showMessage(message: "请选择开始时间")
+                    return
+                }
+                if firCell?.endTimeRightTitleLabel.text?.count == 0 || firCell?.endTimeRightTitleLabel.text == "请选择"{
+                    showMessage(message: "请选择结束时间")
+                    return
+                }
+            }else{
+                //fircell nil
+                
             }
             if secCell?.huoJiangtextView.text?.count == 0 || secCell?.huoJiangtextView.text == "描述"{
                 showMessage(message: "请填写经历描述")
@@ -325,22 +389,66 @@ class CNLiveVitaeAddWorkController:CNLiveBaseViewController,UITableViewDataSourc
                 }
             }
-            var danWei = ""
-            if threeCell?.phoneTextFiled.text?.count ?? 0 <= 0{
-                
-            }else if threeCell?.phoneTextFiled.text == "请填写"{
-                
+            var company = ""
+            if threeCell != nil{
+                if threeCell?.phoneTextFiled.text?.count ?? 0 <= 0{
+                    
+                }else if threeCell?.phoneTextFiled.text == "请填写"{
+                    
+                }else{
+                    company = threeCell?.phoneTextFiled.text ?? ""
+                }
             }else{
-                danWei = threeCell?.phoneTextFiled.text ?? ""
+                company = self.threeCompanyStr
             }
+
             var workDiDian = ""
-            if threeCell?.weizhiRightTitleLabel.text?.count ?? 0 <= 0{
-                
-            }else if threeCell?.weizhiRightTitleLabel.text == "请选择"{
-                
+            if threeCell != nil{
+                if threeCell?.weizhiRightTitleLabel.text?.count ?? 0 <= 0{
+                    
+                }else if threeCell?.weizhiRightTitleLabel.text == "请选择"{
+                    
+                }else{
+                    workDiDian = threeCell?.weizhiRightTitleLabel.text ?? ""
+                }
+            }else{
+                workDiDian = self.threeWorkDiDianStr
+            }
+            
+            var gangWei = ""
+            if firCell != nil{
+                if firCell?.phoneTextFiled.text?.count ?? 0 <= 0{
+                    
+                }else if firCell?.phoneTextFiled.text == "请填写"{
+                    
+                }else{
+                    gangWei = firCell?.phoneTextFiled.text ?? ""
+                }
+            }else{
+                gangWei = self.firGangweiStr
+            }
+            if gangWei == "" || gangWei.count == 0{
+                showMessage(message: "请填写岗位")
+                return
+            }
+            
+            var zhiye = ""
+            if firCell != nil{
+                if firCell?.weizhiRightTitleLabel.text?.count ?? 0 <= 0{
+                    
+                }else if firCell?.weizhiRightTitleLabel.text == "请选择"{
+                    
+                }else{
+                    zhiye = firCell?.weizhiRightTitleLabel.text ?? ""
+                }
             }else{
-                workDiDian = threeCell?.weizhiRightTitleLabel.text ?? ""
+                zhiye = self.firZhiyeStr
             }
+            if zhiye == "" || zhiye.count == 0{
+                showMessage(message: "请选择职业")
+                return
+            }
+            
             var desc = ""
             if secCell?.huoJiangtextView.text?.count ?? 0 <= 0{
@@ -360,7 +468,7 @@ class CNLiveVitaeAddWorkController:CNLiveBaseViewController,UITableViewDataSourc
                     id = self.workModel!.id
                 }
-                CNLiveVitaeViewModel.saveWork(city: workDiDian, companyName: danWei, imgs: newString, jobDuties: desc, startWorkingDate:startTime ?? "" , endWorkingDate: endTime ?? "" , position: firCell?.phoneTextFiled.text ?? "", profession: firCell?.weizhiRightTitleLabel.text ?? "", vsid: vsid ?? "", vitaeId: jianli_vitaeId ?? "", id: id) { result, status in
+                CNLiveVitaeViewModel.saveWork(city: workDiDian, companyName: company, imgs: newString, jobDuties: desc, startWorkingDate:startTime ?? "" , endWorkingDate: endTime ?? "" , position: gangWei, profession: zhiye, vsid: vsid ?? "", vitaeId: jianli_vitaeId ?? "", id: id) { result, status in
                     if status == .success{
                         self.navigationController?.popViewController(animated: true)
 //                        self.navigationController?.viewControllers.forEach({ item in
@@ -373,20 +481,27 @@ class CNLiveVitaeAddWorkController:CNLiveBaseViewController,UITableViewDataSourc
             }
         }else{
         //获奖
-            let firCell = self.tableView.cellForRow(at: IndexPath(row: 0, section: 0)) as? CNLiveVitaeAddWorkFirCell
-            let secCell = self.tableView.cellForRow(at: IndexPath(row: 1, section: 0)) as? CNLiveVitaeAddWorkSecCell
-            //判断非空
-            if firCell?.phoneTextFiled.text?.count == 0 || firCell?.phoneTextFiled.text == "请填写"{
-                showMessage(message: "请填写获奖名称")
-                return
-            }
-            if firCell?.canjiaRightTitleLabel.text?.count == 0 || firCell?.canjiaRightTitleLabel.text == "请选择"{
-                showMessage(message: "请选择开始时间")
-                return
+            if let firCell = self.tableView.cellForRow(at: IndexPath(row: 0, section: 0)) as? CNLiveVitaeAddWorkFirCell{
+                //判断非空
+                if firCell.phoneTextFiled.text?.count == 0 || firCell.phoneTextFiled.text == "请填写"{
+                    showMessage(message: "请填写获奖名称")
+                    return
+                }
+                if firCell.canjiaRightTitleLabel.text?.count == 0 || firCell.canjiaRightTitleLabel.text == "请选择"{
+                    showMessage(message: "请选择开始时间")
+                    return
+                }
+
+            }else{//firCell nil
+                
             }
-            if secCell?.huoJiangtextView.text?.count == 0 || secCell?.huoJiangtextView.text == "描述"{
-                showMessage(message: "请填写描述")
-                return
+            if let secCell = self.tableView.cellForRow(at: IndexPath(row: 1, section: 0)) as? CNLiveVitaeAddWorkSecCell{
+                if secCell.huoJiangtextView.text?.count == 0 || secCell.huoJiangtextView.text == "描述"{
+                    showMessage(message: "请填写描述")
+                    return
+                }
+            }else{//secCell nil
+                
             }
             var newString = ""
@@ -410,24 +525,56 @@ class CNLiveVitaeAddWorkController:CNLiveBaseViewController,UITableViewDataSourc
                 }
             }
-
+            
             if let userDic = UserDefaults.standard.dictionary(forKey: UserInfoManager.shared.userInfo.uid){
                 let jianli_vitaeId = userDic["jianli_vitaeId"] as? String
                 let vsid = userDic["vsid"] as? String
-                let startTime = self.convertDateStringToMillisecondsString(dateString: firCell?.canjiaRightTitleLabel.text ?? "")
+                
+                
+                var awardName = ""
+                if firCell != nil{
+                    if firCell?.phoneTextFiled.text?.count ?? 0 <= 0{
+                        
+                    }else if firCell?.phoneTextFiled.text == "请填写"{
+                        
+                    }else{
+                        awardName = firCell?.phoneTextFiled.text ?? ""
+                        if awardName.count == 0{
+                            awardName = self.firAwardName
+                        }
+                    }
+                }else{
+                    awardName = self.firAwardName
+                }
+                
+                
+                var startTime = ""
+                if firCell != nil{
+                    startTime = self.convertDateStringToMillisecondsString(dateString: firCell?.canjiaRightTitleLabel.text ?? "") ?? ""
+                    if startTime.count == 0{
+                        startTime = self.firAwardStart
+                    }
+                }else{
+                    startTime = self.firAwardStart
+                }
                 //提交工作记录
                 var id = ""
                 if self.awardModel != nil{
                     id = self.awardModel!.id
                 }
                 var danWei = ""
-                if firCell?.banfaTextFiled.text?.count ?? 0 <= 0{
-                    
-                }else if firCell?.banfaTextFiled.text == "请输入"{
-                    
+                if firCell != nil{
+                    if firCell?.banfaTextFiled.text?.count ?? 0 <= 0{
+                        
+                    }else if firCell?.banfaTextFiled.text == "请输入"{
+                        
+                    }else{
+                        danWei = firCell?.banfaTextFiled.text ?? ""
+                    }
                 }else{
-                    danWei = firCell?.banfaTextFiled.text ?? ""
+                    danWei = self.firAwardCompany
                 }
+                
                 var desc = ""
                 if secCell?.huoJiangtextView.text?.count ?? 0 <= 0{
@@ -436,7 +583,7 @@ class CNLiveVitaeAddWorkController:CNLiveBaseViewController,UITableViewDataSourc
                 }else{
                     desc = secCell?.huoJiangtextView.text ?? ""
                 }
-                CNLiveVitaeViewModel.saveAward(company: danWei, description: desc, time: startTime ?? "", title: firCell?.phoneTextFiled.text ?? "", imgs: newString, vsid: vsid ?? "", vitaeId: jianli_vitaeId ?? "", id: id) { result, status in
+                CNLiveVitaeViewModel.saveAward(company: danWei, description: desc, time: startTime, title: awardName, imgs: newString, vsid: vsid ?? "", vitaeId: jianli_vitaeId ?? "", id: id) { result, status in
                     if status == .success{
                         self.navigationController?.popViewController(animated: true)
 //                        self.navigationController?.viewControllers.forEach({ item in
@@ -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),isPreview: false, isExpand: isExpand)
+                        let layout = CNLiveViateWorkModelLayout(model: mdl as! CNLiveVitaeWorksModel,descH: Float(jianjieHeight),isPreview: false, isExpand: isExpand, isShowExpand: true)
                         let newWorkModel = layout.getCellHModel()
                         tempArr.append(newWorkModel)
                     }else{
-                        let layout = CNLiveViateAwardModelLayout(model: mdl as! CNLiveVitaeAwardsModel,descH: Float(jianjieHeight), isPreview: false, isExpand: isExpand)
+                        let layout = CNLiveViateAwardModelLayout(model: mdl as! CNLiveVitaeAwardsModel,descH: Float(jianjieHeight), isPreview: false, isExpand: isExpand, isShowExpand: true)
                         let newWorkModel = layout.getCellHModel()
                         tempArr.append(newWorkModel)
                     }
@@ -217,7 +217,7 @@ class CNLiveVitaeWorkDetailController:CNLiveBaseViewController,UITableViewDataSo
                     if let res = result as? [CNLiveVitaeWorksModel]{
                         self.workListArr = Array()
                         for mdl in res {
-                            let layout = CNLiveViateWorkModelLayout(model: mdl,descH: 40.0,isPreview: false, isExpand: false)
+                            let layout = CNLiveViateWorkModelLayout(model: mdl,descH: 40.0,isPreview: false, isExpand: false, isShowExpand: true)
                             let newWorkModel = layout.getCellHModel()
                             self.workListArr.append(newWorkModel)
                         }
@@ -235,7 +235,7 @@ class CNLiveVitaeWorkDetailController:CNLiveBaseViewController,UITableViewDataSo
                     if let res = result as? [CNLiveVitaeAwardsModel]{
                         self.workListArr = Array()
                         for mdl in res {
-                            let layout = CNLiveViateAwardModelLayout(model: mdl,descH: 40.0, isPreview: false, isExpand: false)
+                            let layout = CNLiveViateAwardModelLayout(model: mdl,descH: 40.0, isPreview: false, isExpand: false, isShowExpand: true)
                             let newWorkModel = layout.getCellHModel()
                             self.workListArr.append(newWorkModel)
                         }
@@ -298,7 +298,7 @@ class CNLiveDigitalResumePreViewController:CNLiveBaseViewController,UITableViewD
 //                    let idxPath = tableView.indexPath(for: workCell)
                     for (idx,mdl) in res.enumerated() {
                         if idx == index{
-                            let layout = CNLiveViateWorkModelLayout(model: mdl as! CNLiveVitaeWorksModel,descH: Float(jianjieHeight),isPreview: true, isExpand: isExpand)
+                            let layout = CNLiveViateWorkModelLayout(model: mdl as! CNLiveVitaeWorksModel,descH: Float(jianjieHeight),isPreview: true, isExpand: isExpand, isShowExpand: true)
                             let newWorkModel = layout.getCellHModel()
                             tempArr.append(newWorkModel)
                         }else{
@@ -358,7 +358,7 @@ class CNLiveDigitalResumePreViewController:CNLiveBaseViewController,UITableViewD
 //                    let idxPath = tableView.indexPath(for: workCell)
                     for (idx,mdl) in res.enumerated() {
                         if idx == index{
-                            let layout = CNLiveViateAwardModelLayout(model: mdl as! CNLiveVitaeAwardsModel,descH: Float(jianjieHeight),isPreview: true, isExpand: isExpand)
+                            let layout = CNLiveViateAwardModelLayout(model: mdl as! CNLiveVitaeAwardsModel,descH: Float(jianjieHeight),isPreview: true, isExpand: isExpand, isShowExpand: true)
                             let newWorkModel = layout.getCellHModel()
                             tempArr.append(newWorkModel)
                         }else{
@@ -605,7 +605,7 @@ class CNLiveDigitalResumePreViewController:CNLiveBaseViewController,UITableViewD
                         for (_,mdl) in self.vitaeModel!.works.enumerated() {
 //                            self.totalDataArray.add(CNLiveViatePreviewCellType.work)
 //                            self.totalPreViewDataArray.add(CNLiveViatePreviewCellType.work)
-                            let layout = CNLiveViateWorkModelLayout(model: mdl ,descH: Float(40.0),isPreview: true, isExpand: false)
+                            let layout = CNLiveViateWorkModelLayout(model: mdl ,descH: Float(40.0),isPreview: true, isExpand: false, isShowExpand: true)
                             let newWorkModel = layout.getCellHModel()
                             self.workDataArray.add(newWorkModel)
 //                            self.awardDataArray.add(CNLiveViatePreviewCellType.work)
@@ -616,7 +616,7 @@ class CNLiveDigitalResumePreViewController:CNLiveBaseViewController,UITableViewD
                             self.totalDataArray.add(CNLiveViatePreviewCellType.award)
                             self.totalPreViewDataArray.add(CNLiveViatePreviewCellType.award)
                             for (_,mdl) in self.vitaeModel!.awards.enumerated() {
-                                let layout = CNLiveViateAwardModelLayout(model: mdl ,descH: Float(40.0),isPreview: true, isExpand: false)
+                                let layout = CNLiveViateAwardModelLayout(model: mdl ,descH: Float(40.0),isPreview: true, isExpand: false, isShowExpand: true)
                                 let newWorkModel = layout.getCellHModel()
                                 self.awardDataArray.add(newWorkModel)
 //                                self.workDataArray.add(CNLiveViatePreviewCellType.award)
@@ -9,10 +9,16 @@ import Foundation
 import Kingfisher
 import SnapKit
+typealias UpdateAddWorkFirCellBlock = (_ currentCell: CNLiveVitaeAddWorkFirCell? ,_ zhiye:String ,_ gangwei:String,_ start:String,_ end:String) -> Void
+
+typealias UpdateAddAwardFirCellBlock = (_ currentCell: CNLiveVitaeAddWorkFirCell? ,_ awardName:String ,_ start:String,_ company:String) -> Void
+
 class CNLiveVitaeAddWorkFirCell:UITableViewCell, UITextFieldDelegate{
     var zhiyeStr:String = ""
+    var updateAddWorkFirCellBlock:UpdateAddWorkFirCellBlock?
+    var updateAddAwardFirCellBlock:UpdateAddAwardFirCellBlock?
+    var startStr:String = ""
-//    var workAwardType:CNLiveViateWorkAwardType = .work
     var _workAwardType:CNLiveViateWorkAwardType = .work
     var workAwardType : CNLiveViateWorkAwardType {
         get{
@@ -450,6 +456,12 @@ class CNLiveVitaeAddWorkFirCell:UITableViewCell, UITextFieldDelegate{
     // MARK: - UITextFieldDelegate
     func textFieldDidEndEditing(_ textField: UITextField) {
         currentViewController()?.view.endEditing(true)
+        if self.updateAddWorkFirCellBlock != nil{
+            self.updateAddWorkFirCellBlock?(self, "", textField.text ?? "", "", "")
+        }
+        if self.updateAddAwardFirCellBlock != nil{
+            self.updateAddAwardFirCellBlock?(self, self.phoneTextFiled.text ?? "", self.startStr, self.banfaTextFiled.text ?? "")
+        }
     }
     @objc func zhiYeTapAction(){
@@ -458,6 +470,9 @@ class CNLiveVitaeAddWorkFirCell:UITableViewCell, UITextFieldDelegate{
         vc.selectAddWorkZhiYeBlock = { zhiyeStr in
             self.zhiyeStr = zhiyeStr 
             self.weizhiRightTitleLabel.text = zhiyeStr
+            if self.updateAddWorkFirCellBlock != nil{
+                self.updateAddWorkFirCellBlock?(self, zhiyeStr, "", "", "")
+            }
         }
         navigationViewController().pushViewController(vc, animated: true)
     }
@@ -470,6 +485,12 @@ class CNLiveVitaeAddWorkFirCell:UITableViewCell, UITextFieldDelegate{
                 let textStr = text as! String
                 self?.canjiaRightTitleLabel.text = textStr
                 self?.canjiaRightTitleLabel.textColor = HexColor("#333333")
+                if self?.updateAddWorkFirCellBlock != nil{
+                    self?.updateAddWorkFirCellBlock?(self ?? CNLiveVitaeAddWorkFirCell(), "", "", textStr, "")
+                }
+                if self?.updateAddAwardFirCellBlock != nil{
+                    self?.updateAddAwardFirCellBlock?(self, self?.phoneTextFiled.text ?? "", self?.startStr ?? "", self?.banfaTextFiled.text ?? "")
+                }
             }else{
                 self?.canjiaRightTitleLabel.text = "请选择"
                 self?.canjiaRightTitleLabel.textColor = HexColor("#B4B4B4")
@@ -484,6 +505,9 @@ class CNLiveVitaeAddWorkFirCell:UITableViewCell, UITextFieldDelegate{
                 let textStr = text as! String
                 self?.endTimeRightTitleLabel.text = textStr
                 self?.endTimeRightTitleLabel.textColor = HexColor("#333333")
+                if self?.updateAddWorkFirCellBlock != nil{
+                    self?.updateAddWorkFirCellBlock?(self ?? CNLiveVitaeAddWorkFirCell(), "", "", "", textStr)
+                }
             }else{
                 self?.endTimeRightTitleLabel.text = "请选择"
                 self?.endTimeRightTitleLabel.textColor = HexColor("#B4B4B4")
@@ -509,14 +533,19 @@ class CNLiveVitaeAddWorkFirCell:UITableViewCell, UITextFieldDelegate{
         self.phoneTextFiled.text = model.title
         self.banfaTextFiled.text = model.company
-        let startStr = self.convertMillisecondsStringToDateString(millisecondsString: model.time)
-        if startStr?.count ?? 0 > 0{
-            self.canjiaRightTitleLabel.text = startStr
+        let start = self.convertMillisecondsStringToDateString(millisecondsString: model.time)
+        self.startStr = start ?? ""
+        if start?.count ?? 0 > 0{
+            self.canjiaRightTitleLabel.text = start
             self.canjiaRightTitleLabel.textColor = HexColor("#333333")
         }else{
             self.canjiaRightTitleLabel.text = "请选择"
             self.canjiaRightTitleLabel.textColor = HexColor("#B4B4B4")
         }
+        
+        if self.updateAddAwardFirCellBlock != nil{
+            self.updateAddAwardFirCellBlock?(self, self.phoneTextFiled.text ?? "", self.startStr, self.banfaTextFiled.text ?? "")
+        }
     }
     //工作记录
@@ -541,6 +570,10 @@ class CNLiveVitaeAddWorkFirCell:UITableViewCell, UITextFieldDelegate{
             self.endTimeRightTitleLabel.text = "请选择"
             self.endTimeRightTitleLabel.textColor = HexColor("#B4B4B4")
         }
+        
+        if self.updateAddWorkFirCellBlock != nil{
+            self.updateAddWorkFirCellBlock?(self, model.profession, model.position, startStr ?? "", endStr ?? "")
+        }
     }
     //"2024.07.02"格式转成"1722297600000"毫秒时间戳字符串
@@ -9,8 +9,11 @@ import Foundation
 import Kingfisher
 import SnapKit
+typealias UpdateAddWorkThreeCellBlock = (_ currentCell: CNLiveVitaeAddWorkThreeCell? ,_ company:String ,_ workDiDian:String) -> Void
+
 class CNLiveVitaeAddWorkThreeCell:UITableViewCell, UITextFieldDelegate{
-    
+    var updateAddWorkThreeCellBlock:UpdateAddWorkThreeCellBlock?
+
     //简历workModel
     var _workModel : CNLiveVitaeWorksModel?
     var workModel : CNLiveVitaeWorksModel? {
@@ -197,6 +200,9 @@ class CNLiveVitaeAddWorkThreeCell:UITableViewCell, UITextFieldDelegate{
     // MARK: - UITextFieldDelegate
     func textFieldDidEndEditing(_ textField: UITextField) {
         currentViewController()?.view.endEditing(true)
+        if self.updateAddWorkThreeCellBlock != nil{
+            self.updateAddWorkThreeCellBlock?(self, textField.text ?? "", "")
+        }
     }
     @objc func workCityTapAction(){
@@ -207,6 +213,9 @@ class CNLiveVitaeAddWorkThreeCell:UITableViewCell, UITextFieldDelegate{
             let vc = CNLiveDigitalResumeInfoSelectAddressController()
             vc.finishSelectAreaCallBack = { [weak self] in
                 self?.weizhiRightTitleLabel.text = String(format: "%@%@%@",self?.selectAreaVC?.province ?? "",self?.selectAreaVC?.city ?? "",self?.selectAreaVC?.area ?? "" )
+                if self?.updateAddWorkThreeCellBlock != nil{
+                    self?.updateAddWorkThreeCellBlock?(self, "", self?.weizhiRightTitleLabel.text ?? "")
+                }
             }
             let currVC = currentViewController()
             currVC?.addChild(vc)
@@ -225,6 +234,11 @@ class CNLiveVitaeAddWorkThreeCell:UITableViewCell, UITextFieldDelegate{
             cityStr = "请选择"
         }
         self.weizhiRightTitleLabel.text = cityStr
+        
+        if self.updateAddWorkThreeCellBlock != nil{
+            self.updateAddWorkThreeCellBlock?(self, model.companyName, model.city)
+        }
+
     }
 }
@@ -250,7 +250,11 @@ class CNLiveVitaeWorkCell: UITableViewCell{
             make.left.equalToSuperview()
             make.bottom.equalToSuperview().offset(-54-15)
             make.width.equalToSuperview()
-            make.top.equalTo(self.jianjieLabel.snp.bottom).offset(10)
+            if self.expandBtn.isHidden{
+                make.top.equalTo(self.jianjieLabel.snp.bottom).offset(10)
+            }else{
+                make.top.equalTo(self.expandBtn.snp.bottom)
+            }
         }
         self.whiteBgView.addSubview(self.expandBtn)
         self.expandBtn.snp.makeConstraints { make in
@@ -340,7 +344,6 @@ class CNLiveVitaeWorkCell: UITableViewCell{
         jianjieLabel.numberOfLines = 0
         jianjieLabel.width = self.whiteBgView.width-15-20
-        let size = jianjieLabel.sizeThatFits(CGSize(width: jianjieLabel.width, height: CGFloat.greatestFiniteMagnitude))
         self.jianjieLabel.sizeToFit()
         var jienjieH:CGFloat = 0
@@ -436,7 +439,11 @@ class CNLiveVitaeWorkCell: UITableViewCell{
             make.left.equalToSuperview()
             make.bottom.equalToSuperview().offset(-54-15)
             make.width.equalToSuperview()
-            make.top.equalTo(self.jianjieLabel.snp.bottom).offset(10)
+            if self.expandBtn.isHidden{
+                make.top.equalTo(self.jianjieLabel.snp.bottom).offset(10)
+            }else{
+                make.top.equalTo(self.expandBtn.snp.bottom)
+            }
         }
     }
     //工作
@@ -475,7 +482,6 @@ class CNLiveVitaeWorkCell: UITableViewCell{
         jianjieLabel.numberOfLines = 0
         jianjieLabel.width = self.whiteBgView.width-15-20
-        let size = jianjieLabel.sizeThatFits(CGSize(width: jianjieLabel.width, height: CGFloat.greatestFiniteMagnitude))
         self.jianjieLabel.sizeToFit()
         var jienjieH:CGFloat = 0
@@ -575,7 +581,11 @@ class CNLiveVitaeWorkCell: UITableViewCell{
                 make.left.equalToSuperview()
                 make.bottom.equalToSuperview().offset(-54-15)
                 make.width.equalToSuperview()
-                make.top.equalTo(self.jianjieLabel.snp.bottom).offset(10)
+                if self.expandBtn.isHidden{
+                    make.top.equalTo(self.jianjieLabel.snp.bottom).offset(10)
+                }else{
+                    make.top.equalTo(self.expandBtn.snp.bottom)
+                }
             }
         }else{
             self.workDingWeiTitleLabel.isHidden = false
@@ -585,7 +595,11 @@ class CNLiveVitaeWorkCell: UITableViewCell{
                 make.left.equalToSuperview()
                 make.bottom.equalTo(self.dingweiImgView.snp.top).offset(-5)
                 make.width.equalToSuperview()
-                make.top.equalTo(self.jianjieLabel.snp.bottom).offset(10)
+                if self.expandBtn.isHidden{
+                    make.top.equalTo(self.jianjieLabel.snp.bottom).offset(10)
+                }else{
+                    make.top.equalTo(self.expandBtn.snp.bottom)
+                }
             }
         }
@@ -611,12 +625,10 @@ class CNLiveVitaeWorkCell: UITableViewCell{
     // MARK: - Action
     @objc func expandBtnAction(button:UIButton){
         button.isSelected = !button.isSelected
-        let lines = jianjieLabel.getRealLabelTextLines()
         let height = jianjieLabel.qmui_lineHeight
         jianjieLabel.numberOfLines = 0
         jianjieLabel.width = self.whiteBgView.width-15-20
-        let size = jianjieLabel.sizeThatFits(CGSize(width: jianjieLabel.width, height: CGFloat.greatestFiniteMagnitude))
         self.jianjieLabel.sizeToFit()
         var jienjieH:CGFloat = 0
@@ -223,7 +223,11 @@ class CNLiveDigitalResumePreviewFourWorkAwardCell:UITableViewCell{
             make.left.equalToSuperview()
             make.bottom.equalToSuperview()
             make.width.equalToSuperview()
-            make.top.equalTo(self.jianjieLabel.snp.bottom).offset(10)
+            if self.expandBtn.isHidden{
+                make.top.equalTo(self.jianjieLabel.snp.bottom).offset(10)
+            }else{
+                make.top.equalTo(self.expandBtn.snp.bottom)
+            }
         }
         self.contentView.addSubview(self.expandBtn)
         self.expandBtn.snp.makeConstraints { make in
@@ -255,7 +259,10 @@ class CNLiveDigitalResumePreviewFourWorkAwardCell:UITableViewCell{
                 view.removeFromSuperview()
             }
         }
+
         self.workProfessionTitleLabel.text = model.profession.count > 0 ? model.profession : "行业"
+        
+        self.workNameTitleLabel.isHidden = false
         self.workNameTitleLabel.text = model.position.count > 0 ? model.position : "职位"
         if model.companyName.count > 0{
             self.workPositionTitleLabel.text = model.companyName
@@ -294,6 +301,7 @@ class CNLiveDigitalResumePreviewFourWorkAwardCell:UITableViewCell{
                 self.workTimeTitleLabel.text = startDateString!+"~"+endDateString!
             }
         }
+        self.workTimeTitleLabel.isHidden = false
         self.jianjieLabel.text = model.jobDuties//"描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述"
         let lines = jianjieLabel.getRealLabelTextLines()
@@ -393,7 +401,11 @@ class CNLiveDigitalResumePreviewFourWorkAwardCell:UITableViewCell{
                 make.left.equalToSuperview()
                 make.bottom.equalToSuperview()
                 make.width.equalToSuperview()
-                make.top.equalTo(self.jianjieLabel.snp.bottom).offset(10)
+                if self.expandBtn.isHidden{
+                    make.top.equalTo(self.jianjieLabel.snp.bottom).offset(10)
+                }else{
+                    make.top.equalTo(self.expandBtn.snp.bottom)
+                }
             }
         }else{
@@ -404,7 +416,11 @@ class CNLiveDigitalResumePreviewFourWorkAwardCell:UITableViewCell{
                 make.left.equalToSuperview()
                 make.bottom.equalTo(self.dingweiImgView.snp.top).offset(-5)
                 make.width.equalToSuperview()
-                make.top.equalTo(self.jianjieLabel.snp.bottom).offset(10)
+                if self.expandBtn.isHidden{
+                    make.top.equalTo(self.jianjieLabel.snp.bottom).offset(10)
+                }else{
+                    make.top.equalTo(self.expandBtn.snp.bottom)
+                }
             }
         }
         self.nameIconImgView.image = UIImage(named: "mine_jianli_preview_work")
@@ -552,7 +568,11 @@ class CNLiveDigitalResumePreviewFourWorkAwardCell:UITableViewCell{
             make.left.equalToSuperview()
             make.bottom.equalToSuperview()
             make.width.equalToSuperview()
-            make.top.equalTo(self.jianjieLabel.snp.bottom).offset(10)
+            if self.expandBtn.isHidden{
+                make.top.equalTo(self.jianjieLabel.snp.bottom).offset(10)
+            }else{
+                make.top.equalTo(self.expandBtn.snp.bottom)
+            }
         }
     }
@@ -24,9 +24,16 @@ class CNLiveViateWorkModelLayout:NSObject{
         }
     }
-    init(model:CNLiveVitaeWorksModel,descH:Float,isPreview:Bool,isExpand:Bool){
+    init(model:CNLiveVitaeWorksModel,descH:Float,isPreview:Bool,isExpand:Bool,isShowExpand:Bool){
         super.init()
         model.isExpand = isExpand
+        model.isShowExpand = isShowExpand
+        var expand:Float = 20
+        if isShowExpand{
+            expand = 20
+        }else{
+            expand = 0
+        }
         self.workModel = model
         var companyH:Float = 25
         let companyStr = model.companyName
@@ -60,10 +67,10 @@ class CNLiveViateWorkModelLayout:NSObject{
             cityH = 35
         }
         if isPreview == false{//工作记录详情页
-            _workModel?.cellH = Float(123-25)+companyH+descH+Float(hang*imgWH)+cityH+55+15
+            _workModel?.cellH = Float(123-25)+companyH+descH+expand+Float(hang*imgWH)+cityH+55+15
         }else{//预览工作记录
             imgWH = Float((Float(KSreenWidth)-30-40-50)/3.0+10)
-            _workModel?.cellH = Float(162-58-25)+companyH+descH+Float(hang*imgWH)+cityH//+55
+            _workModel?.cellH = Float(162-58-25)+companyH+descH+expand+Float(hang*imgWH)+cityH//+55
         }
     }
     func getCellHModel()->CNLiveVitaeWorksModel{
@@ -90,9 +97,16 @@ class CNLiveViateAwardModelLayout:NSObject{
         }
     }
-    init(model:CNLiveVitaeAwardsModel,descH:Float,isPreview:Bool,isExpand:Bool){
+    init(model:CNLiveVitaeAwardsModel,descH:Float,isPreview:Bool,isExpand:Bool,isShowExpand:Bool){
         super.init()
         model.isExpand = isExpand
+        model.isShowExpand = isShowExpand
+        var expand:Float = 20
+        if isShowExpand{
+            expand = 20
+        }else{
+            expand = 0
+        }
         self.awardModel = model
         var companyH:Float = 25
         let companyStr = model.company
@@ -118,10 +132,10 @@ class CNLiveViateAwardModelLayout:NSObject{
         }
         var imgWH:Float = Float((KSreenWidth-60-15)/3.0+10)
         if isPreview == false{//获奖详情页
-            _awardModel?.cellH = Float(123-25)+companyH+descH+Float(hang*imgWH)+55+15
+            _awardModel?.cellH = Float(123-25)+companyH+descH+expand+Float(hang*imgWH)+55+15
         }else{//预览获奖
             imgWH = Float((Float(KSreenWidth)-30-40-50)/3.0+10)
-            _awardModel?.cellH = Float(162-58-25-25)+companyH+descH+Float(hang*imgWH)//+55
+            _awardModel?.cellH = Float(162-58-25-25)+companyH+descH+expand+Float(hang*imgWH)//+55
         }
     }
     func getCellHModel()->CNLiveVitaeAwardsModel{
@@ -109,6 +109,7 @@ class CNLiveVitaeWorksModel:BaseModel{
     ///cell高度
     var cellH: Float = 0
     var isExpand:Bool = false//是否展开
+    var isShowExpand:Bool = false//是否显示 展开按钮
 }
@@ -160,6 +161,8 @@ class CNLiveVitaeAwardsModel:BaseModel{
     ///cell高度
     var cellH: Float = 0
     var isExpand:Bool = false//是否展开
+    var isShowExpand:Bool = false//是否显示 展开按钮
+    
 }
 /**
  "data": {