diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoObuDcCombineManager.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoObuDcCombineManager.kt index 1824a5bb98..439d5e5ccb 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoObuDcCombineManager.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoObuDcCombineManager.kt @@ -631,9 +631,9 @@ class MogoObuDcCombineManager private constructor() : IMoGoObuWarningRsiListener if (currentSpeed > 0) { ttsContentNew = if ((currentSpeed * 3.6).roundToInt() in (minSpeedTemp + 1) until maxSpeedTemp) { - "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您，推荐保持当前车速通过路口" + "建议保持当前车速通过路口" } else { - "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您，推荐保持车速$minSpeedTemp - $maxSpeedTemp KM/H通过路口" + "推荐保持车速10-30KM/H通过路口" } alertContentNew = "推荐车速$minSpeedTemp - $maxSpeedTemp KM/H" } 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 daed0329ee..bda0b7989c 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 @@ -1113,9 +1113,9 @@ class MogoPrivateObuNewManager private constructor() : OnUpgradeListener { if (currentSpeed > 0) { ttsContentNew = if ((currentSpeed * 3.6).roundToInt() in (minSpeedTemp + 1) until maxSpeedTemp) { - "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您，推荐保持当前车速通过路口" + "建议保持当前车速通过路口" } else { - "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您，推荐保持车速$minSpeedTemp - $maxSpeedTemp KM/H通过路口" + "推荐保持车速10-30KM/H通过路口" } alertContentNew = "推荐车速$minSpeedTemp - $maxSpeedTemp KM/H" } 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 e189dc8e58..469e1ad5e2 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 @@ -254,7 +254,7 @@ enum class EventTypeEnumNew( "闯红灯预警", poiTypeSrcVr = R.drawable.icon_warning_v2x_traffic_lights_red, content = "前方路口有闯红灯风险", - tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您，前方路口有闯红灯风险，建议降低车速" + tts = "有路口闯红灯风险，建议降低车速" ), TYPE_USECASE_ID_IVP_GREEN( @@ -314,7 +314,7 @@ enum class EventTypeEnumNew( "超速", poiTypeSrcVr = R.drawable.icon_warning_v2x_over_speed, content = "当前路段限速 %s KM/H，已超速", - tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您，当前路段限速 %s 千米每小时，已超速" + tts = "当前路段限速 %s 千米每小时，已超速" ), //------------道路危险情况预警 obu end -----------> @@ -324,161 +324,161 @@ enum class EventTypeEnumNew( "急转弯", poiTypeSrcVr = R.drawable.icon_warning_v2x_turn_left_sharp, content = "前方%s米急转弯", - tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您，前方%s米急转弯" + tts = "前方%s米急转弯" ), TYPE_ID_BRIDGE( 8.toString(), "桥梁", poiTypeSrcVr = R.drawable.icon_warning_v2x_hump_bridge, content = "前方%s米桥梁", - tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您，前方%s米桥梁" + tts = "前方%s米桥梁" ), TYPE_ID_PEDESTRIAN( 10.toString(), "路人", poiTypeSrcVr = R.drawable.icon_warning_v2x_pedestrian_crossing, content = "前方%s米路人", - tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您，前方%s米路人" + tts = "前方%s米路人" ), TYPE_ID_SLIPPERY_ROAD( 17.toString(), "路滑", poiTypeSrcVr = R.drawable.v2x_icon_jiebing_vr, content = "前方%s米路滑", - tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您，前方%s米路滑" + tts = "前方%s米路滑" ), TYPE_ID_TUNNEL( 21.toString(), "隧道", poiTypeSrcVr = R.drawable.icon_default, content = "前方%s米隧道", - tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您，前方%s米隧道" + tts = "前方%s米隧道" ), TYPE_ID_FERRY( 22.toString(), "渡轮", poiTypeSrcVr = R.drawable.icon_default, content = "前方%s米渡轮", - tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您，前方%s米渡轮" + tts = "前方%s米渡轮" ), TYPE_ID_UNEVEN_ROAD( 24.toString(), "路面不平", poiTypeSrcVr = R.drawable.icon_warning_road_hollow, content = "前方%s米路面不平", - tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您，前方%s米路面不平" + tts = "前方%s米路面不平" ), TYPE_ID_NON_MOTOR_VEHICLE( 32.toString(), "非机动车", poiTypeSrcVr = R.drawable.icon_warning_v2x_motobike, content = "前方%s米有非机动车", - tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您，前方%s米有非机动车" + tts = "前方%s米有非机动车" ), TYPE_ID_OBSTACLE( 36.toString(), "障碍", poiTypeSrcVr = R.drawable.icon_default, content = "前方%s米障碍", - tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您，前方%s米障碍" + tts = "前方%s米障碍" ), TYPE_FOURS_ROAD_WORK( 38.toString(), "施工", poiTypeSrcVr = R.drawable.icon_warning_v2x_road_construction, content = "前方%s米施工", - tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您，前方%s米施工" + tts = "前方%s米施工" ), TYPE_VEHICLE_QUEUE( 47.toString(), "车队", poiTypeSrcVr = R.drawable.icon_default, content = "前方%s米车队", - tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您，前方%s米车队" + tts = "前方%s米车队" ), TYPE_NO_PASSING( 51.toString(), "道路不通", poiTypeSrcVr = R.drawable.v2x_icon_fenglu_vr, content = "前方%s米不通", - tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您，前方%s米不通" + tts = "前方%s米不通" ), TYPE_NO_TURNING_AROUND( 75.toString(), "禁止掉头", poiTypeSrcVr = R.drawable.icon_default, content = "前方%s米禁止掉头", - tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您，前方%s米禁止掉头" + tts = "前方%s米禁止掉头" ), TYPE_USECASE_ID_ROAD_NO_PARKING( 78.toString(), "禁止停车", poiTypeSrcVr = R.drawable.icon_warning_v2x_no_parking, content = "前方%s米有禁停路段", - tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您，前方%s米有禁停路段" + tts = "前方%s米有禁停路段" ), TYPE_USECASE_ID_ROAD_NO_TOOTING( 80.toString(), "禁止鸣笛", poiTypeSrcVr = R.drawable.icon_warning_v2x_no_tooting, content = "前方%s米禁止鸣笛", - tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您，前方%s米禁止鸣笛" + tts = "前方%s米禁止鸣笛" ), TYPE_USECASE_ID_BUS_WARNING( 123.toString(), "公交提醒", poiTypeSrcVr = R.drawable.icon_warning_v2x_tramcar, content = "前方%s米公交提醒", - tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您，前方%s米公交提醒" + tts = "前方%s米公交提醒" ), TYPE_USECASE_ID_NARROW_RIGHT( 163.toString(), "右侧变窄/车道数减少", poiTypeSrcVr = R.drawable.icon_default, content = "前方%s米右侧变窄/车道数减少", - tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您，前方%s米右侧变窄/车道数减少" + tts = "前方%s米右侧变窄/车道数减少" ), TYPE_USECASE_ID_GAS_STATION( 201.toString(), "加油站", poiTypeSrcVr = R.drawable.icon_warning_gas_station, content = "前方%s米加油站", - tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您，前方%s米加油站" + tts = "前方%s米加油站" ), TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL( 242.toString(), "学校", poiTypeSrcVr = R.drawable.icon_warning_v2x_school, content = "前方%s米学校", - tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您，前方%s米学校" + tts = "前方%s米学校" ), TYPE_USECASE_ID_ACCIDENT( 244.toString(), "交通事故", poiTypeSrcVr = R.drawable.v2x_icon_jiaotongshigu_vr, content = "前方%s米交通事故", - tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您，前方%s米交通事故" + tts = "前方%s米交通事故" ), TYPE_USECASE_ROAD_BUS_STATION( 245.toString(), "通过公交站", poiTypeSrcVr = R.drawable.icon_v2x_bus_station_driver, content = "前方%s米有公交站", - tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}发现前方公交站，提醒您注意右侧行人及来车" + tts = "前方%s米有公交站" ), TYPE_ATTENTION_CONFLUENCE( 44.toString(), "前方车辆汇流", poiTypeSrcVr = R.drawable.icon_warning_v2x_attention_confluence, - content = "前方%s米注意车辆汇流", - tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您，前方%s米注意车辆汇流" + content = "前方%s米注意车辆汇入", + tts = "前方%s米注意车辆汇入" ), TYPE_PEDESTRIAN_CROSSING( 114.toString(), "人行横道", poiTypeSrcVr = R.drawable.icon_warning_v2x_person, content = "前方%s米人行横道", - tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您，前方%s米人行横道" + tts = "前方%s米人行横道" ), //------------车内标牌 obu end -------------->