From 12ee84d9832ddb13d53e67fcd38424a246274c92 Mon Sep 17 00:00:00 2001
From: chenfufeng <chenfufeng@zhidaoauto.com>
Date: Tue, 26 Nov 2024 16:17:43 +0800
Subject: [PATCH] =?UTF-8?q?[6.8.0][Fix]=E8=A7=A3=E5=86=B3=E8=A1=8C?=
 =?UTF-8?q?=E7=A8=8B=E5=85=A8=E8=A7=88=E8=BD=A8=E8=BF=B9=E7=BA=BF=E6=9C=AA?=
 =?UTF-8?q?=E6=B8=85=E9=99=A4=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../function/hmi/map/MapContainerLayout.kt    | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/map/MapContainerLayout.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/map/MapContainerLayout.kt
index d7d29992d7..1911e2d39a 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/map/MapContainerLayout.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/map/MapContainerLayout.kt
@@ -145,9 +145,7 @@ class MapContainerLayout @JvmOverloads constructor(
     override fun invokeOrderStatus(inOrder: Boolean) {
         super.invokeOrderStatus(inOrder)
         if (!inOrder) {// 订单结束
-            if (isScaled) {// 行程总览地图
-                overMapView.clearAllMarkersAndPolyline()
-            }
+            overMapView.clearAllMarkersAndPolyline()
         }
     }
 
@@ -167,9 +165,12 @@ class MapContainerLayout @JvmOverloads constructor(
                     overMapView.layoutParams =
                         (overMapView.layoutParams as LayoutParams).also { layoutParams ->
                             layoutParams.width = it.animatedValue as Int
-                            layoutParams.height = evaluator.evaluate(it.animatedFraction, mapMinHeight, mapMaxHeight)
-                            layoutParams.rightMargin = evaluator.evaluate(it.animatedFraction, maxMarginEnd, 0)
-                            layoutParams.bottomMargin = evaluator.evaluate(it.animatedFraction, maxMarginBottom, 0)
+                            layoutParams.height =
+                                evaluator.evaluate(it.animatedFraction, mapMinHeight, mapMaxHeight)
+                            layoutParams.rightMargin =
+                                evaluator.evaluate(it.animatedFraction, maxMarginEnd, 0)
+                            layoutParams.bottomMargin =
+                                evaluator.evaluate(it.animatedFraction, maxMarginBottom, 0)
                         }
                 }
                 zoomInAnimator?.interpolator = AccelerateDecelerateInterpolator()
@@ -184,9 +185,12 @@ class MapContainerLayout @JvmOverloads constructor(
                     overMapView.layoutParams =
                         (overMapView.layoutParams as LayoutParams).also { layoutParams ->
                             layoutParams.width = it.animatedValue as Int
-                            layoutParams.height = evaluator.evaluate(it.animatedFraction, mapMaxHeight, mapMinHeight)
-                            layoutParams.rightMargin = evaluator.evaluate(it.animatedFraction, 0, maxMarginEnd)
-                            layoutParams.bottomMargin = evaluator.evaluate(it.animatedFraction, 0, maxMarginBottom)
+                            layoutParams.height =
+                                evaluator.evaluate(it.animatedFraction, mapMaxHeight, mapMinHeight)
+                            layoutParams.rightMargin =
+                                evaluator.evaluate(it.animatedFraction, 0, maxMarginEnd)
+                            layoutParams.bottomMargin =
+                                evaluator.evaluate(it.animatedFraction, 0, maxMarginBottom)
                         }
                 }
                 zoomOutAnimator?.interpolator = AccelerateDecelerateInterpolator()