From b28e8b213bf0091c02b767d4525fd8467c95fd21 Mon Sep 17 00:00:00 2001 From: renwj Date: Thu, 13 Apr 2023 14:45:36 +0800 Subject: [PATCH] =?UTF-8?q?[2.15.0][V2N]=20V2N=E4=B8=8A=E8=BD=A6=E6=96=B0?= =?UTF-8?q?=E8=80=81=E9=93=BE=E8=B7=AF=E5=85=BC=E5=AE=B9=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../function/biz/v2x/v2n/V2XEventManager.kt | 6 +++++- .../biz/v2x/v2n/pnc/V2NIdentifyDrawer.kt | 20 +++++++++++++------ 2 files changed, 19 insertions(+), 7 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 2e79e74c2b..599290e0cb 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 @@ -9,6 +9,7 @@ import android.util.Log import androidx.annotation.RequiresApi import androidx.localbroadcastmanager.content.LocalBroadcastManager import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo +import com.mogo.eagle.core.data.config.* import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_ALIAS_CODE_CLOUD_V2N import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_LINK_CLOUD import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_LINK_LOG_CLOUD_V2N @@ -51,6 +52,7 @@ import com.mogo.eagle.core.function.api.cloud.IMoGoCloudListener import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager import com.mogo.eagle.core.function.call.autopilot.CallerV2XListenerManager import com.mogo.eagle.core.function.call.cloud.CallerCloudListenerManager +import com.mogo.eagle.core.utilcode.mogo.* import com.mogo.eagle.function.biz.v2x.v2n.V2XPoiLoader.Companion.v2xPoiLoader import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.Logger @@ -178,7 +180,9 @@ object V2XEventManager : IMoGoChassisLocationGCJ02Listener, IV2XCallback, handleRoadMarkerEvent(event.data.toRoadMarker()) } is V2XEvent.RoadEventX -> { - handleRoadMarkerEvent(event.data.toRoadMarker()) + if (!AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode) || !FunctionBuildConfig.isNewV2NData) { + handleRoadMarkerEvent(event.data.toRoadMarker()) + } } else -> { Logger.e(TAG, "onAck other event: $event") 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 178fe0c3dc..1ab7cca965 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 @@ -2,6 +2,7 @@ package com.mogo.eagle.function.biz.v2x.v2n.pnc import android.os.* import androidx.core.util.* +import com.mogo.eagle.core.data.config.* import com.mogo.eagle.core.data.enums.* import com.mogo.eagle.core.data.enums.WarningDirectionEnum.ALERT_WARNING_TOP import com.mogo.eagle.core.data.map.entity.* @@ -14,6 +15,7 @@ import com.mogo.eagle.core.function.call.autopilot.* import com.mogo.eagle.core.function.call.hmi.* import com.mogo.eagle.core.function.call.map.* import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager.saveMsgBox +import com.mogo.eagle.core.utilcode.mogo.* import com.mogo.eagle.core.utilcode.mogo.logger.* import com.mogo.eagle.core.utilcode.util.* import com.mogo.eagle.function.biz.v2x.v2n.scenario.scene.airoad.* @@ -221,18 +223,24 @@ internal object V2NIdentifyDrawer { } private fun drawShiGong(events: List) { - handler.removeMessages(MSG_WHAT_DRAW_SHIGONE) - handler.sendMessage(Message.obtain(handler, MSG_WHAT_DRAW_SHIGONE, events)) + if (AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode) && FunctionBuildConfig.isNewV2NData) { + handler.removeMessages(MSG_WHAT_DRAW_SHIGONE) + handler.sendMessage(Message.obtain(handler, MSG_WHAT_DRAW_SHIGONE, events)) + } } private fun drawShiGu(events: List) { - handler.removeMessages(MSG_WHAT_DRAW_SHIGU) - handler.sendMessage(Message.obtain(handler, MSG_WHAT_DRAW_SHIGU, events)) + if (AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode) && FunctionBuildConfig.isNewV2NData) { + handler.removeMessages(MSG_WHAT_DRAW_SHIGU) + handler.sendMessage(Message.obtain(handler, MSG_WHAT_DRAW_SHIGU, events)) + } } private fun drawYongDu(events: List) { - handler.removeMessages(MSG_WHAT_DRAW_YONGDU) - handler.sendMessage(Message.obtain(handler, MSG_WHAT_DRAW_YONGDU, events)) + if (AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode) && FunctionBuildConfig.isNewV2NData) { + handler.removeMessages(MSG_WHAT_DRAW_YONGDU) + handler.sendMessage(Message.obtain(handler, MSG_WHAT_DRAW_YONGDU, events)) + } } fun init() {