From f3be6b9e83778199ae3d698954962e4e44818630 Mon Sep 17 00:00:00 2001
From: aibingbing <aibingbing@zhidaoauto.com>
Date: Mon, 8 Jul 2024 14:42:35 +0800
Subject: [PATCH] =?UTF-8?q?[6.5.0]=20refactor:=20=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E4=BB=96=E8=BD=A6=E9=80=86=E8=A1=8C=20=E7=BB=98=E5=88=B6?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/v2x/v2n/pnc/V2NIdentifyDrawer.kt      | 23 ++++---------------
 .../v2n/scenario/scene/airoad/AiRoadMarker.kt |  6 ++++-
 2 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/pnc/V2NIdentifyDrawer.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/pnc/V2NIdentifyDrawer.kt
index 78c52628e4..8e0b3d1082 100644
--- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/pnc/V2NIdentifyDrawer.kt
+++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/pnc/V2NIdentifyDrawer.kt
@@ -327,9 +327,8 @@ internal object V2NIdentifyDrawer: IEventDismissListener {
                 V2XBizTrace.onAck(TAG, mapOf("other_retrograde_vehicle" to "event == null"), true)
                 return@Callback true
             }
-            AiRoadMarker.aiMakers.getOrPut(event.eventId) {
-                AiRoadMarker()
-            }.apply {
+            val newEventId = "other_retrograde_vehicle_${event.eventId}"
+            AiRoadMarker.aiMakers.getOrPut(newEventId) {
                 val eventLocation = when (event.gnssType) {
                     0 -> CoordinateTransform.GCJ02ToWGS84(event.longitude, event.latitude)
                     else -> arrayOf(event.longitude, event.latitude)
@@ -342,7 +341,6 @@ internal object V2NIdentifyDrawer: IEventDismissListener {
                     return@Callback true
                 }
                 val isDriver = AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)
-                val newEventId = "other_retrograde_vehicle_${event.eventId}_${event.timestamp}_${event.longitude}_${event.latitude}"
                 val cameraIp = if(TextUtils.isEmpty(event.exts)) ""
                 else (GsonUtils.fromJson(event.exts, Map::class.java)["cameraIp"])?:""
                 // 弹事件框
@@ -355,21 +353,10 @@ internal object V2NIdentifyDrawer: IEventDismissListener {
                     cameraIp.toString(),
                     event.longitude,
                     event.latitude)
+                AiRoadMarker()
             }.also {
-                it.marker(Marker(event.eventId, EventTypeEnumNew.TYPE_SOCKET_ROAD_OTHER_RETROGRADE_VEHICLE.poiType, event.longitude, event.latitude, 0.0), drawMarker = true, false, isHighFrequency = true)
-            }
-//            EventDismissManager.addEvent(
-//                TAG,
-//                EventDismissBean(
-//                    newEventId,
-//                    event.longitude,
-//                    event.latitude,
-//                    150,
-//                    20,
-//                    -1,
-//                    event.targetIdsList.joinToString(separator = ",")
-//                )
-//            )
+                it.marker(Marker(newEventId, EventTypeEnumNew.TYPE_SOCKET_ROAD_OTHER_RETROGRADE_VEHICLE.poiType, event.longitude, event.latitude, 0.0), drawMarker = true, false, isHighFrequency = true)
+            }.receive()
         } else if (msg.what == MSG_WHAT_DRAW_GREEN_WAVE) {
             val data = msg.obj as? V2nCrossSpeed ?: return@Callback true
             val destX = data.lng
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 6e842e3c98..ac84114c63 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
@@ -111,7 +111,11 @@ class AiRoadMarker {
             CallerMapUIServiceManager.getOverlayManager()?.showOrUpdatePoint(builder.build())?.let { p ->
                 if (!markerIds.contains(markerId)) {
                     markerIds.add(markerId)
-                    val wrapper = MarkerWrapper(markerId, marker.poi_lon, marker.poi_lat, 1, elapsedDistance = 10)
+                    var distance = 10
+                    if (marker.poiType == EventTypeEnumNew.TYPE_SOCKET_ROAD_OTHER_RETROGRADE_VEHICLE.poiType) {
+                        distance = 100
+                    }
+                    val wrapper = MarkerWrapper(markerId, marker.poi_lon, marker.poi_lat, 1, elapsedDistance = distance)
                     wrapper.onRemoved = {
                         CallerRoadV2NEventWindowListenerManager.dismiss(markerId)
                         builders.remove(markerId)