From b6bbbcc7dec57c42941218105ee25c73b53b8b37 Mon Sep 17 00:00:00 2001
From: renwj <renwenjie@zhidaoauto.com>
Date: Sun, 28 Apr 2024 15:08:01 +0800
Subject: [PATCH] =?UTF-8?q?[6.4.0][=E5=90=AF=E8=87=AA=E9=A9=BE=E6=8C=87?=
 =?UTF-8?q?=E5=BC=95]=20UI=E8=B5=B0=E6=9F=A5=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../status/ui/AutoPilotLaunchBeforeView.kt    |  5 ++-
 .../layout/layout_autopilot_launch_before.xml | 31 +++++++++----------
 2 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/ui/AutoPilotLaunchBeforeView.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/ui/AutoPilotLaunchBeforeView.kt
index a2ae7d1377..f49364708a 100644
--- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/ui/AutoPilotLaunchBeforeView.kt
+++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/ui/AutoPilotLaunchBeforeView.kt
@@ -48,9 +48,8 @@ class AutoPilotLaunchBeforeView: LinearLayout, IStatusListener {
     constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : super(context, attrs, defStyleAttr) {
         LayoutInflater.from(context).inflate(R.layout.layout_autopilot_launch_before, this, true)
         background = ContextCompat.getDrawable(context, R.drawable.icon_bg_autopilot_status)
-        clipChildren = false
-        clipToPadding = false
-        setPadding(AutoSizeUtils.dp2px(context, 29f), AutoSizeUtils.dp2px(context, 35f), AutoSizeUtils.dp2px(context, 30f), AutoSizeUtils.dp2px(context, 30f))
+        val padding = AutoSizeUtils.dp2px(context, 30f)
+        setPadding(padding, padding, padding, padding)
     }
 
 
diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/layout/layout_autopilot_launch_before.xml b/core/function-impl/mogo-core-function-devatools/src/main/res/layout/layout_autopilot_launch_before.xml
index 6481eaaa26..0cb89c7cfe 100644
--- a/core/function-impl/mogo-core-function-devatools/src/main/res/layout/layout_autopilot_launch_before.xml
+++ b/core/function-impl/mogo-core-function-devatools/src/main/res/layout/layout_autopilot_launch_before.xml
@@ -6,9 +6,9 @@
     tools:layout_height="@dimen/dp_269"
     tools:orientation="horizontal"
     tools:background="@drawable/icon_bg_autopilot_status"
-    tools:paddingTop="@dimen/dp_35"
+    tools:paddingTop="@dimen/dp_30"
     tools:paddingBottom="@dimen/dp_30"
-    tools:paddingStart="@dimen/dp_29"
+    tools:paddingStart="@dimen/dp_30"
     tools:paddingEnd="@dimen/dp_30"
     tools:clipToPadding="false"
     tools:clipChildren="false">
@@ -17,43 +17,44 @@
         android:id="@+id/speed_chart_parent"
         android:layout_width="@dimen/dp_184"
         android:layout_height="@dimen/dp_200"
-        android:gravity="center"
+        android:gravity="center_horizontal"
+        android:layout_gravity="center_vertical"
         android:orientation="vertical"
+        android:clipChildren="false"
+        android:clipToPadding="false"
         android:background="@drawable/icon_bg_speed">
         <TextView
             android:id="@+id/speed"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textSize="@dimen/dp_74"
+            android:layout_marginTop="@dimen/dp_20"
             android:textColor="@color/white"
             tools:text="65"
             android:fontFamily="@font/font_din"
-            android:text="0"
-            android:layout_marginBottom="@dimen/dp_2"/>
+            android:text="0" />
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textSize="@dimen/dp_32"
+            android:layout_marginTop="@dimen/dp_m_5"
             android:text="Km/h"
             android:textColor="@color/white"/>
     </LinearLayout>
 
     <LinearLayout
         android:layout_width="0dip"
-        android:layout_height="@dimen/dp_200"
+        android:layout_height="wrap_content"
         android:layout_weight="1"
         android:orientation="vertical"
-        android:gravity="center_vertical"
-        android:paddingEnd="@dimen/dp_34"
-        android:clipChildren="false"
-        android:clipToPadding="false">
+        android:layout_marginTop="@dimen/dp_5"
+        android:paddingStart="@dimen/dp_34">
 
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
-            android:layout_marginStart="@dimen/dp_34"
-            android:layout_marginTop="@dimen/dp_10"
+            android:layout_marginTop="@dimen/dp_30"
             android:background="@drawable/bg_geer_position"
             android:paddingStart="@dimen/dp_53"
             android:paddingEnd="@dimen/dp_53"
@@ -107,12 +108,8 @@
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_34"
             android:gravity="center_vertical"
-            android:layout_marginTop="@dimen/dp_23"
-            android:paddingEnd="-20dp"
-            android:clipToPadding="false"
-            android:clipChildren="false">
+            android:layout_marginTop="@dimen/dp_23">
 
             <ImageView
                 android:id="@+id/iv_steer"