From 1adfe1b419b7c0b09a0ade4f8a696b20b5c87728 Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Tue, 12 Apr 2022 20:34:45 +0800
Subject: [PATCH] =?UTF-8?q?[driver=20passenger=20]=20taxi=E4=B9=98?=
 =?UTF-8?q?=E5=AE=A2=E5=B1=8FUI=20=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/TaxiPassengerMapDirectionView.java     |  3 ++-
 .../taxi_p_activity_serving_order_view.xml    | 20 +++++++++----------
 .../src/main/res/values-sw320dp/dimens.xml    |  4 ++--
 .../res/values-xhdpi-2560x1440/dimens.xml     |  4 ++--
 .../src/main/res/values/dimens.xml            |  4 ++--
 5 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerMapDirectionView.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerMapDirectionView.java
index 0de3dd3cbc..f31c585524 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerMapDirectionView.java
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerMapDirectionView.java
@@ -228,7 +228,8 @@ public class TaxiPassengerMapDirectionView
                 polylineOptions.addAll(mCoordinatesLatLng);
                 polylineOptions.colorValues(colorList); // 1FC3FF -> 57ABFF
                 polylineOptions.useGradient(true);
-                polylineOptions.width(5);
+                polylineOptions.width(10);
+                polylineOptions.lineCapType(PolylineOptions.LineCapType.LineCapRound);
 
                 // 绘制线
                 mPolyline = mAMap.addPolyline(polylineOptions);
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_activity_serving_order_view.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_activity_serving_order_view.xml
index 94fa20a614..51ce312479 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_activity_serving_order_view.xml
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_activity_serving_order_view.xml
@@ -42,8 +42,8 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_116"
                 android:background="#2661A2DC"
-                android:paddingTop="@dimen/dp_40"
-                android:paddingBottom="@dimen/dp_40"
+                android:paddingTop="@dimen/dp_30"
+                android:paddingBottom="@dimen/dp_30"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintTop_toTopOf="parent">
 
@@ -152,7 +152,7 @@
                             android:includeFontPadding="false"
                             android:text="公里"
                             android:textColor="#FFFFFF"
-                            android:textSize="24px" />
+                            android:textSize="@dimen/taxi_p_route_txt_unit_size" />
                     </LinearLayout>
 
                     <TextView
@@ -161,11 +161,11 @@
                         android:layout_height="wrap_content"
                         android:layout_below="@+id/taxi_p_order_remain_distance_ll"
                         android:layout_centerHorizontal="true"
-                        android:layout_marginTop="@dimen/dp_12"
+                        android:layout_marginTop="@dimen/dp_10"
                         android:includeFontPadding="false"
                         android:text="距离"
                         android:textColor="#8FB3EF"
-                        android:textSize="24px" />
+                        android:textSize="@dimen/taxi_p_route_txt_unit_size" />
 
                 </RelativeLayout>
 
@@ -205,7 +205,7 @@
                             android:includeFontPadding="false"
                             android:text="分钟"
                             android:textColor="#FFFFFF"
-                            android:textSize="24px" />
+                            android:textSize="@dimen/taxi_p_route_txt_unit_size" />
                     </LinearLayout>
 
                     <TextView
@@ -214,11 +214,11 @@
                         android:layout_height="wrap_content"
                         android:layout_below="@+id/taxi_p_order_remain_distance_ll2"
                         android:layout_centerHorizontal="true"
-                        android:layout_marginTop="@dimen/dp_12"
+                        android:layout_marginTop="@dimen/dp_10"
                         android:includeFontPadding="false"
                         android:text="剩余"
                         android:textColor="#8FB3EF"
-                        android:textSize="24px" />
+                        android:textSize="@dimen/taxi_p_route_txt_unit_size" />
 
                 </RelativeLayout>
 
@@ -248,11 +248,11 @@
                         android:layout_height="wrap_content"
                         android:layout_below="@+id/taxi_p_order_remain_arrive_time"
                         android:layout_centerHorizontal="true"
-                        android:layout_marginTop="@dimen/dp_12"
+                        android:layout_marginTop="@dimen/dp_10"
                         android:includeFontPadding="false"
                         android:text="到达"
                         android:textColor="#8FB3EF"
-                        android:textSize="24px" />
+                        android:textSize="@dimen/taxi_p_route_txt_unit_size" />
 
                 </RelativeLayout>
 
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/values-sw320dp/dimens.xml b/OCH/mogo-och-taxi-passenger/src/main/res/values-sw320dp/dimens.xml
index ad3fad91cf..c9efef01f8 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/res/values-sw320dp/dimens.xml
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/values-sw320dp/dimens.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <dimen name="taxi_p_order_map_width">520px</dimen>
-    <dimen name="taxi_p_order_map_height">518px</dimen>
+    <dimen name="taxi_p_order_map_height">496px</dimen>
     <dimen name="module_och_taxi_panel_width">560px</dimen>
     <dimen name="module_och_taxi_panel_height">910px</dimen>
     <dimen name="taxi_operation_data_item_width">800px</dimen>
@@ -61,4 +60,5 @@
     <dimen name="taxi_p_order_station_size">36px</dimen>
     <dimen name="taxi_p_order_route_size">50px</dimen>
     <dimen name="taxi_p_progress_des_size">34px</dimen>
+    <dimen name="taxi_p_route_txt_unit_size">28px</dimen>
 </resources>
\ No newline at end of file
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/values-xhdpi-2560x1440/dimens.xml b/OCH/mogo-och-taxi-passenger/src/main/res/values-xhdpi-2560x1440/dimens.xml
index bfd5b81e2d..6af3cfedd4 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/res/values-xhdpi-2560x1440/dimens.xml
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/values-xhdpi-2560x1440/dimens.xml
@@ -64,8 +64,7 @@
     <dimen name="module_och_taxi_order_text_marginRight">31.5px</dimen>
 
 
-    <dimen name="taxi_p_order_map_width">520px</dimen>
-    <dimen name="taxi_p_order_map_height">518px</dimen>
+    <dimen name="taxi_p_order_map_height">496px</dimen>
     <dimen name="module_och_taxi_panel_width">560px</dimen>
     <dimen name="module_och_taxi_panel_height">910px</dimen>
     <dimen name="taxi_operation_data_item_width">800px</dimen>
@@ -124,5 +123,6 @@
     <dimen name="taxi_p_order_station_size">36px</dimen>
     <dimen name="taxi_p_order_route_size">50px</dimen>
     <dimen name="taxi_p_progress_des_size">34px</dimen>
+    <dimen name="taxi_p_route_txt_unit_size">28px</dimen>
 
 </resources>
\ No newline at end of file
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/values/dimens.xml b/OCH/mogo-och-taxi-passenger/src/main/res/values/dimens.xml
index 730018af11..f97cae2174 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/res/values/dimens.xml
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/values/dimens.xml
@@ -59,8 +59,7 @@
     <dimen name="module_och_taxi_order_distance_marginRight">17px</dimen>
     <dimen name="module_och_taxi_order_text_marginRight">22.5px</dimen>
 
-    <dimen name="taxi_p_order_map_width">520px</dimen>
-    <dimen name="taxi_p_order_map_height">518px</dimen>
+    <dimen name="taxi_p_order_map_height">496px</dimen>
     <dimen name="module_och_taxi_panel_width">560px</dimen>
     <dimen name="module_och_taxi_panel_height">910px</dimen>
     <dimen name="taxi_operation_data_item_width">800px</dimen>
@@ -119,4 +118,5 @@
     <dimen name="taxi_p_order_station_size">36px</dimen>
     <dimen name="taxi_p_order_route_size">50px</dimen>
     <dimen name="taxi_p_progress_des_size">34px</dimen>
+    <dimen name="taxi_p_route_txt_unit_size">28px</dimen>
 </resources>
\ No newline at end of file