From b697beff830aa128c7b41fc2fce19a5ff78a35fc Mon Sep 17 00:00:00 2001
From: renwj <renwenjie@zhidaoauto.com>
Date: Fri, 5 Jan 2024 17:54:48 +0800
Subject: [PATCH] =?UTF-8?q?[6.2.6][V2N]=20=E4=BC=98=E5=8C=96taxi=E4=B9=98?=
 =?UTF-8?q?=E5=AE=A2=E5=B1=8F=E4=BA=8B=E4=BB=B6=E8=A7=A6=E5=8F=91=E6=97=B6?=
 =?UTF-8?q?=E8=A7=86=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

---
 .../angle/MoGoVisualAngleChangeProvider.kt    | 33 +++++++++++--------
 1 file changed, 20 insertions(+), 13 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 750c820964..55f6691d06 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
@@ -224,7 +224,7 @@ class MoGoVisualAngleChangeProvider: IMoGoVisualAngleChangeProvider {
                 Log.d(TAG, "--- doRealVisualAngleChange --- 2 ---")
                 delay(delay)
                 Log.d(TAG, "--- doRealVisualAngleChange --- 3 ---")
-                doChangeAngle(Record(target, triggerTime = triggerTime))
+                doChangeAngle(Record(target, triggerTime = triggerTime), displayed)
             }.also { itx ->
                 itx.invokeOnCompletion {
                     if (it is CancellationException) {
@@ -249,35 +249,42 @@ class MoGoVisualAngleChangeProvider: IMoGoVisualAngleChangeProvider {
                     }
                 }
                 Log.d(TAG, "--- doRealVisualAngleChange --- 10 ---")
-                doChangeAngle(Record(target, triggerTime = triggerTime))
+                doChangeAngle(Record(target, triggerTime = triggerTime), displayed)
             }
         }
     }
 
-    private fun doChangeAngle(record: Record) {
-        val angle = record.target.angle
+    private fun doChangeAngle(target: Record, previous: Record? = null) {
+        val angle = target.target.angle
         CallerMapUIServiceManager.getMapUIController()?.also {
-            Log.d(TAG, "--- doChangeAngle ---： ${record.target}")
-            if (record.target !is Default) {
-                record.isDisplay = true
+            Log.d(TAG, "--- doChangeAngle ---： ${target.target}")
+            if (target.target !is Default) {
+                target.isDisplay = true
                 synchronized(queue) {
-                    queue += record
+                    queue += target
                 }
             }
-            if (record.target is Default && roadEventFlag) {
+            if (target.target is Default && roadEventFlag) {
                 roadEventFlag = false
                 it.setLockMode(true)
             }
-            if (record.target is RoadEvent) {
-                it.setLockMode(false)
-                roadEventFlag = true
+            if (target.target is RoadEvent) {
                 //taxi乘客屏，使用的新地图效果，切了视角也看不到
                 if (!AppIdentityModeUtils.isTaxiPassenger(FunctionBuildConfig.appIdentityMode)) {
+                    roadEventFlag = true
+                    it.setLockMode(false)
                     scope.launch {
-                        it.animateTo(0.0 ,0.0,1f, - record.target.poi_angle.toFloat(),11.5f,28f,3000,record.target.isGps)
+                        it.animateTo(0.0 ,0.0,1f, - target.target.poi_angle.toFloat(),11.5f,28f,3000,target.target.isGps)
                     }
                 }
             } else {
+                if (target.target is Default && previous != null && (previous.target is RoadEvent)) {
+                    Log.d(TAG, "==== doChangeAngle === 1 ===")
+                    if (AppIdentityModeUtils.isTaxiPassenger(FunctionBuildConfig.appIdentityMode)) {
+                        Log.d(TAG, "==== doChangeAngle === 2 ===")
+                        return
+                    }
+                }
                 it.changeMapVisualAngle(angle, null)
             }
         }