From ebaf5608a92cef0023db5a024fb858546fe1e9d9 Mon Sep 17 00:00:00 2001
From: zhongchao <zhongchao@zhidaoauto.com>
Date: Fri, 4 Aug 2023 18:48:35 +0800
Subject: [PATCH] [3.4.0] change the crossid get before traffic light request
 cross road and adjust time to 1000

---
 .../biz/v2x/trafficlight/core/MogoTrafficLightManager.kt    | 5 +----
 .../v2x/trafficlight/network/TrafficLightNetWorkModel.kt    | 6 ++++--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/trafficlight/core/MogoTrafficLightManager.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/trafficlight/core/MogoTrafficLightManager.kt
index 79e0637f92..1d519ae668 100644
--- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/trafficlight/core/MogoTrafficLightManager.kt
+++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/trafficlight/core/MogoTrafficLightManager.kt
@@ -20,8 +20,6 @@ import com.mogo.eagle.function.biz.v2x.trafficlight.core.TrafficLightThreadHandl
 import com.mogo.eagle.function.biz.v2x.trafficlight.core.TrafficLightThreadHandler.Companion.MSG_WHAT_STOP_SEARCH_CROSS_ROAD
 import com.mogo.eagle.function.biz.v2x.trafficlight.core.TrafficLightThreadHandler.Companion.MSG_WHAT_STOP_SEARCH_TRAFFIC_LIGHT
 import com.mogo.eagle.function.biz.v2x.trafficlight.network.TrafficLightNetWorkModel
-import com.mogo.map.MogoData
-import com.mogo.map.MogoData.Companion.mogoMapData
 
 class MogoTrafficLightManager : IMoGoChassisLocationGCJ02Listener {
 
@@ -60,9 +58,8 @@ class MogoTrafficLightManager : IMoGoChassisLocationGCJ02Listener {
                 }
                 firstLoopCrossRoad = false
                 mLocation?.let { it ->
-                    val tileId = mogoMapData.get().getTileId(it.longitude, it.latitude)
                     trafficLightNetWorkModel.requestRoadID(
-                        tileId, it.latitude, it.longitude, it.heading,
+                        it.latitude, it.longitude, it.heading,
                         {
                             mThreadHandler?.sendEmptyMessage(MSG_WHAT_STOP_SEARCH_CROSS_ROAD)
                             roadIDResult = it
diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/trafficlight/network/TrafficLightNetWorkModel.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/trafficlight/network/TrafficLightNetWorkModel.kt
index 1646e6a7d2..44bfad8607 100644
--- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/trafficlight/network/TrafficLightNetWorkModel.kt
+++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/trafficlight/network/TrafficLightNetWorkModel.kt
@@ -4,6 +4,7 @@ import com.mogo.cloud.passport.MoGoAiCloudClientConfig
 import com.mogo.commons.constants.HostConst
 import com.mogo.eagle.core.data.BaseResponse
 import com.mogo.eagle.core.data.biz.trafficlight.*
+import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager
 import com.mogo.eagle.core.network.MoGoRetrofitFactory
 import com.mogo.eagle.core.network.apiCall
 import com.mogo.eagle.core.network.cancel
@@ -18,7 +19,6 @@ class TrafficLightNetWorkModel {
     }
 
     fun requestRoadID(
-        tileID: Long,
         lat: Double,
         lon: Double,
         bearing: Double,
@@ -28,8 +28,10 @@ class TrafficLightNetWorkModel {
         request<BaseResponse<RoadIDResult>>("requestRoadID") {
             loader {
                 apiCall {
+                    val tileId = CallerMapUIServiceManager.getMapUIController()
+                        ?.getTileId(lon, lat) ?: 0
                     val map = hashMapOf<String, String>()
-                    val roadIDRequestData = RoadIDRequestData(tileID, lat, lon, bearing)
+                    val roadIDRequestData = RoadIDRequestData(tileId, lat, lon, bearing)
                     map["sn"] = MoGoAiCloudClientConfig.getInstance().sn
                     map["data"] = GsonUtils.toJson(roadIDRequestData)
                     getNetWorkApi().getFrontRoadID(map)