diff --git a/OCH/mogo-och-bus/src/main/res/layout/fragment_och_bus.xml b/OCH/mogo-och-bus/src/main/res/layout/fragment_och_bus.xml
index b7a1745fbd..5845c787b4 100644
--- a/OCH/mogo-och-bus/src/main/res/layout/fragment_och_bus.xml
+++ b/OCH/mogo-och-bus/src/main/res/layout/fragment_och_bus.xml
@@ -2,8 +2,8 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="@dimen/module_och_bus_panel_width"
-    android:layout_height="@dimen/module_och_bus_panel_height"
+    android:layout_width="@dimen/module_mogo_och_autopilot_order_bg_width"
+    android:layout_height="@dimen/module_mogo_och_autopilot_order_bg_height"
     android:background="@drawable/module_och_bus_panel_bkg"
     android:orientation="vertical">
 
@@ -12,16 +12,16 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="right"
-        android:layout_marginTop="16px"
-        android:layout_marginRight="16px"
+        android:layout_marginTop="@dimen/module_mogo_och_autopilot_order_tag_m_t"
+        android:layout_marginRight="@dimen/module_mogo_och_autopilot_order_tag_m_r"
         android:background="@drawable/module_och_bus_panel_anchor_bkg"
-        android:paddingLeft="8px"
-        android:paddingTop="1px"
-        android:paddingRight="8px"
-        android:paddingBottom="1px"
+        android:paddingLeft="@dimen/module_mogo_och_autopilot_order_tag_p_r"
+        android:paddingTop="2px"
+        android:paddingRight="@dimen/module_mogo_och_autopilot_order_tag_p_r"
+        android:paddingBottom="2px"
         android:text="小巴车"
         android:textColor="#FFF"
-        android:textSize="16px"
+        android:textSize="@dimen/module_mogo_och_autopilot_order_tag_height"
         android:textStyle="bold" />
 
     <androidx.constraintlayout.widget.ConstraintLayout
@@ -40,7 +40,7 @@
             android:layout_marginLeft="14px"
             android:text="当前站点："
             android:textColor="#8E9DD4"
-            android:textSize="20px"
+            android:textSize="@dimen/module_och_bus_order_start_station_anchor_textSize"
             android:textStyle="bold"
             app:layout_constraintLeft_toRightOf="@+id/greenDot"
             app:layout_constraintTop_toTopOf="parent" />
@@ -50,8 +50,9 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="6px"
+            android:text="--"
             android:textColor="#FFF"
-            android:textSize="26px"
+            android:textSize="@dimen/module_mogo_och_bus_station_name_text_size"
             android:textStyle="bold"
             app:layout_constraintLeft_toLeftOf="@+id/module_och_bus_current_station_anchor"
             app:layout_constraintTop_toBottomOf="@+id/module_och_bus_current_station_anchor"
@@ -63,7 +64,7 @@
             android:layout_height="wrap_content"
             android:text="始"
             android:textColor="#8E9DD4"
-            android:textSize="20px"
+            android:textSize="@dimen/module_mogo_och_bus_station_notice_text_size"
             android:textStyle="bold"
             android:visibility="invisible"
             app:layout_constraintBottom_toBottomOf="@+id/module_och_bus_current_station"
@@ -75,10 +76,10 @@
             android:id="@+id/module_och_bus_next_station_anchor"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="27px"
+            android:layout_marginTop="@dimen/module_och_bus_order_distance_anchor_marginTop"
             android:text="下一站："
             android:textColor="#8E9DD4"
-            android:textSize="20px"
+            android:textSize="@dimen/module_och_bus_order_start_station_anchor_textSize"
             android:textStyle="bold"
             app:layout_constraintLeft_toLeftOf="@+id/module_och_bus_current_station"
             app:layout_constraintTop_toBottomOf="@+id/module_och_bus_current_station" />
@@ -87,8 +88,9 @@
             android:id="@+id/module_och_bus_order_end_station"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:text="--"
             android:textColor="#FFF"
-            android:textSize="@dimen/module_och_bus_order_start_station_textSize"
+            android:textSize="@dimen/module_mogo_och_bus_station_name_text_size"
             android:textStyle="bold"
             app:layout_constraintLeft_toLeftOf="@+id/module_och_bus_next_station_anchor"
             app:layout_constraintTop_toBottomOf="@+id/module_och_bus_next_station_anchor"
@@ -100,7 +102,7 @@
             android:layout_height="wrap_content"
             android:text="终"
             android:textColor="#8E9DD4"
-            android:textSize="20px"
+            android:textSize="@dimen/module_mogo_och_bus_station_notice_text_size"
             android:textStyle="bold"
             android:visibility="invisible"
             app:layout_constraintBottom_toBottomOf="@+id/module_och_bus_order_end_station"
@@ -121,13 +123,14 @@
         <ImageView
             android:id="@+id/dotLine"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="0dp"
+            android:scaleType="fitXY"
             android:src="@drawable/module_och_bus_dot_line"
+            app:layout_constraintBottom_toTopOf="@+id/blueDot"
             app:layout_constraintLeft_toLeftOf="@+id/greenDot"
             app:layout_constraintRight_toRightOf="@+id/greenDot"
             app:layout_constraintTop_toBottomOf="@+id/greenDot" />
 
-
         <ImageView
             android:id="@+id/blueDot"
             android:layout_width="wrap_content"
@@ -137,7 +140,6 @@
             app:layout_constraintLeft_toLeftOf="@+id/greenDot"
             app:layout_constraintTop_toTopOf="@+id/module_och_bus_order_end_station" />
 
-
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OCH/mogo-och-bus/src/main/res/values-xhdpi-2560x1600/dimens.xml b/OCH/mogo-och-bus/src/main/res/values-xhdpi-2560x1600/dimens.xml
new file mode 100644
index 0000000000..6df53a85b2
--- /dev/null
+++ b/OCH/mogo-och-bus/src/main/res/values-xhdpi-2560x1600/dimens.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!--  本套资源适配分体机xhdpi  -->
+    <dimen name="module_mogo_och_bus_station_panel_width">300px</dimen>
+    <dimen name="module_mogo_och_bus_station_panel_height">348px</dimen>
+    <dimen name="module_mogo_och_bus_two_station_panel_height">211px</dimen>
+    <dimen name="module_mogo_och_bus_three_station_panel_height">276px</dimen>
+
+
+    <dimen name="module_mogo_och_bus_station_list_height">220px</dimen>
+    <dimen name="module_mogo_och_bus_two_station_list_height">98px</dimen>
+    <dimen name="module_mogo_och_bus_three_station_list_height">159px</dimen>
+
+    <dimen name="module_mogo_och_bus_current_station_name_text_size">32px</dimen>
+    <dimen name="module_mogo_och_bus_current_station_notice_text_size">20px</dimen>
+    <dimen name="module_mogo_och_bus_station_name_text_size">41.6px</dimen>
+    <dimen name="module_mogo_och_bus_station_notice_text_size">32px</dimen>
+
+    <dimen name="module_mogo_och_bus_station_name_margin_left">15px</dimen>
+
+    <dimen name="module_mogo_och_bus_station_panel_padding_top">20px</dimen>
+    <dimen name="module_mogo_och_bus_station_panel_padding_left">36px</dimen>
+    <dimen name="module_mogo_och_bus_station_panel_padding_bottom">28px</dimen>
+    <dimen name="module_mogo_och_bus_station_panel_padding_right">36px</dimen>
+
+    <dimen name="module_mogo_och_bus_station_panel_guide_offset_left">3px</dimen>
+    <dimen name="module_mogo_och_bus_station_panel_guide_offset_right">3px</dimen>
+    <dimen name="module_mogo_och_bus_station_panel_guide_offset_top">17px</dimen>
+    <dimen name="module_mogo_och_bus_station_panel_guide_offset_bottom">17px</dimen>
+
+
+    <dimen name="module_och_bus_panel_width">300px</dimen>
+    <dimen name="module_och_bus_panel_height">270px</dimen>
+    <dimen name="module_och_bus_order_status_marginLeft">30px</dimen>
+    <dimen name="module_och_bus_order_status_marginTop">24px</dimen>
+    <dimen name="module_och_bus_order_status_textSize">24px</dimen>
+    <dimen name="module_och_bus_order_status_divider_height">1px</dimen>
+    <dimen name="module_och_bus_order_status_divider_marginLeft">30px</dimen>
+    <dimen name="module_och_bus_order_status_divider_marginTop">23px</dimen>
+    <dimen name="module_och_bus_order_status_divider_marginRight">30px</dimen>
+    <dimen name="module_och_bus_order_status_stationInfo_height">146px</dimen>
+    <dimen name="module_och_bus_order_status_stationInfo_paddingLeft">20px</dimen>
+    <dimen name="module_och_bus_order_status_stationInfo_paddingTop">23px</dimen>
+    <dimen name="module_och_bus_order_status_stationInfo_paddingRight">30px</dimen>
+    <dimen name="module_och_bus_order_status_stationInfo_paddingBottom">23px</dimen>
+    <dimen name="module_och_bus_order_start_station_textSize">26px</dimen>
+    <dimen name="module_och_bus_order_start_station_anchor_textSize">32px</dimen>
+    <dimen name="module_och_bus_order_end_station_anchor_textSize">20px</dimen>
+    <dimen name="module_och_bus_order_distance_container_height">80px</dimen>
+    <dimen name="module_och_bus_order_distance_container_marginLeft">3px</dimen>
+    <dimen name="module_och_bus_order_distance_anchor_marginTop">44.5px</dimen>
+    <dimen name="module_och_bus_order_distance_anchor_textSize">20px</dimen>
+    <dimen name="module_och_bus_order_distance_textSize">28px</dimen>
+    <dimen name="module_och_bus_order_distance_marginRight">27px</dimen>
+
+
+    <dimen name="module_mogo_och_autopilot_order_tag_height">25.6px</dimen>
+    <dimen name="module_mogo_och_autopilot_order_tag_m_t">20px</dimen>
+    <dimen name="module_mogo_och_autopilot_order_tag_m_r">20px</dimen>
+    <dimen name="module_mogo_och_autopilot_order_tag_p_r">16px</dimen>
+    <dimen name="module_mogo_och_autopilot_order_tag_p_l">16px</dimen>
+
+</resources>
\ No newline at end of file
diff --git a/OCH/mogo-och-bus/src/main/res/values/dimens.xml b/OCH/mogo-och-bus/src/main/res/values/dimens.xml
index db034e5867..38414718d2 100644
--- a/OCH/mogo-och-bus/src/main/res/values/dimens.xml
+++ b/OCH/mogo-och-bus/src/main/res/values/dimens.xml
@@ -48,10 +48,16 @@
     <dimen name="module_och_bus_order_end_station_anchor_textSize">20px</dimen>
     <dimen name="module_och_bus_order_distance_container_height">80px</dimen>
     <dimen name="module_och_bus_order_distance_container_marginLeft">3px</dimen>
-    <dimen name="module_och_bus_order_distance_anchor_marginLeft">27px</dimen>
+    <dimen name="module_och_bus_order_distance_anchor_marginTop">27px</dimen>
     <dimen name="module_och_bus_order_distance_anchor_textSize">20px</dimen>
     <dimen name="module_och_bus_order_distance_textSize">28px</dimen>
     <dimen name="module_och_bus_order_distance_marginRight">27px</dimen>
 
+    <dimen name="module_mogo_och_autopilot_order_tag_height">16px</dimen>
+    <dimen name="module_mogo_och_autopilot_order_tag_m_t">16px</dimen>
+    <dimen name="module_mogo_och_autopilot_order_tag_m_r">16px</dimen>
+    <dimen name="module_mogo_och_autopilot_order_tag_p_r">16px</dimen>
+    <dimen name="module_mogo_och_autopilot_order_tag_p_l">16px</dimen>
+
 
 </resources>
\ No newline at end of file
diff --git a/OCH/mogo-och/src/main/res/layout/module_mogo_och_base_fragment.xml b/OCH/mogo-och/src/main/res/layout/module_mogo_och_base_fragment.xml
index 3757a8f629..b020ce9082 100644
--- a/OCH/mogo-och/src/main/res/layout/module_mogo_och_base_fragment.xml
+++ b/OCH/mogo-och/src/main/res/layout/module_mogo_och_base_fragment.xml
@@ -14,9 +14,11 @@
         android:layout_marginTop="@dimen/module_mogo_och_station_panel_container_margin_top_no_call"
         android:background="@drawable/module_mogo_och_autopilot_status_bg"
         android:drawableLeft="@drawable/module_och_bus_ic_autopilot"
+        android:drawablePadding="@dimen/dp_10"
         android:elevation="@dimen/dp_10"
-        android:gravity="center"
-        android:paddingLeft="35px"
+        android:foregroundGravity="center"
+        android:gravity="center_vertical"
+        android:paddingLeft="@dimen/module_mogo_och_operation_status_padding"
         android:text="自动驾驶"
         android:textAlignment="center"
         android:textColor="@color/module_mogo_och_autopilot_text_color_normal"
@@ -28,12 +30,11 @@
 
     <FrameLayout
         android:id="@+id/module_mogo_och_station_panel_container"
-        android:layout_width="300px"
-        android:layout_height="270px"
-        android:layout_marginTop="16px"
+        android:layout_width="@dimen/module_mogo_och_autopilot_order_bg_width"
+        android:layout_height="@dimen/module_mogo_och_autopilot_order_bg_height"
+        android:layout_marginTop="@dimen/module_mogo_och_autopilot_order_m_t"
         android:background="@drawable/module_och_panel_bkg"
         android:elevation="@dimen/dp_10"
-        android:visibility="gone"
         app:layout_constraintLeft_toLeftOf="@+id/module_mogo_och_autopilot_status"
         app:layout_constraintTop_toBottomOf="@id/module_mogo_och_autopilot_status"
         app:layout_goneMarginTop="@dimen/module_mogo_och_station_panel_container_margin_top_no_call"
@@ -44,9 +45,9 @@
         android:layout_width="@dimen/module_mogo_och_operation_status_bg_width"
         android:layout_height="@dimen/module_mogo_och_operation_status_bg_height"
         android:background="@drawable/module_mogo_och_operation_status_bg"
-        android:gravity="center"
         android:elevation="@dimen/dp_10"
-        android:text="开启"
+        android:gravity="center"
+        android:text="出车"
         android:textAlignment="center"
         android:textColor="@color/module_mogo_och_autopilot_text_color_selector"
         android:textSize="@dimen/module_mogo_och_autopilot_status_text_size"
diff --git a/OCH/mogo-och/src/main/res/values-xhdpi-2560x1600/dimens.xml b/OCH/mogo-och/src/main/res/values-xhdpi-2560x1600/dimens.xml
new file mode 100644
index 0000000000..01184d5a1f
--- /dev/null
+++ b/OCH/mogo-och/src/main/res/values-xhdpi-2560x1600/dimens.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!--  此资源适配分体机 xhdpi  -->
+    <dimen name="module_mogo_och_margin_left">40px</dimen>
+    <dimen name="module_mogo_och_margin_right">40px</dimen>
+    <dimen name="module_mogo_och_margin_bottom">46px</dimen>
+    <dimen name="module_mogo_och_margin_top">24px</dimen>
+
+    <dimen name="module_mogo_och_station_panel_container_margin_top_no_call">530px</dimen>
+    <dimen name="module_mogo_och_station_panel_container_margin_top_with_call">492px</dimen>
+
+    <dimen name="module_mogo_och_autopilot_status_bg_corner">24px</dimen>
+    <dimen name="module_mogo_och_autopilot_status_bg_width">460px</dimen>
+    <dimen name="module_mogo_och_autopilot_status_bg_height">140px</dimen>
+
+    <dimen name="module_mogo_och_operation_status_bg_width">144px</dimen>
+    <dimen name="module_mogo_och_operation_status_bg_height">144px</dimen>
+
+    <dimen name="module_mogo_och_operation_status_padding">92px</dimen>
+
+    <dimen name="module_mogo_och_autopilot_order_m_t">30px</dimen>
+    <dimen name="module_mogo_och_autopilot_order_bg_width">466px</dimen>
+    <dimen name="module_mogo_och_autopilot_order_bg_height">414px</dimen>
+
+
+    <dimen name="module_mogo_och_autopilot_status_text_size">44px</dimen>
+    <dimen name="module_mogo_och_autopilot_status_text_padding_top">13px</dimen>
+    <dimen name="module_mogo_och_autopilot_status_text_drawable_padding">12px</dimen>
+
+    <dimen name="module_mogo_och_notice_text_max_width">460px</dimen>
+    <dimen name="module_mogo_och_notice_text_size">30px</dimen>
+
+</resources>
\ No newline at end of file
diff --git a/OCH/mogo-och/src/main/res/values/dimens.xml b/OCH/mogo-och/src/main/res/values/dimens.xml
index c08ce46182..f20425eba8 100644
--- a/OCH/mogo-och/src/main/res/values/dimens.xml
+++ b/OCH/mogo-och/src/main/res/values/dimens.xml
@@ -12,9 +12,16 @@
     <dimen name="module_mogo_och_autopilot_status_bg_corner">24px</dimen>
     <dimen name="module_mogo_och_autopilot_status_bg_width">300px</dimen>
     <dimen name="module_mogo_och_autopilot_status_bg_height">100px</dimen>
+
     <dimen name="module_mogo_och_operation_status_bg_width">108px</dimen>
     <dimen name="module_mogo_och_operation_status_bg_height">108px</dimen>
 
+    <dimen name="module_mogo_och_operation_status_padding">35px</dimen>
+
+    <dimen name="module_mogo_och_autopilot_order_m_t">30px</dimen>
+    <dimen name="module_mogo_och_autopilot_order_bg_width">300px</dimen>
+    <dimen name="module_mogo_och_autopilot_order_bg_height">270px</dimen>
+
     <dimen name="module_mogo_och_autopilot_status_text_size">30px</dimen>
     <dimen name="module_mogo_och_autopilot_status_text_padding_top">13px</dimen>
     <dimen name="module_mogo_och_autopilot_status_text_drawable_padding">12px</dimen>
diff --git a/modules/mogo-module-common/src/main/res/raw/motorbike.n3d b/modules/mogo-module-common/src/main/res/raw/motorbike.n3d
index 8e1ca5958a..dc95af0f2c 100644
Binary files a/modules/mogo-module-common/src/main/res/raw/motorbike.n3d and b/modules/mogo-module-common/src/main/res/raw/motorbike.n3d differ