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()