From de5eabd2c195098fdeff959ae4503ec20d8defae Mon Sep 17 00:00:00 2001 From: renwj Date: Fri, 21 Oct 2022 19:45:19 +0800 Subject: [PATCH] =?UTF-8?q?[V2X][Road]=E6=B7=BB=E5=8A=A0=E6=89=80=E6=9C=89?= =?UTF-8?q?marker=E6=B8=85=E7=A9=BA=E7=9B=91=E5=90=AC=E5=9B=9E=E8=B0=83?= =?UTF-8?q?=EF=BC=9B=E8=A7=A3=E5=86=B3=E7=9B=B8=E5=85=B3bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scenario/impl/V2XScenarioManager.java | 1 - .../scenario/scene/airoad/AiRoadMarker.kt | 43 +++++++++++++------ .../core/function/api/v2x/OnClearAllMarker.kt | 8 ++++ .../call/v2x/CallMarkersClearManager.kt | 34 +++++++++++++++ .../java/com/mogo/map/MogoMarkerManager.java | 4 ++ 5 files changed, 76 insertions(+), 14 deletions(-) create mode 100644 core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/v2x/OnClearAllMarker.kt create mode 100644 core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/v2x/CallMarkersClearManager.kt diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/impl/V2XScenarioManager.java b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/impl/V2XScenarioManager.java index 800293f761..f1b6a9b176 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/impl/V2XScenarioManager.java +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/impl/V2XScenarioManager.java @@ -63,7 +63,6 @@ public class V2XScenarioManager implements IV2XScenarioManager { Intent intent = new Intent(V2XConst.BROADCAST_SCENE_ACTION); intent.putExtra(V2XConst.BROADCAST_SCENE_EXTRA_KEY, v2XMessageEntity); LocalBroadcastManager.getInstance(Utils.getApp()).sendBroadcast(intent); - AiRoadMarker.INSTANCE.clear(); // 如果没有拿到之前的，根据类型分发 switch (v2XMessageEntity.getType()) { case V2XMessageEntity.V2XTypeEnum.ALERT_ROAD_WARNING: diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/airoad/AiRoadMarker.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/airoad/AiRoadMarker.kt index 56be98086e..4db46c81eb 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/airoad/AiRoadMarker.kt +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/airoad/AiRoadMarker.kt @@ -13,8 +13,10 @@ import androidx.lifecycle.Lifecycle.Event.ON_DESTROY import com.mogo.eagle.core.data.map.* import com.mogo.eagle.core.data.map.MapRoadInfo.StopLine import com.mogo.eagle.core.function.api.map.listener.* +import com.mogo.eagle.core.function.api.v2x.* import com.mogo.eagle.core.function.call.map.* import com.mogo.eagle.core.function.call.map.CallerMapRoadListenerManager.OnRoadListener +import com.mogo.eagle.core.function.call.v2x.* import com.mogo.eagle.core.function.v2x.events.scenario.scene.road.* import com.mogo.eagle.core.utilcode.kotlin.* import com.mogo.eagle.core.utilcode.mogo.logger.* @@ -62,6 +64,23 @@ object AiRoadMarker { } } + private val onClearAllMarker = object : OnClearAllMarker { + + override fun onClearAllMarkers() { + val marker = this@AiRoadMarker.marker.get() + if (marker != null) { + unMarker(marker) + } + } + + override fun onClearAllMarkers(tag: String) { + val marker = this@AiRoadMarker.marker.get() + if (marker != null) { + unMarker(marker) + } + } + } + private val markers = ConcurrentSet() private val options by lazy { @@ -174,11 +193,13 @@ object AiRoadMarker { private fun onCreate() { CallerMapRoadListenerManager.registerRoadListener(TAG, onRoadListener) + CallMarkersClearManager.addAllMarkersClearListener(TAG, onClearAllMarker) CallerMapLocationListenerManager.addListener(TAG, onLocationListener, true) } private fun onDestroy() { CallerMapRoadListenerManager.unRegisterRoadListener(TAG) + CallMarkersClearManager.removeAllMarkersClearListener(TAG) CallerMapLocationListenerManager.removeListener(TAG, true) pool.shutdownNow() removeLine() @@ -201,7 +222,15 @@ object AiRoadMarker { } fun marker(marker: Marker, drawMarker: Boolean) { + handler.removeCallbacks(checkExpiredTask) val location = carLocation.get() ?: return + if (markers.contains(marker)) { + Logger.d(TAG, "--- enqueue --- cache hit ---") + return + } + synchronized(markers) { + markers += marker + } this.marker.set(marker) //施工中心点前方的自车行驶方向上300米距离 val l1 = MogoMap.getInstance().mogoMap.getCenterLineRangeInfo(marker.poi_lon, marker.poi_lat, location.third.toFloat(), 300f) @@ -295,19 +324,7 @@ object AiRoadMarker { markers -= marker removeLine() V2XAiRoadEventMarker.removeMarkers(null) - } - - fun clear() { - hideLine() - V2XAiRoadEventMarker.removeMarkers(null) - } - - fun restore() { - showLine() - val marker = marker.get() - if (marker != null) { - marker(marker, false) - } + handler.removeCallbacks(checkExpiredTask) } private fun hideLine() { diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/v2x/OnClearAllMarker.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/v2x/OnClearAllMarker.kt new file mode 100644 index 0000000000..9f6c62456c --- /dev/null +++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/v2x/OnClearAllMarker.kt @@ -0,0 +1,8 @@ +package com.mogo.eagle.core.function.api.v2x + +interface OnClearAllMarker { + + fun onClearAllMarkers() + + fun onClearAllMarkers(tag: String) +} \ No newline at end of file diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/v2x/CallMarkersClearManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/v2x/CallMarkersClearManager.kt new file mode 100644 index 0000000000..a5bd0e35c2 --- /dev/null +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/v2x/CallMarkersClearManager.kt @@ -0,0 +1,34 @@ +package com.mogo.eagle.core.function.call.v2x + +import com.mogo.eagle.core.function.api.v2x.* +import java.util.concurrent.* + +object CallMarkersClearManager { + + private val listeners by lazy { ConcurrentHashMap>() } + + fun addAllMarkersClearListener(tag: String, listener: OnClearAllMarker) { + var ll = listeners[tag] + if (ll == null) { + ll = ArrayList() + } + ll.add(listener) + listeners[tag] = ll + } + + fun removeAllMarkersClearListener(tag: String) { + listeners.remove(tag) + } + + fun invokeClearAllMarkers() { + listeners.values.flatten().forEach { + it.onClearAllMarkers() + } + } + + fun invokeClearAllMarkersOfTag(tag: String) { + listeners.values.flatten().forEach { + it.onClearAllMarkers(tag) + } + } +} \ No newline at end of file diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/MogoMarkerManager.java b/libraries/mogo-map/src/main/java/com/mogo/map/MogoMarkerManager.java index f2919f49d1..184dabddf4 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/MogoMarkerManager.java +++ b/libraries/mogo-map/src/main/java/com/mogo/map/MogoMarkerManager.java @@ -3,6 +3,7 @@ package com.mogo.map; import android.content.Context; import com.mogo.eagle.core.data.map.MogoLatLng; +import com.mogo.eagle.core.function.call.v2x.CallMarkersClearManager; import com.mogo.map.marker.IMogoMarker; import com.mogo.map.marker.IMogoMarkerManager; import com.mogo.map.marker.MogoMarkerOptions; @@ -100,11 +101,13 @@ public class MogoMarkerManager implements IMogoMarkerManager { @Override public void removeMarkers( String tag ) { + CallMarkersClearManager.INSTANCE.invokeClearAllMarkersOfTag(tag); MogoMarkersHandler.getInstance().remove( tag ); } @Override public void removeMarkers() { + CallMarkersClearManager.INSTANCE.invokeClearAllMarkers(); MogoMarkersHandler.getInstance().removeAll(); } @@ -115,6 +118,7 @@ public class MogoMarkerManager implements IMogoMarkerManager { @Override public void inVisibleAllMarkers() { + CallMarkersClearManager.INSTANCE.invokeClearAllMarkers(); MogoMarkersHandler.getInstance().inVisibleAll(); }