diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_bottom_bar_bg.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_bottom_bar_bg.png
index 0043b0bf15..e57ab24b01 100644
Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_bottom_bar_bg.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_bottom_bar_bg.png differ
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_map_car.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_map_car.png
index dedaf093e9..3dc7578590 100644
Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_map_car.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_map_car.png differ
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_map_car_light.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_map_car_light.png
new file mode 100644
index 0000000000..c980c18981
Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_map_car_light.png differ
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_status_bg.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_status_bg.png
index ea6962bfca..9ef3dedd65 100644
Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_status_bg.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_status_bg.png differ
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_start_autopilot_bottom_bg.xml b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_start_autopilot_bottom_bg.xml
new file mode 100644
index 0000000000..54909012c8
--- /dev/null
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_start_autopilot_bottom_bg.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <gradient android:endColor="@color/taxi_p_5D6A8C" android:centerColor="@color/taxi_p_995D6A8C" android:startColor="@color/taxi_p_005D6A8C" android:angle="270"/>
+</shape>
\ No newline at end of file
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_arrived_end_panel.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_arrived_end_panel.xml
index 12245e03ec..17ce3f897d 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_arrived_end_panel.xml
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_arrived_end_panel.xml
@@ -19,8 +19,8 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         android:src="@drawable/taxi_p_passenger_arrived_close"
-        android:layout_marginEnd="@dimen/dp_70"
-        android:layout_marginTop="@dimen/dp_140"
+        android:layout_marginEnd="@dimen/dp_50"
+        android:layout_marginTop="@dimen/dp_50"
         android:layout_width="@dimen/dp_120"
         android:layout_height="@dimen/dp_120"/>
 
@@ -70,6 +70,7 @@
         android:layout_height="@dimen/dp_339"/>
 
     <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/actv_title_01"
         app:layout_constraintStart_toStartOf="@+id/v_xiaozhi_belt_info_bg"
         app:layout_constraintEnd_toEndOf="@+id/v_xiaozhi_belt_info_bg"
         app:layout_constraintTop_toTopOf="@+id/v_xiaozhi_belt_info_bg"
@@ -82,9 +83,8 @@
 
 
     <androidx.appcompat.widget.AppCompatTextView
-        app:layout_constraintEnd_toEndOf="@+id/v_xiaozhi_belt_info_bg"
         app:layout_constraintBottom_toBottomOf="@+id/v_xiaozhi_belt_info_bg"
-        app:layout_constraintStart_toStartOf="@+id/v_xiaozhi_belt_info_bg"
+        app:layout_constraintStart_toStartOf="@+id/actv_title_01"
         android:layout_marginBottom="@dimen/dp_67"
         android:text="记得在小程序完成支付哦~"
         android:textColor="@android:color/white"
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml
index 899dac7440..eb7cbdbcd4 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml
@@ -12,6 +12,8 @@
         app:resetDrawable="@null"
         app:startPointDrawable="@drawable/taxi_p_map_view_dir_start"
         app:endPointDrawable="@drawable/taxi_p_map_view_dir_end"
+        app:carDrawable="@drawable/taxi_p_map_car"
+        app:compassDrawable="@drawable/taxi_p_map_car_light"
         app:mapStyleExtraPath="style_extra.data"
         app:mapStylePath="style.data"
         app:leftPadding="80"
@@ -132,10 +134,9 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         android:layout_marginEnd="@dimen/dp_82"
-        android:src="@drawable/taxi_p_xioazhi_normal"
         android:layout_marginBottom="@dimen/dp_28"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
+        android:layout_width="@dimen/dp_216"
+        android:layout_height="@dimen/dp_216"/>
 
     <!--气泡态消息盒子-->
     <com.mogo.eagle.core.function.hmi.ui.msgbox.PassengerMsgBoxBubbleView
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_bottom_bar.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_bottom_bar.xml
index 6e5c34b59a..a43e39baef 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_bottom_bar.xml
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_bottom_bar.xml
@@ -13,12 +13,13 @@
         android:format12Hour="M月d日 HH:mm"
         android:format24Hour="M月d日 HH:mm"
         android:gravity="center"
+        android:fontFamily="@font/din"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
         android:textColor="@color/taxi_p_111D2F"
         android:textSize="@dimen/dp_52"
-        android:layout_marginStart="@dimen/dp_120"
+        android:layout_marginStart="@dimen/dp_92"
         android:letterSpacing="-0.05"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"/>
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_itinerary.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_itinerary.xml
index 2330ffc027..7ef46d3e44 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_itinerary.xml
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_itinerary.xml
@@ -23,6 +23,7 @@
         android:layout_marginStart="@dimen/dp_90"
         android:textColor="@color/taxi_p_203555"
         android:textSize="@dimen/dp_150"
+        android:fontFamily="@font/din"
         android:textScaleX="0.9"
         android:textStyle="bold"
         app:layout_constraintStart_toStartOf="parent"
@@ -84,6 +85,7 @@
         android:layout_marginTop="@dimen/dp_51"
         android:layout_marginStart="@dimen/dp_58"
         android:textSize="@dimen/dp_61"
+        android:fontFamily="@font/din"
         app:layout_constraintHorizontal_chainStyle="spread"
         android:textColor="@color/taxi_p_081831"
         app:layout_constraintEnd_toStartOf="@+id/actv_surplus_time"
@@ -108,6 +110,7 @@
         android:layout_height="wrap_content"
         android:gravity="center"
         android:textSize="@dimen/dp_61"
+        android:fontFamily="@font/din"
         android:textColor="@color/taxi_p_081831"
         app:layout_constraintEnd_toStartOf="@+id/actv_arrived_time"
         app:layout_constraintStart_toEndOf="@+id/actv_distance"
@@ -134,6 +137,7 @@
         android:textColor="@color/taxi_p_081831"
         android:layout_marginEnd="@dimen/dp_58"
         android:text="--"
+        android:fontFamily="@font/din"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/actv_surplus_time"
         app:layout_constraintTop_toTopOf="@+id/actv_distance" />
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_start_autopilot_view.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_start_autopilot_view.xml
index 57256d0982..29d38613a5 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_start_autopilot_view.xml
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_start_autopilot_view.xml
@@ -23,8 +23,8 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         android:src="@drawable/taxi_p_passenger_arrived_close"
-        android:layout_marginEnd="@dimen/dp_70"
-        android:layout_marginTop="@dimen/dp_140"
+        android:layout_marginEnd="@dimen/dp_50"
+        android:layout_marginTop="@dimen/dp_50"
         android:layout_width="@dimen/dp_120"
         android:layout_height="@dimen/dp_120"/>
 
@@ -54,6 +54,12 @@
         app:layout_constraintLeft_toLeftOf="@+id/taxi_p_autopilot_btn_bg"
         app:layout_constraintRight_toRightOf="@+id/taxi_p_autopilot_btn_bg" />
 
+    
+    <View
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:background="@drawable/taxi_p_start_autopilot_bottom_bg"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_250"/>
 
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/actv_orderinfo"
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/values/colors.xml b/OCH/mogo-och-taxi-passenger/src/main/res/values/colors.xml
index 8c2c25ab4d..5ab1c03c92 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/res/values/colors.xml
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/values/colors.xml
@@ -86,6 +86,9 @@
     <color name="taxi_p_255BAA">#255BAA</color>
     <color name="taxi_p_80F8FF">#80F8FF</color>
     <color name="taxi_p_2B364B">#2B364B</color>
+    <color name="taxi_p_005D6A8C">#005D6A8C</color>
+    <color name="taxi_p_5D6A8C">#5D6A8C</color>
+    <color name="taxi_p_995D6A8C">#995D6A8C</color>
 
 
 
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/values/styles.xml b/OCH/mogo-och-taxi-passenger/src/main/res/values/styles.xml
index 3ebb46664d..886f90766d 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/res/values/styles.xml
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/values/styles.xml
@@ -12,6 +12,7 @@
     </style>
 
     <style name="och_check_number_checked">
+        <item name="android:fontFamily">@font/din</item>
         <item name="android:background">@drawable/bg_taxi_p_checked_input_background</item>
         <item name="android:textColor">@color/taxi_p_check_keyboard_input_field_checked</item>
     </style>
@@ -23,6 +24,7 @@
         <item name="android:shadowRadius">20</item>
         <item name="android:textSize">@dimen/dp_87</item>
         <item name="android:gravity">center</item>
+        <item name="android:fontFamily">@font/din</item>
         <item name="android:layout_width">@dimen/dp_173</item>
         <item name="android:layout_height">@dimen/dp_173</item>
     </style>
@@ -32,6 +34,7 @@
         <item name="android:layout_height">@dimen/dp_92</item>
         <item name="android:background">@drawable/bg_taxi_p_keyboard_background</item>
         <item name="android:gravity">center</item>
+        <item name="android:fontFamily">@font/din</item>
         <item name="android:textColor">@color/taxi_p_282F62</item>
         <item name="android:textSize">@dimen/dp_65</item>
     </style>