From d4bf056b95194cc69440e4797930850240859597 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Fri, 19 Apr 2024 16:45:05 +0800
Subject: [PATCH] =?UTF-8?q?[6.4.0]=20[=E7=BC=93=E5=AD=98=E4=B8=8B=E8=BD=BD?=
 =?UTF-8?q?=E6=88=90=E5=8A=9F=E7=9A=84lineId]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../autopilot/OchAutoPilotStatusListenerManager.kt  |  8 ++++++++
 .../autopilot/trajectory/TrajectoryManager.kt       | 13 +++++++++++++
 .../java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt |  1 -
 3 files changed, 21 insertions(+), 1 deletion(-)

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 5afa7f08c2..54153fe23b 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
@@ -3,6 +3,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.CallerAutoPilotStatusListenerManager
+import com.mogo.och.common.module.manager.autopilot.trajectory.TrajectoryManager
 import com.mogo.och.common.module.utils.CallerBase
 import com.zhjt.mogo.adas.data.AdasConstants
 import com.zhjt.mogo.adas.data.bean.MogoReport
@@ -94,6 +95,13 @@ object OchAutoPilotStatusListenerManager : CallerBase<IOchAutopilotStatusListene
 
                 }
             }
+            if (MogoReport.Code.Info.ISYS.INIT_TRAJECTORY_SUCCESS == guardianInfo?.code){
+                TrajectoryManager.addDownLoadSuccessLine(lineId)
+            }
+            if (MogoReport.Code.Info.ISYS.INIT_TRAJECTORY_FAILURE == guardianInfo?.code){
+                // 更新轨迹没有更新lineId 第二次下载失败 删除App成功缓存(概率很低)
+                TrajectoryManager.removeDownLoadSuccessLine(lineId)
+            }
         }
         M_LISTENERS.forEach {
             val listener = it.value
diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/trajectory/TrajectoryManager.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/trajectory/TrajectoryManager.kt
index 9734f53b03..023c1bc0b2 100644
--- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/trajectory/TrajectoryManager.kt
+++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/trajectory/TrajectoryManager.kt
@@ -17,6 +17,8 @@ object TrajectoryManager : IMoGoPlanningRottingListener {
     private val distanceListeners: ConcurrentHashMap<String, ITrajectoryListListener> =
         ConcurrentHashMap()
 
+    private val downLoadSuccessLineIds = mutableListOf<Long>()
+
     /**
      * 所有轨迹点
      */
@@ -99,4 +101,15 @@ object TrajectoryManager : IMoGoPlanningRottingListener {
         distanceListeners[tag] = listener
     }
 
+    fun addDownLoadSuccessLine(lineId:Long){
+        if(lineId>0){
+            downLoadSuccessLineIds.add(lineId)
+        }
+    }
+    fun removeDownLoadSuccessLine(lineId:Long){
+        if(lineId>0&& downLoadSuccessLineIds.contains(lineId)){
+            downLoadSuccessLineIds.remove(lineId)
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt
index e86d77eee6..5909042538 100644
--- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt
+++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt
@@ -285,7 +285,6 @@ object TaxiTaskModel {
             }
 
             override fun onAutopilotGuardian(guardianInfo: MogoReportMessage?, lineId: Long) {
-                super.onAutopilotGuardian(guardianInfo, lineId)
                 TaxiTrajectoryManager.getInstance().onAutopilotGuardian(guardianInfo,lineId)
             }