Commit 00c29f840fc901bf75a02d06a3530619c1cb012f
1 parent
a91fb738
实名认证接口域名调整 , 数字简历信息页面修改同步接口和数字简历首页
Showing
69 changed files
with
802 additions
and
40 deletions
metaCode.xcodeproj/project.pbxproj
| ... | ... | @@ -75,6 +75,9 @@ |
| 75 | 75 | 1926C2912AE0FD4500C71DC3 /* CNLiveDownSlideModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1926C2902AE0FD4500C71DC3 /* CNLiveDownSlideModel.swift */; }; |
| 76 | 76 | 192ED4632C4A642F0057244C /* CNLiveAddrAreaModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 192ED4622C4A642F0057244C /* CNLiveAddrAreaModel.swift */; }; |
| 77 | 77 | 192ED4652C4DF6340057244C /* CNLiveDigitalResumeInfoSelectAddressController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 192ED4642C4DF6340057244C /* CNLiveDigitalResumeInfoSelectAddressController.swift */; }; |
| 78 | + 192ED4672C4F47E50057244C /* CNLiveSelectHangYeController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 192ED4662C4F47E50057244C /* CNLiveSelectHangYeController.swift */; }; | |
| 79 | + 192ED4692C4F77370057244C /* CNLiveHangYeFirCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 192ED4682C4F77370057244C /* CNLiveHangYeFirCell.swift */; }; | |
| 80 | + 192ED46B2C4F77450057244C /* CNLiveHangYeSecCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 192ED46A2C4F77450057244C /* CNLiveHangYeSecCell.swift */; }; | |
| 78 | 81 | 1938BD172B3D6C7F00390A34 /* CNLiveAuthViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1938BD162B3D6C7F00390A34 /* CNLiveAuthViewController.swift */; }; |
| 79 | 82 | 1938BD202B46799A00390A34 /* CNLivePlayletHomePageController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1938BD1F2B46799A00390A34 /* CNLivePlayletHomePageController.swift */; }; |
| 80 | 83 | 1938BD222B467C1700390A34 /* CNLivePlayletHomePageCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1938BD212B467C1700390A34 /* CNLivePlayletHomePageCell.swift */; }; |
| ... | ... | @@ -392,6 +395,9 @@ |
| 392 | 395 | 1926C2902AE0FD4500C71DC3 /* CNLiveDownSlideModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveDownSlideModel.swift; sourceTree = "<group>"; }; |
| 393 | 396 | 192ED4622C4A642F0057244C /* CNLiveAddrAreaModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveAddrAreaModel.swift; sourceTree = "<group>"; }; |
| 394 | 397 | 192ED4642C4DF6340057244C /* CNLiveDigitalResumeInfoSelectAddressController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveDigitalResumeInfoSelectAddressController.swift; sourceTree = "<group>"; }; |
| 398 | + 192ED4662C4F47E50057244C /* CNLiveSelectHangYeController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveSelectHangYeController.swift; sourceTree = "<group>"; }; | |
| 399 | + 192ED4682C4F77370057244C /* CNLiveHangYeFirCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveHangYeFirCell.swift; sourceTree = "<group>"; }; | |
| 400 | + 192ED46A2C4F77450057244C /* CNLiveHangYeSecCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveHangYeSecCell.swift; sourceTree = "<group>"; }; | |
| 395 | 401 | 1938BD162B3D6C7F00390A34 /* CNLiveAuthViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveAuthViewController.swift; sourceTree = "<group>"; }; |
| 396 | 402 | 1938BD1F2B46799A00390A34 /* CNLivePlayletHomePageController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLivePlayletHomePageController.swift; sourceTree = "<group>"; }; |
| 397 | 403 | 1938BD212B467C1700390A34 /* CNLivePlayletHomePageCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLivePlayletHomePageCell.swift; sourceTree = "<group>"; }; |
| ... | ... | @@ -1138,6 +1144,7 @@ |
| 1138 | 1144 | 19DFE63F2C3FC5F400E428AE /* CNLiveDigitalResumeController.swift */, |
| 1139 | 1145 | 19DFE64C2C4792C500E428AE /* CNLiveDigitalResumeInfoController.swift */, |
| 1140 | 1146 | 192ED4642C4DF6340057244C /* CNLiveDigitalResumeInfoSelectAddressController.swift */, |
| 1147 | + 192ED4662C4F47E50057244C /* CNLiveSelectHangYeController.swift */, | |
| 1141 | 1148 | ); |
| 1142 | 1149 | path = DigitalAuth; |
| 1143 | 1150 | sourceTree = "<group>"; |
| ... | ... | @@ -1205,6 +1212,8 @@ |
| 1205 | 1212 | children = ( |
| 1206 | 1213 | 19DFE6482C44BEAE00E428AE /* CNLiveDigitalResumeCell.swift */, |
| 1207 | 1214 | 19DFE64A2C4516B000E428AE /* CNLiveDigitalResumeSecCell.swift */, |
| 1215 | + 192ED4682C4F77370057244C /* CNLiveHangYeFirCell.swift */, | |
| 1216 | + 192ED46A2C4F77450057244C /* CNLiveHangYeSecCell.swift */, | |
| 1208 | 1217 | ); |
| 1209 | 1218 | path = DigitalResume; |
| 1210 | 1219 | sourceTree = "<group>"; |
| ... | ... | @@ -2015,6 +2024,7 @@ |
| 2015 | 2024 | 191733642B392011007BCC04 /* CNLiveShopGoodsSearchViewController.swift in Sources */, |
| 2016 | 2025 | 79EABB892AB4497700F3A4E2 /* CNLiveSaveStandDB.swift in Sources */, |
| 2017 | 2026 | 790B1FB62A41938F0074CF00 /* UIImage+CNLiveExtensions.swift in Sources */, |
| 2027 | + 192ED4692C4F77370057244C /* CNLiveHangYeFirCell.swift in Sources */, | |
| 2018 | 2028 | 19C735C12BFDCEE900CACF4E /* CNLiveTotalHotListController.swift in Sources */, |
| 2019 | 2029 | 7939B0732B47F12F005AE981 /* CNLiveShortVideoViewController.swift in Sources */, |
| 2020 | 2030 | 19BB1FEA2AEF7B4A0094D962 /* CNLiveShopConsoleCell.swift in Sources */, |
| ... | ... | @@ -2099,6 +2109,7 @@ |
| 2099 | 2109 | 191732F12B084822007BCC04 /* CNLiveShopClassifyInputTableViewCell.swift in Sources */, |
| 2100 | 2110 | 191733212B143F3A007BCC04 /* CNLiveGradientView.swift in Sources */, |
| 2101 | 2111 | 19AD65AE2BA177C20045A444 /* CNLiveShopGoodsDetailsTableHeaderView.swift in Sources */, |
| 2112 | + 192ED46B2C4F77450057244C /* CNLiveHangYeSecCell.swift in Sources */, | |
| 2102 | 2113 | 19BB1FE62AEB93B80094D962 /* CNLiveShopUserInfoModel.swift in Sources */, |
| 2103 | 2114 | 19DFE64D2C4792C500E428AE /* CNLiveDigitalResumeInfoController.swift in Sources */, |
| 2104 | 2115 | 7CD675472A274167008354C1 /* NewPagedFlowView.m in Sources */, |
| ... | ... | @@ -2178,6 +2189,7 @@ |
| 2178 | 2189 | 790D01852A2D89E100C5978D /* UIColor+CNLiveExtensions.swift in Sources */, |
| 2179 | 2190 | 19FA20192AE22D98001F7186 /* CNLiveDownSlideTodayRecommendCell.swift in Sources */, |
| 2180 | 2191 | 19C735C52BFF09BA00CACF4E /* CNLiveRealHotListDetailImageCell.swift in Sources */, |
| 2192 | + 192ED4672C4F47E50057244C /* CNLiveSelectHangYeController.swift in Sources */, | |
| 2181 | 2193 | 790B1FB42A4153E90074CF00 /* CNLiveMineBaseModel.swift in Sources */, |
| 2182 | 2194 | 794294AA2B4D4381008AAFA0 /* CNLiveShortVideoCommentListView.swift in Sources */, |
| 2183 | 2195 | 7978A8432A396632007C86B8 /* CNLiveMineViewModel.swift in Sources */, | ... | ... |
metaCode/Classes/Main/HomePage/Controller/AuthMainController/CNMetaCodeHomePageController.swift
| ... | ... | @@ -741,7 +741,7 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel |
| 741 | 741 | UserInfoManager.cacheUserInfo(userInfo: userInfo) |
| 742 | 742 | |
| 743 | 743 | let vsid = UserInfoManager.shared.userInfo.currentUser?.vsid ?? "" |
| 744 | - CNLiveMineViewModel.requestsIndustryInfo(channelId: channelId, sid: UserInfoManager.shared.userInfo.uid, vsid: vsid) { result, respStatue in | |
| 744 | + CNLiveMineViewModel.requestsIndustryInfo(channelId: channelId,type:"1", sid: UserInfoManager.shared.userInfo.uid, vsid: vsid) { result, respStatue in | |
| 745 | 745 | if respStatue == .success{//UserInfoManager.shared.userInfo.uid vsid "1342671" "2" |
| 746 | 746 | if let res = result as? [MineAuthenticationsChildModel]{ |
| 747 | 747 | //添加每个MineAuthenticationsBaseModel到self.dataArray对应的 频道列表model里 | ... | ... |
metaCode/Classes/Main/HomePage/Controller/DigitalAuth/CNLiveDigitalAssetsController.swift
| ... | ... | @@ -97,6 +97,7 @@ class CNLiveDigitalAssetsController:CNLiveBaseViewController, UITableViewDataSou |
| 97 | 97 | arr.append(listMdl) |
| 98 | 98 | } |
| 99 | 99 | } |
| 100 | + self!.dataArray.removeAllObjects() | |
| 100 | 101 | self!.dataArray.addObjects(from: listBaseModel.list) |
| 101 | 102 | self!.dataArray.add(MineAuthListModel()) |
| 102 | 103 | self!.tableView.reloadData() | ... | ... |
metaCode/Classes/Main/HomePage/Controller/DigitalAuth/CNLiveDigitalAuthController.swift
| ... | ... | @@ -289,7 +289,7 @@ class CNLiveDigitalAuthController:CNLiveBaseViewController,UITableViewDataSource |
| 289 | 289 | func getAuthenticationsApi(channelId:String ,vsid:String,sid:String) |
| 290 | 290 | { |
| 291 | 291 | showLoading(message: "") |
| 292 | - CNLiveMineViewModel.requestsIndustryInfo(channelId: channelId, sid: sid, vsid: vsid) { result, respStatue in | |
| 292 | + CNLiveMineViewModel.requestsIndustryInfo(channelId: channelId, type: "1", sid: sid, vsid: vsid) { result, respStatue in | |
| 293 | 293 | if respStatue == .success{//UserInfoManager.shared.userInfo.uid vsid "1342671" "2" |
| 294 | 294 | if let res = result as? [MineAuthenticationsChildModel]{ |
| 295 | 295 | //添加每个MineAuthenticationsBaseModel到self.dataArray对应的 频道列表model里 | ... | ... |
metaCode/Classes/Main/HomePage/Controller/DigitalAuth/CNLiveDigitalResumeController.swift
| ... | ... | @@ -64,6 +64,10 @@ class CNLiveDigitalResumeController:CNLiveBaseViewController,UITableViewDataSour |
| 64 | 64 | return nextBtn |
| 65 | 65 | }() |
| 66 | 66 | |
| 67 | + override func viewWillAppear(_ animated: Bool) { | |
| 68 | + super.viewWillAppear(animated) | |
| 69 | + self.getVitae() | |
| 70 | + } | |
| 67 | 71 | |
| 68 | 72 | override func viewDidLoad() { |
| 69 | 73 | super.viewDidLoad() |
| ... | ... | @@ -94,7 +98,7 @@ class CNLiveDigitalResumeController:CNLiveBaseViewController,UITableViewDataSour |
| 94 | 98 | make.height.equalTo(40) |
| 95 | 99 | } |
| 96 | 100 | |
| 97 | - self.getVitae() | |
| 101 | +// self.getVitae() | |
| 98 | 102 | } |
| 99 | 103 | |
| 100 | 104 | |
| ... | ... | @@ -159,6 +163,7 @@ class CNLiveDigitalResumeController:CNLiveBaseViewController,UITableViewDataSour |
| 159 | 163 | //有简历-刷新页面 |
| 160 | 164 | self.vitaeModel = model |
| 161 | 165 | self.tableView.reloadData() |
| 166 | + self.saveViateModel() | |
| 162 | 167 | } |
| 163 | 168 | }else{ |
| 164 | 169 | |
| ... | ... | @@ -168,7 +173,7 @@ class CNLiveDigitalResumeController:CNLiveBaseViewController,UITableViewDataSour |
| 168 | 173 | } |
| 169 | 174 | func saveUpdateVitae(isSave:Bool){ |
| 170 | 175 | |
| 171 | - 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 | |
| 176 | + 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 | |
| 172 | 177 | if status == .success{ |
| 173 | 178 | |
| 174 | 179 | } |
| ... | ... | @@ -197,6 +202,30 @@ class CNLiveDigitalResumeController:CNLiveBaseViewController,UITableViewDataSour |
| 197 | 202 | |
| 198 | 203 | } |
| 199 | 204 | |
| 205 | + func saveViateModel(){ | |
| 206 | + if var userDic = UserDefaults.standard.dictionary(forKey: UserInfoManager.shared.userInfo.uid){ | |
| 207 | + | |
| 208 | + userDic.updateValue(String(format: "%d", self.vitaeModel!.vitae?.id ?? 0), forKey: "jianli_vitaeId") | |
| 209 | + userDic.updateValue(String(format: "%d", self.vitaeModel!.vitae?.vsid ?? 0), forKey: "vsid") | |
| 210 | + userDic.updateValue(self.vitaeModel!.vitae?.city ?? "", forKey: "jianli_city") | |
| 211 | + userDic.updateValue(self.vitaeModel!.vitae?.profession ?? "", forKey: "jianli_profession") | |
| 212 | + userDic.updateValue(self.vitaeModel!.vitae?.professionId ?? "", forKey: "jianli_professionId") | |
| 213 | + userDic.updateValue(self.vitaeModel!.vitae?.icon ?? "", forKey: "jianli_icon") | |
| 214 | + userDic.updateValue(self.vitaeModel!.vitae?.phone ?? "", forKey: "jianli_phone") | |
| 215 | + userDic.updateValue(self.vitaeModel!.vitae?.selfIntroduction ?? "", forKey: "jianli_selfIntroduction") | |
| 216 | + userDic.updateValue(self.vitaeModel!.vitae?.workTime ?? "", forKey: "jianli_workTime") | |
| 217 | + userDic.updateValue(self.vitaeModel!.vitae?.showAge ?? false, forKey: "jianli_showAge") | |
| 218 | + userDic.updateValue(self.vitaeModel!.vitae?.showAddress ?? false, forKey: "jianli_showAddress") | |
| 219 | + userDic.updateValue(self.vitaeModel!.vitae?.showAwards ?? false, forKey: "jianli_showAwards") | |
| 220 | + userDic.updateValue(self.vitaeModel!.vitae?.updateTime ?? "", forKey: "jianli_updateTime") | |
| 221 | + UserDefaults.standard.setValue(userDic, forKey: UserInfoManager.shared.userInfo.uid) | |
| 222 | + UserDefaults.standard.synchronize() | |
| 223 | + }else{ | |
| 224 | + let tempDic = NSMutableDictionary() | |
| 225 | + UserDefaults.standard.setValue(tempDic, forKey: UserInfoManager.shared.userInfo.uid) | |
| 226 | + UserDefaults.standard.synchronize() | |
| 227 | + } | |
| 228 | + } | |
| 200 | 229 | // MARK: - Alert弹窗 |
| 201 | 230 | let delegate = UIApplication.shared.delegate as! AppDelegate |
| 202 | 231 | /// 未认证-inputType17时弹窗背景图 | ... | ... |
metaCode/Classes/Main/HomePage/Controller/DigitalAuth/CNLiveDigitalResumeInfoController.swift
| ... | ... | @@ -378,18 +378,16 @@ class CNLiveDigitalResumeInfoController:CNLiveBaseViewController, UITextFieldDel |
| 378 | 378 | make.right.equalToSuperview().offset(-15) |
| 379 | 379 | } |
| 380 | 380 | } |
| 381 | - | |
| 382 | 381 | func loadLocalData(){ |
| 383 | 382 | if var userDic = UserDefaults.standard.dictionary(forKey: UserInfoManager.shared.userInfo.uid){ |
| 384 | - if let seleDay = userDic["selectDay"]{ | |
| 385 | - print(seleDay) | |
| 383 | + if let seleDay = userDic["jianli_workTime"]{ | |
| 386 | 384 | //设置过工作日期 |
| 387 | 385 | self.canjiaRightTitleLabel.text = seleDay as? String |
| 388 | 386 | }else{ |
| 389 | 387 | //没设置过工作日期 |
| 390 | 388 | self.canjiaRightTitleLabel.text = "请选择" |
| 391 | 389 | } |
| 392 | - if let phone = userDic["phone"]{ | |
| 390 | + if let phone = userDic["jianli_phone"]{ | |
| 393 | 391 | //设置过手机号 |
| 394 | 392 | self.phoneTextFiled.text = phone as? String |
| 395 | 393 | }else{ |
| ... | ... | @@ -397,7 +395,7 @@ class CNLiveDigitalResumeInfoController:CNLiveBaseViewController, UITextFieldDel |
| 397 | 395 | self.phoneTextFiled.text = "" |
| 398 | 396 | } |
| 399 | 397 | |
| 400 | - if let showAge = userDic["showAge"]{ | |
| 398 | + if let showAge = userDic["jianli_showAge"]{ | |
| 401 | 399 | //设置展示年龄 |
| 402 | 400 | self.nianLingSwitch.isOn = showAge as! Bool |
| 403 | 401 | }else{ |
| ... | ... | @@ -405,7 +403,7 @@ class CNLiveDigitalResumeInfoController:CNLiveBaseViewController, UITextFieldDel |
| 405 | 403 | self.nianLingSwitch.isOn = false |
| 406 | 404 | } |
| 407 | 405 | |
| 408 | - if let showPhone = userDic["showPhone"]{ | |
| 406 | + if let showPhone = userDic["jianli_showPhone"]{ | |
| 409 | 407 | //设置展示手机号 |
| 410 | 408 | self.phoneSwitch.isOn = showPhone as! Bool |
| 411 | 409 | }else{ |
| ... | ... | @@ -413,7 +411,7 @@ class CNLiveDigitalResumeInfoController:CNLiveBaseViewController, UITextFieldDel |
| 413 | 411 | self.phoneSwitch.isOn = false |
| 414 | 412 | } |
| 415 | 413 | |
| 416 | - if let showWeiZhi = userDic["showWeiZhi"]{ | |
| 414 | + if let showWeiZhi = userDic["jianli_showAddress"]{ | |
| 417 | 415 | //设置展示位置 |
| 418 | 416 | self.weiZhiSwitch.isOn = showWeiZhi as! Bool |
| 419 | 417 | }else{ |
| ... | ... | @@ -421,7 +419,7 @@ class CNLiveDigitalResumeInfoController:CNLiveBaseViewController, UITextFieldDel |
| 421 | 419 | self.weiZhiSwitch.isOn = false |
| 422 | 420 | } |
| 423 | 421 | |
| 424 | - if let showHuoJiang = userDic["showHuoJiang"]{ | |
| 422 | + if let showHuoJiang = userDic["jianli_showAwards"]{ | |
| 425 | 423 | //设置展示获奖 |
| 426 | 424 | self.huoJiangSwitch.isOn = showHuoJiang as! Bool |
| 427 | 425 | }else{ |
| ... | ... | @@ -429,7 +427,7 @@ class CNLiveDigitalResumeInfoController:CNLiveBaseViewController, UITextFieldDel |
| 429 | 427 | self.huoJiangSwitch.isOn = false |
| 430 | 428 | } |
| 431 | 429 | |
| 432 | - if let cityStreet = userDic["cityStreet"]{ | |
| 430 | + if let cityStreet = userDic["jianli_city"]{ | |
| 433 | 431 | //设置街区 |
| 434 | 432 | self.weizhiRightTitleLabel.text = cityStreet as? String |
| 435 | 433 | }else{ |
| ... | ... | @@ -439,6 +437,33 @@ class CNLiveDigitalResumeInfoController:CNLiveBaseViewController, UITextFieldDel |
| 439 | 437 | } |
| 440 | 438 | } |
| 441 | 439 | |
| 440 | + //计算工作年限 | |
| 441 | + func calculateWorkExperience(fromDateString: String) -> Int? { | |
| 442 | + let formatter = DateFormatter() | |
| 443 | + formatter.dateFormat = "yyyy-MM-dd" | |
| 444 | + formatter.timeZone = TimeZone(abbreviation: "UTC")! // 确保时区一致,或者根据需要调整 | |
| 445 | + | |
| 446 | + guard let startDate = formatter.date(from: fromDateString) else { | |
| 447 | + return nil | |
| 448 | + } | |
| 449 | + | |
| 450 | + let calendar = Calendar.current | |
| 451 | + let currentDate = Date() | |
| 452 | + | |
| 453 | + // 计算年份差,这里我们不需要精确的月份和日期,所以只需要年份组件 | |
| 454 | + let components = calendar.dateComponents([.year], from: startDate, to: currentDate) | |
| 455 | + guard let yearDifference = components.year else { | |
| 456 | + return nil | |
| 457 | + } | |
| 458 | + | |
| 459 | + // 如果需要,可以对年份差进行四舍五入(但在这个场景下,由于我们只计算整年,所以四舍五入可能不是必需的) | |
| 460 | + // 但为了完整性,我还是展示了如何四舍五入到最近的整数 | |
| 461 | + let roundedYearDifference = round(Double(yearDifference)) | |
| 462 | + | |
| 463 | + // 返回工作经验年数(已经是整数了,因为round函数的结果会被隐式转换为Int) | |
| 464 | + return Int(roundedYearDifference) | |
| 465 | + } | |
| 466 | + | |
| 442 | 467 | deinit { |
| 443 | 468 | |
| 444 | 469 | } |
| ... | ... | @@ -452,7 +477,7 @@ class CNLiveDigitalResumeInfoController:CNLiveBaseViewController, UITextFieldDel |
| 452 | 477 | |
| 453 | 478 | func savePhone(){ |
| 454 | 479 | if var userDic = UserDefaults.standard.dictionary(forKey: UserInfoManager.shared.userInfo.uid){ |
| 455 | - userDic.updateValue(self.phoneTextFiled.text ?? "", forKey: "phone") | |
| 480 | + userDic.updateValue(self.phoneTextFiled.text ?? "", forKey: "jianli_phone") | |
| 456 | 481 | UserDefaults.standard.setValue(userDic, forKey: UserInfoManager.shared.userInfo.uid) |
| 457 | 482 | UserDefaults.standard.synchronize() |
| 458 | 483 | }else{ |
| ... | ... | @@ -483,31 +508,116 @@ class CNLiveDigitalResumeInfoController:CNLiveBaseViewController, UITextFieldDel |
| 483 | 508 | } |
| 484 | 509 | self.selectAreaVC?.display() |
| 485 | 510 | } |
| 486 | - | |
| 511 | + | |
| 487 | 512 | func saveWeiZhi(cityStreet:String){ |
| 488 | 513 | if var userDic = UserDefaults.standard.dictionary(forKey: UserInfoManager.shared.userInfo.uid){ |
| 489 | - userDic.updateValue(cityStreet, forKey: "cityStreet") | |
| 514 | + userDic.updateValue(cityStreet, forKey: "jianli_city") | |
| 490 | 515 | UserDefaults.standard.setValue(userDic, forKey: UserInfoManager.shared.userInfo.uid) |
| 491 | 516 | UserDefaults.standard.synchronize() |
| 517 | + self.updateViate(key: "jianli_city", value: cityStreet) | |
| 492 | 518 | }else{ |
| 493 | 519 | let tempDic = NSMutableDictionary() |
| 494 | 520 | UserDefaults.standard.setValue(tempDic, forKey: UserInfoManager.shared.userInfo.uid) |
| 495 | 521 | UserDefaults.standard.synchronize() |
| 496 | 522 | } |
| 497 | 523 | } |
| 498 | - | |
| 524 | + func updateViate(key:String,value:Any){ | |
| 525 | + if let userDic = UserDefaults.standard.dictionary(forKey: UserInfoManager.shared.userInfo.uid){ | |
| 526 | + var jianli_city = userDic["jianli_city"] as? String | |
| 527 | + if key == "jianli_city"{ | |
| 528 | + jianli_city = (value as! String) | |
| 529 | + } | |
| 530 | + var jianli_vitaeId = userDic["jianli_vitaeId"] as? String | |
| 531 | + if key == "jianli_vitaeId"{ | |
| 532 | + jianli_vitaeId = (value as! String) | |
| 533 | + } | |
| 534 | + var vsid = userDic["vsid"] as? String | |
| 535 | + if key == "vsid"{ | |
| 536 | + vsid = (value as! String) | |
| 537 | + } | |
| 538 | + var jianli_profession = userDic["jianli_profession"] as? String ?? "" | |
| 539 | + if key == "jianli_profession"{ | |
| 540 | + jianli_profession = value as! String | |
| 541 | + } | |
| 542 | + var jianli_professionId = userDic["jianli_professionId"] as? String | |
| 543 | + if key == "jianli_professionId"{ | |
| 544 | + jianli_professionId = (value as! String) | |
| 545 | + } | |
| 546 | + var jianli_icon = userDic["jianli_icon"] as? String ?? "" | |
| 547 | + if key == "jianli_icon"{ | |
| 548 | + jianli_icon = value as! String | |
| 549 | + } | |
| 550 | + var jianli_phone = userDic["jianli_phone"] as? String ?? "" | |
| 551 | + if key == "jianli_phone"{ | |
| 552 | + jianli_phone = value as! String | |
| 553 | + } | |
| 554 | + var jianli_selfIntroduction = userDic["jianli_selfIntroduction"] as? String | |
| 555 | + if key == "jianli_selfIntroduction"{ | |
| 556 | + jianli_selfIntroduction = (value as! String) | |
| 557 | + } | |
| 558 | + var jianli_workTime = userDic["jianli_workTime"] as? String | |
| 559 | + if key == "jianli_workTime"{ | |
| 560 | + jianli_workTime = (value as! String) | |
| 561 | + } | |
| 562 | + var jianli_showAge = userDic["jianli_showAge"] as? Bool ?? false | |
| 563 | + if key == "jianli_showAge"{ | |
| 564 | + jianli_showAge = value as! Bool | |
| 565 | + } | |
| 566 | + var jianli_showAddress = userDic["jianli_showAddress"] as? Bool ?? false | |
| 567 | + if key == "jianli_showAddress"{ | |
| 568 | + jianli_showAddress = value as! Bool | |
| 569 | + } | |
| 570 | + var jianli_showAwards = userDic["jianli_showAwards"] as? Bool ?? false | |
| 571 | + if key == "jianli_showAwards"{ | |
| 572 | + jianli_showAwards = value as! Bool | |
| 573 | + } | |
| 574 | + var jianli_showPhone = userDic["jianli_showPhone"] as? Bool ?? false | |
| 575 | + if key == "jianli_showPhone"{ | |
| 576 | + jianli_showPhone = value as! Bool | |
| 577 | + } | |
| 578 | + var jianli_updateTime = userDic["jianli_updateTime"] as? String ?? "" | |
| 579 | + if key == "jianli_updateTime"{ | |
| 580 | + jianli_updateTime = value as! String | |
| 581 | + } | |
| 582 | + | |
| 583 | + 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 | |
| 584 | + if respStatue == .success{ | |
| 585 | + | |
| 586 | + | |
| 587 | + } | |
| 588 | + } | |
| 589 | + }else{ | |
| 590 | + let tempDic = NSMutableDictionary() | |
| 591 | + UserDefaults.standard.setValue(tempDic, forKey: UserInfoManager.shared.userInfo.uid) | |
| 592 | + UserDefaults.standard.synchronize() | |
| 593 | + } | |
| 594 | + | |
| 595 | + | |
| 596 | + } | |
| 499 | 597 | @objc func canJiaTapAction(){ |
| 500 | 598 | MineInfoAlertView.showSelectView(showType: .selectDay) { [weak self] text in |
| 501 | 599 | print("刷新之后的数据是=>\(text)")//"2024-06-18" |
| 502 | 600 | if (text as! String).count > 0{ |
| 503 | - let textStr = text as! String | |
| 504 | - self?.canjiaRightTitleLabel.text = textStr | |
| 601 | + var yearStr = "" | |
| 602 | + if let textStr = text as? String{ | |
| 603 | + if let workExperience = self?.calculateWorkExperience(fromDateString: textStr){ | |
| 604 | + yearStr = "\(workExperience)年经验" | |
| 605 | + }else{ | |
| 606 | + yearStr = "请选择" | |
| 607 | + } | |
| 608 | + }else{ | |
| 609 | + yearStr = "请选择" | |
| 610 | + } | |
| 611 | + | |
| 612 | + | |
| 613 | + self?.canjiaRightTitleLabel.text = yearStr | |
| 505 | 614 | self?.canjiaRightTitleLabel.textColor = HexColor("#333333") |
| 506 | 615 | |
| 507 | 616 | if var userDic = UserDefaults.standard.dictionary(forKey: UserInfoManager.shared.userInfo.uid){ |
| 508 | - userDic.updateValue(textStr, forKey: "selectDay") | |
| 617 | + userDic.updateValue(yearStr, forKey: "jianli_workTime") | |
| 509 | 618 | UserDefaults.standard.setValue(userDic, forKey: UserInfoManager.shared.userInfo.uid) |
| 510 | 619 | UserDefaults.standard.synchronize() |
| 620 | + self!.updateViate(key: "jianli_workTime", value: yearStr) | |
| 511 | 621 | }else{ |
| 512 | 622 | let tempDic = NSMutableDictionary() |
| 513 | 623 | UserDefaults.standard.setValue(tempDic, forKey: UserInfoManager.shared.userInfo.uid) |
| ... | ... | @@ -524,23 +634,25 @@ class CNLiveDigitalResumeInfoController:CNLiveBaseViewController, UITextFieldDel |
| 524 | 634 | |
| 525 | 635 | // MARK: - SwitchAction |
| 526 | 636 | @objc func nianLingSwitchAction(sender: UISwitch) { |
| 527 | - self.saveShowSwitch(key: "showAge", isOn: sender.isOn) | |
| 637 | + self.saveShowSwitch(key: "jianli_showAge", isOn: sender.isOn) | |
| 528 | 638 | } |
| 529 | 639 | @objc func phoneSwitchAction(sender: UISwitch) { |
| 530 | - self.saveShowSwitch(key: "showPhone", isOn: sender.isOn) | |
| 640 | + self.saveShowSwitch(key: "jianli_showPhone", isOn: sender.isOn) | |
| 531 | 641 | } |
| 532 | 642 | @objc func weiZhiSwitchAction(sender: UISwitch) { |
| 533 | - self.saveShowSwitch(key: "showWeiZhi", isOn: sender.isOn) | |
| 643 | + self.saveShowSwitch(key: "jianli_showAddress", isOn: sender.isOn) | |
| 534 | 644 | } |
| 535 | 645 | @objc func huoJiangSwitchAction(sender: UISwitch) { |
| 536 | - self.saveShowSwitch(key: "showHuoJiang", isOn: sender.isOn) | |
| 646 | + self.saveShowSwitch(key: "jianli_showAwards", isOn: sender.isOn) | |
| 537 | 647 | } |
| 648 | + | |
| 538 | 649 | |
| 539 | 650 | func saveShowSwitch(key:String,isOn:Bool){ |
| 540 | 651 | if var userDic = UserDefaults.standard.dictionary(forKey: UserInfoManager.shared.userInfo.uid){ |
| 541 | 652 | userDic.updateValue(isOn, forKey: key) |
| 542 | 653 | UserDefaults.standard.setValue(userDic, forKey: UserInfoManager.shared.userInfo.uid) |
| 543 | 654 | UserDefaults.standard.synchronize() |
| 655 | + self.updateViate(key: key, value: isOn) | |
| 544 | 656 | }else{ |
| 545 | 657 | let tempDic = NSMutableDictionary() |
| 546 | 658 | UserDefaults.standard.setValue(tempDic, forKey: UserInfoManager.shared.userInfo.uid) | ... | ... |
metaCode/Classes/Main/HomePage/Controller/DigitalAuth/CNLiveFaceAuthController.swift
| ... | ... | @@ -781,6 +781,7 @@ extension CNLiveFaceAuthController { |
| 781 | 781 | if let avatarImage = avatarImage { |
| 782 | 782 | // 使用裁剪后的头像 |
| 783 | 783 | print("11111Avatar image: \(avatarImage)") |
| 784 | + | |
| 784 | 785 | let data = avatarImage.compressImage() |
| 785 | 786 | print("11111Image size: \(data.count/1024) KB") |
| 786 | 787 | ... | ... |
metaCode/Classes/Main/HomePage/Controller/DigitalAuth/CNLiveIdentityRepositoryController.swift
| ... | ... | @@ -355,7 +355,7 @@ class CNLiveIdentityRepositoryController:CNLiveBaseViewController,UITableViewDat |
| 355 | 355 | func getAuthenticationsApi(vsid:String,sid:String) |
| 356 | 356 | { |
| 357 | 357 | showLoading(message: "") |
| 358 | - CNLiveMineViewModel.requestsIndustryInfo(channelId: "", sid: sid, vsid: vsid) { result, respStatue in | |
| 358 | + CNLiveMineViewModel.requestsIndustryInfo(channelId: "", type: "1", sid: sid, vsid: vsid) { result, respStatue in | |
| 359 | 359 | if respStatue == .success{ |
| 360 | 360 | if let res = result as? [MineAuthenticationsChildModel]{ |
| 361 | 361 | //添加每个MineAuthenticationsBaseModel到self.dataArray对应的 频道列表model里 | ... | ... |
metaCode/Classes/Main/HomePage/Controller/DigitalAuth/CNLiveSelectHangYeController.swift
0 → 100644
| 1 | +// | |
| 2 | +// CNLiveSelectHangYeController.swift | |
| 3 | +// metaCode | |
| 4 | +// | |
| 5 | +// Created by zx on 2024/7/23. | |
| 6 | +// 我的职业页面 | |
| 7 | + | |
| 8 | +import Foundation | |
| 9 | +import SnapKit | |
| 10 | +class CNLiveSelectHangYeController:CNLiveBaseViewController, UITableViewDataSource, UITableViewDelegate{ | |
| 11 | + var currSeleFirIndex = 0 | |
| 12 | + var currSeleSecIndex = -1 | |
| 13 | + | |
| 14 | + lazy var firstDataArray :Array<MineAuthenticationsChildModel> = { | |
| 15 | + let dataArray = Array<MineAuthenticationsChildModel>() | |
| 16 | + return dataArray | |
| 17 | + }() | |
| 18 | + lazy var secDataArray :Array<MineAuthenticationsChildModel> = { | |
| 19 | + let dataArray = Array<MineAuthenticationsChildModel>() | |
| 20 | + return dataArray | |
| 21 | + }() | |
| 22 | + let kCNLiveHangYeFirCellIdentifier = "kCNLiveHangYeFirCellIdentifier" | |
| 23 | + let kCNLiveHangYeSecCellIdentifier = "kCNLiveHangYeSecCellIdentifier" | |
| 24 | + | |
| 25 | + lazy var firstTableView : UITableView = { | |
| 26 | + let tableView = UITableView(frame: .zero, style: .plain) | |
| 27 | + tableView.dataSource = self | |
| 28 | + tableView.delegate = self | |
| 29 | + tableView.separatorStyle = .none | |
| 30 | + tableView.register(CNLiveHangYeFirCell.self, forCellReuseIdentifier: kCNLiveHangYeFirCellIdentifier) | |
| 31 | + tableView.backgroundColor = HexColor("#F6F7FB") | |
| 32 | + return tableView | |
| 33 | + }() | |
| 34 | + lazy var secTableView : UITableView = { | |
| 35 | + let tableView = UITableView(frame: .zero, style: .plain) | |
| 36 | + tableView.dataSource = self | |
| 37 | + tableView.delegate = self | |
| 38 | + tableView.separatorStyle = .none | |
| 39 | + tableView.tableFooterView = UIView.init() | |
| 40 | + tableView.register(CNLiveHangYeSecCell.self, forCellReuseIdentifier: kCNLiveHangYeSecCellIdentifier) | |
| 41 | + tableView.backgroundColor = .white | |
| 42 | + return tableView | |
| 43 | + }() | |
| 44 | + lazy var bottomZhiNanWhiteView :UIView = { | |
| 45 | + let bottomNavView = UIView() | |
| 46 | + bottomNavView.backgroundColor = .white | |
| 47 | + return bottomNavView | |
| 48 | + }() | |
| 49 | + lazy var jiuYeZhiNanBtn: UIButton = { | |
| 50 | + let nextBtn = UIButton(type: .custom) | |
| 51 | + nextBtn.setTitle("确认提交", for: .normal) | |
| 52 | + nextBtn.setTitleColor(.white, for: .normal) | |
| 53 | + nextBtn.backgroundColor = HexColor("#1961FE") | |
| 54 | + nextBtn.layer.cornerRadius = 20 | |
| 55 | + nextBtn.clipsToBounds = true | |
| 56 | + nextBtn.addTarget(self, action: #selector(tijiaoBtnAction), for: .touchUpInside) | |
| 57 | + return nextBtn | |
| 58 | + }() | |
| 59 | + | |
| 60 | + override func viewDidLoad() { | |
| 61 | + super.viewDidLoad() | |
| 62 | + titleName = "我的职业" | |
| 63 | + navigationBarHidden = false | |
| 64 | + | |
| 65 | + self.view.addSubview(self.firstTableView) | |
| 66 | + self.firstTableView.snp.makeConstraints { make in | |
| 67 | + make.top.equalTo(KNavigationHeight) | |
| 68 | + make.left.equalToSuperview() | |
| 69 | + make.height.equalToSuperview().offset(-KNavigationHeight-60) | |
| 70 | + make.width.equalTo(adapt_length(length: 107)) | |
| 71 | + } | |
| 72 | + | |
| 73 | + self.view.addSubview(self.secTableView) | |
| 74 | + self.secTableView.snp.makeConstraints { make in | |
| 75 | + make.top.equalTo(KNavigationHeight) | |
| 76 | + make.right.equalToSuperview() | |
| 77 | + make.height.equalToSuperview().offset(-KNavigationHeight-60) | |
| 78 | + make.left.equalTo(self.firstTableView.snp.right) | |
| 79 | + } | |
| 80 | + | |
| 81 | + self.view.addSubview(self.bottomZhiNanWhiteView) | |
| 82 | + self.bottomZhiNanWhiteView.snp.makeConstraints { make in | |
| 83 | + make.top.equalTo(self.firstTableView.snp.bottom) | |
| 84 | + make.bottom.left.right.equalToSuperview() | |
| 85 | + } | |
| 86 | + | |
| 87 | + self.bottomZhiNanWhiteView.addSubview(self.jiuYeZhiNanBtn) | |
| 88 | + self.jiuYeZhiNanBtn.snp.makeConstraints { make in | |
| 89 | + make.left.equalTo(15) | |
| 90 | + make.right.equalToSuperview().offset(-15) | |
| 91 | + make.top.equalTo(10) | |
| 92 | + make.height.equalTo(40) | |
| 93 | + } | |
| 94 | + | |
| 95 | + | |
| 96 | + let vsid = UserInfoManager.shared.userInfo.currentUser?.vsid ?? "" | |
| 97 | + let sid = UserInfoManager.shared.userInfo.uid | |
| 98 | + self.getHangYeData(vsid: vsid, sid: sid) | |
| 99 | + } | |
| 100 | + | |
| 101 | + deinit { | |
| 102 | + } | |
| 103 | + | |
| 104 | + @objc func tijiaoBtnAction(){ | |
| 105 | + let isRealChengNuo = self.getRealChengNuo() | |
| 106 | + if isRealChengNuo == false{ | |
| 107 | + //弹出承诺弹窗 | |
| 108 | + self.show17Alert() | |
| 109 | + }else{ | |
| 110 | + //确认后返回到数字资产页面 接口变更行业 变更为对应行业 | |
| 111 | + self.popZiChanController() | |
| 112 | + } | |
| 113 | + } | |
| 114 | + | |
| 115 | + // MARK: - 获取行业数据 | |
| 116 | + func getHangYeData(vsid:String,sid:String){ | |
| 117 | + CNLiveMineViewModel.requestsIndustryInfo(channelId: "", type: "2", sid: sid, vsid: vsid) { result, respStatue in | |
| 118 | + if respStatue == .success{ | |
| 119 | + if let res = result as? [MineAuthenticationsChildModel]{ | |
| 120 | + //添加每个MineAuthenticationsBaseModel到self.dataArray对应的 频道列表model里 | |
| 121 | + if res.count > 0{ | |
| 122 | + self.firstDataArray = res | |
| 123 | + self.secDataArray = res[0].child | |
| 124 | + self.firstTableView.reloadData() | |
| 125 | + self.secTableView.reloadData() | |
| 126 | + self.currSeleFirIndex = 0 | |
| 127 | + self.currSeleSecIndex = -1 | |
| 128 | + }else{ | |
| 129 | + //没有行业列表 ,提示暂无内容 | |
| 130 | + } | |
| 131 | + } | |
| 132 | + }else{ | |
| 133 | + | |
| 134 | + } | |
| 135 | + } | |
| 136 | + } | |
| 137 | + | |
| 138 | + func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { | |
| 139 | + if tableView == self.firstTableView{ | |
| 140 | + return self.firstDataArray.count | |
| 141 | + }else{ | |
| 142 | + return self.secDataArray.count | |
| 143 | + } | |
| 144 | + } | |
| 145 | + | |
| 146 | + func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { | |
| 147 | + if tableView == self.firstTableView{ | |
| 148 | + //fir | |
| 149 | + guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveHangYeFirCellIdentifier) as? CNLiveHangYeFirCell | |
| 150 | + else { | |
| 151 | + let cell = CNLiveHangYeFirCell() | |
| 152 | + return cell | |
| 153 | + } | |
| 154 | + let authModel = self.firstDataArray[indexPath.row] | |
| 155 | + cell.authModel = authModel | |
| 156 | + if self.currSeleFirIndex == indexPath.row{ | |
| 157 | + cell.isSelect = true | |
| 158 | + }else{ | |
| 159 | + cell.isSelect = false | |
| 160 | + } | |
| 161 | + return cell | |
| 162 | + }else{ | |
| 163 | + //sec | |
| 164 | + guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveHangYeSecCellIdentifier) as? CNLiveHangYeSecCell | |
| 165 | + else { | |
| 166 | + let cell = CNLiveHangYeSecCell() | |
| 167 | + return cell | |
| 168 | + } | |
| 169 | + let authModel = self.secDataArray[indexPath.row] | |
| 170 | + cell.authModel = authModel | |
| 171 | + if self.currSeleSecIndex == indexPath.row{ | |
| 172 | + cell.isSelect = true | |
| 173 | + }else{ | |
| 174 | + cell.isSelect = false | |
| 175 | + } | |
| 176 | + return cell | |
| 177 | + } | |
| 178 | + } | |
| 179 | + | |
| 180 | + func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) { | |
| 181 | + if tableView == self.firstTableView{ | |
| 182 | + self.currSeleFirIndex = indexPath.row | |
| 183 | + self.currSeleSecIndex = -1 | |
| 184 | + self.secDataArray = self.firstDataArray[indexPath.row].child | |
| 185 | + self.firstTableView.reloadData() | |
| 186 | + self.secTableView.reloadData() | |
| 187 | + | |
| 188 | + }else{ | |
| 189 | + self.currSeleSecIndex = indexPath.row | |
| 190 | + self.secTableView.reloadData() | |
| 191 | + } | |
| 192 | + } | |
| 193 | + | |
| 194 | + func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat { | |
| 195 | + 50 | |
| 196 | + } | |
| 197 | + | |
| 198 | + func popZiChanController(){ | |
| 199 | + if let userDic = UserDefaults.standard.dictionary(forKey: UserInfoManager.shared.userInfo.uid){ | |
| 200 | + let jianli_city = userDic["jianli_city"] as? String | |
| 201 | + let jianli_vitaeId = userDic["jianli_vitaeId"] as? String | |
| 202 | + let vsid = userDic["vsid"] as? String | |
| 203 | + let jianli_profession = userDic["jianli_profession"] as? String ?? "" | |
| 204 | + let jianli_professionId = userDic["jianli_professionId"] as? String | |
| 205 | + let jianli_icon = userDic["jianli_icon"] as? String ?? "" | |
| 206 | + let jianli_phone = userDic["jianli_phone"] as? String ?? "" | |
| 207 | + let jianli_selfIntroduction = userDic["jianli_selfIntroduction"] as? String | |
| 208 | + let jianli_workTime = userDic["jianli_workTime"] as? String | |
| 209 | + let jianli_showAge = userDic["jianli_showAge"] as? Bool ?? false | |
| 210 | + let jianli_showAddress = userDic["jianli_showAddress"] as? Bool ?? false | |
| 211 | + let jianli_showAwards = userDic["jianli_showAwards"] as? Bool ?? false | |
| 212 | + let jianli_showPhone = userDic["jianli_showPhone"] as? Bool ?? false | |
| 213 | + let jianli_updateTime = userDic["jianli_updateTime"] as? String ?? "" | |
| 214 | + | |
| 215 | + let firModel = self.firstDataArray[self.currSeleFirIndex] | |
| 216 | + let secModel = self.secDataArray[self.currSeleSecIndex] | |
| 217 | + let hangYeStr = firModel.name+"·"+secModel.name | |
| 218 | + 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 | |
| 219 | + if respStatue == .success{ | |
| 220 | + | |
| 221 | + self.navigationController?.viewControllers.forEach({ item in | |
| 222 | + if (item.isKind(of: CNLiveDigitalResumeController.self)) { | |
| 223 | + self.navigationController?.popToViewController(item, animated: true) | |
| 224 | + } | |
| 225 | + }) | |
| 226 | + } | |
| 227 | + } | |
| 228 | + }else{ | |
| 229 | + let tempDic = NSMutableDictionary() | |
| 230 | + UserDefaults.standard.setValue(tempDic, forKey: UserInfoManager.shared.userInfo.uid) | |
| 231 | + UserDefaults.standard.synchronize() | |
| 232 | + } | |
| 233 | + | |
| 234 | + | |
| 235 | + } | |
| 236 | + // MARK: - Alert弹窗 | |
| 237 | + let delegate = UIApplication.shared.delegate as! AppDelegate | |
| 238 | + /// 未认证-inputType17时弹窗背景图 | |
| 239 | + lazy var alertBgImgView:UIImageView = { | |
| 240 | + let alertBgImgView:UIImageView = UIImageView() | |
| 241 | + alertBgImgView.tag = 20001 | |
| 242 | + alertBgImgView.isUserInteractionEnabled = true | |
| 243 | + let ges = UITapGestureRecognizer(target: self, action: #selector(alertBgImgViewClickAction)) | |
| 244 | + alertBgImgView.addGestureRecognizer(ges) | |
| 245 | + | |
| 246 | + return alertBgImgView | |
| 247 | + }() | |
| 248 | + lazy var alertBgView:UIView = { | |
| 249 | + let alertBgView:UIView = UIView(frame: CGRect(x: 0, y: 0, width: KSreenWidth, height: KSreenHeight)) | |
| 250 | + alertBgView.backgroundColor = HexColor("#000000") | |
| 251 | + alertBgView.alpha = 0.6 | |
| 252 | + alertBgView.isUserInteractionEnabled = true | |
| 253 | + alertBgView.tag = 20000 | |
| 254 | + | |
| 255 | + let ges = UITapGestureRecognizer(target: self, action: #selector(alertBgViewClickAction)) | |
| 256 | + alertBgView.addGestureRecognizer(ges) | |
| 257 | + | |
| 258 | + return alertBgView | |
| 259 | + }() | |
| 260 | + // MARK: - 点击弹窗,按类型跳转 | |
| 261 | + @objc func alertBgImgViewClickAction() { | |
| 262 | + //存储本地行业真实承诺 | |
| 263 | + self.saveRealChengNuo() | |
| 264 | + self.hiden17Alert() | |
| 265 | + self.popZiChanController() | |
| 266 | + } | |
| 267 | + func saveRealChengNuo(){ | |
| 268 | + if var userDic = UserDefaults.standard.dictionary(forKey: UserInfoManager.shared.userInfo.uid){ | |
| 269 | + userDic.updateValue(true, forKey: "hangYeChengNuo") | |
| 270 | + UserDefaults.standard.setValue(userDic, forKey: UserInfoManager.shared.userInfo.uid) | |
| 271 | + UserDefaults.standard.synchronize() | |
| 272 | + }else{ | |
| 273 | + let tempDic = NSMutableDictionary() | |
| 274 | + UserDefaults.standard.setValue(tempDic, forKey: UserInfoManager.shared.userInfo.uid) | |
| 275 | + UserDefaults.standard.synchronize() | |
| 276 | + } | |
| 277 | + } | |
| 278 | + func getRealChengNuo()->Bool{ | |
| 279 | + if var userDic = UserDefaults.standard.dictionary(forKey: UserInfoManager.shared.userInfo.uid){ | |
| 280 | + if let isChengNuo = userDic["hangYeChengNuo"] as? Bool{ | |
| 281 | + if isChengNuo == true{ | |
| 282 | + return true | |
| 283 | + }else{ | |
| 284 | + return false | |
| 285 | + } | |
| 286 | + }else{ | |
| 287 | + return false | |
| 288 | + } | |
| 289 | + }else{ | |
| 290 | + let tempDic = NSMutableDictionary() | |
| 291 | + UserDefaults.standard.setValue(tempDic, forKey: UserInfoManager.shared.userInfo.uid) | |
| 292 | + UserDefaults.standard.synchronize() | |
| 293 | + return false | |
| 294 | + } | |
| 295 | + | |
| 296 | + } | |
| 297 | + @objc func alertBgViewClickAction() { | |
| 298 | + //点击蒙版隐藏view | |
| 299 | + self.hiden17Alert() | |
| 300 | + } | |
| 301 | + //弹出弹窗 | |
| 302 | + func show17Alert(){ | |
| 303 | + | |
| 304 | + delegate.window?.addSubview(self.alertBgView) | |
| 305 | + delegate.window?.addSubview(self.alertBgImgView) | |
| 306 | + alertBgImgView.snp.makeConstraints { make in | |
| 307 | + make.centerX.equalToSuperview() | |
| 308 | + make.centerY.equalToSuperview() | |
| 309 | + make.width.equalTo(KSreenWidth-120) | |
| 310 | + make.height.equalTo((KSreenWidth-120)*330/390) | |
| 311 | + } | |
| 312 | + | |
| 313 | + self.alertBgImgView.image = UIImage(named: "mine_chengnuo") | |
| 314 | + } | |
| 315 | + func hiden17Alert(){ | |
| 316 | + delegate.window?.subviews.forEach({ view in | |
| 317 | + if view.tag >= 20000{ | |
| 318 | + view.removeFromSuperview() | |
| 319 | + } | |
| 320 | + }) | |
| 321 | + } | |
| 322 | +} | ... | ... |
metaCode/Classes/Main/HomePage/View/DigitalAuthViews/DigitalResume/CNLiveDigitalResumeCell.swift
| ... | ... | @@ -108,6 +108,14 @@ class CNLiveDigitalResumeCell: UITableViewCell { |
| 108 | 108 | titleLabel.font = Font_14 |
| 109 | 109 | return titleLabel |
| 110 | 110 | }() |
| 111 | + lazy var weizhiTitleLabel: UILabel = { | |
| 112 | + let titleLabel = UILabel() | |
| 113 | + titleLabel.textColor = HexColor("#999999") | |
| 114 | + titleLabel.textAlignment = .left | |
| 115 | + titleLabel.text = " | 位置未授权" | |
| 116 | + titleLabel.font = Font_14 | |
| 117 | + return titleLabel | |
| 118 | + }() | |
| 111 | 119 | lazy var workTitleLabel: UILabel = { |
| 112 | 120 | let titleLabel = UILabel() |
| 113 | 121 | titleLabel.textColor = HexColor("#999999") |
| ... | ... | @@ -131,6 +139,12 @@ class CNLiveDigitalResumeCell: UITableViewCell { |
| 131 | 139 | titleLabel.font = BoldFont_14 |
| 132 | 140 | return titleLabel |
| 133 | 141 | }() |
| 142 | + lazy var hangyeImgView :UIImageView = { | |
| 143 | + let iconImgView = UIImageView() | |
| 144 | + iconImgView.image = UIImage(named: "mine_jianli_zhenshi") | |
| 145 | + return iconImgView | |
| 146 | + }() | |
| 147 | + | |
| 134 | 148 | lazy var hangyeDetailTitleLabel: UILabel = { |
| 135 | 149 | let titleLabel = UILabel() |
| 136 | 150 | titleLabel.textColor = HexColor("#999999") |
| ... | ... | @@ -315,7 +329,7 @@ class CNLiveDigitalResumeCell: UITableViewCell { |
| 315 | 329 | |
| 316 | 330 | self.contentView.addSubview(self.jianliIconBgView) |
| 317 | 331 | self.jianliIconBgView.snp.makeConstraints { make in |
| 318 | - make.top.equalTo(adapt_length(length: 57)) | |
| 332 | + make.top.equalTo(adapt_length(length: 37)) | |
| 319 | 333 | make.right.equalToSuperview().offset(adapt_length(length: -42)) |
| 320 | 334 | make.width.height.equalTo(adapt_length(length: 90)) |
| 321 | 335 | } |
| ... | ... | @@ -339,14 +353,23 @@ class CNLiveDigitalResumeCell: UITableViewCell { |
| 339 | 353 | make.height.equalTo(adapt_length(length: 21)) |
| 340 | 354 | } |
| 341 | 355 | self.whiteBgView.addSubview(self.phoneTitleLabel) |
| 356 | + let (gender, age) = self.extractGenderAndAge(fromIDCardNumber: UserInfoManager.shared.userInfo.currentUser?.idNo ?? "") | |
| 357 | + let ageStr = String(format: "%d", age ?? 0) | |
| 358 | + self.phoneTitleLabel.text = gender+" | "+ageStr+"岁"+" | "+UserInfoManager.shared.userInfo.mobile | |
| 359 | + self.phoneTitleLabel.sizeToFit() | |
| 342 | 360 | self.phoneTitleLabel.snp.makeConstraints { make in |
| 343 | 361 | make.left.equalTo(adapt_length(length: 15)) |
| 344 | 362 | make.top.equalTo(self.authNameTitleLabel.snp.bottom).offset(adapt_length(length: 8)) |
| 363 | + make.width.equalTo(self.phoneTitleLabel.size.width) | |
| 364 | + make.height.equalTo(self.phoneTitleLabel.size.height) | |
| 345 | 365 | } |
| 346 | - let (gender, age) = self.extractGenderAndAge(fromIDCardNumber: UserInfoManager.shared.userInfo.currentUser?.idNo ?? "") | |
| 347 | - let ageStr = String(format: "%d", age ?? 0) | |
| 348 | - self.phoneTitleLabel.text = gender+" | "+ageStr+"岁"+" | "+UserInfoManager.shared.userInfo.mobile | |
| 349 | 366 | |
| 367 | + self.whiteBgView.addSubview(self.weizhiTitleLabel) | |
| 368 | + self.weizhiTitleLabel.snp.makeConstraints { make in | |
| 369 | + make.left.equalTo(self.phoneTitleLabel.snp.right) | |
| 370 | + make.right.equalToSuperview().offset(-5) | |
| 371 | + make.top.equalTo(self.phoneTitleLabel.snp.top) | |
| 372 | + } | |
| 350 | 373 | self.whiteBgView.addSubview(self.workTitleLabel) |
| 351 | 374 | self.workTitleLabel.snp.makeConstraints { make in |
| 352 | 375 | make.left.equalTo(adapt_length(length: 15)) |
| ... | ... | @@ -366,6 +389,14 @@ class CNLiveDigitalResumeCell: UITableViewCell { |
| 366 | 389 | make.left.equalTo(adapt_length(length: 15)) |
| 367 | 390 | make.top.equalTo(self.lineView.snp.bottom).offset(adapt_length(length: 20)) |
| 368 | 391 | } |
| 392 | + self.whiteBgView.addSubview(self.hangyeImgView) | |
| 393 | + self.hangyeImgView.snp.makeConstraints { make in | |
| 394 | + make.left.equalTo(self.hangyeTitleLabel.snp.right).offset(5) | |
| 395 | + make.centerY.equalTo(self.hangyeTitleLabel.snp.centerY) | |
| 396 | + make.width.equalTo(83) | |
| 397 | + make.height.equalTo(16) | |
| 398 | + } | |
| 399 | + self.hangyeImgView.isHidden = true | |
| 369 | 400 | self.whiteBgView.addSubview(self.hangyeDetailTitleLabel) |
| 370 | 401 | self.hangyeDetailTitleLabel.snp.makeConstraints { make in |
| 371 | 402 | make.right.equalToSuperview().offset(adapt_length(length: -20)) |
| ... | ... | @@ -493,10 +524,11 @@ class CNLiveDigitalResumeCell: UITableViewCell { |
| 493 | 524 | |
| 494 | 525 | } |
| 495 | 526 | @objc func workTitleLabelAciton(){ |
| 496 | - | |
| 527 | + let vc = CNLiveDigitalResumeInfoController() | |
| 528 | + currentViewController()?.navigationController?.pushViewController(vc, animated: true) | |
| 497 | 529 | } |
| 498 | 530 | @objc func hangyeDetailTitleLabelAciton(){ |
| 499 | - | |
| 531 | + navigationViewController().pushViewController(CNLiveSelectHangYeController(), animated: true) | |
| 500 | 532 | } |
| 501 | 533 | @objc func renzhengDetailTitleLabelAciton(){ |
| 502 | 534 | |
| ... | ... | @@ -524,5 +556,26 @@ class CNLiveDigitalResumeCell: UITableViewCell { |
| 524 | 556 | |
| 525 | 557 | func setupNewUI(model:CNLiveVitaeModel){ |
| 526 | 558 | self.jianliTitleLabel.text = "数字简历ID:"+"\(model.vitae!.id)" |
| 559 | + if model.vitae?.profession.count ?? 0 > 0{ | |
| 560 | + self.hangyeTitleLabel.text = model.vitae?.profession | |
| 561 | + self.hangyeDetailTitleLabel.isHidden = true | |
| 562 | + //再加一个本人承诺真实icon | |
| 563 | + self.hangyeImgView.isHidden = false | |
| 564 | + }else{ | |
| 565 | + self.hangyeTitleLabel.text = "行业" | |
| 566 | + self.hangyeDetailTitleLabel.isHidden = false | |
| 567 | + //隐藏一个本人承诺真实icon | |
| 568 | + self.hangyeImgView.isHidden = true | |
| 569 | + } | |
| 570 | + if model.vitae?.city.count ?? 0 > 0 && model.vitae?.showAddress == true{ | |
| 571 | + self.weizhiTitleLabel.text = " | "+model.vitae!.city | |
| 572 | + }else{ | |
| 573 | + self.weizhiTitleLabel.text = " | 位置未授权" | |
| 574 | + } | |
| 575 | + if model.vitae?.workTime.count ?? 0 > 0{ | |
| 576 | + self.workTitleLabel.text = model.vitae!.workTime | |
| 577 | + }else{ | |
| 578 | + self.workTitleLabel.text = "参加工作时间未设置 >" | |
| 579 | + } | |
| 527 | 580 | } |
| 528 | 581 | } | ... | ... |
metaCode/Classes/Main/HomePage/View/DigitalAuthViews/DigitalResume/CNLiveHangYeFirCell.swift
0 → 100644
| 1 | +// | |
| 2 | +// CNLiveHangYeFirCell.swift | |
| 3 | +// metaCode | |
| 4 | +// | |
| 5 | +// Created by zx on 2024/7/23. | |
| 6 | +// | |
| 7 | + | |
| 8 | +import Foundation | |
| 9 | +import SnapKit | |
| 10 | + | |
| 11 | +class CNLiveHangYeFirCell:UITableViewCell{ | |
| 12 | + | |
| 13 | + var _authModel : MineAuthenticationsChildModel? | |
| 14 | + var authModel : MineAuthenticationsChildModel? { | |
| 15 | + get{ | |
| 16 | + _authModel | |
| 17 | + } | |
| 18 | + set{ | |
| 19 | + _authModel = newValue! | |
| 20 | + setupNewUI(model: _authModel!) | |
| 21 | + } | |
| 22 | + } | |
| 23 | + | |
| 24 | + var _isSelect = false | |
| 25 | + var isSelect:Bool{ | |
| 26 | + get{ | |
| 27 | + _isSelect | |
| 28 | + } | |
| 29 | + set{ | |
| 30 | + _isSelect = newValue | |
| 31 | + if _isSelect == true{ | |
| 32 | + self.nameLabel.textColor = HexColor("#1961FE") | |
| 33 | + self.nameLabel.backgroundColor = .white | |
| 34 | + }else{ | |
| 35 | + self.nameLabel.textColor = HexColor("#999999") | |
| 36 | + self.nameLabel.backgroundColor = HexColor("#F6F7FB") | |
| 37 | + } | |
| 38 | + } | |
| 39 | + } | |
| 40 | + lazy var nameLabel: UILabel = { | |
| 41 | + let titleLabel = UILabel() | |
| 42 | + titleLabel.textColor = HexColor("#1961FE") | |
| 43 | + titleLabel.text = "名称名称" | |
| 44 | + titleLabel.font = BoldFont_14 | |
| 45 | + titleLabel.textAlignment = .center | |
| 46 | + titleLabel.adjustsFontSizeToFitWidth = true | |
| 47 | + return titleLabel | |
| 48 | + }() | |
| 49 | + | |
| 50 | + override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) { | |
| 51 | + super.init(style: style, reuseIdentifier: reuseIdentifier) | |
| 52 | + self.selectionStyle = .none | |
| 53 | + self.initUI() | |
| 54 | + } | |
| 55 | + | |
| 56 | + required init?(coder: NSCoder) { | |
| 57 | + fatalError("init(coder:) has not been implemented") | |
| 58 | + } | |
| 59 | + | |
| 60 | + func initUI(){ | |
| 61 | + self.contentView.addSubview(self.nameLabel) | |
| 62 | + self.nameLabel.snp.makeConstraints { make in | |
| 63 | + make.top.bottom.left.right.equalToSuperview() | |
| 64 | + } | |
| 65 | + } | |
| 66 | + | |
| 67 | + func setupNewUI(model:MineAuthenticationsChildModel){ | |
| 68 | + self.nameLabel.text = model.name | |
| 69 | + } | |
| 70 | +} | ... | ... |
metaCode/Classes/Main/HomePage/View/DigitalAuthViews/DigitalResume/CNLiveHangYeSecCell.swift
0 → 100644
| 1 | +// | |
| 2 | +// CNLiveHangYeSecCell.swift | |
| 3 | +// metaCode | |
| 4 | +// | |
| 5 | +// Created by zx on 2024/7/23. | |
| 6 | +// | |
| 7 | + | |
| 8 | +import Foundation | |
| 9 | +import SnapKit | |
| 10 | + | |
| 11 | +class CNLiveHangYeSecCell:UITableViewCell{ | |
| 12 | + var _authModel : MineAuthenticationsChildModel? | |
| 13 | + var authModel : MineAuthenticationsChildModel? { | |
| 14 | + get{ | |
| 15 | + _authModel | |
| 16 | + } | |
| 17 | + set{ | |
| 18 | + _authModel = newValue! | |
| 19 | + setupNewUI(model: _authModel!) | |
| 20 | + } | |
| 21 | + } | |
| 22 | + | |
| 23 | + var _isSelect = false | |
| 24 | + var isSelect:Bool{ | |
| 25 | + get{ | |
| 26 | + _isSelect | |
| 27 | + } | |
| 28 | + set{ | |
| 29 | + _isSelect = newValue | |
| 30 | + if _isSelect == true{ | |
| 31 | + self.iconImgView.isHidden = false | |
| 32 | + }else{ | |
| 33 | + self.iconImgView.isHidden = true | |
| 34 | + } | |
| 35 | + } | |
| 36 | + } | |
| 37 | + lazy var nameLabel: UILabel = { | |
| 38 | + let titleLabel = UILabel() | |
| 39 | + titleLabel.textColor = HexColor("#333333") | |
| 40 | + titleLabel.text = "名称名称" | |
| 41 | + titleLabel.font = Font_14 | |
| 42 | + titleLabel.textAlignment = .center | |
| 43 | + titleLabel.adjustsFontSizeToFitWidth = true | |
| 44 | + return titleLabel | |
| 45 | + }() | |
| 46 | + lazy var iconImgView :UIImageView = { | |
| 47 | + let iconImgView = UIImageView() | |
| 48 | + iconImgView.image = UIImage(named: "mine_hangye_select") | |
| 49 | + return iconImgView | |
| 50 | + }() | |
| 51 | + | |
| 52 | + override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) { | |
| 53 | + super.init(style: style, reuseIdentifier: reuseIdentifier) | |
| 54 | + self.selectionStyle = .none | |
| 55 | + self.initUI() | |
| 56 | + } | |
| 57 | + | |
| 58 | + required init?(coder: NSCoder) { | |
| 59 | + fatalError("init(coder:) has not been implemented") | |
| 60 | + } | |
| 61 | + | |
| 62 | + func initUI(){ | |
| 63 | + self.contentView.addSubview(self.nameLabel) | |
| 64 | + self.nameLabel.snp.makeConstraints { make in | |
| 65 | + make.left.equalTo(20) | |
| 66 | + make.centerY.equalToSuperview() | |
| 67 | + } | |
| 68 | + | |
| 69 | + self.contentView.addSubview(self.iconImgView) | |
| 70 | + self.iconImgView.snp.makeConstraints { make in | |
| 71 | + make.right.equalToSuperview().offset(-20) | |
| 72 | + make.width.height.equalTo(17) | |
| 73 | + make.centerY.equalToSuperview() | |
| 74 | + } | |
| 75 | + self.iconImgView.isHidden = true | |
| 76 | + } | |
| 77 | + func setupNewUI(model:MineAuthenticationsChildModel){ | |
| 78 | + self.nameLabel.text = model.name | |
| 79 | + } | |
| 80 | +} | ... | ... |
metaCode/Classes/Main/HomePage/ViewModel/DigitalAuth/CNLiveDigitalAuthViewModel.swift
| ... | ... | @@ -21,26 +21,36 @@ class CNLiveDigitalAuthViewModel:NSObject{ |
| 21 | 21 | param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "sid") |
| 22 | 22 | param.setValue(name, forKey: "name") |
| 23 | 23 | param.setValue(idNo, forKey: "idNo") |
| 24 | -// param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "file") | |
| 25 | - | |
| 24 | + | |
| 26 | 25 | CNLiveNetworking.setAllowRequestDefaultArgument(true) |
| 27 | 26 | CNLiveNetworking.setupShowDataResult(false) |
| 28 | - CNLiveNetworking.setupDSRequest(true) | |
| 27 | + CNLiveNetworking.setupShowResult(true) | |
| 28 | + | |
| 29 | 29 | let custom_param = NSMutableDictionary() |
| 30 | 30 | custom_param.setValue(CNLiveMCEnvironmentManager.shared.appId, forKey: "appId") |
| 31 | 31 | custom_param.setValue(CNLiveMCEnvironmentManager.shared.appKey, forKey: "appKey") |
| 32 | 32 | CNLiveNetworking.setupCustomParam(custom_param as? [String : String]) |
| 33 | - CNLiveNetworking.uploadNetwork(withURLString: APPBaseCMSUrl+"/toolApi/verify", param: param as! [AnyHashable : Any]) { formData in | |
| 34 | - formData?.appendPart(withForm: fileData, name: "file")//APPBaseCMSUrl APPBaseMCUrl | |
| 33 | + CNLiveNetworking.uploadNetwork(withURLString: APPBaseMCUrl+"/toolApi/verify", param: param as! [AnyHashable : Any]) { formData in | |
| 34 | + formData?.appendPart(withFileData: fileData as Data, name: "file", fileName: ".jpg", mimeType: "image/jpg") | |
| 35 | 35 | } progressBlock: { progress in |
| 36 | - print("progress\(progress?.completedUnitCount)") | |
| 36 | + print("已上传==>\(progress!.fractionCompleted*100)") | |
| 37 | 37 | } completionBlock: { task, any, error in |
| 38 | 38 | print("completionBlock") |
| 39 | 39 | |
| 40 | 40 | if (error != nil){ |
| 41 | 41 | resultBlock(NSNull(),.failed) |
| 42 | 42 | }else{ |
| 43 | - resultBlock(true,.success) | |
| 43 | + if let dic = any as? Dictionary<String, Any>{ | |
| 44 | + if let data = dic["data"] as? Bool{ | |
| 45 | + if data == true{ | |
| 46 | + resultBlock(true,.success) | |
| 47 | + }else{ | |
| 48 | + resultBlock(NSNull(),.failed) | |
| 49 | + } | |
| 50 | + } | |
| 51 | + }else{ | |
| 52 | + resultBlock(NSNull(),.failed) | |
| 53 | + } | |
| 44 | 54 | } |
| 45 | 55 | |
| 46 | 56 | } | ... | ... |
metaCode/Classes/Main/HomePage/ViewModel/Vitae/CNLiveVitaeViewModel.swift
| ... | ... | @@ -49,7 +49,7 @@ class CNLiveVitaeViewModel:NSObject{ |
| 49 | 49 | 参数 vsid 实名对象id |
| 50 | 50 | 参数 type 1简历信息 2官方认证 3证书 4工作经历 4获奖情况 |
| 51 | 51 | */ |
| 52 | - 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) { | |
| 52 | + 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) { | |
| 53 | 53 | let values = NSMutableDictionary() |
| 54 | 54 | values.addEntries(from: ["city":city]) |
| 55 | 55 | values.addEntries(from: ["icon":icon]) | ... | ... |
metaCode/Classes/Main/MinePage/ViewModel/CNLiveMineViewModel.swift
| ... | ... | @@ -716,11 +716,13 @@ class CNLiveMineViewModel: NSObject { |
| 716 | 716 | /// - sid: 用户id |
| 717 | 717 | /// - vsid: 实名id |
| 718 | 718 | /// - resultBlock: 返回 |
| 719 | - static func requestsIndustryInfo(channelId: String, sid: String, vsid: String,resultBlock: @escaping resultNewsBlock) { | |
| 719 | + static func requestsIndustryInfo(channelId: String,type:String, sid: String, vsid: String,resultBlock: @escaping resultNewsBlock) { | |
| 720 | 720 | let param = NSMutableDictionary() |
| 721 | 721 | param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "sid") |
| 722 | 722 | param.setValue(vsid, forKey: "vsid") |
| 723 | 723 | param.setValue(channelId, forKey: "channelId") |
| 724 | + param.setValue(type, forKey: "type") | |
| 725 | + | |
| 724 | 726 | let custom_param = NSMutableDictionary() |
| 725 | 727 | custom_param.setValue(CNLiveMCEnvironmentManager.shared.appId, forKey: "appId") |
| 726 | 728 | custom_param.setValue(CNLiveMCEnvironmentManager.shared.appKey, forKey: "appKey") | ... | ... |
metaCode/Supporting Files/Assets.xcassets/MinePage/jianli/Contents.json
0 → 100644
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_jianli.imageset/Contents.json renamed to 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 renamed to metaCode/Supporting Files/Assets.xcassets/MinePage/jianli/mine_jianli.imageset/mine_jianli@2x.png
1.82 KB
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_jianli.imageset/mine_jianli@3x.png renamed to metaCode/Supporting Files/Assets.xcassets/MinePage/jianli/mine_jianli.imageset/mine_jianli@3x.png
3.28 KB
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_jianli_back.imageset/Contents.json renamed to metaCode/Supporting Files/Assets.xcassets/MinePage/jianli/mine_jianli_back.imageset/Contents.json
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_jianli_back.imageset/mine_jianli_back@2x.png renamed to metaCode/Supporting Files/Assets.xcassets/MinePage/jianli/mine_jianli_back.imageset/mine_jianli_back@2x.png
303 Bytes
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_jianli_back.imageset/mine_jianli_back@3x.png renamed to metaCode/Supporting Files/Assets.xcassets/MinePage/jianli/mine_jianli_back.imageset/mine_jianli_back@3x.png
528 Bytes
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_jianli_gaokao.imageset/Contents.json renamed to metaCode/Supporting Files/Assets.xcassets/MinePage/jianli/mine_jianli_gaokao.imageset/Contents.json
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_jianli_gaokao.imageset/mine_jianli_gaokao@2x.png renamed to metaCode/Supporting Files/Assets.xcassets/MinePage/jianli/mine_jianli_gaokao.imageset/mine_jianli_gaokao@2x.png
37.8 KB
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_jianli_gaokao.imageset/mine_jianli_gaokao@3x.png renamed to metaCode/Supporting Files/Assets.xcassets/MinePage/jianli/mine_jianli_gaokao.imageset/mine_jianli_gaokao@3x.png
74.7 KB
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_jianli_grayIcon.imageset/Contents.json renamed to metaCode/Supporting Files/Assets.xcassets/MinePage/jianli/mine_jianli_grayIcon.imageset/Contents.json
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_jianli_grayIcon.imageset/mine_jianli_icon@2x.png renamed to metaCode/Supporting Files/Assets.xcassets/MinePage/jianli/mine_jianli_grayIcon.imageset/mine_jianli_icon@2x.png
8.94 KB
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_jianli_grayIcon.imageset/mine_jianli_icon@3x.png renamed to metaCode/Supporting Files/Assets.xcassets/MinePage/jianli/mine_jianli_grayIcon.imageset/mine_jianli_icon@3x.png
16.4 KB
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_jianli_huliyuan.imageset/Contents.json renamed to metaCode/Supporting Files/Assets.xcassets/MinePage/jianli/mine_jianli_huliyuan.imageset/Contents.json
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_jianli_huliyuan.imageset/mine_jianli_huliyuan@2x.png renamed to metaCode/Supporting Files/Assets.xcassets/MinePage/jianli/mine_jianli_huliyuan.imageset/mine_jianli_huliyuan@2x.png
43.1 KB
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_jianli_huliyuan.imageset/mine_jianli_huliyuan@3x.png renamed to metaCode/Supporting Files/Assets.xcassets/MinePage/jianli/mine_jianli_huliyuan.imageset/mine_jianli_huliyuan@3x.png
82.2 KB
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_jianli_icon.imageset/Contents.json renamed to metaCode/Supporting Files/Assets.xcassets/MinePage/jianli/mine_jianli_icon.imageset/Contents.json
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_jianli_icon.imageset/mine_jianli_icon@2x.png renamed to metaCode/Supporting Files/Assets.xcassets/MinePage/jianli/mine_jianli_icon.imageset/mine_jianli_icon@2x.png
12.3 KB
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_jianli_icon.imageset/mine_jianli_icon@3x.png renamed to metaCode/Supporting Files/Assets.xcassets/MinePage/jianli/mine_jianli_icon.imageset/mine_jianli_icon@3x.png
29.6 KB
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_jianli_iconbg.imageset/Contents.json renamed to metaCode/Supporting Files/Assets.xcassets/MinePage/jianli/mine_jianli_iconbg.imageset/Contents.json
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_jianli_iconbg.imageset/mine_jianli_iconbg@2x.png renamed to metaCode/Supporting Files/Assets.xcassets/MinePage/jianli/mine_jianli_iconbg.imageset/mine_jianli_iconbg@2x.png
7.8 KB
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_jianli_iconbg.imageset/mine_jianli_iconbg@3x.png renamed to metaCode/Supporting Files/Assets.xcassets/MinePage/jianli/mine_jianli_iconbg.imageset/mine_jianli_iconbg@3x.png
14.5 KB
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_jianli_jiating.imageset/Contents.json renamed to metaCode/Supporting Files/Assets.xcassets/MinePage/jianli/mine_jianli_jiating.imageset/Contents.json
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_jianli_jiating.imageset/mine_jianli_jiating@2x.png renamed to metaCode/Supporting Files/Assets.xcassets/MinePage/jianli/mine_jianli_jiating.imageset/mine_jianli_jiating@2x.png
31.8 KB
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_jianli_jiating.imageset/mine_jianli_jiating@3x.png renamed to metaCode/Supporting Files/Assets.xcassets/MinePage/jianli/mine_jianli_jiating.imageset/mine_jianli_jiating@3x.png
60.4 KB
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_jianli_peibanshi.imageset/Contents.json renamed to metaCode/Supporting Files/Assets.xcassets/MinePage/jianli/mine_jianli_peibanshi.imageset/Contents.json
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_jianli_peibanshi.imageset/mine_jianli_peibanshi@2x.png renamed to metaCode/Supporting Files/Assets.xcassets/MinePage/jianli/mine_jianli_peibanshi.imageset/mine_jianli_peibanshi@2x.png
49.7 KB
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_jianli_peibanshi.imageset/mine_jianli_peibanshi@3x.png renamed to metaCode/Supporting Files/Assets.xcassets/MinePage/jianli/mine_jianli_peibanshi.imageset/mine_jianli_peibanshi@3x.png
96.3 KB
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_jianli_qiuzhi.imageset/Contents.json renamed to metaCode/Supporting Files/Assets.xcassets/MinePage/jianli/mine_jianli_qiuzhi.imageset/Contents.json
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_jianli_qiuzhi.imageset/mine_jianli_qiuzhi.jpg renamed to metaCode/Supporting Files/Assets.xcassets/MinePage/jianli/mine_jianli_qiuzhi.imageset/mine_jianli_qiuzhi.jpg
62.4 KB
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_jianli_tishi.imageset/Contents.json renamed to metaCode/Supporting Files/Assets.xcassets/MinePage/jianli/mine_jianli_tishi.imageset/Contents.json
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_jianli_tishi.imageset/mine_jianli_tishi@2x.png renamed to metaCode/Supporting Files/Assets.xcassets/MinePage/jianli/mine_jianli_tishi.imageset/mine_jianli_tishi@2x.png
219 KB
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_jianli_tishi.imageset/mine_jianli_tishi@3x.png renamed to metaCode/Supporting Files/Assets.xcassets/MinePage/jianli/mine_jianli_tishi.imageset/mine_jianli_tishi@3x.png
567 KB
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_jianli_xieyiBg.imageset/Contents.json renamed to metaCode/Supporting Files/Assets.xcassets/MinePage/jianli/mine_jianli_xieyiBg.imageset/Contents.json
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_jianli_xieyiBg.imageset/mine_jianli_xieyiBg@2x.png renamed to metaCode/Supporting Files/Assets.xcassets/MinePage/jianli/mine_jianli_xieyiBg.imageset/mine_jianli_xieyiBg@2x.png
219 KB
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_jianli_xieyiBg.imageset/mine_jianli_xieyiBg@3x.png renamed to metaCode/Supporting Files/Assets.xcassets/MinePage/jianli/mine_jianli_xieyiBg.imageset/mine_jianli_xieyiBg@3x.png
567 KB
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_jianli_xinli.imageset/Contents.json renamed to metaCode/Supporting Files/Assets.xcassets/MinePage/jianli/mine_jianli_xinli.imageset/Contents.json
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_jianli_xinli.imageset/mine_jianli_xinli@2x.png renamed to metaCode/Supporting Files/Assets.xcassets/MinePage/jianli/mine_jianli_xinli.imageset/mine_jianli_xinli@2x.png
32.5 KB
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_jianli_xinli.imageset/mine_jianli_xinli@3x.png renamed to metaCode/Supporting Files/Assets.xcassets/MinePage/jianli/mine_jianli_xinli.imageset/mine_jianli_xinli@3x.png
64.1 KB
metaCode/Supporting Files/Assets.xcassets/MinePage/jianli/mine_jianli_zhenshi.imageset/Contents.json
0 → 100644
| 1 | +{ | |
| 2 | + "images" : [ | |
| 3 | + { | |
| 4 | + "idiom" : "universal", | |
| 5 | + "scale" : "1x" | |
| 6 | + }, | |
| 7 | + { | |
| 8 | + "filename" : "mine_jianli_zhenshi@2x.png", | |
| 9 | + "idiom" : "universal", | |
| 10 | + "scale" : "2x" | |
| 11 | + }, | |
| 12 | + { | |
| 13 | + "idiom" : "universal", | |
| 14 | + "scale" : "3x" | |
| 15 | + } | |
| 16 | + ], | |
| 17 | + "info" : { | |
| 18 | + "author" : "xcode", | |
| 19 | + "version" : 1 | |
| 20 | + } | |
| 21 | +} | ... | ... |
metaCode/Supporting Files/Assets.xcassets/MinePage/jianli/mine_jianli_zhenshi.imageset/mine_jianli_zhenshi@2x.png
0 → 100644
25.8 KB
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_jianli_zhiye.imageset/Contents.json renamed to metaCode/Supporting Files/Assets.xcassets/MinePage/jianli/mine_jianli_zhiye.imageset/Contents.json
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_jianli_zhiye.imageset/mine_jianli_zhiye.jpg renamed to metaCode/Supporting Files/Assets.xcassets/MinePage/jianli/mine_jianli_zhiye.imageset/mine_jianli_zhiye.jpg
67 KB
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_jianli_zhiyeguigua.imageset/Contents.json renamed to metaCode/Supporting Files/Assets.xcassets/MinePage/jianli/mine_jianli_zhiyeguigua.imageset/Contents.json
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_jianli_zhiyeguigua.imageset/mine_jianli_zhiyeguigua@2x.png renamed to metaCode/Supporting Files/Assets.xcassets/MinePage/jianli/mine_jianli_zhiyeguigua.imageset/mine_jianli_zhiyeguigua@2x.png
45.5 KB
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_jianli_zhiyeguigua.imageset/mine_jianli_zhiyeguigua@3x.png renamed to metaCode/Supporting Files/Assets.xcassets/MinePage/jianli/mine_jianli_zhiyeguigua.imageset/mine_jianli_zhiyeguigua@3x.png
88.9 KB
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_jianli_zhiyuanzhe.imageset/Contents.json renamed to metaCode/Supporting Files/Assets.xcassets/MinePage/jianli/mine_jianli_zhiyuanzhe.imageset/Contents.json
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_jianli_zhiyuanzhe.imageset/mine_jianli_zhiyuanzhe@2x.png renamed to metaCode/Supporting Files/Assets.xcassets/MinePage/jianli/mine_jianli_zhiyuanzhe.imageset/mine_jianli_zhiyuanzhe@2x.png
61.3 KB
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_jianli_zhiyuanzhe.imageset/mine_jianli_zhiyuanzhe@3x.png renamed to metaCode/Supporting Files/Assets.xcassets/MinePage/jianli/mine_jianli_zhiyuanzhe.imageset/mine_jianli_zhiyuanzhe@3x.png
120 KB
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_chengnuo.imageset/Contents.json
0 → 100644
| 1 | +{ | |
| 2 | + "images" : [ | |
| 3 | + { | |
| 4 | + "idiom" : "universal", | |
| 5 | + "scale" : "1x" | |
| 6 | + }, | |
| 7 | + { | |
| 8 | + "filename" : "mine_chengnuo@2x.png", | |
| 9 | + "idiom" : "universal", | |
| 10 | + "scale" : "2x" | |
| 11 | + }, | |
| 12 | + { | |
| 13 | + "idiom" : "universal", | |
| 14 | + "scale" : "3x" | |
| 15 | + } | |
| 16 | + ], | |
| 17 | + "info" : { | |
| 18 | + "author" : "xcode", | |
| 19 | + "version" : 1 | |
| 20 | + } | |
| 21 | +} | ... | ... |
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_chengnuo.imageset/mine_chengnuo@2x.png
0 → 100644
126 KB
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_hangye_select.imageset/Contents.json
0 → 100644
| 1 | +{ | |
| 2 | + "images" : [ | |
| 3 | + { | |
| 4 | + "idiom" : "universal", | |
| 5 | + "scale" : "1x" | |
| 6 | + }, | |
| 7 | + { | |
| 8 | + "filename" : "mine_hangye_select@2x.png", | |
| 9 | + "idiom" : "universal", | |
| 10 | + "scale" : "2x" | |
| 11 | + }, | |
| 12 | + { | |
| 13 | + "filename" : "mine_hangye_select@3x.png", | |
| 14 | + "idiom" : "universal", | |
| 15 | + "scale" : "3x" | |
| 16 | + } | |
| 17 | + ], | |
| 18 | + "info" : { | |
| 19 | + "author" : "xcode", | |
| 20 | + "version" : 1 | |
| 21 | + } | |
| 22 | +} | ... | ... |
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_hangye_select.imageset/mine_hangye_select@2x.png
0 → 100644
1013 Bytes
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_hangye_select.imageset/mine_hangye_select@3x.png
0 → 100644
1.72 KB