From c60215d259fd83db356fcc84d9268c379eb7b666 Mon Sep 17 00:00:00 2001
From: EmArrow <zhongchao@zhidaoauto.com>
Date: Fri, 9 Aug 2024 17:44:25 +0800
Subject: [PATCH] [6.6.0] remove hdmap loaded when data invoke

---
 .../autopilot/adapter/MoGoAdasListenerImpl.kt |  9 ++-----
 .../report/IPCReportManager.kt                | 26 ++++++++++---------
 2 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt
index de66e0462e..693217a87b 100644
--- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt
+++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt
@@ -5,7 +5,6 @@ import chassis.Chassis
 import chassis.ChassisStatesOuterClass
 import chassis.VehicleStateOuterClass
 import com.mogo.eagle.core.data.app.AppConfigInfo
-import com.mogo.eagle.core.data.config.FunctionBuildConfig
 import com.mogo.eagle.core.data.config.HdMapBuildConfig
 import com.mogo.eagle.core.data.deva.chain.ChainConstant
 import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_ADAS_ARRIVE
@@ -329,9 +328,7 @@ class MoGoAdasListenerImpl : OnAdasListener {
         if (autopilotState != null) {
             //工控机模拟时间
             CallerAutopilotVehicleStateListenerManager.invokeAutopilotTime(header.timestamp.toLong())
-            if (HdMapBuildConfig.isMapLoaded) {
-                updateAutoPilotStatus(autopilotState.state, autopilotState.autopilotMode)
-            }
+            updateAutoPilotStatus(autopilotState.state, autopilotState.autopilotMode)
         }
     }
 
@@ -346,9 +343,7 @@ class MoGoAdasListenerImpl : OnAdasListener {
         header: MessagePad.Header,
         mogoReportMessage: MogoReportMsg.MogoReportMessage?
     ) {
-        if (HdMapBuildConfig.isMapLoaded) {
-            invokeAutopilotGuardian(mogoReportMessage)
-        }
+        invokeAutopilotGuardian(mogoReportMessage)
     }
 
     //融合感知红绿灯
diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/report/IPCReportManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/report/IPCReportManager.kt
index e381f4b2d0..787daf3446 100644
--- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/report/IPCReportManager.kt
+++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/report/IPCReportManager.kt
@@ -9,6 +9,7 @@ import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager
 import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager
 import com.mogo.eagle.core.utilcode.util.TimeUtils
+import com.mogo.eagle.core.utilcode.util.UiThreadHandler
 import com.zhjt.mogo.adas.data.bean.MogoReport
 import mogo_msg.MogoReportMsg
 
@@ -126,18 +127,19 @@ class IPCReportManager : IMoGoAutopilotStatusListener {
                     it.src,it.level,it.msg,it.code,it.resultList,it.actionsList,false)
                 CallerMsgBoxManager.saveMsgBox(MsgBoxBean(MsgBoxType.REPORT, reportEntity))
             }
-
-            if (reportList.size > 49) {
-                reportList.removeLast()
-            }
-            reportList.add(
-                0,
-                ReportEntity(
-                    TimeUtils.millis2String(System.currentTimeMillis()),
-                    it.src, it.level, it.msg, it.code, it.resultList, it.actionsList
-                ,false)
-            )
-            reportListFloatWindow?.refreshData(reportList)
+            UiThreadHandler.post({
+                if (reportList.size > 49) {
+                    reportList.removeLast()
+                }
+                reportList.add(
+                    0,
+                    ReportEntity(
+                        TimeUtils.millis2String(System.currentTimeMillis()),
+                        it.src, it.level, it.msg, it.code, it.resultList, it.actionsList
+                        ,false)
+                )
+                reportListFloatWindow?.refreshData(reportList)
+            }, UiThreadHandler.MODE.QUEUE)
 
 //            //Error 弹窗并有提示音
 //            if(it.resultList.contains(RESULT_AUTOPILOT_DISABLE)