From 2372ecb31df78784ba4c3a51245ac4946f381e1c Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Tue, 30 Apr 2024 16:18:12 +0800
Subject: [PATCH] =?UTF-8?q?[6.4.0]=20[=E8=87=AA=E4=B8=BB=E7=AE=97=E8=B7=AF?=
 =?UTF-8?q?UI=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/routing_fragment.xml  | 35 ++++++++-----------
 1 file changed, 14 insertions(+), 21 deletions(-)

diff --git a/OCH/taxi/unmanned-driver/src/main/res/layout/routing_fragment.xml b/OCH/taxi/unmanned-driver/src/main/res/layout/routing_fragment.xml
index fb9ef5ed94..1b3da3fcee 100644
--- a/OCH/taxi/unmanned-driver/src/main/res/layout/routing_fragment.xml
+++ b/OCH/taxi/unmanned-driver/src/main/res/layout/routing_fragment.xml
@@ -2,9 +2,13 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="@dimen/module_och_taxi_panel_width"
-    android:layout_height="@dimen/taxi_routing_verify_view_height"
-    android:background="@drawable/taxi_routing_bg"
+    android:layout_width="@dimen/dp_618"
+    android:layout_height="@dimen/dp_960"
+    android:paddingTop="@dimen/dp_26"
+    android:paddingBottom="@dimen/dp_32"
+    android:paddingStart="@dimen/dp_29"
+    android:paddingEnd="@dimen/dp_29"
+    android:background="@drawable/taxi_order_bg"
     app:layout_constraintLeft_toLeftOf="parent"
     app:layout_constraintTop_toTopOf="parent">
 
@@ -21,7 +25,7 @@
             android:id="@+id/taskTitleTv"
             android:layout_width="@dimen/dp_420"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/dp_45"
+            android:layout_marginTop="@dimen/dp_35"
             android:ellipsize="marquee"
             android:marqueeRepeatLimit="marquee_forever"
             android:singleLine="true"
@@ -31,17 +35,6 @@
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
-
-        <View
-            android:id="@+id/module_och_taxi_order_status_divider"
-            android:layout_width="match_parent"
-            android:layout_height="4dp"
-            android:layout_marginTop="@dimen/dp_45"
-            android:background="@drawable/taxi_line_bg1"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/taskTitleTv"
-            app:layout_constraintBottom_toBottomOf="parent"/>
     </androidx.constraintlayout.widget.ConstraintLayout>
 
     <androidx.constraintlayout.widget.ConstraintLayout
@@ -63,7 +56,7 @@
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/btnChooseTask"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/dp_132"
+                android:layout_height="@dimen/dp_116"
                 android:background="@drawable/routing_click_btn_bg"
                 android:gravity="center"
                 android:text="@string/routing_verify_btn_choose_task"
@@ -75,7 +68,7 @@
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/btnStartTask"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/dp_132"
+                android:layout_height="@dimen/dp_116"
                 android:background="@drawable/routing_click_btn_bg"
                 android:gravity="center"
                 android:text="@string/routing_verify_btn_start_task"
@@ -221,8 +214,8 @@
 
             <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/startPoint"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_width="@dimen/dp_38"
+                android:layout_height="@dimen/dp_38"
                 android:src="@drawable/taxi_driver_circle_green_big"
                 app:layout_constraintBottom_toBottomOf="@+id/startStationName"
                 app:layout_constraintLeft_toLeftOf="@+id/taskHintTextView"
@@ -241,8 +234,8 @@
 
             <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/endPoint"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_width="@dimen/dp_38"
+                android:layout_height="@dimen/dp_38"
                 android:src="@drawable/taxi_driver_circle_blue_big"
                 app:layout_constraintBottom_toBottomOf="@+id/endStationName"
                 app:layout_constraintLeft_toLeftOf="@+id/taskHintTextView"