From 2831976c0ff86ab5ddb858a51537ef42c8196ad0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Fri, 10 Sep 2021 15:43:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BB=96=E8=BD=A6=E9=A2=9C?=
 =?UTF-8?q?=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/drawer/TrafficMarkerDrawer.kt      | 34 ++++++++++++++++++-
 .../module/obu/mogo/MogoPrivateObuManager.kt  | 10 +++---
 2 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/TrafficMarkerDrawer.kt b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/TrafficMarkerDrawer.kt
index bbbe1825c5..120a3a2baf 100644
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/TrafficMarkerDrawer.kt
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/TrafficMarkerDrawer.kt
@@ -70,6 +70,35 @@ object TrafficMarkerDrawer {
         mTrafficMap[trafficData.uuid] = trafficData
     }
 
+    /**
+     * 更新识别数据位置
+     */
+    fun updateITrafficLocationInfo(trafficData: TrafficData) {
+        val tempTraffic = mTrafficMap[trafficData.uuid]
+        if (tempTraffic != null) {
+            tempTraffic.lat = trafficData.lat
+            tempTraffic.lon = trafficData.lon
+            mTrafficMap[trafficData.uuid] = tempTraffic
+        } else {
+            mTrafficMap[trafficData.uuid] = trafficData
+        }
+    }
+
+    /**
+     * 更新识别数据颜色
+     */
+    fun updateITrafficThreatLevelInfo(trafficData: TrafficData) {
+        val tempTraffic = mTrafficMap[trafficData.uuid]
+        if (tempTraffic != null) {
+            tempTraffic.lat = trafficData.lat
+            tempTraffic.lon = trafficData.lon
+            tempTraffic.threatLevel = trafficData.threatLevel
+            mTrafficMap[trafficData.uuid] = tempTraffic
+        } else {
+            mTrafficMap[trafficData.uuid] = trafficData
+        }
+    }
+
     /**
      * 移除识别的数据
      */
@@ -113,7 +142,10 @@ object TrafficMarkerDrawer {
      * 绘制单条
      */
     private fun drawObuRecognizedDataMarker(trafficData: TrafficData) {
-        Logger.d("MogoObu", "drawObuRecognizedDataMarker trafficData.type = " + trafficData.type + "---trafficData.threatLevel = " + trafficData.threatLevel)
+        Logger.d(
+            "MogoObu",
+            "drawObuRecognizedDataMarker trafficData.type = " + trafficData.type + "---trafficData.threatLevel = " + trafficData.threatLevel
+        )
         if (trafficData.type != null) {
             val resId: Int = trafficData.type.traffic3DIconId
 
diff --git a/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/MogoPrivateObuManager.kt b/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/MogoPrivateObuManager.kt
index 3aa429fb26..afd42e3646 100644
--- a/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/MogoPrivateObuManager.kt
+++ b/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/MogoPrivateObuManager.kt
@@ -149,7 +149,7 @@ class MogoPrivateObuManager private constructor() {
             mContext?.let { SharedPrefsMgr.getInstance(it).putBoolean("OBU_RV", true) }
             // 更新数据
             TrafficDataConvertUtils.cvxRvInfoIndInfo2TrafficData(info)?.let {
-                TrafficMarkerDrawer.updateITrafficInfo(it)
+                TrafficMarkerDrawer.updateITrafficLocationInfo(it)
             }
         }
 
@@ -349,7 +349,7 @@ class MogoPrivateObuManager private constructor() {
                         TrafficDataConvertUtils.cvxPtcThreatIndInfo2TrafficData(info)?.let {
                             // 事件结束，还原交通参与者颜色
                             it.threatLevel = 0x01
-                            TrafficMarkerDrawer.updateITrafficInfo(it)
+                            TrafficMarkerDrawer.updateITrafficThreatLevelInfo(it)
                         }
                         mIMoGoWaringProvider?.disableWarningV2X(ObuConstants.USE_CASE_ID.VRUCW.toString())
                     }
@@ -357,7 +357,7 @@ class MogoPrivateObuManager private constructor() {
                     else -> {
                         // 更新数据
                         TrafficDataConvertUtils.cvxPtcThreatIndInfo2TrafficData(info)?.let {
-                            TrafficMarkerDrawer.updateITrafficInfo(it)
+                            TrafficMarkerDrawer.updateITrafficThreatLevelInfo(it)
                         }
                     }
                 }
@@ -693,7 +693,7 @@ class MogoPrivateObuManager private constructor() {
                 //更新周边车辆进行预警颜色变换，车辆实时移动和变色
                 TrafficDataConvertUtils.cvxV2vThreatIndInfo2TrafficData(info)?.let {
                     it.threatLevel = 0x01
-                    TrafficMarkerDrawer.updateITrafficInfo(it)
+                    TrafficMarkerDrawer.updateITrafficThreatLevelInfo(it)
                 }
             }
             // 更新
@@ -704,7 +704,7 @@ class MogoPrivateObuManager private constructor() {
                 }
                 //更新周边车辆进行预警颜色变换，车辆实时移动和变色
                 TrafficDataConvertUtils.cvxV2vThreatIndInfo2TrafficData(info)?.let {
-                    TrafficMarkerDrawer.updateITrafficInfo(it)
+                    TrafficMarkerDrawer.updateITrafficThreatLevelInfo(it)
                 }
             }
         }