From 0ffda8fb65cf47035d57678334f6cabd9e0a2332 Mon Sep 17 00:00:00 2001
From: zhongchao <zhongchao@zhidaoauto.com>
Date: Mon, 24 Oct 2022 11:01:41 +0800
Subject: [PATCH] wait to test of fun config which adding the msgReceive

---
 .../funcconfig/FuncConfigCenter.kt                   | 10 ++++++++--
 .../core/function/map/identify/WarningHelper.kt      | 12 ++++--------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/funcconfig/FuncConfigCenter.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/funcconfig/FuncConfigCenter.kt
index 3e585ace26..4feb330166 100644
--- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/funcconfig/FuncConfigCenter.kt
+++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/funcconfig/FuncConfigCenter.kt
@@ -1,6 +1,7 @@
 package com.zhjt.mogo_core_function_devatools.funcconfig
 
 import android.content.Context
+import android.util.Log
 import com.mogo.aicloud.services.socket.IMogoOnMessageListener
 import com.mogo.aicloud.services.socket.MogoAiCloudSocketManager
 import com.mogo.commons.AbsMogoApplication
@@ -56,7 +57,7 @@ class FuncConfigCenter : IMogoOnMessageListener<FuncConfig>, IMoGoAutopilotCarCo
                     refreshConfig(GsonUtils.fromJson(bizJson, FuncConfig::class.java))
                 })
             }
-        }else{
+        } else {
             ToastUtils.showLong("未获取到域控mac信息")
         }
     }
@@ -66,8 +67,9 @@ class FuncConfigCenter : IMogoOnMessageListener<FuncConfig>, IMoGoAutopilotCarCo
     }
 
     override fun onMsgReceived(obj: FuncConfig?) {
+        Log.d(TAG, "onMsgReceived Business : $obj")
         obj?.let {
-            refreshConfig(it)
+            invokeUpdate(it)
         }
     }
 
@@ -81,6 +83,10 @@ class FuncConfigCenter : IMogoOnMessageListener<FuncConfig>, IMoGoAutopilotCarCo
     )
     private fun refreshConfig(funcConfig: FuncConfig) {
         BizManager.updateBizConfigData(funcConfig)
+        invokeUpdate(funcConfig)
+    }
+
+    private fun invokeUpdate(funcConfig: FuncConfig) {
         funcConfig.business.forEach { business ->
             CallerDevaToolsFuncConfigListenerManager.invokeDevaToolsFuncConfigBizUpdate(
                 business.biz.uppercase(),
diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/map/identify/WarningHelper.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/map/identify/WarningHelper.kt
index b9a5307175..3539215978 100644
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/map/identify/WarningHelper.kt
+++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/map/identify/WarningHelper.kt
@@ -1,9 +1,7 @@
 package com.mogo.eagle.core.function.map.identify
 
 import android.annotation.SuppressLint
-import android.util.Log
 import com.mogo.eagle.core.data.config.FunctionBuildConfig
-import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig
 import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.BIZ_PNC_WARNING
 import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.FOUNDATION
 import com.mogo.eagle.core.data.traffic.TrafficData
@@ -101,7 +99,6 @@ object WarningHelper {
             return
         }
         if (exist) {
-            Log.i("EmArrow0926","obu color uuid : ${obuTrafficData.uuid}")
             obuWarningTrafficData[obuTrafficData.uuid!!] = obuTrafficData
         } else {
             obuWarningTrafficData.remove(obuTrafficData.uuid)
@@ -115,20 +112,19 @@ object WarningHelper {
         return ""
     }
 
-    @BizConfig(FOUNDATION,"",BIZ_PNC_WARNING)
-    fun getPncColor(uuid: String, color:(String) -> Unit) {
+    @BizConfig(FOUNDATION,"", BIZ_PNC_WARNING)
+    fun getPncColor(uuid: String, color:((String) -> Unit)) {
         if (FunctionBuildConfig.isBeautyMode) {
             // 判断物体是否有预警信息
             if (pncWarningBeautyTrafficData.containsKey(uuid)) {
                 val planningTrack = pncWarningBeautyTrafficData[uuid]
                 if (planningTrack != null && !timeOut(planningTrack.time)) {
-                    Log.i("EmArrow0926","pnc color uuid : $uuid")
                     color.invoke(planningTrack.color)
                 } else {
                     pncWarningBeautyTrafficData.remove(uuid)
                 }
             }
-            return color.invoke("")
+            color.invoke("")
         } else {
             // 判断物体是否有预警信息
             if (pncWarningOriginTrafficData.containsKey(uuid)) {
@@ -139,7 +135,7 @@ object WarningHelper {
                     pncWarningOriginTrafficData.remove(uuid)
                 }
             }
-            return color.invoke("")
+            color.invoke("")
         }
     }