From 3e6a88492e9cbf866d69485c807d8c51b11abb6d Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Tue, 23 Apr 2024 20:56:29 +0800
Subject: [PATCH] =?UTF-8?q?[6.4.0]=20[=E6=98=AF=E5=90=A6=E5=90=AF=E5=8A=A8?=
 =?UTF-8?q?=E8=87=AA=E9=A9=BE=E5=9B=9E=E8=B0=83]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/mogo/och/bus/presenter/BusPresenter.java     |  4 ++++
 .../mogo/och/charter/presenter/DriverM1Presenter.kt  |  4 ++++
 .../autopilot/IOchAutopilotStatusListener.java       |  5 +++++
 .../autopilot/OchAutoPilotStatusListenerManager.kt   | 12 +++++++++++-
 .../com/mogo/och/shuttle/presenter/BusPresenter.java |  4 ++++
 5 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/OCH/bus/driver/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java
index 154b36af8c..b68ebf7d47 100644
--- a/OCH/bus/driver/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java
+++ b/OCH/bus/driver/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java
@@ -278,4 +278,8 @@ public class BusPresenter extends Presenter<BusFragment>
         runOnUIThread(() -> mView.stopAnimAndUpdateBtnStatus());
     }
 
+    @Override
+    public void canStartAutopilot(boolean canStart) {
+
+    }
 }
diff --git a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/presenter/DriverM1Presenter.kt b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/presenter/DriverM1Presenter.kt
index 0e363d1e1a..828008694b 100644
--- a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/presenter/DriverM1Presenter.kt
+++ b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/presenter/DriverM1Presenter.kt
@@ -188,4 +188,8 @@ class DriverM1Presenter(view: DriverM1Fragment?) :
         }
     }
 
+    override fun canStartAutopilot(canStart: Boolean) {
+
+    }
+
 }
diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/autopilot/IOchAutopilotStatusListener.java b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/autopilot/IOchAutopilotStatusListener.java
index 172e96d631..f22459686e 100644
--- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/autopilot/IOchAutopilotStatusListener.java
+++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/autopilot/IOchAutopilotStatusListener.java
@@ -91,5 +91,10 @@ public interface IOchAutopilotStatusListener {
      */
     default void onAutopilotRouteLineId(long lineId) {
     }
+    /**
+     * 自动驾驶路线ID回调
+     */
+    default void canStartAutopilot(boolean canStart) {
+    }
 
 }
diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/autopilot/OchAutoPilotStatusListenerManager.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/autopilot/OchAutoPilotStatusListenerManager.kt
index 54153fe23b..733f62b82a 100644
--- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/autopilot/OchAutoPilotStatusListenerManager.kt
+++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/autopilot/OchAutoPilotStatusListenerManager.kt
@@ -2,6 +2,7 @@ package com.mogo.och.common.module.manager.autopilot.autopilot
 
 import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
+import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager
 import com.mogo.och.common.module.manager.autopilot.trajectory.TrajectoryManager
 import com.mogo.och.common.module.utils.CallerBase
@@ -13,12 +14,14 @@ import system_master.SsmInfo
 import system_master.SystemStatusInfo
 import java.lang.Exception
 
-object OchAutoPilotStatusListenerManager : CallerBase<IOchAutopilotStatusListener>(),IMoGoAutopilotStatusListener {
+object OchAutoPilotStatusListenerManager : CallerBase<IOchAutopilotStatusListener>(),IMoGoAutopilotStatusListener,
+        (Boolean) -> Unit {
 
     const val TAG = "OCHAutoPilotStatusListenerManager"
     init {
         //2021.11.1 鹰眼架构整合，由IMoGoAutopilotStatusListener逐步替代IMogoAdasOCHCallback接口
         CallerAutoPilotStatusListenerManager.addListener(TAG, this)
+        CallerAutoPilotControlManager.addStartAutopilotStateListener(TAG,this)
     }
 
     override fun onAutopilotTrajectoryDownloadReq(
@@ -152,4 +155,11 @@ object OchAutoPilotStatusListenerManager : CallerBase<IOchAutopilotStatusListene
             listener.onAutopilotRouteLineId(lineId)
         }
     }
+
+    override fun invoke(canStartAutopilot: Boolean) {
+        M_LISTENERS.forEach {
+            val listener = it.value
+            listener.canStartAutopilot(canStartAutopilot)
+        }
+    }
 }
\ No newline at end of file
diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/presenter/BusPresenter.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/presenter/BusPresenter.java
index 846f0d9ea6..dd91f6c089 100644
--- a/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/presenter/BusPresenter.java
+++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/presenter/BusPresenter.java
@@ -255,4 +255,8 @@ public class BusPresenter extends Presenter<ShuttleFragment>
         runOnUIThread(() -> mView.stopAnimAndUpdateBtnStatus());
     }
 
+    @Override
+    public void canStartAutopilot(boolean canStart) {
+
+    }
 }