diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/MoGoAutopilotControlProvider.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/MoGoAutopilotControlProvider.kt
index 9ff64d7fac..3efd35e9bf 100644
--- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/MoGoAutopilotControlProvider.kt
+++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/MoGoAutopilotControlProvider.kt
@@ -6,6 +6,7 @@ import androidx.annotation.RequiresPermission
import bag_manager.BagManagerOuterClass
import chassis.SpecialVehicleTaskCmdOuterClass
import com.alibaba.android.arouter.facade.annotation.Route
+import com.mogo.commons.AbsMogoApplication
import com.mogo.commons.debug.DebugConfig
import com.mogo.commons.storage.SharedPrefsMgr
import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters
@@ -1167,7 +1168,7 @@ class MoGoAutopilotControlProvider :
* @param resultCode 上报字段code
*/
override fun getReportResultDesc(resultCode: String): String {
- return MogoReport.ResultDesc.getDesc(resultCode)
+ return MogoReport.ResultDesc.getDesc(AbsMogoApplication.getApp(), resultCode)
}
/**
@@ -1175,7 +1176,7 @@ class MoGoAutopilotControlProvider :
* @param actionCode 上报字段code
*/
override fun getReportActionDesc(actionCode: String): String {
- return MogoReport.ActionDesc.getDesc(actionCode)
+ return MogoReport.ActionDesc.getDesc(AbsMogoApplication.getApp(), actionCode)
}
override fun onAutopilotCarConfig(carConfigResp: MessagePad.CarConfigResp) {
diff --git a/libraries/mogo-adas-data/src/main/java/com/zhjt/mogo/adas/data/bean/MogoReport.java b/libraries/mogo-adas-data/src/main/java/com/zhjt/mogo/adas/data/bean/MogoReport.java
index 91e01db97e..de1d2d5e7c 100644
--- a/libraries/mogo-adas-data/src/main/java/com/zhjt/mogo/adas/data/bean/MogoReport.java
+++ b/libraries/mogo-adas-data/src/main/java/com/zhjt/mogo/adas/data/bean/MogoReport.java
@@ -1,5 +1,11 @@
package com.zhjt.mogo.adas.data.bean;
+import android.content.Context;
+
+import androidx.annotation.StringRes;
+
+import com.zhjt.mogo.adas.data.R;
+
import java.lang.reflect.Field;
import java.util.HashMap;
import java.util.Locale;
@@ -28,12 +34,12 @@ public class MogoReport {
public enum ResultDesc {
- AUTOPILOT_SYSTEM_UNSTARTED(Result.AUTOPILOT_SYSTEM_UNSTARTED, "自动驾驶系统启动失败"),
- AUTOPILOT_DISABLE(Result.AUTOPILOT_DISABLE, "无法启动自动驾驶"),
- AUTOPILOT_INFERIOR(Result.AUTOPILOT_INFERIOR, "自动驾驶效果受影响"),
- REMOTEPILOT_DISABLE(Result.REMOTEPILOT_DISABLE, "无法启动远程驾驶"),
- REMOTEPILOT_INFERIOR(Result.REMOTEPILOT_INFERIOR, "远程驾驶效果受影响"),
- SHOW_WARNING(Result.SHOW_WARNING, "存在不确定因素，警示");
+ AUTOPILOT_SYSTEM_UNSTARTED(Result.AUTOPILOT_SYSTEM_UNSTARTED, R.string.adas_data_report_result_AUTOPILOT_SYSTEM_UNSTARTED),
+ AUTOPILOT_DISABLE(Result.AUTOPILOT_DISABLE, R.string.adas_data_report_result_AUTOPILOT_DISABLE),
+ AUTOPILOT_INFERIOR(Result.AUTOPILOT_INFERIOR, R.string.adas_data_report_result_AUTOPILOT_INFERIOR),
+ REMOTEPILOT_DISABLE(Result.REMOTEPILOT_DISABLE, R.string.adas_data_report_result_REMOTEPILOT_DISABLE),
+ REMOTEPILOT_INFERIOR(Result.REMOTEPILOT_INFERIOR, R.string.adas_data_report_result_REMOTEPILOT_INFERIOR),
+ SHOW_WARNING(Result.SHOW_WARNING, R.string.adas_data_report_result_SHOW_WARNING);
/**
@@ -43,31 +49,36 @@ public class MogoReport {
/**
* 描述
*/
- public final String desc;
+ @StringRes
+ private final int descResId;
- ResultDesc(String result, String desc) {
+ ResultDesc(String result, @StringRes int descResId) {
this.result = result;
- this.desc = desc;
+ this.descResId = descResId;
}
- public static String getDesc(String result) {
- switch (result) {
- case Result.AUTOPILOT_SYSTEM_UNSTARTED:
- return AUTOPILOT_SYSTEM_UNSTARTED.desc;
- case Result.AUTOPILOT_DISABLE:
- return AUTOPILOT_DISABLE.desc;
- case Result.AUTOPILOT_INFERIOR:
- return AUTOPILOT_INFERIOR.desc;
- case Result.REMOTEPILOT_DISABLE:
- return REMOTEPILOT_DISABLE.desc;
- case Result.REMOTEPILOT_INFERIOR:
- return REMOTEPILOT_INFERIOR.desc;
- case Result.SHOW_WARNING:
- return SHOW_WARNING.desc;
- default:
- return result;
-
+ public static String getDesc(Context context, String result) {
+ if (context == null) return result;
+ try {
+ switch (result) {
+ case Result.AUTOPILOT_SYSTEM_UNSTARTED:
+ return context.getString(AUTOPILOT_SYSTEM_UNSTARTED.descResId);
+ case Result.AUTOPILOT_DISABLE:
+ return context.getString(AUTOPILOT_DISABLE.descResId);
+ case Result.AUTOPILOT_INFERIOR:
+ return context.getString(AUTOPILOT_INFERIOR.descResId);
+ case Result.REMOTEPILOT_DISABLE:
+ return context.getString(REMOTEPILOT_DISABLE.descResId);
+ case Result.REMOTEPILOT_INFERIOR:
+ return context.getString(REMOTEPILOT_INFERIOR.descResId);
+ case Result.SHOW_WARNING:
+ return context.getString(SHOW_WARNING.descResId);
+ default:
+ return result;
+ }
+ } catch (Exception e) {
+ return result;
}
}
@@ -108,19 +119,19 @@ public class MogoReport {
public enum ActionDesc {
- CONTACT_TECH_SUPPORT(Action.CONTACT_TECH_SUPPORT, "联系技术支持"),
- CONTACT_MAINTENANCE(Action.CONTACT_MAINTENANCE, "联系运维"),
- CONTACT_HARDWARE_ENGINEER(Action.CONTACT_HARDWARE_ENGINEER, "联系硬件"),
- REBOOT_PAD(Action.REBOOT_PAD, "重启Pad"),
- REBOOT_VEHICLE(Action.REBOOT_VEHICLE, "重启车辆"),
- CHECK_GEAR(Action.CHECK_GEAR, "检查车辆档位仪表盘等自车因素"),
- CHECK_NETWORK(Action.CHECK_NETWORK, "检查网络连接和路由器等通信因素"),
- TRY_AGAIN_LATER(Action.TRY_AGAIN_LATER, "请稍后重试"),
- REMOTEPILOT_REQUEST(Action.REMOTEPILOT_REQUEST, "请求远程驾驶"),
- MANUAL_HANDLE_REQUEST(Action.MANUAL_HANDLE_REQUEST, "请安全员注意接管"),
- MANUAL_HANDLE_IMMEDIATELY(Action.MANUAL_HANDLE_IMMEDIATELY, "请安全员立即接管"),
- REBOOT_SYSTEM(Action.REBOOT_SYSTEM, "系统软重启"),
- KEEP_POWERON_AND_WAIT(Action.KEEP_POWERON_AND_WAIT, "请安全位置停车，保持上电，等待修复完成"),
+ CONTACT_TECH_SUPPORT(Action.CONTACT_TECH_SUPPORT, R.string.adas_data_report_action_CONTACT_TECH_SUPPORT),
+ CONTACT_MAINTENANCE(Action.CONTACT_MAINTENANCE, R.string.adas_data_report_action_CONTACT_MAINTENANCE),
+ CONTACT_HARDWARE_ENGINEER(Action.CONTACT_HARDWARE_ENGINEER, R.string.adas_data_report_action_CONTACT_HARDWARE_ENGINEER),
+ REBOOT_PAD(Action.REBOOT_PAD, R.string.adas_data_report_action_REBOOT_PAD),
+ REBOOT_VEHICLE(Action.REBOOT_VEHICLE, R.string.adas_data_report_action_REBOOT_VEHICLE),
+ CHECK_GEAR(Action.CHECK_GEAR, R.string.adas_data_report_action_CHECK_GEAR),
+ CHECK_NETWORK(Action.CHECK_NETWORK, R.string.adas_data_report_action_CHECK_NETWORK),
+ TRY_AGAIN_LATER(Action.TRY_AGAIN_LATER, R.string.adas_data_report_action_TRY_AGAIN_LATER),
+ REMOTEPILOT_REQUEST(Action.REMOTEPILOT_REQUEST, R.string.adas_data_report_action_REMOTEPILOT_REQUEST),
+ MANUAL_HANDLE_REQUEST(Action.MANUAL_HANDLE_REQUEST, R.string.adas_data_report_action_MANUAL_HANDLE_REQUEST),
+ MANUAL_HANDLE_IMMEDIATELY(Action.MANUAL_HANDLE_IMMEDIATELY, R.string.adas_data_report_action_MANUAL_HANDLE_IMMEDIATELY),
+ REBOOT_SYSTEM(Action.REBOOT_SYSTEM, R.string.adas_data_report_action_REBOOT_SYSTEM),
+ KEEP_POWERON_AND_WAIT(Action.KEEP_POWERON_AND_WAIT, R.string.adas_data_report_action_KEEP_POWERON_AND_WAIT),
;
/**
@@ -130,44 +141,50 @@ public class MogoReport {
/**
* 描述
*/
- public final String desc;
+ @StringRes
+ private final int descResId;
- ActionDesc(String action, String desc) {
+ ActionDesc(String action, @StringRes int descResId) {
this.action = action;
- this.desc = desc;
+ this.descResId = descResId;
}
- public static String getDesc(String action) {
- switch (action) {
- case Action.CONTACT_TECH_SUPPORT:
- return CONTACT_TECH_SUPPORT.desc;
- case Action.CONTACT_MAINTENANCE:
- return CONTACT_MAINTENANCE.desc;
- case Action.CONTACT_HARDWARE_ENGINEER:
- return CONTACT_HARDWARE_ENGINEER.desc;
- case Action.REBOOT_PAD:
- return REBOOT_PAD.desc;
- case Action.REBOOT_VEHICLE:
- return REBOOT_VEHICLE.desc;
- case Action.CHECK_GEAR:
- return CHECK_GEAR.desc;
- case Action.CHECK_NETWORK:
- return CHECK_NETWORK.desc;
- case Action.TRY_AGAIN_LATER:
- return TRY_AGAIN_LATER.desc;
- case Action.REMOTEPILOT_REQUEST:
- return REMOTEPILOT_REQUEST.desc;
- case Action.MANUAL_HANDLE_REQUEST:
- return MANUAL_HANDLE_REQUEST.desc;
- case Action.MANUAL_HANDLE_IMMEDIATELY:
- return MANUAL_HANDLE_IMMEDIATELY.desc;
- case Action.REBOOT_SYSTEM:
- return REBOOT_SYSTEM.desc;
- case Action.KEEP_POWERON_AND_WAIT:
- return KEEP_POWERON_AND_WAIT.desc;
- default:
- return action;
+ public static String getDesc(Context context, String action) {
+ if (context == null) return action;
+ try {
+ switch (action) {
+ case Action.CONTACT_TECH_SUPPORT:
+ return context.getString(CONTACT_TECH_SUPPORT.descResId);
+ case Action.CONTACT_MAINTENANCE:
+ return context.getString(CONTACT_MAINTENANCE.descResId);
+ case Action.CONTACT_HARDWARE_ENGINEER:
+ return context.getString(CONTACT_HARDWARE_ENGINEER.descResId);
+ case Action.REBOOT_PAD:
+ return context.getString(REBOOT_PAD.descResId);
+ case Action.REBOOT_VEHICLE:
+ return context.getString(REBOOT_VEHICLE.descResId);
+ case Action.CHECK_GEAR:
+ return context.getString(CHECK_GEAR.descResId);
+ case Action.CHECK_NETWORK:
+ return context.getString(CHECK_NETWORK.descResId);
+ case Action.TRY_AGAIN_LATER:
+ return context.getString(TRY_AGAIN_LATER.descResId);
+ case Action.REMOTEPILOT_REQUEST:
+ return context.getString(REMOTEPILOT_REQUEST.descResId);
+ case Action.MANUAL_HANDLE_REQUEST:
+ return context.getString(MANUAL_HANDLE_REQUEST.descResId);
+ case Action.MANUAL_HANDLE_IMMEDIATELY:
+ return context.getString(MANUAL_HANDLE_IMMEDIATELY.descResId);
+ case Action.REBOOT_SYSTEM:
+ return context.getString(REBOOT_SYSTEM.descResId);
+ case Action.KEEP_POWERON_AND_WAIT:
+ return context.getString(KEEP_POWERON_AND_WAIT.descResId);
+ default:
+ return action;
+ }
+ } catch (Exception e) {
+ return action;
}
}
}
diff --git a/libraries/mogo-adas-data/src/main/res/values/strings.xml b/libraries/mogo-adas-data/src/main/res/values/strings.xml
index 3a6801dffc..431df79fb5 100644
--- a/libraries/mogo-adas-data/src/main/res/values/strings.xml
+++ b/libraries/mogo-adas-data/src/main/res/values/strings.xml
@@ -105,4 +105,24 @@
人工接管时给PAD发后摄像头数据响应
未知
+
+ 自动驾驶系统启动失败
+ 无法启动自动驾驶
+ 自动驾驶效果受影响
+ 无法启动远程驾驶
+ 远程驾驶效果受影响
+ 存在不确定因素，警示
+ 联系技术支持
+ 联系运维
+ 联系硬件
+ 重启PAD
+ 重启车辆
+ 检查车辆档位仪表盘等自车因素
+ 检查网络连接和路由器等通信因素
+ 请稍后重试
+ 请求远程驾驶
+ 请安全员注意接管
+ 请安全员立即接管
+ 系统软重启
+ 请安全位置停车，保持上电，等待修复完成