修复city_id获取失败问题。升版本号1.5.5

GeliBusinessPlatform.xcodeproj/project.pbxproj

@@ -3987,7 +3987,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = GeliBusinessPlatform/GeliBusinessPlatform.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.7;
+				CURRENT_PROJECT_VERSION = 1.8;
 				DEFINES_MODULE = NO;
 				DEVELOPMENT_ASSET_PATHS = "\"GeliBusinessPlatform/Preview Content\"";
 				DEVELOPMENT_TEAM = K48346UACH;
@@ -4035,7 +4035,7 @@
 					"$(PROJECT_DIR)/GeliBusinessPlatform/Other/JPush/Lib",
 					"$(PROJECT_DIR)/GeliBusinessPlatform/Other/SDK/ShareSDK/Support/PlatformSDK/WeChatSDK",
 				);
-				MARKETING_VERSION = 1.5.4;
+				MARKETING_VERSION = 1.5.5;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -4116,7 +4116,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = GeliBusinessPlatform/GeliBusinessPlatform.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.7;
+				CURRENT_PROJECT_VERSION = 1.8;
 				DEFINES_MODULE = NO;
 				DEVELOPMENT_ASSET_PATHS = "\"GeliBusinessPlatform/Preview Content\"";
 				DEVELOPMENT_TEAM = K48346UACH;
@@ -4164,7 +4164,7 @@
 					"$(PROJECT_DIR)/GeliBusinessPlatform/Other/JPush/Lib",
 					"$(PROJECT_DIR)/GeliBusinessPlatform/Other/SDK/ShareSDK/Support/PlatformSDK/WeChatSDK",
 				);
-				MARKETING_VERSION = 1.5.4;
+				MARKETING_VERSION = 1.5.5;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",

GeliBusinessPlatform/ViewController/代客下单（货运）/下运单/XiaYunDanViewController.swift

@@ -422,7 +422,21 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
             make.height.equalTo(30)
             make.width.equalTo(self.locBtn.bounds.size.width)
         })
-        
+        print("abc == ",adrArr.count)
+        if adrArr.count == 0 {
+            city_id = loc.city_id!
+            print("abc == ")
+            extractedFunc()
+            return
+        }
+        if adrArr.count > 0 {
+            city_id = loc.city_id!
+            let dict = adrArr.first
+            if dict!["locName"] as! String == "空"{
+                extractedFunc()
+                return
+            }
+        }
         
     }
     
@@ -714,16 +728,18 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
             }
             
             if adrDatas.count == 0{
+                print("city_id = ",city_id)
                 HUD.flash(.progress)
                 cityList(["user_token":UserToken as Any,"nonce_str":String.randomStr(len: 30) as Any], success: { (data) in
                     let model = data as! cityListModel
                     self.adrDatas.removeAll()
                     for item in model.data! {
-                        if item.name_en == self.selectLoc.localizedLowercase || item.name == self.selectLoc {
+                        if self.selectLoc.contains("\(item.name!)") || self.selectLoc.localizedLowercase.contains("\(item.name_en!)") {
                             self.loc = item
                         }
                         self.adrDatas.append(item)
                     }
+                    
                     self.getUICarList()
                     HUD.hide()
                 }) { (err) in}
@@ -755,9 +771,9 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
         lineV.frame.origin.x = fullScreenWidth * 0.5
         hllView.isHidden = false
         locBtn.isUserInteractionEnabled = true
-        
         for item in adrDatas {
-            if item.name == selectLoc || item.name_en == selectLoc.localizedLowercase{
+            
+            if selectLoc.contains("\(item.name!)") || selectLoc.localizedLowercase.contains("\(item.name_en!)"){
                 city_id = item.city_id!
             }
         }
@@ -787,7 +803,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
                 
                 self.adrDatas.removeAll()
                 for item in model.data! {
-                    if item.name_en == self.selectLoc.localizedLowercase || item.name == self.selectLoc {
+                    if self.selectLoc.contains("\(item.name!)") || self.selectLoc.localizedLowercase.contains("\(item.name_en!)") {
                         self.loc = item
                     }
                     self.adrDatas.append(item)
@@ -1183,7 +1199,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
                     
                     self.adrDatas.removeAll()
                     for item in model.data! {
-                        if item.name_en == self.selectLoc.localizedLowercase || item.name == self.selectLoc {
+                        if self.selectLoc.contains("\(item.name!)") || self.selectLoc.localizedLowercase.contains("\(item.name_en!)") {
                             self.loc = item
                         }
                         self.adrDatas.append(item)
@@ -1352,7 +1368,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
                         
                         self.adrDatas.removeAll()
                         for item in model.data! {
-                            if item.name_en == self.selectLoc.localizedLowercase || item.name == self.selectLoc {
+                            if self.selectLoc.contains("\(item.name!)") || self.selectLoc.localizedLowercase.contains("\(item.name_en!)") {
                                 self.loc = item
                             }
                             self.adrDatas.append(item)