From a758a69119b9fa0648a9f5659c1604e10de38d63 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Mon, 2 Dec 2024 16:21:46 +0800
Subject: [PATCH] =?UTF-8?q?[6.8.0]=20[fix]=20[taxi=20=E5=90=AF=E5=8A=A8?=
 =?UTF-8?q?=E8=87=AA=E9=A9=BE=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E3=80=81=E4=B9=98=E5=AE=A2=E5=B1=8F=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?orderId]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/mogo/och/unmanned/taxi/ui/task/TaxiTaskModel.kt     | 2 ++
 .../mogo/och/unmanned/passenger/model/AutopilotManager.kt   | 6 ++++++
 2 files changed, 8 insertions(+)

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 e50a17f0b3..404483b968 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
@@ -1081,6 +1081,8 @@ object TaxiTaskModel {
                         mCurrentTaskTrajectory = it.first { currentTaskLineId == it.lineId }
                         mCurrentTaskTrajectory?.let {traj->
                             LineManager.setLineInfo(LineInfo(traj.lineId,traj.lineName, orderId = mCurrentTaskWithOrder?.order?.orderNo?:""))
+                            traj.blackPoints?.clear()
+                            traj.passPoints?.clear()
                             LineManager.setContraiInfo(traj.toCommonContraiInfo())
                         }
                     }
diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/model/AutopilotManager.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/model/AutopilotManager.kt
index 9ebc7395fa..25d3c0caac 100644
--- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/model/AutopilotManager.kt
+++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/model/AutopilotManager.kt
@@ -155,6 +155,12 @@ object AutopilotManager : IOchAutopilotStatusListener {
             AutopilotControlParameters.AutoPilotLonLat(startWgsLat, startWgsLon)
         parameters.endLatLon = AutopilotControlParameters.AutoPilotLonLat(endWgsLat, endWgsLon)
 
+        val startSiteId = TaxiPassengerModel.currentOCHOrder?.orderStartSite?.siteId?:0L
+        val endSiteId = TaxiPassengerModel.currentOCHOrder?.orderEndSite?.siteId?:0L
+        val orderNo = TaxiPassengerModel.currentOCHOrder?.orderNo?:0L
+        val lineId = TaxiPassengerModel.currentOCHOrder?.orderLine?:""
+        parameters.orderId = "${lineId}_${startSiteId}_${endSiteId}_${orderNo}"
+
         // TODO 这里需要增加传入 白名单点列表、黑名单点列表，顺序按照服务端传入顺序为准。
         //parameters.wayLatLons
         //parameters.blackLatLons