From d24bdacb6e428fe390dbf1722fe1a34594760dd8 Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Tue, 25 Jan 2022 15:16:42 +0800
Subject: [PATCH] =?UTF-8?q?[taxi/bus=202.5.1]=20taxi=E7=BB=9F=E4=B8=80=20d?=
 =?UTF-8?q?p=20->=20px?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/OCHTaxiPersonalDialogFragment.java     | 12 ++--
 .../res/drawable/taxi_cancel_button_bg.xml    |  2 +-
 .../main/res/drawable/taxi_grab_order_bg.xml  | 12 ++--
 .../drawable/taxi_grabing_order_btn_bg.xml    |  2 +-
 .../drawable/taxi_operation_data_item_bg.xml  |  2 +-
 .../res/drawable/taxi_operation_status_bg.xml |  2 +-
 .../src/main/res/drawable/taxi_order_bg.xml   | 12 ++--
 .../drawable/taxi_order_button_status_bg.xml  |  2 +-
 .../taxi_order_button_status_canceled_bg.xml  |  2 +-
 .../drawable/taxi_order_button_type_bg.xml    |  2 +-
 .../taxi_order_button_type_reserver_bg.xml    |  2 +-
 .../drawable/taxi_order_cancel_dialog_bg.xml  |  2 +-
 .../res/drawable/taxi_order_viewpager_bg.xml  |  2 +-
 .../main/res/drawable/taxi_show_orders_bg.xml |  2 +-
 .../main/res/layout/taxi_base_fragment.xml    | 20 +++---
 .../src/main/res/layout/taxi_being_order.xml  | 72 +++++++++----------
 .../src/main/res/layout/taxi_navi_view.xml    |  4 +-
 .../res/layout/taxi_no_data_common_view.xml   |  2 +-
 .../layout/taxi_operation_data_item_view.xml  | 10 +--
 .../layout/taxi_operation_tab_item_custom.xml |  2 +-
 .../res/layout/taxi_order_cancel_view.xml     | 18 ++---
 .../res/layout/taxi_order_checkbox_item.xml   |  4 +-
 .../main/res/layout/taxi_order_grab_view.xml  | 60 ++++++++--------
 .../taxi_order_list_boot_no_data_view.xml     |  4 +-
 .../res/layout/taxi_order_reserve_item.xml    | 38 +++++-----
 .../res/layout/taxi_orders_list_day_item.xml  |  4 +-
 .../main/res/layout/taxi_orders_list_item.xml | 40 +++++------
 .../main/res/layout/taxi_orders_list_view.xml | 48 ++++++-------
 .../src/main/res/layout/taxi_panel.xml        |  8 +--
 .../main/res/layout/taxi_reserve_orders.xml   |  6 +-
 .../res/layout/taxi_server_orders_panel.xml   | 20 +++---
 .../main/res/layout/taxi_tab_item_custom.xml  |  6 +-
 .../res/values-xhdpi-2560x1600/dimens.xml     |  7 --
 33 files changed, 213 insertions(+), 218 deletions(-)
 delete mode 100644 OCH/mogo-och-taxi/src/main/res/values-xhdpi-2560x1600/dimens.xml

diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiPersonalDialogFragment.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiPersonalDialogFragment.java
index eff41d529a..6fb27a36d0 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiPersonalDialogFragment.java
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiPersonalDialogFragment.java
@@ -2,6 +2,7 @@ package com.mogo.och.taxi.ui;
 
 import android.content.Context;
 import android.graphics.Color;
+import android.graphics.Point;
 import android.graphics.Typeface;
 import android.os.Build;
 import android.os.Bundle;
@@ -86,17 +87,18 @@ public class OCHTaxiPersonalDialogFragment extends DialogFragment implements Vie
         getDialog().setCanceledOnTouchOutside(true);
         Window window = getDialog().getWindow();
         //dialog padding 去掉
-        window.getDecorView().setPadding(0,0,0,0);
-        window.setDimAmount(0f);
         WindowManager.LayoutParams params = window.getAttributes();
         params.x = 0;
         params.y = 0;
         WindowManager windowManager  = (WindowManager)getContext().getSystemService(Context.WINDOW_SERVICE);
-        params.width = (int) (windowManager.getDefaultDisplay().getWidth() * 0.375);
-        params.height = (int) (windowManager.getDefaultDisplay().getHeight());
+        Point point = new Point();
+        windowManager.getDefaultDisplay().getSize(point);
+        params.width = (int)(point.x * 0.375);
+        params.height = point.y;
+        Log.d(TAG,"width= "+params.width+"height= "+params.height);
         window.setAttributes(params);
         window.getDecorView().setBackgroundColor(Color.parseColor("#00FFFFFF"));//设置背景， 不然显示不全
-        window.setGravity(Gravity.LEFT);
+        window.setGravity(Gravity.LEFT|Gravity.BOTTOM);
     }
     private void initView(View view) {
         initOperationTabDatas(view);
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/taxi_cancel_button_bg.xml b/OCH/mogo-och-taxi/src/main/res/drawable/taxi_cancel_button_bg.xml
index 587b21f2b8..60eb252eab 100644
--- a/OCH/mogo-och-taxi/src/main/res/drawable/taxi_cancel_button_bg.xml
+++ b/OCH/mogo-och-taxi/src/main/res/drawable/taxi_cancel_button_bg.xml
@@ -2,6 +2,6 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <corners
-        android:radius="13dp"/>
+        android:radius="26dp"/>
     <solid android:color="#4D1D5EF3"/>
 </shape>
\ No newline at end of file
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/taxi_grab_order_bg.xml b/OCH/mogo-och-taxi/src/main/res/drawable/taxi_grab_order_bg.xml
index 3d326d57ff..d626dfde91 100644
--- a/OCH/mogo-och-taxi/src/main/res/drawable/taxi_grab_order_bg.xml
+++ b/OCH/mogo-och-taxi/src/main/res/drawable/taxi_grab_order_bg.xml
@@ -4,7 +4,7 @@
     <item>
         <shape android:shape="rectangle">
 
-            <corners android:radius="21dp"/>
+            <corners android:radius="42px"/>
 
             <gradient
                 android:angle="315"
@@ -16,13 +16,13 @@
     </item>
 
     <item
-        android:left="2dp"
-        android:top="2dp"
-        android:bottom="2dp"
-        android:right="2dp">
+        android:left="4px"
+        android:top="4px"
+        android:bottom="4px"
+        android:right="4px">
         <shape android:shape="rectangle">
 
-            <corners android:radius="21dp"/>
+            <corners android:radius="42px"/>
             <gradient
                 android:type="linear"
                 android:startColor="#D6DEF0"
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/taxi_grabing_order_btn_bg.xml b/OCH/mogo-och-taxi/src/main/res/drawable/taxi_grabing_order_btn_bg.xml
index 7ee5f5ffdf..fbe05625d8 100644
--- a/OCH/mogo-och-taxi/src/main/res/drawable/taxi_grabing_order_btn_bg.xml
+++ b/OCH/mogo-och-taxi/src/main/res/drawable/taxi_grabing_order_btn_bg.xml
@@ -2,6 +2,6 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <corners
-        android:radius="27dp"/>
+        android:radius="54px"/>
     <solid android:color="#33FFFFFF"/>
 </shape>
\ No newline at end of file
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/taxi_operation_data_item_bg.xml b/OCH/mogo-och-taxi/src/main/res/drawable/taxi_operation_data_item_bg.xml
index 6d9b371c46..dca30d9244 100644
--- a/OCH/mogo-och-taxi/src/main/res/drawable/taxi_operation_data_item_bg.xml
+++ b/OCH/mogo-och-taxi/src/main/res/drawable/taxi_operation_data_item_bg.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <corners android:radius="12dp" />
+    <corners android:radius="24px" />
     <gradient
         android:angle="0"
         android:startColor="#304378"
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/taxi_operation_status_bg.xml b/OCH/mogo-och-taxi/src/main/res/drawable/taxi_operation_status_bg.xml
index c240674887..dde09aaba4 100644
--- a/OCH/mogo-och-taxi/src/main/res/drawable/taxi_operation_status_bg.xml
+++ b/OCH/mogo-och-taxi/src/main/res/drawable/taxi_operation_status_bg.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-        <corners android:radius="27dp" />
+        <corners android:radius="54px" />
     <gradient
         android:startColor="#323C6F"
         android:endColor="#323C6F"
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/taxi_order_bg.xml b/OCH/mogo-och-taxi/src/main/res/drawable/taxi_order_bg.xml
index dd58eb822e..f442e3fb0b 100644
--- a/OCH/mogo-och-taxi/src/main/res/drawable/taxi_order_bg.xml
+++ b/OCH/mogo-och-taxi/src/main/res/drawable/taxi_order_bg.xml
@@ -4,7 +4,7 @@
     <item>
         <shape android:shape="rectangle">
 
-            <corners android:radius="21dp"/>
+            <corners android:radius="42px"/>
 
             <gradient
                 android:angle="315"
@@ -16,13 +16,13 @@
     </item>
 
     <item
-        android:left="2dp"
-        android:top="2dp"
-        android:bottom="2dp"
-        android:right="2dp">
+        android:left="4px"
+        android:top="4px"
+        android:bottom="4px"
+        android:right="4px">
         <shape android:shape="rectangle">
 
-            <corners android:radius="21dp"/>
+            <corners android:radius="42px"/>
             <gradient
                 android:type="linear"
                 android:startColor="#80435AB2"
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/taxi_order_button_status_bg.xml b/OCH/mogo-och-taxi/src/main/res/drawable/taxi_order_button_status_bg.xml
index ee893cc0b3..103e621370 100644
--- a/OCH/mogo-och-taxi/src/main/res/drawable/taxi_order_button_status_bg.xml
+++ b/OCH/mogo-och-taxi/src/main/res/drawable/taxi_order_button_status_bg.xml
@@ -2,6 +2,6 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <corners
-        android:radius="4.5dp"/>
+        android:radius="9px"/>
     <solid android:color="@color/taxi_order_cancel_btn"/>
 </shape>
\ No newline at end of file
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/taxi_order_button_status_canceled_bg.xml b/OCH/mogo-och-taxi/src/main/res/drawable/taxi_order_button_status_canceled_bg.xml
index 410486dee3..8869eec9a6 100644
--- a/OCH/mogo-och-taxi/src/main/res/drawable/taxi_order_button_status_canceled_bg.xml
+++ b/OCH/mogo-och-taxi/src/main/res/drawable/taxi_order_button_status_canceled_bg.xml
@@ -2,6 +2,6 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <corners
-        android:radius="4.5dp"/>
+        android:radius="9px"/>
     <solid android:color="#364071"/>
 </shape>
\ No newline at end of file
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/taxi_order_button_type_bg.xml b/OCH/mogo-och-taxi/src/main/res/drawable/taxi_order_button_type_bg.xml
index d90c5c50f4..d32f758b8b 100644
--- a/OCH/mogo-och-taxi/src/main/res/drawable/taxi_order_button_type_bg.xml
+++ b/OCH/mogo-och-taxi/src/main/res/drawable/taxi_order_button_type_bg.xml
@@ -2,6 +2,6 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <corners
-        android:radius="4.5dp"/>
+        android:radius="9px"/>
     <solid android:color="#FF1E7D4E"/>
 </shape>
\ No newline at end of file
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/taxi_order_button_type_reserver_bg.xml b/OCH/mogo-och-taxi/src/main/res/drawable/taxi_order_button_type_reserver_bg.xml
index fd2a6268d6..acae5d44a7 100644
--- a/OCH/mogo-och-taxi/src/main/res/drawable/taxi_order_button_type_reserver_bg.xml
+++ b/OCH/mogo-och-taxi/src/main/res/drawable/taxi_order_button_type_reserver_bg.xml
@@ -2,6 +2,6 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <corners
-        android:radius="4.5dp"/>
+        android:radius="9px"/>
     <solid android:color="#BB791C"/>
 </shape>
\ No newline at end of file
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/taxi_order_cancel_dialog_bg.xml b/OCH/mogo-och-taxi/src/main/res/drawable/taxi_order_cancel_dialog_bg.xml
index 2d2d670f2f..942b51b459 100644
--- a/OCH/mogo-och-taxi/src/main/res/drawable/taxi_order_cancel_dialog_bg.xml
+++ b/OCH/mogo-och-taxi/src/main/res/drawable/taxi_order_cancel_dialog_bg.xml
@@ -2,6 +2,6 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
 android:shape="rectangle">
 <corners
-    android:radius="17dp"/>
+    android:radius="34px"/>
 <solid android:color="#E63B4577"/>
 </shape>
\ No newline at end of file
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/taxi_order_viewpager_bg.xml b/OCH/mogo-och-taxi/src/main/res/drawable/taxi_order_viewpager_bg.xml
index bab07639d2..621dfb107e 100644
--- a/OCH/mogo-och-taxi/src/main/res/drawable/taxi_order_viewpager_bg.xml
+++ b/OCH/mogo-och-taxi/src/main/res/drawable/taxi_order_viewpager_bg.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <corners android:radius="21dp"/>
+    <corners android:radius="42px"/>
     <solid android:color="#00000000"/>
 </shape>
\ No newline at end of file
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/taxi_show_orders_bg.xml b/OCH/mogo-och-taxi/src/main/res/drawable/taxi_show_orders_bg.xml
index cd0efcec3e..c7f6e8e8f0 100644
--- a/OCH/mogo-och-taxi/src/main/res/drawable/taxi_show_orders_bg.xml
+++ b/OCH/mogo-och-taxi/src/main/res/drawable/taxi_show_orders_bg.xml
@@ -2,6 +2,6 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <corners
-        android:radius="21dp"/>
+        android:radius="42px"/>
     <solid android:color="@color/taxi_order_cancel_btn"/>
 </shape>
\ No newline at end of file
diff --git a/OCH/mogo-och-taxi/src/main/res/layout/taxi_base_fragment.xml b/OCH/mogo-och-taxi/src/main/res/layout/taxi_base_fragment.xml
index 8c27946d1d..5a640a3415 100644
--- a/OCH/mogo-och-taxi/src/main/res/layout/taxi_base_fragment.xml
+++ b/OCH/mogo-och-taxi/src/main/res/layout/taxi_base_fragment.xml
@@ -86,17 +86,17 @@
 
     <CheckedTextView
         android:id="@+id/module_mogo_och_operation_status"
-        android:layout_width="125dp"
-        android:layout_height="51dp"
-        android:layout_marginLeft="24dp"
+        android:layout_width="250px"
+        android:layout_height="102px"
+        android:layout_marginLeft="48px"
         android:layout_marginBottom="@dimen/module_mogo_och_margin_bottom"
         android:background="@drawable/taxi_operation_status_bg"
         android:drawableLeft="@drawable/taxi_out_btn"
-        android:drawablePadding="5dp"
+        android:drawablePadding="10px"
         android:elevation="@dimen/dp_10"
         android:gravity="center"
-        android:paddingLeft="23dp"
-        android:paddingRight="25dp"
+        android:paddingLeft="46px"
+        android:paddingRight="50px"
         android:text="出车"
         android:textAlignment="center"
         android:textColor="@color/taxi_autopilot_text_color_selector"
@@ -110,14 +110,14 @@
         android:layout_width="@dimen/module_mogo_och_operation_status_bg_width"
         android:layout_height="@dimen/module_mogo_och_operation_status_bg_height"
         android:layout_marginBottom="@dimen/module_mogo_och_margin_bottom"
-        android:layout_marginLeft="20dp"
+        android:layout_marginLeft="40px"
         android:elevation="@dimen/dp_10"
         android:background="@drawable/taxi_operation_status_bg"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toRightOf="@id/module_mogo_och_operation_status"
         android:gravity="center"
         android:visibility="gone"
-        app:layout_goneMarginLeft="24dp">
+        app:layout_goneMarginLeft="48px">
         <ImageView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -130,7 +130,7 @@
         android:id="@+id/module_och_taxi_swich_map_layout"
         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="20dp"
+        android:layout_marginLeft="40px"
         android:layout_marginBottom="@dimen/module_mogo_och_margin_bottom"
         android:background="@drawable/taxi_operation_status_bg"
         android:elevation="@dimen/dp_10"
@@ -150,7 +150,7 @@
         android:id="@+id/module_och_taxi_setting_layout"
         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="20dp"
+        android:layout_marginLeft="40px"
         android:layout_marginBottom="@dimen/module_mogo_och_margin_bottom"
         android:background="@drawable/taxi_operation_status_bg"
         android:elevation="@dimen/dp_10"
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 f70c32354a..da7aa36c9d 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
@@ -21,9 +21,9 @@
         <TextView
             android:id="@+id/module_och_taxi_order_status"
             android:layout_width="wrap_content"
-            android:layout_height="28dp"
-            android:layout_marginLeft="20dp"
-            android:layout_marginTop="26dp"
+            android:layout_height="56px"
+            android:layout_marginLeft="40px"
+            android:layout_marginTop="52px"
             android:gravity="center_vertical"
             android:text="前往乘客上车点"
             android:textColor="@color/taxi_order_status_textColor"
@@ -34,11 +34,11 @@
 
         <ImageView
             android:id="@+id/module_och_taxi_order_cancel_iv"
-            android:layout_width="45dp"
-            android:layout_height="45dp"
-            android:layout_marginTop="17dp"
-            android:layout_marginRight="10dp"
-            android:padding="10dp"
+            android:layout_width="90px"
+            android:layout_height="90px"
+            android:layout_marginTop="34px"
+            android:layout_marginRight="20px"
+            android:padding="20px"
             android:src="@drawable/taxi_report_order_cancel_icon"
             app:layout_constraintRight_toRightOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
@@ -48,30 +48,30 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:visibility="gone"
-            android:paddingLeft="20dp"
-            android:paddingRight="20dp"
+            android:paddingLeft="40px"
+            android:paddingRight="40px"
             app:layout_constraintBottom_toTopOf="@+id/module_och_taxi_order_server_status_tv">
 
             <TextView
                 android:id="@+id/module_och_taxi_order_station_title_2"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="100dp"
+                android:layout_marginTop="200px"
                 android:textColor="#CAD6FF"
                 android:textSize="17sp"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
-                app:layout_goneMarginTop="25dp"
+                app:layout_goneMarginTop="50px"
                 tools:text="送乘客至" />
             <TextView
                 android:id="@+id/module_och_taxi_order_station_2"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="18dp"
+                android:layout_marginTop="36px"
                 android:textStyle="bold"
                 android:maxLines="2"
                 android:ellipsize="end"
-                android:lineSpacingExtra="5dp"
+                android:lineSpacingExtra="10px"
                 android:textColor="#FFFFFF"
                 android:textSize="23sp"
                 app:layout_constraintLeft_toLeftOf="parent"
@@ -82,9 +82,9 @@
                 android:id="@+id/module_och_taxi_order_distance_anchor_2"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="139dp"
+                android:layout_marginBottom="278px"
                 android:inputType="textMultiLine"
-                android:lineSpacingExtra="8dp"
+                android:lineSpacingExtra="16px"
                 android:text="距离 - - 公里，用时 - - 分"
                 android:textColor="#CAD6FF"
                 android:textSize="16sp"
@@ -97,22 +97,22 @@
             android:id="@+id/module_och_taxi_order_status_station_3"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:paddingLeft="20dp"
-            android:paddingRight="20dp"
+            android:paddingLeft="40px"
+            android:paddingRight="40px"
             android:visibility="visible"
             app:layout_constraintBottom_toTopOf="@+id/module_och_taxi_order_server_status_tv">
             <TextView
                 android:id="@+id/module_och_taxi_order_had_arrived_time_32"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="75dp"
-                android:lineSpacingExtra="8dp"
+                android:layout_marginTop="150px"
+                android:lineSpacingExtra="16px"
                 android:textColor="#CAD6FF"
                 android:textSize="17sp"
                 android:visibility="visible"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
-                app:layout_goneMarginTop="25dp"
+                app:layout_goneMarginTop="50px"
                 tools:text="已于 - - 到达乘客上车点" />
             <LinearLayout
                 android:id="@+id/module_och_taxi_order_go_ahead_station_31"
@@ -127,26 +127,26 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:textColor="#CAD6FF"
-                    android:layout_marginTop="75dp"
+                    android:layout_marginTop="150px"
                     android:textSize="17sp"
                     android:text="前往"/>
                 <TextView
                     android:id="@+id/module_och_taxi_order_start_station_31"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="4dp"
-                    android:layout_marginRight="34dp"
+                    android:layout_marginTop="8px"
+                    android:layout_marginRight="68px"
                     android:maxLines="2"
                     android:textStyle="bold"
                     android:ellipsize="end"
-                    android:lineSpacingExtra="5dp"
+                    android:lineSpacingExtra="10px"
                     android:textColor="#FFFFFF"
                     android:textSize="23sp"
                     tools:text="- -" />
                 <RelativeLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="4dp"
+                    android:layout_marginTop="8px"
                     android:layout_gravity="center_vertical">
                     <TextView
                         android:id="@+id/go_ahead_station_catch_31"
@@ -179,9 +179,9 @@
                     android:id="@+id/arrive_station_32"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="27dp"
+                    android:layout_marginTop="56px"
                     android:inputType="textMultiLine"
-                    android:lineSpacingExtra="8dp"
+                    android:lineSpacingExtra="16px"
                     android:textColor="#CAD6FF"
                     android:textSize="17sp"
                     tools:text="送乘客至" />
@@ -189,11 +189,11 @@
                     android:id="@+id/module_och_taxi_order_end_station_32"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="4dp"
+                    android:layout_marginTop="8px"
                     android:maxLines="2"
                     android:textStyle="bold"
                     android:ellipsize="end"
-                    android:lineSpacingExtra="8dp"
+                    android:lineSpacingExtra="16px"
                     android:textColor="#FFFFFF"
                     android:textSize="23sp"
                     tools:text="- -" />
@@ -203,9 +203,9 @@
                 android:id="@+id/module_och_taxi_order_other_content_3"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="130dp"
+                android:layout_marginBottom="260px"
                 android:inputType="textMultiLine"
-                android:lineSpacingExtra="8dp"
+                android:lineSpacingExtra="16px"
                 android:textColor="#CAD6FF"
                 android:textSize="17sp"
                 app:layout_constraintBottom_toBottomOf="parent"
@@ -216,9 +216,9 @@
                 android:id="@+id/module_och_taxi_order_distance_anchor_3"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="90dp"
+                android:layout_marginBottom="180px"
                 android:inputType="textMultiLine"
-                android:lineSpacingExtra="8dp"
+                android:lineSpacingExtra="16px"
                 android:text="距离 - - 公里，用时 - - 分钟"
                 android:textColor="#CAD6FF"
                 android:textSize="16sp"
@@ -230,7 +230,7 @@
         <TextView
             android:id="@+id/module_och_taxi_order_server_status_tv"
             android:layout_width="match_parent"
-            android:layout_height="65dp"
+            android:layout_height="130px"
             android:background="@drawable/taxi_panel_distance_bkg"
             android:gravity="center"
             android:text="@string/module_och_taxi_order_server_start"
@@ -244,7 +244,7 @@
         layout="@layout/taxi_no_data_common_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="120dp"
+        android:layout_marginBottom="240px"
         android:visibility="visible"
         app:layout_constraintBottom_toBottomOf="parent" />
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/OCH/mogo-och-taxi/src/main/res/layout/taxi_navi_view.xml b/OCH/mogo-och-taxi/src/main/res/layout/taxi_navi_view.xml
index 500a752f75..49d6454265 100644
--- a/OCH/mogo-och-taxi/src/main/res/layout/taxi_navi_view.xml
+++ b/OCH/mogo-och-taxi/src/main/res/layout/taxi_navi_view.xml
@@ -3,8 +3,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    app:cardCornerRadius="15dp"
-    app:cardElevation="4dp"
+    app:cardCornerRadius="30px"
+    app:cardElevation="8px"
     app:cardUseCompatPadding="true"
     app:cardPreventCornerOverlap="false"
     app:cardBackgroundColor="@android:color/transparent">
diff --git a/OCH/mogo-och-taxi/src/main/res/layout/taxi_no_data_common_view.xml b/OCH/mogo-och-taxi/src/main/res/layout/taxi_no_data_common_view.xml
index 00cffff52a..dc6d17e0a7 100644
--- a/OCH/mogo-och-taxi/src/main/res/layout/taxi_no_data_common_view.xml
+++ b/OCH/mogo-och-taxi/src/main/res/layout/taxi_no_data_common_view.xml
@@ -20,7 +20,7 @@
         android:layout_height="wrap_content"
         android:textColor="#91A1EA"
         android:textSize="15sp"
-        android:layout_marginTop="25dp"
+        android:layout_marginTop="50px"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/no_order_data_iv"
diff --git a/OCH/mogo-och-taxi/src/main/res/layout/taxi_operation_data_item_view.xml b/OCH/mogo-och-taxi/src/main/res/layout/taxi_operation_data_item_view.xml
index a74e39f79b..5581647a61 100644
--- a/OCH/mogo-och-taxi/src/main/res/layout/taxi_operation_data_item_view.xml
+++ b/OCH/mogo-och-taxi/src/main/res/layout/taxi_operation_data_item_view.xml
@@ -2,17 +2,17 @@
 <androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_marginTop="15dp"
-    android:layout_width="400dp"
-    android:layout_height="111dp"
+    android:layout_marginTop="30px"
+    android:layout_width="@dimen/taxi_operation_data_item_width"
+    android:layout_height="@dimen/taxi_operation_data_item_height"
     android:background="@drawable/taxi_operation_data_item_bg">
 
     <TextView
         android:id="@+id/operation_data_tv"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="15dp"
-        android:layout_marginLeft="30dp"
+        android:layout_marginTop="30px"
+        android:layout_marginLeft="60px"
         android:textSize="18sp"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toTopOf="parent"
diff --git a/OCH/mogo-och-taxi/src/main/res/layout/taxi_operation_tab_item_custom.xml b/OCH/mogo-och-taxi/src/main/res/layout/taxi_operation_tab_item_custom.xml
index 00c2345717..36083f3018 100644
--- a/OCH/mogo-och-taxi/src/main/res/layout/taxi_operation_tab_item_custom.xml
+++ b/OCH/mogo-och-taxi/src/main/res/layout/taxi_operation_tab_item_custom.xml
@@ -23,7 +23,7 @@
         app:layout_constraintTop_toBottomOf="@+id/operation_tab_title"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
-        android:layout_marginTop="5dp"
+        android:layout_marginTop="10px"
         android:src="@drawable/taxi_driver_operation_tab_line"/>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/OCH/mogo-och-taxi/src/main/res/layout/taxi_order_cancel_view.xml b/OCH/mogo-och-taxi/src/main/res/layout/taxi_order_cancel_view.xml
index 88c9ac60cd..35fa48fe9a 100644
--- a/OCH/mogo-och-taxi/src/main/res/layout/taxi_order_cancel_view.xml
+++ b/OCH/mogo-och-taxi/src/main/res/layout/taxi_order_cancel_view.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="560dp"
+    android:layout_width="@dimen/taxi_order_cancel_width"
     android:layout_height="wrap_content"
     android:background="@drawable/taxi_order_cancel_dialog_bg">
 
@@ -12,7 +12,7 @@
         android:textSize="28sp"
         android:textColor="#FFFFFFFF"
         android:layout_centerHorizontal="true"
-        android:layout_marginTop="23dp"
+        android:layout_marginTop="46px"
         />
     <GridView
         android:id="@+id/module_och_taxi_order_cancel_content_gv"
@@ -21,21 +21,21 @@
         android:layout_below="@+id/module_och_taxi_order_cancel_title_tv"
         android:numColumns="2"
         android:stretchMode="columnWidth"
-        android:verticalSpacing="25dp"
-        android:layout_marginTop="37dp"
-        android:paddingLeft="72dp"/>
+        android:verticalSpacing="50px"
+        android:layout_marginTop="74px"
+        android:paddingLeft="144px"/>
 
     <View
         android:id="@+id/line_deliver_h"
         android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:layout_marginTop="44dp"
+        android:layout_height="2px"
+        android:layout_marginTop="88px"
         android:layout_below="@id/module_och_taxi_order_cancel_content_gv"
         android:background="#66B8BFE8"/>
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="81dp"
+        android:layout_height="@dimen/taxi_order_cancel_btn_height"
         android:orientation="horizontal"
         android:weightSum="2"
         android:layout_below="@+id/line_deliver_h">
@@ -49,7 +49,7 @@
             android:textSize="26sp"
             android:gravity="center"/>
         <View
-            android:layout_width="1dp"
+            android:layout_width="2px"
             android:layout_height="match_parent"
             android:background="#66B8BFE8" />
         <TextView
diff --git a/OCH/mogo-och-taxi/src/main/res/layout/taxi_order_checkbox_item.xml b/OCH/mogo-och-taxi/src/main/res/layout/taxi_order_checkbox_item.xml
index 69cdfc6969..c04429d76c 100644
--- a/OCH/mogo-och-taxi/src/main/res/layout/taxi_order_checkbox_item.xml
+++ b/OCH/mogo-och-taxi/src/main/res/layout/taxi_order_checkbox_item.xml
@@ -4,7 +4,7 @@
     android:layout_height="wrap_content"
     android:textSize="22sp"
     android:textColor="#FFFFFFFF"
-    android:paddingLeft="4dp"
+    android:paddingLeft="8px"
     android:id="@+id/item_checkbox"
-    android:drawablePadding="10dp"
+    android:drawablePadding="20px"
     android:drawableLeft="@drawable/taxi_unselect_btn"/>
diff --git a/OCH/mogo-och-taxi/src/main/res/layout/taxi_order_grab_view.xml b/OCH/mogo-och-taxi/src/main/res/layout/taxi_order_grab_view.xml
index 7c5111c8cc..f4c6717bbd 100644
--- a/OCH/mogo-och-taxi/src/main/res/layout/taxi_order_grab_view.xml
+++ b/OCH/mogo-och-taxi/src/main/res/layout/taxi_order_grab_view.xml
@@ -2,8 +2,8 @@
 <androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="280dp"
-    android:layout_height="455dp"
+    android:layout_width="@dimen/module_och_taxi_panel_width"
+    android:layout_height="@dimen/module_och_taxi_panel_height"
     android:background="@drawable/taxi_grab_order_bg">
 
     <TextView
@@ -12,36 +12,36 @@
         android:layout_height="wrap_content"
         android:textSize="20sp"
         android:textColor="#181D6D"
-        android:layout_marginTop="17dp"
-        android:layout_marginLeft="20dp"
+        android:layout_marginTop="34px"
+        android:layout_marginLeft="40px"
         android:text="预约单"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toTopOf="parent"/>
 
     <ImageView
         android:id="@+id/grab_order_cancel_iv"
-        android:layout_width="56dp"
-        android:layout_height="56dp"
-        android:layout_marginTop="5dp"
-        android:layout_marginRight="3dp"
-        android:padding="10dp"
+        android:layout_width="112px"
+        android:layout_height="112px"
+        android:layout_marginTop="10px"
+        android:layout_marginRight="6px"
+        android:padding="20px"
         android:src="@drawable/taxi_grad_order_close_icon"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
     <View
         android:id="@+id/module_och_taxi_order_status_divider"
-        android:layout_width="0dp"
-        android:layout_height="2dp"
-        android:layout_marginBottom="15dp"
+        android:layout_width="0px"
+        android:layout_height="4px"
+        android:layout_marginBottom="30px"
         android:background="#4F4E63F0"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/grab_order_cancel_iv" />
     <View
         android:id="@+id/module_och_taxi_order_status_divider1"
-        android:layout_width="0dp"
-        android:layout_height="2dp"
+        android:layout_width="0px"
+        android:layout_height="4px"
         android:background="#40FFFFFF"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="@+id/module_och_taxi_order_status_divider"
@@ -54,7 +54,7 @@
         android:text="预约时间：今天15：30"
         android:textColor="#5C5F8E"
         android:textSize="18sp"
-        android:layout_marginTop="21dp"
+        android:layout_marginTop="42px"
         app:layout_constraintLeft_toLeftOf="@+id/grab_order_title"
         app:layout_constraintTop_toBottomOf="@+id/module_och_taxi_order_status_divider1"/>
 
@@ -62,8 +62,8 @@
         android:id="@+id/grab_order_start_station_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="32dp"
-        android:layout_marginLeft="37dp"
+        android:layout_marginTop="64px"
+        android:layout_marginLeft="74px"
         android:text="上车："
         android:textColor="#5C5F8E"
         android:textSize="17sp"
@@ -74,23 +74,23 @@
         android:id="@+id/grab_order_start_greenDot"
         app:layout_constraintTop_toBottomOf="@+id/grab_order_start_station_title"
         app:layout_constraintLeft_toLeftOf="@+id/grab_order_reserver_time"
-        android:layout_marginTop="13dp"
+        android:layout_marginTop="26px"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:src="@drawable/taxi_driver_circle_green_small" />
 
     <TextView
         android:id="@+id/grab_order_start_station"
-        android:layout_width="223dp"
+        android:layout_width="@dimen/taxi_grab_order_start_station_width"
         android:layout_height="wrap_content"
         app:layout_constraintLeft_toLeftOf="@+id/grab_order_start_station_title"
-        android:layout_marginTop="4dp"
+        android:layout_marginTop="8px"
         android:textStyle="bold"
         app:layout_constraintTop_toBottomOf="@+id/grab_order_start_station_title"
         android:maxLines="2"
         android:ellipsize="end"
         android:text="- -"
-        app:layout_goneMarginTop="28dp"
+        app:layout_goneMarginTop="56px"
         android:textColor="#181D6D"
         android:textSize="23sp" />
 
@@ -101,7 +101,7 @@
         app:layout_constraintRight_toRightOf="@+id/grab_order_start_greenDot"
         app:layout_constraintTop_toBottomOf="@+id/grab_order_start_greenDot"
         android:layout_width="wrap_content"
-        android:layout_height="0dp"
+        android:layout_height="0px"
         android:scaleType="fitXY"
         android:src="@drawable/taxi_grab_dot_line" />
 
@@ -109,7 +109,7 @@
         android:id="@+id/grab_order_end_blueDot"
         app:layout_constraintLeft_toLeftOf="@+id/grab_order_reserver_time"
         app:layout_constraintTop_toBottomOf="@+id/grab_order_end_station_title"
-        android:layout_marginTop="13dp"
+        android:layout_marginTop="26px"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:src="@drawable/taxi_driver_circle_blue_small" />
@@ -120,7 +120,7 @@
         android:text="下车："
         android:textColor="#5C5F8E"
         android:textSize="17sp"
-        android:layout_marginTop="25dp"
+        android:layout_marginTop="50px"
         app:layout_constraintLeft_toLeftOf="@+id/grab_order_start_station"
         app:layout_constraintTop_toBottomOf="@+id/grab_order_start_station"/>
     <TextView
@@ -130,9 +130,9 @@
         android:maxLines="2"
         android:ellipsize="end"
         android:text="- -"
-        android:layout_marginTop="4dp"
+        android:layout_marginTop="8px"
         android:textStyle="bold"
-        android:layout_width="223dp"
+        android:layout_width="@dimen/taxi_grab_order_start_station_width"
         android:layout_height="wrap_content"
         android:textColor="#181D6D"
         android:textSize="23sp" />
@@ -141,9 +141,9 @@
         android:id="@+id/grab_order_tv"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:minHeight="50dp"
-        android:minWidth="190dp"
-        android:paddingTop="11dp"
+        android:minHeight="100px"
+        android:minWidth="380px"
+        android:paddingTop="22px"
         android:gravity="center_horizontal"
         android:textStyle="bold"
         android:textSize="21sp"
@@ -162,6 +162,6 @@
         android:src="@drawable/grab_failure_anmi_flow"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintRight_toRightOf="parent"
-        app:taxi_right_bottom_radius="30dp"/>
+        app:taxi_right_bottom_radius="60px"/>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/OCH/mogo-och-taxi/src/main/res/layout/taxi_order_list_boot_no_data_view.xml b/OCH/mogo-och-taxi/src/main/res/layout/taxi_order_list_boot_no_data_view.xml
index 685696729d..4e24c65314 100644
--- a/OCH/mogo-och-taxi/src/main/res/layout/taxi_order_list_boot_no_data_view.xml
+++ b/OCH/mogo-och-taxi/src/main/res/layout/taxi_order_list_boot_no_data_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="200dp"
-    android:layout_height="80dp"
+    android:layout_width="@dimen/taxi_order_nodata_width"
+    android:layout_height="@dimen/taxi_order_nodata_height"
     android:gravity="center"
     android:text="已经到底了…"
     android:textSize="15sp"
diff --git a/OCH/mogo-och-taxi/src/main/res/layout/taxi_order_reserve_item.xml b/OCH/mogo-och-taxi/src/main/res/layout/taxi_order_reserve_item.xml
index 08a08bc3cd..3cf7369efd 100644
--- a/OCH/mogo-och-taxi/src/main/res/layout/taxi_order_reserve_item.xml
+++ b/OCH/mogo-och-taxi/src/main/res/layout/taxi_order_reserve_item.xml
@@ -9,9 +9,9 @@
     <TextView
         android:id="@+id/to_be_order_time"
         android:layout_width="wrap_content"
-        android:layout_height="24dp"
-        android:layout_marginLeft="25dp"
-        android:layout_marginTop="13dp"
+        android:layout_height="48px"
+        android:layout_marginLeft="50px"
+        android:layout_marginTop="26px"
         android:gravity="center_vertical"
         android:inputType="textMultiLine"
         android:text="今天 9：00"
@@ -19,14 +19,14 @@
         android:textSize="17sp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        android:layout_marginBottom="13dp"/>
+        android:layout_marginBottom="26px"/>
 
     <ImageView
         android:id="@+id/to_be_order_cancel_iv"
-        android:layout_width="45dp"
-        android:layout_height="45dp"
-        android:layout_marginRight="5dp"
-        android:padding="10dp"
+        android:layout_width="90px"
+        android:layout_height="90px"
+        android:layout_marginRight="10px"
+        android:padding="20px"
         android:src="@drawable/taxi_report_order_cancel_icon"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="@+id/to_be_order_time"
@@ -43,15 +43,15 @@
 
     <TextView
         android:id="@+id/base_start_station"
-        android:layout_marginTop="13dp"
+        android:layout_marginTop="26px"
         app:layout_constraintLeft_toRightOf="@+id/base_start_greenDot"
         app:layout_constraintTop_toBottomOf="@+id/to_be_order_time"
         android:maxLines="2"
         android:ellipsize="end"
         android:text="后路站"
-        android:layout_width="216dp"
+        android:layout_width="@dimen/taxi_reserve_item_station_width"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="10dp"
+        android:layout_marginLeft="20px"
         android:textColor="#FFFFFF"
         android:textSize="18sp" />
 
@@ -62,7 +62,7 @@
         app:layout_constraintRight_toRightOf="@+id/base_start_greenDot"
         app:layout_constraintTop_toBottomOf="@+id/base_start_greenDot"
         android:layout_width="wrap_content"
-        android:layout_height="0dp"
+        android:layout_height="0px"
         android:scaleType="fitXY"
         android:src="@drawable/taxi_dot_line" />
 
@@ -81,18 +81,18 @@
         android:text="后路站1"
         android:maxLines="2"
         android:ellipsize="end"
-        android:layout_marginTop="9dp"
-        android:layout_width="216dp"
+        android:layout_marginTop="18px"
+        android:layout_width="@dimen/taxi_reserve_item_station_width"
         android:layout_height="wrap_content"
         android:textColor="#FFFFFF"
         android:textSize="18sp" />
     <View
         android:id="@+id/to_be_order_divider"
-        android:layout_width="240dp"
-        android:layout_height="0.5dp"
-        android:layout_marginTop="15dp"
-        android:layout_marginLeft="20dp"
-        android:layout_marginRight="20dp"
+        android:layout_width="480px"
+        android:layout_height="1px"
+        android:layout_marginTop="30px"
+        android:layout_marginLeft="40px"
+        android:layout_marginRight="40px"
         android:background="#997E91FF"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
diff --git a/OCH/mogo-och-taxi/src/main/res/layout/taxi_orders_list_day_item.xml b/OCH/mogo-och-taxi/src/main/res/layout/taxi_orders_list_day_item.xml
index 3b2804b165..077bf77c47 100644
--- a/OCH/mogo-och-taxi/src/main/res/layout/taxi_orders_list_day_item.xml
+++ b/OCH/mogo-och-taxi/src/main/res/layout/taxi_orders_list_day_item.xml
@@ -7,12 +7,12 @@
     <TextView
         android:id="@+id/order_day_tv"
         android:layout_width="match_parent"
-        android:layout_height="32dp"
+        android:layout_height="@dimen/taxi_order_list_item_height"
         android:gravity="center"
         android:text="2020.08.17"
         android:textColor="#FFFFFF"
         android:textSize="17sp"
-        android:layout_marginTop="20dp"
+        android:layout_marginTop="40px"
         android:background="#80203076">
     </TextView>
     <include layout="@layout/taxi_orders_list_item"/>
diff --git a/OCH/mogo-och-taxi/src/main/res/layout/taxi_orders_list_item.xml b/OCH/mogo-och-taxi/src/main/res/layout/taxi_orders_list_item.xml
index 00f0a24421..9ddc3532ec 100644
--- a/OCH/mogo-och-taxi/src/main/res/layout/taxi_orders_list_item.xml
+++ b/OCH/mogo-och-taxi/src/main/res/layout/taxi_orders_list_item.xml
@@ -4,9 +4,9 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingLeft="30dp"
-    android:paddingTop="18dp"
-    android:paddingRight="30dp">
+    android:paddingLeft="60px"
+    android:paddingTop="36px"
+    android:paddingRight="60px">
 
     <TextView
         android:id="@+id/order_time_hm_tv"
@@ -18,8 +18,8 @@
 
     <Button
         android:id="@+id/order_status_bt"
-        android:layout_width="45dp"
-        android:layout_height="19dp"
+        android:layout_width="90px"
+        android:layout_height="38px"
         android:layout_alignParentRight="true"
         android:background="@drawable/taxi_order_button_status_bg"
         android:text="服务中"
@@ -28,9 +28,9 @@
 
     <Button
         android:id="@+id/order_type_bt"
-        android:layout_width="45dp"
-        android:layout_height="19dp"
-        android:layout_marginRight="9dp"
+        android:layout_width="90px"
+        android:layout_height="38px"
+        android:layout_marginRight="18px"
         android:layout_toLeftOf="@+id/order_status_bt"
         android:background="@drawable/taxi_order_button_type_bg"
         android:text="即时单"
@@ -43,7 +43,7 @@
         android:layout_height="wrap_content"
         android:layout_below="@+id/order_time_hm_tv"
         android:orientation="vertical"
-        android:layout_marginTop="15dp">
+        android:layout_marginTop="30px">
 
         <ImageView
             android:id="@+id/grab_order_start_greenDot"
@@ -63,7 +63,7 @@
             android:ellipsize="end"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="20dp"
+            android:layout_marginLeft="40px"
             android:textColor="#FFFFFF"
             android:textSize="22sp" />
 
@@ -74,7 +74,7 @@
             app:layout_constraintRight_toRightOf="@+id/grab_order_start_greenDot"
             app:layout_constraintTop_toBottomOf="@+id/grab_order_start_greenDot"
             android:layout_width="wrap_content"
-            android:layout_height="0dp"
+            android:layout_height="0px"
             android:scaleType="fitXY"
             android:src="@drawable/taxi_dot_line" />
 
@@ -95,7 +95,7 @@
             android:textSize="22sp"
             android:maxLines="2"
             android:ellipsize="end"
-            android:layout_marginTop="20dp"
+            android:layout_marginTop="40px"
             app:layout_constraintTop_toBottomOf="@+id/grab_order_start_station"
             app:layout_constraintLeft_toLeftOf="@+id/grab_order_start_station"
             tools:text="后路站1" />
@@ -106,18 +106,18 @@
             android:layout_height="wrap_content"
             android:textColor="#8E9DD4"
             android:textSize="20sp"
-            android:layout_marginTop="20dp"
+            android:layout_marginTop="40px"
             app:layout_constraintTop_toBottomOf="@+id/grab_order_end_blueDot"
             app:layout_constraintLeft_toLeftOf="@+id/grab_order_end_blueDot"
             tools:text="订单编号111111" />
 
         <View
             android:id="@+id/module_och_taxi_order_divider"
-            android:layout_width="0dp"
-            android:layout_height="0.5dp"
-            app:layout_goneMarginTop="20dp"
-            android:layout_marginTop="13dp"
-            android:padding="5dp"
+            android:layout_width="0px"
+            android:layout_height="1px"
+            app:layout_goneMarginTop="40px"
+            android:layout_marginTop="26px"
+            android:padding="10px"
             android:background="#598E9DD4"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/order_num" />
@@ -129,8 +129,8 @@
         layout="@layout/taxi_order_list_boot_no_data_view"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="40dp"
-        android:layout_marginBottom="40dp"
+        android:layout_marginTop="80px"
+        android:layout_marginBottom="80px"
         android:layout_below="@+id/order_item_cl"
         android:layout_centerHorizontal="true"/>
 
diff --git a/OCH/mogo-och-taxi/src/main/res/layout/taxi_orders_list_view.xml b/OCH/mogo-och-taxi/src/main/res/layout/taxi_orders_list_view.xml
index 8180be85fa..65fe651d0d 100644
--- a/OCH/mogo-och-taxi/src/main/res/layout/taxi_orders_list_view.xml
+++ b/OCH/mogo-och-taxi/src/main/res/layout/taxi_orders_list_view.xml
@@ -12,16 +12,16 @@
 
         <Button
             android:id="@+id/module_och_taxi_order_list_show_bt"
-            android:layout_width="308dp"
-            android:layout_height="66dp"
+            android:layout_width="@dimen/taxi_order_list_show_bt_width"
+            android:layout_height="@dimen/taxi_order_list_show_bt_height"
             android:layout_centerHorizontal="true"
             android:layout_gravity="center_horizontal"
-            android:layout_marginTop="103dp"
+            android:layout_marginTop="206px"
             android:background="@drawable/taxi_show_orders_bg"
             android:drawableLeft="@drawable/taxi_order_list_page"
             android:gravity="center"
-            android:paddingLeft="77dp"
-            android:paddingRight="66dp"
+            android:paddingLeft="154px"
+            android:paddingRight="132px"
             android:text="查看全部订单"
             android:textColor="#FFFFFFFF"
             android:textSize="22sp" />
@@ -29,21 +29,21 @@
         <TextView
             android:id="@+id/module_och_taxi_operation_data_title"
             android:layout_width="wrap_content"
-            android:layout_height="43dp"
+            android:layout_height="86px"
             android:layout_below="@+id/module_och_taxi_order_list_show_bt"
-            android:layout_marginLeft="40dp"
-            android:layout_marginTop="56dp"
+            android:layout_marginLeft="80px"
+            android:layout_marginTop="112px"
             android:gravity="center"
             android:text="出租车运营数据:"
             android:textColor="#FFFFFF"
             android:textSize="22sp" />
 
         <View
-            android:layout_width="7dp"
-            android:layout_height="25dp"
+            android:layout_width="14px"
+            android:layout_height="50px"
             android:layout_below="@+id/module_och_taxi_order_list_show_bt"
-            android:layout_marginLeft="23.5dp"
-            android:layout_marginTop="66dp"
+            android:layout_marginLeft="47px"
+            android:layout_marginTop="132px"
             android:background="#2966EC" />
 
         <com.google.android.material.tabs.TabLayout
@@ -52,20 +52,20 @@
             android:layout_height="wrap_content"
             android:layout_below="@+id/module_och_taxi_operation_data_title"
             app:tabMode="fixed"
-            android:layout_marginLeft="40dp"
-            android:layout_marginTop="15dp"
-            app:tabIndicatorHeight="0dp"
-            app:tabMaxWidth="150dp"
-            app:tabMinWidth="120dp"
+            android:layout_marginLeft="80px"
+            android:layout_marginTop="30px"
+            app:tabIndicatorHeight="0px"
+            app:tabMaxWidth="@dimen/taxi_order_list_tab_max_weight"
+            app:tabMinWidth="@dimen/taxi_order_list_tab_min_weight"
             app:tabSelectedTextColor="#FFFFFF"
             app:tabTextColor="#A7B6F0" />
 
         <androidx.viewpager.widget.ViewPager
             android:id="@+id/operation_data_viewpager"
             android:layout_width="match_parent"
-            android:layout_height="410dp"
-            android:layout_marginLeft="40dp"
-            android:layout_marginRight="40dp"
+            android:layout_height="820px"
+            android:layout_marginLeft="80px"
+            android:layout_marginRight="80px"
             app:layout_constraintStart_toStartOf="parent"
             android:layout_below="@+id/operation_data_tablayout" />
 
@@ -79,7 +79,7 @@
             android:id="@+id/module_och_taxi_order_list"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingBottom="47dp">
+            android:paddingBottom="94px">
 
         </androidx.recyclerview.widget.RecyclerView>
     </RelativeLayout>
@@ -90,10 +90,10 @@
         layout="@layout/taxi_no_data_common_view"/>
     <ImageView
         android:id="@+id/module_och_taxi_order_list_close_iv"
-        android:layout_width="75dp"
-        android:layout_height="75dp"
+        android:layout_width="150px"
+        android:layout_height="150px"
         android:layout_gravity="right"
-        android:padding="15dp"
+        android:padding="30px"
         android:src="@drawable/taxi_order_cancel_close1" />
 
 </FrameLayout>
diff --git a/OCH/mogo-och-taxi/src/main/res/layout/taxi_panel.xml b/OCH/mogo-och-taxi/src/main/res/layout/taxi_panel.xml
index e26d186d8b..e5357ee50f 100644
--- a/OCH/mogo-och-taxi/src/main/res/layout/taxi_panel.xml
+++ b/OCH/mogo-och-taxi/src/main/res/layout/taxi_panel.xml
@@ -4,10 +4,10 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     app:shadowColor="#C7151D4C"
-    app:shadowRadius="21dp"
-    app:blurRadius="10dp"
-    app:xOffset="0dp"
-    app:yOffset="0dp"
+    app:shadowRadius="42px"
+    app:blurRadius="20px"
+    app:xOffset="0px"
+    app:yOffset="0px"
     app:bgColor="@android:color/transparent">
     <FrameLayout
         android:id="@+id/fragment_container"
diff --git a/OCH/mogo-och-taxi/src/main/res/layout/taxi_reserve_orders.xml b/OCH/mogo-och-taxi/src/main/res/layout/taxi_reserve_orders.xml
index 4f6cacc1a1..4228dcda02 100644
--- a/OCH/mogo-och-taxi/src/main/res/layout/taxi_reserve_orders.xml
+++ b/OCH/mogo-och-taxi/src/main/res/layout/taxi_reserve_orders.xml
@@ -20,14 +20,14 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:layout_constraintBottom_toBottomOf="parent"
-        android:layout_marginBottom="120dp"
+        android:layout_marginBottom="240px"
         layout="@layout/taxi_no_data_common_view"/>
 
     <include
         android:id="@+id/list_boot_refresh_no_data_view"
         layout="@layout/taxi_order_list_boot_no_data_view"
-        android:layout_width="200dp"
-        android:layout_height="80dp"
+        android:layout_width="@dimen/taxi_order_list_boot_refresh_no_data_view_width"
+        android:layout_height="@dimen/taxi_order_list_boot_refresh_no_data_view_height"
         app:layout_constraintTop_toBottomOf="@+id/order_to_be_served_rv"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"/>
diff --git a/OCH/mogo-och-taxi/src/main/res/layout/taxi_server_orders_panel.xml b/OCH/mogo-och-taxi/src/main/res/layout/taxi_server_orders_panel.xml
index 62ced4e516..9ce89e8452 100644
--- a/OCH/mogo-och-taxi/src/main/res/layout/taxi_server_orders_panel.xml
+++ b/OCH/mogo-och-taxi/src/main/res/layout/taxi_server_orders_panel.xml
@@ -13,9 +13,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tabMode="fixed"
-        app:tabIndicatorHeight="0dp"
-        app:tabMinWidth="140dp"
-        app:tabMaxWidth="140dp"
+        app:tabIndicatorHeight="0px"
+        app:tabMinWidth="280px"
+        app:tabMaxWidth="280px"
         app:tabIndicatorFullWidth="false"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -27,7 +27,7 @@
     <androidx.viewpager.widget.ViewPager
         android:id="@+id/module_och_taxi_view_pager"
         android:layout_width="wrap_content"
-        android:layout_height="399dp"
+        android:layout_height="798px"
         android:overScrollMode="never"
         android:background="@drawable/taxi_order_viewpager_bg"
         app:layout_constraintTop_toBottomOf="@+id/module_och_taxi_tab"
@@ -36,8 +36,8 @@
         android:id="@+id/wait_order_num"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="5dp"
-        android:layout_marginRight="20dp"
+        android:layout_marginTop="10px"
+        android:layout_marginRight="40px"
         android:gravity="center"
         android:textSize="15sp"
         android:textColor="@android:color/white"
@@ -49,16 +49,16 @@
         app:layout_constraintTop_toTopOf="parent"/>
     <View
         android:id="@+id/module_och_taxi_order_status_divider"
-        android:layout_width="0dp"
-        android:layout_height="2dp"
+        android:layout_width="0px"
+        android:layout_height="4px"
         android:background="@drawable/taxi_line_bg1"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/module_och_taxi_tab" />
     <View
         android:id="@+id/module_och_taxi_order_status_divider1"
-        android:layout_width="0dp"
-        android:layout_height="2dp"
+        android:layout_width="0px"
+        android:layout_height="4px"
         android:background="@drawable/taxi_line_bg2"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="@+id/module_och_taxi_order_status_divider"
diff --git a/OCH/mogo-och-taxi/src/main/res/layout/taxi_tab_item_custom.xml b/OCH/mogo-och-taxi/src/main/res/layout/taxi_tab_item_custom.xml
index 993dda928e..58e7e988be 100644
--- a/OCH/mogo-och-taxi/src/main/res/layout/taxi_tab_item_custom.xml
+++ b/OCH/mogo-och-taxi/src/main/res/layout/taxi_tab_item_custom.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="140dp"
-    android:layout_height="60dp"
+    android:layout_width="@dimen/taxi_tab_item_custom_width"
+    android:layout_height="@dimen/taxi_tab_item_custom_height"
     android:id="@+id/tab_title"
     android:gravity="center"
     android:text="进行中"
     android:textColor="#CCD4F5"
     android:textSize="18sp"
     android:textStyle="bold"
-    android:layout_marginTop="4.5dp"/>
\ No newline at end of file
+    android:layout_marginTop="9px"/>
\ No newline at end of file
diff --git a/OCH/mogo-och-taxi/src/main/res/values-xhdpi-2560x1600/dimens.xml b/OCH/mogo-och-taxi/src/main/res/values-xhdpi-2560x1600/dimens.xml
deleted file mode 100644
index bc5daa9277..0000000000
--- a/OCH/mogo-och-taxi/src/main/res/values-xhdpi-2560x1600/dimens.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <dimen name="module_och_taxi_panel_width">280dp</dimen>
-    <dimen name="module_och_taxi_panel_height">406dp</dimen>
-<!--    <dimen name="module_mogo_och_taxi_order_cancel_width">400dp</dimen>-->
-<!--    <dimen name="module_mogo_och_taxi_order_cancel_height">285dp</dimen>-->
-</resources>
\ No newline at end of file