From bfa28c1269ce4fa59412162f9b805abf35c0201e Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Wed, 6 Dec 2023 14:54:09 +0800
Subject: [PATCH] =?UTF-8?q?[6.2.4]=20[bus=E3=80=81shuttle]=20[=E7=BB=93?=
 =?UTF-8?q?=E6=9D=9F=E4=BB=BB=E5=8A=A1=E6=97=B6=20=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E8=87=AA=E9=A9=BE]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/jinlvvan/java/com/mogo/och/bus/model/OrderModel.java   | 3 +++
 .../src/main/java/com/mogo/och/bus/model/OrderModel.java       | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/OCH/bus/driver/src/jinlvvan/java/com/mogo/och/bus/model/OrderModel.java b/OCH/bus/driver/src/jinlvvan/java/com/mogo/och/bus/model/OrderModel.java
index 84d8af86be..3a89eaa247 100644
--- a/OCH/bus/driver/src/jinlvvan/java/com/mogo/och/bus/model/OrderModel.java
+++ b/OCH/bus/driver/src/jinlvvan/java/com/mogo/och/bus/model/OrderModel.java
@@ -548,6 +548,9 @@ public class OrderModel {
                             clearBusStationDatas();
                             queryBusRoutes();
                             removeTipRunnables();
+                            CallerAutoPilotControlManager.INSTANCE.cancelAutoPilot();
+                            // 取消自驾
+                            setTrajectoryStation(null,null,-1L);
                             //                           startOrStopQueryPassengerWriteOff(false);
                         }
                     }
diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/model/OrderModel.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/model/OrderModel.java
index e6a847f71b..6ecc30ac08 100644
--- a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/model/OrderModel.java
+++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/model/OrderModel.java
@@ -605,6 +605,8 @@ public class OrderModel {
                             clearBusStationDatas();
                             queryBusRoutes();
                             removeTipRunnables();
+                            // 取消自驾
+                            CallerAutoPilotControlManager.INSTANCE.cancelAutoPilot();
                             //                           startOrStopQueryPassengerWriteOff(false);
                         }
                     }