From d9cab485f88fbf05d38c3cc7aee6b7656cdf86ff Mon Sep 17 00:00:00 2001
From: renwj <renwenjie@zhidaoauto.com>
Date: Wed, 17 Jul 2024 18:13:31 +0800
Subject: [PATCH] =?UTF-8?q?[6.5.0][=E9=81=93=E8=B7=AF=E4=BA=8B=E4=BB=B6][M?=
 =?UTF-8?q?arker=E7=BB=98=E5=88=B6]=20=E6=B7=BB=E5=8A=A0marker=E7=A7=BB?=
 =?UTF-8?q?=E9=99=A4=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../eagle/function/biz/v2x/v2n/remove/MarkerRemoveManager.kt | 4 ++++
 .../biz/v2x/v2n/scenario/scene/airoad/AiRoadMarker.kt        | 5 +++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/remove/MarkerRemoveManager.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/remove/MarkerRemoveManager.kt
index 14311ff67a..4991af4547 100644
--- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/remove/MarkerRemoveManager.kt
+++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/remove/MarkerRemoveManager.kt
@@ -219,4 +219,8 @@ object MarkerRemoveManager {
     fun peekMarker(id: String): MarkerWrapper? {
         return showedMarkers.find { it.id == id }
     }
+
+    fun removeMarker(id: String): Boolean {
+        return peekMarker(id)?.let { removeMarker(it) } ?: false
+    }
 }
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/airoad/AiRoadMarker.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/airoad/AiRoadMarker.kt
index d27373bc91..0e5ec742a4 100644
--- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/airoad/AiRoadMarker.kt
+++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/airoad/AiRoadMarker.kt
@@ -102,7 +102,6 @@ class AiRoadMarker {
     fun marker(marker: Marker, drawMarker: Boolean, drawRoadLine: Boolean = false, isHighFrequency:Boolean = false) {
         val markerId = marker.id
         if (isHighFrequency && drawMarker) {
-            this.marker.set(marker)
             Logger.d(TAG, "marker --->poiType: $marker, ${EventTypeEnumNew.getMarker3DRes(marker.poiType)}")
             val builder = getOrPutPointOptionBuilder(markerId, V2XConst.V2X_MARKER_OWNER, MAP_MARKER)
             builder
@@ -120,6 +119,7 @@ class AiRoadMarker {
             CallerMapUIServiceManager.getOverlayManager()?.showOrUpdatePoint(builder.build())?.let { p ->
                 if (!markerIds.contains(markerId)) {
                     markerIds.add(markerId)
+                    this.marker.set(marker)
                     var distance = 10
                     if (marker.poiType == EventTypeEnumNew.TYPE_SOCKET_ROAD_OTHER_RETROGRADE_VEHICLE.poiType) {
                         distance = 100
@@ -299,7 +299,7 @@ class AiRoadMarker {
             wrapper.onRemoved = { id ->
                 aiMakers.remove(id)?.also {
                     val m = it.marker.get()
-                    CallerRoadV2NEventWindowListenerManager.dismiss("${m.poi_lon}-${m.poi_lat}")
+                    CallerRoadV2NEventWindowListenerManager.dismiss(m.id)
                 }
             }
             MarkerRemoveManager.addMarker(wrapper)
@@ -328,6 +328,7 @@ class AiRoadMarker {
             if (marker.poiType == EventTypeEnumNew.TYPE_SOCKET_ROAD_GREE_WAVE.poiType) {
                 CallerHmiManager.dismissGreenWave()
             } else {
+                MarkerRemoveManager.removeMarker(marker.id)
                 CallerRoadV2NEventWindowListenerManager.dismiss(marker.id)
             }
         }