diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/fragment/BaseShuttleTabFragment.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/fragment/BaseShuttleTabFragment.java
index 81cfd770bf..6273398549 100644
--- a/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/fragment/BaseShuttleTabFragment.java
+++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/fragment/BaseShuttleTabFragment.java
@@ -42,7 +42,6 @@ import com.mogo.map.listener.MogoMapListenerHandler;
 import com.mogo.map.uicontroller.IMogoMapUIController;
 import com.mogo.map.uicontroller.VisualAngleMode;
 import com.mogo.och.shuttle.R;
-import com.mogo.och.shuttle.ui.ShuttleTrafficDataView;
 import com.mogo.och.shuttle.view.BizMapView;
 import com.mogo.och.data.bean.BusRoutesResult;
 import com.mogo.och.shuttle.model.OrderModel;
diff --git a/OCH/shuttle/driver/src/main/res/drawable-xhdpi/press_start_status.png b/OCH/shuttle/driver/src/main/res/drawable-nodpi/press_start_status.png
similarity index 100%
rename from OCH/shuttle/driver/src/main/res/drawable-xhdpi/press_start_status.png
rename to OCH/shuttle/driver/src/main/res/drawable-nodpi/press_start_status.png
diff --git a/OCH/shuttle/driver/src/main/res/drawable-xhdpi/start_failure.png b/OCH/shuttle/driver/src/main/res/drawable-nodpi/start_failure.png
similarity index 100%
rename from OCH/shuttle/driver/src/main/res/drawable-xhdpi/start_failure.png
rename to OCH/shuttle/driver/src/main/res/drawable-nodpi/start_failure.png
diff --git a/OCH/shuttle/driver/src/main/res/drawable-xhdpi/shuttle_write_off_bg.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/shuttle_write_off_bg.png
index d4d1eac25f..de9b6c49b7 100755
Binary files a/OCH/shuttle/driver/src/main/res/drawable-xhdpi/shuttle_write_off_bg.png and b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/shuttle_write_off_bg.png differ
diff --git a/OCH/shuttle/driver/src/main/res/drawable/press_start_status.png b/OCH/shuttle/driver/src/main/res/drawable/press_start_status.png
deleted file mode 100755
index af32c20cb5..0000000000
Binary files a/OCH/shuttle/driver/src/main/res/drawable/press_start_status.png and /dev/null differ
diff --git a/OCH/shuttle/driver/src/main/res/drawable/start_failure.png b/OCH/shuttle/driver/src/main/res/drawable/start_failure.png
deleted file mode 100755
index 5737f93ad8..0000000000
Binary files a/OCH/shuttle/driver/src/main/res/drawable/start_failure.png and /dev/null differ
diff --git a/OCH/shuttle/driver/src/main/res/layout/shuttle_base_fragment.xml b/OCH/shuttle/driver/src/main/res/layout/shuttle_base_fragment.xml
index 53b5f358ab..a275b87a98 100644
--- a/OCH/shuttle/driver/src/main/res/layout/shuttle_base_fragment.xml
+++ b/OCH/shuttle/driver/src/main/res/layout/shuttle_base_fragment.xml
@@ -38,7 +38,7 @@
 
     <FrameLayout
         android:id="@+id/fl_speed"
-        android:layout_width="@dimen/dp_624"
+        android:layout_width="@dimen/dp_618"
         android:layout_height="@dimen/dp_269"
         android:layout_marginStart="@dimen/dp_10"
         app:layout_constraintLeft_toLeftOf="parent"
@@ -171,10 +171,10 @@
 
     <RelativeLayout
         android:id="@+id/module_mogo_och_autopilot_status"
-        android:layout_width="@dimen/dp_585"
-        android:layout_height="@dimen/dp_171"
-        android:layout_marginLeft="@dimen/dp_10"
-        android:layout_marginTop="@dimen/dp_m_10"
+        android:layout_width="@dimen/dp_616"
+        android:layout_height="@dimen/dp_180"
+        android:layout_marginStart="@dimen/dp_10"
+        android:layout_marginTop="@dimen/dp_m_1"
         android:background="@drawable/bus_autopilot_0_1_status_bg"
         android:gravity="center"
         app:layout_constraintLeft_toLeftOf="parent"
@@ -226,11 +226,11 @@
     <com.mogo.och.shuttle.ui.writeoff.WriteOffView
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintBottom_toTopOf="@+id/module_mogo_och_arrived_tv"
-        android:layout_marginStart="@dimen/dp_15"
+        android:layout_marginStart="@dimen/dp_12"
         android:layout_marginBottom="-40dp"
         android:background="@drawable/shuttle_write_off_bg"
-        android:layout_width="@dimen/dp_585"
-        android:layout_height="@dimen/dp_176"/>
+        android:layout_width="@dimen/dp_618"
+        android:layout_height="@dimen/dp_177"/>
 
     <TextView
         android:id="@+id/module_mogo_och_arrived_tv"
diff --git a/OCH/shuttle/driver/src/main/res/layout/shuttle_fragment_och.xml b/OCH/shuttle/driver/src/main/res/layout/shuttle_fragment_och.xml
index a2271be28e..e5b1c21ffb 100644
--- a/OCH/shuttle/driver/src/main/res/layout/shuttle_fragment_och.xml
+++ b/OCH/shuttle/driver/src/main/res/layout/shuttle_fragment_och.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/module_och_bus_order_status_stationInfo"
-    android:layout_width="@dimen/dp_587"
+    android:layout_width="@dimen/dp_616"
     android:layout_height="wrap_content"
     android:paddingBottom="@dimen/dp_28"
     android:background="@drawable/bus_line_panel_bg"
@@ -98,8 +98,8 @@
         android:id="@+id/switch_line_btn"
         android:layout_width="match_parent"
         android:layout_height="@dimen/bus_switch_line_btn_height_1"
-        android:layout_marginStart="@dimen/dp_28"
-        android:layout_marginEnd ="@dimen/dp_26"
+        android:layout_marginStart="@dimen/dp_29"
+        android:layout_marginEnd ="@dimen/dp_27"
         android:layout_marginTop="@dimen/dp_40"
         app:layout_goneMarginTop="@dimen/dp_550"
         android:background="@drawable/bus_switch_line_btn"
diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/ui/AutoPilotLaunchBeforeView.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/ui/AutoPilotLaunchBeforeView.kt
index 1d8e9f59ca..7f23e434a1 100644
--- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/ui/AutoPilotLaunchBeforeView.kt
+++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/ui/AutoPilotLaunchBeforeView.kt
@@ -48,7 +48,7 @@ class AutoPilotLaunchBeforeView: LinearLayout, IStatusListener {
     constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : super(context, attrs, defStyleAttr) {
         LayoutInflater.from(context).inflate(R.layout.layout_autopilot_launch_before, this, true)
         background = ContextCompat.getDrawable(context, R.drawable.icon_bg_autopilot_status)
-        setPadding(AutoSizeUtils.dp2px(context, 27f), AutoSizeUtils.dp2px(context, 33f), AutoSizeUtils.dp2px(context, 30f), AutoSizeUtils.dp2px(context, 30f))
+        setPadding(AutoSizeUtils.dp2px(context, 29f), AutoSizeUtils.dp2px(context, 35f), AutoSizeUtils.dp2px(context, 30f), AutoSizeUtils.dp2px(context, 30f))
     }
 
 
diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/layout/layout_autopilot_launch_before.xml b/core/function-impl/mogo-core-function-devatools/src/main/res/layout/layout_autopilot_launch_before.xml
index aae31ba69e..9cd6f3bd5c 100644
--- a/core/function-impl/mogo-core-function-devatools/src/main/res/layout/layout_autopilot_launch_before.xml
+++ b/core/function-impl/mogo-core-function-devatools/src/main/res/layout/layout_autopilot_launch_before.xml
@@ -2,13 +2,13 @@
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     tools:parentTag="android.widget.LinearLayout"
-    tools:layout_width="@dimen/dp_624"
+    tools:layout_width="@dimen/dp_618"
     tools:layout_height="@dimen/dp_269"
     tools:orientation="horizontal"
     tools:background="@drawable/icon_bg_autopilot_status"
-    tools:paddingTop="@dimen/dp_33"
+    tools:paddingTop="@dimen/dp_35"
     tools:paddingBottom="@dimen/dp_30"
-    tools:paddingStart="@dimen/dp_27"
+    tools:paddingStart="@dimen/dp_29"
     tools:paddingEnd="@dimen/dp_30">
 
     <LinearLayout