From 8dec76ca14ac0c4d08ccebe29efe16380f5747d4 Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Tue, 10 May 2022 17:31:22 +0800
Subject: [PATCH] =?UTF-8?q?taxi=E4=B9=98=E5=AE=A2=E5=B1=8F=E6=96=B9?=
 =?UTF-8?q?=E5=90=91=E7=9B=98=E9=83=A8=E5=88=86UI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/res/layout/taxi_p_base_fragment.xml  | 68 +++++++++++--------
 1 file changed, 41 insertions(+), 27 deletions(-)

diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml
index 034b5d4f97..05706dd341 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml
@@ -6,28 +6,40 @@
     android:layout_height="match_parent"
     android:layout_marginTop="@dimen/dp_72">
 
-        <ImageView
-            android:id="@+id/module_och_autopilot_iv"
-            android:layout_width="@dimen/module_mogo_och_operation_status_bg_width"
-            android:layout_height="@dimen/module_mogo_och_operation_status_bg_height"
-            android:layout_marginLeft="40px"
-            android:layout_marginTop="48px"
-            android:scaleType="fitXY"
-            android:layout_gravity="center_horizontal"
-            android:src="@drawable/taxi_p_un_auto_nor"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintTop_toTopOf="parent"/>
+    <com.mogo.eagle.core.function.hmi.ui.widget.SteeringWheelView
+        android:id="@+id/steering_wheel"
+        android:layout_width="@dimen/dp_630"
+        android:layout_height="@dimen/dp_630"
+        android:layout_marginLeft="-59px"
+        android:layout_marginTop="@dimen/dp_20"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
-        <ImageView
-            android:id="@+id/module_och_taxi_swich_map_iv"
-            android:layout_width="@dimen/module_mogo_och_operation_status_bg_width"
-            android:layout_height="@dimen/module_mogo_och_operation_status_bg_height"
-            android:layout_marginTop="40px"
-            android:layout_gravity="center"
-            android:scaleType="fitXY"
-            app:layout_constraintTop_toBottomOf="@+id/module_och_autopilot_iv"
-            app:layout_constraintLeft_toLeftOf="@+id/module_och_autopilot_iv"
-            android:background="@drawable/taxi_p_switch_map_bg" />
+    <ImageView
+        android:id="@+id/module_och_autopilot_iv"
+        android:layout_width="@dimen/module_mogo_och_operation_status_bg_width"
+        android:layout_height="@dimen/module_mogo_och_operation_status_bg_height"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginLeft="40px"
+        android:layout_marginTop="48px"
+        android:scaleType="fitXY"
+        android:src="@drawable/taxi_p_un_auto_nor"
+        android:visibility="gone"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <ImageView
+        android:id="@+id/module_och_taxi_swich_map_iv"
+        android:layout_width="@dimen/module_mogo_och_operation_status_bg_width"
+        android:layout_height="@dimen/module_mogo_och_operation_status_bg_height"
+        android:layout_gravity="center"
+        android:layout_marginLeft="40px"
+        android:layout_marginTop="40px"
+        android:layout_marginBottom="@dimen/dp_50"
+        android:background="@drawable/taxi_p_switch_map_bg"
+        android:scaleType="fitXY"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent" />
 
     <ImageView
         android:layout_width="300px"
@@ -36,8 +48,9 @@
         android:layout_marginLeft="@dimen/dp_40"
         android:layout_marginBottom="@dimen/dp_40"
         android:background="@drawable/taxi_p_mogologo_nor"
+        android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"/>
+        app:layout_constraintLeft_toLeftOf="parent" />
 
     <Button
         android:id="@+id/btnAutopilotDisable"
@@ -96,6 +109,7 @@
         android:visibility="gone"
         app:constraint_referenced_ids="btnAutopilotArrive,btnAutopilotDisable,btnAutopilotEnable,btnAutopilotRunning,btnAutopilotControl"
         tools:visibility="gone" />
+
     <FrameLayout
         android:id="@+id/module_mogo_och_navi_panel_container"
         android:layout_width="wrap_content"
@@ -103,16 +117,16 @@
         android:layout_marginTop="@dimen/dp_120"
         android:layout_marginRight="@dimen/dp_10"
         app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent"/>
+        app:layout_constraintTop_toTopOf="parent" />
 
     <com.mogo.och.taxi.passenger.ui.TaxiPassengerTrafficLightView
         android:id="@+id/traffic_light_view"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        android:layout_marginRight="@dimen/taxi_p_traffic_light_layout_margin_right"
         android:layout_marginTop="@dimen/taxi_p_traffic_light_layout_margin_top"
-        android:visibility="gone"/>
+        android:layout_marginRight="@dimen/taxi_p_traffic_light_layout_margin_right"
+        android:visibility="gone"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file