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

[2.13.2] 修改预警提示，添加红绿灯的来源显示

Browse Source
This commit is contained in:
lixiaopeng
2023-01-10 18:24:57 +08:00
parent 9cc44d9d51
commit 942be811c4
5 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -750,7 +750,7 @@ class MogoPrivateObuManager private constructor() {
when (currentLight.phase) {
// 灯光不可用
0x0 -> {
CallerHmiManager.showWarningTrafficLight(0, 2)
CallerHmiManager.showWarningTrafficLight(0, 3)
}
// 红灯
0x1 -> {
@@ -759,7 +759,7 @@ class MogoPrivateObuManager private constructor() {
isRedLight = true
}
isGreenLight = false
CallerHmiManager.showWarningTrafficLight(1, 2)
CallerHmiManager.showWarningTrafficLight(1, 3)
val red = currentLight.count_down.toInt()
CallerHmiManager.changeCountdownRed(red)
@@ -774,7 +774,7 @@ class MogoPrivateObuManager private constructor() {
isGreenLight = true
}
isRedLight = false
CallerHmiManager.showWarningTrafficLight(3, 2)
CallerHmiManager.showWarningTrafficLight(3, 3)
val green = currentLight.count_down.toInt()
CallerHmiManager.changeCountdownGreen(green)
//防止数据出现问题的容错

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

@@ -399,6 +399,7 @@ class MogoPrivateObuNewManager private constructor() {
//限速预警, ADD处理一次
MogoObuConstants.RSI_SCENE_TYPE.SLW.toString() -> {
appId = EventTypeEnumNew.TYPE_USECASE_ID_ROAD_SPEED_LIMIT.poiType
alertContent = EventTypeEnumNew.getWarningContent(appId)
ttsContent = EventTypeEnumNew.getWarningTts(appId)
}
@@ -958,7 +959,7 @@ class MogoPrivateObuNewManager private constructor() {
when (currentLight.light) {
// 灯光不可用
0 -> {
CallerHmiManager.showWarningTrafficLight(0, 2)
CallerHmiManager.showWarningTrafficLight(0, 3)
}
// 红灯
2, 3 -> {
@@ -967,7 +968,7 @@ class MogoPrivateObuNewManager private constructor() {
isRedLight = true
}
isGreenLight = false
CallerHmiManager.showWarningTrafficLight(1, 2)
CallerHmiManager.showWarningTrafficLight(1, 3)
val red = currentLight.countDown.toInt()
CallerHmiManager.changeCountdownRed(red)
@@ -980,7 +981,7 @@ class MogoPrivateObuNewManager private constructor() {
isGreenLight = true
}
isRedLight = false
CallerHmiManager.showWarningTrafficLight(3, 2)
CallerHmiManager.showWarningTrafficLight(3, 3)
val green = currentLight.countDown.toInt()
CallerHmiManager.changeCountdownGreen(green)
}
@@ -988,7 +989,7 @@ class MogoPrivateObuNewManager private constructor() {
// 黄灯
7, 8 -> {
CallerHmiManager.disableWarningV2X(appId.toString())
CallerHmiManager.showWarningTrafficLight(2, 2)
CallerHmiManager.showWarningTrafficLight(2, 3)
val yellow = currentLight.countDown.toInt()
CallerHmiManager.changeCountdownYellow(yellow)
}