From a79e7e6ee45cf9588c2422846fa9cfc3e5142916 Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Sat, 19 Mar 2022 21:28:19 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9A=90=E8=97=8F=E8=BD=A6=E8=BE=86=E8=87=AA?=
 =?UTF-8?q?=E6=A3=80=E5=85=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/res/layout/view_auto_pilot_check.xml | 185 ++++++++++--------
 1 file changed, 105 insertions(+), 80 deletions(-)

diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_auto_pilot_check.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_auto_pilot_check.xml
index a0314a6569..4d4bec61b1 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_auto_pilot_check.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_auto_pilot_check.xml
@@ -9,10 +9,10 @@
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintRight_toRightOf="parent">
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
@@ -27,6 +27,96 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/checkLayout"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/dp_216"
+                android:layout_marginTop="@dimen/dp_266"
+                android:orientation="horizontal"
+                app:layout_constraintTop_toTopOf="parent">
+
+                <RelativeLayout
+                    android:id="@+id/check"
+                    android:layout_width="0px"
+                    android:layout_height="wrap_content"
+                    app:layout_constraintEnd_toStartOf="@+id/debug"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    android:visibility="gone">
+
+                    <com.mogo.eagle.core.function.hmi.ui.widget.CheckStatusView
+                        android:id="@+id/viewCheckStatus"
+                        android:layout_width="150px"
+                        android:layout_height="150px"
+                        android:layout_centerHorizontal="true" />
+
+                    <TextView
+                        android:id="@+id/tvCheck"
+                        android:layout_width="wrap_content"
+                        android:layout_height="42px"
+                        android:layout_alignParentBottom="true"
+                        android:layout_centerHorizontal="true"
+                        android:text="@string/check_vehicle_detection"
+                        android:textColor="@color/color_FFA7B6F0"
+                        android:textSize="32px" />
+                </RelativeLayout>
+
+                <RelativeLayout
+                    android:id="@+id/debug"
+                    android:layout_width="0px"
+                    android:layout_height="wrap_content"
+                    app:layout_constraintEnd_toStartOf="@+id/feedback"
+                    app:layout_constraintStart_toEndOf="@+id/check"
+                    app:layout_constraintTop_toTopOf="parent">
+
+                    <ImageView
+                        android:id="@+id/ivDebugPanel"
+                        android:layout_width="150px"
+                        android:layout_height="150px"
+                        android:layout_centerHorizontal="true"
+                        android:background="@drawable/debug_icon_nor" />
+
+                    <TextView
+                        android:id="@+id/tvDebug"
+                        android:layout_width="wrap_content"
+                        android:layout_height="42px"
+                        android:layout_alignParentBottom="true"
+                        android:layout_centerHorizontal="true"
+                        android:text="@string/debug_panel"
+                        android:textColor="@color/color_FFA7B6F0"
+                        android:textSize="32px" />
+                </RelativeLayout>
+
+                <RelativeLayout
+                    android:id="@+id/feedback"
+                    android:layout_width="0px"
+                    android:layout_height="wrap_content"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@+id/debug"
+                    app:layout_constraintTop_toTopOf="parent">
+
+                    <ImageView
+                        android:id="@+id/ivDebugFeedback"
+                        android:layout_width="150px"
+                        android:layout_height="150px"
+                        android:layout_centerHorizontal="true"
+                        android:background="@drawable/debug_icon_feedback" />
+
+                    <TextView
+                        android:id="@+id/tvDebugFeedback"
+                        android:layout_width="wrap_content"
+                        android:layout_height="42px"
+                        android:layout_alignParentBottom="true"
+                        android:layout_centerHorizontal="true"
+                        android:layout_marginTop="23px"
+                        android:text="@string/debug_panel_fb"
+                        android:textColor="@color/color_FFA7B6F0"
+                        android:textSize="32px" />
+
+                </RelativeLayout>
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
             <TextView
                 android:layout_width="84px"
                 android:layout_height="86px"
@@ -39,69 +129,6 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
-            <com.mogo.eagle.core.function.hmi.ui.widget.CheckStatusView
-                android:id="@+id/viewCheckStatus"
-                android:layout_width="150px"
-                android:layout_height="150px"
-                android:layout_marginStart="113px"
-                android:layout_marginTop="266px"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-
-            <TextView
-                android:id="@+id/tvCheck"
-                android:layout_width="128px"
-                android:layout_height="42px"
-                android:layout_marginStart="124px"
-                android:layout_marginTop="23px"
-                android:text="@string/check_vehicle_detection"
-                android:textColor="@color/color_FFA7B6F0"
-                android:textSize="32px"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/viewCheckStatus" />
-
-            <ImageView
-                android:id="@+id/ivDebugPanel"
-                android:layout_width="150px"
-                android:layout_height="150px"
-                android:background="@drawable/debug_icon_nor"
-                app:layout_constraintStart_toEndOf="@id/viewCheckStatus"
-                app:layout_constraintTop_toTopOf="@id/viewCheckStatus"
-                android:layout_marginStart="142px" />
-
-            <TextView
-                android:id="@+id/tvDebug"
-                android:layout_width="128px"
-                android:layout_height="42px"
-                android:layout_marginStart="416px"
-                android:layout_marginTop="23px"
-                android:text="@string/debug_panel"
-                android:textColor="@color/color_FFA7B6F0"
-                android:textSize="32px"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/ivDebugPanel" />
-
-            <ImageView
-                android:id="@+id/ivDebugFeedback"
-                android:layout_width="150px"
-                android:layout_height="150px"
-                android:background="@drawable/debug_icon_feedback"
-                app:layout_constraintStart_toEndOf="@id/ivDebugPanel"
-                app:layout_constraintTop_toTopOf="@id/viewCheckStatus"
-                android:layout_marginStart="142px" />
-
-            <TextView
-                android:id="@+id/tvDebugFeedback"
-                android:layout_width="128px"
-                android:layout_height="42px"
-                android:layout_marginStart="740px"
-                android:layout_marginTop="23px"
-                android:text="@string/debug_panel_fb"
-                android:textColor="@color/color_FFA7B6F0"
-                android:textSize="32px"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/ivDebugFeedback" />
-
             <View
                 android:layout_width="14px"
                 android:layout_height="50px"
@@ -109,7 +136,7 @@
                 android:layout_marginTop="94px"
                 android:background="@color/color_FF2966EC"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/tvCheck" />
+                app:layout_constraintTop_toBottomOf="@id/checkLayout" />
 
             <TextView
                 android:id="@+id/tvSpeedTitle"
@@ -122,7 +149,7 @@
                 android:textColor="@color/color_FFFFFF"
                 android:textSize="42px"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/tvCheck" />
+                app:layout_constraintTop_toBottomOf="@id/checkLayout" />
 
             <androidx.appcompat.widget.LinearLayoutCompat
                 android:id="@+id/llSpeedPosition"
@@ -166,9 +193,9 @@
                 android:layout_marginStart="80px"
                 android:layout_marginTop="94px"
                 android:background="@color/color_FF2966EC"
+                android:visibility="gone"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/llSpeedPosition"
-                android:visibility="gone"/>
+                app:layout_constraintTop_toBottomOf="@id/llSpeedPosition" />
 
             <TextView
                 android:id="@+id/tvSystemOperation"
@@ -180,18 +207,18 @@
                 android:text="@string/check_system_operation"
                 android:textColor="@color/color_FFFFFF"
                 android:textSize="42px"
+                android:visibility="gone"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/llSpeedPosition"
-                android:visibility="gone"/>
+                app:layout_constraintTop_toBottomOf="@id/llSpeedPosition" />
 
             <com.mogo.eagle.core.function.hmi.ui.widget.CheckSystemView
                 android:id="@+id/checkSystemView"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="40px"
+                android:visibility="gone"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/tvSystemOperation"
-                android:visibility="gone"/>
+                app:layout_constraintTop_toBottomOf="@id/tvSystemOperation" />
 
             <View
                 android:id="@+id/viewSystemVersion"
@@ -207,15 +234,14 @@
                 android:id="@+id/tvSystemVersion"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginStart="113px"
                 android:gravity="center"
                 android:text="@string/check_system_version"
                 android:textColor="@color/color_FFFFFF"
                 android:textSize="42px"
-                app:layout_constraintTop_toTopOf="@id/viewSystemVersion"
                 app:layout_constraintBottom_toBottomOf="@id/viewSystemVersion"
                 app:layout_constraintLeft_toLeftOf="parent"
-                android:layout_marginStart="113px"
-                />
+                app:layout_constraintTop_toTopOf="@id/viewSystemVersion" />
 
             <com.mogo.eagle.core.function.hmi.ui.widget.SystemVersionView
                 android:id="@+id/systemVersionView"
@@ -223,10 +249,9 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="40px"
                 android:layout_marginBottom="40px"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/viewSystemVersion"
                 app:layout_constraintBottom_toBottomOf="parent"
-                />
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/viewSystemVersion" />
 
             <com.mogo.eagle.core.function.hmi.ui.tools.SpeedKeyboardView
                 android:id="@+id/sKeyBoardView"