From 8135f4a618b31203e263158f58d5f1a3ad20997e Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Wed, 9 Aug 2023 15:06:22 +0800
Subject: [PATCH] =?UTF-8?q?[5.0.0]=20[=E8=BD=A6=E9=97=A8=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../layout/taxi_p_start_autopilot_view.xml    | 24 ++++++++++------
 .../layout/taxi_p_start_autopilot_view.xml    | 28 ++++++++++++-------
 2 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/OCH/taxi/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_start_autopilot_view.xml b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_start_autopilot_view.xml
index 8390992694..5969d33c65 100644
--- a/OCH/taxi/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_start_autopilot_view.xml
+++ b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_start_autopilot_view.xml
@@ -155,12 +155,20 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>
 
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/gl_horizontal_center"
+        android:orientation="horizontal"
+        app:layout_constraintGuide_percent="0.5"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
+
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/actv_front_right_door"
         android:gravity="center"
         android:visibility="gone"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/gl_horizontal_center"
+        app:layout_constraintBottom_toBottomOf="@+id/gl_horizontal_center"
         app:layout_constraintStart_toStartOf="@+id/gl_vertical_center"
         android:layout_marginStart="@dimen/dp_106"
         android:text="右前车门未关"
@@ -174,8 +182,8 @@
         android:id="@+id/actv_front_left_door"
         android:gravity="center"
         android:visibility="gone"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/gl_horizontal_center"
+        app:layout_constraintBottom_toBottomOf="@+id/gl_horizontal_center"
         app:layout_constraintEnd_toStartOf="@+id/gl_vertical_center"
         android:layout_marginEnd="@dimen/dp_106"
         android:text="左前车门未关"
@@ -191,9 +199,9 @@
         android:gravity="center"
         android:visibility="gone"
         app:layout_constraintEnd_toStartOf="@+id/gl_vertical_center"
-        app:layout_constraintTop_toBottomOf="@+id/actv_front_left_door"
+        app:layout_constraintTop_toBottomOf="@+id/gl_horizontal_center"
         android:layout_marginEnd="@dimen/dp_135"
-        android:layout_marginTop="@dimen/dp_87"
+        android:layout_marginTop="@dimen/dp_142"
         android:text="左后车门未关"
         android:textSize="@dimen/dp_35"
         android:textColor="@color/taxi_p_2B364B"
@@ -206,9 +214,9 @@
         android:gravity="center"
         android:visibility="gone"
         app:layout_constraintStart_toEndOf="@+id/gl_vertical_center"
-        app:layout_constraintTop_toBottomOf="@+id/actv_front_left_door"
+        app:layout_constraintTop_toBottomOf="@+id/gl_horizontal_center"
         android:layout_marginStart="@dimen/dp_135"
-        android:layout_marginTop="@dimen/dp_87"
+        android:layout_marginTop="@dimen/dp_142"
         android:text="右后车门未关"
         android:textSize="@dimen/dp_35"
         android:textColor="@color/taxi_p_2B364B"
diff --git a/OCH/taxi/taxi-unmanned-passenger/src/main/res/layout/taxi_p_start_autopilot_view.xml b/OCH/taxi/taxi-unmanned-passenger/src/main/res/layout/taxi_p_start_autopilot_view.xml
index 8390992694..e113fef32b 100644
--- a/OCH/taxi/taxi-unmanned-passenger/src/main/res/layout/taxi_p_start_autopilot_view.xml
+++ b/OCH/taxi/taxi-unmanned-passenger/src/main/res/layout/taxi_p_start_autopilot_view.xml
@@ -54,7 +54,7 @@
         app:layout_constraintLeft_toLeftOf="@+id/taxi_p_autopilot_btn_bg"
         app:layout_constraintRight_toRightOf="@+id/taxi_p_autopilot_btn_bg" />
 
-    
+
     <View
         app:layout_constraintBottom_toBottomOf="parent"
         android:background="@drawable/taxi_p_start_autopilot_bottom_bg"
@@ -73,7 +73,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>
 
-    
+
     <View
         android:id="@+id/v_xiaozhi_belt_info_bg"
         app:layout_constraintBottom_toTopOf="@+id/iv_xiaozhi_belt"
@@ -155,12 +155,20 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>
 
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/gl_horizontal_center"
+        android:orientation="horizontal"
+        app:layout_constraintGuide_percent="0.5"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
+
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/actv_front_right_door"
         android:gravity="center"
         android:visibility="gone"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/gl_horizontal_center"
+        app:layout_constraintBottom_toBottomOf="@+id/gl_horizontal_center"
         app:layout_constraintStart_toStartOf="@+id/gl_vertical_center"
         android:layout_marginStart="@dimen/dp_106"
         android:text="右前车门未关"
@@ -174,8 +182,8 @@
         android:id="@+id/actv_front_left_door"
         android:gravity="center"
         android:visibility="gone"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/gl_horizontal_center"
+        app:layout_constraintBottom_toBottomOf="@+id/gl_horizontal_center"
         app:layout_constraintEnd_toStartOf="@+id/gl_vertical_center"
         android:layout_marginEnd="@dimen/dp_106"
         android:text="左前车门未关"
@@ -191,9 +199,9 @@
         android:gravity="center"
         android:visibility="gone"
         app:layout_constraintEnd_toStartOf="@+id/gl_vertical_center"
-        app:layout_constraintTop_toBottomOf="@+id/actv_front_left_door"
+        app:layout_constraintTop_toBottomOf="@+id/gl_horizontal_center"
         android:layout_marginEnd="@dimen/dp_135"
-        android:layout_marginTop="@dimen/dp_87"
+        android:layout_marginTop="@dimen/dp_142"
         android:text="左后车门未关"
         android:textSize="@dimen/dp_35"
         android:textColor="@color/taxi_p_2B364B"
@@ -206,9 +214,9 @@
         android:gravity="center"
         android:visibility="gone"
         app:layout_constraintStart_toEndOf="@+id/gl_vertical_center"
-        app:layout_constraintTop_toBottomOf="@+id/actv_front_left_door"
+        app:layout_constraintTop_toBottomOf="@+id/gl_horizontal_center"
         android:layout_marginStart="@dimen/dp_135"
-        android:layout_marginTop="@dimen/dp_87"
+        android:layout_marginTop="@dimen/dp_142"
         android:text="右后车门未关"
         android:textSize="@dimen/dp_35"
         android:textColor="@color/taxi_p_2B364B"