diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/enums/WarningTypeEnum.kt b/modules/mogo-module-common/src/main/java/com/mogo/module/common/enums/WarningTypeEnum.kt index 5dbbf89fce..85f581b2a3 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/enums/WarningTypeEnum.kt +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/enums/WarningTypeEnum.kt @@ -43,8 +43,8 @@ enum class WarningTypeEnum( TYPE_USECASE_ID_CLW( ObuConstants.USE_CASE_ID.CLW, "车辆失控预警", - "前车失控预警", - "小心前方失控车辆", + "%s失控预警", + "小心%s失控车辆", R.drawable.icon_warning_v2x_vehicle_control ), TYPE_USECASE_ID_DNPW( diff --git a/modules/mogo-module-data/src/main/java/com/mogo/module/data/enums/WarningDirectionEnum.kt b/modules/mogo-module-data/src/main/java/com/mogo/module/data/enums/WarningDirectionEnum.kt index 97ef53c041..bee6026da3 100644 --- a/modules/mogo-module-data/src/main/java/com/mogo/module/data/enums/WarningDirectionEnum.kt +++ b/modules/mogo-module-data/src/main/java/com/mogo/module/data/enums/WarningDirectionEnum.kt @@ -46,6 +46,6 @@ enum class WarningDirectionEnum( ), ALERT_WARNING_ALL( 9, - "全方位" + "周边" ) } \ No newline at end of file diff --git a/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/MogoPrivateObuManager.kt b/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/MogoPrivateObuManager.kt index c8de0b2039..c926a7a53f 100644 --- a/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/MogoPrivateObuManager.kt +++ b/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/MogoPrivateObuManager.kt @@ -571,7 +571,6 @@ class MogoPrivateObuManager private constructor() { } - private var isStrikeTts = false /** @@ -621,17 +620,9 @@ class MogoPrivateObuManager private constructor() { WarningTypeEnum.TYPE_USECASE_ID_CLW.useCaseId -> { alertContent = WarningTypeEnum.getWarningContent(appId) ttsContent = WarningTypeEnum.getWarningTts(appId) -// when (direction) { -// 3 -> { //左前 -// ttsContent = String.format(ttsContent, "左") -// } -// 4 -> { //右前 -// ttsContent = String.format(ttsContent, "右") -// } -// 1 -> { //正前 -// ttsContent = alertContent -// } -// } + + alertContent = String.format(alertContent, direction.desc) + ttsContent = String.format(ttsContent, direction.desc) } //左转辅助 @@ -711,10 +702,10 @@ class MogoPrivateObuManager private constructor() { mIMoGoWaringProvider?.showWarningV2X( appId, alertContent, - if (level == 3) ttsContent else "", + if (level == 2||level == 3) ttsContent else "", appId.toString() ) - if (level == 3) { + if (level == 2||level == 3) { isStrikeTts = true } //更新周边车辆进行预警颜色变换,车辆实时移动和变色