Refactor location logic

Author: huami1314

Diff for: CityManager.m

@@ -601,11 +601,11 @@ - (void)loadCityData {
         @"659006":@"铁门关",
         @"659007":@"双河",
         @"659008":@"可克达拉",
-        @"710000":@"台湾",
-        @"710100":@"台湾",
-        @"810000":@"香港",
-        @"810100":@"香港",
-        @"820100":@"澳门"
+        @"710000":@"中国台湾",
+        @"710100":@"中国台湾",
+        @"810000":@"中国香港",
+        @"810100":@"中国香港",
+        @"820100":@"中国澳门"
     };
 }
 
@@ -616,9 +616,7 @@ - (NSString *)getCityNameWithCode:(NSString *)code {
 
     NSString *cityName = self.cityCodeMap[code];
 
-    if (!cityName) {
     return cityName;
-    }
 }
 
 - (NSString *)getProvinceNameWithCode:(NSString *)code {
@@ -629,9 +627,7 @@ - (NSString *)getProvinceNameWithCode:(NSString *)code {
     provinceCode = [provinceCode stringByAppendingString:@"0000"];
     NSString *provinceCodeName = self.cityCodeMap[provinceCode];
 
-    if (!provinceCodeName) {
-        return provinceCodeName;
-    }
+    return provinceCodeName;
 }
 
 @end

Diff for: DYYY.xm

@@ -1099,18 +1099,29 @@
 
             if (cityName.length > 0 && ![text containsString:cityName]) {
                 if (!self.model.ipAttribution) {
-                    if ([provinceName isEqualToString:cityName]) {
+                    BOOL isDirectCity = [provinceName isEqualToString:cityName] || 
+                                       ([cityCode hasPrefix:@"11"] || [cityCode hasPrefix:@"12"] || 
+                                        [cityCode hasPrefix:@"31"] || [cityCode hasPrefix:@"50"]);
+                    
+                    if (isDirectCity) {
                         label.text = [NSString stringWithFormat:@"%@  IP属地：%@", text, cityName];
                     } else {
                         label.text = [NSString stringWithFormat:@"%@  IP属地：%@ %@", text, provinceName, cityName];
                     }
                 } else {
-                    // 添加条件判断
-			if (![text isEqualToString:provinceName] || [cityName isEqualToString:text]) {
-    				label.text = text; 
-			} else {
-    				label.text = [NSString stringWithFormat:@"%@ %@", text, cityName]; 
-			}
+                    BOOL isDirectCity = [provinceName isEqualToString:cityName] || 
+                                       ([cityCode hasPrefix:@"11"] || [cityCode hasPrefix:@"12"] || 
+                                        [cityCode hasPrefix:@"31"] || [cityCode hasPrefix:@"50"]);
+                    
+                    BOOL containsProvince = [text containsString:provinceName];
+                    
+                    if (isDirectCity && containsProvince) {
+                        label.text = text;
+                    } else if (containsProvince) {
+                        label.text = [NSString stringWithFormat:@"%@ %@", text, cityName];
+                    } else {
+                        label.text = text;
+                    }
                 }
             }
         }