diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index b569ae3318..904f2b0e0d 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -91,6 +91,7 @@
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
+        <option name="useQualifiedModuleNames" value="true" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/adapter/OchBusStationAdapter.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/adapter/OchBusStationAdapter.java
index 9c1d54a25f..f46502e624 100644
--- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/adapter/OchBusStationAdapter.java
+++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/adapter/OchBusStationAdapter.java
@@ -59,18 +59,18 @@ public class OchBusStationAdapter extends RecyclerView.Adapter<OchBusStationAdap
             if (currentStation == 0) {
                 // 在起始点
                 holder.tvStationName.setTextColor(context.getResources().getColor(R.color.module_mogo_och_bus_arrived_station_name_text_color));
-                holder.ivIcon.setImageResource(R.drawable.module_mogo_och_bus_icon_arrived_station);
+                holder.ivIcon.setImageResource(R.drawable.module_mogo_och_icon_arrived_station);
                 holder.vDashBottom.setColor(context.getResources().getColor(R.color.module_mogo_och_bus_not_arrive_dash_color));
             } else {
                 holder.tvStationName.setTextColor(context.getResources().getColor(R.color.module_mogo_och_bus_current_station_name_text_color));
-                holder.ivIcon.setImageResource(R.drawable.module_mogo_och_bus_icon_arriving_station);
+                holder.ivIcon.setImageResource(R.drawable.module_mogo_och_icon_arriving_station);
                 holder.vDashTop.setGradient(context.getResources().getColor(R.color.module_mogo_och_bus_arriving_start_dash_color), context.getResources().getColor(R.color.module_mogo_och_bus_arriving_end_dash_color));
                 holder.vDashBottom.setColor(context.getResources().getColor(R.color.module_mogo_och_bus_not_arrive_dash_color));
             }
         } else if (position < currentStation) {
             // 驶过
             holder.tvStationName.setTextColor(context.getResources().getColor(R.color.module_mogo_och_bus_arrived_station_name_text_color));
-            holder.ivIcon.setImageResource(R.drawable.module_mogo_och_bus_icon_arrived_station);
+            holder.ivIcon.setImageResource(R.drawable.module_mogo_och_icon_arrived_station);
             if (position == currentStation - 1) {
                 holder.vDashBottom.setGradient(context.getResources().getColor(R.color.module_mogo_och_bus_leaving_start_dash_color), context.getResources().getColor(R.color.module_mogo_och_bus_leaving_end_dash_color));
                 holder.vDashTop.setColor(context.getResources().getColor(R.color.module_mogo_och_bus_arrived_dash_color));
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..f2b8dfca44 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"
@@ -113,7 +115,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="14px"
-            android:src="@drawable/module_mogo_och_bus_icon_arrived_station"
+            android:src="@drawable/module_mogo_och_icon_arrived_station"
             app:layout_constraintBottom_toBottomOf="@+id/module_och_bus_current_station"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintTop_toTopOf="@+id/module_och_bus_current_station" />
@@ -121,23 +123,23 @@
         <ImageView
             android:id="@+id/dotLine"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:src="@drawable/module_och_bus_dot_line"
+            android:layout_height="0dp"
+            android:scaleType="fitXY"
+            android:src="@drawable/module_och_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"
             android:layout_height="wrap_content"
-            android:src="@drawable/module_mogo_och_bus_icon_arriving_station"
+            android:src="@drawable/module_mogo_och_icon_arriving_station"
             app:layout_constraintBottom_toBottomOf="@+id/module_och_bus_order_end_station"
             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/layout/item_och_bus_station.xml b/OCH/mogo-och-bus/src/main/res/layout/item_och_bus_station.xml
index d777f2d0d6..25ac60ead5 100644
--- a/OCH/mogo-och-bus/src/main/res/layout/item_och_bus_station.xml
+++ b/OCH/mogo-och-bus/src/main/res/layout/item_och_bus_station.xml
@@ -26,7 +26,7 @@
         android:layout_width="20px"
         android:layout_height="20px"
         android:scaleType="center"
-        android:src="@drawable/module_mogo_och_bus_icon_arrived_station"
+        android:src="@drawable/module_mogo_och_icon_arrived_station"
         app:layout_constraintBottom_toBottomOf="@id/module_mogo_och_bus_station_name"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintVertical_bias="0.4"
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..81c5fe7e4e
--- /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">42px</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-taxi/src/main/res/drawable-xhdpi/module_och_taxi_blue_dot.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/module_och_taxi_blue_dot.png
deleted file mode 100644
index e1fd463963..0000000000
Binary files a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/module_och_taxi_blue_dot.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/module_och_taxi_dot_line.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/module_och_taxi_dot_line.png
deleted file mode 100644
index 186001352c..0000000000
Binary files a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/module_och_taxi_dot_line.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/module_och_taxi_green_dot.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/module_och_taxi_green_dot.png
deleted file mode 100644
index a676a789c3..0000000000
Binary files a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/module_och_taxi_green_dot.png and /dev/null differ
diff --git a/OCH/mogo-och-taxi/src/main/res/layout/module_och_taxi_panel.xml b/OCH/mogo-och-taxi/src/main/res/layout/module_och_taxi_panel.xml
index 0f357cd739..888fec075e 100644
--- a/OCH/mogo-och-taxi/src/main/res/layout/module_och_taxi_panel.xml
+++ b/OCH/mogo-och-taxi/src/main/res/layout/module_och_taxi_panel.xml
@@ -1,45 +1,55 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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="300px"
-    android:layout_height="270px"
+    android:layout_width="@dimen/module_mogo_och_autopilot_order_bg_width"
+    android:layout_height="@dimen/module_mogo_och_autopilot_order_bg_height"
     android:orientation="vertical">
 
     <TextView
         android:id="@+id/module_och_taxi_order_status"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginLeft="@dimen/module_och_taxi_order_status_marginLeft"
         android:layout_marginTop="@dimen/module_och_taxi_order_status_marginTop"
         android:text="@string/module_och_taxi_order_status_ph_text"
         android:textColor="@color/module_och_order_status_textColor"
         android:textSize="@dimen/module_och_taxi_order_status_textSize"
-        android:textStyle="bold" />
+        android:textStyle="bold"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <View
         android:id="@+id/module_och_taxi_order_status_divider"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="@dimen/module_och_taxi_order_status_divider_height"
         android:layout_marginLeft="@dimen/module_och_taxi_order_status_divider_marginLeft"
         android:layout_marginTop="@dimen/module_och_taxi_order_status_divider_marginTop"
         android:layout_marginRight="@dimen/module_och_taxi_order_status_divider_marginRight"
-        android:background="@color/module_och_taxi_order_status_divider_bkgColor" />
+        android:background="@color/module_och_taxi_order_status_divider_bkgColor"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/module_och_taxi_order_status" />
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/module_och_taxi_order_status_stationInfo"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/module_och_taxi_order_status_stationInfo_height"
+        android:layout_height="0dp"
         android:paddingLeft="@dimen/module_och_taxi_order_status_stationInfo_paddingLeft"
         android:paddingTop="@dimen/module_och_taxi_order_status_stationInfo_paddingTop"
         android:paddingRight="@dimen/module_och_taxi_order_status_stationInfo_paddingRight"
-        android:paddingBottom="@dimen/module_och_taxi_order_status_stationInfo_paddingBottom">
+        android:paddingBottom="@dimen/module_och_taxi_order_status_stationInfo_paddingBottom"
+        app:layout_constraintBottom_toTopOf="@+id/module_och_taxi_order_distance_container"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/module_och_taxi_order_status_divider">
 
         <ImageView
             android:id="@+id/greenDot"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:src="@drawable/module_och_taxi_green_dot"
+            android:src="@drawable/module_mogo_och_icon_arriving_station"
             app:layout_constraintBottom_toBottomOf="@+id/module_och_taxi_order_start_station"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintTop_toTopOf="@+id/module_och_taxi_order_start_station" />
@@ -48,7 +58,7 @@
             android:id="@+id/module_och_taxi_order_start_station"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="5px"
+            android:layout_marginLeft="@dimen/module_och_taxi_order_start_station_marginLeft"
             android:textColor="@color/module_och_order_status_textColor"
             android:textSize="@dimen/module_och_taxi_order_start_station_textSize"
             android:textStyle="bold"
@@ -72,17 +82,18 @@
             android:id="@+id/dotLine"
             android:layout_width="wrap_content"
             android:layout_height="0dp"
-            android:src="@drawable/module_och_taxi_dot_line"
+            android:scaleType="fitXY"
+            android:src="@drawable/module_och_dot_line"
+            app:layout_constraintBottom_toTopOf="@+id/blueDot"
             app:layout_constraintLeft_toLeftOf="@+id/greenDot"
             app:layout_constraintRight_toRightOf="@+id/greenDot"
-            app:layout_constraintBottom_toTopOf="@+id/blueDot"
             app:layout_constraintTop_toBottomOf="@+id/greenDot" />
 
         <ImageView
             android:id="@+id/blueDot"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:src="@drawable/module_och_taxi_blue_dot"
+            android:src="@drawable/module_mogo_och_icon_arrived_station"
             app:layout_constraintBottom_toBottomOf="@+id/module_och_taxi_order_end_station"
             app:layout_constraintLeft_toLeftOf="@+id/greenDot"
             app:layout_constraintTop_toTopOf="@+id/module_och_taxi_order_end_station" />
@@ -118,7 +129,10 @@
         android:id="@+id/module_och_taxi_order_distance_container"
         android:layout_width="match_parent"
         android:layout_height="@dimen/module_och_taxi_order_distance_container_height"
-        android:background="@drawable/module_och_taxi_panel_distance_bkg">
+        android:background="@drawable/module_och_taxi_panel_distance_bkg"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent">
 
         <TextView
             android:id="@+id/module_och_taxi_order_distance_anchor"
@@ -146,4 +160,4 @@
             app:layout_constraintLeft_toRightOf="@+id/greenDot" />
     </FrameLayout>
 
-</LinearLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/OCH/mogo-och-taxi/src/main/res/values-xhdpi/dimens.xml b/OCH/mogo-och-taxi/src/main/res/values-xhdpi-2560x1600/dimens.xml
similarity index 76%
rename from OCH/mogo-och-taxi/src/main/res/values-xhdpi/dimens.xml
rename to OCH/mogo-och-taxi/src/main/res/values-xhdpi-2560x1600/dimens.xml
index 2ca27f9ddf..95796c9ef6 100644
--- a/OCH/mogo-och-taxi/src/main/res/values-xhdpi/dimens.xml
+++ b/OCH/mogo-och-taxi/src/main/res/values-xhdpi-2560x1600/dimens.xml
@@ -2,8 +2,9 @@
 <resources>
     <dimen name="module_och_taxi_panel_width">464px</dimen>
     <dimen name="module_och_taxi_panel_height">310px</dimen>
-    <dimen name="module_och_taxi_order_status_marginLeft">20px</dimen>
-    <dimen name="module_och_taxi_order_status_marginTop">20px</dimen>
+    <dimen name="module_och_taxi_order_start_station_marginLeft">15px</dimen>
+    <dimen name="module_och_taxi_order_status_marginLeft">25px</dimen>
+    <dimen name="module_och_taxi_order_status_marginTop">25px</dimen>
     <dimen name="module_och_taxi_order_status_textSize">20px</dimen>
     <dimen name="module_och_taxi_order_status_divider_height">1px</dimen>
     <dimen name="module_och_taxi_order_status_divider_marginLeft">20px</dimen>
@@ -11,16 +12,16 @@
     <dimen name="module_och_taxi_order_status_divider_marginRight">20px</dimen>
     <dimen name="module_och_taxi_order_status_stationInfo_height">140px</dimen>
     <dimen name="module_och_taxi_order_status_stationInfo_paddingLeft">20px</dimen>
-    <dimen name="module_och_taxi_order_status_stationInfo_paddingTop">20px</dimen>
+    <dimen name="module_och_taxi_order_status_stationInfo_paddingTop">41px</dimen>
     <dimen name="module_och_taxi_order_status_stationInfo_paddingRight">17px</dimen>
-    <dimen name="module_och_taxi_order_status_stationInfo_paddingBottom">20px</dimen>
-    <dimen name="module_och_taxi_order_start_station_textSize">26px</dimen>
-    <dimen name="module_och_taxi_order_start_station_anchor_textSize">20px</dimen>
-    <dimen name="module_och_taxi_order_end_station_anchor_textSize">20px</dimen>
-    <dimen name="module_och_taxi_order_distance_container_height">64px</dimen>
+    <dimen name="module_och_taxi_order_status_stationInfo_paddingBottom">41px</dimen>
+    <dimen name="module_och_taxi_order_start_station_textSize">42px</dimen>
+    <dimen name="module_och_taxi_order_start_station_anchor_textSize">32px</dimen>
+    <dimen name="module_och_taxi_order_end_station_anchor_textSize">32px</dimen>
+    <dimen name="module_och_taxi_order_distance_container_height">84px</dimen>
     <dimen name="module_och_taxi_order_distance_container_marginLeft">3px</dimen>
     <dimen name="module_och_taxi_order_distance_anchor_marginLeft">20px</dimen>
-    <dimen name="module_och_taxi_order_distance_anchor_textSize">20px</dimen>
-    <dimen name="module_och_taxi_order_distance_textSize">24px</dimen>
+    <dimen name="module_och_taxi_order_distance_anchor_textSize">32px</dimen>
+    <dimen name="module_och_taxi_order_distance_textSize">36px</dimen>
     <dimen name="module_och_taxi_order_distance_marginRight">17px</dimen>
 </resources>
\ No newline at end of file
diff --git a/OCH/mogo-och-taxi/src/main/res/values/dimens.xml b/OCH/mogo-och-taxi/src/main/res/values/dimens.xml
index 2ca27f9ddf..954782677b 100644
--- a/OCH/mogo-och-taxi/src/main/res/values/dimens.xml
+++ b/OCH/mogo-och-taxi/src/main/res/values/dimens.xml
@@ -2,6 +2,7 @@
 <resources>
     <dimen name="module_och_taxi_panel_width">464px</dimen>
     <dimen name="module_och_taxi_panel_height">310px</dimen>
+    <dimen name="module_och_taxi_order_start_station_marginLeft">5px</dimen>
     <dimen name="module_och_taxi_order_status_marginLeft">20px</dimen>
     <dimen name="module_och_taxi_order_status_marginTop">20px</dimen>
     <dimen name="module_och_taxi_order_status_textSize">20px</dimen>
diff --git a/OCH/mogo-och/src/main/java/com/mogo/och/view/SlidePanelView.java b/OCH/mogo-och/src/main/java/com/mogo/och/view/SlidePanelView.java
index db76a5e9f3..ee4785e198 100644
--- a/OCH/mogo-och/src/main/java/com/mogo/och/view/SlidePanelView.java
+++ b/OCH/mogo-och/src/main/java/com/mogo/och/view/SlidePanelView.java
@@ -3,6 +3,7 @@ package com.mogo.och.view;
 import android.animation.ObjectAnimator;
 import android.animation.ValueAnimator;
 import android.content.Context;
+import android.content.res.TypedArray;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Canvas;
@@ -41,6 +42,14 @@ public class SlidePanelView extends View {
 
     public SlidePanelView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
+        TypedArray mTypedArray = context.obtainStyledAttributes(attrs, R.styleable.SlidePanelView);
+        textSize = (int) mTypedArray.getDimension(R.styleable.SlidePanelView_textSize, textSize);
+        BLOCK_START_X = (int) mTypedArray.getDimension(R.styleable.SlidePanelView_BLOCK_START_X, BLOCK_START_X);
+        BLOCK_START_Y = (int) mTypedArray.getDimension(R.styleable.SlidePanelView_BLOCK_START_Y, BLOCK_START_Y);
+        NORMAL_TEXT_MARGIN_LEFT = (int) mTypedArray.getDimension(R.styleable.SlidePanelView_NORMAL_TEXT_MARGIN_LEFT, NORMAL_TEXT_MARGIN_LEFT);
+        NORMAL_TEXT_MARGIN_RIGHT = (int) mTypedArray.getDimension(R.styleable.SlidePanelView_NORMAL_TEXT_MARGIN_RIGHT, NORMAL_TEXT_MARGIN_RIGHT);
+        SHORT_TEXT_MARGIN_LEFT = (int) mTypedArray.getDimension(R.styleable.SlidePanelView_SHORT_TEXT_MARGIN_LEFT, SHORT_TEXT_MARGIN_LEFT);
+        SHORT_TEXT_MARGIN_RIGHT = (int) mTypedArray.getDimension(R.styleable.SlidePanelView_SHORT_TEXT_MARGIN_RIGHT, SHORT_TEXT_MARGIN_RIGHT);
         init();
     }
 
@@ -48,12 +57,13 @@ public class SlidePanelView extends View {
     private final Paint blockPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
     private final Paint textPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
 
-    private static final int BLOCK_START_X = 15;
-    private static final int BLOCK_START_Y = 15;
-    private static final int NORMAL_TEXT_MARGIN_LEFT = 40;
-    private static final int NORMAL_TEXT_MARGIN_RIGHT = 50;
-    private static final int SHORT_TEXT_MARGIN_LEFT = 60;
-    private static final int SHORT_TEXT_MARGIN_RIGHT = 70;
+    private static int textSize = 40;
+    private static int BLOCK_START_X = 15;
+    private static int BLOCK_START_Y = 15;
+    private static int NORMAL_TEXT_MARGIN_LEFT = 40;
+    private static int NORMAL_TEXT_MARGIN_RIGHT = 60;
+    private static int SHORT_TEXT_MARGIN_LEFT = 60;
+    private static int SHORT_TEXT_MARGIN_RIGHT = 70;
 
     private int textMarginLeft = NORMAL_TEXT_MARGIN_LEFT;
     private int textMarginRight = NORMAL_TEXT_MARGIN_RIGHT;
@@ -107,7 +117,7 @@ public class SlidePanelView extends View {
         bgPaint.setStyle(Paint.Style.FILL);
 
         textPaint.setStyle(Paint.Style.FILL);
-        textPaint.setTextSize(40);
+        textPaint.setTextSize(textSize);
         textPaint.setTextAlign(Paint.Align.LEFT);
         textGradient = new LinearGradient(-GRADIENT_OFFSET, 0, 0, 0, new int[]{0x33ffffff, 0xffffffff, 0x33ffffff}, null, Shader.TileMode.CLAMP);
         textGradient.setLocalMatrix(gradientMatrix);
diff --git a/OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_mogo_och_base_icon_not_in_autopilot.png b/OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_mogo_och_base_icon_not_in_autopilot.png
new file mode 100644
index 0000000000..927296d690
Binary files /dev/null and b/OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_mogo_och_base_icon_not_in_autopilot.png differ
diff --git a/OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_mogo_och_icon_arrived_station.png b/OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_mogo_och_icon_arrived_station.png
new file mode 100644
index 0000000000..8a065b66dd
Binary files /dev/null and b/OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_mogo_och_icon_arrived_station.png differ
diff --git a/OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_mogo_och_icon_arriving_station.png b/OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_mogo_och_icon_arriving_station.png
new file mode 100644
index 0000000000..4ed57a0e30
Binary files /dev/null and b/OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_mogo_och_icon_arriving_station.png differ
diff --git a/OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_och_base_slide_block.png b/OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_och_base_slide_block.png
new file mode 100644
index 0000000000..ed7b293b90
Binary files /dev/null and b/OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_och_base_slide_block.png differ
diff --git a/OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_och_dot_line.png b/OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_och_dot_line.png
new file mode 100644
index 0000000000..a720a532ea
Binary files /dev/null and b/OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_och_dot_line.png differ
diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/module_mogo_och_bus_icon_arrived_station.png b/OCH/mogo-och/src/main/res/drawable-xhdpi/module_mogo_och_icon_arrived_station.png
similarity index 100%
rename from OCH/mogo-och-bus/src/main/res/drawable-xhdpi/module_mogo_och_bus_icon_arrived_station.png
rename to OCH/mogo-och/src/main/res/drawable-xhdpi/module_mogo_och_icon_arrived_station.png
diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/module_mogo_och_bus_icon_arriving_station.png b/OCH/mogo-och/src/main/res/drawable-xhdpi/module_mogo_och_icon_arriving_station.png
similarity index 100%
rename from OCH/mogo-och-bus/src/main/res/drawable-xhdpi/module_mogo_och_bus_icon_arriving_station.png
rename to OCH/mogo-och/src/main/res/drawable-xhdpi/module_mogo_och_icon_arriving_station.png
diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/module_och_bus_dot_line.png b/OCH/mogo-och/src/main/res/drawable-xhdpi/module_och_dot_line.png
similarity index 100%
rename from OCH/mogo-och-bus/src/main/res/drawable-xhdpi/module_och_bus_dot_line.png
rename to OCH/mogo-och/src/main/res/drawable-xhdpi/module_och_dot_line.png
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..890e9ab8d8 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,11 +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_30"
         android:elevation="@dimen/dp_10"
-        android:gravity="center"
-        android:paddingLeft="35px"
+        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"
         android:textSize="@dimen/module_mogo_och_autopilot_status_text_size"
         android:textStyle="bold"
@@ -28,9 +28,9 @@
 
     <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"
@@ -43,25 +43,34 @@
         android:id="@+id/module_mogo_och_operation_status"
         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="@dimen/module_mogo_och_autopilot_status_text_m_l"
         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"
         android:textStyle="bold"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="@+id/module_mogo_och_autopilot_status" />
+        app:layout_constraintLeft_toLeftOf="parent" />
 
     <com.mogo.och.view.SlidePanelView
         android:id="@+id/module_mogo_och_slide_panel"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:visibility="gone"
+        app:BLOCK_START_X="@dimen/module_mogo_och_slide_panel_block_start_x"
+        app:BLOCK_START_Y="@dimen/module_mogo_och_slide_panel_block_start_y"
+        app:NORMAL_TEXT_MARGIN_LEFT="@dimen/module_mogo_och_slide_panel_normal_text_margin_left"
+        app:NORMAL_TEXT_MARGIN_RIGHT="@dimen/module_mogo_och_slide_panel_normal_text_margin_right"
+        app:SHORT_TEXT_MARGIN_LEFT="@dimen/module_mogo_och_slide_panel_short_text_margin_left"
+        app:SHORT_TEXT_MARGIN_RIGHT="@dimen/module_mogo_och_slide_panel_short_text_margin_right"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent" />
+        app:layout_constraintRight_toRightOf="parent"
+        app:textSize="@dimen/module_mogo_och_slide_panel_textSize"
+        tools:visibility="visible" />
 
     <Button
         android:id="@+id/btnAutopilotDisable"
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..90c60c7488
--- /dev/null
+++ b/OCH/mogo-och/src/main/res/values-xhdpi-2560x1600/dimens.xml
@@ -0,0 +1,42 @@
+<?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_slide_panel_block_start_x">20px</dimen>
+    <dimen name="module_mogo_och_slide_panel_block_start_y">20px</dimen>
+    <dimen name="module_mogo_och_slide_panel_normal_text_margin_left">70px</dimen>
+    <dimen name="module_mogo_och_slide_panel_normal_text_margin_right">130px</dimen>
+    <dimen name="module_mogo_och_slide_panel_short_text_margin_left">93px</dimen>
+    <dimen name="module_mogo_och_slide_panel_short_text_margin_right">150px</dimen>
+    <dimen name="module_mogo_och_slide_panel_textSize">70px</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_autopilot_status_text_m_l">224px</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/attrs.xml b/OCH/mogo-och/src/main/res/values/attrs.xml
new file mode 100644
index 0000000000..33fc037d9c
--- /dev/null
+++ b/OCH/mogo-och/src/main/res/values/attrs.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <declare-styleable name="SlidePanelView">
+        <attr name="textSize" format="dimension" />
+        <attr name="NORMAL_TEXT_MARGIN_LEFT" format="dimension" />
+        <attr name="NORMAL_TEXT_MARGIN_RIGHT" format="dimension" />
+        <attr name="SHORT_TEXT_MARGIN_LEFT" format="dimension" />
+        <attr name="SHORT_TEXT_MARGIN_RIGHT" format="dimension" />
+        <attr name="BLOCK_START_X" format="dimension" />
+        <attr name="BLOCK_START_Y" format="dimension" />
+    </declare-styleable>
+</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..84f4ec5a14 100644
--- a/OCH/mogo-och/src/main/res/values/dimens.xml
+++ b/OCH/mogo-och/src/main/res/values/dimens.xml
@@ -9,15 +9,31 @@
     <dimen name="module_mogo_och_station_panel_container_margin_top_no_call">345px</dimen>
     <dimen name="module_mogo_och_station_panel_container_margin_top_with_call">492px</dimen>
 
+    <dimen name="module_mogo_och_slide_panel_block_start_x">15px</dimen>
+    <dimen name="module_mogo_och_slide_panel_block_start_y">15px</dimen>
+    <dimen name="module_mogo_och_slide_panel_normal_text_margin_left">40px</dimen>
+    <dimen name="module_mogo_och_slide_panel_normal_text_margin_right">50px</dimen>
+    <dimen name="module_mogo_och_slide_panel_short_text_margin_left">50px</dimen>
+    <dimen name="module_mogo_och_slide_panel_short_text_margin_right">70px</dimen>
+    <dimen name="module_mogo_och_slide_panel_textSize">40px</dimen>
+
     <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">15px</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>
+    <dimen name="module_mogo_och_autopilot_status_text_m_l">188px</dimen>
 
     <dimen name="module_mogo_och_notice_text_max_width">460px</dimen>
     <dimen name="module_mogo_och_notice_text_size">30px</dimen>
diff --git a/app/build.gradle b/app/build.gradle
index a590264328..f2d477d65d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -76,6 +76,9 @@ android {
         f8xxLauncherOnlineRelease {
             manifest.srcFile 'src/f8xxLauncherOnlineRelease/AndroidManifest.xml'
         }
+        fPadLenovoLauncherOnlineRelease {
+            manifest.srcFile 'src/f8xxLauncherOnlineRelease/AndroidManifest.xml'
+        }
     }
 
     flavorDimensions "product", "basic", "env"
@@ -219,6 +222,35 @@ android {
             // 是否需要使用工控机的rtk定位
             buildConfigField 'boolean', 'IS_USE_ADAS_RTK_LOCATION_INFO', 'true'
         }
+        // 衡阳-联想Pad
+        fPadLenovo {
+            // 应用包名
+            applicationId rootProject.ext.android.fLauncherApplicationId
+            dimension "product"
+            buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'false'
+            // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0
+            buildConfigField 'int', 'CAR_MACHINE_TYPE', '2'
+            buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'true'
+            manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.fLauncherAmapApiValue,CHANNEL_VALUE: "f8xx"]
+            // 是否使用高德sdk自定义导航
+            buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'false'
+            // 是否支持换肤
+            buildConfigField 'boolean', 'IS_SKIN_SUPPORTED', 'true'
+            // 是否支持查询导航目的地车友
+            buildConfigField 'boolean', 'IS_SUPPORTED_SEARCH_DESTINATION_ONLINE_CAR_LIST', 'true'
+            // 是否支持桌面卡片刷新
+            buildConfigField 'boolean', 'IS_SUPPORT_LAUNCHER_CARD_REFRESH_STRATEGY', 'false'
+            // 是否基于地图
+            buildConfigField 'boolean', 'IS_MAP_BASED', 'true'
+            // 是否加载引导模块
+            buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'false'
+            // 分享时是否隐藏 adas
+            buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'false'
+            // 是否需要实时上报坐标
+            buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true'
+            // 是否需要使用工控机的rtk定位
+            buildConfigField 'boolean', 'IS_USE_ADAS_RTK_LOCATION_INFO', 'true'
+        }
         // f系列-分体机
         phone {
             // 应用包名
diff --git a/app/functions/abiFilters.gradle b/app/functions/abiFilters.gradle
index 902b1c2463..8243a5905d 100644
--- a/app/functions/abiFilters.gradle
+++ b/app/functions/abiFilters.gradle
@@ -28,6 +28,15 @@ project.android.productFlavors {
             }
         }
     }
+    // 联想Pad
+    fPadLenovo {
+        externalNativeBuild {
+            ndk {
+                // 设置支持的SO库架构
+                abiFilters "arm64-v8a"
+            }
+        }
+    }
     // f系列-分体机
     f80x {
         externalNativeBuild {
diff --git a/app/functions/aicloudservices.gradle b/app/functions/aicloudservices.gradle
index 86edbe53e4..a50fc6fae7 100644
--- a/app/functions/aicloudservices.gradle
+++ b/app/functions/aicloudservices.gradle
@@ -12,6 +12,7 @@ project.dependencies {
         em4Implementation rootProject.ext.dependencies.mogoaicloudserviceapk
         e8xxImplementation rootProject.ext.dependencies.mogoaicloudserviceapk
         f8xxImplementation rootProject.ext.dependencies.mogoaicloudserviceapk
+        fPadLenovoImplementation rootProject.ext.dependencies.mogoaicloudserviceapk
         f80xImplementation rootProject.ext.dependencies.mogoaicloudserviceapk
         f8AmapImplementation rootProject.ext.dependencies.mogoaicloudserviceapk
         em3Implementation rootProject.ext.dependencies.mogoaicloudserviceapk
@@ -29,6 +30,7 @@ project.dependencies {
         em4Implementation project(':foudations:mogo-aicloud-services-apk')
         e8xxImplementation project(':foudations:mogo-aicloud-services-apk')
         f8xxImplementation project(':foudations:mogo-aicloud-services-apk')
+        fPadLenovoImplementation project(':foudations:mogo-aicloud-services-apk')
         f80xImplementation project(':foudations:mogo-aicloud-services-apk')
         f8AmapImplementation project(':foudations:mogo-aicloud-services-apk')
         em3Implementation project(':foudations:mogo-aicloud-services-apk')
diff --git a/app/functions/basedmap.gradle b/app/functions/basedmap.gradle
index 5b2d05f88c..320d8a4e27 100644
--- a/app/functions/basedmap.gradle
+++ b/app/functions/basedmap.gradle
@@ -4,6 +4,7 @@ project.dependencies {
     if (Boolean.valueOf(RELEASE)) {
 
         f8xxImplementation rootProject.ext.dependencies.mapcustom
+        fPadLenovoImplementation rootProject.ext.dependencies.mapcustom
         f80xImplementation rootProject.ext.dependencies.mapcustom
         fochtaxiImplementation rootProject.ext.dependencies.mapcustom
         fochbusImplementation rootProject.ext.dependencies.mapcustom
@@ -22,6 +23,7 @@ project.dependencies {
         em3Implementation rootProject.ext.dependencies.mapamap
     } else {
         f8xxImplementation project(':libraries:map-custom')
+        fPadLenovoImplementation project(':libraries:map-custom')
         f80xImplementation project(':libraries:map-custom')
         fochtaxiImplementation project(':libraries:map-custom')
         fochbusImplementation project(':libraries:map-custom')
diff --git a/app/functions/baseservices.gradle b/app/functions/baseservices.gradle
index e05e0aad93..f5a0f534a5 100644
--- a/app/functions/baseservices.gradle
+++ b/app/functions/baseservices.gradle
@@ -13,6 +13,7 @@ project.dependencies {
         em4Implementation rootProject.ext.dependencies.mogobaseserviceapk
         e8xxImplementation rootProject.ext.dependencies.mogobaseserviceapk
         f8xxImplementation rootProject.ext.dependencies.mogobaseserviceapk
+        fPadLenovoImplementation rootProject.ext.dependencies.mogobaseserviceapk
         f80xImplementation rootProject.ext.dependencies.mogobaseserviceapk
         f8AmapImplementation rootProject.ext.dependencies.mogobaseserviceapk
         em3Implementation rootProject.ext.dependencies.mogobaseserviceapk
@@ -30,6 +31,7 @@ project.dependencies {
         em4Implementation project(':foudations:mogo-base-services-apk')
         e8xxImplementation project(':foudations:mogo-base-services-apk')
         f8xxImplementation project(':foudations:mogo-base-services-apk')
+        fPadLenovoImplementation project(':foudations:mogo-base-services-apk')
         f80xImplementation project(':foudations:mogo-base-services-apk')
         f8AmapImplementation project(':foudations:mogo-base-services-apk')
         em3Implementation project(':foudations:mogo-base-services-apk')
diff --git a/app/functions/bizguide.gradle b/app/functions/bizguide.gradle
index 778393ab43..3ac507dd4a 100644
--- a/app/functions/bizguide.gradle
+++ b/app/functions/bizguide.gradle
@@ -9,6 +9,7 @@ project.dependencies {
         em4Implementation rootProject.ext.dependencies.mogomoduleguide
         e8xxImplementation rootProject.ext.dependencies.mogomoduleguide
         f8xxImplementation rootProject.ext.dependencies.mogomoduleguide
+        fPadLenovoImplementation rootProject.ext.dependencies.mogomoduleguide
         f80xImplementation rootProject.ext.dependencies.mogomoduleguide
         f8AmapImplementation rootProject.ext.dependencies.mogomoduleguide
         em3Implementation rootProject.ext.dependencies.mogomoduleguide
@@ -22,6 +23,7 @@ project.dependencies {
         em4Implementation project(':modules:mogo-module-guide')
         e8xxImplementation project(':modules:mogo-module-guide')
         f8xxImplementation project(':modules:mogo-module-guide')
+        fPadLenovoImplementation project(':modules:mogo-module-guide')
         f80xImplementation project(':modules:mogo-module-guide')
         f8AmapImplementation project(':modules:mogo-module-guide')
         em3Implementation project(':modules:mogo-module-guide')
diff --git a/app/functions/leftpanel.gradle b/app/functions/leftpanel.gradle
index eab467b173..8fbdf3da82 100644
--- a/app/functions/leftpanel.gradle
+++ b/app/functions/leftpanel.gradle
@@ -13,6 +13,7 @@ project.dependencies {
         e8xxImplementation rootProject.ext.dependencies.moduleleftpanelnoop
         e8xxImplementation rootProject.ext.dependencies.moduleleftpanelnoop
         f8xxImplementation rootProject.ext.dependencies.moduleleftpanelnoop
+        fPadLenovoImplementation rootProject.ext.dependencies.moduleleftpanelnoop
         f80xImplementation rootProject.ext.dependencies.moduleleftpanelnoop
         f8AmapImplementation rootProject.ext.dependencies.moduleleftpanelnoop
         em3Implementation rootProject.ext.dependencies.moduleleftpanelnoop
@@ -30,6 +31,7 @@ project.dependencies {
         em4Implementation project(':modules:mogo-module-left-panel-noop')
         e8xxImplementation project(':modules:mogo-module-left-panel-noop')
         f8xxImplementation project(':modules:mogo-module-left-panel-noop')
+        fPadLenovoImplementation project(':modules:mogo-module-left-panel-noop')
         f80xImplementation project(':modules:mogo-module-left-panel-noop')
         f8AmapImplementation project(':modules:mogo-module-left-panel-noop')
         em3Implementation project(':modules:mogo-module-left-panel-noop')
diff --git a/app/functions/och.gradle b/app/functions/och.gradle
index 097bd40f7b..2a4c8dd1fc 100644
--- a/app/functions/och.gradle
+++ b/app/functions/och.gradle
@@ -10,6 +10,7 @@ project.dependencies {
         d8xxImplementation rootProject.ext.dependencies.mogoochnoop
         d80xImplementation rootProject.ext.dependencies.mogoochnoop
         f8xxImplementation rootProject.ext.dependencies.mogoochnoop
+        fPadLenovoImplementation rootProject.ext.dependencies.mogoochnoop
         f80xImplementation rootProject.ext.dependencies.mogoochnoop
         f8AmapImplementation rootProject.ext.dependencies.mogoochnoop
         em4Implementation rootProject.ext.dependencies.mogoochnoop
@@ -26,6 +27,7 @@ project.dependencies {
         d8xxImplementation project(':OCH:mogo-och-noop')
         d80xImplementation project(':OCH:mogo-och-noop')
         f8xxImplementation project(':OCH:mogo-och-noop')
+        fPadLenovoImplementation project(':OCH:mogo-och-noop')
         f80xImplementation project(':OCH:mogo-och-noop')
         f8AmapImplementation project(':OCH:mogo-och-noop')
         em4Implementation project(':OCH:mogo-och-noop')
diff --git a/app/functions/skin.gradle b/app/functions/skin.gradle
index 039502982f..0d5cbb0ef0 100644
--- a/app/functions/skin.gradle
+++ b/app/functions/skin.gradle
@@ -10,6 +10,7 @@ project.dependencies {
         d8xxImplementation rootProject.ext.dependencies.skinsupportimpl
         d80xImplementation rootProject.ext.dependencies.skinsupportimpl
         f8xxImplementation rootProject.ext.dependencies.skinsupportimpl
+        fPadLenovoImplementation rootProject.ext.dependencies.skinsupportimpl
         f80xImplementation rootProject.ext.dependencies.skinsupportimpl
         f8AmapImplementation rootProject.ext.dependencies.skinsupportimpl
         em4Implementation rootProject.ext.dependencies.skinsupportimpl
@@ -19,6 +20,7 @@ project.dependencies {
         phoneImplementation rootProject.ext.dependencies.skinsupportimpl
 
         f8xxImplementation rootProject.ext.dependencies.skinsupportlight
+        fPadLenovoImplementation rootProject.ext.dependencies.skinsupportlight
         f80xImplementation rootProject.ext.dependencies.skinsupportlight
         f8AmapImplementation rootProject.ext.dependencies.skinsupportlight
         em4Implementation rootProject.ext.dependencies.skinsupportlight
@@ -42,6 +44,7 @@ project.dependencies {
         d8xxImplementation project(':skin:mogo-skin-support-impl')
         d80xImplementation project(':skin:mogo-skin-support-impl')
         f8xxImplementation project(':skin:mogo-skin-support-impl')
+        fPadLenovoImplementation project(':skin:mogo-skin-support-impl')
         f80xImplementation project(':skin:mogo-skin-support-impl')
         f8AmapImplementation project(':skin:mogo-skin-support-impl')
         em4Implementation project(':skin:mogo-skin-support-impl')
@@ -51,6 +54,7 @@ project.dependencies {
         phoneImplementation project(':skin:mogo-skin-support-impl')
 
         f8xxImplementation project(':skin:mogo-skin-light')
+        fPadLenovoImplementation project(':skin:mogo-skin-light')
         f80xImplementation project(':skin:mogo-skin-light')
         f8AmapImplementation project(':skin:mogo-skin-light')
         em4Implementation project(':skin:mogo-skin-light')
diff --git a/app/functions/tts.gradle b/app/functions/tts.gradle
index 587ffe263d..17412804cd 100644
--- a/app/functions/tts.gradle
+++ b/app/functions/tts.gradle
@@ -8,6 +8,7 @@ project.dependencies {
         d8xxImplementation rootProject.ext.dependencies.ttszhi
         d80xImplementation rootProject.ext.dependencies.ttszhi
         f8xxImplementation rootProject.ext.dependencies.ttszhi
+        fPadLenovoImplementation rootProject.ext.dependencies.ttszhi
         f80xImplementation rootProject.ext.dependencies.ttszhi
         f8AmapImplementation rootProject.ext.dependencies.ttszhi
         em4Implementation rootProject.ext.dependencies.ttszhi
@@ -24,6 +25,7 @@ project.dependencies {
         d8xxImplementation project(':tts:tts-zhi')
         d80xImplementation project(':tts:tts-zhi')
         f8xxImplementation project(':tts:tts-zhi')
+        fPadLenovoImplementation project(':tts:tts-zhi')
         f80xImplementation project(':tts:tts-zhi')
         f8AmapImplementation project(':tts:tts-zhi')
         em4Implementation project(':tts:tts-zhi')
diff --git a/app/regroup.gradle b/app/regroup.gradle
index a7e280d8bd..e3632ceefd 100644
--- a/app/regroup.gradle
+++ b/app/regroup.gradle
@@ -3,7 +3,7 @@
 afterEvaluate {
 
     def independent = ["em3", "em1", "d80x", "d82x", "bydauto", "em2", "phone"]
-    def launcher = ["f80x", "f8xx", "f8amap", "em4", "e8xx", "fochtaxi", "fochbus"]
+    def launcher = ["f80x", "f8xx", "f8amap", "em4", "e8xx", "fochtaxi", "fochbus", "fPadLenovo"]
 
     it.getTasks().iterator().forEachRemaining {
         def task = it
diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java
index 0868458787..950990eed4 100644
--- a/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java
+++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java
@@ -79,6 +79,11 @@ public class DebugConfig {
      */
     public static final int CAR_MACHINE_TYPE_BYD = 1;
 
+    /**
+     * 联想PAD
+     */
+    public static final int CAR_MACHINE_TYPE_LENOVO = 2;
+
     private static int sCarMachineType = CAR_MACHINE_TYPE_SELF_INNOVATE;
 
     /**
@@ -471,10 +476,10 @@ public class DebugConfig {
         return result;
     }
 
-    public synchronized static String getStatusData(int type){
-        if(type > 4){
+    public synchronized static String getStatusData(int type) {
+        if (type > 4) {
             return sStatus[type].toString();
-        }else{
+        } else {
             return "0";
         }
     }
diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java
index 48884d48e5..d6cefd890a 100644
--- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java
+++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java
@@ -423,9 +423,6 @@ public class AMapViewWrapper implements IMogoMapView,
 
     @Override
     public void moveToCenter(MogoLatLng latLng, boolean animate) {
-        if (mCurrentUI == EnumMapUI.Type_VR) {
-            return;
-        }
         Logger.d(TAG, "move to center %s", latLng);
         if (latLng == null || latLng.lat == 0.0d || latLng.lng == 0.0d) {
             Logger.e(TAG, "latlng = null or is illegal");
diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/IMogoMarkerManager.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/IMogoMarkerManager.java
index 433b4dada0..86b5d5385f 100644
--- a/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/IMogoMarkerManager.java
+++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/IMogoMarkerManager.java
@@ -46,6 +46,16 @@ public interface IMogoMarkerManager {
      */
     void removeMarkers();
 
+    /**
+     * 显示地图上添加的所有markers
+     */
+    void visibleAllMarkers();
+
+    /**
+     * 隐藏地图上添加的所有markers
+     */
+    void inVisibleAllMarkers();
+
     /**
      * 获取某种类型的全部marker。
      *
diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/MogoMarkersHandler.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/MogoMarkersHandler.java
index 2530bb1f29..4eede46dcb 100644
--- a/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/MogoMarkersHandler.java
+++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/MogoMarkersHandler.java
@@ -1,7 +1,11 @@
 package com.mogo.map.marker;
 
+import android.annotation.SuppressLint;
+import android.os.Build;
 import android.text.TextUtils;
 
+import androidx.annotation.RequiresApi;
+
 import com.mogo.map.listener.IMogoMapListener;
 import com.mogo.map.listener.IMogoMapListenerRegister;
 
@@ -43,6 +47,20 @@ public class MogoMarkersHandler implements IMogoMarkerClickListener, IMogoMarker
         sInstance = null;
     }
 
+    @SuppressLint("NewApi")
+    public synchronized void visibleAll(){
+        mServicesMarkers.values().stream()
+                .filter(mogoMarkerList -> mogoMarkerList != null && !mogoMarkerList.isEmpty())
+                .forEach(mogoMarkerList -> mogoMarkerList.forEach(mogoMarker -> mogoMarker.setVisible(true)));
+    }
+
+    @SuppressLint("NewApi")
+    public synchronized void inVisibleAll(){
+        mServicesMarkers.values().stream()
+                .filter(mogoMarkerList -> mogoMarkerList != null && !mogoMarkerList.isEmpty())
+                .forEach(mogoMarkerList -> mogoMarkerList.forEach(mogoMarker -> mogoMarker.setVisible(false)));
+    }
+
     public synchronized void removeAll() {
         final Collection< List< IMogoMarker > > mogoMarkers = mServicesMarkers.values();
         for ( List< IMogoMarker > mogoMarkerList : mogoMarkers ) {
diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/MogoMarkerManager.java b/libraries/mogo-map/src/main/java/com/mogo/map/MogoMarkerManager.java
index 1222a3f4a0..9d8e814229 100644
--- a/libraries/mogo-map/src/main/java/com/mogo/map/MogoMarkerManager.java
+++ b/libraries/mogo-map/src/main/java/com/mogo/map/MogoMarkerManager.java
@@ -98,4 +98,14 @@ public class MogoMarkerManager implements IMogoMarkerManager {
     public void removeRouteWayOverlay() {
 //        RouteOverlayHelper.getInstance().removeAll();
     }
+
+    @Override
+    public void visibleAllMarkers() {
+
+    }
+
+    @Override
+    public void inVisibleAllMarkers() {
+
+    }
 }
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
diff --git a/modules/mogo-module-common/src/main/res/values-xhdpi-2560x1600/dimens.xml b/modules/mogo-module-common/src/main/res/values-xhdpi-2560x1600/dimens.xml
new file mode 100644
index 0000000000..b693e5557c
--- /dev/null
+++ b/modules/mogo-module-common/src/main/res/values-xhdpi-2560x1600/dimens.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources>
+    <dimen name="dp_32">42px</dimen>
+    <dimen name="module_v2n_tip_width">628px</dimen>
+    <dimen name="module_v2n_tip_height">188px</dimen>
+    <dimen name="module_v2n_tip_text_width">106px</dimen>
+    <dimen name="module_v2n_tip_text_margin_right">52px</dimen>
+    <dimen name="module_v2n_image_margin_left">37px</dimen>
+</resources>
diff --git a/modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml
index eae48600b3..c81c22f39e 100644
--- a/modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml
+++ b/modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml
@@ -1123,5 +1123,11 @@
     <dimen name="module_map_amap_my_location_bg_size">360px</dimen>
     <dimen name="module_map_amap_my_location_icon_width">63px</dimen>
     <dimen name="module_map_amap_my_location_icon_height">96px</dimen>
+    <dimen name="module_v2n_tip_width">470px</dimen>
+    <dimen name="module_v2n_tip_height">140px</dimen>
+    <dimen name="module_v2n_tip_text_width">100px</dimen>
+    <dimen name="module_v2n_tip_text_margin_right">28px</dimen>
+    <dimen name="module_v2n_image_margin_left">28px</dimen>
+
 
 </resources>
diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
index 8d8322ac3d..d9ef4ba560 100644
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
@@ -46,6 +46,7 @@ import com.mogo.map.navi.MogoTraffic;
 import com.mogo.map.uicontroller.EnumMapUI;
 import com.mogo.map.uicontroller.IMogoMapUIController;
 import com.mogo.map.uicontroller.VisualAngleMode;
+import com.mogo.module.common.ModuleNames;
 import com.mogo.module.common.MogoApisHandler;
 import com.mogo.module.common.dialog.WMDialog;
 import com.mogo.module.common.glide.SkinAbleBitmapTarget;
@@ -180,6 +181,9 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
 
     private boolean isShowGuide;
 
+    private ImageView mSwitchMapModeImage;
+    private FrameLayout mSwitchMapModeLayout;
+
     /**
      * 搜索莫模块
      */
@@ -205,7 +209,6 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
 
 
 
-
     /**
      * 内部变量标识是否在vrMode，用于方法执行过滤，避免重复或异常调用
      */
@@ -369,6 +372,11 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
         tvYellow = (TextView) findViewById(R.id.tv_yellow);
         tvRed = (TextView) findViewById(R.id.tv_red);
         tvGreen = (TextView) findViewById(R.id.tv_green);
+
+        mSwitchMapModeLayout = (FrameLayout) findViewById(R.id.module_switch_model_layout);
+        mSwitchMapModeImage = (ImageView) findViewById(R.id.module_switch_model_icon);
+        mSwitchMapModeImage.setOnClickListener(clickListener);
+
     }
 
     private int debugPanelClickCount = 0;
@@ -400,6 +408,7 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
 
             localIsVrMode = true;
             flSpeed.setVisibility(View.VISIBLE);
+            mSwitchMapModeLayout.setVisibility(View.VISIBLE);
           //  clTrafficLight.setVisibility(View.VISIBLE);
         }
     }
@@ -427,6 +436,7 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
             MogoApisHandler.getInstance().getApis().getRegisterCenterApi().unregisterMogoLocationListener(TAG);
             localIsVrMode = false;
             flSpeed.setVisibility(View.GONE);
+            mSwitchMapModeLayout.setVisibility(View.GONE);
             clTrafficLight.setVisibility(View.GONE);
         }
     }
@@ -1085,7 +1095,13 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
 
     @Override
     public void onMapVisualAngleChanged(VisualAngleMode visualAngleMode) {
-        //todo visual
+        if (visualAngleMode.isMediumSight()) {
+            mSwitchMapModeLayout.setVisibility(View.VISIBLE);
+        } else if (visualAngleMode.isLongSight()) {
+            mSwitchMapModeLayout.setVisibility(View.VISIBLE);
+        } else if (visualAngleMode.isCloseSight()) {
+            mSwitchMapModeLayout.setVisibility(View.GONE);
+        }
     }
 
     private static final int SEEK_HELP_NOTICE_NUM_MSG_TYPE = 401015;
@@ -1329,11 +1345,22 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
                     // show panel
                     debugPanelGroup.setVisibility(View.VISIBLE);
                 }
-            }
+            } else if (v.getId() == R.id.module_switch_model_icon) { //切换地图的远近视图
+                if (MogoApisHandler.getInstance().getApis().getMapServiceApi().getMapUIController().getCurrentMapVisualAngle().isLongSight()) {
+                    MogoApisHandler.getInstance().getApis().getMapServiceApi().getMarkerManager(AbsMogoApplication.getApp()).visibleAllMarkers();
+                    MogoApisHandler.getInstance().getApis().getMapServiceApi()
+                            .getMapUIController().changeMapVisualAngle(VisualAngleMode.MODE_MEDIUM_SIGHT);
+                } else if (MogoApisHandler.getInstance().getApis().getMapServiceApi().getMapUIController().getCurrentMapVisualAngle().isMediumSight()) {
+                    MogoApisHandler.getInstance().getApis().getMapServiceApi().getMarkerManager(AbsMogoApplication.getApp()).inVisibleAllMarkers();
+                    MogoApisHandler.getInstance().getApis().getMapServiceApi()
+                            .getMapUIController().changeMapVisualAngle(VisualAngleMode.MODE_LONG_SIGHT);
+                }
 
+            }
         }
     };
 
+
     @Override
     public void onCarLocationChanged2(Location location) {
         vrModeNavInfoView.refreshCurrentSpeed((int) (location.getSpeed() * 3.6F));
diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_switch_map_angle.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_switch_map_angle.png
new file mode 100644
index 0000000000..3e1b96f3e3
Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_switch_map_angle.png differ
diff --git a/modules/mogo-module-extensions/src/main/res/drawable-mdpi/module_switch_map_angle.png b/modules/mogo-module-extensions/src/main/res/drawable-mdpi/module_switch_map_angle.png
new file mode 100644
index 0000000000..3e1b96f3e3
Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-mdpi/module_switch_map_angle.png differ
diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi-1920x1000/module_switch_map_angle.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi-1920x1000/module_switch_map_angle.png
new file mode 100644
index 0000000000..3e1b96f3e3
Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi-1920x1000/module_switch_map_angle.png differ
diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi-2560x1600/module_switch_map_angle.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi-2560x1600/module_switch_map_angle.png
new file mode 100644
index 0000000000..3e1b96f3e3
Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi-2560x1600/module_switch_map_angle.png differ
diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_switch_map_angle.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_switch_map_angle.png
new file mode 100644
index 0000000000..3e1b96f3e3
Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_switch_map_angle.png differ
diff --git a/modules/mogo-module-extensions/src/main/res/drawable/module_switch_map_bg.xml b/modules/mogo-module-extensions/src/main/res/drawable/module_switch_map_bg.xml
new file mode 100644
index 0000000000..0b1b92b69c
--- /dev/null
+++ b/modules/mogo-module-extensions/src/main/res/drawable/module_switch_map_bg.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <corners android:radius="26px" />
+
+    <solid android:color="@color/module_switch_map_bg" />
+
+</shape>
\ No newline at end of file
diff --git a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml
index 7e33a9a6bf..46b6dd229d 100644
--- a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml
+++ b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml
@@ -6,7 +6,6 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-
     <include
         layout="@layout/module_ext_layout_extensions"
         android:layout_width="match_parent"
@@ -43,6 +42,29 @@
             android:layout_width="@dimen/module_ext_arcView_width"
             android:layout_height="@dimen/module_ext_arcView_height"
             android:layout_gravity="center" />
+
+    </FrameLayout>
+
+    <!--切换地图远近事件-->
+    <FrameLayout
+        android:id="@+id/module_switch_model_layout"
+        android:layout_width="@dimen/module_switch_map"
+        android:layout_height="@dimen/module_switch_map"
+        android:layout_marginLeft="@dimen/dp_20"
+        android:layout_marginBottom="@dimen/dp_20"
+        android:elevation="@dimen/dp_10"
+        android:padding="@dimen/dp_20"
+        android:visibility="gone"
+        android:background="@drawable/module_switch_map_bg"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent">
+
+    <ImageView
+        android:id="@+id/module_switch_model_icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:src="@drawable/module_switch_map_angle" />
     </FrameLayout>
 
     <androidx.constraintlayout.widget.ConstraintLayout
diff --git a/modules/mogo-module-extensions/src/main/res/values-xhdpi-1920x1000/dimens.xml b/modules/mogo-module-extensions/src/main/res/values-xhdpi-1920x1000/dimens.xml
index ca06e7f314..4bdcc21227 100644
--- a/modules/mogo-module-extensions/src/main/res/values-xhdpi-1920x1000/dimens.xml
+++ b/modules/mogo-module-extensions/src/main/res/values-xhdpi-1920x1000/dimens.xml
@@ -163,4 +163,6 @@
     <dimen name="module_event_live_error_text_size">36px</dimen>
     <dimen name="module_video_window_height_content">393px</dimen>
     <dimen name="module_video_window_width_content">700px</dimen>
+    <dimen name="module_switch_map">108px</dimen>
+
 </resources>
\ No newline at end of file
diff --git a/modules/mogo-module-extensions/src/main/res/values-xhdpi-2560x1600/dimens.xml b/modules/mogo-module-extensions/src/main/res/values-xhdpi-2560x1600/dimens.xml
new file mode 100644
index 0000000000..027820a732
--- /dev/null
+++ b/modules/mogo-module-extensions/src/main/res/values-xhdpi-2560x1600/dimens.xml
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!--    module_ext_layout_entrance.xml-->
+    <dimen name="module_ext_search_height">90px</dimen>
+    <dimen name="module_ext_search_marginLeft">32px</dimen>
+    <dimen name="module_ext_search_marginTop">2px</dimen>
+    <dimen name="module_ext_search_drawablePadding">16px</dimen>
+    <dimen name="module_ext_search_paddingLeft">26px</dimen>
+    <dimen name="module_ext_search_paddingRight">26px</dimen>
+    <dimen name="module_ext_search_textSize">32px</dimen>
+
+    <dimen name="module_ext_common_address_height">90px</dimen>
+    <dimen name="module_ext_common_address_marginLeft">32px</dimen>
+    <dimen name="module_ext_common_address_marginTop">2px</dimen>
+    <dimen name="module_ext_common_address_home_width">100px</dimen>
+    <dimen name="module_ext_common_address_home_height">90px</dimen>
+    <dimen name="module_ext_common_address_divider_width">2px</dimen>
+    <dimen name="module_ext_common_address_divider_height">54px</dimen>
+    <dimen name="module_ext_common_address_company_width">100px</dimen>
+    <dimen name="module_ext_common_address_company_height">90px</dimen>
+    <dimen name="module_ext_weather_space_between_icon_and_tem">8px</dimen>
+
+    <dimen name="module_ext_speed_limit_width">180px</dimen>
+    <dimen name="module_ext_speed_limit_height">180px</dimen>
+    <dimen name="module_ext_speed_limit_marginTop">2px</dimen>
+    <dimen name="module_ext_speed_limit_marginRight">60px</dimen>
+    <dimen name="module_ext_speed_limit_value_textSize">60px</dimen>
+    <dimen name="module_ext_speed_limit_unit_textSize">28px</dimen>
+
+    <dimen name="module_ext_navi_panel_marginLeft">32px</dimen>
+    <dimen name="module_ext_navi_panel_marginTop">2px</dimen>
+
+    <dimen name="module_ext_operation_panel_width">140px</dimen>
+    <dimen name="module_ext_operation_panel_marginRight">32px</dimen>
+    <dimen name="module_ext_operation_panel_marginBottom">60px</dimen>
+    <dimen name="module_ext_operation_panel_vr_height">92px</dimen>
+    <dimen name="module_ext_operation_panel_vr_textSize">24px</dimen>
+    <dimen name="module_ext_operation_panel_divider_width">48px</dimen>
+    <dimen name="module_ext_operation_panel_divider_height">2px</dimen>
+    <dimen name="module_ext_operation_panel_move2_height">140px</dimen>
+    <dimen name="module_ext_operation_panel_share_width">140px</dimen>
+    <dimen name="module_ext_operation_panel_share_height">120px</dimen>
+    <dimen name="module_ext_operation_panel_share_marginBottom">20px</dimen>
+    <dimen name="module_ext_operation_panel_share_textSize">30px</dimen>
+    <dimen name="module_ext_operation_panel_share_goneMarginBottom">32px</dimen>
+    <dimen name="module_ext_operation_panel_share_goneMarginRight">32px</dimen>
+
+    <dimen name="module_ext_navi_exit_width">120px</dimen>
+    <dimen name="module_ext_navi_exit_height">120px</dimen>
+    <dimen name="module_ext_navi_exit_marginLeft">32px</dimen>
+    <dimen name="module_ext_navi_exit_marginBottom">60px</dimen>
+    <dimen name="module_ext_button_container_marginLeft">32px</dimen>
+    <dimen name="module_ext_button_container_marginBottom">60px</dimen>
+    <dimen name="module_ext_navi_exit_textSize">32px</dimen>
+    <dimen name="v2x_cancel_help_text_size">30px</dimen>
+    <dimen name="module_entrance_id_button_marginTop">20px</dimen>
+
+    <!--    module_ext_layout_extensions.xml-->
+    <dimen name="module_ext_height">120px</dimen>
+    <dimen name="module_ext_paddingRight">60px</dimen>
+    <dimen name="module_ext_paddingLeft">60px</dimen>
+    <dimen name="module_ext_voice_textSize">32px</dimen>
+    <dimen name="module_ext_time_textSize">48px</dimen>
+    <dimen name="module_ext_date_marginRight">80px</dimen>
+    <dimen name="module_ext_date_textSize">28px</dimen>
+    <dimen name="module_ext_weather_marginRight">26px</dimen>
+    <dimen name="module_ext_weather_icon_width">44px</dimen>
+    <dimen name="module_ext_weather_icon_height">44px</dimen>
+    <dimen name="module_ext_weather_temp_marginRight">18px</dimen>
+    <dimen name="module_ext_weather_temp_textSize">34px</dimen>
+    <dimen name="module_ext_weather_temp_desc_marginRight">26px</dimen>
+    <dimen name="module_ext_weather_temp_desc_textSize">28px</dimen>
+    <dimen name="module_ext_msg_marginRight">30px</dimen>
+    <dimen name="module_ext_msg_counter_width">30px</dimen>
+    <dimen name="module_ext_msg_counter_height">30px</dimen>
+    <dimen name="module_ext_msg_counter_textSize">20px</dimen>
+
+    <dimen name="module_ext_user_img_width">103px</dimen>
+    <dimen name="module_ext_user_img_height">103px</dimen>
+
+    <!--    module_map_layout_navi_info_panel.xml-->
+    <dimen name="module_ext_navi_info_panel_width">1058px</dimen>
+    <dimen name="module_ext_navi_info_panel_height">210px</dimen>
+    <dimen name="module_ext_navi_info_panel_small_height">144px</dimen>
+    <dimen name="module_ext_navi_info_panel_turn_icon_width">159px</dimen>
+    <dimen name="module_ext_navi_info_panel_turn_icon_height">159px</dimen>
+    <dimen name="module_ext_navi_info_panel_turn_icon_small_width">70px</dimen>
+    <dimen name="module_ext_navi_info_panel_turn_icon_small_height">70px</dimen>
+    <dimen name="module_ext_navi_info_panel_turn_icon_marginLeft">56px</dimen>
+    <dimen name="module_ext_navi_info_panel_turn_icon_small_marginLeft">83px</dimen>
+    <dimen name="module_ext_navi_info_panel_turn_icon_marginTop">24px</dimen>
+    <dimen name="module_ext_navi_info_panel_next_info_distance_marginTop">40px</dimen>
+    <dimen name="module_ext_navi_info_panel_next_info_distance_textSize">60px</dimen>
+    <dimen name="module_ext_navi_info_panel_next_info_distance_textSize_small">50px</dimen>
+    <dimen name="module_ext_navi_info_panel_next_info_distance_unit_marginLeft">12px</dimen>
+    <dimen name="module_ext_navi_info_panel_next_info_distance_unit_marginBottom">10px</dimen>
+    <dimen name="module_ext_navi_info_panel_next_info_distance_unit_textSize">40px</dimen>
+    <dimen name="module_ext_navi_info_panel_next_info_distance_unit_textSize_small">30px</dimen>
+    <dimen name="module_ext_navi_info_panel_next_info_road_textSize">34px</dimen>
+    <dimen name="module_ext_navi_info_panel__arrive_destination_estimate_info_marginTop">24px</dimen>
+    <dimen name="module_ext_navi_info_panel__arrive_destination_estimate_info_textSize">28px</dimen>
+    <dimen name="module_ext_navi_info_turn_icon_margin_bottom">23px</dimen>
+    <dimen name="module_ext_voice_msg_padding_top">17px</dimen>
+    <dimen name="module_ext_voice_msg_padding_bottom">17px</dimen>
+    <dimen name="module_ext_voice_msg_padding_left">36px</dimen>
+    <dimen name="module_ext_voice_msg_padding_right">36px</dimen>
+    <dimen name="module_ext_voice_msg_icon_margin_left">-2px</dimen>
+    <dimen name="module_ext_navi_extra_info_margin_right">95px</dimen>
+
+    <dimen name="module_ext_weather_bkg_corner">30px</dimen>
+    <dimen name="module_ext_weather_container_paddingLeft">40px</dimen>
+    <dimen name="module_ext_weather_container_paddingRight">40px</dimen>
+    <dimen name="module_ext_msg_dot_marginLeft">15px</dimen>
+    <dimen name="module_ext_msg_dot_marginRight">15px</dimen>
+    <dimen name="module_ext_navi_next_info_road_marginTop">5px</dimen>
+    <dimen name="module_ext_remaining_info_marginRight">50px</dimen>
+    <dimen name="module_ext_remaining_distance_textSize">56px</dimen>
+    <dimen name="module_ext_remaining_distance_unit_textSize">30px</dimen>
+    <dimen name="module_ext_remaining_time_textSize">56px</dimen>
+    <dimen name="module_ext_remaining_time_unit_textSize">30px</dimen>
+    <dimen name="module_ext_arrive_time_textSize">56px</dimen>
+    <dimen name="module_ext_arrive_time_unit_textSize">30px</dimen>
+    <dimen name="module_map_navi_next_info_road_turn_marginLeft">15px</dimen>
+    <dimen name="module_map_navi_next_info_road_turn_marginRight">15px</dimen>
+
+    <!-- 导航查看全程显示范围-->
+    <dimen name="module_map_display_overview_left_margin">1000px</dimen>
+    <dimen name="module_map_display_overview_top_margin">390px</dimen>
+    <dimen name="module_map_display_overview_bottom_margin">200px</dimen>
+    <dimen name="module_map_display_overview_right_margin">200px</dimen>
+    <dimen name="module_ext_north_goneMarginTop">240px</dimen>
+    <dimen name="module_ext_common_corner">30px</dimen>
+    <dimen name="module_ext_button_width">120px</dimen>
+    <dimen name="module_ext_button_height">120px</dimen>
+    <dimen name="module_ext_camera_button_marginTop">10px</dimen>
+    <dimen name="module_ext_display_overview_textSize">22px</dimen>
+    <dimen name="module_ext_display_overview_textSize_large">28px</dimen>
+    <dimen name="module_ext_north_textSize">28px</dimen>
+    <dimen name="module_ext_navi_info_panel_next_info_distance_next_step_textSize">30px</dimen>
+    <dimen name="module_entrance_id_uploading_width">90px</dimen>
+    <dimen name="module_entrance_id_uploading_height">90px</dimen>
+    <dimen name="module_map_id_navi_next_info_distance_marginTop">6dp</dimen>
+    <dimen name="module_map_id_navi_next_info_road_marginBottom">15px</dimen>
+    <dimen name="module_map_id_navi_next_info_road_marginBottom_small">4px</dimen>
+    <dimen name="module_map_id_navi_next_info_distance_marginStart">10px</dimen>
+    <dimen name="module_ext_display_overview_icon_marginTop">20px</dimen>
+
+    <dimen name="module_ext_top_over_navi_height">40px</dimen>
+    <dimen name="module_ext_msg_counter_margin">45px</dimen>
+    <dimen name="module_ext_user_avator_size">100px</dimen>
+    <dimen name="module_ext_user_avator_board_size">134px</dimen>
+    <dimen name="module_ext_layout_padding">30px</dimen>
+    <dimen name="module_ext_layout_paddingRight">20px</dimen>
+    <dimen name="module_ext_layout_paddingBottom">20px</dimen>
+    <dimen name="module_ext_destination_online_car_drawablePadding">8px</dimen>
+    <dimen name="module_ext_destination_online_car_paddingLeft">21px</dimen>
+    <dimen name="module_ext_destination_online_car_paddingRight">31px</dimen>
+    <dimen name="module_ext_top_view_max_width">1920px</dimen>
+
+    <dimen name="module_ext_navi_width">-1</dimen>
+    <dimen name="module_ext_bottom_btn_margin_bottom">0px</dimen>
+
+    <dimen name="module_event_live_error_text_size">36px</dimen>
+    <dimen name="module_video_window_height_content">393px</dimen>
+    <dimen name="module_video_window_width_content">700px</dimen>
+    <dimen name="module_switch_map">145px</dimen>
+</resources>
\ No newline at end of file
diff --git a/modules/mogo-module-extensions/src/main/res/values/colors.xml b/modules/mogo-module-extensions/src/main/res/values/colors.xml
index e787bc7500..74cf309afe 100644
--- a/modules/mogo-module-extensions/src/main/res/values/colors.xml
+++ b/modules/mogo-module-extensions/src/main/res/values/colors.xml
@@ -14,4 +14,5 @@
 
     <color name="arc_speeding">#DB3137</color>
     <color name="arc_speed">#3E77F6</color>
+    <color name="module_switch_map_bg">#3B4577</color>
 </resources>
\ No newline at end of file
diff --git a/modules/mogo-module-extensions/src/main/res/values/dimens.xml b/modules/mogo-module-extensions/src/main/res/values/dimens.xml
index d430472dff..54c5195205 100644
--- a/modules/mogo-module-extensions/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-extensions/src/main/res/values/dimens.xml
@@ -244,5 +244,5 @@
     <dimen name="module_video_window_width_content">400px</dimen>
     <dimen name="module_video_window_height_content">300px</dimen>
 
-
+    <dimen name="module_switch_map">108px</dimen>
 </resources>
\ No newline at end of file
diff --git a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/CategorySearchFragment.kt b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/CategorySearchFragment.kt
index 8245a45bf3..4fb9c33120 100644
--- a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/CategorySearchFragment.kt
+++ b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/CategorySearchFragment.kt
@@ -15,6 +15,7 @@ import com.mogo.map.marker.IMogoMarker
 import com.mogo.map.marker.IMogoMarkerClickListener
 import com.mogo.map.marker.MogoMarkerOptions
 import com.mogo.map.search.geo.MogoPoiItem
+import com.mogo.module.common.MogoApisHandler
 import com.mogo.module.common.map.MapCenterPointStrategy
 import com.mogo.module.common.map.Scene
 import com.mogo.module.common.utils.CarSeries
@@ -188,7 +189,7 @@ class CategorySearchFragment : BaseFragment(), CategoryView, IMogoVoiceCmdCallBa
         current.setToTop()
         arrayList[mAdapter.lastPosition].icon(getMarkerIcon(mAdapter.lastPosition))
         arrayList[mAdapter.current].icon(getMarkerIcon(mAdapter.current))
-        if (moveToCenter) {
+        if (moveToCenter &&  !MogoApisHandler.getInstance().apis.statusManagerApi.isVrMode) {
             SearchApisHolder.getStatusManager().setUserInteractionStatus(TAG, true, false)
             SearchApisHolder.getUiControllerApis().moveToCenter(current.position, CarSeries.isF8xxSeries())
         }
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java
index ed640f042e..4374b23b9f 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java
@@ -338,7 +338,9 @@ public class MockIntentHandler implements IntentHandler {
                 MarkerServiceHandler.getApis().getRefreshStrategyControllerApi().restartAutoRefreshAtTime(duration);
                 IMogoMarker marker = MarkerServiceHandler.getMarkerManager().addMarker(TAG, options);
                 MarkerServiceHandler.getMogoStatusManager().setUserInteractionStatus(TAG, true, false);
-                MarkerServiceHandler.getMapUIController().moveToCenter(mogoLatLngs.get(0));
+                if(!MarkerServiceHandler.getApis().getStatusManagerApi().isVrMode()){
+                    MarkerServiceHandler.getMapUIController().moveToCenter(mogoLatLngs.get(0));
+                }
                 WorkThreadHandler.getInstance().post(() -> marker.startSmooth(mogoLatLngs, duration));
                 break;
             }
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/OnlineCarSearchIntentHandler.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/OnlineCarSearchIntentHandler.java
index 6659075585..e9255fac1f 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/OnlineCarSearchIntentHandler.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/OnlineCarSearchIntentHandler.java
@@ -170,7 +170,9 @@ class OnlineCarSearchIntentHandler implements IntentHandler {
                                 int radius ) {
         MarkerServiceHandler.getApis().getRefreshStrategyControllerApi().restartAutoRefreshAtTime( 30_000 );
         MarkerServiceHandler.getMogoStatusManager().setUserInteractionStatus( TAG, true, false );
-        MarkerServiceHandler.getMapUIController().moveToCenter( target );
+        if(!MarkerServiceHandler.getApis().getStatusManagerApi().isVrMode()){
+            MarkerServiceHandler.getMapUIController().moveToCenter( target );
+        }
         MapMarkerManager.getInstance().getOnlineCarDataByVoiceControl(
                 target,
                 onlyFocus,
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java
index b3e3c4cb5a..6af6921829 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java
@@ -698,7 +698,7 @@ public class MapMarkerManager implements IMogoMarkerClickListener,
      * @return
      */
     private boolean ignoreOnlineCarRequest() {
-        return ignoreDrawRequest();
+        return ignoreDrawRequest() || MarkerServiceHandler.getMogoStatusManager().isVrMode();
     }
 
     /**
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/timedelay/TimeDelayUploadManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/timedelay/TimeDelayUploadManager.java
new file mode 100644
index 0000000000..fd8c1947e7
--- /dev/null
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/timedelay/TimeDelayUploadManager.java
@@ -0,0 +1,46 @@
+package com.mogo.module.service.timedelay;
+
+import android.content.Context;
+
+import com.mogo.module.common.MogoApisHandler;
+import com.mogo.service.connection.IMogoOnMessageListener;
+
+/**
+ * 接收服务端模拟定位数据，对下发数据做实时Post上报，统计时延
+ */
+public class TimeDelayUploadManager implements IMogoOnMessageListener {
+
+    private volatile static TimeDelayUploadManager timeDelayUploadManager;
+    private static final int MSG_SOCKET_TYPE = 403000;
+
+    private TimeDelayUploadManager() {
+
+    }
+
+    public TimeDelayUploadManager getInstance() {
+        if (timeDelayUploadManager == null) {
+            synchronized (TimeDelayUploadManager.class) {
+                if (timeDelayUploadManager == null) {
+                    timeDelayUploadManager = new TimeDelayUploadManager();
+                }
+            }
+        }
+        return timeDelayUploadManager;
+    }
+
+    public void init(Context mContext) {
+        MogoApisHandler.getInstance()
+                .getApis()
+                .getSocketManagerApi(mContext).registerOnMessageListener(MSG_SOCKET_TYPE,this);
+    }
+
+    @Override
+    public Class target() {
+        return null;
+    }
+
+    @Override
+    public void onMsgReceived(Object obj) {
+
+    }
+}
diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/TanluManager.java b/modules/mogo-module-share/src/main/java/com/mogo/module/share/TanluManager.java
index e88a3a9680..329a0f76a1 100644
--- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/TanluManager.java
+++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/TanluManager.java
@@ -498,7 +498,9 @@ public class TanluManager implements IMogoMarkerClickListener,
         Logger.d(TAG, "moveToMarcker lat = " + lat + " >>>>lon = " + lon);
         MogoLatLng latLng = new MogoLatLng(lat, lon);
         mMogoStatusManager.setUserInteractionStatus(TAG, true, false);
-        mMApUIController.moveToCenter(latLng);
+        if(!mMogoStatusManager.isVrMode()){
+            mMApUIController.moveToCenter(latLng);
+        }
     }
 
     private void moveNotFresh() {
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/receiver/TestPanelBroadcastReceiver.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/receiver/TestPanelBroadcastReceiver.java
index 197e49dfc5..4da724fa37 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/receiver/TestPanelBroadcastReceiver.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/receiver/TestPanelBroadcastReceiver.java
@@ -16,7 +16,6 @@ import com.mogo.module.v2x.V2XConst;
 import com.mogo.module.v2x.V2XServiceManager;
 import com.mogo.module.v2x.entity.net.V2XOptimalRouteDataRes;
 import com.mogo.module.v2x.entity.net.V2XSpecialCarRes;
-import com.mogo.module.v2x.scenario.impl.V2XScenarioManager;
 import com.mogo.module.v2x.scenario.scene.livecar.V2XVoiceCallLiveBiz;
 import com.mogo.module.v2x.utils.TestOnLineCarUtils;
 import com.mogo.module.v2x.utils.V2XSQLiteUtils;
@@ -162,6 +161,7 @@ public class TestPanelBroadcastReceiver extends BroadcastReceiver {
             intent.putExtra(V2XConst.BROADCAST_SCENE_EXTRA_KEY, v2XMessageEntity);
             LocalBroadcastManager.getInstance(mContext).sendBroadcast(intent);
         } else if (sceneType == 18) {  //test visualAngle UI
+            V2XServiceManager.getMapService().getMarkerManager(mContext).inVisibleAllMarkers();
             V2XServiceManager.getMapService().getMapUIController().changeMapVisualAngle(VisualAngleMode.MODE_LONG_SIGHT);
         } else if (sceneType == 19) {  //test visualAngle UI
             V2XServiceManager.getMapService().getMapUIController().changeMapVisualAngle(VisualAngleMode.MODE_MEDIUM_SIGHT);
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XVoiceCallLiveBiz.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XVoiceCallLiveBiz.java
index 6fa7ab80fa..ae3b8ff515 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XVoiceCallLiveBiz.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XVoiceCallLiveBiz.java
@@ -13,6 +13,7 @@ import com.mogo.commons.voice.AIAssist;
 import com.mogo.map.location.MogoLocation;
 import com.mogo.map.marker.IMogoMarker;
 import com.mogo.map.marker.IMogoMarkerClickListener;
+import com.mogo.map.uicontroller.VisualAngleMode;
 import com.mogo.module.common.MogoApisHandler;
 import com.mogo.module.common.entity.V2XMessageEntity;
 import com.mogo.module.common.entity.V2XPushMessageEntity;
@@ -85,9 +86,22 @@ public class V2XVoiceCallLiveBiz implements IMogoMarkerClickListener{
         MogoApisHandler.getInstance().getApis().getRegisterCenterApi().registerMogoStaticMarkerClickListener(MAP_STATIC, this);
     }
 
+    /**
+     * 地图上静态marker点击，现在仅点击摄像头
+     * @param marker
+     * @return
+     */
     @Override
     public boolean onStaticMarkerClicked(IMogoMarker marker) {
         Log.d(REGISTER_LIFECYCLE_TAG,"onStaticMarkerClicked marker");
+        if(V2XServiceManager.getMapService().getMapUIController().getCurrentMapVisualAngle().isLongSight()){
+            Log.d(REGISTER_LIFECYCLE_TAG,"onStaticMarkerClicked marker is on LongSight, so don't response");
+            return false;
+        }
+        //拉近地图视角为近景
+        V2XServiceManager.getMapService().getMapUIController().changeMapVisualAngle(VisualAngleMode.MODE_CLOSE_SIGHT);
+        //移动地图中心点至marker位置
+        V2XServiceManager.getMapService().getMapUIController().moveToCenter(marker.getPosition(),true);
         String assInfo = marker.getMarkerAssInfo();
         Log.d(REGISTER_LIFECYCLE_TAG,"onStaticMarkerClicked marker assInfo : " + assInfo);
         if (TextUtils.isEmpty(assInfo) || !assInfo.contains(MAP_STATIC_TRAFFIC)) {
@@ -161,6 +175,10 @@ public class V2XVoiceCallLiveBiz implements IMogoMarkerClickListener{
         });
     }
 
+    /**
+     * 获取特定路口摄像头直播
+     * @param assInfo 路口摄像头Id
+     */
     private void getSpecifiedOpenCameraLive(String assInfo) {
         MoGoAiCloudTrafficLive.viewDesignativeIntersectionLive(assInfo, new ITrafficIntersectionLiveCallBack() {
             @Override
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/v2x_optimal_route_warning.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/v2x_optimal_route_warning.png
new file mode 100644
index 0000000000..76ae6f035a
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/v2x_optimal_route_warning.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xxhdpi/v2x_road_front_car_warning.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/v2x_road_front_car_warning.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xxhdpi/v2x_road_front_car_warning.png
rename to modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/v2x_road_front_car_warning.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xxhdpi/v2x_road_front_dead_zone.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/v2x_road_front_dead_zone.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xxhdpi/v2x_road_front_dead_zone.png
rename to modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/v2x_road_front_dead_zone.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xxhdpi/v2x_road_front_m_warning.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/v2x_road_front_m_warning.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xxhdpi/v2x_road_front_m_warning.png
rename to modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/v2x_road_front_m_warning.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xxhdpi/v2x_road_front_p_warning.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/v2x_road_front_p_warning.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xxhdpi/v2x_road_front_p_warning.png
rename to modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/v2x_road_front_p_warning.png
diff --git a/modules/mogo-module-v2x/src/main/res/layout/v2x_road_front_warning_vr.xml b/modules/mogo-module-v2x/src/main/res/layout/v2x_road_front_warning_vr.xml
index 1bce72aaed..f6e3f5199f 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/v2x_road_front_warning_vr.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/v2x_road_front_warning_vr.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="@dimen/dp_470"
-    android:layout_height="@dimen/dp_140"
+    android:layout_width="@dimen/module_v2n_tip_width"
+    android:layout_height="@dimen/module_v2n_tip_height"
     android:layout_marginLeft="@dimen/dp_190"
     android:background="@drawable/v2x_front_warning_bg"
     android:layout_marginTop="@dimen/dp_20">
 
     <ImageView
         android:id="@+id/warning_type_image"
-        android:layout_width="@dimen/dp_100"
-        android:layout_height="@dimen/dp_100"
-        android:layout_marginLeft="@dimen/dp_28"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/module_v2n_image_margin_left"
         android:layout_marginTop="@dimen/dp_20"
         android:src="@drawable/v2x_road_front_car_warning" />
 
@@ -21,7 +21,7 @@
         android:layout_alignParentRight="true"
         android:layout_centerVertical="true"
         android:layout_marginRight="@dimen/dp_28"
-        android:maxWidth="@dimen/dp_100"
+        android:maxWidth="@dimen/module_v2n_tip_text_width"
         android:text="1.2米"
         android:textColor="@color/v2x_FF3036"
         android:textSize="@dimen/dp_32" />
@@ -33,7 +33,7 @@
         android:layout_alignEnd="@+id/warning_distance"
         android:layout_centerVertical="true"
         android:layout_marginLeft="@dimen/dp_20"
-        android:layout_marginRight="@dimen/dp_20"
+        android:layout_marginRight="@dimen/module_v2n_tip_text_margin_right"
         android:layout_toRightOf="@+id/warning_type_image"
         android:text="前车碰撞预警"
         android:textColor="#FFFFFF"
diff --git a/modules/mogo-module-v2x/src/main/res/layout/vr_window_top_tips.xml b/modules/mogo-module-v2x/src/main/res/layout/vr_window_top_tips.xml
index c4c5b9f5a3..c99774a6e4 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/vr_window_top_tips.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/vr_window_top_tips.xml
@@ -12,8 +12,8 @@
 
     <ImageView
         android:id="@+id/warning_type_image"
-        android:layout_width="@dimen/dp_100"
-        android:layout_height="@dimen/dp_100"
+        android:layout_width="@dimen/module_v2x_event_warning_type_image_size"
+        android:layout_height="@dimen/module_v2x_event_warning_type_image_size"
         android:src="@drawable/v2x_optimal_route_warning"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml
index d705650afe..2815a726e6 100644
--- a/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml
@@ -99,6 +99,11 @@
     <dimen name="module_v2x_event_help_sub_title_text_size">14px</dimen>
     <dimen name="module_v2x_event_help_distance_text_size">44px</dimen>
     <dimen name="module_v2x_event_parking_text_size">19px</dimen>
+
+    <!--最优路线-->
+    <dimen name="module_v2x_event_warning_type_image_size">133px</dimen>
+    <dimen name="module_v2x_event_warning_type_text_size">42px</dimen>
+
     <!--适配 V2X 弹窗 UI-->
 
     <dimen name="module_v2x_event_panel_btn_x">572px</dimen>
diff --git a/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml
index a580148415..2344ee5dea 100644
--- a/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml
@@ -99,6 +99,11 @@
     <dimen name="module_v2x_event_help_sub_title_text_size">14px</dimen>
     <dimen name="module_v2x_event_help_distance_text_size">44px</dimen>
     <dimen name="module_v2x_event_parking_text_size">19px</dimen>
+
+    <!--最优路线-->
+    <dimen name="module_v2x_event_warning_type_image_size">133px</dimen>
+    <dimen name="module_v2x_event_warning_type_text_size">42px</dimen>
+
     <!--适配 V2X 弹窗 UI-->
 
     <dimen name="module_v2x_event_panel_btn_x">572px</dimen>
diff --git a/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml
index 091c72520e..b43ce52f75 100644
--- a/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml
@@ -80,6 +80,11 @@
     <dimen name="module_v2x_event_help_sub_title_text_size">26px</dimen>
     <dimen name="module_v2x_event_help_distance_text_size">80px</dimen>
     <dimen name="module_v2x_event_parking_text_size">34px</dimen>
+
+    <!--最优路线-->
+    <dimen name="module_v2x_event_warning_type_image_size">100px</dimen>
+    <dimen name="module_v2x_event_warning_type_text_size">32px</dimen>
+
     <!--适配 V2X 弹窗 UI-->
 
     <dimen name="module_v2x_event_panel_btn_x">940px</dimen>
diff --git a/modules/mogo-module-v2x/src/main/res/values-xhdpi-2560x1600/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-xhdpi-2560x1600/dimens.xml
new file mode 100644
index 0000000000..e5e04824ef
--- /dev/null
+++ b/modules/mogo-module-v2x/src/main/res/values-xhdpi-2560x1600/dimens.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources>
+    <!--联想PAD适配-->
+    <dimen name="module_main_v2x_animation_width">800px</dimen>
+
+    <dimen name="module_v2x_search_marginLeft">32px</dimen>
+    <dimen name="module_v2x_operation_panel_share_goneMarginRight">32px</dimen>
+
+    <dimen name="module_v2x_push_img_height">390px</dimen>
+    <dimen name="module_v2x_push_img_container_height">410px</dimen>
+
+
+    <dimen name="module_v2x_event_icon_size">160px</dimen>
+
+
+    <dimen name="module_v2x_event_distance_text">60px</dimen>
+    <dimen name="module_v2x_event_distance_title">40px</dimen>
+
+    <dimen name="module_v2x_history_event_icon_size">80px</dimen>
+
+    <dimen name="module_v2x_surrounding_item_bottom_size">15px</dimen>
+    <dimen name="module_v2x_map_left">550px</dimen>
+    <dimen name="module_v2x_map_top">200px</dimen>
+    <dimen name="module_v2x_map_right">200px</dimen>
+    <dimen name="module_v2x_map_bottom">100px</dimen>
+    <dimen name="module_v2x_surrounding_top_height">90px</dimen>
+    <dimen name="module_v2x_surrounding_top_bt_width">162px</dimen>
+    <dimen name="module_v2x_surrounding_top_bt_height">64px</dimen>
+    <dimen name="module_v2x_surrounding_empty_iv_margin_top">80px</dimen>
+    <dimen name="module_v2x_surrounding_empty_tv_margin_top">26px</dimen>
+    <dimen name="module_v2x_surrounding_empty_bt_width">270px</dimen>
+    <dimen name="module_v2x_surrounding_empty_bt_height">86px</dimen>
+    <dimen name="module_v2x_surrounding_empty_bt_margin_top">58px</dimen>
+    <dimen name="module_v2x_surrounding_root_margin_left">48px</dimen>
+    <dimen name="module_v2x_surrounding_margin_left">48px</dimen>
+    <dimen name="module_v2x_surrounding_empty_image_height">349px</dimen>
+    <dimen name="module_v2x_surrounding_item_width">465px</dimen>
+    <dimen name="module_v2x_surrounding_item_height">306px</dimen>
+    <dimen name="module_v2x_surrounding_item_bottom">77px</dimen>
+    <dimen name="module_v2x_surrounding_item_bottom_image_height">50px</dimen>
+    <dimen name="module_v2x_surrounding_item_marigin_left">28px</dimen>
+    <dimen name="module_v2x_surrounding_item_marigin_bottom_left">16px</dimen>
+    <dimen name="module_v2x_panel_surrounding_marginbottom">5px</dimen>
+    <dimen name="module_v2x_panel_surrounding_stance">80px</dimen>
+    <dimen name="module_v2x_surrounding_top">22px</dimen>
+
+    <dimen name="module_v2x_surrounding_list_margin_left">20px</dimen>
+    <dimen name="module_v2x_surrounding_item_margin_left">30px</dimen>
+
+    <dimen name="module_v2x_surrounding_refresh_bt_radius">42px</dimen>
+    <dimen name="module_v2x_surrounding_top_textsize">30px</dimen>
+    <dimen name="module_v2x_surrounding_item_bottom_left_textsize">36px</dimen>
+    <dimen name="module_v2x_surrounding_item_bottom_right_textsize">30px</dimen>
+    <dimen name="module_v2x_surrounding_item_maigin_left">50px</dimen>
+
+    <dimen name="module_v2x_panel_width">120px</dimen>
+
+    <dimen name="module_v2x_panel_tab_height">158px</dimen>
+
+    <!--适配 V2X 弹窗 UI-->
+    <dimen name="module_v2x_event_type_title_text_size">20px</dimen>
+    <dimen name="module_v2x_event_title_text_size">36px</dimen>
+    <dimen name="module_v2x_event_sub_title_text_size">28px</dimen>
+    <dimen name="module_v2x_event_head_size">55px</dimen>
+    <dimen name="module_v2x_event_live_error_text_size">36px</dimen>
+    <dimen name="module_v2x_live_window_height">310px</dimen>
+    <dimen name="module_v2x_event_button_size">110px</dimen>
+    <dimen name="module_v2x_event_button_size_detail">120px</dimen>
+
+    <!--道路事件 高的弹窗-->
+    <dimen name="module_v2x_event_image_height">270px</dimen>
+    <dimen name="module_v2x_event_image_width">480px</dimen>
+    <dimen name="module_v2x_event_window_height">330px</dimen>
+    <dimen name="module_v2x_event_window_height_ground">450px</dimen>
+
+    <!--疲劳驾驶、违章停车、道路求助-->
+    <dimen name="module_v2x_fatigue_driving_window_height_ground">200px</dimen>
+
+    <dimen name="module_v2x_event_help_head_size">75px</dimen>
+    <dimen name="module_v2x_event_help_title_text_size">32px</dimen>
+    <dimen name="module_v2x_event_help_sub_title_text_size">26px</dimen>
+    <dimen name="module_v2x_event_help_distance_text_size">80px</dimen>
+    <dimen name="module_v2x_event_parking_text_size">34px</dimen>
+
+    <!--最优路线-->
+    <dimen name="module_v2x_event_warning_type_image_size">133px</dimen>
+    <dimen name="module_v2x_event_warning_type_text_size">42px</dimen>
+
+    <!--适配 V2X 弹窗 UI-->
+
+    <dimen name="module_v2x_event_panel_btn_x">940px</dimen>
+    <dimen name="module_v2x_event_panel_btn_y">701px</dimen>
+    <dimen name="v2x_driving_width">150px</dimen>
+    <dimen name="v2x_driving_heigt">46px</dimen>
+    <dimen name="v2x_recommond_route_size">26px</dimen>
+
+
+</resources>
diff --git a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml
index 6ca53077b7..b67af50738 100644
--- a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml
@@ -113,6 +113,11 @@
     <dimen name="module_v2x_event_help_sub_title_text_size">26px</dimen>
     <dimen name="module_v2x_event_help_distance_text_size">80px</dimen>
     <dimen name="module_v2x_event_parking_text_size">34px</dimen>
+
+    <!--最优路线-->
+    <dimen name="module_v2x_event_warning_type_image_size">133px</dimen>
+    <dimen name="module_v2x_event_warning_type_text_size">42px</dimen>
+
     <!--适配 V2X 弹窗 UI-->
 
     <dimen name="module_v2x_event_panel_btn_x">940px</dimen>