diff --git a/OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml b/OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml index 070c68db47..e5878e724a 100644 --- a/OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml +++ b/OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml @@ -398,8 +398,8 @@ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/map/ExchangeChildLayout.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/map/ExchangeChildLayout.kt index 9f461f9006..25f6cd0136 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/map/ExchangeChildLayout.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/map/ExchangeChildLayout.kt @@ -134,8 +134,8 @@ class ExchangeChildLayout @JvmOverloads constructor( txPro = PropertyValuesHolder.ofFloat("translationX", 0f, bottomX - topX - minWidth * (1 - tScaleX) / 2) tyPro = PropertyValuesHolder.ofFloat("translationY", 0f, bottomY - topY - minHeight * (1 - tScaleY) / 2) - tWidthPro = PropertyValuesHolder.ofFloat("scaleX", 1f, tScaleX/1.5f) - tHeightPro = PropertyValuesHolder.ofFloat("scaleY", 1f, tScaleY/1.5f) + tWidthPro = PropertyValuesHolder.ofFloat("scaleX", 1f, tScaleX/2f) + tHeightPro = PropertyValuesHolder.ofFloat("scaleY", 1f, tScaleY/2f) alphaPro = PropertyValuesHolder.ofFloat("alpha", 1f, 0.1f) tOA = ObjectAnimator.ofPropertyValuesHolder(topView, tWidthPro, tHeightPro, txPro, tyPro, alphaPro) } else { @@ -147,8 +147,8 @@ class ExchangeChildLayout @JvmOverloads constructor( txPro = PropertyValuesHolder.ofFloat("translationX", 0f, bottomX - topX - minWidth * (1 - tScaleX) / 2) tyPro = PropertyValuesHolder.ofFloat("translationY", 0f, bottomY - topY - minHeight * (1 - tScaleY) / 2) - tWidthPro = PropertyValuesHolder.ofFloat("scaleX", 1f, tScaleX/1.5f) - tHeightPro = PropertyValuesHolder.ofFloat("scaleY", 1f, tScaleY/1.5f) + tWidthPro = PropertyValuesHolder.ofFloat("scaleX", 1f, tScaleX/2f) + tHeightPro = PropertyValuesHolder.ofFloat("scaleY", 1f, tScaleY/2f) alphaPro = PropertyValuesHolder.ofFloat("alpha", 1f, 0.1f) tOA = ObjectAnimator.ofPropertyValuesHolder(bottomView, tWidthPro, tHeightPro, txPro, tyPro, alphaPro) 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 9b47dfafff..88d798552d 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 @@ -81,6 +81,7 @@ class MapContainerLayout @JvmOverloads constructor( overMapView.setOnGestureListener(object : TravelRealityView.OnGestureListener { override fun onSingleTap(lng: Float, lat: Float) { if (!exchangeLayout.getSwapFlag()) { + overMapView.setMapFlag(false) exchangeLayout.swapViews() } } @@ -90,6 +91,7 @@ class MapContainerLayout @JvmOverloads constructor( override fun onMapClick(latLng: MogoLatLng?) { super.onMapClick(latLng) if (exchangeLayout.getSwapFlag()) { + overMapView.setMapFlag(true) exchangeLayout.swapViews() } } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_map_container.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_map_container.xml index 5617a6b5d7..9f351d46ad 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_map_container.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_map_container.xml @@ -2,8 +2,8 @@