From 4fccb7743cdec9fccba9d0170f4651db2b6fa390 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Wed, 13 Nov 2024 11:21:58 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[6.7.3]=20[fix]=20[=E9=AB=98=E5=BA=A6?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/layout/shuttle_weak_base_fragment.xml | 2 +- OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml | 2 +- .../src/main/res/layout/unmanned_taxi_base_fragment.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_base_fragment.xml b/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_base_fragment.xml index c06ce1320a..ca6121f7c8 100644 --- a/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_base_fragment.xml +++ b/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_base_fragment.xml @@ -7,7 +7,7 @@ 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 0122d3af7d..a71da62b6f 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 @@ -7,7 +7,7 @@ diff --git a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_base_fragment.xml b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_base_fragment.xml index da0470911f..85d7e6d4f1 100644 --- a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_base_fragment.xml +++ b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_base_fragment.xml @@ -8,7 +8,7 @@ From f5a229c1f3a58f12ee1069a1d8e9441dd36587b7 Mon Sep 17 00:00:00 2001 From: donghongyu-pc Date: Fri, 15 Nov 2024 16:13:51 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[6.7.2]=201=E3=80=81=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=96=B0=E7=89=88=E6=9C=AC=E7=9A=84Pad=E5=B1=8F=E5=B9=95?= =?UTF-8?q?=E9=80=82=E9=85=8D=E5=8F=B3=E4=B8=8B=E8=A7=92=E5=B0=8F=E5=9C=B0?= =?UTF-8?q?=E5=9B=BE=E6=98=BE=E7=A4=BA=E8=B4=B4=E8=BE=B9=20=E6=97=A7?= =?UTF-8?q?=E6=AC=BE=EF=BC=9ALenovo=20TB-J706F=20=20=20=201600*2560=20?= =?UTF-8?q?=E6=96=B0=E6=AC=BE=EF=BC=9ATB138FC=20=20=20=201536*2560?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/function/hmi/map/MapContainerLayout.kt | 10 ++++++++++ .../src/main/res/layout/view_map_container.xml | 12 ++++++------ 2 files changed, 16 insertions(+), 6 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 6d508bcc45..e24cc16dc4 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 @@ -12,6 +12,8 @@ import android.view.LayoutInflater import android.view.View import android.view.animation.AccelerateDecelerateInterpolator import androidx.constraintlayout.widget.ConstraintLayout +import androidx.core.view.marginBottom +import androidx.core.view.marginEnd import androidx.core.view.marginStart import androidx.core.view.marginTop import com.mogo.eagle.core.data.config.FunctionBuildConfig @@ -44,6 +46,8 @@ class MapContainerLayout @JvmOverloads constructor( private var mapMaxHeight = 0 private var maxMarginStart = 0 private var maxMarginTop = 0 + private var maxMarginEnd = 0 + private var maxMarginBottom = 0 private var zoomInAnimator: ValueAnimator? = null private var zoomOutAnimator: ValueAnimator? = null @@ -102,6 +106,8 @@ class MapContainerLayout @JvmOverloads constructor( mapMinHeight = overMapView.height maxMarginStart = overMapView.marginStart maxMarginTop = overMapView.marginTop + maxMarginEnd = overMapView.marginEnd + maxMarginBottom = overMapView.marginBottom } override fun onAttachedToWindow() { @@ -164,6 +170,8 @@ class MapContainerLayout @JvmOverloads constructor( layoutParams.height = evaluator.evaluate(it.animatedFraction, mapMinHeight, mapMaxHeight) layoutParams.leftMargin = evaluator.evaluate(it.animatedFraction, maxMarginStart, 0) layoutParams.topMargin = evaluator.evaluate(it.animatedFraction, maxMarginTop, 0) + layoutParams.rightMargin = evaluator.evaluate(it.animatedFraction, maxMarginEnd, 0) + layoutParams.bottomMargin = evaluator.evaluate(it.animatedFraction, maxMarginBottom, 0) } } zoomInAnimator?.interpolator = AccelerateDecelerateInterpolator() @@ -181,6 +189,8 @@ class MapContainerLayout @JvmOverloads constructor( layoutParams.height = evaluator.evaluate(it.animatedFraction, mapMaxHeight, mapMinHeight) layoutParams.leftMargin = evaluator.evaluate(it.animatedFraction, 0, maxMarginStart) layoutParams.topMargin = evaluator.evaluate(it.animatedFraction, 0, maxMarginTop) + layoutParams.rightMargin = evaluator.evaluate(it.animatedFraction, 0, maxMarginEnd) + layoutParams.bottomMargin = evaluator.evaluate(it.animatedFraction, 0, maxMarginBottom) } } zoomOutAnimator?.interpolator = AccelerateDecelerateInterpolator() 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 71e98b3e88..7551ca0d15 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 @@ -23,21 +23,21 @@ android:id="@+id/overMapView" android:layout_width="270dp" android:layout_height="270dp" - android:layout_marginStart="1530dp" - android:layout_marginTop="1204dp" + android:layout_marginEnd="40dp" + android:layout_marginBottom="40dp" + android:focusable="false" + android:focusableInTouchMode="false" app:bottomPadding="160" app:compassDrawable="@drawable/taxt_u_p_map_car_light" app:endPointDrawable="@drawable/taxi_overmap_endpoint" app:globalPathColor="#39BA90" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" app:leftPadding="70" app:mapStyleExtraPath="over_view_style_extra.data" app:mapStylePath="over_view_style.data" app:resetDrawable="@null" app:rightPadding="70" - android:focusable="false" - android:focusableInTouchMode="false" app:roadRangeDrawable="@drawable/taxi_overmap_road_range" app:roadTrajectoryDrawable="@drawable/taxi_orvermap_road_trajectory" app:startPointDrawable="@drawable/taxi_overmap_startpoint"