From 21457b52dfdcf0d043d412853d4b4c8df593abac Mon Sep 17 00:00:00 2001
From: EmArrow <zhongchao@zhidaoauto.com>
Date: Mon, 22 Jul 2024 13:56:44 +0800
Subject: [PATCH] [6.5.0] fix bug of road count and add trace

---
 .../function/datacenter/v2x/RoadLineEventManager.kt  |  3 ++-
 .../CallerAutoPilotStatusListenerManager.kt          | 12 ++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/RoadLineEventManager.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/RoadLineEventManager.kt
index 1de40c1ded..59581f6bd2 100644
--- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/RoadLineEventManager.kt
+++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/RoadLineEventManager.kt
@@ -21,7 +21,8 @@ class RoadLineEventManager : IMoGoMapRoadListener, IMoGoAutopilotStatusListener
         }
     }
 
-    private var record  = false
+    @Volatile
+    private var record = false
 
     fun init() {
         CallerMapRoadListenerManager.addListener(TAG, this)
diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotStatusListenerManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotStatusListenerManager.kt
index 91a1929e7a..d30e8ac4ab 100644
--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotStatusListenerManager.kt
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotStatusListenerManager.kt
@@ -26,6 +26,8 @@ import kotlin.properties.Delegates
  */
 object CallerAutoPilotStatusListenerManager : CallerBase<IMoGoAutopilotStatusListener>() {
 
+    private var atomicCountRoad = AtomicInteger(0)
+
     // 存储最后一次回调的数据，当有新当位置注册了监听将此数据回调过去，防止有些模块注册顺序问题导致无法获取最新状态
     @Volatile
     private var mAutopilotStatusInfo: AutopilotStatusInfo = AutopilotStatusInfo()
@@ -36,6 +38,7 @@ object CallerAutoPilotStatusListenerManager : CallerBase<IMoGoAutopilotStatusLis
         }
         if(newValue == 0L){
             mAutopilotStatusInfo.isArriveAtStation = false
+            atomicCountRoad.set(0)
         }
         M_LISTENERS.forEach {
             val listener = it.value
@@ -70,8 +73,6 @@ object CallerAutoPilotStatusListenerManager : CallerBase<IMoGoAutopilotStatusLis
 
     private var status: AdasConstants.IpcConnectionStatus? = null
 
-    private var atomicCountRoad = AtomicInteger(0)
-
     override fun doSomeAfterAddListener(tag: String, listener: IMoGoAutopilotStatusListener) {
         listener.onAutopilotStatusResponse(autopilotState)
         if(dockerV.isNotEmpty()){
@@ -294,11 +295,14 @@ object CallerAutoPilotStatusListenerManager : CallerBase<IMoGoAutopilotStatusLis
     }
 
     fun updateRoadCount(){
-        atomicCountRoad.addAndGet(1)
+        val roadCount = atomicCountRoad.addAndGet(1)
+        CallerTrace.write("updateRoadCount", mapOf("roadCount" to roadCount))
     }
 
     fun getRoadCount(): Int {
-        return atomicCountRoad.get()
+        val count = atomicCountRoad.get()
+        CallerTrace.write("getRoadCount", mapOf("roadCount" to count))
+        return count
     }
 }