From 6fcfceda118c636c52b6447f4d3290be68b7267b Mon Sep 17 00:00:00 2001
From: renwj <renwenjie@zhidaoauto.com>
Date: Tue, 27 Dec 2022 15:30:25 +0800
Subject: [PATCH 1/2] =?UTF-8?q?[2.13.0]=E4=BC=98=E5=8C=96=E8=A7=86?=
 =?UTF-8?q?=E8=A7=92=E5=88=87=E6=8D=A2=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../call/map/CallerVisualAngleManager.kt      | 25 ++++++++++++++++---
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerVisualAngleManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerVisualAngleManager.kt
index 1d04a769d3..e8c3611806 100644
--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerVisualAngleManager.kt
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerVisualAngleManager.kt
@@ -314,14 +314,14 @@ object CallerVisualAngleManager {
     private fun CoroutineScope.doRealVisualAngleChange(triggerTime: Long, target: Scene, displayed: Record? = null) {
         if (target is Default) {
             Log.d("${M_DEVA}${TAG}", "--- doRealVisualAngleChange --- 1 ---")
+            displayed?.also {
+                queue -= it
+            }
             defaultDelayJob?.safeCancel()
             launch {
                 val delay = target.unit.toMillis(target.delay)
                 Log.d("${M_DEVA}${TAG}", "--- doRealVisualAngleChange --- 2 ---")
                 delay(delay)
-                displayed?.also {
-                    queue -= it
-                }
                 Log.d("${M_DEVA}${TAG}", "--- doRealVisualAngleChange --- 3 ---")
                 doChangeAngle(Record(target, triggerTime = triggerTime))
             }.also { itx ->
@@ -337,7 +337,24 @@ object CallerVisualAngleManager {
             defaultDelayJob?.safeCancel()
             if (displayed == null || displayed.target.priority < target.priority) {
                 Log.d("${M_DEVA}${TAG}", "--- doRealVisualAngleChange --- 6 ---")
-                queue -= displayed
+                displayed?.also {
+                    queue -= it
+                }
+                if (target is Turning) {
+                    if (!target.open) {
+                        Log.d("${M_DEVA}${TAG}", "--- doRealVisualAngleChange --- 7 ---")
+                        changeVisualAngle(Default())
+                        return
+                    }
+                }
+                if (target is CrossRoad) {
+                    if (!target.open) {
+                        Log.d("${M_DEVA}${TAG}", "--- doRealVisualAngleChange --- 8 ---")
+                        changeVisualAngle(Default())
+                        return
+                    }
+                }
+                Log.d("${M_DEVA}${TAG}", "--- doRealVisualAngleChange --- 10 ---")
                 doChangeAngle(Record(target, triggerTime = triggerTime))
             }
         }

From 609afa2c14d70ee5229870c66e980e9442e2310d Mon Sep 17 00:00:00 2001
From: lianglihui <lianglihui@zhidaoauto.com>
Date: Wed, 28 Dec 2022 11:19:33 +0800
Subject: [PATCH 2/2] =?UTF-8?q?2.13.0.1=20fix=20=E9=AB=98=E7=B2=BE?=
 =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E5=B4=A9=E6=BA=83=20=20version=20to=202.8.0.?=
 =?UTF-8?q?10?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index e9147f7489..479e00afea 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -85,7 +85,7 @@ MOGO_LOCATION_VERSION=1.4.3.27
 MOGO_TELEMATIC_VERSION=1.4.3.27
 ######## MogoAiCloudSDK Version ########
 # 自研地图
-MAP_SDK_VERSION=2.8.0.9
+MAP_SDK_VERSION=2.8.0.10
 MAP_SDK_OPERATION_VERSION=1.1.4.1
 # websocket
 WEBSOCKET_VERSION=1.1.7