From 2213be50572576b23c23bade009d488f96263e7b Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Tue, 2 Jul 2024 16:17:23 +0800
Subject: [PATCH] =?UTF-8?q?[6.4.6]=20[fix]=20[=E5=8F=96=E6=B6=88=E7=BA=BF?=
 =?UTF-8?q?=E8=B7=AF=E3=80=81=E6=A8=A1=E6=8B=9F=E5=8D=95=E5=88=B0=E7=AB=99?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AElineid=20=E4=B8=BA-1]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../driver/src/main/java/com/mogo/och/taxi/model/TaxiModel.java | 2 ++
 .../java/com/mogo/och/unmanned/taxi/ui/task/TaxiTaskModel.kt    | 1 +
 2 files changed, 3 insertions(+)

diff --git a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/model/TaxiModel.java b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/model/TaxiModel.java
index 199a4ae122..dd67425e9f 100644
--- a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/model/TaxiModel.java
+++ b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/model/TaxiModel.java
@@ -44,6 +44,7 @@ import com.mogo.och.common.module.manager.autopilot.autopilot.ArrivedStation;
 import com.mogo.och.common.module.manager.autopilot.autopilot.IOchAutopilotStatusListener;
 import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotManager;
 import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotStatusListenerManager;
+import com.mogo.och.common.module.manager.autopilot.line.LineManager;
 import com.mogo.och.common.module.manager.socket.cloud.OCHSocketMessageManager;
 import com.mogo.och.common.module.manager.socket.cloud.data.OCHOperationalMessage;
 import com.mogo.och.common.module.biz.login.LoginStatusManager;
@@ -449,6 +450,7 @@ public class TaxiModel {
                             if (mOrderStatusCallback != null) {
                                 mOrderStatusCallback.onCurrentOrderCancelDone();
                             }
+                            LineManager.setLineId(-1);
                             clearCurrentOCHOrder();
                             cancelAutopilot();
                         }
diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiTaskModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiTaskModel.kt
index f264c0fbd0..3d5c0ee5b8 100644
--- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiTaskModel.kt
+++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiTaskModel.kt
@@ -644,6 +644,7 @@ object TaxiTaskModel {
                     DebugView.printInfoMsg("[上报ArriveSite] success siteId=$siteId, isArriveAtEndSite=$isArriveAtEndSite")
                     d(TAG, "submitArriveSite-onSuccess data=" + GsonUtil.jsonFromObject(data))
                     mDriveToNearestStationTask = null
+                    LineManager.setLineId(-1)
                     if (isArrivedNearestStation) {// 播报提醒
                         VoiceNotice.showNotice("已到达出车点")
                     }