Commit 8a0e8529289ae0cd27deac889543117aa2091053
1 parent
10fc7515
删除我的-官方认证
Showing
6 changed files
with
45 additions
and
25 deletions
metaCode/Classes/Common/Util/CNLiveCommonQiniuTool.swift
| @@ -112,7 +112,7 @@ class UploadManager: NSObject { | @@ -112,7 +112,7 @@ class UploadManager: NSObject { | ||
| 112 | /// - resultBlock: 结果 | 112 | /// - resultBlock: 结果 |
| 113 | static private func uploadData(madiaData: NSData, key: String, progress: ProgressBlcok?, success: SuccessBlock?) { | 113 | static private func uploadData(madiaData: NSData, key: String, progress: ProgressBlcok?, success: SuccessBlock?) { |
| 114 | let param = NSMutableDictionary() | 114 | let param = NSMutableDictionary() |
| 115 | - param.setValue(CNLiveMCEnvironmentManager.shared.appId, forKey: "appId") | 115 | + param.setValue("802_li40qhp922", forKey: "appId")//CNLiveMCEnvironmentManager.shared.appId |
| 116 | param.setValue("POST", forKey: "verb") | 116 | param.setValue("POST", forKey: "verb") |
| 117 | param.setValue("2", forKey: "storageType") | 117 | param.setValue("2", forKey: "storageType") |
| 118 | param.setValue(kBucketName_QN, forKey: "bucket") | 118 | param.setValue(kBucketName_QN, forKey: "bucket") |
metaCode/Classes/Main/HomePage/Controller/DigitalAuth/数字简历相关页面/CNLiveDigitalResumeController.swift
| @@ -11,7 +11,7 @@ import CNLiveShareToolKit | @@ -11,7 +11,7 @@ import CNLiveShareToolKit | ||
| 11 | class CNLiveDigitalResumeController:CNLiveBaseViewController,UITableViewDataSource, UITableViewDelegate{ | 11 | class CNLiveDigitalResumeController:CNLiveBaseViewController,UITableViewDataSource, UITableViewDelegate{ |
| 12 | 12 | ||
| 13 | var certificatesCount:Int = 0//证书数量 | 13 | var certificatesCount:Int = 0//证书数量 |
| 14 | - | 14 | + |
| 15 | //简历model | 15 | //简历model |
| 16 | var vitaeModel:CNLiveVitaeModel? | 16 | var vitaeModel:CNLiveVitaeModel? |
| 17 | lazy var moreNavBtn: UIButton = { | 17 | lazy var moreNavBtn: UIButton = { |
metaCode/Classes/Main/HomePage/Controller/DigitalAuth/数字认证身份相关页面/CNLiveIdentityRepositoryController.swift
| @@ -330,13 +330,19 @@ class CNLiveIdentityRepositoryController:CNLiveBaseViewController,UITableViewDat | @@ -330,13 +330,19 @@ class CNLiveIdentityRepositoryController:CNLiveBaseViewController,UITableViewDat | ||
| 330 | if self.currCollectMdl?.auth == true{ | 330 | if self.currCollectMdl?.auth == true{ |
| 331 | //身份需要实名认证 | 331 | //身份需要实名认证 |
| 332 | if UserInfoManager.shared.userInfo.userMsgUsers?.verifyUsers.count ?? 0 > 0{ | 332 | if UserInfoManager.shared.userInfo.userMsgUsers?.verifyUsers.count ?? 0 > 0{ |
| 333 | - //实名认证过->身份管理页面 | ||
| 334 | let listModel = StandListModel() | 333 | let listModel = StandListModel() |
| 335 | listModel.id = Int(self.currCollectMdl?.id ?? "0")! | 334 | listModel.id = Int(self.currCollectMdl?.id ?? "0")! |
| 336 | listModel.name = "" | 335 | listModel.name = "" |
| 337 | - let vc = CNLiveDigitalRealManageController() | ||
| 338 | - vc.listModel = listModel | ||
| 339 | - self.navigationController?.pushViewController(vc, animated: true) | 336 | + if UserInfoManager.shared.userInfo.currentUser?.vsid.count ?? 0 > 0{ |
| 337 | + //->身份认证页面 | ||
| 338 | + self.navigationController?.pushViewController(CNLiveMineInputViewController.init(listModel: listModel, authType: .person), animated: pushAnimated) | ||
| 339 | + }else{ | ||
| 340 | + //实名认证过->身份管理页面 | ||
| 341 | + let vc = CNLiveDigitalRealManageController() | ||
| 342 | + vc.listModel = listModel | ||
| 343 | + self.navigationController?.pushViewController(vc, animated: true) | ||
| 344 | + } | ||
| 345 | + | ||
| 340 | }else{ | 346 | }else{ |
| 341 | //未实名认证->实名认证 | 347 | //未实名认证->实名认证 |
| 342 | let vc = CNLiveRealNameAuthController() | 348 | let vc = CNLiveRealNameAuthController() |
metaCode/Classes/Main/HomePage/View/DigitalAuthViews/DigitalResume/CNLiveDigitalResumeCell.swift
| @@ -706,14 +706,28 @@ class CNLiveDigitalResumeCell: UITableViewCell { | @@ -706,14 +706,28 @@ class CNLiveDigitalResumeCell: UITableViewCell { | ||
| 706 | navigationViewController().pushViewController(CNLiveSelectHangYeController(), animated: true) | 706 | navigationViewController().pushViewController(CNLiveSelectHangYeController(), animated: true) |
| 707 | } | 707 | } |
| 708 | @objc func renzhengDetailTitleLabelAciton(){ | 708 | @objc func renzhengDetailTitleLabelAciton(){ |
| 709 | - | ||
| 710 | - let vc = CNLiveIdentityRepositoryController() | ||
| 711 | - vc.channelId = "" | ||
| 712 | - vc.type = "1" | ||
| 713 | - navigationViewController().pushViewController(vc, animated: true) | 709 | + let tempArray = StandSortManager.sortMyListData(auths: CNLiveSaveAuthDB.shared.searchAllObject() as NSArray) as! [MineAuthListModel] |
| 710 | + if tempArray.count > 0{ | ||
| 711 | + //有官方认证身份 | ||
| 712 | + //跳转 我的数字资产 | ||
| 713 | + navigationViewController().pushViewController(CNLiveDigitalAssetsController(), animated: true) | ||
| 714 | + }else{ | ||
| 715 | + //没有官方认证身份 | ||
| 716 | + let vc = CNLiveIdentityRepositoryController() | ||
| 717 | + vc.channelId = "" | ||
| 718 | + vc.type = "1" | ||
| 719 | + navigationViewController().pushViewController(vc, animated: true) | ||
| 720 | + } | ||
| 714 | } | 721 | } |
| 715 | @objc func zhengshuDetailTitleLabelAciton(){ | 722 | @objc func zhengshuDetailTitleLabelAciton(){ |
| 716 | - navigationViewController().pushViewController(CNLiveVitaeVocationalCertificateController(), animated: true) | 723 | + if self.certificatesCount > 0{ |
| 724 | + //进证书列表页 | ||
| 725 | + navigationViewController().pushViewController(CNLiveVitaeVocationalCertificateController(), animated: true) | ||
| 726 | + | ||
| 727 | + }else{ | ||
| 728 | + //跳转上传示意图页面 | ||
| 729 | + navigationViewController().pushViewController(CNLiveVitaeCerAddPhotoController(), animated: true) | ||
| 730 | + } | ||
| 717 | } | 731 | } |
| 718 | @objc func gongzuoDetailTitleLabelAciton(){ | 732 | @objc func gongzuoDetailTitleLabelAciton(){ |
| 719 | //工作记录 | 733 | //工作记录 |
metaCode/Classes/Main/MinePage/Controller/CNLiveMineViewController.swift
| @@ -41,8 +41,8 @@ class CNLiveMineViewController : CNLiveBaseViewController, UITableViewDelegate, | @@ -41,8 +41,8 @@ class CNLiveMineViewController : CNLiveBaseViewController, UITableViewDelegate, | ||
| 41 | dataArray.add(array01) | 41 | dataArray.add(array01) |
| 42 | let array02 : [Dictionary] = [["name":"我的数字简历","icon":"mine_jianli"]] | 42 | let array02 : [Dictionary] = [["name":"我的数字简历","icon":"mine_jianli"]] |
| 43 | dataArray.add(array02) | 43 | dataArray.add(array02) |
| 44 | - let array03 : [Dictionary] = [["name":"官方认证","icon":"mine_renzheng"]] | ||
| 45 | - dataArray.add(array03) | 44 | +// let array03 : [Dictionary] = [["name":"官方认证","icon":"mine_renzheng"]] |
| 45 | +// dataArray.add(array03) | ||
| 46 | let array04 : [Dictionary] = [["name":"帮助与反馈","icon":"mine_list_icon_help_feedback"], | 46 | let array04 : [Dictionary] = [["name":"帮助与反馈","icon":"mine_list_icon_help_feedback"], |
| 47 | ["name":"更多设置","icon":"mine_list_icon_set_more"]] | 47 | ["name":"更多设置","icon":"mine_list_icon_set_more"]] |
| 48 | dataArray.add(array04) | 48 | dataArray.add(array04) |
| @@ -297,23 +297,23 @@ extension CNLiveMineViewController { | @@ -297,23 +297,23 @@ extension CNLiveMineViewController { | ||
| 297 | 297 | ||
| 298 | 298 | ||
| 299 | } | 299 | } |
| 300 | - if indexPath.section == 3 { | ||
| 301 | - //官方认证--身份大库 | ||
| 302 | - let vc = CNLiveIdentityRepositoryController() | ||
| 303 | - vc.channelId = "" | ||
| 304 | - vc.type = "1" | ||
| 305 | - navigationViewController().pushViewController(vc, animated: true) | ||
| 306 | - } | 300 | +// if indexPath.section == 3 { |
| 301 | +// //官方认证--身份大库 | ||
| 302 | +// let vc = CNLiveIdentityRepositoryController() | ||
| 303 | +// vc.channelId = "" | ||
| 304 | +// vc.type = "1" | ||
| 305 | +// navigationViewController().pushViewController(vc, animated: true) | ||
| 306 | +// } | ||
| 307 | 307 | ||
| 308 | - if indexPath.section == 4 && indexPath.row == 0 { | 308 | + if indexPath.section == 3 && indexPath.row == 0 { |
| 309 | 309 | ||
| 310 | self.navigationController?.pushViewController(CNLiveHelpFeedBackViewController.init(), animated: true) | 310 | self.navigationController?.pushViewController(CNLiveHelpFeedBackViewController.init(), animated: true) |
| 311 | } | 311 | } |
| 312 | - if indexPath.section == 4 && indexPath.row == 1 { | 312 | + if indexPath.section == 3 && indexPath.row == 1 { |
| 313 | self.navigationController?.pushViewController(CNLiveTypeFeedBackViewController.init(show_type: .setting), animated: true) | 313 | self.navigationController?.pushViewController(CNLiveTypeFeedBackViewController.init(show_type: .setting), animated: true) |
| 314 | } | 314 | } |
| 315 | 315 | ||
| 316 | - if indexPath.section == 5 { | 316 | + if indexPath.section == 4 { |
| 317 | if indexPath.row == 0 { | 317 | if indexPath.row == 0 { |
| 318 | // self.navigationController?.pushViewController(CNLiveShopOrderViewController.init(), animated: true) | 318 | // self.navigationController?.pushViewController(CNLiveShopOrderViewController.init(), animated: true) |
| 319 | // StandSortManager.removeStandSort() | 319 | // StandSortManager.removeStandSort() |
metaCode/Classes/Main/MinePage/ViewModel/CNLiveMineBaseModel.swift
| @@ -272,7 +272,7 @@ class MineAuthenticationsChildIdentitiesModel: BaseModel { | @@ -272,7 +272,7 @@ class MineAuthenticationsChildIdentitiesModel: BaseModel { | ||
| 272 | var name: String = "" | 272 | var name: String = "" |
| 273 | var icon: String = "" | 273 | var icon: String = "" |
| 274 | var createTime: Int = 0 | 274 | var createTime: Int = 0 |
| 275 | - var auth: Bool = false | 275 | + var auth: Bool = false//是否需要实名认证 |
| 276 | var status: Int = 0 | 276 | var status: Int = 0 |
| 277 | var sort: Int = 0 | 277 | var sort: Int = 0 |
| 278 | var type: Int = 0 | 278 | var type: Int = 0 |