From 30bdf3bd7e9d96ed9b3ce16d95718290d0c61e23 Mon Sep 17 00:00:00 2001 From: renwj Date: Wed, 25 Sep 2024 18:12:05 +0800 Subject: [PATCH] =?UTF-8?q?[6.7.0][=E8=98=91=E6=96=B9=E6=8C=89=E9=94=AE?= =?UTF-8?q?=E7=8A=B6=E6=80=81/=E8=A7=86=E8=A7=92=E5=88=87=E6=8D=A2]=20?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/eagle/core/function/hmi/map/MapContainerLayout.kt | 6 ++++++ .../src/main/res/layout/view_map_container.xml | 6 ++++-- 2 files changed, 10 insertions(+), 2 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 e5c73749d6..722d9bf66e 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 @@ -22,6 +22,7 @@ import kotlinx.android.synthetic.main.view_map_container.view.mapBizView import kotlinx.android.synthetic.main.view_map_container.view.overMapView import kotlinx.android.synthetic.main.view_map_container.view.parentLayout import kotlinx.android.synthetic.main.view_map_container.view.shadowView +import kotlinx.android.synthetic.main.view_map_container.view.visualAngleToggle class MapContainerLayout @JvmOverloads constructor( context: Context, @@ -137,6 +138,11 @@ class MapContainerLayout @JvmOverloads constructor( overMapView.swapSettings() updateShadowBg(isScaled) isScaled = !isScaled + if (isScaled) { + visualAngleToggle?.takeIf { it.visibility == View.VISIBLE }?.visibility = View.GONE + } else { + visualAngleToggle?.takeIf { it.visibility != View.VISIBLE }?.visibility = View.VISIBLE + } } override fun onTransitionCancel(transition: Transition?) { 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 e2f9c0ecd5..3752736a64 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 @@ -53,8 +53,10 @@ android:id="@+id/mofangStatusView" android:layout_width="wrap_content" android:layout_height="wrap_content" - app:layout_constraintEnd_toStartOf="@+id/visualAngleToggle" - app:layout_constraintTop_toTopOf="@+id/visualAngleToggle" /> + app:layout_goneMarginEnd="@dimen/dp_50" + android:layout_marginBottom="@dimen/dp_30" + app:layout_constraintBottom_toTopOf="@+id/shadowView" + app:layout_constraintEnd_toStartOf="@+id/visualAngleToggle" />