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

fixed conflict

Browse Source
This commit is contained in:
lixiaopeng
2021-08-24 17:15:25 +08:00
parent 187ce93343
commit edf775d322
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/MogoPrivateObuManager.kt
View File

@@ -342,7 +342,9 @@ class MogoPrivateObuManager private constructor() {
val status = info.status
Logger.d(
MogoObuConst.TAG_MOGO_OBU,
"onCvxV2vThreatIndInfo getMessageDirection(direction) = $direction"
"onCvxV2vThreatIndInfo getMessageDirection(direction) = ${
getMessageDirection(direction)
} --- direction = $direction --- appId = $appId ---level = $level"
)
handleSdkObu(appId, direction, status, level, info)
}
@@ -508,7 +510,7 @@ class MogoPrivateObuManager private constructor() {
info: CvxV2vThreatIndInfo
) {
// 这里排除需要特殊定制的语音及文案外,其余的都可以使用 WarningTypeEnum 提供的
Log.d(MogoObuConst.TAG_MOGO_OBU, "appId = $appId --- handleDirection = $direction ")
Log.d(MogoObuConst.TAG_MOGO_OBU, "handleSdkObu appId = $appId --- handleDirection = $direction ---level = $level")
var alertContent = ""
var ttsContent = ""
when (appId) {
@@ -584,6 +586,7 @@ class MogoPrivateObuManager private constructor() {
"ACTION_V2X_FRONT_WARNING"
)
//显示弹框，语音提示
Log.d(MogoObuConst.TAG_MOGO_OBU, "appId = $appId --- level = $level --- alertContent = $alertContent")
mIMoGoWaringProvider!!.showWarningV2X(
appId,
alertContent,