// 省市区选择逻辑

galaxy/galaxy/Classes/Modules/Community(社区)/M/YHUserInformationModel.swift

@@ -32,6 +32,8 @@ struct YHUserInformationModel {
     var value: [String]?
     var isNeed: Bool?
     
+    var country: String = ""
+    
     init(id: YHUserInformationID? = nil, title: String? = nil, isUserKeyBoard: Bool? = nil, prompts: String? = nil, message: String? = nil, type: YHItemSelectType? = nil, value: [String]? = nil, isNeed: Bool? = nil) {
         self.id = id
         self.title = title

galaxy/galaxy/Classes/Modules/Community(社区)/V/YHMyInformationItemCell.swift

@@ -139,7 +139,18 @@ class YHMyInformationItemCell: UITableViewCell {
         case .normal:
             printLog("不需要跳转")
         case .address:
-            let provice = ""
+            var provice = ""
+            if let country = self.dataSource?.country, !country.isEmpty {
+                if country.contains("香港") {
+                    provice = "香港特别行政区"
+                    
+                } else if country.contains("澳门") {
+                    provice = "澳门特别行政区"
+
+                } else if country.contains("台湾") {
+                    provice = "台湾省"
+                }
+            }
             let addressPicker = YHAddressViewController(selectProvince: provice)
             addressPicker.backLocationStringController = { (address, province, city, _) in
                 self.dataSource?.message = address

galaxy/galaxy/Classes/Modules/Community(社区)/VM/YHInformationAuthorizeViewModel.swift

@@ -23,7 +23,13 @@ class YHInformationAuthorizeViewModel: YHBaseViewModel {
             string = model.address.province + "/" + model.address.city
         }
          
-        let item3 = YHUserInformationModel(id: .id2, title: "所在地-省市", isUserKeyBoard: false, prompts: "请选择您的所在地", message: string, type: .address, isNeed: false)
+        var provinceTitle = "所在地-省市"
+        if model.address.country.contains("香港") || model.address.country.contains("澳门") || model.address.country.contains("台湾") {
+            provinceTitle = "行政区/地点"
+        }
+        var item3 = YHUserInformationModel(id: .id2, title: provinceTitle, isUserKeyBoard: false, prompts: "请选择您的所在地", message: string, type: .address, isNeed: false)
+        item3.country = model.address.country
+        
         let item4 = YHUserInformationModel(id: .id3, title: "毕业院校", isUserKeyBoard: true, prompts: "请输入您的毕业院校", message: model.college, isNeed: false)
         let item5 = YHUserInformationModel(id: .id4, title: "所属行业", isUserKeyBoard: false, prompts: "请选择您的所属行业", message: model.industry, type: .id, isNeed: false)
         let item6 = YHUserInformationModel(id: .id5, title: "职位", isUserKeyBoard: true, prompts: "请输入您的职位", message: model.position, isNeed: false)
@@ -41,6 +47,19 @@ class YHInformationAuthorizeViewModel: YHBaseViewModel {
         case .id2:
             model.address.province = item.value?.first ?? ""
             model.address.city = item.value?.last ?? ""
+            if model.address.province.contains("香港") {
+                model.address.country = "中国香港-Hong Kong"
+                
+            } else if model.address.province.contains("澳门") {
+                model.address.country = "中国澳门-Macau"
+
+            } else if model.address.province.contains("台湾") {
+                model.address.country = "中国台湾-Taiwan"
+                
+            } else {
+                model.address.country = "中国-China"
+            }
+                
         case .id3:
             model.college = item.message ?? ""
         case .id4:
@@ -49,6 +68,8 @@ class YHInformationAuthorizeViewModel: YHBaseViewModel {
             model.position = item.message ?? ""
         case .id6:
             model.address.country = item.message ?? ""
+            model.address.province = ""
+            model.address.city = ""
         default:
             break
         }

galaxy/galaxy/Classes/Modules/Mine（我的）/MyCard(我的名片)/VM/YHEditViewModel.swift

@@ -44,7 +44,13 @@ class YHEditViewModel: YHBaseViewModel {
             string = model.address.province + "/" + model.address.city
         }
          
-        let item3 = YHUserInformationModel(id: .id2, title: "所在地-省市", isUserKeyBoard: false, prompts: "请选择您的所在地", message: string, type: .address, isNeed: true)
+        var provinceTitle = "所在地-省市"
+        if model.address.country.contains("香港") || model.address.country.contains("澳门") || model.address.country.contains("台湾") {
+            provinceTitle = "行政区/地点"
+        }
+        var item3 = YHUserInformationModel(id: .id2, title: provinceTitle, isUserKeyBoard: false, prompts: "请选择您的所在地", message: string, type: .address, isNeed: true)
+        item3.country = model.address.country
+
         let item4 = YHUserInformationModel(id: .id7, title: "星座", isUserKeyBoard: false, prompts: "请选择您的星座", message: model.zodiac, type: .constellation, isNeed: false)
         if model.address.country.contains("中国") {
             return [item1, item2, item3, item4]
@@ -60,6 +66,20 @@ class YHEditViewModel: YHBaseViewModel {
         case .id2:
             model.address.province = item.value?.first ?? ""
             model.address.city = item.value?.last ?? ""
+            
+            if model.address.province.contains("香港") {
+                model.address.country = "中国香港-Hong Kong"
+                
+            } else if model.address.province.contains("澳门") {
+                model.address.country = "中国澳门-Macau"
+
+            } else if model.address.province.contains("台湾") {
+                model.address.country = "中国台湾-Taiwan"
+                
+            } else {
+                model.address.country = "中国-China"
+            }
+            
         case .id3:
             model.college = item.message ?? ""
         case .id4:
@@ -68,6 +88,8 @@ class YHEditViewModel: YHBaseViewModel {
             model.position = item.message ?? ""
         case .id6:
             model.address.country = item.message ?? ""
+            model.address.province = ""
+            model.address.city = ""
         case .id7:
             model.zodiac = item.message ?? ""
         case .id8: