diff --git a/OCH/bus/driver/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java
index 5ccfabacbf..42fa3230ab 100644
--- a/OCH/bus/driver/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java
+++ b/OCH/bus/driver/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java
@@ -416,7 +416,7 @@ public abstract class BaseBusTabFragment<V extends IView, P extends Presenter<V>
                     == autopilotStatus) {
                 ctvAutopilotStatusTv.setText(R.string.bus_pingxing_driver);
                 ctvAutopilotStatus.setClickable(false);
-                ctvAutopilotStatus.setBackgroundResource(R.drawable.pingxingjiashi);
+                ctvAutopilotStatus.setBackgroundResource(R.drawable.common_autopilot_pxjs);
             }
 
         }
diff --git a/OCH/bus/driver/src/main/res/drawable/bus_autopilot_0_1_status_bg.xml b/OCH/bus/driver/src/main/res/drawable/bus_autopilot_0_1_status_bg.xml
index 21c3611ffe..9c91366aa3 100644
--- a/OCH/bus/driver/src/main/res/drawable/bus_autopilot_0_1_status_bg.xml
+++ b/OCH/bus/driver/src/main/res/drawable/bus_autopilot_0_1_status_bg.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@drawable/press_start_status">
+    <item android:state_pressed="true" android:drawable="@drawable/common_autopilot_press">
     </item>
-    <item android:drawable="@drawable/start_failure">
+    <item android:drawable="@drawable/common_autopilot_unable">
     </item>
 </selector>
 
diff --git a/OCH/bus/driver/src/main/res/drawable/bus_autopilot_2_status_bg.xml b/OCH/bus/driver/src/main/res/drawable/bus_autopilot_2_status_bg.xml
index 1b95919363..f0e15d25d2 100644
--- a/OCH/bus/driver/src/main/res/drawable/bus_autopilot_2_status_bg.xml
+++ b/OCH/bus/driver/src/main/res/drawable/bus_autopilot_2_status_bg.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@drawable/press_start_status">
+    <item android:state_pressed="true" android:drawable="@drawable/common_autopilot_press">
     </item>
-    <item android:drawable="@drawable/start_success">
+    <item android:drawable="@drawable/common_autopilot_in_autopilot">
     </item>
 </selector>
 
diff --git a/OCH/bus/driver/src/main/res/layout/bus_base_fragment.xml b/OCH/bus/driver/src/main/res/layout/bus_base_fragment.xml
index 34ffb18583..2462451fb7 100644
--- a/OCH/bus/driver/src/main/res/layout/bus_base_fragment.xml
+++ b/OCH/bus/driver/src/main/res/layout/bus_base_fragment.xml
@@ -19,22 +19,6 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
 
-<!--    <FrameLayout-->
-<!--        android:id="@+id/fl_speed"-->
-<!--        android:layout_width="@dimen/dp_616"-->
-<!--        android:layout_height="@dimen/dp_320"-->
-<!--        android:layout_marginLeft="@dimen/dp_13"-->
-<!--        android:layout_marginTop="@dimen/dp_40"-->
-<!--        android:visibility="visible"-->
-<!--        app:layout_constraintLeft_toLeftOf="parent"-->
-<!--        app:layout_constraintTop_toTopOf="parent">-->
-
-<!--        <com.mogo.eagle.core.function.hmi.ui.widget.TrafficDataView-->
-<!--            android:id="@+id/bus_arc"-->
-<!--            android:layout_width="match_parent"-->
-<!--            android:layout_height="match_parent" />-->
-
-<!--    </FrameLayout>-->
     <FrameLayout
         android:id="@+id/fl_speed"
         android:layout_width="@dimen/dp_618"
@@ -171,9 +155,11 @@
     <RelativeLayout
         android:id="@+id/module_mogo_och_autopilot_status"
         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:layout_height="@dimen/dp_185"
+        android:layout_marginStart="@dimen/dp_9"
+        android:layout_marginTop="-31dp"
+        android:paddingTop="@dimen/dp_27"
+        android:paddingBottom="@dimen/dp_32"
         android:background="@drawable/bus_autopilot_0_1_status_bg"
         android:gravity="center"
         app:layout_constraintLeft_toLeftOf="parent"
@@ -206,9 +192,10 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginLeft="@dimen/dp_13"
+        android:layout_marginTop="-24dp"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toBottomOf="@id/module_mogo_och_autopilot_status"
-        app:layout_goneMarginTop="@dimen/module_mogo_och_station_panel_container_margin_top_no_call" />
+        />
 
     <include
         android:id="@+id/module_mogo_och_bus_test_bar"
diff --git a/OCH/bus/passenger/src/main/java/com/mogo/och/bus/passenger/BusPassengerProvider.kt b/OCH/bus/passenger/src/main/java/com/mogo/och/bus/passenger/BusPassengerProvider.kt
index 6ace107c8c..21fdea40bc 100644
--- a/OCH/bus/passenger/src/main/java/com/mogo/och/bus/passenger/BusPassengerProvider.kt
+++ b/OCH/bus/passenger/src/main/java/com/mogo/och/bus/passenger/BusPassengerProvider.kt
@@ -5,7 +5,6 @@ import android.view.View
 import androidx.fragment.app.Fragment
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.mogo.eagle.core.data.config.FunctionBuildConfig
-import com.mogo.eagle.core.function.hmi.ui.widget.StatusBarView
 import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
diff --git a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/view/autopilot/AutopilotStatusView.kt b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/view/autopilot/AutopilotStatusView.kt
index aa06ab956b..185fe61ba5 100644
--- a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/view/autopilot/AutopilotStatusView.kt
+++ b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/view/autopilot/AutopilotStatusView.kt
@@ -125,7 +125,7 @@ class AutopilotStatusView : RelativeLayout,AutopilotStatusViewModel.IAutopilotSt
         bus_autopolot_btn_tv.text = resources.getString(R.string.charter_loading_autopilot_pingxing_tv)
         bus_autopilot_btn_iv.setImageResource(R.drawable.charter_ic_autopilot)
         isClickable = false
-        background = ResourceUtils.getDrawable(R.drawable.charter_pingxingjiashi)
+        background = ResourceUtils.getDrawable(R.drawable.common_autopilot_pxjs)
     }
 
     override fun onAttachedToWindow() {
diff --git a/OCH/charter/driver/src/main/res/drawable/charter_autopilot_0_1_status_bg.xml b/OCH/charter/driver/src/main/res/drawable/charter_autopilot_0_1_status_bg.xml
index 8c1d9e64ed..f2d64cec32 100644
--- a/OCH/charter/driver/src/main/res/drawable/charter_autopilot_0_1_status_bg.xml
+++ b/OCH/charter/driver/src/main/res/drawable/charter_autopilot_0_1_status_bg.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@drawable/charter_press_start_status"/>
-    <item android:drawable="@drawable/charter_start_failure"/>
+    <item android:state_pressed="true" android:drawable="@drawable/common_autopilot_press"/>
+    <item android:drawable="@drawable/common_autopilot_start_fail"/>
 </selector>
 
diff --git a/OCH/charter/driver/src/main/res/drawable/charter_autopilot_2_status_bg.xml b/OCH/charter/driver/src/main/res/drawable/charter_autopilot_2_status_bg.xml
index fda939cf28..f0e15d25d2 100644
--- a/OCH/charter/driver/src/main/res/drawable/charter_autopilot_2_status_bg.xml
+++ b/OCH/charter/driver/src/main/res/drawable/charter_autopilot_2_status_bg.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@drawable/charter_press_start_status">
+    <item android:state_pressed="true" android:drawable="@drawable/common_autopilot_press">
     </item>
-    <item android:drawable="@drawable/charter_start_success">
+    <item android:drawable="@drawable/common_autopilot_in_autopilot">
     </item>
 </selector>
 
diff --git a/OCH/charter/driver/src/main/res/layout/charter_autopilot_status.xml b/OCH/charter/driver/src/main/res/layout/charter_autopilot_status.xml
index ae9faef3d4..d9064ebce3 100644
--- a/OCH/charter/driver/src/main/res/layout/charter_autopilot_status.xml
+++ b/OCH/charter/driver/src/main/res/layout/charter_autopilot_status.xml
@@ -3,8 +3,8 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="@dimen/dp_616"
-    android:layout_height="@dimen/dp_180"
+    android:layout_width="@dimen/dp_618"
+    android:layout_height="@dimen/dp_185"
     android:gravity="center"
     android:background="@drawable/charter_autopilot_0_1_status_bg"
     tools:parentTag="RelativeLayout">
diff --git a/OCH/charter/driver/src/main/res/layout/charter_base_fragment.xml b/OCH/charter/driver/src/main/res/layout/charter_base_fragment.xml
index cbb7a1b508..438d21db04 100644
--- a/OCH/charter/driver/src/main/res/layout/charter_base_fragment.xml
+++ b/OCH/charter/driver/src/main/res/layout/charter_base_fragment.xml
@@ -164,20 +164,24 @@
 
     <com.magic.mogo.och.charter.view.autopilot.AutopilotStatusView
         android:id="@+id/autopilot_status"
-        android:layout_width="@dimen/dp_616"
-        android:layout_height="@dimen/dp_180"
+        android:layout_width="@dimen/dp_618"
+        android:layout_height="@dimen/dp_185"
         android:gravity="center"
+        android:paddingTop="@dimen/dp_27"
+        android:paddingBottom="@dimen/dp_32"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/fl_speed"
         tools:visibility="visible"
-        android:layout_marginLeft="@dimen/dp_13"/>
+        android:layout_marginTop="-31dp"
+        android:layout_marginLeft="@dimen/dp_9"/>
 
     <!--订单状态-->
     <FrameLayout
         android:id="@+id/module_mogo_och_station_panel_container"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/dp_13"
+        android:layout_marginLeft="@dimen/dp_10"
+        android:layout_marginTop="-30dp"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toBottomOf="@id/autopilot_status"
         app:layout_goneMarginTop="@dimen/dp_530" />
diff --git a/OCH/common/biz/src/main/res/layout/biz_login_business_view.xml b/OCH/common/biz/src/main/res/layout/biz_login_business_view.xml
index b9b315631e..48ebd3c80b 100644
--- a/OCH/common/biz/src/main/res/layout/biz_login_business_view.xml
+++ b/OCH/common/biz/src/main/res/layout/biz_login_business_view.xml
@@ -13,7 +13,7 @@
         android:gravity="center"
         android:paddingTop="@dimen/dp_20"
         android:paddingBottom="@dimen/dp_20"
-        android:text="小巴"
+        android:text="公交模式"
         android:textColor="@color/white"
         app:layout_constraintBottom_toTopOf="@+id/actv_business_charter"
         app:layout_constraintEnd_toEndOf="parent"
@@ -27,7 +27,7 @@
         android:paddingTop="@dimen/dp_20"
         android:paddingBottom="@dimen/dp_20"
         android:gravity="center"
-        android:text="包车"
+        android:text="包车模式"
         android:textColor="@color/white"
         app:layout_constraintBottom_toTopOf="@+id/actv_business_shuttle"
         app:layout_constraintEnd_toEndOf="parent"
@@ -41,7 +41,7 @@
         android:paddingTop="@dimen/dp_20"
         android:paddingBottom="@dimen/dp_20"
         android:gravity="center"
-        android:text="接驳"
+        android:text="接驳模式"
         android:textColor="@color/white"
         app:layout_constraintBottom_toTopOf="@+id/actv_business_taxi"
         app:layout_constraintEnd_toEndOf="parent"
@@ -55,7 +55,7 @@
         android:paddingTop="@dimen/dp_20"
         android:paddingBottom="@dimen/dp_20"
         android:gravity="center"
-        android:text="出租车"
+        android:text="出租车模式"
         android:textColor="@color/white"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/OCH/common/common/build.gradle b/OCH/common/common/build.gradle
index 3562cd026e..1279256a45 100644
--- a/OCH/common/common/build.gradle
+++ b/OCH/common/common/build.gradle
@@ -45,6 +45,7 @@ android {
             res.srcDirs = [
                     'src/main/res',
                     'src/main/res/xiaozhi',
+                    'src/main/res/autopilot',
             ]
         }
     }
diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/common_autopilot_able.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/common_autopilot_able.png
new file mode 100755
index 0000000000..0266a6cb60
Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/common_autopilot_able.png differ
diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/common_autopilot_in_autopilot.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/common_autopilot_in_autopilot.png
new file mode 100755
index 0000000000..1d08b0f359
Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/common_autopilot_in_autopilot.png differ
diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/common_autopilot_press.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/common_autopilot_press.png
new file mode 100755
index 0000000000..e0370edd24
Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/common_autopilot_press.png differ
diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/common_autopilot_pxjs.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/common_autopilot_pxjs.png
new file mode 100755
index 0000000000..c5bfb8e5ba
Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/common_autopilot_pxjs.png differ
diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/common_autopilot_start_fail.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/common_autopilot_start_fail.png
new file mode 100755
index 0000000000..0266a6cb60
Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/common_autopilot_start_fail.png differ
diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/common_autopilot_start_success.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/common_autopilot_start_success.png
new file mode 100755
index 0000000000..3a58c70b24
Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/common_autopilot_start_success.png differ
diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/common_autopilot_starting.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/common_autopilot_starting.png
new file mode 100755
index 0000000000..fe1b9b82b4
Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/common_autopilot_starting.png differ
diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/common_autopilot_unable.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/common_autopilot_unable.png
new file mode 100755
index 0000000000..a8d5e1a53c
Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/common_autopilot_unable.png differ
diff --git a/OCH/common/common/src/main/res/autopilot/drawable/common_autopilot_able_bg.xml b/OCH/common/common/src/main/res/autopilot/drawable/common_autopilot_able_bg.xml
new file mode 100644
index 0000000000..b99a0a1a8f
--- /dev/null
+++ b/OCH/common/common/src/main/res/autopilot/drawable/common_autopilot_able_bg.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--可以启动自驾不在自驾中-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" android:drawable="@drawable/common_autopilot_press">
+    </item>
+    <item android:drawable="@drawable/common_autopilot_able">
+    </item>
+</selector>
+
diff --git a/OCH/common/common/src/main/res/autopilot/drawable/common_autopilot_in_bg.xml b/OCH/common/common/src/main/res/autopilot/drawable/common_autopilot_in_bg.xml
new file mode 100644
index 0000000000..ffcaaae7f1
--- /dev/null
+++ b/OCH/common/common/src/main/res/autopilot/drawable/common_autopilot_in_bg.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--在自驾中-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" android:drawable="@drawable/common_autopilot_in_autopilot">
+    </item>
+    <item android:drawable="@drawable/common_autopilot_in_autopilot">
+    </item>
+</selector>
+
diff --git a/OCH/common/common/src/main/res/autopilot/drawable/common_autopilot_start_fail_bg.xml b/OCH/common/common/src/main/res/autopilot/drawable/common_autopilot_start_fail_bg.xml
new file mode 100644
index 0000000000..d765512c7c
--- /dev/null
+++ b/OCH/common/common/src/main/res/autopilot/drawable/common_autopilot_start_fail_bg.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--在自驾中-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" android:drawable="@drawable/common_autopilot_press">
+    </item>
+    <item android:drawable="@drawable/common_autopilot_start_fail">
+    </item>
+</selector>
+
diff --git a/OCH/common/common/src/main/res/autopilot/drawable/common_autopilot_start_success_bg.xml b/OCH/common/common/src/main/res/autopilot/drawable/common_autopilot_start_success_bg.xml
new file mode 100644
index 0000000000..c40596b9dc
--- /dev/null
+++ b/OCH/common/common/src/main/res/autopilot/drawable/common_autopilot_start_success_bg.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--在自驾中-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" android:drawable="@drawable/common_autopilot_press">
+    </item>
+    <item android:drawable="@drawable/common_autopilot_start_success">
+    </item>
+</selector>
+
diff --git a/OCH/common/common/src/main/res/autopilot/drawable/common_autopilot_starting_bg.xml b/OCH/common/common/src/main/res/autopilot/drawable/common_autopilot_starting_bg.xml
new file mode 100644
index 0000000000..b0a24ad7f7
--- /dev/null
+++ b/OCH/common/common/src/main/res/autopilot/drawable/common_autopilot_starting_bg.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--在自驾中-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" android:drawable="@drawable/common_autopilot_press">
+    </item>
+    <item android:drawable="@drawable/common_autopilot_starting">
+    </item>
+</selector>
+
diff --git a/OCH/common/common/src/main/res/autopilot/drawable/common_autopilot_unable_bg.xml b/OCH/common/common/src/main/res/autopilot/drawable/common_autopilot_unable_bg.xml
new file mode 100644
index 0000000000..9bd804af80
--- /dev/null
+++ b/OCH/common/common/src/main/res/autopilot/drawable/common_autopilot_unable_bg.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--不可启动自驾-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" android:drawable="@drawable/common_autopilot_unable">
+    </item>
+    <item android:drawable="@drawable/common_autopilot_press">
+    </item>
+</selector>
+
diff --git a/OCH/facade/src/main/java/com/mogo/och/facade/route/FacadeProvider.kt b/OCH/facade/src/main/java/com/mogo/och/facade/route/FacadeProvider.kt
index 0daa89a8a7..b42c284043 100644
--- a/OCH/facade/src/main/java/com/mogo/och/facade/route/FacadeProvider.kt
+++ b/OCH/facade/src/main/java/com/mogo/och/facade/route/FacadeProvider.kt
@@ -16,10 +16,9 @@ import com.mogo.eagle.core.function.hmi.ui.setting.SopView
 import com.mogo.eagle.core.function.hmi.ui.setting.ToggleDebugView
 import com.mogo.eagle.core.function.hmi.ui.widget.StatusBarView
 import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
+import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
-import com.mogo.och.common.module.biz.lansocket.LoginLanDriverSocket
-import com.mogo.och.common.module.biz.lansocket.LoginLanPassengerSocket
 import com.mogo.och.common.module.constant.OchCommonConst
 import com.mogo.och.common.module.biz.login.BusinessEnum
 import com.mogo.och.common.module.biz.login.ILoginCallback
@@ -191,11 +190,13 @@ abstract class FacadeProvider : IMoGoFunctionProvider, ILoginCallback {
                     return
                 }
             }
+            CallerLogger.d(TAG,"添加statusBar---${commonService}")
             decorView.addView(statusBarView, statusBarLP)
         }
     }
     private fun removeStatusBar(){
         activity?.let {
+            CallerLogger.d(TAG,"移除statusBar")
             val decorView = it.window.decorView as? FrameLayout ?: return
             val statusBar =  decorView.findViewWithTag<View>("status_bar")
             statusBar?.let {
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 50625d169b..1e30f5b82c 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
@@ -395,7 +395,7 @@ public abstract class BaseShuttleTabFragment<V extends IView, P extends Presente
             ctvAutopilotStatusTv.setText(getResources().getString(R.string.bus_loading_autopilot_runnig_tv));
             ctvAutopilotStatusIv.setImageResource(R.drawable.bus_disable_autopilot_icon);
             ctvAutopilotStatus.setClickable(true);
-            ctvAutopilotStatus.setBackgroundResource(R.drawable.start_failure);
+            ctvAutopilotStatus.setBackgroundResource(R.drawable.common_autopilot_start_fail);
         } else {
             ctvAutopilotStatusTv.setTextColor(AbsMogoApplication.getApp().getColor(R.color.bus_autopilot_text_color_normal));
             ctvAutopilotStatusIv.setImageResource(R.drawable.bus_ic_autopilot);
@@ -403,22 +403,22 @@ public abstract class BaseShuttleTabFragment<V extends IView, P extends Presente
                 ctvAutopilotStatusTv.setText(getResources().getString(R.string.bus_loading_autopilot_runnig_tv));
                 if(canStartAuto){
                     ctvAutopilotStatus.setClickable(true);
-                    ctvAutopilotStatus.setBackgroundResource(R.drawable.press_start_status);
+                    ctvAutopilotStatus.setBackgroundResource(R.drawable.common_autopilot_press);
                 }else {
                     ctvAutopilotStatusTv.setTextColor(getResources().getColor(R.color.bus_autopilot_text_color_disable));
                     ctvAutopilotStatusIv.setImageResource(R.drawable.bus_disable_autopilot_icon);
                     ctvAutopilotStatus.setClickable(true);
-                    ctvAutopilotStatus.setBackgroundResource(R.drawable.start_failure);
+                    ctvAutopilotStatus.setBackgroundResource(R.drawable.common_autopilot_start_fail);
                 }
             } else if (IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING == autopilotStatus) {
                 ctvAutopilotStatusTv.setText(R.string.bus_loading_autopilot_runnig_tv);
                 ctvAutopilotStatus.setClickable(true);
-                ctvAutopilotStatus.setBackgroundResource(R.drawable.start_success);
+                ctvAutopilotStatus.setBackgroundResource(R.drawable.common_autopilot_in_autopilot);
             } else if (IMoGoAutopilotStatusListener.STATUS_PARALLEL_DRIVING
                     == autopilotStatus){
                 ctvAutopilotStatusTv.setText(R.string.bus_pingxing_driver);
                 ctvAutopilotStatus.setClickable(false);
-                ctvAutopilotStatus.setBackgroundResource(R.drawable.pingxingjiashi);
+                ctvAutopilotStatus.setBackgroundResource(R.drawable.common_autopilot_pxjs);
             }
         }
     }
diff --git a/OCH/shuttle/driver/src/main/res/drawable/bus_autopilot_0_1_status_bg.xml b/OCH/shuttle/driver/src/main/res/drawable/bus_autopilot_0_1_status_bg.xml
index 21c3611ffe..47ca8c7d4b 100644
--- a/OCH/shuttle/driver/src/main/res/drawable/bus_autopilot_0_1_status_bg.xml
+++ b/OCH/shuttle/driver/src/main/res/drawable/bus_autopilot_0_1_status_bg.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@drawable/press_start_status">
+    <item android:state_pressed="true" android:drawable="@drawable/common_autopilot_press">
     </item>
-    <item android:drawable="@drawable/start_failure">
+    <item android:drawable="@drawable/common_autopilot_start_fail">
     </item>
 </selector>
 
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 a275b87a98..6d417a595b 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
@@ -172,9 +172,11 @@
     <RelativeLayout
         android:id="@+id/module_mogo_och_autopilot_status"
         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:layout_height="@dimen/dp_185"
+        android:layout_marginStart="@dimen/dp_9"
+        android:layout_marginTop="-31dp"
+        android:paddingTop="@dimen/dp_27"
+        android:paddingBottom="@dimen/dp_32"
         android:background="@drawable/bus_autopilot_0_1_status_bg"
         android:gravity="center"
         app:layout_constraintLeft_toLeftOf="parent"
@@ -207,7 +209,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginLeft="@dimen/dp_10"
-        android:layout_marginTop="@dimen/dp_m_10"
+        android:layout_marginTop="-27dp"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toBottomOf="@id/module_mogo_och_autopilot_status"
         app:layout_goneMarginTop="@dimen/module_mogo_och_station_panel_container_margin_top_no_call" />
diff --git a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java
index 7a6a6024d0..80cf41a1dd 100644
--- a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java
+++ b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java
@@ -338,29 +338,29 @@ public abstract class BaseTaxiTabFragment<V extends IView, P extends Presenter<V
             mAutopilotTv.setText("自动驾驶");
             mAutopilotTv.setTextColor(getResources().getColor(R.color.taxi_autopilot_text_color_normal));
             mAutopilotImage.setImageResource(R.drawable.taxi_ic_autopilot);
-            ctvAutopilotStatusRL.setBackgroundResource(R.drawable.taxi_autopilot_success);
+            ctvAutopilotStatusRL.setBackgroundResource(R.drawable.common_autopilot_in_autopilot);
         } else if (IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE == status) {
             mAutopilotTv.setText("自动驾驶");
             if(canStart){
                 mAutopilotTv.setTextColor(getResources().getColor(R.color.taxi_autopilot_text_color_normal));
                 mAutopilotImage.setImageResource(R.drawable.taxi_ic_autopilot);
-                ctvAutopilotStatusRL.setBackgroundResource(R.drawable.taxi_ic_autopilot_bg_pressed);
+                ctvAutopilotStatusRL.setBackgroundResource(R.drawable.common_autopilot_press);
             }else {
                 mAutopilotTv.setTextColor(getResources().getColor(R.color.taxi_autopilot_text_color_disable));
                 mAutopilotImage.setImageResource(R.drawable.taxi_ic_autopilot_disable);
-                ctvAutopilotStatusRL.setBackgroundResource(R.drawable.taxi_ic_autopilot_bg);
+                ctvAutopilotStatusRL.setBackgroundResource(R.drawable.common_autopilot_press);
             }
         } else if (IMoGoAutopilotStatusListener.STATUS_PARALLEL_DRIVING == status) {
             mAutopilotTv.setText("远程代驾");
             mAutopilotTv.setTextColor(getResources().getColor(R.color.taxi_autopilot_text_color_normal));
             mAutopilotImage.setImageResource(R.drawable.taxi_ic_autopilot);
-            ctvAutopilotStatusRL.setBackgroundResource(R.drawable.taxi_autopilot_pingxjs);
+            ctvAutopilotStatusRL.setBackgroundResource(R.drawable.common_autopilot_pxjs);
             // 平行驾驶
         } else {
             mAutopilotTv.setText("自动驾驶");
             mAutopilotTv.setTextColor(getResources().getColor(R.color.taxi_autopilot_text_color_disable));
             mAutopilotImage.setImageResource(R.drawable.taxi_ic_autopilot_disable);
-            ctvAutopilotStatusRL.setBackgroundResource(R.drawable.taxi_ic_autopilot_bg);
+            ctvAutopilotStatusRL.setBackgroundResource(R.drawable.common_autopilot_start_fail);
         }
 
     }
diff --git a/OCH/taxi/driver/src/main/res/drawable/taxi_autopilot_bg_selector.xml b/OCH/taxi/driver/src/main/res/drawable/taxi_autopilot_bg_selector.xml
index 8ba3d1a9d8..350b784c17 100644
--- a/OCH/taxi/driver/src/main/res/drawable/taxi_autopilot_bg_selector.xml
+++ b/OCH/taxi/driver/src/main/res/drawable/taxi_autopilot_bg_selector.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:tools="http://schemas.android.com/tools" xmlns:android="http://schemas.android.com/apk/res/android" tools:ignore="MissingDefaultResource">
 
-    <item android:state_pressed="true" android:drawable="@drawable/taxi_ic_autopilot_bg_pressed"/>
-    <item android:state_pressed="false" android:drawable="@drawable/taxi_ic_autopilot_bg" />
-    <item android:drawable="@drawable/taxi_ic_autopilot_bg"/>
+    <item android:state_pressed="true" android:drawable="@drawable/common_autopilot_press"/>
+    <item android:state_pressed="false" android:drawable="@drawable/common_autopilot_start_fail" />
+    <item android:drawable="@drawable/common_autopilot_start_fail"/>
 </selector>
\ No newline at end of file
diff --git a/OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml b/OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml
index bc77186cfe..3eff9cffee 100644
--- a/OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml
+++ b/OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml
@@ -35,6 +35,8 @@
         android:layout_height="@dimen/dp_180"
         android:layout_marginStart="@dimen/dp_10"
         android:layout_marginTop="-31dp"
+        android:paddingTop="@dimen/dp_27"
+        android:paddingBottom="@dimen/dp_32"
         android:gravity="center"
         android:background="@drawable/taxi_autopilot_bg_selector"
         app:layout_constraintLeft_toLeftOf="parent"
diff --git a/OCH/taxi/unmanned-driver/src/main/res/layout/taxi_base_fragment.xml b/OCH/taxi/unmanned-driver/src/main/res/layout/taxi_base_fragment.xml
index 1fb3d402e8..d6239d67ee 100644
--- a/OCH/taxi/unmanned-driver/src/main/res/layout/taxi_base_fragment.xml
+++ b/OCH/taxi/unmanned-driver/src/main/res/layout/taxi_base_fragment.xml
@@ -42,6 +42,8 @@
         android:layout_width="@dimen/dp_616"
         android:layout_height="@dimen/dp_180"
         android:layout_marginStart="@dimen/dp_10"
+        android:paddingTop="@dimen/dp_27"
+        android:paddingBottom="@dimen/dp_32"
         android:layout_marginTop="-31dp"
         android:gravity="center"
         android:background="@drawable/taxi_autopilot_bg_selector"