实名认证接口域名调整 , 数字简历信息页面修改同步接口和数字简历首页

“张旭”
1 parent a91fb738
Showing 69 changed files with 802 additions and 40 deletions
metaCode.xcodeproj/project.pbxproj
metaCode/Classes/Main/HomePage/Controller/AuthMainController/CNMetaCodeHomePageController.swift
metaCode/Classes/Main/HomePage/Controller/DigitalAuth/CNLiveDigitalAssetsController.swift
metaCode/Classes/Main/HomePage/Controller/DigitalAuth/CNLiveDigitalAuthController.swift
metaCode/Classes/Main/HomePage/Controller/DigitalAuth/CNLiveDigitalResumeController.swift
metaCode/Classes/Main/HomePage/Controller/DigitalAuth/CNLiveDigitalResumeInfoController.swift
metaCode/Classes/Main/HomePage/Controller/DigitalAuth/CNLiveFaceAuthController.swift
metaCode/Classes/Main/HomePage/Controller/DigitalAuth/CNLiveIdentityRepositoryController.swift
metaCode/Classes/Main/HomePage/Controller/DigitalAuth/CNLiveSelectHangYeController.swift
metaCode/Classes/Main/HomePage/View/DigitalAuthViews/DigitalResume/CNLiveDigitalResumeCell.swift
metaCode/Classes/Main/HomePage/View/DigitalAuthViews/DigitalResume/CNLiveHangYeFirCell.swift
metaCode/Classes/Main/HomePage/View/DigitalAuthViews/DigitalResume/CNLiveHangYeSecCell.swift
metaCode/Classes/Main/HomePage/ViewModel/DigitalAuth/CNLiveDigitalAuthViewModel.swift
metaCode/Classes/Main/HomePage/ViewModel/Vitae/CNLiveVitaeViewModel.swift
metaCode/Classes/Main/MinePage/ViewModel/CNLiveMineViewModel.swift
metaCode/Supporting Files/Assets.xcassets/MinePage/jianli/Contents.json
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_jianli.imageset/Contents.json → metaCode/Supporting Files/Assets.xcassets/MinePage/jianli/mine_jianli.imageset/Contents.json
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_jianli.imageset/mine_jianli@2x.png → metaCode/Supporting Files/Assets.xcassets/MinePage/jianli/mine_jianli.imageset/mine_jianli@2x.png
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_jianli.imageset/mine_jianli@3x.png → metaCode/Supporting Files/Assets.xcassets/MinePage/jianli/mine_jianli.imageset/mine_jianli@3x.png
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_jianli_back.imageset/Contents.json → metaCode/Supporting Files/Assets.xcassets/MinePage/jianli/mine_jianli_back.imageset/Contents.json
@@ -75,6 +75,9 @@
 		1926C2912AE0FD4500C71DC3 /* CNLiveDownSlideModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1926C2902AE0FD4500C71DC3 /* CNLiveDownSlideModel.swift */; };
 		192ED4632C4A642F0057244C /* CNLiveAddrAreaModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 192ED4622C4A642F0057244C /* CNLiveAddrAreaModel.swift */; };
 		192ED4652C4DF6340057244C /* CNLiveDigitalResumeInfoSelectAddressController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 192ED4642C4DF6340057244C /* CNLiveDigitalResumeInfoSelectAddressController.swift */; };
+		192ED4672C4F47E50057244C /* CNLiveSelectHangYeController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 192ED4662C4F47E50057244C /* CNLiveSelectHangYeController.swift */; };
+		192ED4692C4F77370057244C /* CNLiveHangYeFirCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 192ED4682C4F77370057244C /* CNLiveHangYeFirCell.swift */; };
+		192ED46B2C4F77450057244C /* CNLiveHangYeSecCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 192ED46A2C4F77450057244C /* CNLiveHangYeSecCell.swift */; };
 		1938BD172B3D6C7F00390A34 /* CNLiveAuthViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1938BD162B3D6C7F00390A34 /* CNLiveAuthViewController.swift */; };
 		1938BD202B46799A00390A34 /* CNLivePlayletHomePageController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1938BD1F2B46799A00390A34 /* CNLivePlayletHomePageController.swift */; };
 		1938BD222B467C1700390A34 /* CNLivePlayletHomePageCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1938BD212B467C1700390A34 /* CNLivePlayletHomePageCell.swift */; };
@@ -392,6 +395,9 @@
 		1926C2902AE0FD4500C71DC3 /* CNLiveDownSlideModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveDownSlideModel.swift; sourceTree = "<group>"; };
 		192ED4622C4A642F0057244C /* CNLiveAddrAreaModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveAddrAreaModel.swift; sourceTree = "<group>"; };
 		192ED4642C4DF6340057244C /* CNLiveDigitalResumeInfoSelectAddressController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveDigitalResumeInfoSelectAddressController.swift; sourceTree = "<group>"; };
+		192ED4662C4F47E50057244C /* CNLiveSelectHangYeController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveSelectHangYeController.swift; sourceTree = "<group>"; };
+		192ED4682C4F77370057244C /* CNLiveHangYeFirCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveHangYeFirCell.swift; sourceTree = "<group>"; };
+		192ED46A2C4F77450057244C /* CNLiveHangYeSecCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveHangYeSecCell.swift; sourceTree = "<group>"; };
 		1938BD162B3D6C7F00390A34 /* CNLiveAuthViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveAuthViewController.swift; sourceTree = "<group>"; };
 		1938BD1F2B46799A00390A34 /* CNLivePlayletHomePageController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLivePlayletHomePageController.swift; sourceTree = "<group>"; };
 		1938BD212B467C1700390A34 /* CNLivePlayletHomePageCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLivePlayletHomePageCell.swift; sourceTree = "<group>"; };
@@ -1138,6 +1144,7 @@
 				19DFE63F2C3FC5F400E428AE /* CNLiveDigitalResumeController.swift */,
 				19DFE64C2C4792C500E428AE /* CNLiveDigitalResumeInfoController.swift */,
 				192ED4642C4DF6340057244C /* CNLiveDigitalResumeInfoSelectAddressController.swift */,
+				192ED4662C4F47E50057244C /* CNLiveSelectHangYeController.swift */,
 			);
 			path = DigitalAuth;
 			sourceTree = "<group>";
@@ -1205,6 +1212,8 @@
 			children = (
 				19DFE6482C44BEAE00E428AE /* CNLiveDigitalResumeCell.swift */,
 				19DFE64A2C4516B000E428AE /* CNLiveDigitalResumeSecCell.swift */,
+				192ED4682C4F77370057244C /* CNLiveHangYeFirCell.swift */,
+				192ED46A2C4F77450057244C /* CNLiveHangYeSecCell.swift */,
 			);
 			path = DigitalResume;
 			sourceTree = "<group>";
@@ -2015,6 +2024,7 @@
 				191733642B392011007BCC04 /* CNLiveShopGoodsSearchViewController.swift in Sources */,
 				79EABB892AB4497700F3A4E2 /* CNLiveSaveStandDB.swift in Sources */,
 				790B1FB62A41938F0074CF00 /* UIImage+CNLiveExtensions.swift in Sources */,
+				192ED4692C4F77370057244C /* CNLiveHangYeFirCell.swift in Sources */,
 				19C735C12BFDCEE900CACF4E /* CNLiveTotalHotListController.swift in Sources */,
 				7939B0732B47F12F005AE981 /* CNLiveShortVideoViewController.swift in Sources */,
 				19BB1FEA2AEF7B4A0094D962 /* CNLiveShopConsoleCell.swift in Sources */,
@@ -2099,6 +2109,7 @@
 				191732F12B084822007BCC04 /* CNLiveShopClassifyInputTableViewCell.swift in Sources */,
 				191733212B143F3A007BCC04 /* CNLiveGradientView.swift in Sources */,
 				19AD65AE2BA177C20045A444 /* CNLiveShopGoodsDetailsTableHeaderView.swift in Sources */,
+				192ED46B2C4F77450057244C /* CNLiveHangYeSecCell.swift in Sources */,
 				19BB1FE62AEB93B80094D962 /* CNLiveShopUserInfoModel.swift in Sources */,
 				19DFE64D2C4792C500E428AE /* CNLiveDigitalResumeInfoController.swift in Sources */,
 				7CD675472A274167008354C1 /* NewPagedFlowView.m in Sources */,
@@ -2178,6 +2189,7 @@
 				790D01852A2D89E100C5978D /* UIColor+CNLiveExtensions.swift in Sources */,
 				19FA20192AE22D98001F7186 /* CNLiveDownSlideTodayRecommendCell.swift in Sources */,
 				19C735C52BFF09BA00CACF4E /* CNLiveRealHotListDetailImageCell.swift in Sources */,
+				192ED4672C4F47E50057244C /* CNLiveSelectHangYeController.swift in Sources */,
 				790B1FB42A4153E90074CF00 /* CNLiveMineBaseModel.swift in Sources */,
 				794294AA2B4D4381008AAFA0 /* CNLiveShortVideoCommentListView.swift in Sources */,
 				7978A8432A396632007C86B8 /* CNLiveMineViewModel.swift in Sources */,
@@ -741,7 +741,7 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
         UserInfoManager.cacheUserInfo(userInfo: userInfo)
         let vsid = UserInfoManager.shared.userInfo.currentUser?.vsid ?? ""
-        CNLiveMineViewModel.requestsIndustryInfo(channelId: channelId, sid: UserInfoManager.shared.userInfo.uid, vsid: vsid) { result, respStatue in
+        CNLiveMineViewModel.requestsIndustryInfo(channelId: channelId,type:"1", sid: UserInfoManager.shared.userInfo.uid, vsid: vsid) { result, respStatue in
             if respStatue == .success{//UserInfoManager.shared.userInfo.uid   vsid  "1342671"  "2"
                 if let res = result as? [MineAuthenticationsChildModel]{
                     //添加每个MineAuthenticationsBaseModel到self.dataArray对应的 频道列表model里
@@ -97,6 +97,7 @@ class CNLiveDigitalAssetsController:CNLiveBaseViewController, UITableViewDataSou
                             arr.append(listMdl)
                         }
                     }
+                    self!.dataArray.removeAllObjects()
                     self!.dataArray.addObjects(from: listBaseModel.list)
                     self!.dataArray.add(MineAuthListModel())
                     self!.tableView.reloadData()
@@ -289,7 +289,7 @@ class CNLiveDigitalAuthController:CNLiveBaseViewController,UITableViewDataSource
     func getAuthenticationsApi(channelId:String ,vsid:String,sid:String)
     {
         showLoading(message: "")
-        CNLiveMineViewModel.requestsIndustryInfo(channelId: channelId, sid: sid, vsid: vsid) { result, respStatue in
+        CNLiveMineViewModel.requestsIndustryInfo(channelId: channelId, type: "1", sid: sid, vsid: vsid) { result, respStatue in
             if respStatue == .success{//UserInfoManager.shared.userInfo.uid   vsid  "1342671"  "2"
                 if let res = result as? [MineAuthenticationsChildModel]{
                     //添加每个MineAuthenticationsBaseModel到self.dataArray对应的 频道列表model里
@@ -64,6 +64,10 @@ class CNLiveDigitalResumeController:CNLiveBaseViewController,UITableViewDataSour
         return nextBtn
     }()
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
+        self.getVitae()
+    }
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -94,7 +98,7 @@ class CNLiveDigitalResumeController:CNLiveBaseViewController,UITableViewDataSour
             make.height.equalTo(40)
         }
-        self.getVitae()
+//        self.getVitae()
     }
@@ -159,6 +163,7 @@ class CNLiveDigitalResumeController:CNLiveBaseViewController,UITableViewDataSour
                         //有简历-刷新页面
                         self.vitaeModel = model
                         self.tableView.reloadData()
+                        self.saveViateModel()
                     }
                 }else{
@@ -168,7 +173,7 @@ class CNLiveDigitalResumeController:CNLiveBaseViewController,UITableViewDataSour
     }
     func saveUpdateVitae(isSave:Bool){
-        CNLiveVitaeViewModel.saveVitae(city: "", icon: "", isSave: isSave, id: 0, phone: "", profession: "", professionId: 0, selfIntroduction: "", showAddress: true, showAge: true, showAwards: true, showPhone: true, updateTime: "", vsid: UserInfoManager.shared.userInfo.currentUser?.vsid ?? "", workTime: "") { result, status in
+        CNLiveVitaeViewModel.saveVitae(city: "", icon: "", isSave: isSave, id: "0", phone: "", profession: "", professionId: "0", selfIntroduction: "", showAddress: true, showAge: true, showAwards: true, showPhone: true, updateTime: "", vsid: UserInfoManager.shared.userInfo.currentUser?.vsid ?? "", workTime: "") { result, status in
             if status == .success{
             }
@@ -197,6 +202,30 @@ class CNLiveDigitalResumeController:CNLiveBaseViewController,UITableViewDataSour
     }
+    func saveViateModel(){
+        if var userDic = UserDefaults.standard.dictionary(forKey: UserInfoManager.shared.userInfo.uid){
+            
+            userDic.updateValue(String(format: "%d", self.vitaeModel!.vitae?.id ?? 0), forKey: "jianli_vitaeId")
+            userDic.updateValue(String(format: "%d", self.vitaeModel!.vitae?.vsid ?? 0), forKey: "vsid")
+            userDic.updateValue(self.vitaeModel!.vitae?.city ?? "", forKey: "jianli_city")
+            userDic.updateValue(self.vitaeModel!.vitae?.profession ?? "", forKey: "jianli_profession")
+            userDic.updateValue(self.vitaeModel!.vitae?.professionId ?? "", forKey: "jianli_professionId")
+            userDic.updateValue(self.vitaeModel!.vitae?.icon ?? "", forKey: "jianli_icon")
+            userDic.updateValue(self.vitaeModel!.vitae?.phone ?? "", forKey: "jianli_phone")
+            userDic.updateValue(self.vitaeModel!.vitae?.selfIntroduction ?? "", forKey: "jianli_selfIntroduction")
+            userDic.updateValue(self.vitaeModel!.vitae?.workTime ?? "", forKey: "jianli_workTime")
+            userDic.updateValue(self.vitaeModel!.vitae?.showAge ?? false, forKey: "jianli_showAge")
+            userDic.updateValue(self.vitaeModel!.vitae?.showAddress ?? false, forKey: "jianli_showAddress")
+            userDic.updateValue(self.vitaeModel!.vitae?.showAwards ?? false, forKey: "jianli_showAwards")
+            userDic.updateValue(self.vitaeModel!.vitae?.updateTime ?? "", forKey: "jianli_updateTime")
+            UserDefaults.standard.setValue(userDic, forKey: UserInfoManager.shared.userInfo.uid)
+            UserDefaults.standard.synchronize()
+        }else{
+            let tempDic = NSMutableDictionary()
+            UserDefaults.standard.setValue(tempDic, forKey: UserInfoManager.shared.userInfo.uid)
+            UserDefaults.standard.synchronize()
+        }
+    }
     // MARK: - Alert弹窗
     let delegate = UIApplication.shared.delegate as! AppDelegate
     /// 未认证-inputType17时弹窗背景图
@@ -378,18 +378,16 @@ class CNLiveDigitalResumeInfoController:CNLiveBaseViewController, UITextFieldDel
             make.right.equalToSuperview().offset(-15)
         }
     }
-    
     func loadLocalData(){
         if var userDic = UserDefaults.standard.dictionary(forKey: UserInfoManager.shared.userInfo.uid){
-            if let seleDay = userDic["selectDay"]{
-                print(seleDay)
+            if let seleDay = userDic["jianli_workTime"]{
                 //设置过工作日期
                 self.canjiaRightTitleLabel.text = seleDay as? String
             }else{
                 //没设置过工作日期
                 self.canjiaRightTitleLabel.text = "请选择"
             }
-            if let phone = userDic["phone"]{
+            if let phone = userDic["jianli_phone"]{
                 //设置过手机号
                 self.phoneTextFiled.text = phone as? String
             }else{
@@ -397,7 +395,7 @@ class CNLiveDigitalResumeInfoController:CNLiveBaseViewController, UITextFieldDel
                 self.phoneTextFiled.text = ""
             }
-            if let showAge = userDic["showAge"]{
+            if let showAge = userDic["jianli_showAge"]{
                 //设置展示年龄
                 self.nianLingSwitch.isOn = showAge as! Bool
             }else{
@@ -405,7 +403,7 @@ class CNLiveDigitalResumeInfoController:CNLiveBaseViewController, UITextFieldDel
                 self.nianLingSwitch.isOn = false
             }
-            if let showPhone = userDic["showPhone"]{
+            if let showPhone = userDic["jianli_showPhone"]{
                 //设置展示手机号
                 self.phoneSwitch.isOn = showPhone as! Bool
             }else{
@@ -413,7 +411,7 @@ class CNLiveDigitalResumeInfoController:CNLiveBaseViewController, UITextFieldDel
                 self.phoneSwitch.isOn = false
             }
-            if let showWeiZhi = userDic["showWeiZhi"]{
+            if let showWeiZhi = userDic["jianli_showAddress"]{
                 //设置展示位置
                 self.weiZhiSwitch.isOn = showWeiZhi as! Bool
             }else{
@@ -421,7 +419,7 @@ class CNLiveDigitalResumeInfoController:CNLiveBaseViewController, UITextFieldDel
                 self.weiZhiSwitch.isOn = false
             }
-            if let showHuoJiang = userDic["showHuoJiang"]{
+            if let showHuoJiang = userDic["jianli_showAwards"]{
                 //设置展示获奖
                 self.huoJiangSwitch.isOn = showHuoJiang as! Bool
             }else{
@@ -429,7 +427,7 @@ class CNLiveDigitalResumeInfoController:CNLiveBaseViewController, UITextFieldDel
                 self.huoJiangSwitch.isOn = false
             }
-            if let cityStreet = userDic["cityStreet"]{
+            if let cityStreet = userDic["jianli_city"]{
                 //设置街区
                 self.weizhiRightTitleLabel.text = cityStreet as? String
             }else{
@@ -439,6 +437,33 @@ class CNLiveDigitalResumeInfoController:CNLiveBaseViewController, UITextFieldDel
         }
     }
+    //计算工作年限
+    func calculateWorkExperience(fromDateString: String) -> Int? {
+        let formatter = DateFormatter()
+        formatter.dateFormat = "yyyy-MM-dd"
+        formatter.timeZone = TimeZone(abbreviation: "UTC")! // 确保时区一致，或者根据需要调整
+      
+        guard let startDate = formatter.date(from: fromDateString) else {
+            return nil
+        }
+      
+        let calendar = Calendar.current
+        let currentDate = Date()
+      
+        // 计算年份差，这里我们不需要精确的月份和日期，所以只需要年份组件
+        let components = calendar.dateComponents([.year], from: startDate, to: currentDate)
+        guard let yearDifference = components.year else {
+            return nil
+        }
+      
+        // 如果需要，可以对年份差进行四舍五入（但在这个场景下，由于我们只计算整年，所以四舍五入可能不是必需的）
+        // 但为了完整性，我还是展示了如何四舍五入到最近的整数
+        let roundedYearDifference = round(Double(yearDifference))
+      
+        // 返回工作经验年数（已经是整数了，因为round函数的结果会被隐式转换为Int）
+        return Int(roundedYearDifference)
+    }
+    
     deinit {
     }
@@ -452,7 +477,7 @@ class CNLiveDigitalResumeInfoController:CNLiveBaseViewController, UITextFieldDel
     func savePhone(){
         if var userDic = UserDefaults.standard.dictionary(forKey: UserInfoManager.shared.userInfo.uid){
-            userDic.updateValue(self.phoneTextFiled.text ?? "", forKey: "phone")
+            userDic.updateValue(self.phoneTextFiled.text ?? "", forKey: "jianli_phone")
             UserDefaults.standard.setValue(userDic, forKey: UserInfoManager.shared.userInfo.uid)
             UserDefaults.standard.synchronize()
         }else{
@@ -483,31 +508,116 @@ class CNLiveDigitalResumeInfoController:CNLiveBaseViewController, UITextFieldDel
         }
         self.selectAreaVC?.display()
     }
-    
+
     func saveWeiZhi(cityStreet:String){
         if var userDic = UserDefaults.standard.dictionary(forKey: UserInfoManager.shared.userInfo.uid){
-            userDic.updateValue(cityStreet, forKey: "cityStreet")
+            userDic.updateValue(cityStreet, forKey: "jianli_city")
             UserDefaults.standard.setValue(userDic, forKey: UserInfoManager.shared.userInfo.uid)
             UserDefaults.standard.synchronize()
+            self.updateViate(key: "jianli_city", value: cityStreet)
         }else{
             let tempDic = NSMutableDictionary()
             UserDefaults.standard.setValue(tempDic, forKey: UserInfoManager.shared.userInfo.uid)
             UserDefaults.standard.synchronize()
         }
     }
-     
+    func updateViate(key:String,value:Any){
+        if let userDic = UserDefaults.standard.dictionary(forKey: UserInfoManager.shared.userInfo.uid){
+            var jianli_city = userDic["jianli_city"] as? String
+            if key == "jianli_city"{
+                jianli_city = (value as! String)
+            }
+            var jianli_vitaeId = userDic["jianli_vitaeId"] as? String
+            if key == "jianli_vitaeId"{
+                jianli_vitaeId = (value as! String)
+            }
+            var vsid = userDic["vsid"] as? String
+            if key == "vsid"{
+                vsid = (value as! String)
+            }
+            var jianli_profession = userDic["jianli_profession"] as? String ?? ""
+            if key == "jianli_profession"{
+                jianli_profession = value as! String
+            }
+            var jianli_professionId = userDic["jianli_professionId"] as? String
+            if key == "jianli_professionId"{
+                jianli_professionId = (value as! String)
+            }
+            var jianli_icon = userDic["jianli_icon"] as? String ?? ""
+            if key == "jianli_icon"{
+                jianli_icon = value as! String
+            }
+            var jianli_phone = userDic["jianli_phone"] as? String ?? ""
+            if key == "jianli_phone"{
+                jianli_phone = value as! String
+            }
+            var jianli_selfIntroduction = userDic["jianli_selfIntroduction"] as? String
+            if key == "jianli_selfIntroduction"{
+                jianli_selfIntroduction = (value as! String)
+            }
+            var jianli_workTime = userDic["jianli_workTime"] as? String
+            if key == "jianli_workTime"{
+                jianli_workTime = (value as! String)
+            }
+            var jianli_showAge = userDic["jianli_showAge"] as? Bool ?? false
+            if key == "jianli_showAge"{
+                jianli_showAge = value as! Bool
+            }
+            var jianli_showAddress = userDic["jianli_showAddress"] as? Bool ?? false
+            if key == "jianli_showAddress"{
+                jianli_showAddress = value as! Bool
+            }
+            var jianli_showAwards = userDic["jianli_showAwards"] as? Bool ?? false
+            if key == "jianli_showAwards"{
+                jianli_showAwards = value as! Bool
+            }
+            var jianli_showPhone = userDic["jianli_showPhone"] as? Bool ?? false
+            if key == "jianli_showPhone"{
+                jianli_showPhone = value as! Bool
+            }
+            var jianli_updateTime = userDic["jianli_updateTime"] as? String ?? ""
+            if key == "jianli_updateTime"{
+                jianli_updateTime = value as! String
+            }
+
+            CNLiveVitaeViewModel.saveVitae(city: jianli_city ?? "", icon: jianli_icon, isSave: false, id: jianli_vitaeId ?? "", phone: jianli_phone, profession: jianli_profession , professionId: jianli_professionId ?? "", selfIntroduction: jianli_selfIntroduction ?? "", showAddress: jianli_showAddress, showAge: jianli_showAge, showAwards: jianli_showAwards, showPhone:jianli_showPhone, updateTime: jianli_updateTime, vsid: vsid ?? "", workTime: jianli_workTime ?? ""){ result, respStatue in
+                if respStatue == .success{
+                    
+                    
+                }
+            }
+        }else{
+            let tempDic = NSMutableDictionary()
+            UserDefaults.standard.setValue(tempDic, forKey: UserInfoManager.shared.userInfo.uid)
+            UserDefaults.standard.synchronize()
+        }
+
+
+    }
     @objc func canJiaTapAction(){
         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
+                var yearStr = ""
+                if let textStr = text as? String{
+                    if let workExperience = self?.calculateWorkExperience(fromDateString: textStr){
+                        yearStr = "\(workExperience)年经验"
+                    }else{
+                        yearStr = "请选择"
+                    }
+                }else{
+                    yearStr = "请选择"
+                }
+                
+                
+                self?.canjiaRightTitleLabel.text = yearStr
                 self?.canjiaRightTitleLabel.textColor = HexColor("#333333")
                 if var userDic = UserDefaults.standard.dictionary(forKey: UserInfoManager.shared.userInfo.uid){
-                    userDic.updateValue(textStr, forKey: "selectDay")
+                    userDic.updateValue(yearStr, forKey: "jianli_workTime")
                     UserDefaults.standard.setValue(userDic, forKey: UserInfoManager.shared.userInfo.uid)
                     UserDefaults.standard.synchronize()
+                    self!.updateViate(key: "jianli_workTime", value: yearStr)
                 }else{
                     let tempDic = NSMutableDictionary()
                     UserDefaults.standard.setValue(tempDic, forKey: UserInfoManager.shared.userInfo.uid)
@@ -524,23 +634,25 @@ class CNLiveDigitalResumeInfoController:CNLiveBaseViewController, UITextFieldDel
     // MARK: - SwitchAction
     @objc func nianLingSwitchAction(sender: UISwitch) {
-        self.saveShowSwitch(key: "showAge", isOn: sender.isOn)
+        self.saveShowSwitch(key: "jianli_showAge", isOn: sender.isOn)
     }
     @objc func phoneSwitchAction(sender: UISwitch) {
-        self.saveShowSwitch(key: "showPhone", isOn: sender.isOn)
+        self.saveShowSwitch(key: "jianli_showPhone", isOn: sender.isOn)
     }
     @objc func weiZhiSwitchAction(sender: UISwitch) {
-        self.saveShowSwitch(key: "showWeiZhi", isOn: sender.isOn)
+        self.saveShowSwitch(key: "jianli_showAddress", isOn: sender.isOn)
     }
     @objc func huoJiangSwitchAction(sender: UISwitch) {
-        self.saveShowSwitch(key: "showHuoJiang", isOn: sender.isOn)
+        self.saveShowSwitch(key: "jianli_showAwards", isOn: sender.isOn)
     }
+
     func saveShowSwitch(key:String,isOn:Bool){
         if var userDic = UserDefaults.standard.dictionary(forKey: UserInfoManager.shared.userInfo.uid){
             userDic.updateValue(isOn, forKey: key)
             UserDefaults.standard.setValue(userDic, forKey: UserInfoManager.shared.userInfo.uid)
             UserDefaults.standard.synchronize()
+            self.updateViate(key: key, value: isOn)
         }else{
             let tempDic = NSMutableDictionary()
             UserDefaults.standard.setValue(tempDic, forKey: UserInfoManager.shared.userInfo.uid)
@@ -781,6 +781,7 @@ extension CNLiveFaceAuthController {
             if let avatarImage = avatarImage {
                     // 使用裁剪后的头像
                 print("11111Avatar image: \(avatarImage)")
+
                 let data = avatarImage.compressImage()
                 print("11111Image size: \(data.count/1024) KB")
@@ -355,7 +355,7 @@ class CNLiveIdentityRepositoryController:CNLiveBaseViewController,UITableViewDat
     func getAuthenticationsApi(vsid:String,sid:String)
     {
         showLoading(message: "")
-        CNLiveMineViewModel.requestsIndustryInfo(channelId: "", sid: sid, vsid: vsid) { result, respStatue in
+        CNLiveMineViewModel.requestsIndustryInfo(channelId: "", type: "1", sid: sid, vsid: vsid) { result, respStatue in
             if respStatue == .success{
                 if let res = result as? [MineAuthenticationsChildModel]{
                     //添加每个MineAuthenticationsBaseModel到self.dataArray对应的 频道列表model里
+//
+//  CNLiveSelectHangYeController.swift
+//  metaCode
+//
+//  Created by zx on 2024/7/23.
+//  我的职业页面
+
+import Foundation
+import SnapKit
+class CNLiveSelectHangYeController:CNLiveBaseViewController, UITableViewDataSource, UITableViewDelegate{
+    var currSeleFirIndex = 0
+    var currSeleSecIndex = -1
+    
+    lazy var firstDataArray :Array<MineAuthenticationsChildModel> = {
+        let dataArray = Array<MineAuthenticationsChildModel>()
+        return dataArray
+    }()
+    lazy var secDataArray :Array<MineAuthenticationsChildModel> = {
+        let dataArray = Array<MineAuthenticationsChildModel>()
+        return dataArray
+    }()
+    let kCNLiveHangYeFirCellIdentifier = "kCNLiveHangYeFirCellIdentifier"
+    let kCNLiveHangYeSecCellIdentifier = "kCNLiveHangYeSecCellIdentifier"
+
+    lazy var firstTableView : UITableView = {
+        let tableView = UITableView(frame: .zero, style: .plain)
+        tableView.dataSource = self
+        tableView.delegate = self
+        tableView.separatorStyle = .none
+        tableView.register(CNLiveHangYeFirCell.self, forCellReuseIdentifier: kCNLiveHangYeFirCellIdentifier)
+        tableView.backgroundColor = HexColor("#F6F7FB")
+        return tableView
+    }()
+    lazy var secTableView : UITableView = {
+        let tableView = UITableView(frame: .zero, style: .plain)
+        tableView.dataSource = self
+        tableView.delegate = self
+        tableView.separatorStyle = .none
+        tableView.tableFooterView = UIView.init()
+        tableView.register(CNLiveHangYeSecCell.self, forCellReuseIdentifier: kCNLiveHangYeSecCellIdentifier)
+        tableView.backgroundColor = .white
+        return tableView
+    }()
+    lazy var bottomZhiNanWhiteView :UIView = {
+        let bottomNavView = UIView()
+        bottomNavView.backgroundColor = .white
+        return bottomNavView
+    }()
+    lazy var jiuYeZhiNanBtn: UIButton = {
+        let  nextBtn = UIButton(type: .custom)
+        nextBtn.setTitle("确认提交", for: .normal)
+        nextBtn.setTitleColor(.white, for: .normal)
+        nextBtn.backgroundColor = HexColor("#1961FE")
+        nextBtn.layer.cornerRadius = 20
+        nextBtn.clipsToBounds = true
+        nextBtn.addTarget(self, action: #selector(tijiaoBtnAction), for: .touchUpInside)
+        return nextBtn
+    }()
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        titleName = "我的职业"
+        navigationBarHidden = false
+        
+        self.view.addSubview(self.firstTableView)
+        self.firstTableView.snp.makeConstraints { make in
+            make.top.equalTo(KNavigationHeight)
+            make.left.equalToSuperview()
+            make.height.equalToSuperview().offset(-KNavigationHeight-60)
+            make.width.equalTo(adapt_length(length: 107))
+        }
+        
+        self.view.addSubview(self.secTableView)
+        self.secTableView.snp.makeConstraints { make in
+            make.top.equalTo(KNavigationHeight)
+            make.right.equalToSuperview()
+            make.height.equalToSuperview().offset(-KNavigationHeight-60)
+            make.left.equalTo(self.firstTableView.snp.right)
+        }
+        
+        self.view.addSubview(self.bottomZhiNanWhiteView)
+        self.bottomZhiNanWhiteView.snp.makeConstraints { make in
+            make.top.equalTo(self.firstTableView.snp.bottom)
+            make.bottom.left.right.equalToSuperview()
+        }
+        
+        self.bottomZhiNanWhiteView.addSubview(self.jiuYeZhiNanBtn)
+        self.jiuYeZhiNanBtn.snp.makeConstraints { make in
+            make.left.equalTo(15)
+            make.right.equalToSuperview().offset(-15)
+            make.top.equalTo(10)
+            make.height.equalTo(40)
+        }
+
+        
+        let vsid = UserInfoManager.shared.userInfo.currentUser?.vsid ?? ""
+        let sid = UserInfoManager.shared.userInfo.uid
+        self.getHangYeData(vsid: vsid, sid: sid)
+    }
+    
+    deinit {
+    }
+    
+    @objc func tijiaoBtnAction(){
+        let isRealChengNuo = self.getRealChengNuo()
+        if isRealChengNuo == false{
+            //弹出承诺弹窗
+            self.show17Alert()
+        }else{
+            //确认后返回到数字资产页面 接口变更行业 变更为对应行业
+            self.popZiChanController()
+        }
+    }
+    
+    // MARK: - 获取行业数据
+    func getHangYeData(vsid:String,sid:String){
+        CNLiveMineViewModel.requestsIndustryInfo(channelId: "", type: "2", sid: sid, vsid: vsid) { result, respStatue in
+            if respStatue == .success{
+                if let res = result as? [MineAuthenticationsChildModel]{
+                    //添加每个MineAuthenticationsBaseModel到self.dataArray对应的 频道列表model里
+                    if res.count > 0{
+                        self.firstDataArray = res
+                        self.secDataArray = res[0].child
+                        self.firstTableView.reloadData()
+                        self.secTableView.reloadData()
+                        self.currSeleFirIndex = 0
+                        self.currSeleSecIndex = -1
+                    }else{
+                        //没有行业列表 ,提示暂无内容
+                    }
+                }
+            }else{
+                
+            }
+        }
+    }
+    
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        if tableView == self.firstTableView{
+            return self.firstDataArray.count
+        }else{
+            return self.secDataArray.count
+        }
+    }
+    
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        if tableView == self.firstTableView{
+            //fir
+            guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveHangYeFirCellIdentifier) as? CNLiveHangYeFirCell
+            else {
+                let cell = CNLiveHangYeFirCell()
+                return cell
+            }
+            let authModel = self.firstDataArray[indexPath.row]
+            cell.authModel = authModel
+            if self.currSeleFirIndex == indexPath.row{
+                cell.isSelect = true
+            }else{
+                cell.isSelect = false
+            }
+            return cell
+        }else{
+            //sec
+            guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveHangYeSecCellIdentifier) as? CNLiveHangYeSecCell
+            else {
+                let cell = CNLiveHangYeSecCell()
+                return cell
+            }
+            let authModel = self.secDataArray[indexPath.row]
+            cell.authModel = authModel
+            if self.currSeleSecIndex == indexPath.row{
+                cell.isSelect = true
+            }else{
+                cell.isSelect = false
+            }
+            return cell
+        }
+    }
+    
+    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+        if tableView == self.firstTableView{
+            self.currSeleFirIndex = indexPath.row
+            self.currSeleSecIndex = -1
+            self.secDataArray = self.firstDataArray[indexPath.row].child
+            self.firstTableView.reloadData()
+            self.secTableView.reloadData()
+
+        }else{
+            self.currSeleSecIndex = indexPath.row
+            self.secTableView.reloadData()
+        }
+    }
+    
+    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        50
+    }
+
+    func popZiChanController(){
+        if let userDic = UserDefaults.standard.dictionary(forKey: UserInfoManager.shared.userInfo.uid){
+            let jianli_city = userDic["jianli_city"] as? String
+            let jianli_vitaeId = userDic["jianli_vitaeId"] as? String
+            let vsid = userDic["vsid"] as? String
+            let jianli_profession = userDic["jianli_profession"] as? String ?? ""
+            let jianli_professionId = userDic["jianli_professionId"] as? String
+            let jianli_icon = userDic["jianli_icon"] as? String ?? ""
+            let jianli_phone = userDic["jianli_phone"] as? String ?? ""
+            let jianli_selfIntroduction = userDic["jianli_selfIntroduction"] as? String
+            let jianli_workTime = userDic["jianli_workTime"] as? String
+            let jianli_showAge = userDic["jianli_showAge"] as? Bool ?? false
+            let jianli_showAddress = userDic["jianli_showAddress"] as? Bool ?? false
+            let jianli_showAwards = userDic["jianli_showAwards"] as? Bool ?? false
+            let jianli_showPhone = userDic["jianli_showPhone"] as? Bool ?? false
+            let jianli_updateTime = userDic["jianli_updateTime"] as? String ?? ""
+            
+            let firModel = self.firstDataArray[self.currSeleFirIndex]
+            let secModel = self.secDataArray[self.currSeleSecIndex]
+            let hangYeStr = firModel.name+"·"+secModel.name
+            CNLiveVitaeViewModel.saveVitae(city: jianli_city ?? "", icon: jianli_icon, isSave: false, id: jianli_vitaeId ?? "", phone: jianli_phone, profession: hangYeStr, professionId: String(format: "%d", secModel.industryId), selfIntroduction: jianli_selfIntroduction ?? "", showAddress: jianli_showAddress, showAge: jianli_showAge, showAwards: jianli_showAwards, showPhone:jianli_showPhone, updateTime: jianli_updateTime, vsid: vsid ?? "", workTime: jianli_workTime ?? ""){ result, respStatue in
+                if respStatue == .success{
+                    
+                    self.navigationController?.viewControllers.forEach({ item in
+                        if (item.isKind(of: CNLiveDigitalResumeController.self)) {
+                            self.navigationController?.popToViewController(item, animated: true)
+                        }
+                    })
+                }
+            }
+        }else{
+            let tempDic = NSMutableDictionary()
+            UserDefaults.standard.setValue(tempDic, forKey: UserInfoManager.shared.userInfo.uid)
+            UserDefaults.standard.synchronize()
+        }
+
+
+    }
+    // MARK: - Alert弹窗
+    let delegate = UIApplication.shared.delegate as! AppDelegate
+    /// 未认证-inputType17时弹窗背景图
+    lazy var alertBgImgView:UIImageView = {
+        let alertBgImgView:UIImageView = UIImageView()
+        alertBgImgView.tag = 20001
+        alertBgImgView.isUserInteractionEnabled = true
+        let ges = UITapGestureRecognizer(target: self, action: #selector(alertBgImgViewClickAction))
+        alertBgImgView.addGestureRecognizer(ges)
+
+        return alertBgImgView
+    }()
+    lazy var alertBgView:UIView = {
+        let alertBgView:UIView = UIView(frame: CGRect(x: 0, y: 0, width: KSreenWidth, height: KSreenHeight))
+        alertBgView.backgroundColor = HexColor("#000000")
+        alertBgView.alpha = 0.6
+        alertBgView.isUserInteractionEnabled = true
+        alertBgView.tag = 20000
+        
+        let ges = UITapGestureRecognizer(target: self, action: #selector(alertBgViewClickAction))
+        alertBgView.addGestureRecognizer(ges)
+
+        return alertBgView
+    }()
+    // MARK: - 点击弹窗,按类型跳转
+    @objc func alertBgImgViewClickAction() {
+        //存储本地行业真实承诺
+        self.saveRealChengNuo()
+        self.hiden17Alert()
+        self.popZiChanController()
+    }
+    func saveRealChengNuo(){
+        if var userDic = UserDefaults.standard.dictionary(forKey: UserInfoManager.shared.userInfo.uid){
+            userDic.updateValue(true, forKey: "hangYeChengNuo")
+            UserDefaults.standard.setValue(userDic, forKey: UserInfoManager.shared.userInfo.uid)
+            UserDefaults.standard.synchronize()
+        }else{
+            let tempDic = NSMutableDictionary()
+            UserDefaults.standard.setValue(tempDic, forKey: UserInfoManager.shared.userInfo.uid)
+            UserDefaults.standard.synchronize()
+        }
+    }
+    func getRealChengNuo()->Bool{
+        if var userDic = UserDefaults.standard.dictionary(forKey: UserInfoManager.shared.userInfo.uid){
+            if let isChengNuo = userDic["hangYeChengNuo"] as? Bool{
+                if isChengNuo == true{
+                    return true
+                }else{
+                    return false
+                }
+            }else{
+                return false
+            }
+        }else{
+            let tempDic = NSMutableDictionary()
+            UserDefaults.standard.setValue(tempDic, forKey: UserInfoManager.shared.userInfo.uid)
+            UserDefaults.standard.synchronize()
+            return false
+        }
+        
+    }
+    @objc func alertBgViewClickAction() {
+        //点击蒙版隐藏view
+        self.hiden17Alert()
+    }
+    //弹出弹窗
+    func show17Alert(){
+        
+        delegate.window?.addSubview(self.alertBgView)
+        delegate.window?.addSubview(self.alertBgImgView)
+        alertBgImgView.snp.makeConstraints { make in
+            make.centerX.equalToSuperview()
+            make.centerY.equalToSuperview()
+            make.width.equalTo(KSreenWidth-120)
+            make.height.equalTo((KSreenWidth-120)*330/390)
+        }
+        
+        self.alertBgImgView.image = UIImage(named: "mine_chengnuo")
+    }
+    func hiden17Alert(){
+        delegate.window?.subviews.forEach({ view in
+            if view.tag >= 20000{
+                view.removeFromSuperview()
+            }
+        })
+    }
+}
@@ -108,6 +108,14 @@ class CNLiveDigitalResumeCell: UITableViewCell {
         titleLabel.font = Font_14
         return titleLabel
     }()
+    lazy var weizhiTitleLabel: UILabel = {
+        let titleLabel = UILabel()
+        titleLabel.textColor = HexColor("#999999")
+        titleLabel.textAlignment = .left
+        titleLabel.text = " | 位置未授权"
+        titleLabel.font = Font_14
+        return titleLabel
+    }()
     lazy var workTitleLabel: UILabel = {
         let titleLabel = UILabel()
         titleLabel.textColor = HexColor("#999999")
@@ -131,6 +139,12 @@ class CNLiveDigitalResumeCell: UITableViewCell {
         titleLabel.font = BoldFont_14
         return titleLabel
     }()
+    lazy var hangyeImgView :UIImageView = {
+        let iconImgView = UIImageView()
+        iconImgView.image = UIImage(named: "mine_jianli_zhenshi")
+        return iconImgView
+    }()
+
     lazy var hangyeDetailTitleLabel: UILabel = {
         let titleLabel = UILabel()
         titleLabel.textColor = HexColor("#999999")
@@ -315,7 +329,7 @@ class CNLiveDigitalResumeCell: UITableViewCell {
         self.contentView.addSubview(self.jianliIconBgView)
         self.jianliIconBgView.snp.makeConstraints { make in
-            make.top.equalTo(adapt_length(length: 57))
+            make.top.equalTo(adapt_length(length: 37))
             make.right.equalToSuperview().offset(adapt_length(length: -42))
             make.width.height.equalTo(adapt_length(length: 90))
         }
@@ -339,14 +353,23 @@ class CNLiveDigitalResumeCell: UITableViewCell {
             make.height.equalTo(adapt_length(length: 21))
         }
         self.whiteBgView.addSubview(self.phoneTitleLabel)
+        let (gender, age) = self.extractGenderAndAge(fromIDCardNumber: UserInfoManager.shared.userInfo.currentUser?.idNo ?? "")
+        let ageStr = String(format: "%d", age ?? 0)
+        self.phoneTitleLabel.text = gender+" | "+ageStr+"岁"+" | "+UserInfoManager.shared.userInfo.mobile
+        self.phoneTitleLabel.sizeToFit()
         self.phoneTitleLabel.snp.makeConstraints { make in
             make.left.equalTo(adapt_length(length: 15))
             make.top.equalTo(self.authNameTitleLabel.snp.bottom).offset(adapt_length(length: 8))
+            make.width.equalTo(self.phoneTitleLabel.size.width)
+            make.height.equalTo(self.phoneTitleLabel.size.height)
         }
-        let (gender, age) = self.extractGenderAndAge(fromIDCardNumber: UserInfoManager.shared.userInfo.currentUser?.idNo ?? "")
-        let ageStr = String(format: "%d", age ?? 0)
-        self.phoneTitleLabel.text = gender+" | "+ageStr+"岁"+" | "+UserInfoManager.shared.userInfo.mobile
+        self.whiteBgView.addSubview(self.weizhiTitleLabel)
+        self.weizhiTitleLabel.snp.makeConstraints { make in
+            make.left.equalTo(self.phoneTitleLabel.snp.right)
+            make.right.equalToSuperview().offset(-5)
+            make.top.equalTo(self.phoneTitleLabel.snp.top)
+        }
         self.whiteBgView.addSubview(self.workTitleLabel)
         self.workTitleLabel.snp.makeConstraints { make in
             make.left.equalTo(adapt_length(length: 15))
@@ -366,6 +389,14 @@ class CNLiveDigitalResumeCell: UITableViewCell {
             make.left.equalTo(adapt_length(length: 15))
             make.top.equalTo(self.lineView.snp.bottom).offset(adapt_length(length: 20))
         }
+        self.whiteBgView.addSubview(self.hangyeImgView)
+        self.hangyeImgView.snp.makeConstraints { make in
+            make.left.equalTo(self.hangyeTitleLabel.snp.right).offset(5)
+            make.centerY.equalTo(self.hangyeTitleLabel.snp.centerY)
+            make.width.equalTo(83)
+            make.height.equalTo(16)
+        }
+        self.hangyeImgView.isHidden = true
         self.whiteBgView.addSubview(self.hangyeDetailTitleLabel)
         self.hangyeDetailTitleLabel.snp.makeConstraints { make in
             make.right.equalToSuperview().offset(adapt_length(length: -20))
@@ -493,10 +524,11 @@ class CNLiveDigitalResumeCell: UITableViewCell {
     }
     @objc func workTitleLabelAciton(){
-        
+        let vc = CNLiveDigitalResumeInfoController()
+        currentViewController()?.navigationController?.pushViewController(vc, animated: true)
     }
     @objc func hangyeDetailTitleLabelAciton(){
-        
+        navigationViewController().pushViewController(CNLiveSelectHangYeController(), animated: true)
     }
     @objc func renzhengDetailTitleLabelAciton(){
@@ -524,5 +556,26 @@ class CNLiveDigitalResumeCell: UITableViewCell {
     func setupNewUI(model:CNLiveVitaeModel){
         self.jianliTitleLabel.text = "数字简历ID："+"\(model.vitae!.id)"
+        if model.vitae?.profession.count ?? 0 > 0{
+            self.hangyeTitleLabel.text = model.vitae?.profession
+            self.hangyeDetailTitleLabel.isHidden = true
+            //再加一个本人承诺真实icon
+            self.hangyeImgView.isHidden = false
+        }else{
+            self.hangyeTitleLabel.text = "行业"
+            self.hangyeDetailTitleLabel.isHidden = false
+            //隐藏一个本人承诺真实icon
+            self.hangyeImgView.isHidden = true
+        }
+        if model.vitae?.city.count ?? 0 > 0 && model.vitae?.showAddress == true{
+            self.weizhiTitleLabel.text = " | "+model.vitae!.city
+        }else{
+            self.weizhiTitleLabel.text = " | 位置未授权"
+        }
+        if model.vitae?.workTime.count ?? 0 > 0{
+            self.workTitleLabel.text = model.vitae!.workTime
+        }else{
+            self.workTitleLabel.text = "参加工作时间未设置 >"
+        }
     }
 }
+//
+//  CNLiveHangYeFirCell.swift
+//  metaCode
+//
+//  Created by zx on 2024/7/23.
+//
+
+import Foundation
+import SnapKit
+
+class CNLiveHangYeFirCell:UITableViewCell{
+    
+    var _authModel : MineAuthenticationsChildModel?
+    var authModel : MineAuthenticationsChildModel? {
+        get{
+            _authModel
+        }
+        set{
+            _authModel = newValue!
+            setupNewUI(model: _authModel!)
+        }
+    }
+    
+    var _isSelect = false
+    var isSelect:Bool{
+        get{
+            _isSelect
+        }
+        set{
+            _isSelect = newValue
+            if _isSelect == true{
+                self.nameLabel.textColor = HexColor("#1961FE")
+                self.nameLabel.backgroundColor = .white
+            }else{
+                self.nameLabel.textColor = HexColor("#999999")
+                self.nameLabel.backgroundColor = HexColor("#F6F7FB")
+            }
+        }
+    }
+    lazy var nameLabel: UILabel = {
+        let titleLabel = UILabel()
+        titleLabel.textColor = HexColor("#1961FE")
+        titleLabel.text = "名称名称"
+        titleLabel.font = BoldFont_14
+        titleLabel.textAlignment = .center
+        titleLabel.adjustsFontSizeToFitWidth = true
+        return titleLabel
+    }()
+    
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+        self.selectionStyle = .none
+        self.initUI()
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    func initUI(){
+        self.contentView.addSubview(self.nameLabel)
+        self.nameLabel.snp.makeConstraints { make in
+            make.top.bottom.left.right.equalToSuperview()
+        }
+    }
+    
+    func setupNewUI(model:MineAuthenticationsChildModel){
+        self.nameLabel.text = model.name
+    }
+}
+//
+//  CNLiveHangYeSecCell.swift
+//  metaCode
+//
+//  Created by zx on 2024/7/23.
+//
+
+import Foundation
+import SnapKit
+
+class CNLiveHangYeSecCell:UITableViewCell{
+    var _authModel : MineAuthenticationsChildModel?
+    var authModel : MineAuthenticationsChildModel? {
+        get{
+            _authModel
+        }
+        set{
+            _authModel = newValue!
+            setupNewUI(model: _authModel!)
+        }
+    }
+    
+    var _isSelect = false
+    var isSelect:Bool{
+        get{
+            _isSelect
+        }
+        set{
+            _isSelect = newValue
+            if _isSelect == true{
+                self.iconImgView.isHidden = false
+            }else{
+                self.iconImgView.isHidden = true
+            }
+        }
+    }
+    lazy var nameLabel: UILabel = {
+        let titleLabel = UILabel()
+        titleLabel.textColor = HexColor("#333333")
+        titleLabel.text = "名称名称"
+        titleLabel.font = Font_14
+        titleLabel.textAlignment = .center
+        titleLabel.adjustsFontSizeToFitWidth = true
+        return titleLabel
+    }()
+    lazy var iconImgView :UIImageView = {
+        let iconImgView = UIImageView()
+        iconImgView.image = UIImage(named: "mine_hangye_select")
+        return iconImgView
+    }()
+
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+        self.selectionStyle = .none
+        self.initUI()
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    func initUI(){
+        self.contentView.addSubview(self.nameLabel)
+        self.nameLabel.snp.makeConstraints { make in
+            make.left.equalTo(20)
+            make.centerY.equalToSuperview()
+        }
+        
+        self.contentView.addSubview(self.iconImgView)
+        self.iconImgView.snp.makeConstraints { make in
+            make.right.equalToSuperview().offset(-20)
+            make.width.height.equalTo(17)
+            make.centerY.equalToSuperview()
+        }
+        self.iconImgView.isHidden = true
+    }
+    func setupNewUI(model:MineAuthenticationsChildModel){
+        self.nameLabel.text = model.name
+    }
+}
@@ -21,26 +21,36 @@ class CNLiveDigitalAuthViewModel:NSObject{
         param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "sid")
         param.setValue(name, forKey: "name")
         param.setValue(idNo, forKey: "idNo")
-//        param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "file")
-        
+                
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
         CNLiveNetworking.setupShowDataResult(false)
-        CNLiveNetworking.setupDSRequest(true)
+        CNLiveNetworking.setupShowResult(true)
+
         let custom_param = NSMutableDictionary()
         custom_param.setValue(CNLiveMCEnvironmentManager.shared.appId, forKey: "appId")
         custom_param.setValue(CNLiveMCEnvironmentManager.shared.appKey, forKey: "appKey")
         CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
-        CNLiveNetworking.uploadNetwork(withURLString: APPBaseCMSUrl+"/toolApi/verify", param: param as! [AnyHashable : Any]) { formData in
-            formData?.appendPart(withForm: fileData, name: "file")//APPBaseCMSUrl APPBaseMCUrl
+        CNLiveNetworking.uploadNetwork(withURLString: APPBaseMCUrl+"/toolApi/verify", param: param as! [AnyHashable : Any]) { formData in
+            formData?.appendPart(withFileData: fileData as Data, name: "file", fileName: ".jpg", mimeType: "image/jpg")
         } progressBlock: { progress in
-            print("progress\(progress?.completedUnitCount)")
+            print("已上传==>\(progress!.fractionCompleted*100)")
         } completionBlock: { task, any, error in
             print("completionBlock")
             if (error != nil){
                 resultBlock(NSNull(),.failed)
             }else{
-                resultBlock(true,.success)
+                if let dic = any as? Dictionary<String, Any>{
+                    if let data = dic["data"] as? Bool{
+                        if data == true{
+                            resultBlock(true,.success)
+                        }else{
+                            resultBlock(NSNull(),.failed)
+                        }
+                    }
+                }else{
+                    resultBlock(NSNull(),.failed)
+                }
             }
         }
@@ -49,7 +49,7 @@ class CNLiveVitaeViewModel:NSObject{
      参数 vsid 实名对象id
      参数 type 1简历信息 2官方认证 3证书 4工作经历 4获奖情况
      */
-    static func saveVitae(city:String,icon:String,isSave:Bool,id:NSInteger,phone:String,profession:String,professionId:NSInteger,selfIntroduction:String,showAddress:Bool,showAge:Bool,showAwards:Bool,showPhone:Bool,updateTime:String,vsid:String,workTime:String,resultBlock: @escaping downSlideResultBlock) {
+    static func saveVitae(city:String,icon:String,isSave:Bool,id:String,phone:String,profession:String,professionId:String,selfIntroduction:String,showAddress:Bool,showAge:Bool,showAwards:Bool,showPhone:Bool,updateTime:String,vsid:String,workTime:String,resultBlock: @escaping downSlideResultBlock) {
         let values = NSMutableDictionary()
         values.addEntries(from: ["city":city])
         values.addEntries(from: ["icon":icon])
@@ -716,11 +716,13 @@ class CNLiveMineViewModel: NSObject {
     ///   - sid: 用户id
     ///   - vsid: 实名id
     ///   - resultBlock: 返回
-    static func requestsIndustryInfo(channelId: String, sid: String, vsid: String,resultBlock: @escaping resultNewsBlock) {
+    static func requestsIndustryInfo(channelId: String,type:String, sid: String, vsid: String,resultBlock: @escaping resultNewsBlock) {
         let param = NSMutableDictionary()
         param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "sid")
         param.setValue(vsid, forKey: "vsid")
         param.setValue(channelId, forKey: "channelId")
+        param.setValue(type, forKey: "type")
+
         let custom_param = NSMutableDictionary()
         custom_param.setValue(CNLiveMCEnvironmentManager.shared.appId, forKey: "appId")
         custom_param.setValue(CNLiveMCEnvironmentManager.shared.appKey, forKey: "appKey")
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "mine_jianli_zhenshi@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "mine_chengnuo@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "mine_hangye_select@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "mine_hangye_select@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}