新增工作记录页面逻辑

“张旭”
1 parent ce22b596
Showing 11 changed files with 421 additions and 74 deletions
metaCode/Classes/Common/Util/CNLiveCommonQiniuTool.swift
metaCode/Classes/Main/HomePage/Controller/DigitalAuth/CNLiveDigitalResumeInfoController.swift
metaCode/Classes/Main/HomePage/Controller/DigitalAuth/工作相关页面/CNLiveVitaeAddWorkController.swift
metaCode/Classes/Main/HomePage/View/DigitalAuthViews/DigitalResume/CNLiveDigitalResumeCell.swift
metaCode/Classes/Main/HomePage/View/DigitalAuthViews/Vitae/Certificate/CNLiveVitaeCertificateAddPhotoCell.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/Shop/GoodsManager/CNLiveAddGoodsSelectUploadImageView.swift
metaCode/Classes/Main/HomePage/ViewModel/Vitae/CNLiveVitaeViewModel.swift
metaCode/Classes/Main/MinePage/View/CNLiveMineInfoAlertView.swift
@@ -52,6 +52,28 @@ class UploadManager: NSObject {
         return key
     }
+    /// 数字简历上传图片
+    /// - Parameters:
+    ///   - imageData: 图片数据
+    ///   - progressBlock: 进度回调
+    ///   - successBlock: 成功回调
+    static func uploadViateImage(imageData: NSData, progressBlock:@escaping ProgressBlcok, successBlock: @escaping SuccessBlock) -> String {
+        let key = UploadManager.createViateImageFileName()
+        UploadManager.uploadData(madiaData: imageData, key: key, progress: progressBlock, success: successBlock)
+        return key
+    }
+    
+    /// 数字简历上传视频
+    /// - Parameters:
+    ///   - imageData: 视频数据
+    ///   - progressBlock: 进度回调
+    ///   - successBlock: 成功回调
+    static func uploadViateVideo(videoData: NSData, progressBlock:@escaping ProgressBlcok, successBlock: @escaping SuccessBlock) -> String {
+        let key = UploadManager.createViateVideoFileName()
+        UploadManager.uploadData(madiaData: videoData, key: key, progress: progressBlock, success: successBlock)
+        return key
+    }
+    
     // MARK: - 取消上传
     func cancelUploadKey(key:String){
         for (_,obj) in self.uploadModels.enumerated() {
@@ -95,14 +117,14 @@ class UploadManager: NSObject {
         param.setValue("2", forKey: "storageType")
         param.setValue(kBucketName_QN, forKey: "bucket")
         let custom_param = NSMutableDictionary()
-        custom_param.setValue(CNLiveMCEnvironmentManager.shared.appId, forKey: "appId")
-        custom_param.setValue(CNLiveMCEnvironmentManager.shared.appKey, forKey: "appKey")
+        custom_param.setValue("802_li40qhp922", forKey: "appId")//CNLiveMCEnvironmentManager.shared.appId
+        custom_param.setValue("ae3a7ad3e4b9beb7cfe2078db648ebb89aa249ca2e82ac", forKey: "appKey")//CNLiveMCEnvironmentManager.shared.appKey
         CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
         CNLiveNetworking.setupShowResult(true)
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
         CNLiveNetworking.setupShowDataResult(false)
-        CNLiveNetworking.setupSignRequestKey(CNLiveMCEnvironmentManager.shared.appKey)//APPKey_wjj APPKey
-        
+        CNLiveNetworking.setupSignRequestKey("ae3a7ad3e4b9beb7cfe2078db648ebb89aa249ca2e82ac")//CNLiveMCEnvironmentManager.shared.appKey)//APPKey_wjj APPKey
+                
         CNLiveNetworking.requestNetwork(with: .POST, urlString: "\(CNLiveMCEnvironmentManager.shared.img_token_url)/vod_epg/getUploadAuthForApp", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
             hiddenLoading()
@@ -166,6 +188,21 @@ class UploadManager: NSObject {
         let imageName = "802/mateCode/video/\(NSDate().string(withFormat: "yyyy/MM/dd") )/\(arc4random()).mp4"
         return imageName
     }
+    
+    ///数字简历使用的bucket,图片bucket是"vitae_photo_" , 视频是"vitae_video_"
+    /// 设置图片名称
+    /// - Returns: 图片名
+    static private func createViateImageFileName() -> String {
+        let imageName = "802/mateCode/img/vitae_photo_0/\(NSDate().string(withFormat: "yyyy/MM/dd") )/\(arc4random()).jpg"
+        return imageName
+    }
+    
+    /// 设置视频名称
+    /// - Returns: 图片名
+    static private func createViateVideoFileName() -> String {
+        let imageName = "802/mateCode/video/vitae_video_0/\(NSDate().string(withFormat: "yyyy/MM/dd") )/\(arc4random()).mp4"
+        return imageName
+    }
 }
 class QiNiuUploadModel: BaseModel {
@@ -10,12 +10,10 @@ import SnapKit
 import CoreLocation
-class CNLiveDigitalResumeInfoController:CNLiveBaseViewController, UITextFieldDelegate,CLLocationManagerDelegate{
+class CNLiveDigitalResumeInfoController:CNLiveBaseViewController, UITextFieldDelegate{
     var selectAreaVC:CNLiveDigitalResumeInfoSelectAddressController?
-    let locationManager = CLLocationManager()
-
     lazy var topWhiteView :UIView = {
         let bottomNavView = UIView()
         bottomNavView.backgroundColor = .white
@@ -10,6 +10,11 @@ import SnapKit
 class CNLiveVitaeAddWorkController:CNLiveBaseViewController,UITableViewDataSource, UITableViewDelegate{
+    var hangHeight:CGFloat = (KSreenWidth-90)/3.0+10
+    var secCell:CNLiveVitaeAddWorkSecCell?
+    var seleArr:Array<String>?
+    var seleVideoUrl:String = ""
+    
     let kCNLiveVitaeAddWorkFirCellIdentifier = "kCNLiveVitaeAddWorkFirCellIdentifier"
     let kCNLiveVitaeAddWorkSecCellIdentifier = "kCNLiveVitaeAddWorkSecCellIdentifier"
     let kCNLiveVitaeAddWorkThreeCellIdentifier = "kCNLiveVitaeAddWorkThreeCellIdentifier"
@@ -117,6 +122,22 @@ class CNLiveVitaeAddWorkController:CNLiveBaseViewController,UITableViewDataSourc
             cell.uploadImageSuceessBlock = { imageUrl in
             }
+            cell.selectUploadImageView?.changeUploadDataCallBack = { imageUrls , videoUrl in
+                self.seleVideoUrl = videoUrl 
+                self.seleArr = imageUrls
+            }
+            
+            cell.updateAddWorkSecCellHeightBlock = {cell, hangHeight in
+                self.hangHeight = hangHeight
+                self.secCell = cell
+                let arr = cell.selectUploadImageView?.getCurrentSelectImageUrls()
+                let videoUrl = cell.selectUploadImageView?.getCurrentSelectVideoUrl()
+                self.seleVideoUrl = videoUrl ?? ""
+                self.seleArr = arr
+                self.tableView.reloadData()
+                print("11111video\(self.seleVideoUrl)")
+                print("11111photo\(self.seleArr)")
+            }
             return cell
         }else if indexPath.row == 2{
             //ThreeCell
@@ -139,7 +160,11 @@ class CNLiveVitaeAddWorkController:CNLiveBaseViewController,UITableViewDataSourc
         if indexPath.row == 0{
             return 276+15
         }else if indexPath.row == 1{
-            return 368+15
+            if self.secCell == nil{
+                return self.hangHeight+268+15
+            }else{
+                return self.hangHeight
+            }
         }else if indexPath.row == 2{
             return 123+15
         }else{
@@ -149,25 +174,70 @@ class CNLiveVitaeAddWorkController:CNLiveBaseViewController,UITableViewDataSourc
     //确认提交证书
     @objc func addWorkBtnAction(){
-//        let cell = self.tableView.cellForRow(at: IndexPath(row: 0, section: 0)) as! CNLiveVitaeCertificateAddInfoCell
-//        //判断非空
-//        if self.seleImage == nil{
-//            showMessage(message: "请上传图片")
-//            return
-//        }
-//        if cell.cerNameTF.text?.count == 0{
-//            showMessage(message: "请填写证书名称")
-//            return
-//        }
-//        if cell.cerNumberTF.text?.count == 0{
-//            showMessage(message: "请填写资格证编号")
-//            return
-//        }
-//        if cell.cerJiGouTF.text?.count == 0{
-//            showMessage(message: "请填写发证机构")
-//            return
-//        }
-//        let vsid = UserInfoManager.shared.userInfo.currentUser?.vsid ?? ""
+        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
+        //判断非空
+        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 secCell?.huoJiangtextView.text?.count == 0 || secCell?.huoJiangtextView.text == "获奖描述"{
+            showMessage(message: "请填写经历描述")
+            return
+        }
+        
+        var newString = ""
+        if self.seleArr?.count ?? 0 > 0{
+            if self.seleVideoUrl.count > 0{
+                self.seleArr!.append(self.seleVideoUrl)
+            }
+            newString = self.seleArr!.joined(separator: ",")
+        }else{
+            if self.seleArr == nil || self.seleArr?.count ?? 0 == 0{
+                if self.seleVideoUrl.count == 0{
+                    //
+                    showMessage(message: "请上传凭证")
+                    return
+                }else{
+                    if self.seleVideoUrl.count > 0{
+                        newString = self.seleVideoUrl
+                    }
+                }
+            }else{
+                
+            }
+        }
+        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
+            //提交工作记录
+            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
+                if status == .success{
+                   self.navigationController?.viewControllers.forEach({ item in
+                       if (item.isKind(of: CNLiveDigitalResumeController.self)) {
+                           self.navigationController?.popToViewController(item, animated: true)
+                       }
+                   })
+               }
+            }
+            
+        }
 //        //提交证书
 //        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{
@@ -179,5 +249,6 @@ class CNLiveVitaeAddWorkController:CNLiveBaseViewController,UITableViewDataSourc
 //            }
 //            
 //        }
+        
     }
 }
@@ -241,7 +241,7 @@ class CNLiveDigitalResumeCell: UITableViewCell {
     lazy var chakanTitleLabel: UILabel = {
         let titleLabel = UILabel()
         titleLabel.textColor = HexColor("#999999")
-        titleLabel.textAlignment = .right
+        titleLabel.textAlignment = .center
         titleLabel.text = "查看完整资料  >"
         titleLabel.font = Font_14
         titleLabel.isUserInteractionEnabled = true
@@ -462,7 +462,7 @@ class CNLiveDigitalResumeCell: UITableViewCell {
         self.chakanTitleLabel.snp.makeConstraints { make in
             make.top.equalTo(self.bottomLineView.snp.bottom).offset(15)
             make.centerX.equalToSuperview()
-            make.width.equalTo(100)
+            make.width.equalTo(200)
         }
         self.whiteBgView.addSubview(self.shezhiView)
         self.shezhiView.snp.makeConstraints { make in
@@ -190,7 +190,7 @@ extension CNLiveVitaeCertificateAddPhotoCell {
                             didFinishSelection result: PickerResult) {
         result.getImage { [weak self] (image, photoAsset, index) in
             if let image = image {
-                let uploadKey = UploadManager.uploadImage(imageData: image.jpegData(compressionQuality: 1.0)! as NSData, progressBlock: {key, progress in
+                let uploadKey = UploadManager.uploadViateImage(imageData: image.jpegData(compressionQuality: 1.0)! as NSData, progressBlock: {key, progress in
                     print("获取进度==>\(progress)")
                 }, successBlock: { [weak self] key,url in
                     self?.selectImageBlock?(image,key,url)
@@ -306,14 +306,60 @@ class CNLiveVitaeAddWorkFirCell:UITableViewCell, UITextFieldDelegate{
     }
     @objc func startTimeTapAction(){
-        
+        currentViewController()?.view.endEditing(true)
+        MineInfoAlertView.showSelectView(showType: .selectDay) { [weak self] text in
+            print("刷新之后的数据是=>\(text)")//"2024-06-18"
+            if (text as! String).count > 0{
+                let textStr = text as! String
+                self?.canjiaRightTitleLabel.text = textStr
+                self?.canjiaRightTitleLabel.textColor = HexColor("#333333")
+            }else{
+                self?.canjiaRightTitleLabel.text = "请选择"
+                self?.canjiaRightTitleLabel.textColor = HexColor("#B4B4B4")
+            }
+        }
     }
     @objc func endTimeTapAction(){
-        
+        currentViewController()?.view.endEditing(true)
+        MineInfoAlertView.showSelectView(showType: .selectDay) { [weak self] text in
+            print("刷新之后的数据是=>\(text)")//"2024-06-18"
+            if (text as! String).count > 0{
+                let textStr = text as! String
+                self?.endTimeRightTitleLabel.text = textStr
+                self?.endTimeRightTitleLabel.textColor = HexColor("#333333")
+            }else{
+                self?.endTimeRightTitleLabel.text = "请选择"
+                self?.endTimeRightTitleLabel.textColor = HexColor("#B4B4B4")
+            }
+        }
     }
     @objc func zhiJinBtnAction(){
-        
+        if let text = getCurrentDateAsString() {
+            print(text) // 输出类似 "2024-06-18" 的字符串，具体取决于当前日期
+            let textStr = text
+            self.endTimeRightTitleLabel.text = textStr
+            self.endTimeRightTitleLabel.textColor = HexColor("#333333")
+        }else{
+            self.endTimeRightTitleLabel.text = "请选择"
+            self.endTimeRightTitleLabel.textColor = HexColor("#B4B4B4")
+        }
+    }
+    func getCurrentDateAsString() -> String? {
+        // 创建一个Date对象，它默认表示当前日期和时间
+        let now = Date()
+          
+        // 创建一个DateFormatter对象
+        let formatter = DateFormatter()
+          
+        // 设置DateFormatter的日期格式
+        formatter.dateFormat = "yyyy-MM-dd"
+          
+        // 使用DateFormatter将Date对象格式化为字符串
+        let dateString = formatter.string(from: now)
+          
+        // 返回格式化后的日期字符串
+        return dateString
     }
 }
@@ -9,7 +9,7 @@ import Foundation
 import Kingfisher
 import SnapKit
-typealias UpdateAddWorkSecCellHeightBlock = (_ currentCell: CNLiveVitaeAddWorkSecCell ,_ height:Int) -> Void
+typealias UpdateAddWorkSecCellHeightBlock = (_ currentCell: CNLiveVitaeAddWorkSecCell ,_ uploadHeight:CGFloat) -> Void
 class CNLiveVitaeAddWorkSecCell:UITableViewCell, UITextViewDelegate{
     var updateAddWorkSecCellHeightBlock:UpdateAddWorkSecCellHeightBlock?
@@ -66,14 +66,54 @@ class CNLiveVitaeAddWorkSecCell:UITableViewCell, UITextViewDelegate{
     var selectUploadImageView:CNLiveAddGoodsSelectUploadImageView?{
         get{
             if _selectUploadImageView == nil{
-                _selectUploadImageView = CNLiveAddGoodsSelectUploadImageView(frame: CGRect(x: 0, y: 248, width: KSreenWidth, height: 100))
+                _selectUploadImageView = CNLiveAddGoodsSelectUploadImageView(frame: CGRect(x: 0, y: 248, width: KSreenWidth-30, height: 110))
                 _selectUploadImageView?.maxSelectImageCount = 9
+                _selectUploadImageView?.column = 3
                 _selectUploadImageView?.isAbleSelectVideo = true
+                _selectUploadImageView?.isViate = true
                 _selectUploadImageView?.deleteImage = UIImage(named: "DS_happ_daren_dynamic_delete")
+                _selectUploadImageView?.changeFrameCallBack = {
+                    let whiteH = self.selectUploadImageView!.height + self.selectUploadImageView!.top+20
+                    self.topWhiteView.snp.remakeConstraints { make in
+                        make.top.equalTo(15)
+                        make.left.equalTo(15)
+                        make.right.equalToSuperview().offset(-15)
+                        make.height.equalTo(whiteH)
+                    }
+                    self.updateAddWorkSecCellHeightBlock!(self, whiteH+20)
+
+                }
                 _selectUploadImageView?.endUploadImageCallBack = {
                     let imageUrl = self.selectUploadImageView?.getCurrentSelectImageUrls().first
                     self.uploadImageSuceessBlock!(imageUrl ?? "")
+                    
+                    let arr = self.selectUploadImageView?.getCurrentSelectImageUrls()
+                    var hangNum = 1
+                    if arr?.count ?? 0 <= 1{
+                        hangNum = 1
+                    }else if arr?.count ?? 0 <= 4{
+                        hangNum = 2
+                    }else if arr?.count ?? 0 <= 9{
+                        hangNum = 3
+                    }else{
+                        hangNum = 4
+                    }
+                    let addXRSpace = 15 - 17*0.5
+                    let addXSpace = 15 - 17*0.5
+                    let column:CGFloat = 3
+                    let totalSpace = 15 + addXRSpace + addXSpace*CGFloat(column - 1)
+                    let aHeight = ((KSreenWidth-30 - totalSpace) / column)
+                    self.selectUploadImageView?.height = (aHeight+10)*CGFloat(hangNum)
+                    let whiteH = self.selectUploadImageView!.height + self.selectUploadImageView!.top+20
+                    self.topWhiteView.snp.remakeConstraints { make in
+                        make.top.equalTo(15)
+                        make.left.equalTo(15)
+                        make.right.equalToSuperview().offset(-15)
+                        make.height.equalTo(whiteH)
+                    }
+                    self.updateAddWorkSecCellHeightBlock!(self, whiteH+20)
                 }
+
             }
             return _selectUploadImageView
@@ -103,7 +143,7 @@ class CNLiveVitaeAddWorkSecCell:UITableViewCell, UITextViewDelegate{
             make.top.equalTo(15)
             make.left.equalTo(15)
             make.right.equalToSuperview().offset(-15)
-            make.height.equalTo(368)
+            make.height.equalTo(368+15)
         }
         self.topWhiteView.addSubview(self.weizhiTitleLabel)
         self.weizhiTitleLabel.snp.makeConstraints { make in
@@ -10,6 +10,8 @@ import Kingfisher
 import SnapKit
 class CNLiveVitaeAddWorkThreeCell:UITableViewCell, UITextFieldDelegate{
+    var selectAreaVC:CNLiveDigitalResumeInfoSelectAddressController?
+
     lazy var topWhiteView :UIView = {
         let bottomNavView = UIView()
         bottomNavView.backgroundColor = .white
@@ -185,8 +187,24 @@ class CNLiveVitaeAddWorkThreeCell:UITableViewCell, UITextFieldDelegate{
     }
     @objc func workCityTapAction(){
-
+        self.displaySelectAreaVC()
     }
+    func displaySelectAreaVC(){
+        if self.selectAreaVC == nil{
+            let vc = CNLiveDigitalResumeInfoSelectAddressController()
+            vc.finishSelectAreaCallBack = { [weak self] in
+                self?.weizhiRightTitleLabel.text = String(format: "%@%@%@",self?.selectAreaVC?.province ?? "",self?.selectAreaVC?.city ?? "",self?.selectAreaVC?.area ?? "" )
+            }
+            let currVC = currentViewController()
+            currVC?.addChild(vc)
+            vc.view.frame = CGRect(x: 0, y: 0, width: KSreenWidth, height: KSreenHeight)
+            currVC?.view.addSubview(vc.view)
+            vc.didMove(toParent: currVC)
+            self.selectAreaVC = vc
+        }
+        self.selectAreaVC?.display()
+    }
+
 }
@@ -36,6 +36,7 @@ typealias endUploadImageCallBackBlock = ()-&gt;Void
 class CNLiveAddGoodsSelectUploadImageView: UIView,UIImagePickerControllerDelegate, PhotoPickerControllerDelegate {
+    var isViate = false//是否是 数字简历,bucket不一样
     // MARK: - 属性
     /// 显示类型
@@ -715,6 +716,26 @@ class CNLiveAddGoodsSelectUploadImageView: UIView,UIImagePickerControllerDelegat
                         }
                     }
                     break
+                }else{
+                    if model.isVideo == true{
+                        //当前要删除的是视频
+                        if self.uploadVideoModel?.isVideo == true{
+                            //subview是视频
+                            if self.uploadVideoModel?.isUploading == true{
+                                //subview正在上传中
+                                UploadManager.shared.cancelUploadKey(key: self.uploadVideoModel!.uploadKey!)
+                                self.uploadVideoModel = nil
+                            }else{
+                                //subview上传完成
+                                //标记当前有视频,并替换model
+                                self.replaceVideoUrls.append(self.uploadVideoModel!)
+                                let videoModel = CNLiveSelectUploadImageModel()
+                                videoModel.isVideo = true
+                                self.uploadVideoModel = videoModel
+                            }
+                        }
+                        break
+                    }
                 }
             }
@@ -746,25 +767,47 @@ class CNLiveAddGoodsSelectUploadImageView: UIView,UIImagePickerControllerDelegat
                     self.uploadVideoModel?.image = firstImage.first
                     self.uploadVideoModel?.localVideoUrl = videoUrl
                     self.uploadVideoModel?.isUploading = true
-                    
-                    self.uploadVideoModel?.uploadKey = UploadManager.uploadVideo(videoData: videoData, progressBlock: { [weak self] key, progress in
-                        self!.uploadVideoModel?.uploadingPercent = progress
-                        self?.replaceVideoModelInSubviews(model: (self?.uploadVideoModel)!, target: firstImage.first!)
-                    }, successBlock: { [weak self] key,url in
-                        self?.uploadVideoModel?.videoUrl = url
-                        self?.uploadVideoModel?.isUploading = false
-                        self?.uploadVideoModel?.uploadKey = nil
-                        self?.replaceVideoModelInSubviews(model: (self?.uploadVideoModel)!, target: firstImage.first!)
-                        self?.uploadingCount = self!.uploadingCount - 1
-                        if self?.uploadingCount == 0{
-                            if ((self?.endUploadImageCallBack?()) != nil){
-                                self?.endUploadImageCallBack!()
+                    if self.isViate == true{
+                        self.uploadVideoModel?.uploadKey = UploadManager.uploadViateVideo(videoData: videoData, progressBlock: { [weak self] key, progress in
+                            self!.uploadVideoModel?.uploadingPercent = progress
+                            self?.replaceVideoModelInSubviews(model: (self?.uploadVideoModel)!, target: firstImage.first!)
+                        }, successBlock: { [weak self] key,url in
+                            self?.uploadVideoModel?.videoUrl = url
+                            self?.uploadVideoModel?.isUploading = false
+                            self?.uploadVideoModel?.uploadKey = nil
+                            self?.replaceVideoModelInSubviews(model: (self?.uploadVideoModel)!, target: firstImage.first!)
+                            self?.uploadingCount = self!.uploadingCount - 1
+                            if self?.uploadingCount == 0{
+                                if ((self?.endUploadImageCallBack?()) != nil){
+                                    self?.endUploadImageCallBack!()
+                                }
                             }
-                        }
-                        if ((self?.changeUploadDataCallBack?((self?.getCurrentSelectImageUrls())!,(self?.getCurrentSelectVideoUrl())!)) != nil){
-                            self?.changeUploadDataCallBack!((self?.getCurrentSelectImageUrls())!,(self?.getCurrentSelectVideoUrl())!)
-                        }
-                    })
+                            if ((self?.changeUploadDataCallBack?((self?.getCurrentSelectImageUrls())!,(self?.getCurrentSelectVideoUrl())!)) != nil){
+                                self?.changeUploadDataCallBack!((self?.getCurrentSelectImageUrls())!,(self?.getCurrentSelectVideoUrl())!)
+                            }
+                        })
+
+                    }else{
+                        self.uploadVideoModel?.uploadKey = UploadManager.uploadVideo(videoData: videoData, progressBlock: { [weak self] key, progress in
+                            self!.uploadVideoModel?.uploadingPercent = progress
+                            self?.replaceVideoModelInSubviews(model: (self?.uploadVideoModel)!, target: firstImage.first!)
+                        }, successBlock: { [weak self] key,url in
+                            self?.uploadVideoModel?.videoUrl = url
+                            self?.uploadVideoModel?.isUploading = false
+                            self?.uploadVideoModel?.uploadKey = nil
+                            self?.replaceVideoModelInSubviews(model: (self?.uploadVideoModel)!, target: firstImage.first!)
+                            self?.uploadingCount = self!.uploadingCount - 1
+                            if self?.uploadingCount == 0{
+                                if ((self?.endUploadImageCallBack?()) != nil){
+                                    self?.endUploadImageCallBack!()
+                                }
+                            }
+                            if ((self?.changeUploadDataCallBack?((self?.getCurrentSelectImageUrls())!,(self?.getCurrentSelectVideoUrl())!)) != nil){
+                                self?.changeUploadDataCallBack!((self?.getCurrentSelectImageUrls())!,(self?.getCurrentSelectVideoUrl())!)
+                            }
+                        })
+
+                    }
                     DispatchQueue.main.async {
                         self.resetUI()
                         self.autoAdjustHeight()
@@ -790,27 +833,54 @@ class CNLiveAddGoodsSelectUploadImageView: UIView,UIImagePickerControllerDelegat
                 model.image = image
                 model.isUploading = true
-                self!.uploadVideoModel?.uploadKey = UploadManager.uploadImage(imageData: imageData) { [weak self] key, percent in
-                    model.uploadingPercent = percent
-                    self?.replaceImageModelInDataArr(model: model, target: image)
-                } successBlock: { key, url in
-                    model.imageUrl = url
-                    model.isUploading = false
-                    model.uploadKey = nil
-                    self!.replaceImageModelInDataArr(model: model, target: image)
-                    
-                    self!.uploadingCount = self!.uploadingCount - 1
-                    
-                    if self!.uploadingCount == 0{
-                        if self!.endUploadImageCallBack?() != nil{
-                            self!.endUploadImageCallBack!()
+                if self!.isViate == true{
+                    self!.uploadVideoModel?.uploadKey = UploadManager.uploadViateImage(imageData: imageData) { [weak self] key, percent in
+                        model.uploadingPercent = percent
+                        self?.replaceImageModelInDataArr(model: model, target: image)
+                    } successBlock: { key, url in
+                        model.imageUrl = url
+                        model.isUploading = false
+                        model.uploadKey = nil
+                        self!.replaceImageModelInDataArr(model: model, target: image)
+                        
+                        self!.uploadingCount = self!.uploadingCount - 1
+                        
+                        if self!.uploadingCount == 0{
+                            if self!.endUploadImageCallBack?() != nil{
+                                self!.endUploadImageCallBack!()
+                            }
+                        }
+                        
+                        if self!.changeUploadDataCallBack?(self!.getCurrentSelectImageUrls(),self!.getCurrentSelectVideoUrl()) != nil{
+                            self!.changeUploadDataCallBack!(self!.getCurrentSelectImageUrls(),self!.getCurrentSelectVideoUrl())
                         }
                     }
-                    
-                    if self!.changeUploadDataCallBack?(self!.getCurrentSelectImageUrls(),self!.getCurrentSelectVideoUrl()) != nil{
-                        self!.changeUploadDataCallBack!(self!.getCurrentSelectImageUrls(),self!.getCurrentSelectVideoUrl())
+
+                }else{
+                    self!.uploadVideoModel?.uploadKey = UploadManager.uploadImage(imageData: imageData) { [weak self] key, percent in
+                        model.uploadingPercent = percent
+                        self?.replaceImageModelInDataArr(model: model, target: image)
+                    } successBlock: { key, url in
+                        model.imageUrl = url
+                        model.isUploading = false
+                        model.uploadKey = nil
+                        self!.replaceImageModelInDataArr(model: model, target: image)
+                        
+                        self!.uploadingCount = self!.uploadingCount - 1
+                        
+                        if self!.uploadingCount == 0{
+                            if self!.endUploadImageCallBack?() != nil{
+                                self!.endUploadImageCallBack!()
+                            }
+                        }
+                        
+                        if self!.changeUploadDataCallBack?(self!.getCurrentSelectImageUrls(),self!.getCurrentSelectVideoUrl()) != nil{
+                            self!.changeUploadDataCallBack!(self!.getCurrentSelectImageUrls(),self!.getCurrentSelectVideoUrl())
+                        }
                     }
+
                 }
+
                 self!.uploadImageUrls.append(model)
                 self!.resetUI()
                 self!.autoAdjustHeight()
@@ -231,6 +231,65 @@ 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) {
+        let values = NSMutableDictionary()
+        values.addEntries(from: ["profession":profession])
+        values.addEntries(from: ["position":position])
+        values.addEntries(from: ["startWorkingDate":startWorkingDate])
+        values.addEntries(from: ["endWorkingDate":endWorkingDate])
+        values.addEntries(from: ["jobDuties":jobDuties])
+        values.addEntries(from: ["imgs":imgs])
+        values.addEntries(from: ["companyName":companyName])
+        values.addEntries(from: ["city":city])
+        values.addEntries(from: ["vsid":vsid])
+        values.addEntries(from: ["vitaeId":vitaeId])
+        do {
+            let request = URLRequest.init(url: URL.init(string: APPBaseMCUrl+"/userApi/saveVitaeWork")!) as! NSMutableURLRequest
+            request.httpMethod = "POST"
+            request.timeoutInterval = 10
+            request.setValue("application/json", forHTTPHeaderField: "Content-Type")
+            let data = try JSONSerialization.data(withJSONObject: values, options: .prettyPrinted)
+            request.httpBody = data
+            showLoading(message: "")
+            let custom_param = NSMutableDictionary()
+            custom_param.setValue(CNLiveMCEnvironmentManager.shared.appId, forKey: "appId")
+            custom_param.setValue(CNLiveMCEnvironmentManager.shared.appKey, forKey: "appKey")
+            CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
+            CNLiveNetworking.setAllowRequestDefaultArgument(false)
+            CNLiveNetworking.setupShowDataResult(false)
+            CNLiveNetworking.setBuildCustomUrlRequest(request as URLRequest) { task, result, error in
+                hiddenLoading()
+                if (error == nil) {
+                    let resp = result as! NSDictionary
+                    let errorCode = "\(resp["errorCode"] ?? "0")"
+                    if (errorCode == "0") {
+                        resultBlock(true,.success)
+                    } else {
+                        showMessage(message: resp["errorMessage"] as! String)
+                        resultBlock(NSNull(),.failed)
+                    }
+                } else {
+                    if CNLiveNetworking.isNetworking() {
+                        showMessage(message: "上传失败")
+                        resultBlock(NSNull(),.failed)
+                    } else {
+                        showMessage(message: "似乎与网络断开链接")
+                        resultBlock(NSNull(),.noNetwork)
+                    }
+                }
+            }
+        } catch {
+            showMessage(message: "上传失败")
+            resultBlock(NSNull(),.failed)
+        }
+
+    }
+
 }
@@ -287,8 +287,8 @@ class MineInfoAlertView: UIView {
         case .other:
             break
         }
-        
-        let window = UIApplication.shared.windows.last
+
+        let window = UIApplication.shared.windows.first
         window?.addSubview(pickerView)
         pickerView.snp.makeConstraints { make in
             make.edges.equalToSuperview()
@@ -334,6 +334,14 @@ class MineInfoAlertView: UIView {
         }
         if type == .selectDay {
             value = selectDay ?? ""
+            if value.count == 0{
+                let formatter = DateFormatter()
+                formatter.dateFormat = "yyyy-MM-dd"
+                let date = formatter.string(from: datePicker.date)
+                print("获取到的时间是:\(date)")
+                result!(date)
+                return
+            }
             result!(value)
             return
         }