保存位置省市区

“张旭”
1 parent 595ab157
Showing 7 changed files with 669 additions and 176 deletions
metaCode.xcodeproj/project.pbxproj
metaCode/Classes/Main/HomePage/Controller/DigitalAuth/CNLiveDigitalResumeInfoController.swift
metaCode/Classes/Main/HomePage/Controller/DigitalAuth/CNLiveDigitalResumeInfoSelectAddressController.swift
metaCode/Classes/Main/HomePage/Controller/DigitalAuth/CNLiveFaceAuthController.swift
metaCode/Classes/Main/HomePage/Controller/DigitalAuth/CNLiveRealNameAuthController.swift
metaCode/Classes/Main/HomePage/ViewModel/Vitae/CNLiveVitaeViewModel.swift
metaCode/Classes/Main/Model/Vitae/CNLiveAddrAreaModel.swift
@@ -73,6 +73,8 @@
 		192336EB2AD9224300D47CD4 /* CNUpSlideViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 192336EA2AD9224300D47CD4 /* CNUpSlideViewController.swift */; };
 		1926C28F2AE0D76C00C71DC3 /* CNLiveDownSlideViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1926C28E2AE0D76C00C71DC3 /* CNLiveDownSlideViewModel.swift */; };
 		1926C2912AE0FD4500C71DC3 /* CNLiveDownSlideModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1926C2902AE0FD4500C71DC3 /* CNLiveDownSlideModel.swift */; };
+		192ED4632C4A642F0057244C /* CNLiveAddrAreaModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 192ED4622C4A642F0057244C /* CNLiveAddrAreaModel.swift */; };
+		192ED4652C4DF6340057244C /* CNLiveDigitalResumeInfoSelectAddressController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 192ED4642C4DF6340057244C /* CNLiveDigitalResumeInfoSelectAddressController.swift */; };
 		1938BD172B3D6C7F00390A34 /* CNLiveAuthViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1938BD162B3D6C7F00390A34 /* CNLiveAuthViewController.swift */; };
 		1938BD202B46799A00390A34 /* CNLivePlayletHomePageController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1938BD1F2B46799A00390A34 /* CNLivePlayletHomePageController.swift */; };
 		1938BD222B467C1700390A34 /* CNLivePlayletHomePageCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1938BD212B467C1700390A34 /* CNLivePlayletHomePageCell.swift */; };
@@ -388,6 +390,8 @@
 		192336EA2AD9224300D47CD4 /* CNUpSlideViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNUpSlideViewController.swift; sourceTree = "<group>"; };
 		1926C28E2AE0D76C00C71DC3 /* CNLiveDownSlideViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveDownSlideViewModel.swift; sourceTree = "<group>"; };
 		1926C2902AE0FD4500C71DC3 /* CNLiveDownSlideModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveDownSlideModel.swift; sourceTree = "<group>"; };
+		192ED4622C4A642F0057244C /* CNLiveAddrAreaModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveAddrAreaModel.swift; sourceTree = "<group>"; };
+		192ED4642C4DF6340057244C /* CNLiveDigitalResumeInfoSelectAddressController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveDigitalResumeInfoSelectAddressController.swift; sourceTree = "<group>"; };
 		1938BD162B3D6C7F00390A34 /* CNLiveAuthViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveAuthViewController.swift; sourceTree = "<group>"; };
 		1938BD1F2B46799A00390A34 /* CNLivePlayletHomePageController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLivePlayletHomePageController.swift; sourceTree = "<group>"; };
 		1938BD212B467C1700390A34 /* CNLivePlayletHomePageCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLivePlayletHomePageCell.swift; sourceTree = "<group>"; };
@@ -1133,6 +1137,7 @@
 				194134972C292199004FC047 /* CNLiveIdentityRepositoryController.swift */,
 				19DFE63F2C3FC5F400E428AE /* CNLiveDigitalResumeController.swift */,
 				19DFE64C2C4792C500E428AE /* CNLiveDigitalResumeInfoController.swift */,
+				192ED4642C4DF6340057244C /* CNLiveDigitalResumeInfoSelectAddressController.swift */,
 			);
 			path = DigitalAuth;
 			sourceTree = "<group>";
@@ -1190,6 +1195,7 @@
 			isa = PBXGroup;
 			children = (
 				19DFE6452C41099900E428AE /* CNLiveVitaeModel.swift */,
+				192ED4622C4A642F0057244C /* CNLiveAddrAreaModel.swift */,
 			);
 			path = Vitae;
 			sourceTree = "<group>";
@@ -2026,6 +2032,7 @@
 				19123FC12ABC11170075C883 /* CNWebViewController.swift in Sources */,
 				1926C28F2AE0D76C00C71DC3 /* CNLiveDownSlideViewModel.swift in Sources */,
 				790D019D2A2DCBD000C5978D /* UIView+CNLiveExtensions.swift in Sources */,
+				192ED4652C4DF6340057244C /* CNLiveDigitalResumeInfoSelectAddressController.swift in Sources */,
 				19B153CF2BC540FF0018906C /* CNLivePayOrderInfoModel.swift in Sources */,
 				7C7C62F62A4D72E9007A912E /* CNLiveIdentityDB.swift in Sources */,
 				191732E52B05FFE8007BCC04 /* CNLiveModalPresentationViewController.swift in Sources */,
@@ -2188,6 +2195,7 @@
 				194134882C1FE4E7004FC047 /* CNLiveDigitalAssetsController.swift in Sources */,
 				7CD6753F2A2740B0008354C1 /* CNDownSlideViewRemindView.swift in Sources */,
 				19565ECF2AF8D8F6007D6727 /* CNLiveShopGoodsListCell.swift in Sources */,
+				192ED4632C4A642F0057244C /* CNLiveAddrAreaModel.swift in Sources */,
 				1965FA3E2AFB176E00F0F435 /* CNLiveShopAddGoodsSingleView.swift in Sources */,
 				7CD6753C2A2740B0008354C1 /* CNUpSlideViewRemindView.swift in Sources */,
 				7939B0772B47F88A005AE981 /* CNLiveShortVideoControlView.swift in Sources */,
@@ -11,6 +11,9 @@ import CoreLocation
 class CNLiveDigitalResumeInfoController:CNLiveBaseViewController, UITextFieldDelegate,CLLocationManagerDelegate{
+    
+    var selectAreaVC:CNLiveDigitalResumeInfoSelectAddressController?
+
     let locationManager = CLLocationManager()
     lazy var topWhiteView :UIView = {
@@ -461,8 +464,26 @@ class CNLiveDigitalResumeInfoController:CNLiveBaseViewController, UITextFieldDel
     // MARK: - ButtonAction
     @objc func weiZhiTapAction(){
-        self.getPlacemarkAddress()
+        self.displaySelectAreaVC()
+        
+//        self.getPlacemarkAddress()
+    }
+    func displaySelectAreaVC(){
+        if self.selectAreaVC == nil{
+            let vc = CNLiveDigitalResumeInfoSelectAddressController()
+            vc.finishSelectAreaCallBack = { [weak self] in
+                self?.weizhiRightTitleLabel.text = String(format: "%@%@%@",self?.selectAreaVC?.province ?? "",self?.selectAreaVC?.city ?? "",self?.selectAreaVC?.area ?? "" )
+                self?.saveWeiZhi(cityStreet: self?.weizhiRightTitleLabel.text ?? "")
+            }
+            self.addChild(vc)
+            vc.view.frame = CGRect(x: 0, y: 0, width: self.view.width, height: self.view.height)
+            self.view.addSubview(vc.view)
+            vc.didMove(toParent: self)
+            self.selectAreaVC = vc
+        }
+        self.selectAreaVC?.display()
     }
+    
     func saveWeiZhi(cityStreet:String){
         if var userDic = UserDefaults.standard.dictionary(forKey: UserInfoManager.shared.userInfo.uid){
             userDic.updateValue(cityStreet, forKey: "cityStreet")
@@ -474,60 +495,6 @@ class CNLiveDigitalResumeInfoController:CNLiveBaseViewController, UITextFieldDel
             UserDefaults.standard.synchronize()
         }
     }
-    // 代理方法：当定位权限被确定时调用
-    func locationManager(_ manager: CLLocationManager, didChangeAuthorization status: CLAuthorizationStatus) {
-        if status == .authorizedWhenInUse || status == .authorizedAlways {
-            // 权限已授权，可以开始获取位置信息
-            locationManager.startUpdatingLocation()
-        }
-    }
-
-    // 代理方法：当位置更新时调用
-    func locationManager(_ manager: CLLocationManager, didUpdateLocations locations: [CLLocation]) {
-        guard let location = locations.last else { return }
-        
-        // 停止更新位置以节省资源
-        locationManager.stopUpdatingLocation()
-        
-        // 反向地理编码位置以获取地址信息
-        let geocoder = CLGeocoder()
-        geocoder.reverseGeocodeLocation(location, completionHandler: { (placemarks, error) in
-            if let error = error {
-                print("Geocoding failed with error: \(error.localizedDescription)")
-                return
-            }
-            
-            if let placemark = placemarks?.first {
-                print("市区：\(placemark.locality ?? "")")
-                print("街道：\(placemark.thoroughfare ?? "")")
-                // 你可以根据需要进一步处理placemark对象
-                let cityStreet = (placemark.locality ?? "") + (placemark.thoroughfare ?? "")
-                self.saveWeiZhi(cityStreet:cityStreet)
-                self.weizhiRightTitleLabel.text = cityStreet
-            }
-        })
-    }
-
-    // 代理方法：处理定位错误（可选）
-    func locationManager(_ manager: CLLocationManager, didFailWithError error: Error) {
-        print("Location manager failed with error: \(error.localizedDescription)")
-    }
-    func getPlacemarkAddress() {
-        // 检查定位服务是否可用
-        if CLLocationManager.locationServicesEnabled() {
-            // 设置定位管理器的代理
-            locationManager.delegate = self
-            // 请求前台使用时的定位权限
-            locationManager.requestWhenInUseAuthorization()
-            // 配置定位管理器
-            locationManager.desiredAccuracy = kCLLocationAccuracyBest
-            locationManager.startUpdatingLocation()
-        } else {
-            // 定位服务不可用
-            print("Location services are not enabled")
-        }
-        
-    }
     @objc func canJiaTapAction(){
         MineInfoAlertView.showSelectView(showType: .selectDay) { [weak self] text in
+//
+//  CNLiveDigitalResumeInfoSelectAddressController.swift
+//  metaCode
+//
+//  Created by zx on 2024/7/22.
+//  数字简历信息-选择地址页面
+
+import Foundation
+
+typealias FinishSelectAreaBlock = () -> Void
+
+class CNLiveDigitalResumeInfoSelectAddressController:CNLiveBaseViewController,UITableViewDelegate, UITableViewDataSource{
+    
+    var provinceId:String = ""
+    var province:String = ""
+    var cityId:String = ""
+    var city:String = ""
+    var areaId:String = ""
+    var area:String = ""
+
+    var finishSelectAreaCallBack:FinishSelectAreaBlock?
+    var shadowView:UIView?
+    var contentView:UIView?
+    var line:UIImageView?
+    var provinceBtn:UIButton?
+    var cityBtn:UIButton?
+    var areaBtn:UIButton?
+    var selectImageView:UIImageView?
+
+    lazy var tableView : UITableView = {
+        let tableView = UITableView(frame: CGRect(x: 0, y: self.line!.bottom, width: self.contentView!.width, height: self.contentView!.height-self.line!.bottom), style: .plain)
+        tableView.dataSource = self
+        tableView.delegate = self
+        tableView.rowHeight = adapt_length(length: 40)
+        tableView.showsVerticalScrollIndicator = false
+        tableView.backgroundColor = .white
+        tableView.separatorStyle = .none
+        let headerView = UIView(frame: CGRect(x: 0, y: 0, width: self.contentView!.width, height: adapt_length(length: 5)))
+        tableView.tableHeaderView = headerView
+        return tableView
+    }()
+
+    var provinceDataArr:Array<CNLiveAddrAreaModel>?
+    var cityDataArr:Array<CNLiveAddrAreaModel>?
+    var areaDataArr:Array<CNLiveAddrAreaModel>?
+    // MARK: - setter
+    var _displayLevel:NSInteger?
+    var displayLevel:NSInteger?{
+        get{
+            _displayLevel
+        }
+        set{
+            _displayLevel = newValue
+            UIView.animate(withDuration: 0.2) {
+                if (self.displayLevel == 2) {
+                    self.selectImageView!.centerX = self.cityBtn!.centerX
+                    self.cityBtn?.setTitleColor(HexColor("#333333"), for: .normal)
+                }else if (self.displayLevel == 3) {
+                    self.selectImageView!.centerX = self.areaBtn!.centerX
+                    self.areaBtn?.setTitleColor(HexColor("#333333"), for: .normal)
+                }else {
+                    self.selectImageView!.centerX = self.provinceBtn!.centerX
+                }
+            }
+        }
+    }
+    //临时选中省
+    var _temp_selectProvinceModel:CNLiveAddrAreaModel?
+    var temp_selectProvinceModel:CNLiveAddrAreaModel?{
+        get{
+            _temp_selectProvinceModel
+        }
+        set{
+            _temp_selectProvinceModel = newValue
+            if ((_temp_selectProvinceModel) != nil) {
+                self.provinceBtn?.setTitle(_temp_selectProvinceModel?.name, for: .normal)
+            }else {
+                self.provinceBtn?.setTitle("请选择", for: .normal)
+            }
+        }
+    }
+    //临时选中市
+    var _temp_selectCityModel:CNLiveAddrAreaModel?
+    var temp_selectCityModel:CNLiveAddrAreaModel?{
+        get{
+            _temp_selectCityModel
+        }
+        set{
+            _temp_selectCityModel = newValue
+            if ((_temp_selectCityModel) != nil) {
+                self.cityBtn?.setTitle(_temp_selectCityModel?.name, for: .normal)
+                self.cityBtn?.setTitleColor(HexColor("#333333"), for: .normal)
+            }else {
+                self.cityBtn?.setTitle("城市", for: .normal)
+                if (self.displayLevel == 2) {
+                    self.cityBtn?.setTitleColor(HexColor("#333333"), for: .normal)
+                }else {
+                    self.cityBtn?.setTitleColor(HexColor("#999999"), for: .normal)
+                }
+            }
+        }
+    }
+    //临时选中区(县)
+    var _temp_selectAreaModel:CNLiveAddrAreaModel?
+    var temp_selectAreaModel:CNLiveAddrAreaModel?{
+        get{
+            _temp_selectAreaModel
+        }
+        set{
+            _temp_selectAreaModel = newValue
+            if ((_temp_selectAreaModel) != nil) {
+                self.areaBtn?.setTitle(_temp_selectAreaModel?.name, for: .normal)
+                self.areaBtn?.setTitleColor(HexColor("#333333"), for: .normal)
+            }else {
+                self.areaBtn?.setTitle("区县", for: .normal)
+                if (self.displayLevel == 3) {
+                    self.areaBtn?.setTitleColor(HexColor("#333333"), for: .normal)
+                }else {
+                    self.areaBtn?.setTitleColor(HexColor("#999999"), for: .normal)
+                }
+            }
+        }
+    }
+
+    
+    // MARK: - 显示/隐藏
+    func display(){
+        self.view.isUserInteractionEnabled = true
+        UIView.animate(withDuration: 0.2) {
+            self.shadowView?.alpha = 1
+            self.contentView?.y = self.view.height - adapt_length(length: 400)
+        }
+    }
+    func hide(){
+        UIView.animate(withDuration: 0.2) {
+            self.shadowView?.alpha = 0
+            self.contentView?.y = self.view.height
+        }completion: { finished in
+            self.view.isUserInteractionEnabled = false
+        }
+    }
+
+    // MARK: - 数据请求
+    /**
+     数据请求
+
+     @param pid 父级id
+     @param level 第几级
+     */
+    func postDataWithPid(pid:String,level:NSInteger,resultBlock: @escaping downSlideResultBlock){
+        showLoading(message: "")
+        CNLiveVitaeViewModel.getCityListWithId(id: pid) { result, status in
+            hiddenLoading()
+            if status == .success{
+                self.displayLevel = level
+                let model = result as! CNLiveAddrAreaListModel
+                if level == 1{
+                    self.provinceDataArr = model.list
+                    self.temp_selectCityModel = nil
+                    self.temp_selectAreaModel = nil
+                    self.cityDataArr = nil
+                    self.areaDataArr = nil
+                    if self.provinceId.count > 0 && self.provinceId != "0"{
+                        for (_,obj) in self.provinceDataArr!.enumerated(){
+                            if obj.id == self.provinceId{
+                                self.temp_selectProvinceModel = obj
+                                break
+                            }
+                        }
+                        
+                    }
+                }else if level == 2{
+                    self.cityDataArr = model.list
+                    self.temp_selectCityModel = nil
+                    self.temp_selectAreaModel = nil
+                    self.areaDataArr = nil
+                    if self.cityId.count > 0 && self.cityId != "0"{
+                        for (_,obj) in self.cityDataArr!.enumerated(){
+                            if obj.id == self.cityId{
+                                self.temp_selectCityModel = obj
+                                break
+                            }
+                        }
+                    }else{
+                        self.cityBtn?.setTitle("城市", for: .normal)
+                    }
+                }else if level == 3{
+                    self.areaDataArr = model.list
+                    self.temp_selectAreaModel = nil
+                    if self.areaId.count > 0 && self.areaId != "0"{
+                        for (_,obj) in self.areaDataArr!.enumerated(){
+                            if obj.id == self.areaId{
+                                self.temp_selectAreaModel = obj
+                                break
+                            }
+                        }
+                    }else{
+                        self.areaBtn?.setTitle("区县", for: .normal)
+                    }
+                }
+                self.tableView.reloadData()
+                self.tableView.setContentOffset(CGPointZero, animated: true)
+                resultBlock(true, .success)
+            }
+            
+        }
+    }
+
+    // MARK: - viewDidLoad
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        self.view.backgroundColor = .clear
+        self.topNavView.removeFromSuperview()
+        self.initUI()
+        if self.provinceId == "0" || self.provinceId.count == 0{
+            self.cityId = "0"
+            self.areaId = "0"
+        }else if self.cityId == "0" || self.cityId.count == 0{
+            self.areaId = "0"
+        }
+        self.postDataWithPid(pid: "0", level: 1) { result, status in
+            if status == .success{
+                if self.cityId.count > 0 && self.cityId != "0"{
+                    self.postDataWithPid(pid: self.provinceId, level: 2){ result, status in
+                        if self.areaId.count > 0 && self.areaId != "0"{
+                            self.postDataWithPid(pid: self.cityId, level: 3) { result, status in
+                            }
+                        }
+                    }
+                
+                }
+            }
+        }
+        
+    }
+
+    func scrollViewWithProvinceId(provinceId:String,cityId:String,areaId:String){
+        if provinceId == "0"{
+            self.postDataWithPid(pid: provinceId, level: 1){ result, status in
+                if areaId.count > 0 && areaId != "0"{
+                    self.postDataWithPid(pid: cityId, level: 2) { result, status in
+                    }
+                }
+            }
+        }else{
+            self.postDataWithPid(pid: provinceId, level: 2){ result, status in
+                if areaId.count > 0 && areaId != "0"{
+                    self.postDataWithPid(pid: cityId, level: 3) { result, status in
+                    }
+                }
+            }
+        }
+    }
+
+    // MARK: - initUI
+    func initUI(){
+        self.shadowView = UIView(frame: self.view.bounds)
+        self.shadowView?.backgroundColor = UIColor(white: 0, alpha: 0.26)
+        self.shadowView?.alpha = 0
+        self.view.addSubview(self.shadowView!)
+        let shadowViewTap = UITapGestureRecognizer(target: self, action: #selector(shadowViewTap))
+        self.shadowView?.addGestureRecognizer(shadowViewTap)
+        self.contentView = UIView(frame: CGRectMake(0, self.view.height, self.view.width, adapt_length(length: 400)))
+        self.contentView?.backgroundColor = .white
+        self.view.addSubview(self.contentView!)
+        
+        self.line = UIImageView(frame: CGRect(x: 0, y: adapt_length(length: 49)-DS_RRV_ONE_PIXEL, width: self.view.width, height: DS_RRV_ONE_PIXEL))
+        self.line?.backgroundColor = HexColor("#EBE9EA")
+        self.contentView?.addSubview(self.line!)
+        
+        self.provinceBtn = UIButton(type: .custom)
+        self.provinceBtn?.frame = CGRect(x: adapt_length(length: 5), y: 0, width: adapt_length(length: 59), height: adapt_length(length: 49))
+        self.provinceBtn?.setTitle("请选择", for: .normal)
+        self.provinceBtn?.setTitleColor(HexColor("#333333"), for: .normal)
+        self.provinceBtn?.clipsToBounds = true
+        self.provinceBtn?.titleLabel?.font = Font_13
+        self.provinceBtn?.titleLabel?.lineBreakMode = .byTruncatingTail
+        self.provinceBtn?.addTarget(self, action: #selector(provinceBtnClick), for: .touchUpInside)
+        self.contentView?.addSubview(self.provinceBtn!)
+        
+        self.cityBtn = UIButton(type: .custom)
+        self.cityBtn?.frame = CGRect(x: self.provinceBtn!.right+adapt_length(length: 5), y: 0, width: adapt_length(length: 59), height: adapt_length(length: 49))
+        self.cityBtn?.setTitle("城市", for: .normal)
+        self.cityBtn?.setTitleColor(HexColor("#999999"), for: .normal)
+        self.cityBtn?.clipsToBounds = true
+        self.cityBtn?.titleLabel?.font = Font_13
+        self.cityBtn?.titleLabel?.lineBreakMode = .byTruncatingTail
+        self.cityBtn?.addTarget(self, action: #selector(cityBtnClick), for: .touchUpInside)
+        self.contentView?.addSubview(self.cityBtn!)
+
+        self.areaBtn = UIButton(type: .custom)
+        self.areaBtn?.frame = CGRect(x: self.cityBtn!.right+adapt_length(length: 5), y: 0, width: adapt_length(length: 59), height: adapt_length(length: 49))
+        self.areaBtn?.setTitle("区县", for: .normal)
+        self.areaBtn?.setTitleColor(HexColor("#999999"), for: .normal)
+        self.areaBtn?.clipsToBounds = true
+        self.areaBtn?.titleLabel?.font = Font_13
+        self.areaBtn?.titleLabel?.lineBreakMode = .byTruncatingTail
+        self.areaBtn?.addTarget(self, action: #selector(areaBtnClick), for: .touchUpInside)
+        self.contentView?.addSubview(self.areaBtn!)
+
+        self.selectImageView = UIImageView(frame: CGRect(x: 0, y: self.line!.bottom-2, width: adapt_length(length: 39), height: 2))
+        self.selectImageView?.backgroundColor = HexColor("#1961FE")
+        self.contentView?.addSubview(self.selectImageView!)
+        self.selectImageView!.centerX = self.provinceBtn!.centerX
+
+        let confirmBtn = UIButton(type: .custom)
+        confirmBtn.frame = CGRect(x: self.contentView!.width-adapt_length(length: 49), y: 0, width: adapt_length(length: 49), height: adapt_length(length: 49))
+        confirmBtn.setTitle("确定", for: .normal)
+        confirmBtn.setTitleColor(HexColor("#333333"), for: .normal)
+        confirmBtn.clipsToBounds = true
+        confirmBtn.titleLabel?.font = Font_13
+        confirmBtn.addTarget(self, action: #selector(confirmBtnClick), for: .touchUpInside)
+        self.contentView?.addSubview(confirmBtn)
+        self.contentView?.addSubview(self.tableView)
+
+    }
+    
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        if self.displayLevel == 1{
+            return self.provinceDataArr!.count
+        }else if self.displayLevel == 2{
+            return self.cityDataArr!.count
+        }else if self.displayLevel == 3{
+            return self.areaDataArr!.count
+        }else{
+            return 0
+        }
+    }
+    
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        let identifier = "CNLiveAddrSelectAreaTableViewCellID"
+        var cell = tableView.dequeueReusableCell(withIdentifier: identifier)
+        if cell == nil{
+            cell = UITableViewCell(style: .default, reuseIdentifier: identifier)
+            cell?.selectionStyle = .none
+            
+            let titleLab = UILabel(frame: CGRect(x: adapt_length(length: 15), y: 0, width: self.view.width-adapt_length(length: 15)*2, height: adapt_length(length: 40)))
+            titleLab.font = Font_14
+            titleLab.textColor = HexColor("#666666")
+            titleLab.lineBreakMode = .byTruncatingTail
+            titleLab.tag = 1
+            cell?.addSubview(titleLab)
+        }
+        let titleLab = cell?.viewWithTag(1) as! UILabel
+        if self.displayLevel == 1{
+            let model = self.provinceDataArr![indexPath.row] 
+            titleLab.text = model.name
+            if model.id == self.temp_selectProvinceModel?.id{
+                titleLab.textColor = HexColor("#1961FE")
+            }else{
+                titleLab.textColor = HexColor("#666666")
+            }
+        }else if self.displayLevel == 2{
+            let model = self.cityDataArr![indexPath.row]
+            titleLab.text = model.name
+            if model.id == self.temp_selectCityModel?.id{
+                titleLab.textColor = HexColor("#1961FE")
+            }else{
+                titleLab.textColor = HexColor("#666666")
+            }
+        }else if self.displayLevel == 3{
+            let model = self.areaDataArr![indexPath.row]
+            titleLab.text = model.name
+            if model.id == self.temp_selectAreaModel?.id{
+                titleLab.textColor = HexColor("#1961FE")
+            }else{
+                titleLab.textColor = HexColor("#666666")
+            }
+        }else{
+            titleLab.text = ""
+        }
+        return cell!
+    }
+
+    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+        if self.displayLevel == 1{
+            let model = self.provinceDataArr![indexPath.row]
+            self.postDataWithPid(pid: model.id, level: 2){result, status in
+                self.temp_selectProvinceModel = model
+                self.temp_selectCityModel = nil
+                self.temp_selectAreaModel = nil
+            }
+        }else if self.displayLevel == 2{
+            let model = self.cityDataArr![indexPath.row]
+            self.postDataWithPid(pid: model.id, level: 3){result, status in
+                self.temp_selectCityModel = model
+                self.temp_selectAreaModel = nil
+            }
+        }else if self.displayLevel == 3{
+            let model = self.areaDataArr![indexPath.row]
+            self.temp_selectAreaModel = model
+            self.tableView.reloadData()
+        }
+    }
+
+    // MARK: - 触发事件
+    @objc func shadowViewTap(){
+        self.hide()
+    }
+
+    @objc func confirmBtnClick(){
+        if (self.temp_selectProvinceModel == nil) || (self.temp_selectCityModel == nil) || (self.temp_selectAreaModel == nil){
+            showMessage(message: "省市区未选择完成")
+            return
+        }
+        self.provinceId = self.temp_selectProvinceModel!.id
+        self.province = self.temp_selectProvinceModel!.name
+        self.cityId = self.temp_selectCityModel!.id
+        self.city = self.temp_selectCityModel!.name
+        self.areaId = self.temp_selectAreaModel!.id
+        self.area = self.temp_selectAreaModel!.name
+        self.finishSelectAreaCallBack?()
+        self.hide()
+    }
+
+    @objc func provinceBtnClick(){
+        self.displayLevel = 1
+        self.tableView.reloadData()
+        self.tableView.setContentOffset(CGPointZero, animated: true)
+        if self.temp_selectCityModel != nil{
+            self.cityBtn?.setTitleColor(HexColor("#333333"), for: .normal)
+            if self.temp_selectAreaModel != nil{
+                self.areaBtn?.setTitleColor(HexColor("#333333"), for: .normal)
+            }else{
+                self.areaBtn?.setTitleColor(HexColor("#999999"), for: .normal)
+            }
+        }else{
+            self.cityBtn?.setTitleColor(HexColor("#999999"), for: .normal)
+            self.areaBtn?.setTitleColor(HexColor("#999999"), for: .normal)
+        }
+    }
+
+    @objc func cityBtnClick(){
+        if self.temp_selectProvinceModel == nil{
+            return
+        }
+        self.displayLevel = 2
+        self.tableView.reloadData()
+        self.tableView.setContentOffset(CGPointZero, animated: true)
+        if self.temp_selectAreaModel != nil{
+            self.areaBtn?.setTitleColor(HexColor("#333333"), for: .normal)
+        }else{
+            self.areaBtn?.setTitleColor(HexColor("#999999"), for: .normal)
+        }
+    }
+    @objc func areaBtnClick(){
+        if self.temp_selectCityModel == nil{
+            return
+        }
+        self.displayLevel = 3
+        self.tableView.reloadData()
+        self.tableView.setContentOffset(CGPointZero, animated: true)
+    }
+    
+}
+
@@ -15,6 +15,7 @@ import Vision
 class CNLiveFaceAuthController:CNLiveBaseViewController{
     var channelId:String = "0"
+    var isResume:Bool = false//是否跳转到数字简历页面
     lazy var previewView :CNLiveAuthPreviewView = {
         let previewView = CNLiveAuthPreviewView(frame: CGRect(x: 0, y: KNavigationHeight, width: KSreenWidth, height: KSreenHeight-KNavigationHeight))
@@ -379,11 +380,132 @@ class CNLiveFaceAuthController:CNLiveBaseViewController{
                     userInfo.userMsgUsers = res
                     userInfo.currentUser = res.verifyUsers.first
                     UserInfoManager.cacheUserInfo(userInfo: userInfo)
+                    if res.verifyUsers.count > 0{
+                        if self.isResume == true{
+                            //进入数字简历页面
+                            let is_agree = UserDefaults.standard.bool(forKey: "is_agree_shuzijianlixieyi")
+                            if is_agree{
+                                //跳转数字简历页面
+                                let vc = CNLiveDigitalResumeController()
+                                self.navigationController?.pushViewController(vc, animated: true)
+                            }else{
+                                self.showXieyiAlert()
+                            }
+                        }else{
+                            //跳转到身份认证页面
+                            let listModel = StandListModel()
+                            listModel.id = Int(self.channelId) ?? 0
+                            self.navigationController?.pushViewController(CNLiveMineInputViewController.init(listModel: listModel, authType: .person), animated: pushAnimated)
+                        }
+                    }else{
+                        //实名认证失败
+                        showMessage(message: "实名认证失败")
+                        self.navigationController?.popViewController(animated: true)
+                    }
                 }
             }
         }
     }
+    
+    
+    
+    // MARK: - 数字简历协议
+    let delegate = UIApplication.shared.delegate as! AppDelegate
+    /// 未认证-inputType17时弹窗背景图
+    lazy var alertBgImgView:UIImageView = {
+        let alertBgImgView:UIImageView = UIImageView()
+        alertBgImgView.tag = 20001
+        alertBgImgView.isUserInteractionEnabled = true
+        alertBgImgView.contentMode = .scaleAspectFit
+        alertBgImgView.backgroundColor = .white
+        return alertBgImgView
+    }()
+    lazy var agreeBtn: UIButton = {
+        let  nextBtn = UIButton(type: .custom)
+        nextBtn.width = 285
+        nextBtn.height = 44
+        nextBtn.setTitle("同意协议 领取一下", for: .normal)
+        nextBtn.setTitleColor(.white, for: .normal)
+        nextBtn.layer.cornerRadius = 22
+        nextBtn.clipsToBounds = true
+        nextBtn.addTarget(self, action: #selector(agreeBtnAction), for: .touchUpInside)
+        nextBtn.backgroundColor = HexColor("#8E8BFB")
+        // fillCode
+        let bgLayer1 = CAGradientLayer()
+        bgLayer1.colors = [UIColor(red: 0.1, green: 0.38, blue: 1, alpha: 1).cgColor, UIColor(red: 0.56, green: 0.55, blue: 0.98, alpha: 1).cgColor]
+        bgLayer1.locations = [0, 1]
+        bgLayer1.frame = nextBtn.bounds
+        bgLayer1.startPoint = CGPoint(x: 0.5, y: 1)
+        bgLayer1.endPoint = CGPoint(x: 0, y: 0)
+        nextBtn.layer.addSublayer(bgLayer1)
+        return nextBtn
+    }()
+    lazy var jianlixieyiLabel: UILabel = {
+        let label = UILabel()
+        let attrString = NSMutableAttributedString(string: "查看《元码数字简历服务协议》")
+        label.frame = CGRect(x: 0, y: 0, width: KSreenWidth, height: 20)
+        let attr1: [NSAttributedString.Key : Any] = [.font: Font_14,.foregroundColor: HexColor("#20252A")!]
+        attrString.addAttributes(attr1, range: NSRange(location: 0, length: 2))
+        let attr: [NSAttributedString.Key : Any] = [.font: Font_14,.foregroundColor: HexColor("#1961FE")!]
+        attrString.addAttributes(attr, range: NSRange(location: 2, length: attrString.length-2))
+        label.attributedText = attrString
+        label.textAlignment = .center
+        label.isUserInteractionEnabled = true
+        label.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(jianlixieyiAction)))
+        return label
+    }()
+    //弹出数字简历协议alert
+    func showXieyiAlert(){
+        delegate.window?.addSubview(self.alertBgImgView)
+        alertBgImgView.snp.makeConstraints { make in
+            make.centerX.equalToSuperview()
+            make.centerY.equalToSuperview()
+            make.width.equalToSuperview()
+            make.height.equalToSuperview()
+        }
+        self.alertBgImgView.image = UIImage(named: "mine_jianli_xieyiBg")
+        alertBgImgView.addSubview(self.agreeBtn)
+        self.agreeBtn.snp.makeConstraints { make in
+            make.bottom.equalToSuperview().offset(-50)
+            make.width.equalTo(285)
+            make.centerX.equalToSuperview()
+            make.height.equalTo(44)
+        }
+        alertBgImgView.addSubview(self.jianlixieyiLabel)
+        self.jianlixieyiLabel.snp.makeConstraints { make in
+            make.bottom.equalTo(self.agreeBtn.snp.top).offset(-10)
+            make.left.right.equalToSuperview()
+            make.height.equalTo(20)
+        }
+    }
+    @objc func jianlixieyiAction(){
+        //查看数字简历协议
+        let webVC = CNWebViewController()
+        webVC.url = URL(string: "https://wjj.ys1.cnliveimg.com/term/ymRlsbyhxxcjxy.html")
+        self.navigationController?.pushViewController(webVC, animated: true)
+        
+        delegate.window?.subviews.forEach({ view in
+            if view.tag >= 20000{
+                view.isHidden = true
+            }
+        })
+    }
+    @objc func agreeBtnAction(){
+        //同意协议按钮
+        delegate.window?.subviews.forEach({ view in
+            if view.tag >= 20000{
+                view.removeFromSuperview()
+            }
+        })
+        //本地存储已同意
+        UserDefaults.standard.set(true,forKey: "is_agree_shuzijianlixieyi")
+
+        //跳转数字简历页面
+        let vc = CNLiveDigitalResumeController()
+        self.navigationController?.pushViewController(vc, animated: true)
+    }
+ 
 }
 // Video Sessions
@@ -670,10 +792,7 @@ extension CNLiveFaceAuthController {
                     if status == .success{
                         //保存最新实名身份数据
                         self.saveRealData()
-                        //跳转到身份认证页面
-                        let listModel = StandListModel()
-                        listModel.id = Int(self.channelId) ?? 0
-                        self.navigationController?.pushViewController(CNLiveMineInputViewController.init(listModel: listModel, authType: .person), animated: pushAnimated)
+                        
                     }else{
                         //提示认证失败
                         CNLiveAuthTool.shared.showAuthFailAlert()
@@ -745,6 +864,7 @@ extension CNLiveFaceAuthController {
         }
     }
+    
 }
 // Camera Settings & Orientation
@@ -825,6 +945,8 @@ extension CNLiveFaceAuthController: AVCaptureVideoDataOutputSampleBufferDelegate
             print(error)
         }
     }
+    
+    
 }
@@ -214,24 +214,14 @@ class CNLiveRealNameAuthController:CNLiveBaseViewController,UITableViewDataSourc
             showMessage(message: "请输入证件号码")
             return
         }
-        if self.isResume == true{
-            //进入数字简历页面
-            let is_agree = UserDefaults.standard.bool(forKey: "is_agree_shuzijianlixieyi")
-            if is_agree{
-                //跳转数字简历页面
-                let vc = CNLiveDigitalResumeController()
-                self.navigationController?.pushViewController(vc, animated: true)
-            }else{
-                self.showXieyiAlert()
-            }
-        }else{
-            //进入人脸识别页面
-            let vc = CNLiveFaceAuthController()
-            vc.realName = self.nameTextStr
-            vc.realNumber = self.numberTextStr
-            vc.channelId = self.channelId
-            self.navigationController?.pushViewController(vc, animated: true)
-        }
+        //进入人脸识别页面
+        let vc = CNLiveFaceAuthController()
+        vc.realName = self.nameTextStr
+        vc.realNumber = self.numberTextStr
+        vc.channelId = self.channelId
+        vc.isResume = self.isResume
+        self.navigationController?.pushViewController(vc, animated: true)
+    
     }
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
@@ -267,103 +257,5 @@ class CNLiveRealNameAuthController:CNLiveBaseViewController,UITableViewDataSourc
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
         return 122
     }
-
-    
-    
-    // MARK: - 数字简历协议
-    let delegate = UIApplication.shared.delegate as! AppDelegate
-    /// 未认证-inputType17时弹窗背景图
-    lazy var alertBgImgView:UIImageView = {
-        let alertBgImgView:UIImageView = UIImageView()
-        alertBgImgView.tag = 20001
-        alertBgImgView.isUserInteractionEnabled = true
-        alertBgImgView.contentMode = .scaleAspectFit
-        alertBgImgView.backgroundColor = .white
-        return alertBgImgView
-    }()
-    lazy var agreeBtn: UIButton = {
-        let  nextBtn = UIButton(type: .custom)
-        nextBtn.width = 285
-        nextBtn.height = 44
-        nextBtn.setTitle("同意协议 领取一下", for: .normal)
-        nextBtn.setTitleColor(.white, for: .normal)
-        nextBtn.layer.cornerRadius = 22
-        nextBtn.clipsToBounds = true
-        nextBtn.addTarget(self, action: #selector(agreeBtnAction), for: .touchUpInside)
-        nextBtn.backgroundColor = HexColor("#8E8BFB")
-        // fillCode
-        let bgLayer1 = CAGradientLayer()
-        bgLayer1.colors = [UIColor(red: 0.1, green: 0.38, blue: 1, alpha: 1).cgColor, UIColor(red: 0.56, green: 0.55, blue: 0.98, alpha: 1).cgColor]
-        bgLayer1.locations = [0, 1]
-        bgLayer1.frame = nextBtn.bounds
-        bgLayer1.startPoint = CGPoint(x: 0.5, y: 1)
-        bgLayer1.endPoint = CGPoint(x: 0, y: 0)
-        nextBtn.layer.addSublayer(bgLayer1)
-        return nextBtn
-    }()
-    lazy var xieyiLabel: UILabel = {
-        let label = UILabel()
-        let attrString = NSMutableAttributedString(string: "查看《元码数字简历服务协议》")
-        label.frame = CGRect(x: 0, y: 0, width: KSreenWidth, height: 20)
-        let attr1: [NSAttributedString.Key : Any] = [.font: Font_14,.foregroundColor: HexColor("#20252A")!]
-        attrString.addAttributes(attr1, range: NSRange(location: 0, length: 2))
-        let attr: [NSAttributedString.Key : Any] = [.font: Font_14,.foregroundColor: HexColor("#1961FE")!]
-        attrString.addAttributes(attr, range: NSRange(location: 2, length: attrString.length-2))
-        label.attributedText = attrString
-        label.textAlignment = .center
-        label.isUserInteractionEnabled = true
-        label.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(xieyiAction)))
-        return label
-    }()
-    //弹出数字简历协议alert
-    func showXieyiAlert(){
-        delegate.window?.addSubview(self.alertBgImgView)
-        alertBgImgView.snp.makeConstraints { make in
-            make.centerX.equalToSuperview()
-            make.centerY.equalToSuperview()
-            make.width.equalToSuperview()
-            make.height.equalToSuperview()
-        }
-        self.alertBgImgView.image = UIImage(named: "mine_jianli_xieyiBg")
-        alertBgImgView.addSubview(self.agreeBtn)
-        self.agreeBtn.snp.makeConstraints { make in
-            make.bottom.equalToSuperview().offset(-50)
-            make.width.equalTo(285)
-            make.centerX.equalToSuperview()
-            make.height.equalTo(44)
-        }
-        alertBgImgView.addSubview(self.xieyiLabel)
-        self.xieyiLabel.snp.makeConstraints { make in
-            make.bottom.equalTo(self.agreeBtn.snp.top).offset(-10)
-            make.left.right.equalToSuperview()
-            make.height.equalTo(20)
-        }
-    }
-    @objc func xieyiAction(){
-        //查看数字简历协议
-        let webVC = CNWebViewController()
-        webVC.url = URL(string: "https://wjj.ys1.cnliveimg.com/term/ymRlsbyhxxcjxy.html")
-        self.navigationController?.pushViewController(webVC, animated: true)
-        
-        delegate.window?.subviews.forEach({ view in
-            if view.tag >= 20000{
-                view.isHidden = true
-            }
-        })
-    }
-    @objc func agreeBtnAction(){
-        //同意协议按钮
-        delegate.window?.subviews.forEach({ view in
-            if view.tag >= 20000{
-                view.removeFromSuperview()
-            }
-        })
-        //本地存储已同意
-        UserDefaults.standard.set(true,forKey: "is_agree_shuzijianlixieyi")
-
-        //跳转数字简历页面
-        let vc = CNLiveDigitalResumeController()
-        self.navigationController?.pushViewController(vc, animated: true)
-    }
-    
+   
 }
@@ -110,6 +110,32 @@ class CNLiveVitaeViewModel:NSObject{
     }
+    
+    /// 获取省市区县列表
+    /// @param id
+    static func getCityListWithId(id:String,resultBlock: @escaping downSlideResultBlock){
+        let param = NSMutableDictionary()
+        param.setValue(id, forKey: "id")
+        
+        CNLiveNetworking.setAllowRequestDefaultArgument(true)
+        CNLiveNetworking.setupShowDataResult(false)
+        CNLiveNetworking.setupDSRequest(true)
+        let custom_param = NSMutableDictionary()
+        custom_param.setValue(CNLiveMCEnvironmentManager.shared.appId_wjj, forKey: "appId")
+        custom_param.setValue(CNLiveMCEnvironmentManager.shared.appKey_wjj, forKey: "appKey")
+        CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
+
+        CNLiveNetworking.requestNetwork(with: .POST, urlString: "https://managemall.cnlive.com"+"/Api/Index3/getCityList", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
+            hiddenLoading()
+            if (error == nil) {
+                let res = (result as! Dictionary<String, Any>)["data"] as! Dictionary<String, Any>
+                let listModel = newDictionaryToModel(res, CNLiveAddrAreaListModel.self)
+                resultBlock(listModel as Any,.success)
+            }else{
+                resultBlock(NSNull(),.failed)
+            }
+        }
+    }
 }
+//
+//  CNLiveAddrAreaModel.swift
+//  metaCode
+//
+//  Created by zx on 2024/7/19.
+//  数字简历位置model 省市区
+
+import Foundation
+
+class CNLiveAddrAreaListModel:BaseModel{
+    var list:[CNLiveAddrAreaModel]?
+}
+class CNLiveAddrAreaModel:BaseModel{
+    ///id
+    var id:String = ""
+    ///名称
+    var name:String = ""
+    ///父级id(最上级为0)
+    var pid:String = ""
+    ///1省 2市 3区(县)
+    var level:String = ""
+}