* [x] 工作记录列表页-开始时间结束时间没有了(看改没改新增工作和获奖接口或者是否隐藏 ,看提交时判断必传的信息没有提示请填写)

* [x] 工作记录列表页-没有定位时 , cellH不对(得判断是否有更多) * [x] 新增获奖情况-添加描述 ,但是列表页不显示 * [x] 新增获奖情况-编辑一次描述后 , 就不显示了

* [x] 工作记录列表页-开始时间结束时间没有了(看改没改新增工作和获奖接口或者是否隐藏 ,看提交时判断必传的信息没有提示请填写)
* [x] 工作记录列表页-没有定位时 , cellH不对(得判断是否有更多) * [x] 新增获奖情况-添加描述 ,但是列表页不显示 * [x] 新增获奖情况-编辑一次描述后 , 就不显示了
“张旭”
1 parent 7e4fc3fe
Showing 8 changed files with 269 additions and 177 deletions
metaCode/Classes/Main/HomePage/Controller/DigitalAuth/工作相关页面/CNLiveVitaeAddWorkController.swift
metaCode/Classes/Main/HomePage/Controller/DigitalAuth/工作相关页面/CNLiveVitaeWorkDetailController.swift
metaCode/Classes/Main/HomePage/View/DigitalAuthViews/Vitae/Work/CNLiveVitaeAddWorkFirCell.swift
metaCode/Classes/Main/HomePage/View/DigitalAuthViews/Vitae/Work/CNLiveVitaeAddWorkSecCell.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/CNLiveDigitalResumePreViewFirCell.swift
metaCode/Classes/Main/Model/Vitae/CNLiveViateWorkModelLayout.swift
@@ -42,7 +42,8 @@ class CNLiveVitaeAddWorkController:CNLiveBaseViewController,UITableViewDataSourc
     var seleArr:Array<String>?
     var seleVideoUrl:String = ""
-    var isFirstEdit = true
+    var isFirstEdit = true//是否 第一次进入编辑
+//    var isAddWorkAward = true//是否 新增
     //简历workModel
     var _workModel : CNLiveVitaeWorksModel?
     var workModel : CNLiveVitaeWorksModel? {
@@ -193,6 +194,12 @@ class CNLiveVitaeAddWorkController:CNLiveBaseViewController,UITableViewDataSourc
                 }
                 if self.workModel != nil{
                     cell.workModel = self.workModel!
+                }else{
+                    if cell.isUpdated == false{//没更新过 初始化
+                        cell.workModel = CNLiveVitaeWorksModel()
+                    }else{
+                        
+                    }
                 }
             }else{
                 cell.workAwardType = .award
@@ -212,6 +219,12 @@ class CNLiveVitaeAddWorkController:CNLiveBaseViewController,UITableViewDataSourc
                 }
                 if self.awardModel != nil{
                     cell.awardModel = self.awardModel!
+                }else{
+                    if cell.isUpdated == false{//没更新过 初始化
+                        cell.awardModel = CNLiveVitaeAwardsModel()
+                    }else{
+                        
+                    }
                 }
             }
@@ -224,15 +237,36 @@ class CNLiveVitaeAddWorkController:CNLiveBaseViewController,UITableViewDataSourc
                 return cell
             }
             if self.workAwardType == .work{
-                
+                cell.workAwardType = .work
                 if self.workModel != nil && self.isFirstEdit == true{
                     cell.workModel = self.workModel!
                     self.isFirstEdit = false
+                }else{
+                    if self.workModel != nil{
+                        
+                    }else{
+                        if cell.isUpdated == false{//没更新过
+                            cell.clearWorkLocalData()
+                        }else{
+                            
+                        }
+                    }
                 }
             }else{
+                cell.workAwardType = .award
                 if self.awardModel != nil && self.isFirstEdit == true{
                     cell.awardModel = self.awardModel!
                     self.isFirstEdit = false
+                }else{
+                    if self.awardModel != nil{
+                        
+                    }else{
+                        if cell.isUpdated == false{//没更新过
+                            cell.clearAwardLocalData()
+                        }else{
+                            
+                        }
+                    }
                 }
             }
             cell.uploadImageSuceessBlock = { imageUrl in
@@ -337,33 +371,35 @@ class CNLiveVitaeAddWorkController:CNLiveBaseViewController,UITableViewDataSourc
     @objc func addWorkBtnAction() {
         if self.workAwardType == .work{
-            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
-            let threeCell = self.tableView.cellForRow(at: IndexPath(row: 2, section: 0)) as? CNLiveVitaeAddWorkThreeCell
+            
+            let firProfession = UserDefaults.standard.string(forKey: CNLiveVitaeAddWorkFirCellprofession)
+            let firPosition = UserDefaults.standard.string(forKey: CNLiveVitaeAddWorkFirCellposition)
+            let firStart = UserDefaults.standard.string(forKey: CNLiveVitaeAddWorkFirCellstartWorkingDate)
+            let firEnd = UserDefaults.standard.string(forKey: CNLiveVitaeAddWorkFirCellendWorkingDate)
+
+            let secJobDuties = UserDefaults.standard.string(forKey: CNLiveVitaeAddWorkSecCelljobDuties)
+            let threeCompany = UserDefaults.standard.string(forKey: CNLiveVitaeAddWorktThreeCellCompany)
+            let threeCity = UserDefaults.standard.string(forKey: CNLiveVitaeAddWorktThreeCellCity)
+            
             //判断非空
-            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 firProfession?.count == 0 || firProfession == "请选择"{
+                showMessage(message: "请选择职业")
+                return
+            }
+            if firPosition?.count == 0 || firPosition == "请填写"{
+                showMessage(message: "请填写岗位名称")
+                return
             }
-            if secCell?.huoJiangtextView.text?.count == 0 || secCell?.huoJiangtextView.text == "描述"{
+            if firStart?.count == 0 || firStart == "请选择"{
+                showMessage(message: "请选择开始时间")
+                return
+            }
+            if firEnd?.count == 0 || firEnd == "请选择"{
+                showMessage(message: "请选择结束时间")
+                return
+            }
+            if secJobDuties?.count == 0 || secJobDuties == "描述"{
                 showMessage(message: "请填写经历描述")
                 return
             }
@@ -389,74 +425,9 @@ class CNLiveVitaeAddWorkController:CNLiveBaseViewController,UITableViewDataSourc
                 }
             }
-            var company = ""
-            if threeCell != nil{
-                if threeCell?.phoneTextFiled.text?.count ?? 0 <= 0{
-                    
-                }else if threeCell?.phoneTextFiled.text == "请填写"{
-                    
-                }else{
-                    company = threeCell?.phoneTextFiled.text ?? ""
-                }
-            }else{
-                company = self.threeCompanyStr
-            }
-
-            var workDiDian = ""
-            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{
-                zhiye = self.firZhiyeStr
-            }
-            if zhiye == "" || zhiye.count == 0{
-                showMessage(message: "请选择职业")
-                return
-            }
+            var company = threeCompany ?? ""
+            var workDiDian = threeCity ?? ""
-            var desc = ""
-            if secCell?.huoJiangtextView.text?.count ?? 0 <= 0{
-                
-            }else if secCell?.huoJiangtextView.text == "描述"{
-                
-            }else{
-                desc = secCell?.huoJiangtextView.text ?? ""
-            }
             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
@@ -468,7 +439,7 @@ class CNLiveVitaeAddWorkController:CNLiveBaseViewController,UITableViewDataSourc
                     id = self.workModel!.id
                 }
-                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
+                CNLiveVitaeViewModel.saveWork(city: workDiDian, companyName: company, imgs: newString, jobDuties: secJobDuties ?? "", startWorkingDate:firStart ?? "", endWorkingDate: firEnd ?? "", position: firPosition ?? "", profession: firProfession ?? "", vsid: vsid ?? "", vitaeId: jianli_vitaeId ?? "", id: id) { result, status in
                     if status == .success{
                         self.navigationController?.popViewController(animated: true)
 //                        self.navigationController?.viewControllers.forEach({ item in
@@ -481,27 +452,24 @@ class CNLiveVitaeAddWorkController:CNLiveBaseViewController,UITableViewDataSourc
             }
         }else{
         //获奖
-            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
-                }
+            let firTitle = UserDefaults.standard.string(forKey: CNLiveVitaeAddAwardFirCellTitle)
+            let firTime = UserDefaults.standard.string(forKey: CNLiveVitaeAddAwardFirCellTime)
+            let firCompany = UserDefaults.standard.string(forKey: CNLiveVitaeAddAwardFirCellCompany)
-            }else{//firCell nil
-                
+            let secDescription = UserDefaults.standard.string(forKey: CNLiveVitaeAddAwardSecCellDescription)
+            
+            //判断非空
+            if firTitle?.count == 0 || firTitle == "请填写"{
+                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
-                
+            if firTime?.count == 0 || firTime == "请选择"{
+                showMessage(message: "请选择开始时间")
+                return
+            }
+            if secDescription?.count == 0 || secDescription == "描述"{
+                showMessage(message: "请填写描述")
+                return
             }
             var newString = ""
@@ -530,62 +498,13 @@ class CNLiveVitaeAddWorkController:CNLiveBaseViewController,UITableViewDataSourc
                 let jianli_vitaeId = userDic["jianli_vitaeId"] as? String
                 let vsid = userDic["vsid"] as? String
-                
-                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 != nil{
-                    if firCell?.banfaTextFiled.text?.count ?? 0 <= 0{
-                        
-                    }else if firCell?.banfaTextFiled.text == "请输入"{
-                        
-                    }else{
-                        danWei = firCell?.banfaTextFiled.text ?? ""
-                        if danWei.count == 0{
-                            danWei = self.firAwardCompany
-                        }
-                    }
-                }else{
-                    danWei = self.firAwardCompany
-                }
-                var desc = ""
-                if secCell?.huoJiangtextView.text?.count ?? 0 <= 0{
-                    
-                }else if secCell?.huoJiangtextView.text == "描述"{
-                    
-                }else{
-                    desc = secCell?.huoJiangtextView.text ?? ""
-                }
-                CNLiveVitaeViewModel.saveAward(company: danWei, description: desc, time: startTime, title: awardName, imgs: newString, vsid: vsid ?? "", vitaeId: jianli_vitaeId ?? "", id: id) { result, status in
+                CNLiveVitaeViewModel.saveAward(company: firCompany ?? "", description: secDescription ?? "", time: firTime ?? "", title: firTitle ?? "", 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,13 @@ 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, isShowExpand: true)
+                        let model = mdl as! CNLiveVitaeWorksModel
+                        let layout = CNLiveViateWorkModelLayout(model: model,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, isShowExpand: true)
+                        let model = mdl as! CNLiveVitaeAwardsModel
+                        let layout = CNLiveViateAwardModelLayout(model: model,descH: Float(jianjieHeight), isPreview: false, isExpand: isExpand, isShowExpand: true)
                         let newWorkModel = layout.getCellHModel()
                         tempArr.append(newWorkModel)
                     }
@@ -206,6 +208,7 @@ class CNLiveVitaeWorkDetailController:CNLiveBaseViewController,UITableViewDataSo
     @objc func addWorkBtnAction(){
         let vc = CNLiveVitaeAddWorkController()
         vc.workAwardType = self.workAwardType
+//        vc.isAddWorkAward = true
         self.navigationController?.pushViewController(vc, animated: true)
     }
@@ -13,11 +13,21 @@ typealias UpdateAddWorkFirCellBlock = (_ currentCell: CNLiveVitaeAddWorkFirCell?
 typealias UpdateAddAwardFirCellBlock = (_ currentCell: CNLiveVitaeAddWorkFirCell? ,_ awardName:String ,_ start:String,_ company:String) -> Void
+let CNLiveVitaeAddWorkFirCellprofession = "CNLiveVitaeAddWorkFirCellprofession"
+let CNLiveVitaeAddWorkFirCellposition = "CNLiveVitaeAddWorkFirCellposition"
+let CNLiveVitaeAddWorkFirCellstartWorkingDate = "CNLiveVitaeAddWorkFirCellstartWorkingDate"
+let CNLiveVitaeAddWorkFirCellendWorkingDate = "CNLiveVitaeAddWorkFirCellendWorkingDate"
+
+let CNLiveVitaeAddAwardFirCellTitle = "CNLiveVitaeAddAwardFirCellTitle"
+let CNLiveVitaeAddAwardFirCellCompany = "CNLiveVitaeAddAwardFirCellCompany"
+let CNLiveVitaeAddAwardFirCellTime = "CNLiveVitaeAddAwardFirCellTime"
+
 class CNLiveVitaeAddWorkFirCell:UITableViewCell, UITextFieldDelegate{
     var zhiyeStr:String = ""
     var updateAddWorkFirCellBlock:UpdateAddWorkFirCellBlock?
     var updateAddAwardFirCellBlock:UpdateAddAwardFirCellBlock?
     var startStr:String = ""
+    var isUpdated = false//是否 已经更新内容
     var _workAwardType:CNLiveViateWorkAwardType = .work
     var workAwardType : CNLiveViateWorkAwardType {
@@ -462,6 +472,28 @@ class CNLiveVitaeAddWorkFirCell:UITableViewCell, UITextFieldDelegate{
         if self.updateAddAwardFirCellBlock != nil{
             self.updateAddAwardFirCellBlock?(self, self.phoneTextFiled.text ?? "", self.startStr, self.banfaTextFiled.text ?? "")
         }
+        if self.workAwardType == .work{
+            if self.phoneTextFiled.text != "请选择"{
+                self.isUpdated = true
+                UserDefaults.standard.setValue(self.phoneTextFiled.text ?? "", forKey: CNLiveVitaeAddWorkFirCellposition)
+                UserDefaults.standard.synchronize()
+            }else{
+            }
+        }else{
+            if (textField == self.phoneTextFiled) && self.phoneTextFiled.text != "请填写"{
+                self.isUpdated = true
+                UserDefaults.standard.setValue(self.phoneTextFiled.text ?? "", forKey: CNLiveVitaeAddAwardFirCellTitle)
+                UserDefaults.standard.synchronize()
+            }else{
+            }
+            if (textField == self.banfaTextFiled) && self.banfaTextFiled.text != "请输入"{
+                self.isUpdated = true
+                UserDefaults.standard.setValue(self.banfaTextFiled.text ?? "", forKey: CNLiveVitaeAddAwardFirCellCompany)
+                UserDefaults.standard.synchronize()
+            }else{
+            }
+        }
+
     }
     @objc func zhiYeTapAction(){
@@ -473,6 +505,9 @@ class CNLiveVitaeAddWorkFirCell:UITableViewCell, UITextFieldDelegate{
             if self.updateAddWorkFirCellBlock != nil{
                 self.updateAddWorkFirCellBlock?(self, zhiyeStr, "", "", "")
             }
+            self.isUpdated = true
+            UserDefaults.standard.setValue(zhiyeStr, forKey: CNLiveVitaeAddWorkFirCellprofession)
+            UserDefaults.standard.synchronize()
         }
         navigationViewController().pushViewController(vc, animated: true)
     }
@@ -489,8 +524,20 @@ class CNLiveVitaeAddWorkFirCell:UITableViewCell, UITextFieldDelegate{
                     self?.updateAddWorkFirCellBlock?(self ?? CNLiveVitaeAddWorkFirCell(), "", "", textStr, "")
                 }
                 if self?.updateAddAwardFirCellBlock != nil{
-                    self?.updateAddAwardFirCellBlock?(self, self?.phoneTextFiled.text ?? "", self?.startStr ?? "", self?.banfaTextFiled.text ?? "")
+                    self?.updateAddAwardFirCellBlock?(self, self?.phoneTextFiled.text ?? "", textStr, self?.banfaTextFiled.text ?? "")
+                }
+                if self?.workAwardType == .work{
+                    self?.isUpdated = true
+                    let start = self?.convertDateStringToMillisecondsString(dateString: textStr)
+                    UserDefaults.standard.setValue(start, forKey: CNLiveVitaeAddWorkFirCellstartWorkingDate)
+                    UserDefaults.standard.synchronize()
+                }else{
+                    self?.isUpdated = true
+                    let start = self?.convertDateStringToMillisecondsString(dateString: textStr)
+                    UserDefaults.standard.setValue(start, forKey: CNLiveVitaeAddAwardFirCellTime)
+                    UserDefaults.standard.synchronize()
                 }
+
             }else{
                 self?.canjiaRightTitleLabel.text = "请选择"
                 self?.canjiaRightTitleLabel.textColor = HexColor("#B4B4B4")
@@ -508,6 +555,10 @@ class CNLiveVitaeAddWorkFirCell:UITableViewCell, UITextFieldDelegate{
                 if self?.updateAddWorkFirCellBlock != nil{
                     self?.updateAddWorkFirCellBlock?(self ?? CNLiveVitaeAddWorkFirCell(), "", "", "", textStr)
                 }
+                self?.isUpdated = true
+                let end = self?.convertDateStringToMillisecondsString(dateString: textStr)
+                UserDefaults.standard.setValue(end, forKey: CNLiveVitaeAddWorkFirCellendWorkingDate)
+                UserDefaults.standard.synchronize()
             }else{
                 self?.endTimeRightTitleLabel.text = "请选择"
                 self?.endTimeRightTitleLabel.textColor = HexColor("#B4B4B4")
@@ -521,6 +572,9 @@ class CNLiveVitaeAddWorkFirCell:UITableViewCell, UITextFieldDelegate{
             let textStr = text
             self.endTimeRightTitleLabel.text = textStr
             self.endTimeRightTitleLabel.textColor = HexColor("#333333")
+            self.isUpdated = true
+            UserDefaults.standard.setValue(textStr, forKey: CNLiveVitaeAddWorkFirCellendWorkingDate)
+            UserDefaults.standard.synchronize()
         }else{
             self.endTimeRightTitleLabel.text = "请选择"
             self.endTimeRightTitleLabel.textColor = HexColor("#B4B4B4")
@@ -531,9 +585,14 @@ class CNLiveVitaeAddWorkFirCell:UITableViewCell, UITextFieldDelegate{
     func setupNewAwardUI(model:CNLiveVitaeAwardsModel){
         self.phoneTextFiled.text = model.title
+        UserDefaults.standard.setValue(model.title, forKey: CNLiveVitaeAddAwardFirCellTitle)
         self.banfaTextFiled.text = model.company
-        
+        UserDefaults.standard.setValue(model.company, forKey:CNLiveVitaeAddAwardFirCellCompany)
+
         let start = self.convertMillisecondsStringToDateString(millisecondsString: model.time)
+        UserDefaults.standard.setValue(model.time, forKey:CNLiveVitaeAddAwardFirCellTime)
+        UserDefaults.standard.synchronize()
+
         self.startStr = start ?? ""
         if start?.count ?? 0 > 0{
             self.canjiaRightTitleLabel.text = start
@@ -551,8 +610,12 @@ class CNLiveVitaeAddWorkFirCell:UITableViewCell, UITextFieldDelegate{
     //工作记录
     func setupNewUI(model:CNLiveVitaeWorksModel){
         self.weizhiRightTitleLabel.text = model.profession
+        UserDefaults.standard.setValue(model.profession, forKey: CNLiveVitaeAddWorkFirCellprofession)
+
         self.phoneTextFiled.text = model.position
+        UserDefaults.standard.setValue(model.position, forKey: CNLiveVitaeAddWorkFirCellposition)
+
         let startStr = self.convertMillisecondsStringToDateString(millisecondsString: model.startWorkingDate)
         if startStr?.count ?? 0 > 0{
             self.canjiaRightTitleLabel.text = startStr
@@ -561,6 +624,7 @@ class CNLiveVitaeAddWorkFirCell:UITableViewCell, UITextFieldDelegate{
             self.canjiaRightTitleLabel.text = "请选择"
             self.canjiaRightTitleLabel.textColor = HexColor("#B4B4B4")
         }
+        UserDefaults.standard.setValue(model.startWorkingDate, forKey: CNLiveVitaeAddWorkFirCellstartWorkingDate)
         let endStr = self.convertMillisecondsStringToDateString(millisecondsString: model.endWorkingDate)
         if endStr?.count ?? 0 > 0{
@@ -570,6 +634,8 @@ class CNLiveVitaeAddWorkFirCell:UITableViewCell, UITextFieldDelegate{
             self.endTimeRightTitleLabel.text = "请选择"
             self.endTimeRightTitleLabel.textColor = HexColor("#B4B4B4")
         }
+        UserDefaults.standard.setValue(model.endWorkingDate, forKey: CNLiveVitaeAddWorkFirCellendWorkingDate)
+        UserDefaults.standard.synchronize()
         if self.updateAddWorkFirCellBlock != nil{
             self.updateAddWorkFirCellBlock?(self, model.profession, model.position, startStr ?? "", endStr ?? "")
@@ -11,10 +11,13 @@ import SnapKit
 typealias UpdateAddWorkSecCellHeightBlock = (_ currentCell: CNLiveVitaeAddWorkSecCell ,_ uploadHeight:CGFloat) -> Void
+let CNLiveVitaeAddWorkSecCelljobDuties = "CNLiveVitaeAddWorkSecCelljobDuties"
+let CNLiveVitaeAddAwardSecCellDescription = "CNLiveVitaeAddAwardSecCellDescription"
+
 class CNLiveVitaeAddWorkSecCell:UITableViewCell, UITextViewDelegate{
     var updateAddWorkSecCellHeightBlock:UpdateAddWorkSecCellHeightBlock?
     var workAwardType:CNLiveViateWorkAwardType = .work
-    
+    var isUpdated = false//是否 已经更新内容
     //简历workModel
     var _workModel : CNLiveVitaeWorksModel?
     var workModel : CNLiveVitaeWorksModel? {
@@ -213,9 +216,16 @@ class CNLiveVitaeAddWorkSecCell:UITableViewCell, UITextViewDelegate{
     }
+    func clearAwardLocalData(){
+        UserDefaults.standard.setValue("", forKey: CNLiveVitaeAddAwardSecCellDescription)
+        UserDefaults.standard.synchronize()
+    }
     //获奖
     func setupNewAwardUI(model:CNLiveVitaeAwardsModel){
         self.huoJiangtextView.text = model.description
+        UserDefaults.standard.setValue(model.description, forKey: CNLiveVitaeAddAwardSecCellDescription)
+        UserDefaults.standard.synchronize()
+
         self.huoJiangNumberLabel.text = "\(model.description.count)/1000"
         let imgArr =  model.imgs.components(separatedBy: ",")
         var tempImgArr = Array<String>()
@@ -230,8 +240,15 @@ class CNLiveVitaeAddWorkSecCell:UITableViewCell, UITextViewDelegate{
         self.selectUploadImageView?.networkImageArr = tempImgArr
         self.selectUploadImageView?.networkVideoUrl = tempVideoUrl
     }
+    
+    func clearWorkLocalData(){
+        UserDefaults.standard.setValue("", forKey: CNLiveVitaeAddWorkSecCelljobDuties)
+        UserDefaults.standard.synchronize()
+    }
     func setupNewUI(model:CNLiveVitaeWorksModel){
         self.huoJiangtextView.text = model.jobDuties
+        UserDefaults.standard.setValue(model.jobDuties, forKey: CNLiveVitaeAddWorkSecCelljobDuties)
+        UserDefaults.standard.synchronize()
         self.huoJiangNumberLabel.text = "\(model.jobDuties.count)/1000"
         let imgArr =  model.imgs.components(separatedBy: ",")
@@ -253,6 +270,21 @@ class CNLiveVitaeAddWorkSecCell:UITableViewCell, UITextViewDelegate{
             textView.text = "描述"
             textView.textColor = HexColor("#B3B3B3")
 //            setupWithSendBtnStatue(statue: false)
+        }else{
+            if self.workAwardType == .work{
+                if textView.text != "描述"{
+                    self.isUpdated = true
+                    UserDefaults.standard.setValue(textView.text, forKey: CNLiveVitaeAddWorkSecCelljobDuties)
+                    UserDefaults.standard.synchronize()
+                }else{
+                }
+            }else{
+                if textView.text != "描述"{
+                    self.isUpdated = true
+                    UserDefaults.standard.setValue(textView.text, forKey: CNLiveVitaeAddAwardSecCellDescription)
+                    UserDefaults.standard.synchronize()
+                }else{}
+            }
         }
     }
     func textViewDidBeginEditing(_ textView: UITextView) {
@@ -11,9 +11,12 @@ import SnapKit
 typealias UpdateAddWorkThreeCellBlock = (_ currentCell: CNLiveVitaeAddWorkThreeCell? ,_ company:String ,_ workDiDian:String) -> Void
+let CNLiveVitaeAddWorktThreeCellCompany = "CNLiveVitaeAddWorktThreeCellCompany"
+let CNLiveVitaeAddWorktThreeCellCity = "CNLiveVitaeAddWorktThreeCellCity"
+
 class CNLiveVitaeAddWorkThreeCell:UITableViewCell, UITextFieldDelegate{
     var updateAddWorkThreeCellBlock:UpdateAddWorkThreeCellBlock?
-
+    var isUpdated = false//是否 已经更新内容
     //简历workModel
     var _workModel : CNLiveVitaeWorksModel?
     var workModel : CNLiveVitaeWorksModel? {
@@ -203,6 +206,13 @@ class CNLiveVitaeAddWorkThreeCell:UITableViewCell, UITextFieldDelegate{
         if self.updateAddWorkThreeCellBlock != nil{
             self.updateAddWorkThreeCellBlock?(self, textField.text ?? "", "")
         }
+        if textField.text != "请填写"{
+            self.isUpdated = true
+            UserDefaults.standard.setValue(textField.text ?? "", forKey: CNLiveVitaeAddWorktThreeCellCompany)
+            UserDefaults.standard.synchronize()
+        }else{
+            
+        }
     }
     @objc func workCityTapAction(){
@@ -216,6 +226,9 @@ class CNLiveVitaeAddWorkThreeCell:UITableViewCell, UITextFieldDelegate{
                 if self?.updateAddWorkThreeCellBlock != nil{
                     self?.updateAddWorkThreeCellBlock?(self, "", self?.weizhiRightTitleLabel.text ?? "")
                 }
+                self?.isUpdated = true
+                UserDefaults.standard.setValue(self?.weizhiRightTitleLabel.text ?? "", forKey: CNLiveVitaeAddWorktThreeCellCity)
+                UserDefaults.standard.synchronize()
             }
             let currVC = currentViewController()
             currVC?.addChild(vc)
@@ -229,10 +242,17 @@ class CNLiveVitaeAddWorkThreeCell:UITableViewCell, UITextFieldDelegate{
     func setupNewUI(model:CNLiveVitaeWorksModel){
         self.phoneTextFiled.text = model.companyName.count>0 ? model.companyName : "请填写"
+        UserDefaults.standard.setValue(model.companyName, forKey: CNLiveVitaeAddWorktThreeCellCompany)
+        UserDefaults.standard.synchronize()
+
         var cityStr = model.city
+        UserDefaults.standard.setValue(model.city, forKey: CNLiveVitaeAddWorktThreeCellCity)
+        UserDefaults.standard.synchronize()
+
         if cityStr.count == 0{
             cityStr = "请选择"
         }
+        
         self.weizhiRightTitleLabel.text = cityStr
         if self.updateAddWorkThreeCellBlock != nil{
@@ -384,6 +384,7 @@ class CNLiveVitaeWorkCell: UITableViewCell{
         self.editImageUrls.removeAll()
         self.editVideoUrl = ""
         let imgArr =  model.imgs.components(separatedBy: ",")
+        self.images.removeAll()
         if imgArr.count > 0{
             for i in 0..<imgArr.count {
                 let imgWH:Float = Float((KSreenWidth-60-15)/3.0)
@@ -457,8 +458,12 @@ class CNLiveVitaeWorkCell: UITableViewCell{
         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.workNameTitleLabel.text = model.position
+        }else{
             self.workNameTitleLabel.text = model.position+" | "+(startDateString ?? "")
+        }
+        if endDateString == nil || endDateString?.count == 0{
         }else{
             self.workNameTitleLabel.text = model.position+" | "+(startDateString ?? "")+" - "+endDateString!
         }
@@ -522,6 +527,7 @@ class CNLiveVitaeWorkCell: UITableViewCell{
         self.editImageUrls.removeAll()
         self.editVideoUrl = ""
+        self.images.removeAll()
         let imgArr =  model.imgs.components(separatedBy: ",")
         if imgArr.count > 0{
             for i in 0..<imgArr.count {
@@ -661,6 +667,7 @@ class CNLiveVitaeWorkCell: UITableViewCell{
             vc.awardModel = self.awardModel
             vc.workAwardType = .award
         }
+//        vc.isAddWorkAward = false
         vc.seleArr = self.editImageUrls
         vc.seleVideoUrl = self.editVideoUrl
         navigationViewController().pushViewController(vc, animated: true)
@@ -180,7 +180,7 @@ class CNLiveDigitalResumePreViewFirCell: UITableViewCell {
         self.phoneTitleLabel.sizeToFit()
         self.phoneTitleLabel.snp.makeConstraints { make in
             make.left.equalTo(adapt_length(length: 15))
-            make.top.equalTo(self.authNameTitleLabel.snp.bottom).offset(8)
+            make.top.equalTo(60)//self.authNameTitleLabel.snp.bottom).offset(8)
             make.width.equalTo(self.phoneTitleLabel.size.width)
             make.height.equalTo(self.phoneTitleLabel.size.height)
         }
@@ -26,14 +26,39 @@ class CNLiveViateWorkModelLayout:NSObject{
     init(model:CNLiveVitaeWorksModel,descH:Float,isPreview:Bool,isExpand:Bool,isShowExpand:Bool){
         super.init()
+        var gangwei:Float = 10
+        if model.position.count == 0{
+            gangwei = 0
+        }else{
+        }
+
         model.isExpand = isExpand
         model.isShowExpand = isShowExpand
         var expand:Float = 20
-        if isShowExpand{
+        
+        let titleLabel = UILabel.init(frame: CGRectMake(0, 0, KSreenWidth-60, 40))
+        titleLabel.textColor = HexColor("#999999")
+        titleLabel.textAlignment = .left
+        titleLabel.font = Font_14
+        titleLabel.backgroundColor = .clear
+        titleLabel.text = "描述"
+        titleLabel.numberOfLines = 0
+        titleLabel.text = model.jobDuties
+        let lines = titleLabel.getRealLabelTextLines()
+        let height = titleLabel.qmui_lineHeight
+        var tempisShowExpand = false
+        if lines <= 2{
+            tempisShowExpand = false
+        }else{
+            tempisShowExpand = true
+        }
+        
+        if tempisShowExpand{
             expand = 20
         }else{
             expand = 0
         }
+        
         self.workModel = model
         var companyH:Float = 25
         let companyStr = model.companyName
@@ -58,16 +83,16 @@ class CNLiveViateWorkModelLayout:NSObject{
         }else{
             hang = 0
         }
-        var imgWH:Float = Float((KSreenWidth-60-15)/3.0+10)
+        var imgWH:Float = Float((KSreenWidth-60-15-10)/3.0+10)
         var cityH:Float = 35
         let cityStr = model.city
         if cityStr.count == 0 || cityStr == "请选择"{
             cityH = 0
         }else{
-            cityH = 35
+            
         }
         if isPreview == false{//工作记录详情页
-            _workModel?.cellH = Float(123-25)+companyH+descH+expand+Float(hang*imgWH)+cityH+55+15
+            _workModel?.cellH = Float(123-25)+gangwei+companyH+descH+expand+Float(hang*imgWH)-10+cityH+55+15
         }else{//预览工作记录
             imgWH = Float((Float(KSreenWidth)-30-40-50)/3.0+10)
             _workModel?.cellH = Float(162-58-25)+companyH+descH+expand+Float(hang*imgWH)+cityH//+55
@@ -99,14 +124,34 @@ class CNLiveViateAwardModelLayout:NSObject{
     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{
+        
+        let titleLabel = UILabel.init(frame: CGRectMake(0, 0, KSreenWidth-60, 40))
+        titleLabel.textColor = HexColor("#999999")
+        titleLabel.textAlignment = .left
+        titleLabel.font = Font_14
+        titleLabel.backgroundColor = .clear
+        titleLabel.text = "描述"
+        titleLabel.numberOfLines = 0
+        titleLabel.text = model.description
+        let lines = titleLabel.getRealLabelTextLines()
+        let height = titleLabel.qmui_lineHeight
+        var tempisShowExpand = false
+        if lines <= 2{
+            tempisShowExpand = false
+        }else{
+            tempisShowExpand = true
+        }
+        
+        if tempisShowExpand{
             expand = 20
         }else{
             expand = 0
         }
+
         self.awardModel = model
         var companyH:Float = 25
         let companyStr = model.company
@@ -132,7 +177,7 @@ class CNLiveViateAwardModelLayout:NSObject{
         }
         var imgWH:Float = Float((KSreenWidth-60-15)/3.0+10)
         if isPreview == false{//获奖详情页
-            _awardModel?.cellH = Float(123-25)+companyH+descH+expand+Float(hang*imgWH)+55+15
+            _awardModel?.cellH = Float(123-25)+companyH+descH+expand+Float(hang*imgWH)-10+55+15
         }else{//预览获奖
             imgWH = Float((Float(KSreenWidth)-30-40-50)/3.0+10)
             _awardModel?.cellH = Float(162-58-25-25)+companyH+descH+expand+Float(hang*imgWH)//+55