[2.15.0] 30秒间隔只针对obu类型事件类型有效

This commit is contained in:
renwj
2023-03-30 15:25:15 +08:00
parent 0060a76b6a
commit 96bd93ee18
13 changed files with 53 additions and 114 deletions

View File

@@ -613,13 +613,7 @@ class MogoObuDcCombineManager private constructor() : IMoGoObuWarningRsiListener
* 消息盒子对应消息的语音播报
*/
private fun showWarning(type: String, content: String, tts: String, direction: WarningDirectionEnum) {
CallerHmiManager.warningV2X(
type,
content,
tts,
null,
direction
)
CallerHmiManager.warningV2X(type, content, tts, null, direction, isFromObu = true)
}
}

View File

@@ -1,7 +1,6 @@
package com.mogo.eagle.core.function.datacenter.obu
import android.content.Context
import android.util.Log
import com.mogo.eagle.core.data.config.FunctionBuildConfig
import com.mogo.eagle.core.data.config.HmiBuildConfig
import com.mogo.eagle.core.data.enums.*
@@ -11,7 +10,6 @@ import com.mogo.eagle.core.function.api.map.angle.Default
import com.mogo.eagle.core.function.api.map.angle.TooClose
import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager
import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager
import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationWGS84ListenerManager
import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager
import com.mogo.eagle.core.function.call.hmi.CallerHmiManager
import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager
@@ -893,10 +891,7 @@ class MogoPrivateObuNewManager private constructor() : OnUpgradeListener {
if (level == 2 || level == 3) {
//不显示弹框,其它保留
saveObuData(v2xType, alertContent, ttsContent)
CallerHmiManager.warningV2X(
v2xType,
alertContent,
ttsContent,// 只有第一次才tts防止更新的时候不断的提醒
CallerHmiManager.warningV2X(v2xType, alertContent, ttsContent,// 只有第一次才tts防止更新的时候不断的提醒
object : IMoGoWarningStatusListener {
override fun onShow() {
super.onShow()
@@ -910,8 +905,7 @@ class MogoPrivateObuNewManager private constructor() : OnUpgradeListener {
CallerVisualAngleManager.changeAngle(Default())
}
}
}, direction
)
}, direction, isFromObu = true)
}
//更新周边车辆进行预警颜色变换,车辆实时移动和变色 UUID不需要匹配了
@@ -1124,13 +1118,7 @@ class MogoPrivateObuNewManager private constructor() : OnUpgradeListener {
tts: String,
direction: WarningDirectionEnum
) {
CallerHmiManager.warningV2X(
type,
content,
tts,
null,
direction
)
CallerHmiManager.warningV2X(type, content, tts, null, direction, isFromObu = true)
}
}