From 067e243a6be96a81e369fcaadec820599faa05b6 Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Thu, 7 Jul 2022 19:28:14 +0800
Subject: [PATCH] =?UTF-8?q?[Taxi-d=20280,=20Taxi-p=20130]=20taxi=E5=8F=B8?=
 =?UTF-8?q?=E6=9C=BA=E7=AB=AF=E8=AE=A2=E5=8D=95UI=E5=A4=9A=E8=A1=8C?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/res/values/strings.xml           |  2 +-
 .../src/main/res/layout/taxi_being_order.xml  | 22 +++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/values/strings.xml b/OCH/mogo-och-taxi-passenger/src/main/res/values/strings.xml
index d32780d49a..7529f670e4 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/res/values/strings.xml
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/values/strings.xml
@@ -28,7 +28,7 @@
 
     <string name="taxi_p_check_hello_small_text">欢迎体验MOGO自动驾驶出租车</string>
     <string name="taxi_p_check_hello_text">Hello，您好</string>
-    <string name="taxi_p_check_input_phone_tail_title">请输出手机号后4位:</string>
+    <string name="taxi_p_check_input_phone_tail_title">请输入手机号后4位:</string>
     <string name="taxi_p_check_small_mogo">小蘑菇</string>
     <string name="tv_delete">删除</string>
     
diff --git a/OCH/mogo-och-taxi/src/main/res/layout/taxi_being_order.xml b/OCH/mogo-och-taxi/src/main/res/layout/taxi_being_order.xml
index cb652413ae..285701fa67 100644
--- a/OCH/mogo-och-taxi/src/main/res/layout/taxi_being_order.xml
+++ b/OCH/mogo-och-taxi/src/main/res/layout/taxi_being_order.xml
@@ -23,7 +23,7 @@
             android:layout_width="wrap_content"
             android:layout_height="56px"
             android:layout_marginLeft="40px"
-            android:layout_marginTop="52px"
+            android:layout_marginTop="42px"
             android:gravity="center_vertical"
             android:text="前往乘客上车点"
             android:textColor="@color/taxi_order_status_textColor"
@@ -56,7 +56,7 @@
                 android:id="@+id/module_och_taxi_order_station_title_2"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="200px"
+                android:layout_marginTop="210px"
                 android:textColor="#CAD6FF"
                 android:textSize="17sp"
                 app:layout_constraintLeft_toLeftOf="parent"
@@ -82,7 +82,7 @@
                 android:id="@+id/module_och_taxi_order_distance_anchor_2"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="278px"
+                android:layout_marginBottom="264px"
                 android:inputType="textMultiLine"
                 android:lineSpacingExtra="16px"
                 android:text="距离 - - 公里，用时 - - 分"
@@ -108,7 +108,7 @@
                 android:layout_height="wrap_content"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
-                android:layout_marginTop="130px">
+                android:layout_marginTop="@dimen/dp_110">
                 <TextView
                     android:id="@+id/taxi_passenger_num"
                     android:layout_width="wrap_content"
@@ -134,7 +134,7 @@
                     app:layout_constraintTop_toBottomOf="@+id/taxi_passenger_phone"
                     app:layout_constraintLeft_toLeftOf="@+id/taxi_passenger_num"
                     app:layout_constraintRight_toRightOf="parent"
-                    android:layout_marginTop="@dimen/dp_30"
+                    android:layout_marginTop="@dimen/dp_15"
                     android:background="@color/taxi_passenger_line_color"/>
 
             </androidx.constraintlayout.widget.ConstraintLayout>
@@ -171,8 +171,8 @@
                     android:id="@+id/module_och_taxi_order_start_station_31"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="8px"
-                    android:layout_marginRight="68px"
+                    android:layout_marginTop="10px"
+                    android:layout_marginRight="40px"
                     android:maxLines="2"
                     android:textStyle="bold"
                     android:ellipsize="end"
@@ -183,7 +183,7 @@
                 <RelativeLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="8px"
+                    android:layout_marginTop="16px"
                     android:layout_gravity="center_vertical">
 
                     <TextView
@@ -217,7 +217,7 @@
                     android:id="@+id/arrive_station_32"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="56px"
+                    android:layout_marginTop="@dimen/dp_30"
                     android:inputType="textMultiLine"
                     android:lineSpacingExtra="16px"
                     android:textColor="#CAD6FF"
@@ -241,12 +241,12 @@
                 android:id="@+id/module_och_taxi_order_other_content_3"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="260px"
+                android:layout_marginTop="@dimen/dp_22"
                 android:inputType="textMultiLine"
                 android:lineSpacingExtra="16px"
                 android:textColor="#CAD6FF"
                 android:textSize="30px"
-                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/module_och_taxi_order_go_ahead_station_31"
                 app:layout_constraintLeft_toLeftOf="@+id/module_och_taxi_order_arrive_station_32"
                 tools:text="乘客将于 - - 用车" />