From 128066288b2ed5e9bd4dd913650a30a0f78e40b9 Mon Sep 17 00:00:00 2001 From: EmArrow Date: Fri, 12 Jul 2024 17:38:24 +0800 Subject: [PATCH] =?UTF-8?q?[6.5.0]=20=E5=8D=87=E7=BA=A7=E9=AB=98=E7=B2=BE?= =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E7=89=88=E6=9C=AC=EF=BC=8C=E8=A7=A3=E5=86=B3?= =?UTF-8?q?=E8=B7=AF=E5=8F=A3bug=EF=BC=8C=E4=BF=AE=E5=A4=8D=E8=B7=AF?= =?UTF-8?q?=E5=8F=A3=E8=AE=A1=E6=95=B0=E5=8A=9F=E8=83=BD=EF=BC=8C=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=85=A8=E6=81=AF=E8=B7=AF=E5=8F=A3=E5=8F=AA=E5=9C=A8?= =?UTF-8?q?=E6=9C=89=E8=B7=AF=E7=BA=BFID=E6=97=B6=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datacenter/v2x/RoadLineEventManager.kt | 5 ++--- .../core/function/view/RoadCrossRoamView.kt | 6 ++++++ .../call/map/CallerMapRoadListenerManager.kt | 18 ++++++++++-------- gradle.properties | 2 +- 4 files changed, 19 insertions(+), 12 deletions(-) diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/RoadLineEventManager.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/RoadLineEventManager.kt index f17e7af4dd..1de40c1ded 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/RoadLineEventManager.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/RoadLineEventManager.kt @@ -1,12 +1,12 @@ package com.mogo.eagle.core.function.datacenter.v2x -import android.util.Log import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener 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.map.CallerMapRoadListenerManager import com.zhidaoauto.map.data.road.RoadCross + /** * 路线功能相关，绑定路线id后，业务控制，数据变化均可以封装在这里实现 */ @@ -35,11 +35,10 @@ class RoadLineEventManager : IMoGoMapRoadListener, IMoGoAutopilotStatusListener override fun onRoadChange(cross: Boolean, roadCross: RoadCross?) { super.onRoadChange(cross, roadCross) - Log.e(TAG, "onRoadChange: $cross, $roadCross") if(!record){ return } - if(!cross){ + if(cross){ CallerAutoPilotStatusListenerManager.updateRoadCount() } } diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/RoadCrossRoamView.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/RoadCrossRoamView.kt index 59ff46d787..bfd6567a95 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/RoadCrossRoamView.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/RoadCrossRoamView.kt @@ -18,6 +18,7 @@ import com.mogo.commons.voice.AIAssist import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.function.api.hmi.view.IViewControlListener 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.CallerV2nNioEventListenerManager import com.mogo.eagle.core.function.call.hmi.CallerHmiViewControlListenerManager import com.mogo.eagle.core.function.call.map.CallerMapIdentifyManager @@ -128,6 +129,10 @@ class RoadCrossRoamView @JvmOverloads constructor( } private fun attachView() { + // 没有路线不做提示 + if(CallerAutoPilotStatusListenerManager.getLineId() == 0L){ + return + } // 处于漫游模式下不做处理 if (CallerMapIdentifyManager.roam.second) { if (CallerMapIdentifyManager.roam.first != TAG) { @@ -135,6 +140,7 @@ class RoadCrossRoamView @JvmOverloads constructor( } return } + // 首页被遮挡不做提示 if(!CallerHmiViewControlListenerManager.getMainPageVisible()){ CallerLogger.d("$M_MAP$TAG", "attachView return , mainPageVisible is false") return diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerMapRoadListenerManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerMapRoadListenerManager.kt index 91cecba98e..51e35953ad 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerMapRoadListenerManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerMapRoadListenerManager.kt @@ -15,19 +15,21 @@ object CallerMapRoadListenerManager : CallerBase() { private var mRoadId: String? = null private var mStopLine: StopLine? = null + @Volatile private var mRoadChange = false + @Volatile private var mRoadCross: RoadCross? = null private var mCross: Int by Delegates.observable(-1) { _, oldValue, newValue -> -// if (oldValue != newValue) { //todo emArrow test - CallerLogger.d("$M_MAP onRoadChange observable", newValue) - M_LISTENERS.forEach { entry -> - // false:1,2, 离开路口，进入路段 - // true: 进入路口 - mRoadChange = !(newValue == 1 || newValue == 2) - entry.value.onRoadChange(mRoadChange, mRoadCross) + if (oldValue != newValue) { + CallerLogger.d("$M_MAP onRoadChange observable", newValue) + M_LISTENERS.forEach { entry -> + // false:1,2, 离开路口，进入路段 + // true: 进入路口 + mRoadChange = !(newValue == 1 || newValue == 2) + entry.value.onRoadChange(mRoadChange, mRoadCross) + } } -// } } override fun doSomeAfterAddListener(tag: String, listener: IMoGoMapRoadListener) { diff --git a/gradle.properties b/gradle.properties index af0b95367a..847e501bf1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -81,7 +81,7 @@ MOGO_LOCATION_VERSION=1.4.7.23 MOGO_TELEMATIC_VERSION=1.4.7.23 ######## MogoAiCloudSDK Version ######## # 自研地图 -MAP_SDK_VERSION=3.4.0.5 +MAP_SDK_VERSION=3.4.0.6 MAP_SDK_DATA_VERSION=1.0.0.9 MAP_SDK_OPERATION_VERSION=1.1.4.1 # websocket