编辑工作记录

“张旭”
1 parent c2c70c39
Showing 13 changed files with 306 additions and 41 deletions
metaCode.xcodeproj/project.pbxproj
metaCode/Classes/Common/Util/HeroNetworkImageProvider.swift
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/Shop/GoodsManager/CNLiveAddGoodsSelectUploadImageView.swift
metaCode/Classes/Main/HomePage/ViewModel/Vitae/CNLiveVitaeViewModel.swift
metaCode/Classes/Main/Model/Vitae/CNLiveViateWorkModelLayout.swift
metaCode/Classes/Main/Model/Vitae/CNLiveVitaeModel.swift
metaCode/Classes/Other/AppDelegate.swift
@@ -145,6 +145,7 @@
 		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 */; };
+		197563772C5C80D9004E0F42 /* HeroNetworkImageProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 197563762C5C80D9004E0F42 /* HeroNetworkImageProvider.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 */; };
@@ -481,6 +482,7 @@
 		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>"; };
+		197563762C5C80D9004E0F42 /* HeroNetworkImageProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HeroNetworkImageProvider.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>"; };
@@ -1419,6 +1421,7 @@
 				792E57D82A3AA2F2005834DB /* CNLiveCommonBaseModel.swift */,
 				792E57DA2A3AE9F4005834DB /* CNLiveCommonQiniuTool.swift */,
 				1938BD462B4FD5A500390A34 /* CNLiveIntegralAlertTool.swift */,
+				197563762C5C80D9004E0F42 /* HeroNetworkImageProvider.swift */,
 			);
 			path = Util;
 			sourceTree = "<group>";
@@ -2293,6 +2296,7 @@
 				19C735C52BFF09BA00CACF4E /* CNLiveRealHotListDetailImageCell.swift in Sources */,
 				192ED4672C4F47E50057244C /* CNLiveSelectHangYeController.swift in Sources */,
 				790B1FB42A4153E90074CF00 /* CNLiveMineBaseModel.swift in Sources */,
+				197563772C5C80D9004E0F42 /* HeroNetworkImageProvider.swift in Sources */,
 				794294AA2B4D4381008AAFA0 /* CNLiveShortVideoCommentListView.swift in Sources */,
 				7978A8432A396632007C86B8 /* CNLiveMineViewModel.swift in Sources */,
 				19AD65AC2BA16CF20045A444 /* CNLiveShopCommentRequestShareModel.swift in Sources */,
+//
+//  HeroNetworkImageProvider.swift
+//  metaCode
+//
+//  Created by zx on 2024/8/2.
+//
+
+import Foundation
+import JFHeroBrowser
+import Kingfisher
+
+extension HeroNetworkImageProvider: NetworkImageProvider {
+    func downloadImage(with imgUrl: String, complete: Complete<UIImage>?) {
+        KingfisherManager.shared.retrieveImage(with: URL(string: imgUrl)!, options: nil) { receiveSize, totalSize in
+            guard totalSize > 0 else { return }
+            let progress:CGFloat = CGFloat(CGFloat(receiveSize) / CGFloat(totalSize))
+            complete?(.progress(progress))
+        } downloadTaskUpdated: { task in
+
+        } completionHandler: { result in
+            switch result {
+            case .success(let loadingImageResult):
+                complete?(.success(loadingImageResult.image))
+                break
+            case .failure(let error):
+                complete?(.failed(error))
+                break
+            }
+        }
+    }
+}
+
+class HeroNetworkImageProvider: NSObject {
+    @objc static let shared = HeroNetworkImageProvider()
+}
@@ -15,6 +15,19 @@ class CNLiveVitaeAddWorkController:CNLiveBaseViewController,UITableViewDataSourc
     var seleArr:Array<String>?
     var seleVideoUrl:String = ""
+    var isFirstEdit = true
+    //简历workModel
+    var _workModel : CNLiveVitaeWorksModel?
+    var workModel : CNLiveVitaeWorksModel? {
+        get{
+            _workModel
+        }
+        set{
+            _workModel = newValue!
+        }
+    }
+
+    
     let kCNLiveVitaeAddWorkFirCellIdentifier = "kCNLiveVitaeAddWorkFirCellIdentifier"
     let kCNLiveVitaeAddWorkSecCellIdentifier = "kCNLiveVitaeAddWorkSecCellIdentifier"
     let kCNLiveVitaeAddWorkThreeCellIdentifier = "kCNLiveVitaeAddWorkThreeCellIdentifier"
@@ -61,6 +74,10 @@ class CNLiveVitaeAddWorkController:CNLiveBaseViewController,UITableViewDataSourc
         titleName = "新增工作记录"
         navigationBarHidden = false
         self.initUI()
+        
+        if self.workModel != nil{
+            self.tableView.reloadData()
+        }
     }
     deinit {}
@@ -111,6 +128,9 @@ class CNLiveVitaeAddWorkController:CNLiveBaseViewController,UITableViewDataSourc
                 let cell = CNLiveVitaeAddWorkFirCell()
                 return cell
             }
+            if self.workModel != nil{
+                cell.workModel = self.workModel!
+            }
             return cell
         }else if indexPath.row == 1{
             //SecCell
@@ -119,6 +139,10 @@ class CNLiveVitaeAddWorkController:CNLiveBaseViewController,UITableViewDataSourc
                 let cell = CNLiveVitaeAddWorkSecCell()
                 return cell
             }
+            if self.workModel != nil && self.isFirstEdit == true{
+                cell.workModel = self.workModel!
+                self.isFirstEdit = false
+            }
             cell.uploadImageSuceessBlock = { imageUrl in
             }
@@ -135,8 +159,6 @@ class CNLiveVitaeAddWorkController:CNLiveBaseViewController,UITableViewDataSourc
                 self.seleVideoUrl = videoUrl ?? ""
                 self.seleArr = arr
                 self.tableView.reloadData()
-                print("11111video\(self.seleVideoUrl)")
-                print("11111photo\(self.seleArr)")
             }
             return cell
         }else if indexPath.row == 2{
@@ -146,6 +168,9 @@ class CNLiveVitaeAddWorkController:CNLiveBaseViewController,UITableViewDataSourc
                 let cell = CNLiveVitaeAddWorkThreeCell()
                 return cell
             }
+            if self.workModel != nil{
+                cell.workModel = self.workModel!
+            }
             return cell
         }else{
             return UITableViewCell()
@@ -173,7 +198,7 @@ class CNLiveVitaeAddWorkController:CNLiveBaseViewController,UITableViewDataSourc
     }
     //确认提交证书
-    @objc func addWorkBtnAction(){
+    @objc func addWorkBtnAction() {
         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
@@ -222,12 +247,17 @@ class CNLiveVitaeAddWorkController:CNLiveBaseViewController,UITableViewDataSourc
         }
         let danWei = threeCell?.phoneTextFiled.text ?? ""
         let workDiDian = threeCell?.weizhiRightTitleLabel.text ?? ""
-        let vsid = UserInfoManager.shared.userInfo.currentUser?.vsid ?? ""
         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 ?? "")
+            let endTime = self.convertDateStringToMillisecondsString(dateString: firCell?.endTimeRightTitleLabel.text ?? "")
             //提交工作记录
-            CNLiveVitaeViewModel.saveWork(city: workDiDian, companyName: danWei, imgs: newString, jobDuties: secCell?.huoJiangtextView.text ?? "", startWorkingDate: firCell?.canjiaRightTitleLabel.text ?? "", endWorkingDate: firCell?.endTimeRightTitleLabel.text ?? "", position: firCell?.phoneTextFiled.text ?? "", profession: firCell?.weizhiRightTitleLabel.text ?? "", vsid: vsid ?? "", vitaeId: jianli_vitaeId ?? "") { result, status in
+            var id = ""
+            if self.workModel != nil{
+                id = self.workModel!.id
+            }
+            CNLiveVitaeViewModel.saveWork(city: workDiDian, companyName: danWei, imgs: newString, jobDuties: secCell?.huoJiangtextView.text ?? "", startWorkingDate:startTime ?? "" , endWorkingDate: endTime ?? "" , position: firCell?.phoneTextFiled.text ?? "", profession: firCell?.weizhiRightTitleLabel.text ?? "", vsid: vsid ?? "", vitaeId: jianli_vitaeId ?? "", id: id) { result, status in
                 if status == .success{
                    self.navigationController?.viewControllers.forEach({ item in
                        if (item.isKind(of: CNLiveDigitalResumeController.self)) {
@@ -238,17 +268,25 @@ class CNLiveVitaeAddWorkController:CNLiveBaseViewController,UITableViewDataSourc
             }
         }
-//        //提交证书
-//        CNLiveVitaeViewModel.saveCertificate(img: self.seleImageUrl, lv: cell.cerLevelTF.text ?? "", number: cell.cerNumberTF.text ?? "", organization: cell.cerJiGouTF.text ?? "", time: cell.cerTimeTF.text ?? "", title: cell.cerNameTF.text ?? "", uploadTime: "", validity: cell.cerYouXiaoTF.text ?? "", vsid: vsid){result, respStatue in
-//            if respStatue == .success{
-//                self.navigationController?.viewControllers.forEach({ item in
-//                    if (item.isKind(of: CNLiveVitaeVocationalCertificateController.self)) {
-//                        self.navigationController?.popToViewController(item, animated: true)
-//                    }
-//                })
-//            }
-//            
-//        }
-        
+
+    }
+    
+    func convertDateStringToMillisecondsString(dateString: String, dateFormat: String = "yyyy.MM.dd") -> String? {
+        // 创建DateFormatter实例并设置日期格式
+        let formatter = DateFormatter()
+        formatter.dateFormat = dateFormat
+        formatter.timeZone = TimeZone(secondsFromGMT: 0) // 确保使用UTC时区
+          
+        // 使用DateFormatter解析日期字符串
+        if let date = formatter.date(from: dateString) {
+            // 获取时间戳（秒）并转换为毫秒
+            let milliseconds = Int64(date.timeIntervalSince1970 * 1000)
+              
+            // 将毫秒值转换为字符串
+            return String(milliseconds)
+        }
+          
+        // 如果日期字符串无法被解析，则返回nil
+        return nil
     }
 }
@@ -7,7 +7,7 @@
 import Foundation
 import SnapKit
-
+import JFHeroBrowser
 class CNLiveVitaeWorkDetailController:CNLiveBaseViewController,UITableViewDataSource, UITableViewDelegate{
     var jianjieLblHeight:CGFloat = 40
     var cellHeights:Array<CGFloat> = Array()
@@ -149,7 +149,17 @@ class CNLiveVitaeWorkDetailController:CNLiveBaseViewController,UITableViewDataSo
             self.workListArr = Array(tempArr)
             self.tableView.reloadData()
         }
-
+        cell.vitaeWorkPreviewVideoPhotoBlock = { images , index in
+            self.hero.browserMultiSoures(viewModules: images, initIndex: index) {
+                [
+                    .enableBlurEffect(false),
+                    .heroView(nil),
+                    .imageDidChangeHandle({ imageIndex in
+                        return nil
+                    })
+                ]
+            }
+        }
         return cell
     }
@@ -11,6 +11,17 @@ import SnapKit
 class CNLiveVitaeAddWorkFirCell:UITableViewCell, UITextFieldDelegate{
     var zhiyeStr:String = ""
+    //简历workModel
+    var _workModel : CNLiveVitaeWorksModel?
+    var workModel : CNLiveVitaeWorksModel? {
+        get{
+            _workModel
+        }
+        set{
+            _workModel = newValue!
+            setupNewUI(model: _workModel!)
+        }
+    }
     lazy var topWhiteView :UIView = {
         let bottomNavView = UIView()
@@ -308,7 +319,7 @@ class CNLiveVitaeAddWorkFirCell:UITableViewCell, UITextFieldDelegate{
     @objc func startTimeTapAction(){
         currentViewController()?.view.endEditing(true)
         MineInfoAlertView.showSelectView(showType: .selectDay) { [weak self] text in
-            print("刷新之后的数据是=>\(text)")//"2024-06-18"
+            print("刷新之后的数据是=>\(text)")//"2024.06.18"
             if (text as! String).count > 0{
                 let textStr = text as! String
                 self?.canjiaRightTitleLabel.text = textStr
@@ -336,7 +347,7 @@ class CNLiveVitaeAddWorkFirCell:UITableViewCell, UITextFieldDelegate{
     @objc func zhiJinBtnAction(){
         if let text = getCurrentDateAsString() {
-            print(text) // 输出类似 "2024-06-18" 的字符串，具体取决于当前日期
+            print(text) // 输出类似 "2024.06.18" 的字符串，具体取决于当前日期
             let textStr = text
             self.endTimeRightTitleLabel.text = textStr
             self.endTimeRightTitleLabel.textColor = HexColor("#333333")
@@ -345,6 +356,71 @@ class CNLiveVitaeAddWorkFirCell:UITableViewCell, UITextFieldDelegate{
             self.endTimeRightTitleLabel.textColor = HexColor("#B4B4B4")
         }
     }
+    
+    func setupNewUI(model:CNLiveVitaeWorksModel){
+        self.weizhiRightTitleLabel.text = model.profession
+        self.phoneTextFiled.text = model.position
+        
+        let startStr = self.convertMillisecondsStringToDateString(millisecondsString: model.startWorkingDate)
+        if startStr?.count ?? 0 > 0{
+            self.canjiaRightTitleLabel.text = startStr
+            self.canjiaRightTitleLabel.textColor = HexColor("#333333")
+        }else{
+            self.canjiaRightTitleLabel.text = "请选择"
+            self.canjiaRightTitleLabel.textColor = HexColor("#B4B4B4")
+        }
+        
+        let endStr = self.convertMillisecondsStringToDateString(millisecondsString: model.endWorkingDate)
+        if endStr?.count ?? 0 > 0{
+            self.endTimeRightTitleLabel.text = endStr
+            self.endTimeRightTitleLabel.textColor = HexColor("#333333")
+        }else{
+            self.endTimeRightTitleLabel.text = "请选择"
+            self.endTimeRightTitleLabel.textColor = HexColor("#B4B4B4")
+        }
+    }
+    
+    //"2024.07.02"格式转成"1722297600000"毫秒时间戳字符串
+    func convertDateStringToMillisecondsString(dateString: String, dateFormat: String = "yyyy.MM.dd") -> String? {
+        // 创建DateFormatter实例并设置日期格式
+        let formatter = DateFormatter()
+        formatter.dateFormat = dateFormat
+        formatter.timeZone = TimeZone(secondsFromGMT: 0) // 确保使用UTC时区
+          
+        // 使用DateFormatter解析日期字符串
+        if let date = formatter.date(from: dateString) {
+            // 获取时间戳（秒）并转换为毫秒
+            let milliseconds = Int64(date.timeIntervalSince1970 * 1000)
+              
+            // 将毫秒值转换为字符串
+            return String(milliseconds)
+        }
+          
+        // 如果日期字符串无法被解析，则返回nil
+        return nil
+    }
+    //"1722297600000"格式转为"yyyy.MM.dd"格式字符串
+    func convertMillisecondsStringToDateString(millisecondsString: String, dateFormatOutput: String = "yyyy.MM.dd") -> String? {
+        // 将毫秒时间戳字符串转换为Int64
+        if let milliseconds = Int64(millisecondsString) {
+            // 将毫秒转换为秒
+            let seconds = TimeInterval(milliseconds) / 1000
+              
+            // 使用Date表示这个时间戳
+            let date = Date(timeIntervalSince1970: seconds)
+              
+            // 创建DateFormatter并设置输出格式
+            let formatter = DateFormatter()
+            formatter.dateFormat = dateFormatOutput
+              
+            // 使用DateFormatter将Date格式化为字符串
+            return formatter.string(from: date)
+        }
+          
+        // 如果毫秒时间戳字符串无法被转换为Int64，则返回nil
+        return nil
+    }
+    
     func getCurrentDateAsString() -> String? {
         // 创建一个Date对象，它默认表示当前日期和时间
         let now = Date()
@@ -353,7 +429,7 @@ class CNLiveVitaeAddWorkFirCell:UITableViewCell, UITextFieldDelegate{
         let formatter = DateFormatter()
         // 设置DateFormatter的日期格式
-        formatter.dateFormat = "yyyy-MM-dd"
+        formatter.dateFormat = "yyyy.MM.dd"
         // 使用DateFormatter将Date对象格式化为字符串
         let dateString = formatter.string(from: now)
@@ -13,6 +13,19 @@ typealias UpdateAddWorkSecCellHeightBlock = (_ currentCell: CNLiveVitaeAddWorkSe
 class CNLiveVitaeAddWorkSecCell:UITableViewCell, UITextViewDelegate{
     var updateAddWorkSecCellHeightBlock:UpdateAddWorkSecCellHeightBlock?
+    
+    //简历workModel
+    var _workModel : CNLiveVitaeWorksModel?
+    var workModel : CNLiveVitaeWorksModel? {
+        get{
+            _workModel
+        }
+        set{
+            _workModel = newValue!
+            setupNewUI(model: _workModel!)
+        }
+    }
+    
     lazy var topWhiteView :UIView = {
         let bottomNavView = UIView()
         bottomNavView.backgroundColor = .white
@@ -187,6 +200,23 @@ class CNLiveVitaeAddWorkSecCell:UITableViewCell, UITextViewDelegate{
     }
+    func setupNewUI(model:CNLiveVitaeWorksModel){
+        self.huoJiangtextView.text = model.jobDuties
+        self.huoJiangNumberLabel.text = "\(model.jobDuties.count)/1000"
+        
+        let imgArr =  model.imgs.components(separatedBy: ",")
+        var tempImgArr = Array<String>()
+        var tempVideoUrl = ""
+        for (_,imgUrl) in imgArr.enumerated() {
+            if imgUrl.contains("vitae_video_"){
+                tempVideoUrl = imgUrl
+            }else{
+                tempImgArr.append(imgUrl)
+            }
+        }
+        self.selectUploadImageView?.networkImageArr = tempImgArr
+        self.selectUploadImageView?.networkVideoUrl = tempVideoUrl
+    }
     func textViewDidEndEditing(_ textView: UITextView) {
         if textView.text.lengthOfBytes(using: .utf8) < 1 {
@@ -10,6 +10,19 @@ import Kingfisher
 import SnapKit
 class CNLiveVitaeAddWorkThreeCell:UITableViewCell, UITextFieldDelegate{
+    
+    //简历workModel
+    var _workModel : CNLiveVitaeWorksModel?
+    var workModel : CNLiveVitaeWorksModel? {
+        get{
+            _workModel
+        }
+        set{
+            _workModel = newValue!
+            setupNewUI(model: _workModel!)
+        }
+    }
+    
     var selectAreaVC:CNLiveDigitalResumeInfoSelectAddressController?
     lazy var topWhiteView :UIView = {
@@ -205,6 +218,13 @@ class CNLiveVitaeAddWorkThreeCell:UITableViewCell, UITextFieldDelegate{
         self.selectAreaVC?.display()
     }
-    
+    func setupNewUI(model:CNLiveVitaeWorksModel){
+        self.phoneTextFiled.text = model.companyName.count>0 ? model.companyName : "请填写"
+        var cityStr = model.city
+        if cityStr.count == 0{
+            cityStr = "请选择"
+        }
+        self.weizhiRightTitleLabel.text = cityStr
+    }
 }
@@ -10,14 +10,21 @@ import QMUIKit
 import SwiftUI
 import SnapKit
 import Kingfisher
-import SKPhotoBrowser
-
+import JFHeroBrowser
 //cell高度变化
 typealias vitaeWorkCellChangedBlockActionBlock = (_ cell: CNLiveVitaeWorkCell ,_ cellHeight:CGFloat) -> Void
+typealias VitaeWorkPreviewVideoPhotoBlock = (_ images: [HeroBrowserViewModuleBaseProtocol] ,_ index:Int) -> Void
 class CNLiveVitaeWorkCell: UITableViewCell{
-    var images = [SKPhoto]()
+    
+    lazy var images: [HeroBrowserViewModuleBaseProtocol] = {
+        var list: [HeroBrowserViewModuleBaseProtocol] = []
+        return list
+    }()
+    
+    var vitaeWorkPreviewVideoPhotoBlock:VitaeWorkPreviewVideoPhotoBlock?
+
     var vitaeWorkCellChangedBlock:vitaeWorkCellChangedBlockActionBlock?
     //简历workModel
@@ -303,21 +310,46 @@ class CNLiveVitaeWorkCell: UITableViewCell{
                 imgView.isUserInteractionEnabled = true
                 imgView.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(imgViewTapAciton)))
                 imgView.tag = 1000+i
-                imgView.contentMode = .scaleAspectFit
+                imgView.contentMode = .center
                 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)
+                if imgUrl.contains("vitae_video_"){
+                    //是视频
+                    let thumbailImgUrl = "http://wjjtest.ys2.cnliveimg.com/802/mateCode/img/vitae_photo_0/2024/08/02/3977195366.jpg"
+                    let vm = HeroBrowserVideoViewModule(thumbailImgUrl: thumbailImgUrl, videoUrl: imgUrl, provider: HeroNetworkImageProvider.shared, autoPlay: true)
+                    self.images.append(vm)
+                    imgView.kf.setImage(with: URL(string: thumbailImgUrl),placeholder: UIImage(color: UIColor.lightGray, size: imgView.size))
+                    
+                    let playBtn = UIButton(type: .custom)
+                    playBtn.frame = imgView.bounds
+                    playBtn.setImage(UIImage(named: "short_video_play"), for: .normal)
+                    playBtn.addTarget(self, action: #selector(playBtnAction(btn:)), for: .touchUpInside)
+                    playBtn.clipsToBounds = true
+                    playBtn.layer.cornerRadius = 5
+                    playBtn.tag = 1000+i
+                    imgView.addSubview(playBtn)
+                }else if imgUrl.contains("vitae_photo_"){
+                    //是图片
+                    self.images.append(HeroBrowserNetworkImageViewModule(thumbailImgUrl: nil, originImgUrl: imgUrl))
+                    imgView.kf.setImage(with: URL(string: imgUrl))
+                }else{
+                    //默认图片
+                    self.images.append(HeroBrowserNetworkImageViewModule(thumbailImgUrl: nil, originImgUrl: imgUrl))
+                    imgView.kf.setImage(with: URL(string: imgUrl))
+                }
             }
         }
-        self.workDingWeiTitleLabel.text = model.city
+        let cityStr = model.city
+        if cityStr.count == 0 || cityStr == "请选择"{
+            self.workDingWeiTitleLabel.isHidden = true
+        }else{
+            self.workDingWeiTitleLabel.isHidden = false
+            self.workDingWeiTitleLabel.text = model.city
+        }
     }
     func convertTimestampStringToDateString(timestampString: String) -> String? {
@@ -357,19 +389,22 @@ class CNLiveVitaeWorkCell: UITableViewCell{
     }
     @objc func editBtnAction(){
-        
+        let vc = CNLiveVitaeAddWorkController()
+        vc.workModel = self.workModel
+        navigationViewController().pushViewController(vc, animated: true)
     }
     @objc func deleteBtnAction(){
     }
-    
+    @objc func playBtnAction(btn:UIButton){
+        let index = btn.tag-1000
+        self.vitaeWorkPreviewVideoPhotoBlock?(self.images, index)
+    }
     @objc func imgViewTapAciton(ges: UITapGestureRecognizer){
         let imgView = ges.view as! UIImageView
         let index = imgView.tag-1000
-        let browser = SKPhotoBrowser(photos: self.images)
-        browser.initializePageIndex(index)
-        currentViewController()?.present(browser, animated: true)
+        self.vitaeWorkPreviewVideoPhotoBlock?(self.images, index)
     }
 }
@@ -345,6 +345,9 @@ class CNLiveAddGoodsSelectUploadImageView: UIView,UIImagePickerControllerDelegat
      */
     func deleteUploadImageUrl(){
         for uploadImageModel in self.uploadImageUrls {
+            if uploadImageModel.imageUrl == nil || uploadImageModel.imageUrl?.count == 0{
+                return
+            }
             if !self.networkImageArr.contains(uploadImageModel.imageUrl!){
                 UploadManager.shared.requestQiNiuDeleteImageUrl(imageUrl: uploadImageModel.imageUrl!) { result, status in
@@ -236,7 +236,7 @@ class CNLiveVitaeViewModel:NSObject{
      保存简历-工作经历(新增工作记录)
      参数 vsid 实名对象id
      */
-    static func saveWork(city:String,companyName:String,imgs:String,jobDuties:String,startWorkingDate:String,endWorkingDate:String,position:String,profession:String,vsid:String,vitaeId:String,resultBlock: @escaping downSlideResultBlock) {
+    static func saveWork(city:String,companyName:String,imgs:String,jobDuties:String,startWorkingDate:String,endWorkingDate:String,position:String,profession:String,vsid:String,vitaeId:String,id:String,resultBlock: @escaping downSlideResultBlock) {
         let values = NSMutableDictionary()
         values.addEntries(from: ["profession":profession])
         values.addEntries(from: ["position":position])
@@ -248,6 +248,9 @@ class CNLiveVitaeViewModel:NSObject{
         values.addEntries(from: ["city":city])
         values.addEntries(from: ["vsid":vsid])
         values.addEntries(from: ["vitaeId":vitaeId])
+        if id.count > 0{
+            values.addEntries(from: ["id":id])
+        }
         do {
             let request = URLRequest.init(url: URL.init(string: APPBaseMCUrl+"/userApi/saveVitaeWork")!) as! NSMutableURLRequest
             request.httpMethod = "POST"
@@ -43,7 +43,14 @@ class CNLiveViateWorkModelLayout:NSObject{
             hang = 0
         }
         let imgWH:Float = Float((KSreenWidth-60-15)/3.0+10)
-        _workModel?.cellH = Float(123)+descH+Float(hang*imgWH)+90
+        var cityH:Float = 35
+        let cityStr = model.city
+        if cityStr.count == 0 || cityStr == "请选择"{
+            cityH = 0
+        }else{
+            cityH = 35
+        }
+        _workModel?.cellH = Float(123)+descH+Float(hang*imgWH)+cityH+55
     }
     func getCellHModel()->CNLiveVitaeWorksModel{
         return _workModel!
@@ -82,7 +82,7 @@ class CNLiveVitaeIdentitiesModel:BaseModel{
 //简历工作模块
 class CNLiveVitaeWorksModel:BaseModel{
     ///
-    var id: Int = 0
+    var id:String = ""
     ///
     var vitaeId:String = ""
     ///
@@ -12,6 +12,8 @@ import CNLiveShareToolKit
 //import RangersAPM
 import CNLiveEnvironment
 import CNLivePayCostModule
+import JFHeroBrowser
+
 @main
 class AppDelegate: UIResponder, UIApplicationDelegate {
@@ -20,6 +22,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     func application(_ appUITableViewRowDatalication: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
+        JFHeroBrowserGlobalConfig.default.networkImageProvider = HeroNetworkImageProvider.shared
+
         // Override point for customization after application launch.
         //tencentAppId  wxAppId
         CNLiveShareManager.registeredShareView(whenDidFinishLaunch: universalLinkURL, appId: APPId, tencentAppId: tencentAppId, wxAppId: wxAppId, wxSecret: "", weiBoAppId: "")