Commit 7c172508d643b844fd14f9fae1f267bd1bc54c52
1 parent
123bbe2d
切换实名对象时更新对应的身份本地数据
Showing
6 changed files
with
73 additions
and
17 deletions
metaCode/Classes/Config/CNLiveConfigUserInfo.swift
| @@ -200,7 +200,8 @@ class StandSortManager: NSObject { | @@ -200,7 +200,8 @@ class StandSortManager: NSObject { | ||
| 200 | } | 200 | } |
| 201 | 201 | ||
| 202 | static var sort_key: String { | 202 | static var sort_key: String { |
| 203 | - return "mateCode_stand_sort_key_"+UserInfoManager.shared.userInfo.uid | 203 | + let key = "mateCode_stand_sort_key_"+UserInfoManager.shared.userInfo.uid |
| 204 | + return key | ||
| 204 | } | 205 | } |
| 205 | 206 | ||
| 206 | /// 存储排序信息 | 207 | /// 存储排序信息 |
metaCode/Classes/Config/Database/CNLiveSaveAuthDB.swift
| @@ -48,18 +48,18 @@ class CNLiveSaveAuthDB : NSObject{ | @@ -48,18 +48,18 @@ class CNLiveSaveAuthDB : NSObject{ | ||
| 48 | func insertObjects(objects: [MineAuthListModel]) { | 48 | func insertObjects(objects: [MineAuthListModel]) { |
| 49 | 49 | ||
| 50 | do { | 50 | do { |
| 51 | - try FileManager.default.removeItem(atPath: userFileDir+"storage.plist") | 51 | + try FileManager.default.removeItem(atPath: self.userFileDir()+"storage.plist") |
| 52 | } catch _ {} | 52 | } catch _ {} |
| 53 | 53 | ||
| 54 | 54 | ||
| 55 | - var temp_dic = NSMutableDictionary.init(contentsOfFile: userFileDir+"storage.plist") | 55 | + var temp_dic = NSMutableDictionary.init(contentsOfFile: self.userFileDir()+"storage.plist") |
| 56 | if (temp_dic == nil) { | 56 | if (temp_dic == nil) { |
| 57 | temp_dic = NSMutableDictionary.init() | 57 | temp_dic = NSMutableDictionary.init() |
| 58 | } | 58 | } |
| 59 | for item in objects { | 59 | for item in objects { |
| 60 | temp_dic?.setObject((item.toJSON() ?? Dictionary()) as Dictionary, forKey: CNLiveAuthListTableName+"\(item.identityId)" as NSCopying) | 60 | temp_dic?.setObject((item.toJSON() ?? Dictionary()) as Dictionary, forKey: CNLiveAuthListTableName+"\(item.identityId)" as NSCopying) |
| 61 | } | 61 | } |
| 62 | - temp_dic?.write(toFile: userFileDir+"storage.plist", atomically: true) | 62 | + temp_dic?.write(toFile: self.userFileDir()+"storage.plist", atomically: true) |
| 63 | 63 | ||
| 64 | // if objects.count > 0 { | 64 | // if objects.count > 0 { |
| 65 | // do{ | 65 | // do{ |
| @@ -80,7 +80,7 @@ class CNLiveSaveAuthDB : NSObject{ | @@ -80,7 +80,7 @@ class CNLiveSaveAuthDB : NSObject{ | ||
| 80 | /// - Returns: 返回查找的所以数据 | 80 | /// - Returns: 返回查找的所以数据 |
| 81 | func searchAllObject() -> Array<MineAuthListModel>{ | 81 | func searchAllObject() -> Array<MineAuthListModel>{ |
| 82 | 82 | ||
| 83 | - let temp_dic = NSMutableDictionary.init(contentsOfFile: userFileDir+"storage.plist") | 83 | + let temp_dic = NSMutableDictionary.init(contentsOfFile: self.userFileDir()+"storage.plist") |
| 84 | if (temp_dic == nil) { | 84 | if (temp_dic == nil) { |
| 85 | return Array() | 85 | return Array() |
| 86 | } | 86 | } |
| @@ -194,11 +194,10 @@ class CNLiveSaveAuthDB : NSObject{ | @@ -194,11 +194,10 @@ class CNLiveSaveAuthDB : NSObject{ | ||
| 194 | // } | 194 | // } |
| 195 | // } | 195 | // } |
| 196 | 196 | ||
| 197 | - | ||
| 198 | - private lazy var userFileDir: String = { | 197 | + private func userFileDir()->String{ |
| 199 | let userFileDir = NSString() | 198 | let userFileDir = NSString() |
| 200 | var path: String = "" | 199 | var path: String = "" |
| 201 | - path = "\(fileDir)/userId_\(UserInfoManager.shared.userInfo.uid)/" | 200 | + path = "\(self.fileDir)/userId_\(UserInfoManager.shared.userInfo.uid)/vsid_\(UserInfoManager.shared.userInfo.currentUser?.vsid ?? "0")/" |
| 202 | let fileManager = FileManager.default | 201 | let fileManager = FileManager.default |
| 203 | var isDir: ObjCBool = false | 202 | var isDir: ObjCBool = false |
| 204 | let exist: Bool = fileManager.fileExists(atPath: path, isDirectory: &isDir) | 203 | let exist: Bool = fileManager.fileExists(atPath: path, isDirectory: &isDir) |
| @@ -211,9 +210,27 @@ class CNLiveSaveAuthDB : NSObject{ | @@ -211,9 +210,27 @@ class CNLiveSaveAuthDB : NSObject{ | ||
| 211 | } | 210 | } |
| 212 | } | 211 | } |
| 213 | return path as String | 212 | return path as String |
| 214 | - }() | 213 | + |
| 214 | + } | ||
| 215 | +// private var userFileDir: String = { | ||
| 216 | +// let userFileDir = NSString() | ||
| 217 | +// var path: String = "" | ||
| 218 | +// path = "\(fileDir)/userId_\(UserInfoManager.shared.userInfo.uid)/vsid_\(UserInfoManager.shared.userInfo.currentUser?.vsid ?? "0")/" | ||
| 219 | +// let fileManager = FileManager.default | ||
| 220 | +// var isDir: ObjCBool = false | ||
| 221 | +// let exist: Bool = fileManager.fileExists(atPath: path, isDirectory: &isDir) | ||
| 222 | +// if !(isDir.boolValue && exist) { | ||
| 223 | +// do { | ||
| 224 | +// try fileManager.createDirectory(atPath: path, withIntermediateDirectories: true) | ||
| 225 | +// } catch { | ||
| 226 | +// debugPrint("文件目录创建失败") | ||
| 227 | +// return "" | ||
| 228 | +// } | ||
| 229 | +// } | ||
| 230 | +// return path as String | ||
| 231 | +// }() | ||
| 215 | 232 | ||
| 216 | - private lazy var fileDir: String = { | 233 | + private var fileDir: String = { |
| 217 | let path = "\(NSHomeDirectory())/Documents/metaCode/saveAuthDB" | 234 | let path = "\(NSHomeDirectory())/Documents/metaCode/saveAuthDB" |
| 218 | let fileManager = FileManager.default | 235 | let fileManager = FileManager.default |
| 219 | var isDir: ObjCBool = false | 236 | var isDir: ObjCBool = false |
metaCode/Classes/Main/HomePage/Controller/DigitalAuth/CNLiveDigitalResumeController.swift
| @@ -121,6 +121,12 @@ class CNLiveDigitalResumeController:CNLiveBaseViewController,UITableViewDataSour | @@ -121,6 +121,12 @@ class CNLiveDigitalResumeController:CNLiveBaseViewController,UITableViewDataSour | ||
| 121 | return cell | 121 | return cell |
| 122 | } | 122 | } |
| 123 | cell.certificatesCount = self.certificatesCount | 123 | cell.certificatesCount = self.certificatesCount |
| 124 | + cell.updateViateDataBlock = { | ||
| 125 | + self.certificatesCount = 0 | ||
| 126 | + self.vitaeModel = nil | ||
| 127 | + self.getVitae() | ||
| 128 | + self.getCetList() | ||
| 129 | + } | ||
| 124 | if self.vitaeModel?.vitae?.id ?? 0 > 0{ | 130 | if self.vitaeModel?.vitae?.id ?? 0 > 0{ |
| 125 | cell.vitaeModel = self.vitaeModel! | 131 | cell.vitaeModel = self.vitaeModel! |
| 126 | } | 132 | } |
| @@ -181,8 +187,8 @@ class CNLiveDigitalResumeController:CNLiveBaseViewController,UITableViewDataSour | @@ -181,8 +187,8 @@ class CNLiveDigitalResumeController:CNLiveBaseViewController,UITableViewDataSour | ||
| 181 | }else{ | 187 | }else{ |
| 182 | //有简历-刷新页面 | 188 | //有简历-刷新页面 |
| 183 | self.vitaeModel = model | 189 | self.vitaeModel = model |
| 184 | - self.tableView.reloadData() | ||
| 185 | self.saveViateModel() | 190 | self.saveViateModel() |
| 191 | + self.tableView.reloadData() | ||
| 186 | } | 192 | } |
| 187 | }else{ | 193 | }else{ |
| 188 | 194 |
metaCode/Classes/Main/HomePage/View/DigitalAuthViews/CNLiveDigitalFirstCell.swift
| @@ -225,6 +225,9 @@ class CNLiveDigitalFirstCell: UITableViewCell { | @@ -225,6 +225,9 @@ class CNLiveDigitalFirstCell: UITableViewCell { | ||
| 225 | let userInfo = UserInfoManager.shared.userInfo | 225 | let userInfo = UserInfoManager.shared.userInfo |
| 226 | userInfo.currentUser = userMdl | 226 | userInfo.currentUser = userMdl |
| 227 | UserInfoManager.cacheUserInfo(userInfo: userInfo) | 227 | UserInfoManager.cacheUserInfo(userInfo: userInfo) |
| 228 | + | ||
| 229 | + CNLiveMineViewModel.requestsGETAuthInfoList(page: 1) { result, respStatue in | ||
| 230 | + } | ||
| 228 | self.authNameTitleLabel.text = userMdl.name | 231 | self.authNameTitleLabel.text = userMdl.name |
| 229 | 232 | ||
| 230 | let (gender, age) = self.extractGenderAndAge(fromIDCardNumber: UserInfoManager.shared.userInfo.currentUser?.idNo ?? "") | 233 | let (gender, age) = self.extractGenderAndAge(fromIDCardNumber: UserInfoManager.shared.userInfo.currentUser?.idNo ?? "") |
metaCode/Classes/Main/HomePage/View/DigitalAuthViews/DigitalResume/CNLiveDigitalResumeCell.swift
| @@ -9,8 +9,12 @@ import Foundation | @@ -9,8 +9,12 @@ import Foundation | ||
| 9 | import Kingfisher | 9 | import Kingfisher |
| 10 | import SnapKit | 10 | import SnapKit |
| 11 | 11 | ||
| 12 | +typealias UpdateViateDataBlock = () -> Void | ||
| 13 | + | ||
| 12 | class CNLiveDigitalResumeCell: UITableViewCell { | 14 | class CNLiveDigitalResumeCell: UITableViewCell { |
| 13 | var certificatesCount:Int = 0//证书数量 | 15 | var certificatesCount:Int = 0//证书数量 |
| 16 | + | ||
| 17 | + var updateViateDataBlock:UpdateViateDataBlock? | ||
| 14 | //简历Model | 18 | //简历Model |
| 15 | var _vitaeModel : CNLiveVitaeModel? | 19 | var _vitaeModel : CNLiveVitaeModel? |
| 16 | var vitaeModel : CNLiveVitaeModel? { | 20 | var vitaeModel : CNLiveVitaeModel? { |
| @@ -49,8 +53,6 @@ class CNLiveDigitalResumeCell: UITableViewCell { | @@ -49,8 +53,6 @@ class CNLiveDigitalResumeCell: UITableViewCell { | ||
| 49 | titleLabel.font = Font_14//数字简历ID:123456789321 | 53 | titleLabel.font = Font_14//数字简历ID:123456789321 |
| 50 | titleLabel.text = "数字简历ID:" | 54 | titleLabel.text = "数字简历ID:" |
| 51 | titleLabel.adjustsFontSizeToFitWidth=true | 55 | titleLabel.adjustsFontSizeToFitWidth=true |
| 52 | - titleLabel.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(jianliAction))) | ||
| 53 | - titleLabel.isUserInteractionEnabled = true | ||
| 54 | return titleLabel | 56 | return titleLabel |
| 55 | }() | 57 | }() |
| 56 | lazy var whiteBgView :UIView = { | 58 | lazy var whiteBgView :UIView = { |
| @@ -663,14 +665,32 @@ class CNLiveDigitalResumeCell: UITableViewCell { | @@ -663,14 +665,32 @@ class CNLiveDigitalResumeCell: UITableViewCell { | ||
| 663 | } | 665 | } |
| 664 | 666 | ||
| 665 | // MARK: - buttonAction | 667 | // MARK: - buttonAction |
| 666 | - @objc func jianliAction(){ | ||
| 667 | - | ||
| 668 | - } | ||
| 669 | @objc func jianliIconAction(){ | 668 | @objc func jianliIconAction(){ |
| 670 | 669 | ||
| 671 | } | 670 | } |
| 672 | @objc func changePersonBtnAction(){ | 671 | @objc func changePersonBtnAction(){ |
| 673 | - | 672 | + var infoArr = Array<String>() |
| 673 | + UserInfoManager.shared.userInfo.userMsgUsers?.verifyUsers.forEach({ userMdl in | ||
| 674 | + infoArr.append(userMdl.name) | ||
| 675 | + }) | ||
| 676 | + MineStandListAlertView.showStandListView(infos: infoArr as NSArray,name: "实名对象切换", show_type: .string, isAddPerson: false) {text in | ||
| 677 | + let seleText = text as? String | ||
| 678 | + let tempArr = UserInfoManager.shared.userInfo.userMsgUsers?.verifyUsers | ||
| 679 | + if tempArr?.count == 0{ | ||
| 680 | + return | ||
| 681 | + } | ||
| 682 | + tempArr?.forEach({ userMdl in | ||
| 683 | + if userMdl.name == seleText{ | ||
| 684 | + let userInfo = UserInfoManager.shared.userInfo | ||
| 685 | + userInfo.currentUser = userMdl | ||
| 686 | + UserInfoManager.cacheUserInfo(userInfo: userInfo) | ||
| 687 | + CNLiveMineViewModel.requestsGETAuthInfoList(page: 1) { result, respStatue in | ||
| 688 | + self.updateViateDataBlock?() | ||
| 689 | + } | ||
| 690 | + } | ||
| 691 | + }) | ||
| 692 | + } | ||
| 693 | + | ||
| 674 | } | 694 | } |
| 675 | @objc func workTitleLabelAciton(){ | 695 | @objc func workTitleLabelAciton(){ |
| 676 | let vc = CNLiveDigitalResumeInfoController() | 696 | let vc = CNLiveDigitalResumeInfoController() |
| @@ -728,6 +748,13 @@ class CNLiveDigitalResumeCell: UITableViewCell { | @@ -728,6 +748,13 @@ class CNLiveDigitalResumeCell: UITableViewCell { | ||
| 728 | 748 | ||
| 729 | 749 | ||
| 730 | func setupNewUI(model:CNLiveVitaeModel){ | 750 | func setupNewUI(model:CNLiveVitaeModel){ |
| 751 | + let name = UserInfoManager.shared.userInfo.currentUser?.name ?? "" | ||
| 752 | + self.authNameTitleLabel.text = name | ||
| 753 | + let idNo = UserInfoManager.shared.userInfo.currentUser?.idNo ?? "" | ||
| 754 | + let (gender, age) = self.extractGenderAndAge(fromIDCardNumber: idNo) | ||
| 755 | + let ageStr = String(format: "%d", age ?? 0) | ||
| 756 | + self.phoneTitleLabel.text = gender+" | "+ageStr+"岁"+" | "+UserInfoManager.shared.userInfo.mobile | ||
| 757 | + | ||
| 731 | self.jianliTitleLabel.text = "数字简历ID:"+"\(model.vitae!.id)" | 758 | self.jianliTitleLabel.text = "数字简历ID:"+"\(model.vitae!.id)" |
| 732 | if model.vitae?.profession.count ?? 0 > 0{ | 759 | if model.vitae?.profession.count ?? 0 > 0{ |
| 733 | self.hangyeTitleLabel.text = model.vitae?.profession | 760 | self.hangyeTitleLabel.text = model.vitae?.profession |
metaCode/Classes/Main/HomePage/View/VerticalViews/CNCustomIndexView.swift
| @@ -330,6 +330,8 @@ class CNCustomIndexView:PGIndexBannerSubiew, UIScrollViewDelegate, WJColorChange | @@ -330,6 +330,8 @@ class CNCustomIndexView:PGIndexBannerSubiew, UIScrollViewDelegate, WJColorChange | ||
| 330 | let userInfo = UserInfoManager.shared.userInfo | 330 | let userInfo = UserInfoManager.shared.userInfo |
| 331 | userInfo.currentUser = userMdl | 331 | userInfo.currentUser = userMdl |
| 332 | UserInfoManager.cacheUserInfo(userInfo: userInfo) | 332 | UserInfoManager.cacheUserInfo(userInfo: userInfo) |
| 333 | + CNLiveMineViewModel.requestsGETAuthInfoList(page: 1) { result, respStatue in | ||
| 334 | + } | ||
| 333 | self.topRealPersonBtn.text = "当前对象: "+(UserInfoManager.shared.userInfo.currentUser?.name ?? "") | 335 | self.topRealPersonBtn.text = "当前对象: "+(UserInfoManager.shared.userInfo.currentUser?.name ?? "") |
| 334 | self.topRealPersonBtn.isHidden = false | 336 | self.topRealPersonBtn.isHidden = false |
| 335 | } | 337 | } |