From b901eb527c71ea8ca96bbfe1dd2270a38bdc55e4 Mon Sep 17 00:00:00 2001 From: renwj Date: Tue, 16 Jul 2024 19:50:28 +0800 Subject: [PATCH] =?UTF-8?q?[6.5.0][=E9=81=93=E8=B7=AF=E4=BA=8B=E4=BB=B6][?= =?UTF-8?q?=E8=A7=86=E8=A7=92=E5=88=87=E6=8D=A2]=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E9=81=93=E8=B7=AFID=E6=95=B0=E6=8D=AE=E5=9B=9E=E8=B0=83?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../function/biz/v2x/v2n/V2XEventManager.kt | 37 +------------------ .../main/java/com/mogo/map/AMapViewWrapper.kt | 6 +-- 2 files changed, 3 insertions(+), 40 deletions(-) diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/V2XEventManager.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/V2XEventManager.kt index 4b074c39f6..4dc693d326 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/V2XEventManager.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/V2XEventManager.kt @@ -32,17 +32,14 @@ import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Listener import com.mogo.eagle.core.function.api.autopilot.IMoGoV2XListener import com.mogo.eagle.core.function.api.cloud.IMoGoCloudListener -import com.mogo.eagle.core.function.api.map.road.IMoGoMapRoadListener import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotIdentifyListenerManager import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager.getChassisLocationGCJ02 -import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationWGS84ListenerManager import com.mogo.eagle.core.function.call.autopilot.CallerV2XListenerManager import com.mogo.eagle.core.function.call.autopilot.CallerV2XListenerManager.V2NCarTypeCheck.Companion.verifyCarType import com.mogo.eagle.core.function.call.cloud.CallerCloudListenerManager import com.mogo.eagle.core.function.call.hmi.CallerHmiManager -import com.mogo.eagle.core.function.call.map.CallerMapRoadListenerManager import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils @@ -61,7 +58,6 @@ import com.mogo.eagle.function.biz.v2x.v2n.receiver.SceneBroadcastReceiver import com.mogo.eagle.function.biz.v2x.v2n.scenario.impl.V2XScenarioManager import com.mogo.eagle.function.biz.v2x.v2n.utils.V2XEventAnalyticsManager import com.mogo.eagle.function.biz.v2x.v2n.utils.toRoadMarker -import com.zhidaoauto.map.data.road.StopLine import com.zhjt.service.chain.ChainLog import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers @@ -79,7 +75,7 @@ import java.util.concurrent.atomic.AtomicReference object V2XEventManager : IMoGoChassisLocationGCJ02Listener, IV2XCallback, IMoGoAutopilotIdentifyListener, IMoGoCloudListener, - IMoGoV2XListener, IMoGoAutopilotStatusListener, IMoGoMapRoadListener { + IMoGoV2XListener, IMoGoAutopilotStatusListener { private const val TAG = "V2XEventManager" @@ -108,39 +104,9 @@ object V2XEventManager : IMoGoChassisLocationGCJ02Listener, IV2XCallback, v2xPoiLoader.startLoopPoi() // 注册广播接收场景弹窗使用的 SceneBroadcastReceiver.register(context) - CallerMapRoadListenerManager.addListener(TAG, this) } } - override fun onRoadIdInfo(roadId: String) { - super.onRoadIdInfo(roadId) - Log.d(TAG, "--- onRoadIdInfo ---: $roadId") - this.roadId = roadId - val enterCrossRoadId = this.roadIdWithEnterCross - if (hasCrossRoad && roadId.isNotBlank() && enterCrossRoadId.isNotBlank() && enterCrossRoadId != roadId) { - hasCrossRoad = false - if (firstLocationInCross.get() == null) { - Log.d(TAG, "--- onRoadIdInfo --- 1 ---: $roadId") - firstLocationInCross.set(CallerChassisLocationWGS84ListenerManager.getChassisLocationWGS84()) - } - } - } - - override fun onStopLineInfo(info: StopLine) { - super.onStopLineInfo(info) - Log.d(TAG, "--- onStopLineInfo --- 1 ---: ${ info.distance }") - if (!hasCrossRoad && info.distance <= 10) { - Log.d(TAG, "--- onStopLineInfo --- 2 ---: $roadId") - hasCrossRoad = true - roadIdWithEnterCross = this.roadId - firstLocationInCross.set(null) - } - } - - fun getFirstLocationInCross(): MogoLocation? { - return firstLocationInCross.get() - } - private fun registerListener() { CallerChassisLocationGCJ02ListenerManager.addListener(TAG, 1, this) v2xPoiLoader.addCallback(this) @@ -363,7 +329,6 @@ object V2XEventManager : IMoGoChassisLocationGCJ02Listener, IV2XCallback, unRegisterListener() } v2xPoiLoader.stopLoopPoi() - CallerMapRoadListenerManager.removeListener(TAG) } } diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.kt b/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.kt index 67573155e9..050ba85937 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.kt +++ b/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.kt @@ -242,10 +242,8 @@ class AMapViewWrapper(mMapView: MapAutoView) : IMogoMapView, IMogoMapUIControlle * @param laneId */ override fun onRoadIdInfo(roadId: String?, laneId: String?) { - handler.post { - if (roadId != null && !TextUtils.isEmpty(roadId)) { - invokeListenersOnRoadIdGet(roadId) - } + if (roadId != null && !TextUtils.isEmpty(roadId)) { + invokeListenersOnRoadIdGet(roadId) } }