yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev_robotaxi-d-app-module_280_220608_2.8.0' into 'dev_robotaxi-d-app-module_282_220707_2.8.2'

Browse Source 
[Taxi-d 280, Taxi-p 130] taxi司机端订单UI多行修改

See merge request zhjt/AndroidApp/MoGoEagleEye!51
This commit is contained in:
pangfan
2022-07-07 11:32:59 +00:00
parent 403fa3f496 067e243a6b
commit 82af6dda9c
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OCH/mogo-och-taxi-passenger/src/main/res/values/strings.xml
View File

@@ -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>

22
OCH/mogo-och-taxi/src/main/res/layout/taxi_being_order.xml
View File

@@ -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="乘客将于 - - 用车" />