From 1177b7c018c38bef3d6fef34871e44f0cf0af169 Mon Sep 17 00:00:00 2001
From: renwj <renwenjie@zhidaoauto.com>
Date: Wed, 17 Jul 2024 12:16:38 +0800
Subject: [PATCH] =?UTF-8?q?[6.5.0][=E9=81=93=E8=B7=AF=E4=BA=8B=E4=BB=B6][?=
 =?UTF-8?q?=E8=A7=86=E8=A7=92=E5=88=87=E6=8D=A2]=20=E9=81=BF=E5=85=8D?=
 =?UTF-8?q?=E4=B8=BB=E5=8A=A8=E8=8E=B7=E5=8F=96=E8=B7=AF=E5=8F=A3=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=EF=BC=8C=E5=AF=BC=E8=87=B4=E5=BA=94=E7=94=A8=E5=8D=A1?=
 =?UTF-8?q?=E9=A1=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../angle/MoGoVisualAngleChangeProvider.kt    | 26 +++++++++----------
 .../main/java/com/mogo/map/AMapViewWrapper.kt |  6 +++--
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/angle/MoGoVisualAngleChangeProvider.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/angle/MoGoVisualAngleChangeProvider.kt
index ab544b13de..1f98b35dab 100644
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/angle/MoGoVisualAngleChangeProvider.kt
+++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/angle/MoGoVisualAngleChangeProvider.kt
@@ -18,6 +18,7 @@ import com.mogo.eagle.core.function.call.autopilot.*
 import com.mogo.eagle.core.function.call.map.*
 import com.mogo.eagle.core.utilcode.kotlin.*
 import com.mogo.map.MapDataWrapper
+import com.zhidaoauto.map.data.road.RoadCross
 import com.zhidaoauto.map.data.road.StopLine
 import com.zhidaoauto.map.sdk.open.common.tools.MapTools
 import kotlinx.coroutines.*
@@ -48,6 +49,11 @@ class MoGoVisualAngleChangeProvider: IMoGoVisualAngleChangeProvider {
         private val triggerLocation = AtomicReference<MogoLocation>()
         private val travelled by lazy { AtomicReference(0.0) }
 
+        override fun onRoadChange(cross: Boolean, roadCross: RoadCross?) {
+            super.onRoadChange(cross, roadCross)
+            inCrossRoad = cross
+        }
+
         override fun onRoadIdInfo(roadId: String) {
             this.roadId.set(roadId)
             Log.d(TAG, "-- onRoadIdInfo --: prev: ${this.triggerRoadId.get()} -> curr: $roadId")
@@ -64,21 +70,13 @@ class MoGoVisualAngleChangeProvider: IMoGoVisualAngleChangeProvider {
                 val oldRoadId = triggerRoadId.get()
                 Log.d(TAG, "-- onRoadIdInfo --: travelled --: ${travelled.get()}")
                 if ((travelled.get() > distance)) {
-                    val cross = MapDataWrapper.getCrossRoad(loc.longitude, loc.latitude, loc.heading)
-                    Log.d(TAG, "-- onRoadIdInfo --: cross --: ${cross?.status}")
-                    if (cross?.status == 1) {
-                        if (!inCrossRoad) {
-                            inCrossRoad = true
-                        }
-                    } else {
-                        if (inCrossRoad) {
-                            triggerClose = true
-                        }
-                        if (!triggerClose && roadId != "0" && oldRoadId != null && oldRoadId != roadId) {
-                            triggerClose = true
-                        }
+                    Log.d(TAG, "-- onRoadIdInfo --: cross --: $inCrossRoad")
+                    if (inCrossRoad) {
+                        triggerClose = true
+                    }
+                    if (!triggerClose && roadId != "0" && oldRoadId != null && oldRoadId != roadId) {
+                        triggerClose = true
                     }
-
                     if (triggerClose) {
                         Log.d(TAG, "-- onRoadIdInfo --: trigger close --")
                         distanceOfCarToStopLine.set(0.0)
diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.kt b/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.kt
index 050ba85937..67573155e9 100644
--- a/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.kt
+++ b/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.kt
@@ -242,8 +242,10 @@ class AMapViewWrapper(mMapView: MapAutoView) : IMogoMapView, IMogoMapUIControlle
      * @param laneId
      */
     override fun onRoadIdInfo(roadId: String?, laneId: String?) {
-        if (roadId != null && !TextUtils.isEmpty(roadId)) {
-            invokeListenersOnRoadIdGet(roadId)
+        handler.post {
+            if (roadId != null && !TextUtils.isEmpty(roadId)) {
+                invokeListenersOnRoadIdGet(roadId)
+            }
         }
     }