yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[6.5.0] 升级高精地图版本，解决路口bug，修复路口计数功能，增加全息路口只在有路线ID时显示

Browse Source
This commit is contained in:
EmArrow
2024-07-12 17:38:24 +08:00
parent 0d9a6556ac
commit 128066288b
4 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/RoadLineEventManager.kt
View File

@@ -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()
}
}

6
core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/RoadCrossRoamView.kt
View File

@@ -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

18
core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerMapRoadListenerManager.kt
View File

@@ -15,19 +15,21 @@ object CallerMapRoadListenerManager : CallerBase<IMoGoMapRoadListener>() {
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) {

2
gradle.properties
View File

@@ -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