From 0b9690c839a05c1253c71a3edbb58d768dab15f2 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Wed, 30 Aug 2023 20:03:59 +0800
Subject: [PATCH] =?UTF-8?q?[6.0.0]=20[autopilo]=20[=E5=8C=85=E8=BD=A6?=
 =?UTF-8?q?=E4=B9=98=E5=AE=A2=E5=B1=8F=E5=88=B0=E7=AB=99=E5=90=8E=E5=81=9C?=
 =?UTF-8?q?=E6=AD=A2=E8=87=AA=E9=A9=BE]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../passenger/model/CharterPassengerModel.kt  |  2 +-
 .../CallerAutoPilotControlManager.kt          | 19 ++++++++++++++++---
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/model/CharterPassengerModel.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/model/CharterPassengerModel.kt
index ed21b9ba9d..9a90b9a708 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/model/CharterPassengerModel.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/model/CharterPassengerModel.kt
@@ -964,7 +964,7 @@ object CharterPassengerModel {
             // 清理轨迹
             cleanRoutePoints()
             // 到站结束自驾
-            CallerAutoPilotControlManager.cancelAutoPilot()
+            CallerAutoPilotControlManager.cancelAutoPilot4Passenger()
             // 结束路距计算 到达目的站点
             endCalculateDistanceLoop()
             // 到站置距离位0
diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotControlManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotControlManager.kt
index 22fb5e1fbf..a491892928 100644
--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotControlManager.kt
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotControlManager.kt
@@ -122,12 +122,25 @@ object CallerAutoPilotControlManager {
     fun cancelAutoPilot() {
         // 司机屏才能取消自动驾驶
         if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) {
-            providerApi?.cancelAutoPilot()
-            // 更新记录在全局的控制参数
-            CallerAutoPilotStatusListenerManager.updateAutopilotControlParameters(null)
+            cancelAutoPilotInner()
         }
     }
 
+    /**
+     * 包车乘客屏 取消自驾(包车 乘客屏为中心)
+     */
+    fun cancelAutoPilot4Passenger(){
+        if (AppIdentityModeUtils.isCharterPassenger(FunctionBuildConfig.appIdentityMode)) {
+            cancelAutoPilotInner()
+        }
+    }
+
+    private fun cancelAutoPilotInner() {
+        providerApi?.cancelAutoPilot()
+        // 更新记录在全局的控制参数
+        CallerAutoPilotStatusListenerManager.updateAutopilotControlParameters(null)
+    }
+
     /**
      * 开启域控制器录制bag包
      */