From 165ba9b010a65618b374a55692d054ecd1c85ef6 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Sat, 4 Mar 2023 16:29:16 +0800
Subject: [PATCH] =?UTF-8?q?[m1]=20[1.1.2]=20[=E7=BB=93=E6=9D=9F=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E8=BF=9B=E8=A1=8C=E9=9D=A0=E8=BE=B9=E5=81=9C=E8=BD=A6?=
 =?UTF-8?q?=E6=8C=87=E4=BB=A4=E3=80=81=E5=85=A8=E8=A7=88=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E7=BB=88=E7=82=B9=E7=AB=99]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../presenter/BusPassengerPresenter.kt        |  18 ++++++++++++++++++
 .../och/bus/passenger/ui/M1ContainFragment.kt |   2 +-
 .../m1_small_map_view_dir_end.png             | Bin 0 -> 10167 bytes
 .../src/m1/res/layout/m1_main_fragment.xml    |   1 +
 4 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100755 OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/m1_small_map_view_dir_end.png

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 0000000000000000000000000000000000000000..38204c4e09b6ce3fa27940e884b3ae7e7c185f24
GIT binary patch
literal 10167
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

literal 0
HcmV?d00001

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"