diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/ai/V2XWarningRepository.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/ai/V2XWarningRepository.kt
index 27a4769366..05519a392c 100644
--- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/ai/V2XWarningRepository.kt
+++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/ai/V2XWarningRepository.kt
@@ -4,6 +4,8 @@ import android.os.Handler
import android.os.Looper
import android.os.Message
import android.util.Log
+import com.mogo.eagle.core.data.R
+import com.mogo.eagle.core.utilcode.util.StringUtils
import com.mogo.service.v2n.bean.MGDynamicEventBean
import com.mogo.service.v2n.bean.MGPerceptionBean
import com.mogo.service.v2n.bean.MGWaringCrossBean
@@ -716,17 +718,28 @@ fun interpolatePoints(start: MGLocationBean, end: MGLocationBean): MGLocationBea
}
enum class WaringOrientationType(val text: String, val mask: Int) {
- left_top("左前方", 1 shl 0),// 00000001
- top("前方", 1 shl 1),// 00000010
- right_top("右前方", 1 shl 2),//00000100
- right("右侧", 1 shl 3),//00001000
- right_bottom("右后方", 1 shl 4),//00010000
- bottom("后方", 1 shl 5),//00100000
- left_bottom("左后方", 1 shl 6),//01000000
- left("左侧", 1 shl 7),//10000000
- top_big("前方", 1 shl 8),//100000000
- bottom_big("后方", 1 shl 9),//1000000000
- none("未知", 0);
+// left_top("左前方", 1 shl 0),// 00000001
+ left_top(StringUtils.getString(R.string.module_core_left_top), 1 shl 0),// 00000001
+// top("前方", 1 shl 1),// 00000010
+ top(StringUtils.getString(R.string.module_core_top), 1 shl 1),// 00000010
+// right_top("右前方", 1 shl 2),//00000100
+ right_top(StringUtils.getString(R.string.module_core_right_top), 1 shl 2),//00000100
+// right("右侧", 1 shl 3),//00001000
+ right(StringUtils.getString(R.string.module_core_right1), 1 shl 3),//00001000
+// right_bottom("右后方", 1 shl 4),//00010000
+ right_bottom(StringUtils.getString(R.string.module_core_right_bottom), 1 shl 4),//00010000
+// bottom("后方", 1 shl 5),//00100000
+ bottom(StringUtils.getString(R.string.module_core_bottom), 1 shl 5),//00100000
+// left_bottom("左后方", 1 shl 6),//01000000
+ left_bottom(StringUtils.getString(R.string.module_core_left_bottom), 1 shl 6),//01000000
+// left("左侧", 1 shl 7),//10000000
+ left(StringUtils.getString(R.string.module_core_left1), 1 shl 7),//10000000
+// top_big("前方", 1 shl 8),//100000000
+ top_big(StringUtils.getString(R.string.module_core_top), 1 shl 8),//100000000
+// bottom_big("后方", 1 shl 9),//1000000000
+ bottom_big(StringUtils.getString(R.string.module_core_bottom), 1 shl 9),//1000000000
+// none("未知", 0);
+ none(StringUtils.getString(R.string.module_core_unknown), 0);
companion object {
//a上左，b上中，c上右， d中左，e中，f中右， g下左，h下中，i下右
diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/pnc/PncActionsHelper.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/pnc/PncActionsHelper.kt
index 60a8a91e86..4a8226b5d4 100644
--- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/pnc/PncActionsHelper.kt
+++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/pnc/PncActionsHelper.kt
@@ -1,5 +1,7 @@
package com.mogo.eagle.core.data.autopilot.pnc
+import com.mogo.eagle.core.data.R
+import com.mogo.eagle.core.utilcode.util.StringUtils
import mogo.telematics.pad.MessagePad.DrivingState.*
class PncActionsHelper {
@@ -13,102 +15,131 @@ class PncActionsHelper {
}
// 车道保持 driving_action： 1:车道保持状态，2:跟车状态
LANKE_KEEP_VALUE -> {
- if (driveAction == 2) "正在跟随车辆行驶" else ""
+// if (driveAction == 2) "正在跟随车辆行驶" else ""
+ if (driveAction == 2) StringUtils.getString(R.string.module_core_following_vehicle_driving) else ""
}
// 红绿灯通行状态 driving_action：1 表示停止动作；driving_action:2 表示通行动作
TRAFFIC_LIGHT_VALUE -> {
- if (driveAction == 1) "正在等红灯" else ""
+// if (driveAction == 1) "正在等红灯" else ""
+ if (driveAction == 1) StringUtils.getString(R.string.module_core_waiting_for_red_light) else ""
}
// follow全局择机向左变道状态 driving_action：1 表示触发变道；driving_action:2 表示择机保持；driving_action:3 表示变道完成
FOLLOW_LANE_CHANGE_LEFT_VALUE -> {
- if (driveAction == 2) "正在向左变道" else if (driveAction == 3) "正在完成变道" else ""
+// if (driveAction == 2) "正在向左变道" else if (driveAction == 3) "正在完成变道" else ""
+ if (driveAction == 2) StringUtils.getString(R.string.module_core_changing_lane_to_left) else if (driveAction == 3) StringUtils.getString(R.string.module_core_completing_lane_change) else ""
}
// follow全局择机向右变道状态 driving_action：1 表示触发变道；driving_action:2 表示择机保持；driving_action:3 表示变道完成
FOLLOW_LANE_CHANGE_RIGHT_VALUE -> {
- if (driveAction == 2) "正在向右变道" else if (driveAction == 3) "正在完成变道" else ""
+// if (driveAction == 2) "正在向右变道" else if (driveAction == 3) "正在完成变道" else ""
+ if (driveAction == 2) StringUtils.getString(R.string.module_core_changing_lane_to_right) else if (driveAction == 3) StringUtils.getString(R.string.module_core_completing_lane_change) else ""
}
// 变道绕障 主动向左/右变道状态 driving_action：1 表示触发变道；driving_action:2 表示执行变道；driving_action:3 表示变道取消；driving_action:4 表示变道完成
AUTO_LANE_CHANGE_LEFT_VALUE, AUTO_LANE_CHANGE_RIGHT_VALUE -> {
- if (driveAction == 2) "正在绕过障碍物" else if (driveAction == 3) "变道取消" else ""
+// if (driveAction == 2) "正在绕过障碍物" else if (driveAction == 3) "变道取消" else ""
+ if (driveAction == 2) StringUtils.getString(R.string.module_core_bypassing_obstacle) else if (driveAction == 3) StringUtils.getString(R.string.module_core_change_canceled) else ""
}
// 主动向左/右绕行状态 driving_action：1 表示触发绕行；driving_action:2 表示执行绕行；driving_action:3 表示绕行取消；driving_action:4 表示绕行完成
LANE_AVOID_LEFT_VALUE, LANE_AVOID_RIGHT_VALUE -> {
- if (driveAction == 2) "正在避让障碍物" else ""
+// if (driveAction == 2) "正在避让障碍物" else ""
+ if (driveAction == 2) StringUtils.getString(R.string.module_core_avoiding_obstacle) else ""
}
AUTO_LANE_CHANGE_LEFT_RSI_VALUE -> {
- if (driveAction == 2) "正在向左变道避让前方道路施工" else if (driveAction == 3) "变道取消" else ""
+// if (driveAction == 2) "正在向左变道避让前方道路施工" else if (driveAction == 3) "变道取消" else ""
+ if (driveAction == 2) StringUtils.getString(R.string.module_core_changing_lane_to_left_to_avoid_road_construction_ahead) else if (driveAction == 3) StringUtils.getString(R.string.module_core_change_canceled) else ""
}
AUTO_LANE_CHANGE_RIGHT_RSI_VALUE -> {
- if (driveAction == 2) "正在向右变道避让前方道路施工" else if (driveAction == 3) "变道取消" else ""
+// if (driveAction == 2) "正在向右变道避让前方道路施工" else if (driveAction == 3) "变道取消" else ""
+ if (driveAction == 2) StringUtils.getString(R.string.module_core_changing_lane_to_right_to_avoid_road_construction_ahead) else if (driveAction == 3) StringUtils.getString(R.string.module_core_change_canceled) else ""
}
LANE_AVOID_LEFT_RSI_VALUE -> {
- if (driveAction == 2) "正在向左绕行避让前方道路施工" else if (driveAction == 3) "绕行取消" else ""
+// if (driveAction == 2) "正在向左绕行避让前方道路施工" else if (driveAction == 3) "绕行取消" else ""
+ if (driveAction == 2) StringUtils.getString(R.string.module_core_turning_left_to_bypass_road_construction_ahead) else if (driveAction == 3) StringUtils.getString(R.string.module_core_bypass_canceled) else ""
}
LANE_AVOID_RIGHT_RSI_VALUE -> {
- if (driveAction == 2) "正在向右绕行避让前方道路施工" else if (driveAction == 3) "绕行取消" else ""
+// if (driveAction == 2) "正在向右绕行避让前方道路施工" else if (driveAction == 3) "绕行取消" else ""
+ if (driveAction == 2) StringUtils.getString(R.string.module_core_turning_right_to_bypass_road_construction_ahead) else if (driveAction == 3) StringUtils.getString(R.string.module_core_bypass_canceled) else ""
}
AUTO_LANE_CHANGE_LEFT_RSM_VALUE -> {
- if (driveAction == 2) "正在向左变道避让前方静止障碍物" else if (driveAction == 3) "变道取消" else ""
+// if (driveAction == 2) "正在向左变道避让前方静止障碍物" else if (driveAction == 3) "变道取消" else ""
+ if (driveAction == 2) StringUtils.getString(R.string.module_core_changing_lane_to_left_to_avoid_stationary_obstacle_ahead) else if (driveAction == 3) StringUtils.getString(R.string.module_core_change_canceled) else ""
}
AUTO_LANE_CHANGE_RIGHT_RSM_VALUE -> {
- if (driveAction == 2) "正在向右变道避让前方静止障碍物" else if (driveAction == 3) "变道取消" else ""
+// if (driveAction == 2) "正在向右变道避让前方静止障碍物" else if (driveAction == 3) "变道取消" else ""
+ if (driveAction == 2) StringUtils.getString(R.string.module_core_changing_lane_to_right_to_avoid_stationary_obstacle_ahead) else if (driveAction == 3) StringUtils.getString(R.string.module_core_change_canceled) else ""
}
LANE_AVOID_LEFT_RSM_VALUE -> {
- if (driveAction == 2) "正在向左绕行避让前方静止障碍物" else if (driveAction == 3) "绕行取消" else ""
+// if (driveAction == 2) "正在向左绕行避让前方静止障碍物" else if (driveAction == 3) "绕行取消" else ""
+ if (driveAction == 2) StringUtils.getString(R.string.module_core_turning_left_to_bypass_stationary_obstacle_ahead) else if (driveAction == 3) StringUtils.getString(R.string.module_core_bypass_canceled) else ""
}
LANE_AVOID_RIGHT_RSM_VALUE -> {
- if (driveAction == 2) "正在向右绕行避让前方静止障碍物" else if (driveAction == 3) "绕行取消" else ""
+// if (driveAction == 2) "正在向右绕行避让前方静止障碍物" else if (driveAction == 3) "绕行取消" else ""
+ if (driveAction == 2) StringUtils.getString(R.string.module_core_turning_right_to_bypass_stationary_obstacle_ahead) else if (driveAction == 3) StringUtils.getString(R.string.module_core_bypass_canceled) else ""
}
AUTO_LANE_CHANGE_LEFT_RSI_TRIANGLE_VALUE -> {
- if (driveAction == 2) "正在向左变道避让前方道路事故" else if (driveAction == 3) "变道取消" else ""
+// if (driveAction == 2) "正在向左变道避让前方道路事故" else if (driveAction == 3) "变道取消" else ""
+ if (driveAction == 2) StringUtils.getString(R.string.module_core_changing_lane_to_left_to_avoid_road_accident_ahead) else if (driveAction == 3) StringUtils.getString(R.string.module_core_change_canceled) else ""
}
AUTO_LANE_CHANGE_RIGHT_RSI_TRIANGLE_VALUE -> {
- if (driveAction == 2) "正在向右变道避让前方道路事故" else if (driveAction == 3) "变道取消" else ""
+// if (driveAction == 2) "正在向右变道避让前方道路事故" else if (driveAction == 3) "变道取消" else ""
+ if (driveAction == 2) StringUtils.getString(R.string.module_core_changing_lane_to_right_to_avoid_road_accident_ahead) else if (driveAction == 3) StringUtils.getString(R.string.module_core_change_canceled) else ""
}
LANE_AVOID_LEFT_RSI_TRIANGLE_VALUE -> {
- if (driveAction == 2) "正在向左绕行避让前方道路事故" else if (driveAction == 3) "绕行取消" else ""
+// if (driveAction == 2) "正在向左绕行避让前方道路事故" else if (driveAction == 3) "绕行取消" else ""
+ if (driveAction == 2) StringUtils.getString(R.string.module_core_turning_left_to_bypass_road_accident_ahead) else if (driveAction == 3) StringUtils.getString(R.string.module_core_bypass_canceled) else ""
}
LANE_AVOID_RIGHT_RSI_TRIANGLE_VALUE -> {
- if (driveAction == 2) "正在向右绕行避让前方道路事故" else if (driveAction == 3) "绕行取消" else ""
+// if (driveAction == 2) "正在向右绕行避让前方道路事故" else if (driveAction == 3) "绕行取消" else ""
+ if (driveAction == 2) StringUtils.getString(R.string.module_core_turning_right_to_bypass_road_accident_ahead) else if (driveAction == 3) StringUtils.getString(R.string.module_core_bypass_canceled) else ""
}
// 起步状态 driving_action：1 表示正常启动；driving_action:2 表示择机起步；
START_UP_VALUE -> {
- if (driveAction == 1) "正在出站" else if (driveAction == 2) "正在等待出站" else ""
+// if (driveAction == 1) "正在出站" else if (driveAction == 2) "正在等待出站" else ""
+ if (driveAction == 1) StringUtils.getString(R.string.module_core_leaving_the_station) else if (driveAction == 2) StringUtils.getString(R.string.module_core_waiting_to_leave_the_station) else ""
}
// 靠边停车状态 driving_action：1 表示正常靠边停车；driving_action:2 表示择机靠边停车；
PULL_OVER_VALUE -> {
- if (driveAction == 1) "正在进站" else if (driveAction == 2) "正在等待进站" else ""
+// if (driveAction == 1) "正在进站" else if (driveAction == 2) "正在等待进站" else ""
+ if (driveAction == 1) StringUtils.getString(R.string.module_core_entering_the_station) else if (driveAction == 2) StringUtils.getString(R.string.module_core_waiting_to_enter_the_station) else ""
}
// 同 AUTO_LANE_CHANGE_LEFT_VALUE 、AUTO_LANE_CHANGE_RIGHT_VALUE
AUTO_LANE_CHANGE_LEFT_V2N_VALUE, AUTO_LANE_CHANGE_RIGHT_V2N_VALUE -> {
- if (driveAction == 2) "正在绕过前方道路事件" else ""
+// if (driveAction == 2) "正在绕过前方道路事件" else ""
+ if (driveAction == 2) StringUtils.getString(R.string.module_core_bypassing_road_event_ahead) else ""
}
// 同 LANE_AVOID_LEFT_VALUE 、LANE_AVOID_RIGHT_VALUE
LANE_AVOID_LEFT_V2N_VALUE, LANE_AVOID_RIGHT_V2N_VALUE -> {
- if (driveAction == 2) "正在避让前方道路事件" else ""
+// if (driveAction == 2) "正在避让前方道路事件" else ""
+ if (driveAction == 2) StringUtils.getString(R.string.module_core_avoiding_road_event_ahead) else ""
}
// 正在等待变道避让施工场景 driving_action：1 表示正在等待；driving_action:2 表示等待超时请求平行驾驶；
WAITING_V2N_VALUE -> {
- if (driveAction == 1) "正在尝试绕过前方道路事件" else if (driveAction == 2) "正在请求远程协助" else ""
+// if (driveAction == 1) "正在尝试绕过前方道路事件" else if (driveAction == 2) "正在请求远程协助" else ""
+ if (driveAction == 1) StringUtils.getString(R.string.module_core_attempting_to_bypass_road_event_ahead) else if (driveAction == 2) StringUtils.getString(R.string.module_core_requesting_remote_assistance) else ""
}
YIELD_TO_VEHICLE_COMING_FROM_BEHIND_VALUE -> {
- if (driveAction == 1) "正在避让后方来车" else ""
+// if (driveAction == 1) "正在避让后方来车" else ""
+ if (driveAction == 1) StringUtils.getString(R.string.module_core_avoiding_oncoming_vehicles_from_behind) else ""
}
// 考试项
OUT_OF_ODD_VALUE -> {
- if (driveAction == 1 || driveAction == 2 || driveAction == 3) "已超出ODD" else ""
+// if (driveAction == 1 || driveAction == 2 || driveAction == 3) "已超出ODD" else ""
+ if (driveAction == 1 || driveAction == 2 || driveAction == 3) StringUtils.getString(R.string.module_core_has_exceeded_odd) else ""
}
LANE_FOLLOW_VEHICLE_STREAM_VALUE -> {
- "正在跟车行驶"
+// "正在跟车行驶"
+ StringUtils.getString(R.string.module_core_following_the_vehicle_ahead)
}
LANE_CHANGE_LEFT_VEHICLE_STREAM_VALUE -> {
- "正在向左变道避让前方车龙"
+// "正在向左变道避让前方车龙"
+ StringUtils.getString(R.string.module_core_changing_lane_left_avoid_vehicle_queue_ahead)
}
LANE_CHANGE_RIGHT_VEHICLE_STREAM_VALUE -> {
- "正在向右变道避让前方车龙"
+// "正在向右变道避让前方车龙"
+ StringUtils.getString(R.string.module_core_changing_lane_right_avoid_vehicle_queue_ahead)
}
USING_RSI_LINK_VALUE -> {
- "正在使用云端规划通过路口"
+// "正在使用云端规划通过路口"
+ StringUtils.getString(R.string.module_core_using_cloud_planning_pass_intersection)
}
else -> ""
}
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 6bb9b70281..31e39ecf4f 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
@@ -4,6 +4,7 @@ import android.view.View
import com.mogo.eagle.core.data.R
import com.mogo.eagle.core.data.config.FunctionBuildConfig
import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
+import com.mogo.eagle.core.utilcode.util.StringUtils
import com.mogo.skin.utils.SkinResources
@@ -20,78 +21,103 @@ enum class EventTypeEnumNew(
//交通检查
TRAFFIC_CHECK(
- "10002", "交通检查", "前方交通检查",
- R.drawable.v2x_icon_jiaotongjiancha_vr, "前方交通检查", "交通检查"
+// "10002", "交通检查", "前方交通检查",
+ "10002", StringUtils.getString(R.string.module_core_traffic_check), StringUtils.getString(R.string.module_core_ahead_traffic_check),
+// R.drawable.v2x_icon_jiaotongjiancha_vr, "前方交通检查", "交通检查"
+ R.drawable.v2x_icon_jiaotongjiancha_vr, StringUtils.getString(R.string.module_core_ahead_traffic_check), StringUtils.getString(R.string.module_core_traffic_check)
),
//封路
ROAD_CLOSED(
- "10003", "封路", "前方封路", R.drawable.v2x_icon_fenglu_vr,
- "前方封路", "道路封路"
+// "10003", "封路", "前方封路", R.drawable.v2x_icon_fenglu_vr,
+ "10003", StringUtils.getString(R.string.module_core_road_closed), StringUtils.getString(R.string.module_core_ahead_road_closed), R.drawable.v2x_icon_fenglu_vr,
+// "前方封路", "道路封路"
+ StringUtils.getString(R.string.module_core_ahead_road_closed), StringUtils.getString(R.string.module_core_road_closure)
),
//施工
FOURS_ROAD_WORK(
- "10006", "注意施工占道", "注意施工占道", R.drawable.icon_warning_v2x_road_construction,
- "注意施工占道", "注意施工占道"
+// "10006", "注意施工占道", "注意施工占道", R.drawable.icon_warning_v2x_road_construction,
+ "10006", StringUtils.getString(R.string.module_core_fours_road_work), StringUtils.getString(R.string.module_core_fours_road_work), R.drawable.icon_warning_v2x_road_construction,
+// "注意施工占道", "注意施工占道"
+ StringUtils.getString(R.string.module_core_fours_road_work), StringUtils.getString(R.string.module_core_fours_road_work)
),
//拥堵
FOURS_BLOCK_UP(
- "10007", "道路拥堵", "前方拥堵", R.drawable.icon_warning_v2x_congestion,
- "前方道路拥堵", "道路拥堵"
+// "10007", "道路拥堵", "前方拥堵", R.drawable.icon_warning_v2x_congestion,
+ "10007", StringUtils.getString(R.string.module_core_road_congestion), StringUtils.getString(R.string.module_core_ahead_congestion), R.drawable.icon_warning_v2x_congestion,
+// "前方道路拥堵", "道路拥堵"
+ StringUtils.getString(R.string.module_core_ahead_road_congestion), StringUtils.getString(R.string.module_core_road_congestion)
),
//积水
FOURS_PONDING(
- "10008", "道路积水", "前方道路积水", R.drawable.v2x_icon_jishui_vr,
- "前方道路积水", "道路积水"
+// "10008", "道路积水", "前方道路积水", R.drawable.v2x_icon_jishui_vr,
+ "10008", StringUtils.getString(R.string.module_core_road_ponding), StringUtils.getString(R.string.module_core_ahead_road_ponding), R.drawable.v2x_icon_jishui_vr,
+// "前方道路积水", "道路积水"
+ StringUtils.getString(R.string.module_core_ahead_road_ponding), StringUtils.getString(R.string.module_core_road_ponding)
),
//结冰
FOURS_ICE(
- "10011", "路面结冰", "路面结冰", R.drawable.v2x_icon_jiebing_vr,
- "前方路面结冰", "路面结冰"
+// "10011", "路面结冰", "路面结冰", R.drawable.v2x_icon_jiebing_vr,
+ "10011", StringUtils.getString(R.string.module_core_road_icing), StringUtils.getString(R.string.module_core_road_icing), R.drawable.v2x_icon_jiebing_vr,
+// "前方路面结冰", "路面结冰"
+ StringUtils.getString(R.string.module_core_ahead_road_icing), StringUtils.getString(R.string.module_core_road_icing)
),
//事故
FOURS_ACCIDENT(
- "10013", "交通事故", "前方交通事故", R.drawable.v2x_icon_jiaotongshigu_vr,
- "前方交通事故", "交通事故"
+// "10013", "交通事故", "前方交通事故", R.drawable.v2x_icon_jiaotongshigu_vr,
+ "10013", StringUtils.getString(R.string.module_core_traffic_accident), StringUtils.getString(R.string.module_core_ahead_traffic_accident), R.drawable.v2x_icon_jiaotongshigu_vr,
+// "前方交通事故", "交通事故"
+ StringUtils.getString(R.string.module_core_ahead_traffic_accident), StringUtils.getString(R.string.module_core_traffic_accident)
),
//重大事故
FOURS_ACCIDENT_01(
- "1001301", "交通事故", "前方交通事故", R.drawable.v2x_icon_jiaotongshigu_vr,
- "前方交通事故", "交通事故"
+// "1001301", "交通事故", "前方交通事故", R.drawable.v2x_icon_jiaotongshigu_vr,
+ "1001301", StringUtils.getString(R.string.module_core_traffic_accident), StringUtils.getString(R.string.module_core_ahead_traffic_accident), R.drawable.v2x_icon_jiaotongshigu_vr,
+// "前方交通事故", "交通事故"
+ StringUtils.getString(R.string.module_core_ahead_traffic_accident), StringUtils.getString(R.string.module_core_traffic_accident)
),
//特大事故
FOURS_ACCIDENT_02(
- "1001302", "交通事故", "前方交通事故", R.drawable.v2x_icon_jiaotongshigu_vr,
- "前方交通事故", "交通事故"
+// "1001302", "交通事故", "前方交通事故", R.drawable.v2x_icon_jiaotongshigu_vr,
+ "1001302", StringUtils.getString(R.string.module_core_traffic_accident), StringUtils.getString(R.string.module_core_ahead_traffic_accident), R.drawable.v2x_icon_jiaotongshigu_vr,
+// "前方交通事故", "交通事故"
+ StringUtils.getString(R.string.module_core_ahead_traffic_accident), StringUtils.getString(R.string.module_core_traffic_accident)
),
//较大事故
FOURS_ACCIDENT_03(
- "1001303", "交通事故", "前方交通事故", R.drawable.v2x_icon_jiaotongshigu_vr,
- "前方交通事故", "交通事故"
+// "1001303", "交通事故", "前方交通事故", R.drawable.v2x_icon_jiaotongshigu_vr,
+ "1001303", StringUtils.getString(R.string.module_core_traffic_accident), StringUtils.getString(R.string.module_core_ahead_traffic_accident), R.drawable.v2x_icon_jiaotongshigu_vr,
+// "前方交通事故", "交通事故"
+ StringUtils.getString(R.string.module_core_ahead_traffic_accident), StringUtils.getString(R.string.module_core_traffic_accident)
),
//一般事故
FOURS_ACCIDENT_04(
- "1001304", "交通事故", "前方交通事故", R.drawable.v2x_icon_jiaotongshigu_vr,
- "前方交通事故", "交通事故"
+// "1001304", "交通事故", "前方交通事故", R.drawable.v2x_icon_jiaotongshigu_vr,
+ "1001304", StringUtils.getString(R.string.module_core_traffic_accident), StringUtils.getString(R.string.module_core_ahead_traffic_accident), R.drawable.v2x_icon_jiaotongshigu_vr,
+// "前方交通事故", "交通事故"
+ StringUtils.getString(R.string.module_core_ahead_traffic_accident), StringUtils.getString(R.string.module_core_traffic_accident)
),
//轻微事故
FOURS_ACCIDENT_05(
- "1001305", "交通事故", "前方交通事故", R.drawable.v2x_icon_jiaotongshigu_vr,
- "前方交通事故", "交通事故"
+// "1001305", "交通事故", "前方交通事故", R.drawable.v2x_icon_jiaotongshigu_vr,
+ "1001305", StringUtils.getString(R.string.module_core_traffic_accident), StringUtils.getString(R.string.module_core_ahead_traffic_accident), R.drawable.v2x_icon_jiaotongshigu_vr,
+// "前方交通事故", "交通事故"
+ StringUtils.getString(R.string.module_core_ahead_traffic_accident), StringUtils.getString(R.string.module_core_traffic_accident)
),
//实时路况
- FOURS_LIVING("10015", "实时路况"),
+// FOURS_LIVING("10015", "实时路况"),
+ FOURS_LIVING("10015", StringUtils.getString(R.string.module_core_real_time_traffic)),
//违章停车
ILLEGAL_PARK_LIVING("10016"),
@@ -100,38 +126,50 @@ enum class EventTypeEnumNew(
ROAD_SLIPPERY("10021"),
//鬼探头类型
- GHOST_PROBE("10024", "前方盲区路人预警", "前方盲区路人预警", R.drawable.icon_warning_v2x_pedestrian_crossing,
- "前方盲区路人通行，请注意", "前方盲区即将有路人通过，请减速慢行"),
+// GHOST_PROBE("10024", "前方盲区路人预警", "前方盲区路人预警", R.drawable.icon_warning_v2x_pedestrian_crossing,
+ GHOST_PROBE("10024", StringUtils.getString(R.string.module_core_ahead_blind_spot_pedestrian_warning), StringUtils.getString(R.string.module_core_ahead_blind_spot_pedestrian_warning), R.drawable.icon_warning_v2x_pedestrian_crossing,
+// "前方盲区路人通行，请注意", "前方盲区即将有路人通过，请减速慢行"),
+ StringUtils.getString(R.string.module_core_ahead_blind_spot_pedestrian_passing_please_attention), StringUtils.getString(R.string.module_core_ahead_blind_spot_pedestrian_approaching_please_slow_down)),
//接管
TAKE_OVER_EVENT(
- "20000", "接管", "注意周围、立即接管", R.drawable.icon_warning_take_over,
- "注意周围、立即接管", "自动驾驶退出请立即接管"
+// "20000", "接管", "注意周围、立即接管", R.drawable.icon_warning_take_over,
+ "20000", StringUtils.getString(R.string.module_core_take_over), StringUtils.getString(R.string.module_core_attention_surroundings_immediate_takeover), R.drawable.icon_warning_take_over,
+// "注意周围、立即接管", "自动驾驶退出请立即接管"
+ StringUtils.getString(R.string.module_core_attention_surroundings_immediate_takeover), StringUtils.getString(R.string.module_core_autonomous_driving_exit_please_take_over_immediately)
),
//弱网接管
- NETWORK_WEAK_EVENT("20001", "接管", "注意周围、立即接管", R.drawable.icon_warning_take_over,
- "注意周围、立即接管", "平行驾驶遇弱网已退出，注意随时接管"),
+// NETWORK_WEAK_EVENT("20001", "接管", "注意周围、立即接管", R.drawable.icon_warning_take_over,
+ NETWORK_WEAK_EVENT("20001", StringUtils.getString(R.string.module_core_take_over), StringUtils.getString(R.string.module_core_attention_surroundings_immediate_takeover), R.drawable.icon_warning_take_over,
+// "注意周围、立即接管", "平行驾驶遇弱网已退出，注意随时接管"),
+ StringUtils.getString(R.string.module_core_attention_surroundings_immediate_takeover), StringUtils.getString(R.string.module_core_parallel_driving_exited_due_to_weak_network_attention_to_take_over_at_any_time)),
//平行驾驶接入
EVEHICLE_IN_TROUBLE(
- "20002", "自驾判定遇困", "已请求平行驾驶，请稍作等待", R.drawable.icon_warning_take_over,
- "已请求平行驾驶，请稍作等待"
+// "20002", "自驾判定遇困", "已请求平行驾驶，请稍作等待", R.drawable.icon_warning_take_over,
+ "20002", StringUtils.getString(R.string.module_core_autonomous_driving_judgment_troubled), StringUtils.getString(R.string.module_core_parallel_driving_requested_please_wait_a_moment), R.drawable.icon_warning_take_over,
+// "已请求平行驾驶，请稍作等待"
+ StringUtils.getString(R.string.module_core_parallel_driving_requested_please_wait_a_moment)
),
// 前方静止or慢速车辆报警
- ALERT_FRONT_CAR("99999","前方预警"),
+// ALERT_FRONT_CAR("99999","前方预警"),
+ ALERT_FRONT_CAR("99999",StringUtils.getString(R.string.module_core_ahead_warning)),
// 限行管理
ALERT_TRAFFIC_CONTROL("99998"),
// 红绿灯事件、是建议以多少速度驶过
- ALERT_TRAFFIC_LIGHT_SUGGEST("99997","红绿灯"),
+// ALERT_TRAFFIC_LIGHT_SUGGEST("99997","红绿灯"),
+ ALERT_TRAFFIC_LIGHT_SUGGEST("99997", StringUtils.getString(R.string.module_core_traffic_light)),
// 红绿灯事件、一种是绿灯不足3秒
- ALERT_TRAFFIC_LIGHT_WARNING("99996","红绿灯"),
+// ALERT_TRAFFIC_LIGHT_WARNING("99996","红绿灯"),
+ ALERT_TRAFFIC_LIGHT_WARNING("99996", StringUtils.getString(R.string.module_core_traffic_light)),
// 故障车辆
- ALERT_CAR_TROUBLE_WARNING("20007","故障车辆"),
+// ALERT_CAR_TROUBLE_WARNING("20007","故障车辆"),
+ ALERT_CAR_TROUBLE_WARNING("20007",StringUtils.getString(R.string.module_core_broken_down_vehicle)),
// 疲劳驾驶
ALERT_FATIGUE_DRIVING("99993"),
@@ -142,406 +180,577 @@ enum class EventTypeEnumNew(
//TODO 这个确认值
TYPE_USECASE_OPTIMAL_LANE(
0x2B06.toString(),
- "最优车道",
+// "最优车道",
+ StringUtils.getString(R.string.module_core_optimal_lane),
poiTypeSrcVr = R.drawable.v2x_icon_live_logo,
- content = "最优车道",
- tts = "最优车道"
+// content = "最优车道",
+ content = StringUtils.getString(R.string.module_core_optimal_lane),
+// tts = "最优车道"
+ tts = StringUtils.getString(R.string.module_core_optimal_lane)
),
//-------------obu v2v start ------------>
TYPE_USECASE_ID_FCW(
2010.toString(),
- "前向碰撞预警",
+// "前向碰撞预警",
+ StringUtils.getString(R.string.module_core_forward_collision_warning),
poiTypeSrcVr = R.drawable.icon_warning_v2x_collision_warning,
- content = "前车碰撞预警",
- tts = "小心前车"
+// content = "前车碰撞预警",
+ content = StringUtils.getString(R.string.module_core_front_collision_warning),
+// tts = "小心前车"
+ tts = StringUtils.getString(R.string.module_core_beware_of_front_vehicle)
),
TYPE_USECASE_ID_ICW(
2009.toString(),
- "交叉路口碰撞预警",
+// "交叉路口碰撞预警",
+ StringUtils.getString(R.string.module_core_intersection_collision_warning),
poiTypeSrcVr = R.drawable.icon_warning_v2x_crossroads_warning,
- content = "交叉路口碰撞预警",
- tts = "注意交叉路口车辆"
+// content = "交叉路口碰撞预警",
+ content = StringUtils.getString(R.string.module_core_intersection_collision_warning),
+// tts = "注意交叉路口车辆"
+ tts = StringUtils.getString(R.string.module_core_pay_attention_to_intersection_vehicles)
),
TYPE_USECASE_ID_LTA(
2001.toString(),
- "左转辅助",
+// "左转辅助",
+ StringUtils.getString(R.string.module_core_left_turn_assist),
poiTypeSrcVr = R.drawable.icon_warning_v2x_turn_left,
- content = "左转碰撞预警",
- tts = "注意路口对向来车"
+// content = "左转碰撞预警",
+ content = StringUtils.getString(R.string.module_core_left_turn_collision_warning),
+// tts = "注意路口对向来车"
+ tts = StringUtils.getString(R.string.module_core_pay_attention_to_oncoming_vehicles_at_intersection)
),
TYPE_USECASE_ID_BSW(
2002.toString(),
- "盲区预警",
+// "盲区预警",
+ StringUtils.getString(R.string.module_core_warning_blind_spot),
poiTypeSrcVr = R.drawable.icon_warning_v2x_blind_area_collision,
- content = "%s后盲区预警",
- tts = "注意%s后车辆"
+// content = "%s后盲区预警",
+ content = StringUtils.getString(R.string.module_core_rear_blind_spot_warning),
+// tts = "注意%s后车辆"
+ tts = StringUtils.getString(R.string.module_core_pay_attention_to_vehicles_behind)
),
TYPE_USECASE_ID_LCW(
2003.toString(),
- "变道预警",
+// "变道预警",
+ StringUtils.getString(R.string.module_core_lane_change_warning),
poiTypeSrcVr = R.drawable.icon_warning_v2x_changelanes,
- content = "%s向变道预警",
- tts = "注意%s后车辆"
+// content = "%s向变道预警",
+ content = StringUtils.getString(R.string.module_core_lane_change_warning1),
+// tts = "注意%s后车辆"
+ tts = StringUtils.getString(R.string.module_core_pay_attention_to_vehicles_behind)
),//注意左后车辆/注意右后车辆
TYPE_USECASE_ID_DNPW(
2004.toString(),
- "逆向超车预警",
+// "逆向超车预警",
+ StringUtils.getString(R.string.module_core_dnpw),
poiTypeSrcVr = R.drawable.icon_warning_v2x_reverse_overtaking,
- content = "逆向超车预警",
- tts = "注意对向来车"
+// content = "逆向超车预警",
+ content = StringUtils.getString(R.string.module_core_dnpw),
+// tts = "注意对向来车"
+ tts = StringUtils.getString(R.string.module_core_pay_attention_to_oncoming_vehicles)
),
TYPE_USECASE_ID_EBW(
2005.toString(),
- "紧急制动预警",
+// "紧急制动预警",
+ StringUtils.getString(R.string.module_core_ebw),
poiTypeSrcVr = R.drawable.icon_warning_v2x_emergency_brake,
- content = "前车急刹车",
- tts = "前车急刹车"
+// content = "前车急刹车",
+ content = StringUtils.getString(R.string.module_core_front_vehicle_sudden_braking),
+// tts = "前车急刹车"
+ tts = StringUtils.getString(R.string.module_core_front_vehicle_sudden_braking)
),
TYPE_USECASE_ID_AVW(
2006.toString(),
- "异常车辆提醒",
+// "异常车辆提醒",
+ StringUtils.getString(R.string.module_core_avw),
poiTypeSrcVr = R.drawable.icon_warning_v2x_abnormal_car,
- content = "%s车异常",
- tts = "小心%s异常车辆"
+// content = "%s车异常",
+ content = StringUtils.getString(R.string.module_core_avw_content),
+// tts = "小心%s异常车辆"
+ tts = StringUtils.getString(R.string.module_core_avw_tts)
),
TYPE_USECASE_ID_CLW(
2007.toString(),
- "车辆失控预警",
+// "车辆失控预警",
+ StringUtils.getString(R.string.module_core_clw),
poiTypeSrcVr = R.drawable.icon_warning_v2x_vehicle_control,
- content = "前%s失控预警",
- tts = "小心%s失控车辆"
+// content = "前%s失控预警",
+ content = StringUtils.getString(R.string.module_core_clw_content),
+// tts = "小心%s失控车辆"
+ tts = StringUtils.getString(R.string.module_core_clw_tts)
),
TYPE_USECASE_ID_EVW(
2008.toString(),
- "紧急车辆提醒",
+// "紧急车辆提醒",
+ StringUtils.getString(R.string.module_core_evw),
poiTypeSrcVr = R.drawable.icon_warning_v2x_special_vehicle_access,
- content = "注意特种车辆通行",
- tts = "请避让特种车辆"
+// content = "注意特种车辆通行",
+ content = StringUtils.getString(R.string.module_core_evw_content),
+// tts = "请避让特种车辆"
+ tts = StringUtils.getString(R.string.module_core_evw_tts)
),
//-------------obu v2v end ------------>
//---------弱势交通参与者 obu and cloud start ------>
TYPE_USECASE_ID_VRUCW_MOTOR_VEHICLES(
1001.toString(),
- "碰撞预警",
+// "碰撞预警",
+ StringUtils.getString(R.string.module_core_vrucw_motor_vehicles),
poiTypeSrcVr = R.drawable.icon_warning_v2x_motorcycle_collision,
- content = "前方机动车闯入",
- tts = "前方机动车闯入"
+// content = "前方机动车闯入",
+ content = StringUtils.getString(R.string.module_core_vrucw_motor_vehicles_content),
+// tts = "前方机动车闯入"
+ tts = StringUtils.getString(R.string.module_core_vrucw_motor_vehicles_content)
),
TYPE_USECASE_ID_VRUCW_NOT_MOTOR_VEHICLES(
1002.toString(),
- "碰撞预警",
+// "碰撞预警",
+ StringUtils.getString(R.string.module_core_vrucw_motor_vehicles),
poiTypeSrcVr = R.drawable.icon_warning_v2x_motobike,
- content = "前方非机动车闯入",
- tts = "前方非机动车闯入"
+// content = "前方非机动车闯入",
+ content = StringUtils.getString(R.string.module_core_vrucw_not_motor_vehicles_content),
+// tts = "前方非机动车闯入"
+ tts = StringUtils.getString(R.string.module_core_vrucw_not_motor_vehicles_content)
),
TYPE_USECASE_ID_VRUCW_PERSON(
1003.toString(),
- "碰撞预警",
+// "碰撞预警",
+ StringUtils.getString(R.string.module_core_vrucw_motor_vehicles),
poiTypeSrcVr = R.drawable.icon_warning_v2x_pedestrian_crossing,
- content = "前方路人闯入",
- tts = "前方路人闯入"
+// content = "前方路人闯入",
+ content = StringUtils.getString(R.string.module_core_vrucw_person_content),
+// tts = "前方路人闯入"
+ tts = StringUtils.getString(R.string.module_core_vrucw_person_content)
),
TYPE_ERROR_WEAKNESS(
1006.toString(),
- "未知障碍物",
+// "未知障碍物",
+ StringUtils.getString(R.string.module_core_error_weakness),
poiTypeSrcVr = R.drawable.icon_warning_v2x_abnormal_vehicle,
- content = "前方未知障碍物闯入",
- tts = "前方未知障碍物闯入"
+// content = "前方未知障碍物闯入",
+ content = StringUtils.getString(R.string.module_core_error_weakness_content),
+// tts = "前方未知障碍物闯入"
+ tts = StringUtils.getString(R.string.module_core_error_weakness_content)
),
//---------弱势交通参与者 obu and cloud end -------->
//--------------红绿灯 start ------->
TYPE_USECASE_ID_IVP_RED(
1666.toString(),
- "闯红灯预警",
+// "闯红灯预警",
+ StringUtils.getString(R.string.module_core_ivp_red),
poiTypeSrcVr = R.drawable.icon_warning_v2x_traffic_lights_red,
- content = "前方路口有闯红灯风险",
- tts = "有路口闯红灯风险，建议降低车速"
+// content = "前方路口有闯红灯风险",
+ content = StringUtils.getString(R.string.module_core_ivp_red_content),
+// tts = "有路口闯红灯风险，建议降低车速"
+ tts = StringUtils.getString(R.string.module_core_ivp_red_tts)
),
TYPE_USECASE_ID_IVP_GREEN(
1667.toString(),
- "绿波通行",
+// "绿波通行",
+ StringUtils.getString(R.string.module_core_ivp_green),
poiTypeSrcVr = R.drawable.icon_warning_v2x_traffic_lights_green,
- content = "建议车速 %s KM/H",
- tts = "建议车速 %s 千米每小时"
+// content = "建议车速 %s KM/H",
+ content = StringUtils.getString(R.string.module_core_ivp_green_content),
+// tts = "建议车速 %s 千米每小时"
+ tts = StringUtils.getString(R.string.module_core_ivp_green_tts)
),
//-------------红绿灯 end ---------->
//-----------道路危险情况预警 obu start --------------->
TYPE_USECASE_ID_BREAKDOWN_WARNING( //故障车辆
101.toString(),
- "车辆故障",
+// "车辆故障",
+ StringUtils.getString(R.string.module_core_breakdown_warning),
poiTypeSrcVr = R.drawable.icon_warning_v2x_car_breakdown,
- content = "前方%s米有故障车辆，影响路段%s米",
- tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您，前方%s米有故障车辆，影响路段%s米"
+// content = "前方%s米有故障车辆，影响路段%s米",
+ content = StringUtils.getString(R.string.module_core_breakdown_warning_content),
+// tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您，前方%s米有故障车辆，影响路段%s米"
+ tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}${StringUtils.getString(R.string.module_core_breakdown_warning_tts)}"
),
TYPE_FOURS_PONDING( //积水
407.toString(),
- "道路积水",
+// "道路积水",
+ StringUtils.getString(R.string.module_core_fours_ponding),
poiTypeSrcVr = R.drawable.v2x_icon_jishui_vr,
- content = "前方%s米道路积水，影响路段%s米",
- tts ="${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您，前方%s米道路积水，影响路段%s米"
+// content = "前方%s米道路积水，影响路段%s米",
+ content = StringUtils.getString(R.string.module_core_fours_ponding_content),
+// tts ="${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您，前方%s米道路积水，影响路段%s米"
+ tts ="${SkinResources.getInstance().getString(R.string.operation_platform_name)}${StringUtils.getString(R.string.module_core_fours_ponding_tts)}"
),
TYPE_USECASE_ID_ROAD_PARKING( //异常停车
412.toString(),
- "异常停车",
+// "异常停车",
+ StringUtils.getString(R.string.module_core_road_parking),
poiTypeSrcVr = R.drawable.icon_warning_v2x_no_parking,
- content = "前方%s米异常停车，影响路段%s米",
- tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您，前方%s米异常停车，影响路段%s米"
+// content = "前方%s米异常停车，影响路段%s米",
+ content = StringUtils.getString(R.string.module_core_road_parking_content),
+// tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您，前方%s米异常停车，影响路段%s米"
+ tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}${StringUtils.getString(R.string.module_core_road_parking_tts)}"
),
TYPE_USECASE_ID_TJW( //%d
707.toString(),
- "拥堵",
+// "拥堵",
+ StringUtils.getString(R.string.module_core_tjw),
poiTypeSrcVr = R.drawable.icon_warning_v2x_congestion,
- content = "前方%s米拥堵，影响路段%s米",
- tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您，前方%s米拥堵，影响路段%s米"
+// content = "前方%s米拥堵，影响路段%s米",
+ content = StringUtils.getString(R.string.module_core_tjw_content),
+// tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您，前方%s米拥堵，影响路段%s米"
+ tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}${StringUtils.getString(R.string.module_core_tjw_tts)}"
),
TYPE_USECASE_ID_SLW( //超速行驶
901.toString(),
- "超速行驶",
+// "超速行驶",
+ StringUtils.getString(R.string.module_core_slw),
poiTypeSrcVr = R.drawable.icon_warning_v2x_over_speed,
- content = "%s有车辆超速行驶",
- tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您，%s有车辆超速行驶"
+// content = "%s有车辆超速行驶",
+ content = StringUtils.getString(R.string.module_core_slw_content),
+// tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您，%s有车辆超速行驶"
+ tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}${StringUtils.getString(R.string.module_core_slw_tts)}"
),
TYPE_USECASE_ID_ROAD_VEHICLE_RETROGRADE( //车辆逆行
904.toString(),
- "逆行车辆",
+// "逆行车辆",
+ StringUtils.getString(R.string.module_core_road_vehicle_retrograde),
poiTypeSrcVr = R.drawable.icon_default,
- content = "前方%s米逆行车辆，影响路段%s米",
- tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您，前方%s米逆行车辆，影响路段%s米"
+// content = "前方%s米逆行车辆，影响路段%s米",
+ content = StringUtils.getString(R.string.module_core_road_vehicle_retrograde_content),
+// tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您，前方%s米逆行车辆，影响路段%s米"
+ tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}${StringUtils.getString(R.string.module_core_road_vehicle_retrograde_tts)}"
),
TYPE_USECASE_ID_ROAD_SPEED_LIMIT( //-->
6666.toString(),
- "超速",
+// "超速",
+ StringUtils.getString(R.string.module_core_road_speed_limit1),
poiTypeSrcVr = R.drawable.icon_warning_v2x_over_speed,
- content = "当前路段限速 %s KM/H，已超速",
- tts = "当前路段限速 %s 千米每小时，已超速"
+// content = "当前路段限速 %s KM/H，已超速",
+ content = StringUtils.getString(R.string.module_core_road_speed_limit1_content),
+// tts = "当前路段限速 %s 千米每小时，已超速"
+ tts = StringUtils.getString(R.string.module_core_road_speed_limit1_tts)
),
//------------道路危险情况预警 obu end ----------->
//------------车内标牌 obu start -------------->
TYPE_ID_SHAPR_TURNS(
2.toString(),
- "急转弯",
+// "急转弯",
+ StringUtils.getString(R.string.module_core_shapr_turns),
poiTypeSrcVr = R.drawable.icon_warning_v2x_turn_left_sharp,
- content = "前方%s米急转弯",
- tts = "前方%s米急转弯"
+// content = "前方%s米急转弯",
+ content = StringUtils.getString(R.string.module_core_shapr_turns_content),
+// tts = "前方%s米急转弯"
+ tts = StringUtils.getString(R.string.module_core_shapr_turns_tts)
),
TYPE_ID_BRIDGE(
8.toString(),
- "桥梁",
+// "桥梁",
+ StringUtils.getString(R.string.module_core_bridge),
poiTypeSrcVr = R.drawable.icon_warning_v2x_hump_bridge,
- content = "前方%s米桥梁",
- tts = "前方%s米桥梁"
+// content = "前方%s米桥梁",
+ content = StringUtils.getString(R.string.module_core_bridge_content),
+// tts = "前方%s米桥梁"
+ tts = StringUtils.getString(R.string.module_core_bridge_content)
),
TYPE_ID_PEDESTRIAN(
10.toString(),
- "路人",
+// "路人",
+ StringUtils.getString(R.string.module_core_pedestrian1),
poiTypeSrcVr = R.drawable.icon_warning_v2x_pedestrian_crossing,
- content = "前方%s米路人",
- tts = "前方%s米路人"
+// content = "前方%s米路人",
+ content = StringUtils.getString(R.string.module_core_pedestrian1_content),
+// tts = "前方%s米路人"
+ tts = StringUtils.getString(R.string.module_core_pedestrian1_content)
),
TYPE_ID_SLIPPERY_ROAD(
17.toString(),
- "路滑",
+// "路滑",
+ StringUtils.getString(R.string.module_core_slippery_road),
poiTypeSrcVr = R.drawable.v2x_icon_jiebing_vr,
- content = "前方%s米路滑",
- tts = "前方%s米路滑"
+// content = "前方%s米路滑",
+ content = StringUtils.getString(R.string.module_core_slippery_road_content),
+// tts = "前方%s米路滑"
+ tts = StringUtils.getString(R.string.module_core_slippery_road_content)
),
TYPE_ID_TUNNEL(
21.toString(),
- "隧道",
+// "隧道",
+ StringUtils.getString(R.string.module_core_tunnel),
poiTypeSrcVr = R.drawable.icon_default,
- content = "前方%s米隧道",
- tts = "前方%s米隧道"
+// content = "前方%s米隧道",
+ content = StringUtils.getString(R.string.module_core_tunnel_content),
+// tts = "前方%s米隧道"
+ tts = StringUtils.getString(R.string.module_core_tunnel_content)
),
TYPE_ID_FERRY(
22.toString(),
- "渡轮",
+// "渡轮",
+ StringUtils.getString(R.string.module_core_ferry),
poiTypeSrcVr = R.drawable.icon_default,
- content = "前方%s米渡轮",
- tts = "前方%s米渡轮"
+// content = "前方%s米渡轮",
+ content = StringUtils.getString(R.string.module_core_ferry_content),
+// tts = "前方%s米渡轮"
+ tts = StringUtils.getString(R.string.module_core_ferry_content)
),
TYPE_ID_UNEVEN_ROAD(
24.toString(),
- "路面不平",
+// "路面不平",
+ StringUtils.getString(R.string.module_core_uneven_road),
poiTypeSrcVr = R.drawable.icon_warning_road_hollow,
- content = "前方%s米路面不平",
- tts = "前方%s米路面不平"
+// content = "前方%s米路面不平",
+ content = StringUtils.getString(R.string.module_core_uneven_road_content),
+// tts = "前方%s米路面不平"
+ tts = StringUtils.getString(R.string.module_core_uneven_road_content)
),
TYPE_ID_NON_MOTOR_VEHICLE(
32.toString(),
- "非机动车",
+// "非机动车",
+ StringUtils.getString(R.string.module_core_non_motor_vehicle),
poiTypeSrcVr = R.drawable.icon_warning_v2x_motobike,
- content = "前方%s米有非机动车",
- tts = "前方%s米有非机动车"
+// content = "前方%s米有非机动车",
+ content = StringUtils.getString(R.string.module_core_non_motor_vehicle_content),
+// tts = "前方%s米有非机动车"
+ tts = StringUtils.getString(R.string.module_core_non_motor_vehicle_content)
),
TYPE_ID_OBSTACLE(
36.toString(),
- "障碍",
+// "障碍",
+ StringUtils.getString(R.string.module_core_obstacle),
poiTypeSrcVr = R.drawable.icon_default,
- content = "前方%s米障碍",
- tts = "前方%s米障碍"
+// content = "前方%s米障碍",
+ content = StringUtils.getString(R.string.module_core_obstacle_content),
+// tts = "前方%s米障碍"
+ tts = StringUtils.getString(R.string.module_core_obstacle_content)
),
TYPE_FOURS_ROAD_WORK(
38.toString(),
- "施工",
+// "施工",
+ StringUtils.getString(R.string.module_core_road_work),
poiTypeSrcVr = R.drawable.icon_warning_v2x_road_construction,
- content = "前方%s米施工",
- tts = "前方%s米施工"
+// content = "前方%s米施工",
+ content = StringUtils.getString(R.string.module_core_road_work_content),
+// tts = "前方%s米施工"
+ tts = StringUtils.getString(R.string.module_core_road_work_content)
),
TYPE_VEHICLE_QUEUE(
47.toString(),
- "车队",
+// "车队",
+ StringUtils.getString(R.string.module_core_vehicle_queue),
poiTypeSrcVr = R.drawable.icon_default,
- content = "前方%s米车队",
- tts = "前方%s米车队"
+// content = "前方%s米车队",
+ content = StringUtils.getString(R.string.module_core_vehicle_queue_content),
+// tts = "前方%s米车队"
+ tts = StringUtils.getString(R.string.module_core_vehicle_queue_content)
),
TYPE_NO_PASSING(
51.toString(),
- "道路不通",
+// "道路不通",
+ StringUtils.getString(R.string.module_core_no_passing),
poiTypeSrcVr = R.drawable.v2x_icon_fenglu_vr,
- content = "前方%s米不通",
- tts = "前方%s米不通"
+// content = "前方%s米不通",
+ content = StringUtils.getString(R.string.module_core_no_passing_content),
+// tts = "前方%s米不通"
+ tts = StringUtils.getString(R.string.module_core_no_passing_content)
),
TYPE_NO_TURNING_AROUND(
75.toString(),
- "禁止掉头",
+// "禁止掉头",
+ StringUtils.getString(R.string.module_core_no_turning_around),
poiTypeSrcVr = R.drawable.icon_default,
- content = "前方%s米禁止掉头",
- tts = "前方%s米禁止掉头"
+// content = "前方%s米禁止掉头",
+ content = StringUtils.getString(R.string.module_core_no_turning_around_content),
+// tts = "前方%s米禁止掉头"
+ tts = StringUtils.getString(R.string.module_core_no_turning_around_content)
),
TYPE_USECASE_ID_ROAD_NO_PARKING(
78.toString(),
- "禁止停车",
+// "禁止停车",
+ StringUtils.getString(R.string.module_core_road_no_parking),
poiTypeSrcVr = R.drawable.icon_warning_v2x_no_parking,
- content = "前方%s米有禁停路段",
- tts = "前方%s米有禁停路段"
+// content = "前方%s米有禁停路段",
+ content = StringUtils.getString(R.string.module_core_road_no_parking_content),
+// tts = "前方%s米有禁停路段"
+ tts = StringUtils.getString(R.string.module_core_road_no_parking_content)
),
TYPE_USECASE_ID_ROAD_NO_TOOTING(
80.toString(),
- "禁止鸣笛",
+// "禁止鸣笛",
+ StringUtils.getString(R.string.module_core_road_no_tooting),
poiTypeSrcVr = R.drawable.icon_warning_v2x_no_tooting,
- content = "前方%s米禁止鸣笛",
- tts = "前方%s米禁止鸣笛"
+// content = "前方%s米禁止鸣笛",
+ content = StringUtils.getString(R.string.module_core_road_no_tooting_content),
+// tts = "前方%s米禁止鸣笛"
+ tts = StringUtils.getString(R.string.module_core_road_no_tooting_content)
),
TYPE_USECASE_ID_BUS_WARNING(
123.toString(),
- "公交提醒",
+// "公交提醒",
+ StringUtils.getString(R.string.module_core_bus_warning),
poiTypeSrcVr = R.drawable.icon_warning_v2x_tramcar,
- content = "前方%s米公交提醒",
- tts = "前方%s米公交提醒"
+// content = "前方%s米公交提醒",
+ content = StringUtils.getString(R.string.module_core_bus_warning_content),
+// tts = "前方%s米公交提醒"
+ tts = StringUtils.getString(R.string.module_core_bus_warning_content)
),
TYPE_USECASE_ID_NARROW_RIGHT(
163.toString(),
- "右侧变窄/车道数减少",
+// "右侧变窄/车道数减少",
+ StringUtils.getString(R.string.module_core_narrow_right),
poiTypeSrcVr = R.drawable.icon_default,
- content = "前方%s米右侧变窄/车道数减少",
- tts = "前方%s米右侧变窄/车道数减少"
+// content = "前方%s米右侧变窄/车道数减少",
+ content = StringUtils.getString(R.string.module_core_narrow_right_content),
+// tts = "前方%s米右侧变窄/车道数减少"
+ tts = StringUtils.getString(R.string.module_core_narrow_right_content)
),
TYPE_USECASE_ID_GAS_STATION(
201.toString(),
- "加油站",
+// "加油站",
+ StringUtils.getString(R.string.module_core_gas_station),
poiTypeSrcVr = R.drawable.icon_warning_gas_station,
- content = "前方%s米加油站",
- tts = "前方%s米加油站"
+// content = "前方%s米加油站",
+ content = StringUtils.getString(R.string.module_core_gas_station_content),
+// tts = "前方%s米加油站"
+ tts = StringUtils.getString(R.string.module_core_gas_station_content)
),
TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL(
242.toString(),
- "学校",
+// "学校",
+ StringUtils.getString(R.string.module_core_school),
poiTypeSrcVr = R.drawable.icon_warning_v2x_school,
- content = "前方%s米学校",
- tts = "前方%s米学校"
+// content = "前方%s米学校",
+ content = StringUtils.getString(R.string.module_core_school_content),
+// tts = "前方%s米学校"
+ tts = StringUtils.getString(R.string.module_core_school_content)
),
TYPE_USECASE_ID_ACCIDENT(
244.toString(),
- "交通事故",
+// "交通事故",
+ StringUtils.getString(R.string.module_core_accident),
poiTypeSrcVr = R.drawable.v2x_icon_jiaotongshigu_vr,
- content = "前方%s米交通事故",
- tts = "前方%s米交通事故"
+// content = "前方%s米交通事故",
+ content = StringUtils.getString(R.string.module_core_accident_content),
+// tts = "前方%s米交通事故"
+ tts = StringUtils.getString(R.string.module_core_accident_content)
),
TYPE_USECASE_ROAD_BUS_STATION(
245.toString(),
- "通过公交站",
+// "通过公交站",
+ StringUtils.getString(R.string.module_core_bus_station),
poiTypeSrcVr = R.drawable.icon_v2x_bus_station_driver,
- content = "前方%s米有公交站",
- tts = "前方%s米有公交站"
+// content = "前方%s米有公交站",
+ content = StringUtils.getString(R.string.module_core_bus_station_content),
+// tts = "前方%s米有公交站"
+ tts = StringUtils.getString(R.string.module_core_bus_station_content)
),
TYPE_ATTENTION_CONFLUENCE(
44.toString(),
- "前方车辆汇流",
+// "前方车辆汇流",
+ StringUtils.getString(R.string.module_core_attention_confluence),
poiTypeSrcVr = R.drawable.icon_warning_v2x_attention_confluence,
- content = "前方%s米注意车辆汇入",
- tts = "前方%s米注意车辆汇入"
+// content = "前方%s米注意车辆汇入",
+ content = StringUtils.getString(R.string.module_core_attention_confluence_content),
+// tts = "前方%s米注意车辆汇入"
+ tts = StringUtils.getString(R.string.module_core_attention_confluence_content)
),
TYPE_PEDESTRIAN_CROSSING(
114.toString(),
- "人行横道",
+// "人行横道",
+ StringUtils.getString(R.string.module_core_pedestrian_crossing),
poiTypeSrcVr = R.drawable.icon_warning_v2x_person,
- content = "前方%s米人行横道",
- tts = "前方%s米人行横道"
+// content = "前方%s米人行横道",
+ content = StringUtils.getString(R.string.module_core_pedestrian_crossing_content),
+// tts = "前方%s米人行横道"
+ tts = StringUtils.getString(R.string.module_core_pedestrian_crossing_content)
),
//------------车内标牌 obu end -------------->
TYPE_SOCKET_ROAD_CONGESTION(
"100071",
- "交通拥堵",
+// "交通拥堵",
+ StringUtils.getString(R.string.module_core_socket_road_congestion),
poiTypeSrcVr = R.drawable.v2x_icon_yongdu_vr,
- content = "前方%s米交通拥堵",
- tts = "前方%s米交通拥堵, ${SkinResources.getInstance().getString(R.string.operation_platform_name)}提醒您注意观察小心通过"
+// content = "前方%s米交通拥堵",
+ content = StringUtils.getString(R.string.module_core_socket_road_congestion_content),
+// tts = "前方%s米交通拥堵, ${SkinResources.getInstance().getString(R.string.operation_platform_name)}提醒您注意观察小心通过"
+ tts = "${StringUtils.getString(R.string.module_core_socket_road_congestion_tts)}${
+ SkinResources.getInstance().getString(R.string.operation_platform_name)
+ }${StringUtils.getString(R.string.module_core_socket_road_end_tts)}"
),
TYPE_SOCKET_ROAD_JINGZHI(
"100251",
- "静止障碍物占道",
+// "静止障碍物占道",
+ StringUtils.getString(R.string.module_core_road_jingzhi),
poiTypeSrcVr = R.drawable.v2x_icon_jingzhi_zhangai,
- content = "前方%s米静止障碍物占道",
- tts = "前方%s米静止障碍物占道, ${SkinResources.getInstance().getString(R.string.operation_platform_name)}提醒您注意观察小心通过"
+// content = "前方%s米静止障碍物占道",
+ content = StringUtils.getString(R.string.module_core_road_jingzhi_content),
+// tts = "前方%s米静止障碍物占道, ${SkinResources.getInstance().getString(R.string.operation_platform_name)}提醒您注意观察小心通过"
+ tts = "${StringUtils.getString(R.string.module_core_road_jingzhi_tts)}${
+ SkinResources.getInstance().getString(R.string.operation_platform_name)
+ }${StringUtils.getString(R.string.module_core_socket_road_end_tts)}"
),
TYPE_SOCKET_ROAD_SHIGU(
"100321",
- "道路事故",
+// "道路事故",
+ StringUtils.getString(R.string.module_core_road_accident),
poiTypeSrcVr = R.drawable.v2x_icon_shigu_sanjiaopai,
- content = "前方%s米道路事故",
- tts = "前方%s米道路事故,${SkinResources.getInstance().getString(R.string.operation_platform_name)}提醒您注意观察小心通过"
+// content = "前方%s米道路事故",
+ content = StringUtils.getString(R.string.module_core_road_shigu_content),
+// tts = "前方%s米道路事故,${SkinResources.getInstance().getString(R.string.operation_platform_name)}提醒您注意观察小心通过"
+ tts = "${StringUtils.getString(R.string.module_core_road_shigu_tts)}${
+ SkinResources.getInstance().getString(R.string.operation_platform_name)
+ }${StringUtils.getString(R.string.module_core_socket_road_end_tts)}"
),
TYPE_SOCKET_ROAD_SHIGONG(
"100061",
- "道路施工",
+// "道路施工",
+ StringUtils.getString(R.string.module_core_road_construction),
poiTypeSrcVr = R.drawable.v2x_icon_shigong_zhandao,
- content = "前方%s米道路施工",
- tts = "前方%s米道路施工,${SkinResources.getInstance().getString(R.string.operation_platform_name)}提醒您注意观察小心通过"
+// content = "前方%s米道路施工",
+ content = StringUtils.getString(R.string.module_core_road_shigong_content),
+// tts = "前方%s米道路施工,${SkinResources.getInstance().getString(R.string.operation_platform_name)}提醒您注意观察小心通过"
+ tts = "${StringUtils.getString(R.string.module_core_road_shigong_tts)}${
+ SkinResources.getInstance().getString(R.string.operation_platform_name)
+ }${StringUtils.getString(R.string.module_core_socket_road_end_tts)}"
),
TYPE_SOCKET_ROAD_OTHER_RETROGRADE_VEHICLE(
"100062",
- "他车倒车/逆行",
+// "他车倒车/逆行",
+ StringUtils.getString(R.string.module_core_road_other_retrograde_vehicle),
poiTypeSrcVr = R.drawable.icon_v2x_other_retrograde_vehicle_driver,
- content = "前方%s米有他车倒车或逆行",
- tts = "前方有异常车辆"
+// content = "前方%s米有他车倒车或逆行",
+ content = StringUtils.getString(R.string.module_core_road_other_retrograde_vehicle_content),
+// tts = "前方有异常车辆"
+ tts = StringUtils.getString(R.string.module_core_road_other_retrograde_vehicle_tts)
),
TYPE_SOCKET_ROAD_GREE_WAVE(
"100063",
- "绿波通行",
+// "绿波通行",
+ StringUtils.getString(R.string.module_core_road_gree_wave),
poiTypeSrcVr = View.NO_ID,
- content = "保持当前车速即可通过路口，好丝滑！",
- tts = "保持当前车速即可通过路口，好丝滑！"
+// content = "保持当前车速即可通过路口，好丝滑！",
+ content = StringUtils.getString(R.string.module_core_road_gree_wave_content),
+// tts = "保持当前车速即可通过路口，好丝滑！"
+ tts = StringUtils.getString(R.string.module_core_road_gree_wave_content)
),
TYPE_SOCKET_ROAD_PEOPLE_CROSS(
"100064",
- "行人横穿",
+// "行人横穿",
+ StringUtils.getString(R.string.module_core_road_people_cross),
poiTypeSrcVr = View.NO_ID,
- content = "前方%s米有行人/非机动车横穿",
- tts = "前方有行人或非机动车横穿"
+// content = "前方%s米有行人/非机动车横穿",
+ content = StringUtils.getString(R.string.module_core_road_people_cross_content),
+// tts = "前方有行人或非机动车横穿"
+ tts = StringUtils.getString(R.string.module_core_road_people_cross_tts)
),
TYPE_ERROR(
0.toString(),
- "未知/错误/异常",
+// "未知/错误/异常",
+ StringUtils.getString(R.string.module_core_socket_error),
poiTypeSrcVr = R.drawable.icon_warning_v2x_abnormal_vehicle,
content = "",
tts = ""
@@ -551,54 +760,75 @@ enum class EventTypeEnumNew(
//无法接管
TYPE_UNABLE_TAKEOVER(
"UNABLE_TAKEOVER",
- "平行驾驶无法接管",
- "远程无法介入，注意随时接管!可尝试重启app",
+// "平行驾驶无法接管",
+ StringUtils.getString(R.string.module_core_unable_takeover),
+// "远程无法介入，注意随时接管!可尝试重启app",
+ StringUtils.getString(R.string.module_core_unable_takeover_content),
R.drawable.icon_warning_take_over,
- "远程无法介入，注意随时接管!可尝试重启app",
- "远程无法介入，注意随时接管!可尝试重启app"
+// "远程无法介入，注意随时接管!可尝试重启app",
+ StringUtils.getString(R.string.module_core_unable_takeover_content),
+// "远程无法介入，注意随时接管!可尝试重启app"
+ StringUtils.getString(R.string.module_core_unable_takeover_content)
),
//同步异常结束
TYPE_EXCEPTION_EXIT_SYNC(
"EXCEPTION_EXIT_SYNC",
- "同步异常结束",
- "远程介入失败，注意随时接管!",
+// "同步异常结束",
+ StringUtils.getString(R.string.module_core_exception_exit_sync),
+// "远程介入失败，注意随时接管!",
+ StringUtils.getString(R.string.module_core_exception_exit_sync_content),
R.drawable.icon_warning_take_over,
- "远程介入失败，注意随时接管!",
- "远程介入失败，注意随时接管!"
+// "远程介入失败，注意随时接管!",
+ StringUtils.getString(R.string.module_core_exception_exit_sync_content),
+// "远程介入失败，注意随时接管!"
+ StringUtils.getString(R.string.module_core_exception_exit_sync_content)
),
//异常请人工驾驶
TYPE_PARALLEL_EXCEPTION_MANUAL_DRIVING(
"PARALLEL_EXCEPTION_MANUAL_DRIVING",
- "异常请人工驾驶",
- "即将靠边停车，注意随时接管!",
+// "异常请人工驾驶",
+ StringUtils.getString(R.string.module_core_parallel_exception_manual_driving),
+// "即将靠边停车，注意随时接管!",
+ StringUtils.getString(R.string.module_core_parallel_exception_manual_driving_content),
R.drawable.icon_warning_take_over,
- "即将靠边停车，注意随时接管!",
- "即将靠边停车，注意随时接管!"
+// "即将靠边停车，注意随时接管!",
+ StringUtils.getString(R.string.module_core_parallel_exception_manual_driving_content),
+// "即将靠边停车，注意随时接管!"
+ StringUtils.getString(R.string.module_core_parallel_exception_manual_driving_content)
),
//平行驾驶异常结束
TYPE_EXCEPTION_EXIT_PARALLEL_DRIVING(
"EXCEPTION_EXIT_PARALLEL_DRIVING",
- "平行驾驶异常结束",
- "可能应急停车，注意随时接管!",
+// "平行驾驶异常结束",
+ StringUtils.getString(R.string.module_core_exception_exit_parallel_driving),
+// "可能应急停车，注意随时接管!",
+ StringUtils.getString(R.string.module_core_exception_exit_parallel_driving_content),
R.drawable.icon_warning_take_over,
- "可能应急停车，注意随时接管!",
- "可能应急停车，注意随时接管!"
+// "可能应急停车，注意随时接管!",
+ StringUtils.getString(R.string.module_core_exception_exit_parallel_driving_content),
+// "可能应急停车，注意随时接管!"
+ StringUtils.getString(R.string.module_core_exception_exit_parallel_driving_content)
),
//核销成功
TYPE_VERIFICATION_SUCCESSFUL(
"VERIFICATION_SUCCESSFUL",
- "验票成功",
- "%s张%s票（如全程票）",
+// "验票成功",
+ StringUtils.getString(R.string.module_core_verification_successful),
+// "%s张%s票（如全程票）",
+ StringUtils.getString(R.string.module_core_verification_successful_content),
R.drawable.icon_warning_v2x_verification_successful,
- "%s张%s票（如全程票）",
- "%s张%s票（如全程票）"
+// "%s张%s票（如全程票）",
+ StringUtils.getString(R.string.module_core_verification_successful_content),
+// "%s张%s票（如全程票）"
+ StringUtils.getString(R.string.module_core_verification_successful_content)
),
//核销异常
TYPE_ABNORMAL_VERIFICATION(
"ABNORMAL_VERIFICATION",
- "核销失败",
+// "核销失败",
+ StringUtils.getString(R.string.module_core_abnormal_verification),
"%s",
R.drawable.icon_warning_take_over,
"%s",
@@ -608,63 +838,121 @@ enum class EventTypeEnumNew(
//设备状态正常
TYPE_DEVICE_STATUS_NORMAL(
"DEVICE_STATUS_NORMAL",
- "核销设备正常",
- "详情%s",
+// "核销设备正常",
+ StringUtils.getString(R.string.module_core_device_status_normal),
+// "详情%s",
+ StringUtils.getString(R.string.module_core_device_status_normal_content),
R.drawable.icon_warning_v2x_verification_successful,
- "详情%s",
- "详情%s"
+// "详情%s",
+ StringUtils.getString(R.string.module_core_device_status_normal_content),
+// "详情%s"
+ StringUtils.getString(R.string.module_core_device_status_normal_content)
),
//设备状态异常
TYPE_DEVICE_STATUS_ABNORMAL(
"DEVICE_STATUS_ABNORMAL",
- "核销设备异常",
- "详情%s",
+// "核销设备异常",
+ StringUtils.getString(R.string.module_core_device_status_abnormal),
+// "详情%s",
+ StringUtils.getString(R.string.module_core_device_status_normal_content),
R.drawable.icon_default,
- "详情%s",
- "详情%s"
+// "详情%s",
+ StringUtils.getString(R.string.module_core_device_status_normal_content),
+// "详情%s"
+ StringUtils.getString(R.string.module_core_device_status_normal_content)
),
TYPE_POWER_OFF_TIP("POWER_OFF_TIP",
- "一键停服",
- "请等待1分钟再执行车辆下电",
+// "一键停服",
+ StringUtils.getString(R.string.module_core_power_off_tip),
+// "请等待1分钟再执行车辆下电",
+ StringUtils.getString(R.string.module_core_power_off_tip_content),
R.drawable.icon_warning_take_over,
- "请等待1分钟再执行车辆下电",
- "请等待1分钟再执行车辆下电"),
+// "请等待1分钟再执行车辆下电",
+ StringUtils.getString(R.string.module_core_power_off_tip_content),
+// "请等待1分钟再执行车辆下电"),
+ StringUtils.getString(R.string.module_core_power_off_tip_content)),
- TYPE_VIP_IDENTIFICATION_PASS("20022", "VIP通行", "", R.drawable.icon_warning_v2x_vip_turn_light, "VIP车辆优先通行，已为您变为绿灯", "VIP车辆优先通行，已为您变为绿灯"),
- TYPE_VIP_IDENTIFICATION_EXTEND("20023", "VIP通行", "", R.drawable.icon_warning_v2x_vip_turn_light, "VIP车辆优先通行，已为您延长绿灯", "VIP车辆优先通行，已为您延长绿灯"),
- TYPE_VIP_ERROR_IDENTIFICATION("20024", "VIP通行", "", R.drawable.icon_warning_v2x_vip_turn_light, "请求失败，", "请求失败,稍后重试"),
- TYPE_OPTIMAL_ROUTE_RECOMMEND("2000", "路线推荐", "", R.drawable.icon_warning_v2x_optimal_route, "为您推荐最优路线", "已为您选择最优路线"),
+// TYPE_VIP_IDENTIFICATION_PASS("20022", "VIP通行", "", R.drawable.icon_warning_v2x_vip_turn_light, "VIP车辆优先通行，已为您变为绿灯", "VIP车辆优先通行，已为您变为绿灯"),
+ TYPE_VIP_IDENTIFICATION_PASS(
+ "20022",
+ StringUtils.getString(R.string.module_core_vip_identification_pass),
+ "",
+ R.drawable.icon_warning_v2x_vip_turn_light,
+ StringUtils.getString(R.string.module_core_vip_identification_pass_content),
+ StringUtils.getString(R.string.module_core_vip_identification_pass_content)),
+// TYPE_VIP_IDENTIFICATION_EXTEND("20023", "VIP通行", "", R.drawable.icon_warning_v2x_vip_turn_light, "VIP车辆优先通行，已为您延长绿灯", "VIP车辆优先通行，已为您延长绿灯"),
+ TYPE_VIP_IDENTIFICATION_EXTEND(
+ "20023",
+ StringUtils.getString(R.string.module_core_vip_identification_pass),
+ "",
+ R.drawable.icon_warning_v2x_vip_turn_light,
+ StringUtils.getString(R.string.module_core_vip_identification_extend_content),
+ StringUtils.getString(R.string.module_core_vip_identification_extend_content)),
+// TYPE_VIP_ERROR_IDENTIFICATION("20024", "VIP通行", "", R.drawable.icon_warning_v2x_vip_turn_light, "请求失败，", "请求失败,稍后重试"),
+ TYPE_VIP_ERROR_IDENTIFICATION(
+ "20024",
+ StringUtils.getString(R.string.module_core_vip_identification_pass),
+ "",
+ R.drawable.icon_warning_v2x_vip_turn_light,
+ StringUtils.getString(R.string.module_core_vip_error_identification_content),
+ StringUtils.getString(R.string.module_core_vip_error_identification_tts)),
+// TYPE_OPTIMAL_ROUTE_RECOMMEND("2000", "路线推荐", "", R.drawable.icon_warning_v2x_optimal_route, "为您推荐最优路线", "已为您选择最优路线"),
+ TYPE_OPTIMAL_ROUTE_RECOMMEND(
+ "2000",
+ StringUtils.getString(R.string.module_core_optimal_route_recommend),
+ "",
+ R.drawable.icon_warning_v2x_optimal_route,
+ StringUtils.getString(R.string.module_core_optimal_route_recommend_content),
+ StringUtils.getString(R.string.module_core_optimal_route_recommend_tts)),
//蘑方指令下发时，工控机与pad断连提示
- TYPE_IPC_DISCONNECT_FOR_MO_FANG("20025", "连接异常", "", R.drawable.icon_warning_take_over, "工控机连接异常，无法执行魔方命令", ""),
+// TYPE_IPC_DISCONNECT_FOR_MO_FANG("20025", "连接异常", "", R.drawable.icon_warning_take_over, "工控机连接异常，无法执行魔方命令", ""),
+ TYPE_IPC_DISCONNECT_FOR_MO_FANG(
+ "20025",
+ StringUtils.getString(R.string.module_core_ipc_disconnect_for_mo_fang),
+ "",
+ R.drawable.icon_warning_take_over,
+ StringUtils.getString(R.string.module_core_ipc_disconnect_for_mo_fang_content), ""),
//-----------云控基础平台 start-------------
//绿波车速引导
- CLOUD_GREEN_WAVE_SPEED("81002","绿波车速引导","",R.drawable.icon_warning_v2x_traffic_lights_green,"",""),
+// CLOUD_GREEN_WAVE_SPEED("81002","绿波车速引导","",R.drawable.icon_warning_v2x_traffic_lights_green,"",""),
+ CLOUD_GREEN_WAVE_SPEED("81002",StringUtils.getString(R.string.module_core_cloud_green_wave_speed),"",R.drawable.icon_warning_v2x_traffic_lights_green,"",""),
//闯红灯预警
- CLOUD_RED_LIGHT_WARN("81003","闯红灯预警","",R.drawable.icon_warning_v2x_traffic_lights_red,"",""),
+// CLOUD_RED_LIGHT_WARN("81003","闯红灯预警","",R.drawable.icon_warning_v2x_traffic_lights_red,"",""),
+ CLOUD_RED_LIGHT_WARN("81003",StringUtils.getString(R.string.module_core_run_red_light_sop),"",R.drawable.icon_warning_v2x_traffic_lights_red,"",""),
//行驶车道建议
- CLOUD_SUGGEST_DRIVE_LANE("81004","行驶车道建议","",R.drawable.icon_default,"",""),
+// CLOUD_SUGGEST_DRIVE_LANE("81004","行驶车道建议","",R.drawable.icon_default,"",""),
+ CLOUD_SUGGEST_DRIVE_LANE("81004",StringUtils.getString(R.string.module_core_cloud_suggest_drive_lane),"",R.drawable.icon_default,"",""),
//交通拥堵提醒
- CLOUD_TRAFFIC_REMIND("81005","交通拥堵提醒","",R.drawable.v2x_icon_yongdu_vr,"",""),
+// CLOUD_TRAFFIC_REMIND("81005","交通拥堵提醒","",R.drawable.v2x_icon_yongdu_vr,"",""),
+ CLOUD_TRAFFIC_REMIND("81005",StringUtils.getString(R.string.module_core_cloud_traffic_remind),"",R.drawable.v2x_icon_yongdu_vr,"",""),
//紧急车辆优先通行
- CLOUD_PRIORITY_VEHICLE("81006","紧急车辆优先通行","",R.drawable.icon_warning_v2x_special_vehicle_access,"",""),
+// CLOUD_PRIORITY_VEHICLE("81006","紧急车辆优先通行","",R.drawable.icon_warning_v2x_special_vehicle_access,"",""),
+ CLOUD_PRIORITY_VEHICLE("81006",StringUtils.getString(R.string.module_core_cloud_priority_vehicle),"",R.drawable.icon_warning_v2x_special_vehicle_access,"",""),
//道路危险状况提示
- CLOUD_DANGEROUS_ROAD_WARN("81007","道路危险状况","",R.drawable.icon_warning_v2x_car_breakdown,"",""),
+// CLOUD_DANGEROUS_ROAD_WARN("81007","道路危险状况","",R.drawable.icon_warning_v2x_car_breakdown,"",""),
+ CLOUD_DANGEROUS_ROAD_WARN("81007",StringUtils.getString(R.string.module_core_cloud_dangerous_road_warn),"",R.drawable.icon_warning_v2x_car_breakdown,"",""),
//动态限速信息
- CLOUD_LIMIT_SPEED("81008","动态限速信息","",R.drawable.icon_warning_v2x_over_speed,"",""),
+// CLOUD_LIMIT_SPEED("81008","动态限速信息","",R.drawable.icon_warning_v2x_over_speed,"",""),
+ CLOUD_LIMIT_SPEED("81008",StringUtils.getString(R.string.module_core_cloud_limit_speed),"",R.drawable.icon_warning_v2x_over_speed,"",""),
//超视距弱势交通参与者提醒
- CLOUD_BEYOND_VISUAL_RANGE("81009","弱势交通参与者提醒","",R.drawable.icon_default,"",""),
+// CLOUD_BEYOND_VISUAL_RANGE("81009","弱势交通参与者提醒","",R.drawable.icon_default,"",""),
+ CLOUD_BEYOND_VISUAL_RANGE("81009",StringUtils.getString(R.string.module_core_cloud_beyond_visual_range),"",R.drawable.icon_default,"",""),
//路口其他车辆闯红灯预警
- CLOUD_OTHER_VEHICLE_RED_LIGHT_WARN("81010","路口他车闯红灯","",R.drawable.icon_warning_v2x_traffic_lights_red,"",""),
+// CLOUD_OTHER_VEHICLE_RED_LIGHT_WARN("81010","路口他车闯红灯","",R.drawable.icon_warning_v2x_traffic_lights_red,"",""),
+ CLOUD_OTHER_VEHICLE_RED_LIGHT_WARN("81010",StringUtils.getString(R.string.module_core_cloud_other_vehicle_red_light_warn),"",R.drawable.icon_warning_v2x_traffic_lights_red,"",""),
//障碍物(路面遗撒)预警
- CLOUD_OBSTACLE_WARN("81011","障碍物预警","",R.drawable.icon_warning_v2x_abnormal_vehicle,"",""),
+// CLOUD_OBSTACLE_WARN("81011","障碍物预警","",R.drawable.icon_warning_v2x_abnormal_vehicle,"",""),
+ CLOUD_OBSTACLE_WARN("81011",StringUtils.getString(R.string.module_core_cloud_obstacle_warn),"",R.drawable.icon_warning_v2x_abnormal_vehicle,"",""),
//能见度预警
- CLOUD_VISIBILITY_WARN("81012","能见度预警","",R.drawable.icon_warning_take_over,"",""),
+// CLOUD_VISIBILITY_WARN("81012","能见度预警","",R.drawable.icon_warning_take_over,"",""),
+ CLOUD_VISIBILITY_WARN("81012",StringUtils.getString(R.string.module_core_cloud_visibility_warn),"",R.drawable.icon_warning_take_over,"",""),
//异常车辆预警
- CLOUD_ABNORMAL_VEHICLE_WARN("81013","异常车辆预警","",R.drawable.icon_v2x_other_retrograde_vehicle_driver,"","");
+// CLOUD_ABNORMAL_VEHICLE_WARN("81013","异常车辆预警","",R.drawable.icon_v2x_other_retrograde_vehicle_driver,"","");
+ CLOUD_ABNORMAL_VEHICLE_WARN("81013",StringUtils.getString(R.string.module_core_cloud_abnormal_vehicle_warn),"",R.drawable.icon_v2x_other_retrograde_vehicle_driver,"","");
//-----------云控基础平台 end---------------
@@ -686,7 +974,8 @@ enum class EventTypeEnumNew(
FOURS_LIVING.poiType -> FOURS_LIVING.poiTypeStr
GHOST_PROBE.poiType -> GHOST_PROBE.poiTypeStr
- else -> "其它道路事件"
+// else -> "其它道路事件"
+ else -> StringUtils.getString(R.string.module_core_other_road_event)
}
}
@@ -706,22 +995,31 @@ enum class EventTypeEnumNew(
FOURS_LIVING.poiType -> FOURS_LIVING.poiTypeStrVr
GHOST_PROBE.poiType -> GHOST_PROBE.poiTypeStrVr
- else -> "其它道路事件"
+// else -> "其它道路事件"
+ else -> StringUtils.getString(R.string.module_core_other_road_event)
}
}
@JvmStatic
fun getTtsWithFeedback(poiType: String?): String {
return when (poiType) {
- TRAFFIC_CHECK.poiType -> "交通检查"
- ROAD_CLOSED.poiType -> "封路"
- FOURS_ROAD_WORK.poiType -> "施工"
- FOURS_BLOCK_UP.poiType -> "道路拥堵"
- FOURS_PONDING.poiType -> "道路积水"
- FOURS_ICE.poiType -> "路面结冰"
+// TRAFFIC_CHECK.poiType -> "交通检查"
+ TRAFFIC_CHECK.poiType -> StringUtils.getString(R.string.module_core_traffic_check)
+// ROAD_CLOSED.poiType -> "封路"
+ ROAD_CLOSED.poiType -> StringUtils.getString(R.string.module_core_road_closed)
+// FOURS_ROAD_WORK.poiType -> "施工"
+ FOURS_ROAD_WORK.poiType -> StringUtils.getString(R.string.module_core_road_work)
+// FOURS_BLOCK_UP.poiType -> "道路拥堵"
+ FOURS_BLOCK_UP.poiType -> StringUtils.getString(R.string.module_core_road_congestion)
+// FOURS_PONDING.poiType -> "道路积水"
+ FOURS_PONDING.poiType -> StringUtils.getString(R.string.module_core_road_ponding)
+// FOURS_ICE.poiType -> "路面结冰"
+ FOURS_ICE.poiType -> StringUtils.getString(R.string.module_core_road_icing)
FOURS_ACCIDENT.poiType, FOURS_ACCIDENT_01.poiType, FOURS_ACCIDENT_02.poiType,
- FOURS_ACCIDENT_03.poiType, FOURS_ACCIDENT_04.poiType, FOURS_ACCIDENT_05.poiType -> "交通事故"
- else -> "道路事件"
+// FOURS_ACCIDENT_03.poiType, FOURS_ACCIDENT_04.poiType, FOURS_ACCIDENT_05.poiType -> "交通事故"
+ FOURS_ACCIDENT_03.poiType, FOURS_ACCIDENT_04.poiType, FOURS_ACCIDENT_05.poiType -> StringUtils.getString(R.string.module_core_accident)
+// else -> "道路事件"
+ else -> StringUtils.getString(R.string.module_core_road_event)
}
}
@@ -817,7 +1115,8 @@ enum class EventTypeEnumNew(
TYPE_SOCKET_ROAD_CONGESTION.poiType -> TYPE_SOCKET_ROAD_CONGESTION.tts
TYPE_SOCKET_ROAD_OTHER_RETROGRADE_VEHICLE.poiType -> TYPE_SOCKET_ROAD_OTHER_RETROGRADE_VEHICLE.tts
TYPE_USECASE_ROAD_BUS_STATION.poiType -> TYPE_USECASE_ROAD_BUS_STATION.tts
- else -> "道路事件"
+// else -> "道路事件"
+ else -> StringUtils.getString(R.string.module_core_road_event)
}
}
@@ -841,7 +1140,8 @@ enum class EventTypeEnumNew(
TYPE_SOCKET_ROAD_OTHER_RETROGRADE_VEHICLE.poiType -> TYPE_SOCKET_ROAD_OTHER_RETROGRADE_VEHICLE.content
TYPE_USECASE_ROAD_BUS_STATION.poiType -> TYPE_USECASE_ROAD_BUS_STATION.content
TYPE_SOCKET_ROAD_PEOPLE_CROSS.poiType -> TYPE_SOCKET_ROAD_PEOPLE_CROSS.content
- else -> "道路事件"
+// else -> "道路事件"
+ else -> StringUtils.getString(R.string.module_core_road_event)
}
}
@@ -1265,7 +1565,8 @@ enum class EventTypeEnumNew(
CLOUD_ABNORMAL_VEHICLE_WARN.poiTypeStr
}
else ->{
- "事件通知"
+// "事件通知"
+ StringUtils.getString(R.string.module_core_event_notification)
}
}
}
diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/EventTypeHelper.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/EventTypeHelper.kt
index acd57b5dc6..489b1df94b 100644
--- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/EventTypeHelper.kt
+++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/EventTypeHelper.kt
@@ -1,5 +1,6 @@
package com.mogo.eagle.core.data.enums
+import com.mogo.eagle.core.data.R
import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.BIZ_AVW
import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.BIZ_BSW
import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.BIZ_CLW
@@ -13,6 +14,7 @@ import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.BIZ_VRU
import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.BIZ_VRU_RI
import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.V2N
import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.V2V
+import com.mogo.eagle.core.utilcode.util.StringUtils
import com.zhjt.service_biz.BizConfig
class EventTypeHelper {
@@ -29,14 +31,18 @@ class EventTypeHelper {
when {
direction.isLeft() -> {
data.invoke(
- EventTypeEnumNew.getWarningContent(appId.toString() + "左"),
- EventTypeEnumNew.getWarningTts(appId.toString() + "左")
+// EventTypeEnumNew.getWarningContent(appId.toString() + "左"),
+ EventTypeEnumNew.getWarningContent(appId.toString() + StringUtils.getString(R.string.module_core_left)),
+// EventTypeEnumNew.getWarningTts(appId.toString() + "左")
+ EventTypeEnumNew.getWarningTts(appId.toString() + StringUtils.getString(R.string.module_core_left))
)
}
direction.isRight() -> {
data.invoke(
- EventTypeEnumNew.getWarningContent(appId.toString() + "右"),
- EventTypeEnumNew.getWarningTts(appId.toString() + "右")
+// EventTypeEnumNew.getWarningContent(appId.toString() + "右"),
+ EventTypeEnumNew.getWarningContent(appId.toString() + StringUtils.getString(R.string.module_core_right)),
+// EventTypeEnumNew.getWarningTts(appId.toString() + "右")
+ EventTypeEnumNew.getWarningTts(appId.toString() + StringUtils.getString(R.string.module_core_right))
)
}
else -> {
@@ -93,15 +99,19 @@ class EventTypeHelper {
when {
direction.isLeft() -> {
data.invoke(
- EventTypeEnumNew.getWarningContent(appId.toString() + "左"),
- EventTypeEnumNew.getWarningTts(appId.toString() + "左"),
+// EventTypeEnumNew.getWarningContent(appId.toString() + "左"),
+ EventTypeEnumNew.getWarningContent(appId.toString() + StringUtils.getString(R.string.module_core_left)),
+// EventTypeEnumNew.getWarningTts(appId.toString() + "左"),
+ EventTypeEnumNew.getWarningTts(appId.toString() + StringUtils.getString(R.string.module_core_left)),
true
)
}
direction.isRight() -> {
data.invoke(
- EventTypeEnumNew.getWarningContent(appId.toString() + "右"),
- EventTypeEnumNew.getWarningTts(appId.toString() + "右"),
+// EventTypeEnumNew.getWarningContent(appId.toString() + "右"),
+ EventTypeEnumNew.getWarningContent(appId.toString() + StringUtils.getString(R.string.module_core_right)),
+// EventTypeEnumNew.getWarningTts(appId.toString() + "右"),
+ EventTypeEnumNew.getWarningTts(appId.toString() + StringUtils.getString(R.string.module_core_right)),
true
)
}
@@ -130,8 +140,10 @@ class EventTypeHelper {
fun getVRURI(data: ((appId: Int, tts: String, content: String) -> Unit)) {
data.invoke(
EventTypeEnumNew.TYPE_USECASE_ID_VRUCW_PERSON.poiType.toInt(),
- "路人逆行预警",
- "路人逆行预警"
+// "路人逆行预警",
+ StringUtils.getString(R.string.module_core_vrucw_person_content1),
+// "路人逆行预警"
+ StringUtils.getString(R.string.module_core_vrucw_person_content1)
)
}
diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/TrafficTypeEnum.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/TrafficTypeEnum.kt
index 5994672fa6..3be5e07c53 100644
--- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/TrafficTypeEnum.kt
+++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/TrafficTypeEnum.kt
@@ -3,6 +3,7 @@ package com.mogo.eagle.core.data.enums
import com.mogo.eagle.core.data.R
import com.mogo.eagle.core.data.config.FunctionBuildConfig
import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
+import com.mogo.eagle.core.utilcode.util.StringUtils
/**
@@ -19,105 +20,120 @@ enum class TrafficTypeEnum(
) {
TYPE_TRAFFIC_ID_WEI_ZHI(
100,
- "未知数据",
+// "未知数据",
+ StringUtils.getString(R.string.module_core_unknown_data),
R.raw.traffic_xiankuang,
R.raw.traffic_xiankuang,
R.raw.traffic_xiankuang
),
TYPE_TRAFFIC_ID_PEOPLE(
1,
- "人",
+// "人",
+ StringUtils.getString(R.string.module_core_people),
R.raw.traffic_people,
R.raw.xingren,
R.raw.xingren_night
),
TYPE_TRAFFIC_ID_BICYCLE(
2,
- "自行车",
+// "自行车",
+ StringUtils.getString(R.string.module_core_bicycle),
R.raw.traffic_zixingche,
R.raw.traffic_zixingche_day,
R.raw.traffic_zixingche
),
TYPE_TRAFFIC_ID_TA_CHE(
3,
- "他车",
+// "他车",
+ StringUtils.getString(R.string.module_core_ta_che),
R.raw.traffic_tachexiaoche,
R.raw.traffic_tachexiaoche_day,
R.raw.traffic_tachexiaoche
),
TYPE_TRAFFIC_ID_MOTO(
4,
- "摩托",
+// "摩托",
+ StringUtils.getString(R.string.module_core_moto),
R.raw.traffic_motuoche,
R.raw.traffic_motuoche_day,
R.raw.traffic_motuoche
),
TYPE_TRAFFIC_ID_BUS(
6,
- "大巴",
+// "大巴",
+ StringUtils.getString(R.string.module_core_bus),
R.raw.traffic_daba,
R.raw.traffic_daba_day,
R.raw.traffic_daba
),
TYPE_TRAFFIC_ID_TRUCK(
8,
- "卡车",
+// "卡车",
+ StringUtils.getString(R.string.module_core_truck),
R.raw.traffic_daba,
R.raw.traffic_daba_day,
R.raw.traffic_daba
),
TYPE_TRAFFIC_ID_CAMERA(
9,
- "摄像头",
+// "摄像头",
+ StringUtils.getString(R.string.module_core_camera),
R.raw.shexiangtou,
R.raw.shexiangtou,
R.raw.shexiangtou
),
TYPE_TRAFFIC_ID_SPECIAL_VEHICLE(
11,
- "特殊车辆",
+// "特殊车辆",
+ StringUtils.getString(R.string.module_core_special_vehicle),
R.raw.special_vehicle,
R.raw.special_vehicle,
R.raw.special_vehicle
),
TYPE_TRAFFIC_ID_CONE(
12,
- "三角锥",
+// "三角锥",
+ StringUtils.getString(R.string.module_core_cone),
R.raw.sanjiaozhui,
R.raw.sanjiaozhui,
R.raw.sanjiaozhui
),
TYPE_TRAFFIC_ID_LUCE_TA_CHE(
103,
- "路侧他车",
+// "路侧他车",
+ StringUtils.getString(R.string.module_core_luce_ta_che),
R.raw.lucexiaoche,
R.raw.lucexiaoche,
R.raw.lucexiaoche
),
TYPE_TRAFFIC_ID_LUCE_BUS(
106,
- "路侧大巴",
+// "路侧大巴",
+ StringUtils.getString(R.string.module_core_luce_bus),
R.raw.lucedaba,
R.raw.lucedaba,
R.raw.lucedaba
),
TYPE_TRAFFIC_ID_LUCE_TRUCK(
108,
- "路侧卡车",
+// "路侧卡车",
+ StringUtils.getString(R.string.module_core_luce_truck),
R.raw.lucedaba,
R.raw.lucedaba,
R.raw.lucedaba
),
TYPE_TRAFFIC_ID_DAO_LU_SHI_GONG(
501,
- "道路施工",
+// "道路施工",
+ StringUtils.getString(R.string.module_core_road_construction),
R.raw.v2x_shigong_warning,
R.raw.v2x_shigong_warning,
R.raw.v2x_shigong_warning
),
TYPE_TRAFFIC_ID_DAO_LU_SHI_GU(
502,
- "道路事故",
+// "道路事故",
+ StringUtils.getString(R.string.module_core_road_accident),
R.raw.v2x_shigu_sanjiaopai,
R.raw.v2x_shigu_sanjiaopai,
R.raw.v2x_shigu_sanjiaopai
@@ -125,7 +141,8 @@ enum class TrafficTypeEnum(
TYPE_TRAFFIC_ID_TA_CHE_RETROGRADE(
100062,
- "他车逆行",
+// "他车逆行",
+ StringUtils.getString(R.string.module_core_ta_che_retrograde),
R.raw.traffic_tachexiaoche_retrograde,
R.raw.traffic_tachexiaoche_retrograde,
R.raw.traffic_tachexiaoche_retrograde
@@ -133,7 +150,8 @@ enum class TrafficTypeEnum(
TYPE_TRAFFIC_ID_PEOPLE_CROSS(
100064,
- "行人横穿",
+// "行人横穿",
+ StringUtils.getString(R.string.module_core_people_cross),
R.raw.xingren,
R.raw.xingren,
R.raw.xingren
diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/WarningDirectionEnum.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/WarningDirectionEnum.kt
index a492e75343..f70e2d42ae 100644
--- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/WarningDirectionEnum.kt
+++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/WarningDirectionEnum.kt
@@ -1,5 +1,8 @@
package com.mogo.eagle.core.data.enums
+import com.mogo.eagle.core.data.R
+import com.mogo.eagle.core.utilcode.util.StringUtils
+
fun WarningDirectionEnum.isLeft():Boolean{
return this.direction == WarningDirectionEnum.ALERT_WARNING_LEFT.direction
@@ -23,42 +26,52 @@ enum class WarningDirectionEnum(
) {
ALERT_WARNING_NON(
0,
- "关闭红色边框预警"
+// "关闭红色边框预警"
+ StringUtils.getString(R.string.module_core_alert_warning_non)
),
ALERT_WARNING_TOP(
1,
- "正前方"
+// "正前方"
+ StringUtils.getString(R.string.module_core_alert_warning_top)
),
ALERT_WARNING_RIGHT(
2,
- "正右边"
+// "正右边"
+ StringUtils.getString(R.string.module_core_alert_warning_right)
),
ALERT_WARNING_BOTTOM(
3,
- "正后方"
+// "正后方"
+ StringUtils.getString(R.string.module_core_alert_warning_bottom)
),
ALERT_WARNING_LEFT(
4,
- "正左方"
+// "正左方"
+ StringUtils.getString(R.string.module_core_alert_warning_left)
),
ALERT_WARNING_TOP_RIGHT(
5,
- "右前方"
+// "右前方"
+ StringUtils.getString(R.string.module_core_right_top)
),
ALERT_WARNING_BOTTOM_RIGHT(
6,
- "右后方"
+// "右后方"
+ StringUtils.getString(R.string.module_core_right_bottom)
),
ALERT_WARNING_BOTTOM_LEFT(
7,
- "左后方"
+// "左后方"
+ StringUtils.getString(R.string.module_core_left_bottom)
),
ALERT_WARNING_TOP_LEFT(
8,
- "左前方"
+// "左前方"
+ StringUtils.getString(R.string.module_core_left_top)
),
ALERT_WARNING_ALL(
9,
- "周边"
+// "周边"
+ StringUtils.getString(R.string.module_core_alert_warning_all)
)
}
\ No newline at end of file
diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/map/entity/MarkerExploreWay.java b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/map/entity/MarkerExploreWay.java
index f94abff990..95e403e46d 100644
--- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/map/entity/MarkerExploreWay.java
+++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/map/entity/MarkerExploreWay.java
@@ -6,6 +6,8 @@ import android.text.TextUtils;
import androidx.core.util.Pair;
+import com.mogo.eagle.core.utilcode.util.StringUtils;
+
import java.io.Serializable;
import java.util.List;
import java.util.Map;
@@ -44,7 +46,8 @@ public class MarkerExploreWay implements Serializable {
public String getAddr() {
if (TextUtils.isEmpty(addr)) {
- return "未知道路";
+// return "未知道路";
+ return StringUtils.getString(com.mogo.eagle.core.widget.R.string.module_core_unknown_road);
}
return addr;
}
diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/map/entity/MarkerUserInfo.java b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/map/entity/MarkerUserInfo.java
index ae3377d20c..434ee5108a 100644
--- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/map/entity/MarkerUserInfo.java
+++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/map/entity/MarkerUserInfo.java
@@ -3,6 +3,9 @@ package com.mogo.eagle.core.data.map.entity;
import android.text.TextUtils;
+import com.mogo.eagle.core.data.R;
+import com.mogo.eagle.core.utilcode.util.StringUtils;
+
import java.io.Serializable;
import java.util.Calendar;
@@ -47,38 +50,49 @@ public class MarkerUserInfo implements Serializable {
//1990
char ageChar = ageChars[2];
- String ageString = "未设置";
+// String ageString = "未设置";
+ String ageString = StringUtils.getString(R.string.module_core_age_unknown);
switch (ageChar) {
case '0':
- ageString = "00后";
+// ageString = "00后";
+ ageString = StringUtils.getString(R.string.module_core_age_00);
break;
case '1':
- ageString = "10后";
+// ageString = "10后";
+ ageString = StringUtils.getString(R.string.module_core_age_10);
break;
case '2':
- ageString = "20后";
+// ageString = "20后";
+ ageString = StringUtils.getString(R.string.module_core_age_20);
break;
case '3':
- ageString = "30后";
+// ageString = "30后";
+ ageString = StringUtils.getString(R.string.module_core_age_30);
break;
case '4':
- ageString = "40后";
+// ageString = "40后";
+ ageString = StringUtils.getString(R.string.module_core_age_40);
break;
case '5':
- ageString = "50后";
+// ageString = "50后";
+ ageString = StringUtils.getString(R.string.module_core_age_50);
break;
case '6':
- ageString = "60后";
+// ageString = "60后";
+ ageString = StringUtils.getString(R.string.module_core_age_60);
break;
case '7':
- ageString = "70后";
+// ageString = "70后";
+ ageString = StringUtils.getString(R.string.module_core_age_70);
break;
case '8':
- ageString = "80后";
+// ageString = "80后";
+ ageString = StringUtils.getString(R.string.module_core_age_80);
break;
case '9':
- ageString = "90后";
+// ageString = "90后";
+ ageString = StringUtils.getString(R.string.module_core_age_90);
break;
}
@@ -94,7 +108,8 @@ public class MarkerUserInfo implements Serializable {
public int getGenderValue() {
if (!TextUtils.isEmpty(gender)) {
- if ("男".equals(gender)) {
+// if ("男".equals(gender)) {
+ if (TextUtils.equals(gender, StringUtils.getString(R.string.module_core_gender_men))) {
return 0;
}
return 1;
@@ -105,7 +120,8 @@ public class MarkerUserInfo implements Serializable {
public String getGender() {
if (TextUtils.isEmpty(gender)) {
- return "未设置";
+// return "未设置";
+ return StringUtils.getString(R.string.module_core_gender_unknown);
}
return gender;
}
@@ -116,9 +132,11 @@ public class MarkerUserInfo implements Serializable {
public void setGender(int gender) {
if (gender == 0) {
- this.gender = "男";
+// this.gender = "男";
+ this.gender = StringUtils.getString(R.string.module_core_gender_men);
} else {
- this.gender = "女";
+// this.gender = "女";
+ this.gender = StringUtils.getString(R.string.module_core_gender_women);
}
}
@@ -154,7 +172,8 @@ public class MarkerUserInfo implements Serializable {
public String getUserName() {
if (TextUtils.isEmpty(userName)) {
- return "用户未设置昵称";
+// return "用户未设置昵称";
+ return StringUtils.getString(R.string.module_core_user_name_unknown);
}
return userName;
}
diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/map/entity/V2XRoadEventEntity.java b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/map/entity/V2XRoadEventEntity.java
index 2c2b3a4e5a..5c1007ba68 100644
--- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/map/entity/V2XRoadEventEntity.java
+++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/map/entity/V2XRoadEventEntity.java
@@ -1,7 +1,10 @@
package com.mogo.eagle.core.data.map.entity;
import android.text.TextUtils;
+
+import com.mogo.eagle.core.data.R;
import com.mogo.eagle.core.data.enums.EventTypeEnumNew;
+import com.mogo.eagle.core.utilcode.util.StringUtils;
import java.io.Serializable;
import java.util.Objects;
@@ -60,13 +63,16 @@ public class V2XRoadEventEntity implements Serializable {
tts = EventTypeEnumNew.GHOST_PROBE.getTts();
return tts;
}
- tts = "前方#" + (int) getDistance() + "米#";
+// tts = "前方#" + (int) getDistance() + "米#";
+ tts = StringUtils.getString(R.string.module_core_top) +"#" + (int) getDistance() + StringUtils.getString(R.string.module_och_m)+"#";
tts += EventTypeEnumNew.getTts(getPoiType());
if (haveLiveCar) {
- tts += "，查看实况请说确定。";
+// tts += "，查看实况请说确定。";
+ tts += StringUtils.getString(R.string.module_core_say_confirm_to_view_live_situation);
setShowEventButton(true);
} else {
- tts += "，请注意躲避。";
+// tts += "，请注意躲避。";
+ tts += StringUtils.getString(R.string.module_core_please_note_to_avoid);
setShowEventButton(false);
}
return tts;
@@ -76,9 +82,11 @@ public class V2XRoadEventEntity implements Serializable {
* 检测到附近#道路施工#，确认该信息是否正确？您可以说“正确”或“错误”帮助其他车友。
*/
public String getTtsWithFeedback() {
- tts = "检测到附近";
+// tts = "检测到附近";
+ tts = StringUtils.getString(R.string.module_core_detect_nearby);
tts += EventTypeEnumNew.getTtsWithFeedback(getPoiType());
- tts += "，确认该信息是否正确？您可以说“正确”或“错误”帮助其他车友。";
+// tts += "，确认该信息是否正确？您可以说“正确”或“错误”帮助其他车友。";
+ tts += StringUtils.getString(R.string.module_core_confirm_information);
return tts;
}
diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/map/entity/V2XWarningEntity.java b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/map/entity/V2XWarningEntity.java
index 9f9e66a8cc..5ba122f53a 100644
--- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/map/entity/V2XWarningEntity.java
+++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/map/entity/V2XWarningEntity.java
@@ -1,6 +1,8 @@
package com.mogo.eagle.core.data.map.entity;
+import com.mogo.eagle.core.data.R;
import com.mogo.eagle.core.data.map.MogoLatLng;
+import com.mogo.eagle.core.utilcode.util.StringUtils;
import java.io.Serializable;
import java.util.List;
@@ -71,13 +73,16 @@ public class V2XWarningEntity implements Serializable {
switch (type) {
case 1:
case 11:
- this.tts = "注意行人";
+// this.tts = "注意行人";
+ this.tts = StringUtils.getString(R.string.module_core_watch_pedestrians);
break;
case 2:
- this.tts = "注意自行车";
+// this.tts = "注意自行车";
+ this.tts = StringUtils.getString(R.string.module_core_watch_bicycle);
break;
case 4:
- this.tts = "注意摩托车";
+// this.tts = "注意摩托车";
+ this.tts = StringUtils.getString(R.string.module_core_watch_motorbike);
break;
default:
break;
diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/msgbox/MsgFmData.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/msgbox/MsgFmData.kt
index c453f67a39..31e78cdceb 100644
--- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/msgbox/MsgFmData.kt
+++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/msgbox/MsgFmData.kt
@@ -1,5 +1,8 @@
package com.mogo.eagle.core.data.msgbox
+import com.mogo.eagle.core.data.R
+import com.mogo.eagle.core.utilcode.util.StringUtils
+
/**
* FM信息对照表
*/
@@ -15,19 +18,54 @@ class MsgFmData{
val faultLevel: Int//故障处理级别
){
//请求平行驾驶接管
- FM_ACT_NEED_PARALLEL_DERVING_TAKEOVER("恢复策略","请求平行驾驶，请注意随时接管","FM_ACT_NEED_PARALLEL_DERVING_TAKEOVER","如planing出站时，规划失败",3),
+// FM_ACT_NEED_PARALLEL_DERVING_TAKEOVER("恢复策略","请求平行驾驶，请注意随时接管","FM_ACT_NEED_PARALLEL_DERVING_TAKEOVER","如planing出站时，规划失败",3),
+ FM_ACT_NEED_PARALLEL_DERVING_TAKEOVER(
+ StringUtils.getString(R.string.module_core_recovery_strategy),
+ StringUtils.getString(R.string.module_core_need_parallel_derving_takeover_action),
+ "FM_ACT_NEED_PARALLEL_DERVING_TAKEOVER",
+ StringUtils.getString(R.string.module_core_need_parallel_derving_takeover_action_desc),3),
//请求人工驾驶接管
- FM_ACT_NEED_MANNUAL_DERVING("恢复策略","请求人工驾驶接管","FM_ACT_NEED_MANNUAL_DERVING","如planing规划失败，且存在弱网判断",0),
+// FM_ACT_NEED_MANNUAL_DERVING("恢复策略","请求人工驾驶接管","FM_ACT_NEED_MANNUAL_DERVING","如planing规划失败，且存在弱网判断",0),
+ FM_ACT_NEED_MANNUAL_DERVING(
+ StringUtils.getString(R.string.module_core_recovery_strategy),
+ StringUtils.getString(R.string.module_core_need_mannual_derving_action),
+ "FM_ACT_NEED_MANNUAL_DERVING",
+ StringUtils.getString(R.string.module_core_need_mannual_derving_action_desc),0),
//系统重启
- FM_ACT_NEED_RESTART_SYSTEM("恢复策略","请进行系统软重启","FM_ACT_NEED_RESTART_SYSTEM","如检测到出现多个节点奔溃",2),
+// FM_ACT_NEED_RESTART_SYSTEM("恢复策略","请进行系统软重启","FM_ACT_NEED_RESTART_SYSTEM","如检测到出现多个节点奔溃",2),
+ FM_ACT_NEED_RESTART_SYSTEM(
+ StringUtils.getString(R.string.module_core_recovery_strategy),
+ StringUtils.getString(R.string.module_core_need_restart_system_action),
+ "FM_ACT_NEED_RESTART_SYSTEM",
+ StringUtils.getString(R.string.module_core_need_restart_system_action_desc),2),
//整车下电重启
- FM_ACT_MUST_VEHICLE_POWER_RESET("恢复策略","请进行整车下电重启","FM_ACT_MUST_VEHICLE_POWER_RESET","如底盘无数据，需要下电重启",1),
+// FM_ACT_MUST_VEHICLE_POWER_RESET("恢复策略","请进行整车下电重启","FM_ACT_MUST_VEHICLE_POWER_RESET","如底盘无数据，需要下电重启",1),
+ FM_ACT_MUST_VEHICLE_POWER_RESET(
+ StringUtils.getString(R.string.module_core_recovery_strategy),
+ StringUtils.getString(R.string.module_core_must_vehicle_power_reset_action),
+ "FM_ACT_MUST_VEHICLE_POWER_RESET",
+ StringUtils.getString(R.string.module_core_must_vehicle_power_reset_action_desc),1),
//请联系硬件工程师
- FM_ACT_CONTACT_HARDWARE_ENGINEER("人工处理","请联系硬件工程师","FM_ACT_CONTACT_HARDWARE_ENGINEER","硬件接线，域控启动等故障",4),
+// FM_ACT_CONTACT_HARDWARE_ENGINEER("人工处理","请联系硬件工程师","FM_ACT_CONTACT_HARDWARE_ENGINEER","硬件接线，域控启动等故障",4),
+ FM_ACT_CONTACT_HARDWARE_ENGINEER(
+ StringUtils.getString(R.string.module_core_manual_processing),
+ StringUtils.getString(R.string.module_core_contact_hardware_engineer_action),
+ "FM_ACT_CONTACT_HARDWARE_ENGINEER",
+ StringUtils.getString(R.string.module_core_contact_hardware_engineer_action_desc),4),
//请联系运维工程师
- FM_ACT_CONTACT_OPERATIONS_ENGINEER("人工处理","请联系运维工程师","FM_ACT_CONTACT_OPERATIONS_ENGINEER","系统配置不对，网络等故障",4),
+// FM_ACT_CONTACT_OPERATIONS_ENGINEER("人工处理","请联系运维工程师","FM_ACT_CONTACT_OPERATIONS_ENGINEER","系统配置不对，网络等故障",4),
+ FM_ACT_CONTACT_OPERATIONS_ENGINEER(
+ StringUtils.getString(R.string.module_core_manual_processing),
+ StringUtils.getString(R.string.module_core_contact_operations_engineer_action),
+ "FM_ACT_CONTACT_OPERATIONS_ENGINEER",
+ StringUtils.getString(R.string.module_core_contact_operations_engineer_action_desc),4),
//请联系软件工程师
- FM_ACT_CONTACT_SOFTWARE_ENGINEER("人工处理","请联系软件工程师","FM_ACT_CONTACT_SOFTWARE_ENGINEER","节点挂掉，无法启动等故障",4);
+// FM_ACT_CONTACT_SOFTWARE_ENGINEER("人工处理","请联系软件工程师","FM_ACT_CONTACT_SOFTWARE_ENGINEER","节点挂掉，无法启动等故障",4);
+ FM_ACT_CONTACT_SOFTWARE_ENGINEER(
+ StringUtils.getString(R.string.module_core_manual_processing),
+ StringUtils.getString(R.string.module_core_contact_software_engineer_action),
+ "FM_ACT_CONTACT_SOFTWARE_ENGINEER",
+ StringUtils.getString(R.string.module_core_contact_software_engineer_action_desc),4);
companion object{
@@ -69,7 +107,8 @@ class MsgFmData{
FM_ACT_CONTACT_OPERATIONS_ENGINEER.faultLevel ->FM_ACT_CONTACT_OPERATIONS_ENGINEER.faultAction
//请联系软件工程师
FM_ACT_CONTACT_SOFTWARE_ENGINEER.faultLevel -> FM_ACT_CONTACT_SOFTWARE_ENGINEER.faultAction
- else -> "暂无建议操作，请视实际情况注意接管"
+// else -> "暂无建议操作，请视实际情况注意接管"
+ else -> StringUtils.getString(R.string.module_core_no_suggested_operations_available1)
}
}
@@ -89,7 +128,8 @@ class MsgFmData{
FM_ACT_CONTACT_OPERATIONS_ENGINEER.faultLevel ->FM_ACT_CONTACT_OPERATIONS_ENGINEER.faultAction
//请联系软件工程师
FM_ACT_CONTACT_SOFTWARE_ENGINEER.faultLevel -> FM_ACT_CONTACT_SOFTWARE_ENGINEER.faultAction
- else -> "暂无建议操作"
+// else -> "暂无建议操作"
+ else -> StringUtils.getString(R.string.module_core_no_suggested_operations_available)
}
}
@@ -126,17 +166,47 @@ class MsgFmData{
val resultDesc: String//后果对应的处理描述
){
//无法作业
- FM_RST_FUNCTION_LOST("功能影响","无法作业","FM_RST_FUNCTION_LOST","需要禁止作业，如扫盘故障，清扫车无法清扫作业"),
+// FM_RST_FUNCTION_LOST("功能影响","无法作业","FM_RST_FUNCTION_LOST","需要禁止作业，如扫盘故障，清扫车无法清扫作业"),
+ FM_RST_FUNCTION_LOST(
+ StringUtils.getString(R.string.module_core_function_impact),
+ StringUtils.getString(R.string.module_core_unable_job),
+ "FM_RST_FUNCTION_LOST",
+ StringUtils.getString(R.string.module_core_function_lost_desc)),
//无法开放运营
- FM_RST_FORBID_OPEN_WORK("功能影响","无法开放运营","FM_RST_FORBID_OPEN_WORK","需要禁止运营，如安全带故障，可以自驾，不能载人"),
+// FM_RST_FORBID_OPEN_WORK("功能影响","无法开放运营","FM_RST_FORBID_OPEN_WORK","需要禁止运营，如安全带故障，可以自驾，不能载人"),
+ FM_RST_FORBID_OPEN_WORK(
+ StringUtils.getString(R.string.module_core_function_impact),
+ StringUtils.getString(R.string.module_core_unable_operation),
+ "FM_RST_FORBID_OPEN_WORK",
+ StringUtils.getString(R.string.module_core_forbid_open_work_desc)),
//无法平行驾驶
- FM_RST_FORBID_PARALLEL_DERVING("驾驶影响","无法平行驾驶","FM_RST_FORBID_PARALLEL_DERVING","需要禁止平行驾驶"),
+// FM_RST_FORBID_PARALLEL_DERVING("驾驶影响","无法平行驾驶","FM_RST_FORBID_PARALLEL_DERVING","需要禁止平行驾驶"),
+ FM_RST_FORBID_PARALLEL_DERVING(
+ StringUtils.getString(R.string.module_core_driving_impact),
+ StringUtils.getString(R.string.module_core_unable_parallel_drive),
+ "FM_RST_FORBID_PARALLEL_DERVING",
+ StringUtils.getString(R.string.module_core_forbid_parallel_derving_desc)),
//无法自动驾驶
- FM_RST_FORBID_AUTOPILOT_DERVING("驾驶影响","无法自动驾驶","FM_RST_FORBID_AUTOPILOT_DERVING","需要禁止自驾"),
+// FM_RST_FORBID_AUTOPILOT_DERVING("驾驶影响","无法自动驾驶","FM_RST_FORBID_AUTOPILOT_DERVING","需要禁止自驾"),
+ FM_RST_FORBID_AUTOPILOT_DERVING(
+ StringUtils.getString(R.string.module_core_driving_impact),
+ StringUtils.getString(R.string.module_core_unable_auto_drive),
+ "FM_RST_FORBID_AUTOPILOT_DERVING",
+ StringUtils.getString(R.string.module_core_forbid_autopilot_derving_desc)),
//无法手动驾驶
- FM_RST_FORBID_MANNUAL_DERVING("驾驶影响","无法手动驾驶","FM_RST_FORBID_MANNUAL_DERVING","需要禁止行车，如底盘存在故障，需要通知出来"),
+// FM_RST_FORBID_MANNUAL_DERVING("驾驶影响","无法手动驾驶","FM_RST_FORBID_MANNUAL_DERVING","需要禁止行车，如底盘存在故障，需要通知出来"),
+ FM_RST_FORBID_MANNUAL_DERVING(
+ StringUtils.getString(R.string.module_core_driving_impact),
+ StringUtils.getString(R.string.module_core_unable_manual_drive),
+ "FM_RST_FORBID_MANNUAL_DERVING",
+ StringUtils.getString(R.string.module_core_forbid_mannual_derving_desc)),
//失控，无法策略停车
- FM_RST_OUT_OF_CONTROL("安全影响","失控，无法策略停车","FM_RST_OUT_OF_CONTROL","需要立即紧急通知到人，车辆失控，如驾驶中controller挂掉，发送102重启");
+// FM_RST_OUT_OF_CONTROL("安全影响","失控，无法策略停车","FM_RST_OUT_OF_CONTROL","需要立即紧急通知到人，车辆失控，如驾驶中controller挂掉，发送102重启");
+ FM_RST_OUT_OF_CONTROL(
+ StringUtils.getString(R.string.module_core_safety_impact),
+ StringUtils.getString(R.string.module_core_unable_strategic_parking),
+ "FM_RST_OUT_OF_CONTROL",
+ StringUtils.getString(R.string.module_core_out_of_control_desc));
companion object{
//获取结果原因描述
@@ -170,15 +240,24 @@ class MsgFmData{
@JvmStatic
fun getFmPolicyName(policyCode: String?): String{
return when(policyCode){
- "FM_DP_NO_ACTION" -> "报告"
- "FM_DP_ONLY_WARNING" -> "警示"
- "FM_DP_SPEED_LIMIT1" -> "一级降速"
- "FM_DP_SPEED_LIMIT2" -> "二级降速"
- "FM_DP_SPEED_LIMIT3" -> "三级降速"
- "FM_DP_PNC_CHOOSE_STOP" -> "择机靠边停车"
- "FM_DP_COMFORTABLE_STOP" -> "立刻舒适停车"
- "FM_DP_EMERGENCY_STOP" -> "就地紧急停车"
- else -> "暂无"
+// "FM_DP_NO_ACTION" -> "报告"
+ "FM_DP_NO_ACTION" -> StringUtils.getString(R.string.module_core_fm_dp_no_action)
+// "FM_DP_ONLY_WARNING" -> "警示"
+ "FM_DP_ONLY_WARNING" -> StringUtils.getString(R.string.module_core_fm_dp_only_warning)
+// "FM_DP_SPEED_LIMIT1" -> "一级降速"
+ "FM_DP_SPEED_LIMIT1" -> StringUtils.getString(R.string.module_core_fm_dp_speed_limit1)
+// "FM_DP_SPEED_LIMIT2" -> "二级降速"
+ "FM_DP_SPEED_LIMIT2" -> StringUtils.getString(R.string.module_core_fm_dp_speed_limit2)
+// "FM_DP_SPEED_LIMIT3" -> "三级降速"
+ "FM_DP_SPEED_LIMIT3" -> StringUtils.getString(R.string.module_core_fm_dp_speed_limit3)
+// "FM_DP_PNC_CHOOSE_STOP" -> "择机靠边停车"
+ "FM_DP_PNC_CHOOSE_STOP" -> StringUtils.getString(R.string.module_core_fm_dp_comfortable_stop)
+// "FM_DP_COMFORTABLE_STOP" -> "立刻舒适停车"
+ "FM_DP_COMFORTABLE_STOP" -> StringUtils.getString(R.string.module_core_fm_dp_pnc_choose_stop)
+// "FM_DP_EMERGENCY_STOP" -> "就地紧急停车"
+ "FM_DP_EMERGENCY_STOP" -> StringUtils.getString(R.string.module_core_fm_dp_emergency_stop)
+// else -> "暂无"
+ else -> StringUtils.getString(R.string.module_core_no_available)
}
}
diff --git a/core/mogo-core-res/src/main/res/values/string.xml b/core/mogo-core-res/src/main/res/values/string.xml
index fbbbc464d2..8826f7747c 100644
--- a/core/mogo-core-res/src/main/res/values/string.xml
+++ b/core/mogo-core-res/src/main/res/values/string.xml
@@ -828,5 +828,349 @@
正在下载证书，请稍后再试
证书下载失败
当前环境id：%s 不支持密钥下载
+ 左前方
+ 前方
+ 右前方
+ 右侧
+ 右后方
+ 后方
+ 左后方
+ 左侧
+ 正在跟随车辆行驶
+ 正在等红灯
+ 正在向左变道
+ 正在完成变道
+ 正在向右变道
+ 正在绕过障碍物
+ 变道取消
+ 正在避让障碍物
+ 正在向左变道避让前方道路施工
+ 正在向右变道避让前方道路施工
+ 正在向左绕行避让前方道路施工
+ 绕行取消
+ 正在向右绕行避让前方道路施工
+ 正在向左变道避让前方静止障碍物
+ 正在向右变道避让前方静止障碍物
+ 正在向左绕行避让前方静止障碍物
+ 正在向右绕行避让前方静止障碍物
+ 正在向左变道避让前方道路事故
+ 正在向右变道避让前方道路事故
+ 正在向左绕行避让前方道路事故
+ 正在向右绕行避让前方道路事故
+ 正在出站
+ 正在等待出站
+ 正在进站
+ 正在等待进站
+ 正在绕过前方道路事件
+ 正在避让前方道路事件
+ 正在尝试绕过前方道路事件
+ 正在请求远程协助
+ 正在避让后方来车
+ 正在跟车行驶
+ 正在向左变道避让前方车龙
+ 正在向右变道避让前方车龙
+ 交通检查
+ 前方交通检查
+ 封路
+ 前方封路
+ 道路封路
+ 注意施工占道
+ 前方拥堵
+ 前方道路拥堵
+ 道路积水
+ 前方道路积水
+ 路面结冰
+ 前方路面结冰
+ 前方交通事故
+ 实时路况
+ 前方盲区路人预警
+ 前方盲区路人通行，请注意
+ 前方盲区即将有路人通过，请减速慢行
+ 接管
+ 注意周围、立即接管
+ 自动驾驶退出请立即接管
+ 平行驾驶遇弱网已退出，注意随时接管
+ 自驾判定遇困
+ 已请求平行驾驶，请稍作等待
+ 前方预警
+ 红绿灯
+ 故障车辆
+ 最优车道
+ 前向碰撞预警
+ 前车碰撞预警
+ 小心前车
+ 交叉路口碰撞预警
+ 注意交叉路口车辆
+ 左转辅助
+ 左转碰撞预警
+ 注意路口对向来车
+ %s后盲区预警
+ 注意%s后车辆
+ 变道预警
+ %s向变道预警
+ 逆向超车预警
+ 注意对向来车
+ 紧急制动预警
+ 前车急刹车
+ 异常车辆提醒
+ %s车异常
+ 小心%s异常车辆
+ 车辆失控预警
+ 前%s失控预警
+ 小心%s失控车辆
+ 紧急车辆提醒
+ 注意特种车辆通行
+ 请避让特种车辆
+ 碰撞预警
+ 前方机动车闯入
+ 前方非机动车闯入
+ 前方路人闯入
+ 未知障碍物
+ 前方未知障碍物闯入
+ 闯红灯预警
+ 前方路口有闯红灯风险
+ 有路口闯红灯风险，建议降低车速
+ 绿波通行
+ 建议车速 %s KM/H
+ 建议车速 %s 千米每小时
+ 车辆故障
+ 前方%s米有故障车辆，影响路段%s米
+ 路侧提醒您，前方%s米有故障车辆，影响路段%s米
+ 道路积水
+ 前方%s米道路积水，影响路段%s米
+ 路侧提醒您，前方%s米道路积水，影响路段%s米
+ 异常停车
+ 前方%s米异常停车，影响路段%s米
+ 路侧提醒您，前方%s米异常停车，影响路段%s米
+ 拥堵
+ 前方%s米拥堵，影响路段%s米
+ 路侧提醒您，前方%s米拥堵，影响路段%s米
+ 超速行驶
+ %s有车辆超速行驶
+ 路侧提醒您，%s有车辆超速行驶
+ 逆行车辆
+ 前方%s米逆行车辆，影响路段%s米
+ 路侧提醒您，前方%s米逆行车辆，影响路段%s米
+ 超速
+ 当前路段限速 %s KM/H，已超速
+ 当前路段限速 %s 千米每小时，已超速
+ 急转弯
+ 前方%s米急转弯
+ 前方%s米急转弯
+ 桥梁
+ 前方%s米桥梁
+ 路人
+ 前方%s米路人
+ 路滑
+ 前方%s米路滑
+ 隧道
+ 前方%s米隧道
+ 渡轮
+ 前方%s米渡轮
+ 路面不平
+ 前方%s米路面不平
+ 前方%s米有非机动车
+ 障碍
+ 前方%s米障碍
+ 施工
+ 前方%s米施工
+ 车队
+ 前方%s米车队
+ 道路不通
+ 前方%s米不通
+ 禁止掉头
+ 前方%s米禁止掉头
+ 禁止停车
+ 前方%s米有禁停路段
+ 禁止鸣笛
+ 前方%s米禁止鸣笛
+ 公交提醒
+ 前方%s米公交提醒
+ 右侧变窄/车道数减少
+ 前方%s米右侧变窄/车道数减少
+ 加油站
+ 前方%s米加油站
+ 学校
+ 前方%s米学校
+ 交通事故
+ 前方%s米交通事故
+ 通过公交站
+ 前方%s米有公交站
+ 前方车辆汇流
+ 前方%s米注意车辆汇入
+ 人行横道
+ 前方%s米人行横道
+ 提醒您注意观察小心通过
+ 交通拥堵
+ 前方%s米交通拥堵
+ 前方%s米交通拥堵,
+ 静止障碍物占道
+ 前方%s米静止障碍物占道
+ 前方%s米静止障碍物占道,
+ 前方%s米道路事故
+ 前方%s米道路事故,
+ 前方%s米道路施工
+ 前方%s米道路施工,
+ 他车倒车/逆行
+ 前方%s米有他车倒车或逆行
+ 前方有异常车辆
+ 绿波通行
+ 保持当前车速即可通过路口，好丝滑！
+ 行人横穿
+ 前方%s米有行人/非机动车横穿
+ 前方有行人或非机动车横穿
+ 未知/错误/异常
+ 平行驾驶无法接管
+ 远程无法介入，注意随时接管!可尝试重启app
+ 同步异常结束
+ 远程介入失败，注意随时接管!
+ 异常请人工驾驶
+ 即将靠边停车，注意随时接管!
+ 平行驾驶异常结束
+ 可能应急停车，注意随时接管!
+ 验票成功
+ %s张%s票（如全程票）
+ 核销失败
+ 核销设备正常
+ 详情%s
+ 核销设备异常
+ 一键停服
+ 请等待1分钟再执行车辆下电
+ VIP通行
+ VIP车辆优先通行，已为您变为绿灯
+ VIP车辆优先通行，已为您延长绿灯
+ 请求失败，
+ 请求失败,稍后重试
+ 路线推荐
+ 为您推荐最优路线
+ 已为您选择最优路线
+ 连接异常
+ 工控机连接异常，无法执行魔方命令
+
+ 绿波车速引导
+ 行驶车道建议
+ 交通拥堵提醒
+ 紧急车辆优先通行
+ 道路危险状况
+ 动态限速信息
+ 弱势交通参与者提醒
+ 路口他车闯红灯
+ 障碍物预警
+ 能见度预警
+ 异常车辆预警
+ 其它道路事件
+ 道路事件
+ 事件通知
+ 路人逆行预警
+ 未知数据
+ 人
+ 自行车
+ 他车
+ 摩托
+ 大巴
+ 卡车
+ 摄像头
+ 特殊车辆
+ 三角锥
+ 路侧他车
+ 路侧大巴
+ 路侧卡车
+ 他车逆行
+ 行人横穿
+ 关闭红色边框预警
+ 正前方
+ 正右边
+ 正后方
+ 正左方
+ 周边
+ 未知道路
+ 未设置
+ 00后
+ 10后
+ 20后
+ 30后
+ 40后
+ 50后
+ 60后
+ 70后
+ 80后
+ 90后
+ 未设置
+ 男
+ 女
+ 用户未设置昵称
+ ，查看实况请说确定。
+ ，请注意躲避。
+ 检测到附近
+ ，确认该信息是否正确？您可以说“正确”或“错误”帮助其他车友。
+ 恢复策略
+ 人工处理
+ 请求平行驾驶，请注意随时接管
+ 如Planing出站时，规划失败
+ 请求人工驾驶接管
+ 如Planing规划失败，且存在弱网判断
+ 请进行系统软重启
+ 如检测到出现多个节点崩溃
+ 请进行整车下电重启
+ 如底盘无数据，需要下电重启
+ 请联系硬件工程师
+ 硬件接线，域控启动等故障
+ 请联系运维工程师
+ 系统配置不对，网络等故障
+ 请联系软件工程师
+ 节点挂掉，无法启动等故障
+ 暂无建议操作
+ 暂无建议操作，请视实际情况注意接管
+ 功能影响
+ 驾驶影响
+ 安全影响
+ 无法作业
+ 无法开放运营
+ 无法平行驾驶
+ 无法自动驾驶
+ 无法手动驾驶
+ 失控，无法策略停车
+ 需要禁止作业，如扫盘故障，清扫车无法清扫作业
+ 需要禁止运营，如安全带故障，可以自驾，不能载人
+ 需要禁止平行驾驶
+ 需要禁止自驾
+ 需要禁止行车，如底盘存在故障，需要通知出来
+ 需要立即紧急通知到人，车辆失控，如驾驶中controller挂掉，发送102重启
+ 暂无
+ 报告
+ 警示
+ 一级降速
+ 二级降速
+ 三级降速
+ 择机靠边停车
+ 立刻舒适停车
+ 就地紧急停车
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file