diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoPrivateObuNewManager.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoPrivateObuNewManager.kt index 9f38e2ed37..a53663f34b 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoPrivateObuNewManager.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoPrivateObuNewManager.kt @@ -391,6 +391,7 @@ class MogoPrivateObuNewManager private constructor() : OnUpgradeListener { // } MogoObuShowConstants.RTE.RTI_TYPE_SPEEDING -> { //超速行驶 appId = EventTypeEnumNew.TYPE_USECASE_ID_SLW.poiType + } MogoObuShowConstants.RTE.RTI_TYPE_RETRIGRADE -> { //车辆逆行 appId = @@ -399,18 +400,31 @@ class MogoPrivateObuNewManager private constructor() : OnUpgradeListener { } alertContent = EventTypeEnumNew.getWarningContent(appId) ttsContent = EventTypeEnumNew.getWarningTts(appId) - alertContent = String.format( //事件才有影响范围 - alertContent, - Math.round(data.warningMsgList[0].distance).toString(), - Math.round(data.warningMsgList[0].eventRadius).toString() - ) - ttsContent = String.format( - ttsContent, - ConvertUtils.intToChinese( - data.warningMsgList[0].distance.roundToInt()), - ConvertUtils.intToChinese( - data.warningMsgList[0].eventRadius.roundToInt()) - ) + //他车超速行驶 + if(EventTypeEnumNew.TYPE_USECASE_ID_SLW.poiType == appId){ + //同向正后方、同向邻道左后方、同向邻道右后方 提示他车超速行驶 + if(data.warningMsgList[0].targetPosition == MogoObuShowConstants.VEH_TARGET_POSITION.BEHEAD_IN_LANE + || data.warningMsgList[0].targetPosition == MogoObuShowConstants.VEH_TARGET_POSITION.BEHEAD_LEFT + || data.warningMsgList[0].targetPosition == MogoObuShowConstants.VEH_TARGET_POSITION.BEHEAD_RIGHT){ + alertContent = String.format(alertContent, direction.desc) + ttsContent = String.format(ttsContent, direction.desc) + }else{ + return + } + }else{ + alertContent = String.format( //事件才有影响范围 + alertContent, + Math.round(data.warningMsgList[0].distance).toString(), + Math.round(data.warningMsgList[0].eventRadius).toString() + ) + ttsContent = String.format( + ttsContent, + ConvertUtils.intToChinese( + data.warningMsgList[0].distance.roundToInt()), + ConvertUtils.intToChinese( + data.warningMsgList[0].eventRadius.roundToInt()) + ) + } } //车内标牌 diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/EventTypeEnumNew.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/EventTypeEnumNew.kt index c8813b87df..0c6d50aa0a 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/EventTypeEnumNew.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/EventTypeEnumNew.kt @@ -295,8 +295,8 @@ enum class EventTypeEnumNew( 901.toString(), "超速行驶", poiTypeSrcVr = R.drawable.icon_warning_v2x_over_speed, - content = "前方%s米超速行驶,影响路段%s米", - tts = "蘑菇路侧提醒您,前方%s米超速行驶,影响路段%s米" + content = "%s有车辆超速行驶", + tts = "蘑菇路侧提醒您,%s有车辆超速行驶" ), TYPE_USECASE_ID_ROAD_VEHICLE_RETROGRADE( //车辆逆行 904.toString(),