From 0a28a8dceae02a5fea85559dedb9de449ac7549b Mon Sep 17 00:00:00 2001
From: chenfufeng <chenfufeng@zhidaoauto.com>
Date: Mon, 22 Jul 2024 14:14:02 +0800
Subject: [PATCH] =?UTF-8?q?[6.5.0][Fix]=E5=85=BC=E5=AE=B9=E6=A6=82?=
 =?UTF-8?q?=E7=8E=87=E6=80=A7=E9=A6=96=E6=AC=A1=E6=8E=88=E6=9D=83=E6=8B=BF?=
 =?UTF-8?q?=E4=B8=8D=E5=88=B0=E9=AB=98=E5=BE=B7cityCode=E7=9A=84=E6=83=85?=
 =?UTF-8?q?=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../travelreality/TravelRealityModel.kt       | 20 +++++++++++++++----
 .../core/function/view/TravelRealityView.kt   |  5 ++++-
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/travelreality/TravelRealityModel.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/travelreality/TravelRealityModel.kt
index 355e4e7352..a08518983c 100644
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/travelreality/TravelRealityModel.kt
+++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/travelreality/TravelRealityModel.kt
@@ -88,7 +88,10 @@ class TravelRealityModel private constructor() {
                     val time = System.currentTimeMillis().toString()
                     val md5String = "${CROSS_DEVICE.uppercase(Locale.getDefault())}$time"
                     val loc = CallerChassisLocationWGS84ListenerManager.getChassisLocationWGS84()
-                    val cityCode = CallerMapUIServiceManager.getCityCode() ?: "0734"
+                    var cityCode = CallerMapUIServiceManager.getCityCode() ?: "0734"
+                    if (cityCode.isEmpty()) {
+                        cityCode = "0734"
+                    }
                     getNetWorkApi(HostConst.getNDEHost()).getCrossDevice(Md5Util.getMD5Result(md5String), time, "", loc.longitude, loc.latitude, cityCode)
                 }
             }
@@ -126,7 +129,10 @@ class TravelRealityModel private constructor() {
                     val time = System.currentTimeMillis().toString()
                     val md5String = "${CITY_ROAD_RANGE.uppercase(Locale.getDefault())}$time"
                     val loc = CallerChassisLocationWGS84ListenerManager.getChassisLocationWGS84()
-                    val cityCode = CallerMapUIServiceManager.getCityCode() ?: "0734"
+                    var cityCode = CallerMapUIServiceManager.getCityCode() ?: "0734"
+                    if (cityCode.isEmpty()) {
+                        cityCode = "0734"
+                    }
                     getNetWorkApi(HostConst.getNDEHost()).getCityRoadRange(Md5Util.getMD5Result(md5String), time, loc.longitude, loc.latitude, cityCode)
                 }
             }
@@ -150,7 +156,10 @@ class TravelRealityModel private constructor() {
                     val time = System.currentTimeMillis().toString()
                     val md5String = "${CITY_ROAD_TRACK.uppercase(Locale.getDefault())}$time"
                     val loc = CallerChassisLocationWGS84ListenerManager.getChassisLocationWGS84()
-                    val cityCode = CallerMapUIServiceManager.getCityCode() ?: "0734"
+                    var cityCode = CallerMapUIServiceManager.getCityCode() ?: "0734"
+                    if (cityCode.isEmpty()) {
+                        cityCode = "0734"
+                    }
                     getNetWorkApi(HostConst.getNDEHost()).getCityRoadTrack(Md5Util.getMD5Result(md5String), time, loc.longitude, loc.latitude, cityCode)
                 }
             }
@@ -173,7 +182,10 @@ class TravelRealityModel private constructor() {
                 apiCall {
                     val time = System.currentTimeMillis().toString()
                     val loc = CallerChassisLocationWGS84ListenerManager.getChassisLocationWGS84()
-                    val cityCode = CallerMapUIServiceManager.getCityCode() ?: "0734"
+                    var cityCode = CallerMapUIServiceManager.getCityCode() ?: "0734"
+                    if (cityCode.isEmpty()) {
+                        cityCode = "0734"
+                    }
                     val map = mutableMapOf(
                         "lon" to loc.longitude,
                         "lat" to loc.latitude,
diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/TravelRealityView.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/TravelRealityView.kt
index 5db0216cf8..a24c25eeae 100644
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/TravelRealityView.kt
+++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/TravelRealityView.kt
@@ -1142,7 +1142,10 @@ class TravelRealityView @JvmOverloads constructor(
             })
             Log.d(TAG, "请求获取道路事件!")
             // 获取道路事件
-            val cityCode = CallerMapUIServiceManager.getCityCode() ?: "0734"
+            var cityCode = CallerMapUIServiceManager.getCityCode() ?: "0734"
+            if (cityCode.isEmpty()) {
+                cityCode = "0734"
+            }
             travelNetWorkModel.getEventsWithTrajRequest(
                 EventReqEntity(pointList, cityCode),
                 onSuccess = {