diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt
index 8880fb6d3f..1f30c43adb 100644
--- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt
+++ b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt
@@ -3,8 +3,10 @@ package com.mogo.och.bus.passenger.presenter
 import androidx.lifecycle.LifecycleOwner
 import com.mogo.eagle.core.data.config.HdMapBuildConfig
 import com.mogo.eagle.core.data.map.MogoLocation
+import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
 import com.mogo.eagle.core.function.api.telematic.IReceivedMsgListener
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager
+import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager
 import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager
 import com.mogo.eagle.core.function.call.telematic.CallerTelematicListenerManager
 import com.mogo.eagle.core.utilcode.util.GsonUtils
@@ -188,6 +190,22 @@ class BusPassengerPresenter(view: MainFragment?) :
             OrderStatusEnum.OrderNoLine -> {}
             OrderStatusEnum.OrdersWithLine -> {}
             OrderStatusEnum.NoOrderUse -> {
+                when (CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo().state) {
+                    IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE -> {// 不可自动驾驶
+                        ToastUtils.showShort("设备未就绪请稍等，请安全员主动停止车辆")
+                    }
+                    IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE -> {//
+                        ToastUtils.showShort("因车辆正在人工驾驶中无法靠边停车，请安全员主动停止车辆")
+                    }
+                    IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING -> {
+                        // 靠边停车
+                        CallerAutoPilotControlManager.sendPlanningCmd(1)
+                    }
+                    IMoGoAutopilotStatusListener.STATUS_PARALLEL_DRIVING -> {
+                        ToastUtils.showShort("因车辆正在平行驾驶中无法靠边停车，请安全员主动停止车辆")
+                    }
+                    else -> {}
+                }
                 mView?.showOpenAndCloseDoor()
             }
         }
diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1ContainFragment.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1ContainFragment.kt
index a975479d94..1284e5ac9d 100644
--- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1ContainFragment.kt
+++ b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1ContainFragment.kt
@@ -64,7 +64,7 @@ class M1ContainFragment :
                     childFragmentManager.findFragmentByTag(M1OrderFragment.TAG)
                         ?: M1OrderFragment.newInstance(object :ChangeCheck{
                             override fun changeChange() {
-                                cb_bp_setting_soft.isChecked = true
+                                cb_bp_setting_device.isChecked = true
                             }
                         })
             }
diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/m1_small_map_view_dir_end.png b/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/m1_small_map_view_dir_end.png
new file mode 100755
index 0000000000..38204c4e09
Binary files /dev/null and b/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/m1_small_map_view_dir_end.png differ
diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_main_fragment.xml b/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_main_fragment.xml
index 5a3dd1e87c..f3909ba49a 100644
--- a/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_main_fragment.xml
+++ b/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_main_fragment.xml
@@ -22,6 +22,7 @@
         app:layout_constraintStart_toEndOf="@+id/mapBizView"
         app:resetDrawable="@drawable/bus_p_overmap_reset_size"
         app:carDrawable="@drawable/bug_p_overmap_car_model"
+        app:endPointDrawable="@drawable/m1_small_map_view_dir_end"
         app:startPointDrawable="@null"
         app:resetDrawableMarginRight="34dp"
         app:resetDrawableMarginBottom="54dp"