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

[dev_robotaxi-d-app-module_2132_221223_2.13.2_sop] obu的v2v和v2i事件开关添加

Browse Source
This commit is contained in:
lixiaopeng
2023-02-16 17:08:56 +08:00
parent 76f47c6da8
commit 0844eec8fd
4 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuNewManager.kt
View File

@@ -164,7 +164,7 @@ class MogoPrivateObuNewManager private constructor() {
*/
override fun onMogoObuRvWarning(data: MogoObuRvWarningData) {
super.onMogoObuRvWarning(data)
// if (HmiBuildConfig.isShowObuV2vView) { //TODO 临时需要关闭v2v开关
if (HmiBuildConfig.isShowObuV2vView) {
mObuStatusInfo.obuRvStatus = true
CallerObuListenerManager.invokeListener(mObuStatusInfo)
if (!data.warningMsg.warningData.isNullOrEmpty()) {
@@ -218,7 +218,7 @@ class MogoPrivateObuNewManager private constructor() {
}
}
}
// }
}
}
/**
@@ -227,13 +227,13 @@ class MogoPrivateObuNewManager private constructor() {
override fun onMogoObuSpatWarning(data: MogoObuSpatWarningData) {
super.onMogoObuSpatWarning(data)
if (data != null) {
// if (HmiBuildConfig.isShowObuV2iView) {
if (HmiBuildConfig.isShowObuV2iView) {
handlerTrafficLight(
data.warningType,
data.status,
data.lights
)
// }
}
}
}
@@ -247,7 +247,7 @@ class MogoPrivateObuNewManager private constructor() {
*/
override fun onMogoObuRsiWarning(data: MogoObuRsiWarningData) {
super.onMogoObuRsiWarning(data)
// if (HmiBuildConfig.isShowObuV2iView) {
if (HmiBuildConfig.isShowObuV2iView) {
if (data != null && data.warningMsg != null && data.warningMsg.size > 0) {
var alertContent = ""
var ttsContent = ""
@@ -493,7 +493,7 @@ class MogoPrivateObuNewManager private constructor() {
}
}
}
// }
}
}
/**
@@ -513,7 +513,7 @@ class MogoPrivateObuNewManager private constructor() {
"$M_OBU${MogoObuConst.TAG_MOGO_NEW_OBU}",
"onMogoObuRsmWarning ------> ${data.toString()}"
)
// if (HmiBuildConfig.isShowObuV2iView) {
if (HmiBuildConfig.isShowObuV2iView) {
if (HmiBuildConfig.isShowObuWeaknessTrafficView) {
// 交通参与者类型 0x0:未知 UNKNOWN | 1机动车 2:非机动车 NON_MOTOR | 3:行人 PEDESTRIAN 4:obu
if (data != null && data.participant != null) {
@@ -666,7 +666,7 @@ class MogoPrivateObuNewManager private constructor() {
}
}
}
// }
}
}
/**
@@ -1049,6 +1049,10 @@ class MogoPrivateObuNewManager private constructor() {
if (minSpeedTemp == maxSpeedTemp) {
minSpeedTemp -= 5
}
if (minSpeedTemp < 0) {
minSpeedTemp = 1
}
val adviceSpeed = "$minSpeedTemp - $maxSpeedTemp"
val adviceSpeedTts = "$minSpeedTemp 到 $maxSpeedTemp"