From aa702564c1815479200b0aff6de80fcfab88e769 Mon Sep 17 00:00:00 2001 From: xinfengkun Date: Thu, 6 Nov 2025 17:10:32 +0800 Subject: [PATCH 01/33] =?UTF-8?q?[8.2.8][i18n]=20adas-data=20MessageType.j?= =?UTF-8?q?ava=20=E4=B8=AD=E6=96=87=E6=8A=BD=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/AndroidManifest.xml | 2 +- .../IpcConnectionStatusDescription.java | 81 ------ .../zhjt/mogo/adas/common/MessageType.java | 233 ++++++++++-------- .../src/main/res/values/strings.xml | 108 ++++++++ 4 files changed, 233 insertions(+), 191 deletions(-) delete mode 100644 libraries/mogo-adas-data/src/main/java/com/zhjt/mogo/adas/common/IpcConnectionStatusDescription.java create mode 100644 libraries/mogo-adas-data/src/main/res/values/strings.xml diff --git a/libraries/mogo-adas-data/src/main/AndroidManifest.xml b/libraries/mogo-adas-data/src/main/AndroidManifest.xml index db7896fc5e..cd2aec1f91 100644 --- a/libraries/mogo-adas-data/src/main/AndroidManifest.xml +++ b/libraries/mogo-adas-data/src/main/AndroidManifest.xml @@ -1 +1 @@ - + diff --git a/libraries/mogo-adas-data/src/main/java/com/zhjt/mogo/adas/common/IpcConnectionStatusDescription.java b/libraries/mogo-adas-data/src/main/java/com/zhjt/mogo/adas/common/IpcConnectionStatusDescription.java deleted file mode 100644 index a14193b55d..0000000000 --- a/libraries/mogo-adas-data/src/main/java/com/zhjt/mogo/adas/common/IpcConnectionStatusDescription.java +++ /dev/null @@ -1,81 +0,0 @@ -package com.zhjt.mogo.adas.common; - - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; - -import com.zhjt.mogo.adas.data.AdasConstants; - -/** - * 连接状态描述信息 - * 文案消息根据产品文档定义，详情见地址中的“工控机相关异常完善提示内容”模块：http://wiki.zhidaohulian.com/pages/viewpage.action?pageId=126243915 - */ -public enum IpcConnectionStatusDescription { - DISCONNECTED(AdasConstants.IpcConnectionStatus.DISCONNECTED, "未连接或主动断开连接", "未连接：首次启动时未调用连接函数；主动断开连接：主动调用断开连接函数；"), - CONNECTED(AdasConstants.IpcConnectionStatus.CONNECTED, "已连接", null), - CONNECTING(AdasConstants.IpcConnectionStatus.CONNECTING, "连接中", null), - RECONNECTING_TIMER(AdasConstants.IpcConnectionStatus.RECONNECTING_TIMER, "重连中（定时器）", null), - RECONNECTING_NETWORK(AdasConstants.IpcConnectionStatus.RECONNECTING_NETWORK, "重连中（网络监听）", null), - CONNECT_EXCEPTION(AdasConstants.IpcConnectionStatus.CONNECT_EXCEPTION, "连接异常", "与域控连接失败、无法连接、非正常断开等"), - ILLEGAL_ADDRESS(AdasConstants.IpcConnectionStatus.ILLEGAL_ADDRESS, "非法地址", "连接模式为指定地址时：表示当前调用连接时传入的域控地址错误或不符合规则【不修改默认配置不会出现此问题】；连接模式为PING模式时：表示传入的PING地址列表存在问题【不修改默认配置不会出现此问题】"), - SEARCH_ADDRESS(AdasConstants.IpcConnectionStatus.SEARCH_ADDRESS, "搜索中", "连接模式为PING模式时,正在查找是否有可用的域控地址"), - NOT_FOUND_ADDRESS(AdasConstants.IpcConnectionStatus.NOT_FOUND_ADDRESS, "未找到", "连接模式为PING模式时,配置的域控地址列表中的全部地址均无法PING通【不修改默认配置的情况下需要排查PAD是否连接车载路由器、工控机是否连接车载路由器、工控机是否开机等】"), - CERTIFICATION_FAILED(AdasConstants.IpcConnectionStatus.CERTIFICATION_FAILED, "认证异常", "鹰眼端或鹰眼端和域控端启用认证后，认证出现异常"), - HEARTBEAT_TIMEOUT(AdasConstants.IpcConnectionStatus.HEARTBEAT_TIMEOUT, "心跳超时", "连接域控成功后在一段时间内未收到域控心跳数据或其它任何数据，默认4秒【可以配置】"), - PROTOCOL_MISMATCH(AdasConstants.IpcConnectionStatus.PROTOCOL_MISMATCH, "协议不匹配", "被连接的域控端非WebSocket协议【可能性非常低】"), - SERVER_DISCONNECTED(AdasConstants.IpcConnectionStatus.SERVER_DISCONNECTED, "域控断开", "域控主动发起断开WebSocket连接，目前主要原因有：1.证书认证失败；2.老版本MAP不支持多连接的情况下会踢掉客户端；"); - - - @NonNull - public final AdasConstants.IpcConnectionStatus status; - @NonNull - public final String name;//消息类型准确定义名称 - @Nullable - public final String desc;//描述或简单的解决办法或出现此状态的原因 - - public String msg;//自定义消息数据 - - IpcConnectionStatusDescription(@NonNull AdasConstants.IpcConnectionStatus status, @NonNull String name, @Nullable String desc) { - this.status = status; - this.name = name; - this.desc = desc; - } - - @NonNull - public static IpcConnectionStatusDescription getDescription(@Nullable AdasConstants.IpcConnectionStatus status) { - if (status == AdasConstants.IpcConnectionStatus.CONNECTED) { - return CONNECTED; - } else if (status == AdasConstants.IpcConnectionStatus.CONNECTING) { - return CONNECTING; - } else if (status == AdasConstants.IpcConnectionStatus.RECONNECTING_TIMER) { - return RECONNECTING_TIMER; - } else if (status == AdasConstants.IpcConnectionStatus.RECONNECTING_NETWORK) { - return RECONNECTING_NETWORK; - } else if (status == AdasConstants.IpcConnectionStatus.CONNECT_EXCEPTION) { - return CONNECT_EXCEPTION; - } else if (status == AdasConstants.IpcConnectionStatus.ILLEGAL_ADDRESS) { - return ILLEGAL_ADDRESS; - } else if (status == AdasConstants.IpcConnectionStatus.SEARCH_ADDRESS) { - return SEARCH_ADDRESS; - } else if (status == AdasConstants.IpcConnectionStatus.NOT_FOUND_ADDRESS) { - return NOT_FOUND_ADDRESS; - } else if (status == AdasConstants.IpcConnectionStatus.CERTIFICATION_FAILED) { - return CERTIFICATION_FAILED; - } else if (status == AdasConstants.IpcConnectionStatus.HEARTBEAT_TIMEOUT) { - return HEARTBEAT_TIMEOUT; - } else if (status == AdasConstants.IpcConnectionStatus.PROTOCOL_MISMATCH) { - return PROTOCOL_MISMATCH; - } else if (status == AdasConstants.IpcConnectionStatus.SERVER_DISCONNECTED) { - return SERVER_DISCONNECTED; - } else { -// status==AdasConstants.IpcConnectionStatus.DISCONNECTED - return DISCONNECTED; - } - } - - @NonNull - @Override - public String toString() { - return name; - } -} diff --git a/libraries/mogo-adas-data/src/main/java/com/zhjt/mogo/adas/common/MessageType.java b/libraries/mogo-adas-data/src/main/java/com/zhjt/mogo/adas/common/MessageType.java index 3892c83e6b..264861b6c1 100644 --- a/libraries/mogo-adas-data/src/main/java/com/zhjt/mogo/adas/common/MessageType.java +++ b/libraries/mogo-adas-data/src/main/java/com/zhjt/mogo/adas/common/MessageType.java @@ -1,5 +1,11 @@ package com.zhjt.mogo.adas.common; +import android.content.Context; + +import androidx.annotation.StringRes; + +import com.zhjt.mogo.adas.data.R; + import mogo.telematics.pad.MessagePad; /** @@ -13,120 +19,120 @@ import mogo.telematics.pad.MessagePad; */ public enum MessageType { - TYPE_DEFAULT(MessagePad.MessageType.MsgTypeDefault, "默认"), - TYPE_RECEIVE_TRAJECTORY(MessagePad.MessageType.MsgTypeTrajectory, "车前引导线"), - TYPE_RECEIVE_TRACKED_OBJECTS(MessagePad.MessageType.MsgTypeTrackedObjects, "障碍物信息"), - TYPE_RECEIVE_GNSS_INFO(MessagePad.MessageType.MsgTypeGnssInfo, "惯导信息"), - TYPE_RECEIVE_VEHICLE_STATE(MessagePad.MessageType.MsgTypeVehicleState, "老底盘状态"), - TYPE_RECEIVE_AUTOPILOT_STATE(MessagePad.MessageType.MsgTypeAutopilotState, "自动驾驶状态"), - TYPE_RECEIVE_REPORT_MESSAGE(MessagePad.MessageType.MsgTypeReportMessage, "监控事件报告"), - TYPE_RECEIVE_PERCEPTION_TRAFFIC_LIGHT(MessagePad.MessageType.MsgTypePerceptionTrafficLight, "融合感知红绿灯"), - TYPE_RECEIVE_PREDICTION_OBSTACLE_TRAJECTORY(MessagePad.MessageType.MsgTypePredictionObstacleTrajectory, "他车轨迹预测"), - TYPE_RECEIVE_POINT_CLOUD(MessagePad.MessageType.MsgTypePointCloud, "点云透传"), - TYPE_RECEIVE_PLANNING_OBJECTS(MessagePad.MessageType.MsgTypePlanningObjects, "Planning障碍物"), - TYPE_RECEIVE_CHASSIS_STATES(MessagePad.MessageType.MsgTypeChassisStates, "底盘状态"), - TYPE_RECEIVE_FUNCTION_STATES(MessagePad.MessageType.MsgTypeFunctionStates, "重构后功能状态"), - TYPE_RECEIVE_BACK_CAMERA_VIDEO(MessagePad.MessageType.MsgTypeBackCameraVideo, "后摄像头"), - TYPE_RECEIVE_M1_STITCHED_VIDEO(MessagePad.MessageType.MsgTypeM1StitchedVideo, "M1拼接视频"), - TYPE_RECEIVE_SSM(MessagePad.MessageType.MsgTypeSSMState, "SSM系统状态"), - TYPE_RECEIVE_FM_STATE(MessagePad.MessageType.MsgTypeFMState, "FM状态"), - TYPE_RECEIVE_FSM2024_STATE(MessagePad.MessageType.MsgTypeFSM2024State, "FSM状态"), - TYPE_RECEIVE_LOC_STATE(MessagePad.MessageType.MsgTypeLocState, "定位状态"), - TYPE_RECEIVE_CLOUD_REGULATORY_WARNING(MessagePad.MessageType.MsgTypeCloudRegulatoryWarning, "云控监管预警"), - TYPE_RECEIVE_PREDICTION_OBSTACLE_TRAJECTORY2025(MessagePad.MessageType.MsgTypePredictionObjects2025, "障碍物轨迹预测"), - TYPE_RECEIVE_VLLM(MessagePad.MessageType.MsgTypevllm, "视觉语言模型"), - TYPE_RECEIVE_VLLM_IMAGE(MessagePad.MessageType.MsgTypeVllmImage60, "视觉语言模型图像"), + TYPE_DEFAULT(MessagePad.MessageType.MsgTypeDefault, R.string.adas_data_MsgTypeDefault), + TYPE_RECEIVE_TRAJECTORY(MessagePad.MessageType.MsgTypeTrajectory, R.string.adas_data_MsgTypeTrajectory), + TYPE_RECEIVE_TRACKED_OBJECTS(MessagePad.MessageType.MsgTypeTrackedObjects, R.string.adas_data_MsgTypeTrackedObjects), + TYPE_RECEIVE_GNSS_INFO(MessagePad.MessageType.MsgTypeGnssInfo, R.string.adas_data_MsgTypeGnssInfo), + TYPE_RECEIVE_VEHICLE_STATE(MessagePad.MessageType.MsgTypeVehicleState, R.string.adas_data_MsgTypeVehicleState), + TYPE_RECEIVE_AUTOPILOT_STATE(MessagePad.MessageType.MsgTypeAutopilotState, R.string.adas_data_MsgTypeAutopilotState), + TYPE_RECEIVE_REPORT_MESSAGE(MessagePad.MessageType.MsgTypeReportMessage, R.string.adas_data_MsgTypeReportMessage), + TYPE_RECEIVE_PERCEPTION_TRAFFIC_LIGHT(MessagePad.MessageType.MsgTypePerceptionTrafficLight, R.string.adas_data_MsgTypePerceptionTrafficLight), + TYPE_RECEIVE_PREDICTION_OBSTACLE_TRAJECTORY(MessagePad.MessageType.MsgTypePredictionObstacleTrajectory, R.string.adas_data_MsgTypePredictionObstacleTrajectory), + TYPE_RECEIVE_POINT_CLOUD(MessagePad.MessageType.MsgTypePointCloud, R.string.adas_data_MsgTypePointCloud), + TYPE_RECEIVE_PLANNING_OBJECTS(MessagePad.MessageType.MsgTypePlanningObjects, R.string.adas_data_MsgTypePlanningObjects), + TYPE_RECEIVE_CHASSIS_STATES(MessagePad.MessageType.MsgTypeChassisStates, R.string.adas_data_MsgTypeChassisStates), + TYPE_RECEIVE_FUNCTION_STATES(MessagePad.MessageType.MsgTypeFunctionStates, R.string.adas_data_MsgTypeFunctionStates), + TYPE_RECEIVE_BACK_CAMERA_VIDEO(MessagePad.MessageType.MsgTypeBackCameraVideo, R.string.adas_data_MsgTypeBackCameraVideo), + TYPE_RECEIVE_M1_STITCHED_VIDEO(MessagePad.MessageType.MsgTypeM1StitchedVideo, R.string.adas_data_MsgTypeM1StitchedVideo), + TYPE_RECEIVE_SSM(MessagePad.MessageType.MsgTypeSSMState, R.string.adas_data_MsgTypeSSMState), + TYPE_RECEIVE_FM_STATE(MessagePad.MessageType.MsgTypeFMState, R.string.adas_data_MsgTypeFMState), + TYPE_RECEIVE_FSM2024_STATE(MessagePad.MessageType.MsgTypeFSM2024State, R.string.adas_data_MsgTypeFSM2024State), + TYPE_RECEIVE_LOC_STATE(MessagePad.MessageType.MsgTypeLocState, R.string.adas_data_MsgTypeLocState), + TYPE_RECEIVE_CLOUD_REGULATORY_WARNING(MessagePad.MessageType.MsgTypeCloudRegulatoryWarning, R.string.adas_data_MsgTypeCloudRegulatoryWarning), + TYPE_RECEIVE_PREDICTION_OBSTACLE_TRAJECTORY2025(MessagePad.MessageType.MsgTypePredictionObjects2025, R.string.adas_data_MsgTypePredictionObjects2025), + TYPE_RECEIVE_VLLM(MessagePad.MessageType.MsgTypevllm, R.string.adas_data_MsgTypevllm), + TYPE_RECEIVE_VLLM_IMAGE(MessagePad.MessageType.MsgTypeVllmImage60, R.string.adas_data_MsgTypeVllmImage60), - TYPE_RECEIVE_BASIC_INFO_REQ(MessagePad.MessageType.MsgTypeBasicInfoReq, "自动驾驶设备基础信息请求"), - TYPE_SEND_BASIC_INFO_RESP(MessagePad.MessageType.MsgTypeBasicInfoResp, "自动驾驶设备基础信息应答"), - TYPE_SEND_SET_AUTOPILOT_MODE_REQ(MessagePad.MessageType.MsgTypeSetAutopilotModeReq, "设置自动驾驶模式 启动自动驾驶", 5000), - TYPE_SEND_SET_DEMO_MODE_REQ(MessagePad.MessageType.MsgTypeSetDemoModeReq, "设置演示模式", 5000), - TYPE_SEND_CAR_CONFIG_REQ(MessagePad.MessageType.MsgTypeCarConfigReq, "车机基础信息请求"), - TYPE_RECEIVE_CAR_CONFIG_RESP(MessagePad.MessageType.MsgTypeCarConfigResp, "车机基础信息应答"), - TYPE_SEND_RECORD_CAUSE(MessagePad.MessageType.MsgTypeRecordCause, "记录人工接管原因"), - TYPE_SEND_RECORD_DATA(MessagePad.MessageType.MsgTypeRecordData, "数据采集请求"), - TYPE_RECEIVE_RECORD_RESULT(MessagePad.MessageType.MsgTypeRecordResult, "数据采集结果"), - TYPE_SEND_SET_AUTOPILOT_SPEED_REQ(MessagePad.MessageType.MsgTypeSetAutopilotSpeedReq, "设置自动驾驶最大速度", 5000), - TYPE_SEND_GLOBAL_PATH_REQ(MessagePad.MessageType.MsgTypeGlobalPathReq, "自动驾驶路径请求"), - TYPE_RECEIVE_GLOBAL_PATH_RESP(MessagePad.MessageType.MsgTypeGlobalPathResp, "自动驾驶路径应答"), + TYPE_RECEIVE_BASIC_INFO_REQ(MessagePad.MessageType.MsgTypeBasicInfoReq, R.string.adas_data_MsgTypeBasicInfoReq), + TYPE_SEND_BASIC_INFO_RESP(MessagePad.MessageType.MsgTypeBasicInfoResp, R.string.adas_data_MsgTypeBasicInfoResp), + TYPE_SEND_SET_AUTOPILOT_MODE_REQ(MessagePad.MessageType.MsgTypeSetAutopilotModeReq, R.string.adas_data_MsgTypeSetAutopilotModeReq, 5000), + TYPE_SEND_SET_DEMO_MODE_REQ(MessagePad.MessageType.MsgTypeSetDemoModeReq, R.string.adas_data_MsgTypeSetDemoModeReq, 5000), + TYPE_SEND_CAR_CONFIG_REQ(MessagePad.MessageType.MsgTypeCarConfigReq, R.string.adas_data_MsgTypeCarConfigReq), + TYPE_RECEIVE_CAR_CONFIG_RESP(MessagePad.MessageType.MsgTypeCarConfigResp, R.string.adas_data_MsgTypeCarConfigResp), + TYPE_SEND_RECORD_CAUSE(MessagePad.MessageType.MsgTypeRecordCause, R.string.adas_data_MsgTypeRecordCause), + TYPE_SEND_RECORD_DATA(MessagePad.MessageType.MsgTypeRecordData, R.string.adas_data_MsgTypeRecordData), + TYPE_RECEIVE_RECORD_RESULT(MessagePad.MessageType.MsgTypeRecordResult, R.string.adas_data_MsgTypeRecordResult), + TYPE_SEND_SET_AUTOPILOT_SPEED_REQ(MessagePad.MessageType.MsgTypeSetAutopilotSpeedReq, R.string.adas_data_MsgTypeSetAutopilotSpeedReq, 5000), + TYPE_SEND_GLOBAL_PATH_REQ(MessagePad.MessageType.MsgTypeGlobalPathReq, R.string.adas_data_MsgTypeGlobalPathReq), + TYPE_RECEIVE_GLOBAL_PATH_RESP(MessagePad.MessageType.MsgTypeGlobalPathResp, R.string.adas_data_MsgTypeGlobalPathResp), @Deprecated//MAP290开始此接口弃用 - TYPE_SEND_TRAFFIC_LIGHT_DATA(MessagePad.MessageType.MsgTypeTrafficLightData, "发送红绿灯数据到工控机"), + TYPE_SEND_TRAFFIC_LIGHT_DATA(MessagePad.MessageType.MsgTypeTrafficLightData, R.string.adas_data_MsgTypeTrafficLightData), @Deprecated - TYPE_RECEIVE_WARN(MessagePad.MessageType.MsgTypeWarn, "预警数据"), - TYPE_RECEIVE_ARRIVAL_NOTIFICATION(MessagePad.MessageType.MsgTypeArrivalNotification, "到站提醒"), - TYPE_SEND_SYSTEM_CMD_REQ(MessagePad.MessageType.MsgTypeSystemCmdReq, "系统命令请求", 5000), - TYPE_SEND_TRAJECTORY_DOWNLOAD_REQ(MessagePad.MessageType.MsgTypeTrajectoryDownloadReq, "轨迹下载请求", 5000), + TYPE_RECEIVE_WARN(MessagePad.MessageType.MsgTypeWarn, R.string.adas_data_MsgTypeWarn), + TYPE_RECEIVE_ARRIVAL_NOTIFICATION(MessagePad.MessageType.MsgTypeArrivalNotification, R.string.adas_data_MsgTypeArrivalNotification), + TYPE_SEND_SYSTEM_CMD_REQ(MessagePad.MessageType.MsgTypeSystemCmdReq, R.string.adas_data_MsgTypeSystemCmdReq, 5000), + TYPE_SEND_TRAJECTORY_DOWNLOAD_REQ(MessagePad.MessageType.MsgTypeTrajectoryDownloadReq, R.string.adas_data_MsgTypeTrajectoryDownloadReq, 5000), @Deprecated//HQ、M1 MAP350开始弃用，其他车型MAP360开始弃用 - TYPE_SEND_STATUS_QUERY_REQ(MessagePad.MessageType.MsgTypeStatusQueryReq, "状态查询请求"), + TYPE_SEND_STATUS_QUERY_REQ(MessagePad.MessageType.MsgTypeStatusQueryReq, R.string.adas_data_MsgTypeStatusQueryReq), @Deprecated//HQ、M1 MAP350开始弃用，其他车型MAP360开始弃用 - TYPE_RECEIVE_STATUS_QUERY_RESP(MessagePad.MessageType.MsgTypeStatusQueryResp, "状态查询应答"), - TYPE_SEND_SET_RAIN_MODE_REQ(MessagePad.MessageType.MsgTypeSetRainModeReq, "设置雨天模式", 5000), - TYPE_SEND_RECORD_DATA_CONFIG_REQ(MessagePad.MessageType.MsgTypeRecordDataConfigReq, "数据采集配置查询"), - TYPE_RECEIVE_RECORD_DATA_CONFIG_RESP(MessagePad.MessageType.MsgTypeRecordDataConfigResp, "数据采集配置"), - TYPE_SEND_OPERATOR_CMD_REQ(MessagePad.MessageType.MsgTypeOperatorCmdReq, "操控指令", 5000), - TYPE_SEND_SUBSCRIBE_DATA_REQ(MessagePad.MessageType.MsgTypeSubscribeDataReq, "数据订阅、取消订阅请求", 5000), - TYPE_SEND_SPECIAL_VEHICLE_TASK_CMD(MessagePad.MessageType.MsgTypeSpecialVehicleTaskCmd, "特种车辆命令", 5000), - TYPE_SEND_SET_PARAM_REQ(MessagePad.MessageType.MsgTypeSetParamReq, "设置参数命令", 5000), - TYPE_SEND_TRIP_INFO_REQ(MessagePad.MessageType.MsgTypeTripInfoEvent, "行程信息"), - TYPE_SEND_BAG_MANAGER_CMD(MessagePad.MessageType.MsgTypeBagManagerCmd, "Bag管理请求"), - TYPE_RECEIVE_BAG_MANAGER_CMD(MessagePad.MessageType.MsgTypeBagManagerCmd, "Bag管理应答"), - TYPE_SEND_PLANNING_CMD(MessagePad.MessageType.MsgTypePlanningCmd, "给Planning指令", 5000), - TYPE_SEND_SET_PARAM_REQ_V2(MessagePad.MessageType.MsgTypeSetParamReqV2, "设置参数命令V2", 5000), - TYPE_RECEIVE_V2N_CONGESTION_EVENT(MessagePad.MessageType.MsgTypeV2nCongestionEvent, "主车附近事件推送"), - TYPE_RECEIVE_V2N_GLOBAL_PATH_EVENTS(MessagePad.MessageType.MsgTypeV2nGlobalPathEvents, "主车路径全局事件推送"), - TYPE_SEND_GET_PARAM_REQ(MessagePad.MessageType.MsgTypeGetParamReq, "参数获取请求"), - TYPE_RECEIVE_GET_PARAM_RESP(MessagePad.MessageType.MsgTypeGetParamResp, "参数获取应答"), - TYPE_SEND_SWEEPER_CLOUD_TASK_CMD(MessagePad.MessageType.MsgTypeTaskCmd, "发送清扫车指令到云控", 5000), - TYPE_RECEIVE_SWEEPER_CLOUD_TASK_CMD(MessagePad.MessageType.MsgTypeTaskCmd, "云控下发清扫车任务指令", 5000), - TYPE_SEND_FSM_STATUS_REASON_QUERY_REQ(MessagePad.MessageType.MsgTypeFSMStatusReasonQueryReq, "FSM状态原因查询"), - TYPE_RECEIVE_FSM_STATUS_REASON_QUERY_RESP(MessagePad.MessageType.MsgTypeFSMStatusReasonQueryResp, "FSM状态原因查询应答"), - TYPE_SEND_GET_DEBUG_INFO_REQ(MessagePad.MessageType.MsgTypeGetDebugInfo, "Debug信息请求"), - TYPE_RECEIVE_GET_DEBUG_INFO_RESP(MessagePad.MessageType.MsgTypeGetDebugInfo, "Debug信息应答"), - TYPE_SEND_PARALLEL_DRIVING_REQ(MessagePad.MessageType.MsgTypeParallelDrivingCmd, "平行驾驶请求", 5000), - TYPE_RECEIVE_PARALLEL_DRIVING_STATUS(MessagePad.MessageType.MsgTypeParallelDrivingCmd, "平行驾驶状态", 5000), - TYPE_SEND_RECEIVED_ACK(MessagePad.MessageType.MsgTypeReceivedAck, "发送消息回执"), - TYPE_RECEIVE_RECEIVED_ACK(MessagePad.MessageType.MsgTypeReceivedAck, "接收消息回执"), - TYPE_RECEIVE_V2N_NIO_GREEN_WAVE_PASSAGE_EVENT(MessagePad.MessageType.MsgTypeV2nNioGreenWavePassageEvent, "V2N NIO绿波通行（单路口）"), - TYPE_RECEIVE_V2N_NIO_CROSSOVER_EVENT(MessagePad.MessageType.MsgTypeV2nNioCrossoverEvent, "V2N NIO行人横穿（路侧）"), - TYPE_RECEIVE_V2N_NIO_OTHER_RETROGRADE_EVENT(MessagePad.MessageType.MsgTypeV2nNioOtherRetrogradeEvent, "V2N NIO他车逆行（路侧）"), - TYPE_RECEIVE_V2N_NIO_CONGESTION_EVENT(MessagePad.MessageType.MsgTypeV2nNioCongestionEvent, "V2N NIO拥堵事件"), - TYPE_RECEIVE_LANE_MARKS_TRAN(MessagePad.MessageType.MsgTypeLaneMarksTran, "车道线"), - TYPE_SEND_COLLISION_REPORT(MessagePad.MessageType.MsgTypeCollisionReport, "碰撞上报"), - TYPE_SEND_POWER_UNIT(MessagePad.MessageType.MsgTypePowerUnit, "电源模块请求"), - TYPE_RECEIVE_POWER_UNIT(MessagePad.MessageType.MsgTypePowerUnit, "电源模块响应"), - TYPE_SEND_SSM_FUNC_MSG(MessagePad.MessageType.MsgTypeSSMFuncMsg, "SSM功能控制"), - TYPE_RECEIVE_SSM_FUNC_MSG(MessagePad.MessageType.MsgTypeSSMFuncMsg, "SSM功能响应"), - TYPE_SEND_SSM_FUNC_STATUS_QUERY(MessagePad.MessageType.MsgTypeSSMFuncStatusQuery, "SSM功能状态查询"), - TYPE_RECEIVE_SSM_FUNC_STATUS_QUERY(MessagePad.MessageType.MsgTypeSSMFuncStatusQuery, "SSM功能状态响应"), - TYPE_SEND_CAPTURE_IMG_REQ_ON_TAKE_OVER(MessagePad.MessageType.MsgTypeCaptureImgReqOnTakeOver, "接管时摄像头数据请求"), - TYPE_RECEIVE_CLOUD_CONTROL(MessagePad.MessageType.MsgTypeEzhouCloud, "云控数据"), - TYPE_SEND_COPY_BAG(MessagePad.MessageType.MsgTypeCopyBag, "数据落盘控制"), - TYPE_RECEIVE_COPY_BAG(MessagePad.MessageType.MsgTypeCopyBag, "数据落盘响应"), - TYPE_SEND_CLOUD_CONFIG(MessagePad.MessageType.MsgTypeCloudConfig, "云端配置查询"), - TYPE_RECEIVE_CLOUD_CONFIG(MessagePad.MessageType.MsgTypeCloudConfig, "云端配置响应"), - TYPE_SEND_IMG_UPLOAD_CLOUD_ENABLE(MessagePad.MessageType.MsgTypeImgUploadCloudEnable, "摄像头上传NDE云开关"), - TYPE_SEND_IMG_UPLOAD_CLOUD_STATUS_QUERY(MessagePad.MessageType.MsgTypeImgUploadCloudStatusQuery, "摄像头上传NDE云状态查询"), - TYPE_RECEIVE_IMG_UPLOAD_CLOUD_STATUS_QUERY(MessagePad.MessageType.MsgTypeImgUploadCloudStatusQuery, "摄像头上传NDE云状态响应"), - TYPE_SEND_FORCE_STOP_OR_START_CLOUD_REQ(MessagePad.MessageType.MsgTypeForceStopOrStartCloudReq, "云端配置控制"), - TYPE_SEND_SET_OBU_UPLOAD_REQ(MessagePad.MessageType.MsgTypeSetObuUploadReq, "域控上报OBU开关控制"), - TYPE_SEND_OBU_UPLOAD_STATUS(MessagePad.MessageType.MsgTypeObuUploadStatus, "域控上报OBU开关状态查询"), - TYPE_RECEIVE_OBU_UPLOAD_STATUS(MessagePad.MessageType.MsgTypeObuUploadStatus, "域控上报OBU开关状态响应"), + TYPE_RECEIVE_STATUS_QUERY_RESP(MessagePad.MessageType.MsgTypeStatusQueryResp, R.string.adas_data_MsgTypeStatusQueryResp), + TYPE_SEND_SET_RAIN_MODE_REQ(MessagePad.MessageType.MsgTypeSetRainModeReq, R.string.adas_data_MsgTypeSetRainModeReq, 5000), + TYPE_SEND_RECORD_DATA_CONFIG_REQ(MessagePad.MessageType.MsgTypeRecordDataConfigReq, R.string.adas_data_MsgTypeRecordDataConfigReq), + TYPE_RECEIVE_RECORD_DATA_CONFIG_RESP(MessagePad.MessageType.MsgTypeRecordDataConfigResp, R.string.adas_data_MsgTypeRecordDataConfigResp), + TYPE_SEND_OPERATOR_CMD_REQ(MessagePad.MessageType.MsgTypeOperatorCmdReq, R.string.adas_data_MsgTypeOperatorCmdReq, 5000), + TYPE_SEND_SUBSCRIBE_DATA_REQ(MessagePad.MessageType.MsgTypeSubscribeDataReq, R.string.adas_data_MsgTypeSubscribeDataReq, 5000), + TYPE_SEND_SPECIAL_VEHICLE_TASK_CMD(MessagePad.MessageType.MsgTypeSpecialVehicleTaskCmd, R.string.adas_data_MsgTypeSpecialVehicleTaskCmd, 5000), + TYPE_SEND_SET_PARAM_REQ(MessagePad.MessageType.MsgTypeSetParamReq, R.string.adas_data_MsgTypeSetParamReq, 5000), + TYPE_SEND_TRIP_INFO_REQ(MessagePad.MessageType.MsgTypeTripInfoEvent, R.string.adas_data_MsgTypeTripInfoEvent), + TYPE_SEND_BAG_MANAGER_CMD(MessagePad.MessageType.MsgTypeBagManagerCmd, R.string.adas_data_MsgTypeBagManagerCmd_SEND), + TYPE_RECEIVE_BAG_MANAGER_CMD(MessagePad.MessageType.MsgTypeBagManagerCmd, R.string.adas_data_MsgTypeBagManagerCmd_RECEIVE), + TYPE_SEND_PLANNING_CMD(MessagePad.MessageType.MsgTypePlanningCmd, R.string.adas_data_MsgTypePlanningCmd, 5000), + TYPE_SEND_SET_PARAM_REQ_V2(MessagePad.MessageType.MsgTypeSetParamReqV2, R.string.adas_data_MsgTypeSetParamReqV2, 5000), + TYPE_RECEIVE_V2N_CONGESTION_EVENT(MessagePad.MessageType.MsgTypeV2nCongestionEvent, R.string.adas_data_MsgTypeV2nCongestionEvent), + TYPE_RECEIVE_V2N_GLOBAL_PATH_EVENTS(MessagePad.MessageType.MsgTypeV2nGlobalPathEvents, R.string.adas_data_MsgTypeV2nGlobalPathEvents), + TYPE_SEND_GET_PARAM_REQ(MessagePad.MessageType.MsgTypeGetParamReq, R.string.adas_data_MsgTypeGetParamReq), + TYPE_RECEIVE_GET_PARAM_RESP(MessagePad.MessageType.MsgTypeGetParamResp, R.string.adas_data_MsgTypeGetParamResp), + TYPE_SEND_SWEEPER_CLOUD_TASK_CMD(MessagePad.MessageType.MsgTypeTaskCmd, R.string.adas_data_MsgTypeTaskCmd_SEND, 5000), + TYPE_RECEIVE_SWEEPER_CLOUD_TASK_CMD(MessagePad.MessageType.MsgTypeTaskCmd, R.string.adas_data_MsgTypeTaskCmd_RECEIVE, 5000), + TYPE_SEND_FSM_STATUS_REASON_QUERY_REQ(MessagePad.MessageType.MsgTypeFSMStatusReasonQueryReq, R.string.adas_data_MsgTypeFSMStatusReasonQueryReq), + TYPE_RECEIVE_FSM_STATUS_REASON_QUERY_RESP(MessagePad.MessageType.MsgTypeFSMStatusReasonQueryResp, R.string.adas_data_MsgTypeFSMStatusReasonQueryResp), + TYPE_SEND_GET_DEBUG_INFO_REQ(MessagePad.MessageType.MsgTypeGetDebugInfo, R.string.adas_dataMsgTypeGetDebugInfo_SEND), + TYPE_RECEIVE_GET_DEBUG_INFO_RESP(MessagePad.MessageType.MsgTypeGetDebugInfo, R.string.adas_data_MsgTypeGetDebugInfo_RECEIVE), + TYPE_SEND_PARALLEL_DRIVING_REQ(MessagePad.MessageType.MsgTypeParallelDrivingCmd, R.string.adas_data_MsgTypeParallelDrivingCmd_SEND, 5000), + TYPE_RECEIVE_PARALLEL_DRIVING_STATUS(MessagePad.MessageType.MsgTypeParallelDrivingCmd, R.string.adas_data_MsgTypeParallelDrivingCmd_RECEIVE, 5000), + TYPE_SEND_RECEIVED_ACK(MessagePad.MessageType.MsgTypeReceivedAck, R.string.adas_data_MsgTypeReceivedAck_SEND), + TYPE_RECEIVE_RECEIVED_ACK(MessagePad.MessageType.MsgTypeReceivedAck, R.string.adas_data_MsgTypeReceivedAck_RECEVIE), + TYPE_RECEIVE_V2N_NIO_GREEN_WAVE_PASSAGE_EVENT(MessagePad.MessageType.MsgTypeV2nNioGreenWavePassageEvent, R.string.adas_data_MsgTypeV2nNioGreenWavePassageEvent), + TYPE_RECEIVE_V2N_NIO_CROSSOVER_EVENT(MessagePad.MessageType.MsgTypeV2nNioCrossoverEvent, R.string.adas_data_MsgTypeV2nNioCrossoverEvent), + TYPE_RECEIVE_V2N_NIO_OTHER_RETROGRADE_EVENT(MessagePad.MessageType.MsgTypeV2nNioOtherRetrogradeEvent, R.string.adas_data_MsgTypeV2nNioOtherRetrogradeEvent), + TYPE_RECEIVE_V2N_NIO_CONGESTION_EVENT(MessagePad.MessageType.MsgTypeV2nNioCongestionEvent, R.string.adas_data_MsgTypeV2nNioCongestionEvent), + TYPE_RECEIVE_LANE_MARKS_TRAN(MessagePad.MessageType.MsgTypeLaneMarksTran, R.string.adas_data_MsgTypeLaneMarksTran), + TYPE_SEND_COLLISION_REPORT(MessagePad.MessageType.MsgTypeCollisionReport, R.string.adas_data_MsgTypeCollisionReport), + TYPE_SEND_POWER_UNIT(MessagePad.MessageType.MsgTypePowerUnit, R.string.adas_data_MsgTypePowerUnit_SEND), + TYPE_RECEIVE_POWER_UNIT(MessagePad.MessageType.MsgTypePowerUnit, R.string.adas_data_MsgTypePowerUnit_RECEIVE), + TYPE_SEND_SSM_FUNC_MSG(MessagePad.MessageType.MsgTypeSSMFuncMsg, R.string.adas_data_MsgTypeSSMFuncMsg_SEND), + TYPE_RECEIVE_SSM_FUNC_MSG(MessagePad.MessageType.MsgTypeSSMFuncMsg, R.string.adas_data_MsgTypeSSMFuncMsg_RECEIVE), + TYPE_SEND_SSM_FUNC_STATUS_QUERY(MessagePad.MessageType.MsgTypeSSMFuncStatusQuery, R.string.adas_data_MsgTypeSSMFuncStatusQuery_SEND), + TYPE_RECEIVE_SSM_FUNC_STATUS_QUERY(MessagePad.MessageType.MsgTypeSSMFuncStatusQuery, R.string.adas_data_MsgTypeSSMFuncStatusQuery_RECEIVE), + TYPE_SEND_CAPTURE_IMG_REQ_ON_TAKE_OVER(MessagePad.MessageType.MsgTypeCaptureImgReqOnTakeOver, R.string.adas_data_MsgTypeCaptureImgReqOnTakeOver), + TYPE_RECEIVE_CLOUD_CONTROL(MessagePad.MessageType.MsgTypeEzhouCloud, R.string.adas_data_MsgTypeEzhouCloud), + TYPE_SEND_COPY_BAG(MessagePad.MessageType.MsgTypeCopyBag, R.string.adas_data_MsgTypeCopyBag_SEND), + TYPE_RECEIVE_COPY_BAG(MessagePad.MessageType.MsgTypeCopyBag, R.string.adas_data_MsgTypeCopyBag_RECEIVE), + TYPE_SEND_CLOUD_CONFIG(MessagePad.MessageType.MsgTypeCloudConfig, R.string.adas_data_MsgTypeCloudConfig_SEND), + TYPE_RECEIVE_CLOUD_CONFIG(MessagePad.MessageType.MsgTypeCloudConfig, R.string.adas_data_MsgTypeCloudConfig_RECEIVE), + TYPE_SEND_IMG_UPLOAD_CLOUD_ENABLE(MessagePad.MessageType.MsgTypeImgUploadCloudEnable, R.string.adas_data_MsgTypeImgUploadCloudEnable), + TYPE_SEND_IMG_UPLOAD_CLOUD_STATUS_QUERY(MessagePad.MessageType.MsgTypeImgUploadCloudStatusQuery, R.string.adas_data_MsgTypeImgUploadCloudStatusQuery_SEND), + TYPE_RECEIVE_IMG_UPLOAD_CLOUD_STATUS_QUERY(MessagePad.MessageType.MsgTypeImgUploadCloudStatusQuery, R.string.adas_data_MsgTypeImgUploadCloudStatusQuery_RECEIVE), + TYPE_SEND_FORCE_STOP_OR_START_CLOUD_REQ(MessagePad.MessageType.MsgTypeForceStopOrStartCloudReq, R.string.adas_data_MsgTypeForceStopOrStartCloudReq), + TYPE_SEND_SET_OBU_UPLOAD_REQ(MessagePad.MessageType.MsgTypeSetObuUploadReq, R.string.adas_data_MsgTypeSetObuUploadReq), + TYPE_SEND_OBU_UPLOAD_STATUS(MessagePad.MessageType.MsgTypeObuUploadStatus, R.string.adas_data_MsgTypeObuUploadStatus_SEND), + TYPE_RECEIVE_OBU_UPLOAD_STATUS(MessagePad.MessageType.MsgTypeObuUploadStatus, R.string.adas_data_MsgTypeObuUploadStatus_RECEIVE), //TODO 透传原始pb文件中不存在以下type。由于Java中无法强转,所以在mogo-adas-data/message_pad.proto中放开注释 - TYPE_RECEIVE_PLANNING_DECISION_STATE(MessagePad.MessageType.MsgTypePlanningDecisionState, "Planning决策状态"), - TYPE_RECEIVE_SWEEPER_TASK_INDEX_DATA(MessagePad.MessageType.MsgTypeSweeperTaskIndexData, "清扫车指标数据"), - TYPE_RECEIVE_OBU_WARNING_DATA(MessagePad.MessageType.MsgTypeObuWarningData, "OBU预警事件"), + TYPE_RECEIVE_PLANNING_DECISION_STATE(MessagePad.MessageType.MsgTypePlanningDecisionState, R.string.adas_data_MsgTypePlanningDecisionState), + TYPE_RECEIVE_SWEEPER_TASK_INDEX_DATA(MessagePad.MessageType.MsgTypeSweeperTaskIndexData, R.string.adas_data_MsgTypeSweeperTaskIndexData), + TYPE_RECEIVE_OBU_WARNING_DATA(MessagePad.MessageType.MsgTypeObuWarningData, R.string.adas_data_MsgTypeObuWarningData), //以下6个与标定相关 - TYPE_RECEIVE_CAMERA_CALIB_CHECK_DATA30(MessagePad.MessageType.MsgTypeCameraCalibCheckData30, "相机标定检查视频30"), - TYPE_RECEIVE_CAMERA_CALIB_CHECK_DATA60(MessagePad.MessageType.MsgTypeCameraCalibCheckData60, "相机标定检查视频60"), - TYPE_RECEIVE_CAMERA_CALIB_CHECK_DATA120_FRONT(MessagePad.MessageType.MsgTypeCameraCalibCheckData120Front, "相机标定检查视频120前"), - TYPE_RECEIVE_CAMERA_CALIB_CHECK_DATA120_BACK(MessagePad.MessageType.MsgTypeCameraCalibCheckData120Back, "相机标定检查视频120后"), - TYPE_RECEIVE_CAMERA_CALIB_CHECK_DATA120_LEFT(MessagePad.MessageType.MsgTypeCameraCalibCheckData120Left, "相机标定检查视频120左"), - TYPE_RECEIVE_CAMERA_CALIB_CHECK_DATA120_RIGHT(MessagePad.MessageType.MsgTypeCameraCalibCheckData120Right, "相机标定检查视频120右"), + TYPE_RECEIVE_CAMERA_CALIB_CHECK_DATA30(MessagePad.MessageType.MsgTypeCameraCalibCheckData30, R.string.adas_data_MsgTypeCameraCalibCheckData30), + TYPE_RECEIVE_CAMERA_CALIB_CHECK_DATA60(MessagePad.MessageType.MsgTypeCameraCalibCheckData60, R.string.adas_data_MsgTypeCameraCalibCheckData60), + TYPE_RECEIVE_CAMERA_CALIB_CHECK_DATA120_FRONT(MessagePad.MessageType.MsgTypeCameraCalibCheckData120Front, R.string.adas_data_MsgTypeCameraCalibCheckData120Front), + TYPE_RECEIVE_CAMERA_CALIB_CHECK_DATA120_BACK(MessagePad.MessageType.MsgTypeCameraCalibCheckData120Back, R.string.adas_data_MsgTypeCameraCalibCheckData120Back), + TYPE_RECEIVE_CAMERA_CALIB_CHECK_DATA120_LEFT(MessagePad.MessageType.MsgTypeCameraCalibCheckData120Left, R.string.adas_data_MsgTypeCameraCalibCheckData120Left), + TYPE_RECEIVE_CAMERA_CALIB_CHECK_DATA120_RIGHT(MessagePad.MessageType.MsgTypeCameraCalibCheckData120Right, R.string.adas_data_MsgTypeCameraCalibCheckData120Right), - TYPE_RECEIVE_CAPTURE_FRONT_IMG_ON_TAKE_OVER(MessagePad.MessageType.MsgTypeCaptureFrontImgOnTakeOver, "人工接管时给PAD发前摄像头数据响应"), - TYPE_RECEIVE_CAPTURE_BACK_IMG_ON_TAKE_OVER(MessagePad.MessageType.MsgTypeCaptureBackImgOnTakeOver, "人工接管时给PAD发后摄像头数据响应"), + TYPE_RECEIVE_CAPTURE_FRONT_IMG_ON_TAKE_OVER(MessagePad.MessageType.MsgTypeCaptureFrontImgOnTakeOver, R.string.adas_data_MsgTypeCaptureFrontImgOnTakeOver), + TYPE_RECEIVE_CAPTURE_BACK_IMG_ON_TAKE_OVER(MessagePad.MessageType.MsgTypeCaptureBackImgOnTakeOver, R.string.adas_data_MsgTypeCaptureBackImgOnTakeOver), ; @@ -138,22 +144,31 @@ public enum MessageType { /** * 描述 */ - public final String desc; + @StringRes + private final int descResId; /** * 消息回执超时时间 毫秒 0：表示不需要回执 */ public final long timeoutMillis; - MessageType(MessagePad.MessageType typeCode, String desc) { - this(typeCode, desc, 0L); + MessageType(MessagePad.MessageType typeCode, @StringRes int descResId) { + this(typeCode, descResId, 0L); } - MessageType(MessagePad.MessageType typeCode, String desc, long timeoutMillis) { + MessageType(MessagePad.MessageType typeCode, @StringRes int descResId, long timeoutMillis) { this.typeCode = typeCode; - this.desc = desc; + this.descResId = descResId; this.timeoutMillis = timeoutMillis; } + public String getDesc(Context context) { + if (context == null) return ""; + try { + return context.getString(descResId); + } catch (Exception e) { + return ""; + } + } } diff --git a/libraries/mogo-adas-data/src/main/res/values/strings.xml b/libraries/mogo-adas-data/src/main/res/values/strings.xml new file mode 100644 index 0000000000..4e5eb3028e --- /dev/null +++ b/libraries/mogo-adas-data/src/main/res/values/strings.xml @@ -0,0 +1,108 @@ + + 默认 + 车前引导线 + 障碍物信息 + 惯导信息 + 老底盘状态 + 自动驾驶状态 + 监控事件报告 + 融合感知红绿灯 + 他车轨迹预测 + 点云透传 + Planning障碍物 + 底盘状态 + 重构后功能状态 + 后摄像头 + M1拼接视频 + SSM系统状态 + FM状态 + FSM状态 + 定位状态 + 云控监管预警 + 障碍物轨迹预测 + 视觉语言模型 + 视觉语言模型图像 + 自动驾驶设备基础信息请求 + 自动驾驶设备基础信息应答 + 设置自动驾驶模式 启动自动驾驶 + 设置演示模式 + 车机基础信息请求 + 车机基础信息应答 + 记录人工接管原因 + 数据采集请求 + 数据采集结果 + 设置自动驾驶最大速度 + 自动驾驶路径请求 + 自动驾驶路径应答 + 发送红绿灯数据到工控机 + 预警数据 + 到站提醒 + 系统命令请求 + 轨迹下载请求 + 状态查询请求 + 状态查询应答 + 设置雨天模式 + 数据采集配置查询 + 数据采集配置 + 操控指令 + 数据订阅、取消订阅请求 + 特种车辆命令 + 设置参数命令 + 行程信息 + Bag管理请求 + Bag管理应答 + 给Planning指令 + 设置参数命令V2 + 主车附近事件推送 + 主车路径全局事件推送 + 参数获取请求 + 参数获取应答 + 发送清扫车指令到云控 + 云控下发清扫车任务指令 + FSM状态原因查询 + FSM状态原因查询应答 + Debug信息请求 + Debug信息应答 + 平行驾驶请求 + 平行驾驶状态 + 发送消息回执 + 接收消息回执 + V2N NIO绿波通行（单路口） + V2N NIO行人横穿（路侧） + V2N NIO他车逆行（路侧） + V2N NIO拥堵事件 + 车道线 + 碰撞上报 + 电源模块请求 + 电源模块响应 + SSM功能控制 + SSM功能响应 + SSM功能状态查询 + SSM功能状态响应 + 接管时摄像头数据请求 + 云控数据 + 数据落盘控制 + 数据落盘响应 + 云端配置查询 + 云端配置响应 + 摄像头上传NDE云开关 + 摄像头上传NDE云状态查询 + 摄像头上传NDE云状态响应 + 云端配置控制 + 域控上报OBU开关控制 + 域控上报OBU开关状态查询 + 域控上报OBU开关状态响应 + Planning决策状态 + 清扫车指标数据 + OBU预警事件 + 相机标定检查视频30 + 相机标定检查视频60 + 相机标定检查视频120前 + 相机标定检查视频120后 + 相机标定检查视频120左 + 相机标定检查视频120右 + 人工接管时给PAD发前摄像头数据响应 + 人工接管时给PAD发后摄像头数据响应 + + + From 990de2c254c9f79b18c41a59a91f2f411f391cf3 Mon Sep 17 00:00:00 2001 From: xinfengkun Date: Thu, 6 Nov 2025 19:01:32 +0800 Subject: [PATCH 02/33] =?UTF-8?q?[8.2.8][i18n]=20adas-data=20LaunchConditi?= =?UTF-8?q?onData.java=20=E4=B8=AD=E6=96=87=E6=8A=BD=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../autopilot/OCHAdasAbilityManager.java | 42 ++++++++++--------- .../CallerAutopilotActionsListenerManager.kt | 7 ++-- .../adas/data/bean/LaunchConditionData.java | 19 +++++---- .../src/main/res/values/strings.xml | 4 +- 4 files changed, 41 insertions(+), 31 deletions(-) diff --git a/OCH/common/bridge/src/main/java/com/mogo/och/bridge/autopilot/OCHAdasAbilityManager.java b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/autopilot/OCHAdasAbilityManager.java index d3416461e1..bd0a8bcf24 100644 --- a/OCH/common/bridge/src/main/java/com/mogo/och/bridge/autopilot/OCHAdasAbilityManager.java +++ b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/autopilot/OCHAdasAbilityManager.java @@ -1,9 +1,10 @@ package com.mogo.och.bridge.autopilot; -import android.content.Context; +import android.app.Application; import androidx.annotation.Nullable; +import com.mogo.eagle.core.data.config.FunctionBuildConfig; import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotActionsListener; import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatisticsListener; import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager; @@ -11,7 +12,6 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotActionsListene import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotStatisticsListenerManager; import com.mogo.eagle.core.function.call.autopilot.CallerParallelDrivingActionsListenerManager; import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils; -import com.mogo.eagle.core.data.config.FunctionBuildConfig; import com.mogo.eagle.core.utilcode.mogo.logger.Logger; import com.mogo.eagle.core.utilcode.util.ParseVersionUtils; import com.mogo.och.bridge.autopilot.callback.OchAdasStartFailureCallback; @@ -40,6 +40,7 @@ public class OCHAdasAbilityManager implements IMoGoAutopilotActionsListener, IMo private String startFailedMessage = ""; private OchAdasStartFailureCallback failureCallback = null; + private Application context; private static final class SingletonHolder { private static final OCHAdasAbilityManager INSTANCE = new OCHAdasAbilityManager(); @@ -49,18 +50,19 @@ public class OCHAdasAbilityManager implements IMoGoAutopilotActionsListener, IMo return SingletonHolder.INSTANCE; } - public void init(Context context) { + public void init(Application context) { + this.context = context; this.isAutopilotAbility = CallerAutopilotActionsListenerManager.INSTANCE.isAutopilotAbility(); this.launchConditionData = CallerAutopilotActionsListenerManager.INSTANCE.getLaunchConditionData(); this.unableAutopilotReasons = CallerAutopilotActionsListenerManager.INSTANCE.getUnableAutopilotReasons(); initListeners(); } - public void setAdasStartFailureCallback(OchAdasStartFailureCallback callback){ + public void setAdasStartFailureCallback(OchAdasStartFailureCallback callback) { failureCallback = callback; } - public boolean getAutopilotAbilityStatus(){ + public boolean getAutopilotAbilityStatus() { return isAutopilotAbility; } @@ -69,28 +71,28 @@ public class OCHAdasAbilityManager implements IMoGoAutopilotActionsListener, IMo } public String getOriginalData() { - return launchConditionData == null ? "" : launchConditionData.getJson(); + return launchConditionData == null ? "" : launchConditionData.getJson(context); } public ArrayList getUnableAutopilotReasons() { return unableAutopilotReasons; } - public String getAutopilotUnAbilityReason(){ + public String getAutopilotUnAbilityReason() { try { - if(unableAutopilotReasons==null||unableAutopilotReasons.isEmpty()){ + if (unableAutopilotReasons == null || unableAutopilotReasons.isEmpty()) { return "未知异常"; - }else { + } else { StringBuilder stringBuilder = new StringBuilder(); for (int i = 0; i < unableAutopilotReasons.size(); i++) { stringBuilder.append(unableAutopilotReasons.get(i)); - if(i相机标定检查视频120右 人工接管时给PAD发前摄像头数据响应 人工接管时给PAD发后摄像头数据响应 - - + + 未知 From 64e8068d24b72ee606bd0e63505706599f9a6010 Mon Sep 17 00:00:00 2001 From: xinfengkun Date: Fri, 7 Nov 2025 10:04:58 +0800 Subject: [PATCH 03/33] =?UTF-8?q?[8.2.8][i18n]=20adas-data=20MogoReport.ja?= =?UTF-8?q?va=20=E4=B8=AD=E6=96=87=E6=8A=BD=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../autopilot/MoGoAutopilotControlProvider.kt | 5 +- .../zhjt/mogo/adas/data/bean/MogoReport.java | 161 ++++++++++-------- .../src/main/res/values/strings.xml | 20 +++ 3 files changed, 112 insertions(+), 74 deletions(-) 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 + 重启车辆 + 检查车辆档位仪表盘等自车因素 + 检查网络连接和路由器等通信因素 + 请稍后重试 + 请求远程驾驶 + 请安全员注意接管 + 请安全员立即接管 + 系统软重启 + 请安全位置停车，保持上电，等待修复完成 From 56913c6f7f0a8131eb9a1b09842d430ae0182c12 Mon Sep 17 00:00:00 2001 From: xinfengkun Date: Fri, 7 Nov 2025 14:25:23 +0800 Subject: [PATCH 04/33] =?UTF-8?q?[8.2.8][i18n]=20adas-data=20ReceiveTimeou?= =?UTF-8?q?tManager.java=20=E4=B8=AD=E6=96=87=E6=8A=BD=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/values/strings.xml | 10 ++++++ .../zhidao/support/adas/high/AdasChannel.java | 3 +- .../high/common/ReceiveTimeoutManager.java | 34 +++++++++++++++---- .../mogo-adas/src/main/res/values/strings.xml | 3 -- 4 files changed, 38 insertions(+), 12 deletions(-) delete mode 100644 libraries/mogo-adas/src/main/res/values/strings.xml 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 431df79fb5..b0baec3a3b 100644 --- a/libraries/mogo-adas-data/src/main/res/values/strings.xml +++ b/libraries/mogo-adas-data/src/main/res/values/strings.xml @@ -125,4 +125,14 @@ 请安全员立即接管 系统软重启 请安全位置停车，保持上电，等待修复完成 + + + 超时时间： + 最后刷新时间时间差： + 最后一条Telematics心跳接收时间 + 最后一条Telematics数据发送时间 + + + + diff --git a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasChannel.java b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasChannel.java index 6c25f0af48..51bce83cc9 100644 --- a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasChannel.java +++ b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasChannel.java @@ -371,7 +371,6 @@ public class AdasChannel implements IAdasNetCommApi, FpgaSocket.IWebSocketConnec private void initSocket() { if (mSocket == null) { mSocket = new FpgaSocket(context); - context = null; mSocket.setWebSocketListener(this); if (isUseQueue) { WebSocketQueueManager.getInstance().registerWebSocketListener(this); @@ -924,7 +923,7 @@ public class AdasChannel implements IAdasNetCommApi, FpgaSocket.IWebSocketConnec } if (args != null && args.length > 0) { if (status == AdasConstants.IpcConnectionStatus.HEARTBEAT_TIMEOUT && args.length > 2) { - reason = ReceiveTimeoutManager.buildTimeoutStr(true, (boolean) args[0], (long) args[1], (long) args[2]); + reason = ReceiveTimeoutManager.buildTimeoutStr(context, true, (boolean) args[0], (long) args[1], (long) args[2]); } else { reason = String.valueOf(args[0]); } diff --git a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/ReceiveTimeoutManager.java b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/ReceiveTimeoutManager.java index b1d834824e..d1798e2094 100644 --- a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/ReceiveTimeoutManager.java +++ b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/ReceiveTimeoutManager.java @@ -1,6 +1,8 @@ package com.zhidao.support.adas.high.common; +import android.content.Context; import android.os.SystemClock; +import android.text.TextUtils; import com.zhjt.mogo.adas.data.AdasConstants; @@ -128,7 +130,7 @@ public class ReceiveTimeoutManager { long now = SystemClock.elapsedRealtime(); long difference = now - lastRefreshTime; boolean isTimeout = difference >= timeout; - CupidLogUtils.e(TAG, buildTimeoutStr(isTimeout, isHaveIpcHeartbeat(), lastDataTimestamp, difference) + " 设备开机到现在的时间：" + now + "ms 最后一条数据刷新时间：" + lastRefreshTime + "ms"); + CupidLogUtils.e(TAG, buildTimeoutStr(null,isTimeout, isHaveIpcHeartbeat(), lastDataTimestamp, difference) + " 设备开机到现在的时间：" + now + "ms 最后一条数据刷新时间：" + lastRefreshTime + "ms"); if (isTimeout) { if (listener != null) { listener.onTimeout(isHaveIpcHeartbeat(), lastDataTimestamp, difference); @@ -147,17 +149,35 @@ public class ReceiveTimeoutManager { } public static String buildTimeoutStr( + Context context, boolean isTimeout, boolean isHaveIpcHeartbeat, long lastDataTimestamp, long time ) { - String type = isTimeout - ? "超时时间：" - : "最后刷新时间时间差："; - String type1 = isHaveIpcHeartbeat - ? "最后一条Telematics心跳接收时间" - : "最后一条Telematics数据发送时间"; + String type = null; + String type1 = null; + if (context != null) { + try { + type = isTimeout + ? context.getString(com.zhjt.mogo.adas.data.R.string.adas_time_out_period) + : context.getString(com.zhjt.mogo.adas.data.R.string.adas_last_refresh_time_difference); + type1 = isHaveIpcHeartbeat + ? context.getString(com.zhjt.mogo.adas.data.R.string.adas_last_receive_heartbeat_time) + : context.getString(com.zhjt.mogo.adas.data.R.string.adas_last_receive_data_time); + } catch (Exception e) { + type = null; + type1 = null; + } + } + if (TextUtils.isEmpty(type) || TextUtils.isEmpty(type1)) { + type = isTimeout + ? "超时时间：" + : "最后刷新时间时间差："; + type1 = isHaveIpcHeartbeat + ? "最后一条Telematics心跳接收时间" + : "最后一条Telematics数据发送时间"; + } return String.format(Locale.getDefault(), "%s%dms %s：%d", type, diff --git a/libraries/mogo-adas/src/main/res/values/strings.xml b/libraries/mogo-adas/src/main/res/values/strings.xml deleted file mode 100644 index 9e8787cc20..0000000000 --- a/libraries/mogo-adas/src/main/res/values/strings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - adas-high - From 6781029c1a14df080a375f0f094adfb59db02781 Mon Sep 17 00:00:00 2001 From: xinfengkun Date: Mon, 10 Nov 2025 16:23:42 +0800 Subject: [PATCH 05/33] =?UTF-8?q?[8.2.8][i18n]=20adas-data=20ReceiveTimeou?= =?UTF-8?q?tManager.java=20autopilot\ability=E4=B8=AD=E7=9A=84=E6=89=80?= =?UTF-8?q?=E6=9C=89=E7=B1=BB=20=E4=B8=AD=E6=96=87=E6=8A=BD=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../autopilot/MoGoAutopilotControlProvider.kt | 8 +-- .../src/main/res/values/strings.xml | 9 --- .../zhidao/support/adas/high/AdasChannel.java | 7 ++- .../zhidao/support/adas/high/AdasManager.java | 3 +- .../high/common/ReceiveTimeoutManager.java | 9 +-- .../ability/AutopilotAbility250.java | 26 ++++---- .../ability/AutopilotAbility330.java | 27 +++++---- .../ability/AutopilotAbility350And360.java | 38 ++++++------ .../ability/AutopilotAbility360.java | 25 ++++---- .../ability/AutopilotAbilityFSM.java | 3 +- .../ability/AutopilotAbilityManager.java | 31 +++++++++- .../ability/BaseAutopilotAbilityChassis.java | 16 ++--- .../mogo-adas/src/main/res/values/strings.xml | 60 +++++++++++++++++++ 13 files changed, 173 insertions(+), 89 deletions(-) create mode 100644 libraries/mogo-adas/src/main/res/values/strings.xml 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 3efd35e9bf..cc417ee2b1 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 @@ -145,7 +145,7 @@ class MoGoAutopilotControlProvider : // .setSubscribeInterfaceOptions(subscribeInterfaceOptions)// .build() - AdasManager.getInstance().create(mContext, options, MoGoAdasMsgConnectStatusListenerImpl()) + AdasManager.getInstance().create(AbsMogoApplication.getApp(), options, MoGoAdasMsgConnectStatusListenerImpl()) //////////////////////////////////注意先后顺序，AdasManager.getInstance().create后才可以设置监听///////////////////////////////////////////// // 监听ADAS-SDK获取到的工控机数据 AdasManager.getInstance().setOnAdasListener(MoGoAdasListenerImpl()) @@ -241,7 +241,7 @@ class MoGoAutopilotControlProvider : // .setLaunchAutopilotGear(FunctionBuildConfig.launchAutopilotGear) .build() AdasManager.getInstance() - .create(mContext, options, MoGoAdasMsgConnectStatusListenerImpl()) + .create(AbsMogoApplication.getApp(), options, MoGoAdasMsgConnectStatusListenerImpl()) // 监听ADAS-SDK获取到的工控机数据 AdasManager.getInstance().setOnAdasListener(MoGoAdasListenerImpl()) // 接收司机屏发过来的感知、定位等数据 @@ -275,7 +275,7 @@ class MoGoAutopilotControlProvider : .setDeviceCrt(CallerCloudCertManager.getDeviceCrtFDecode()) // .setLaunchAutopilotGear(FunctionBuildConfig.launchAutopilotGear) .build() - AdasManager.getInstance().create(mContext, options, MoGoAdasMsgConnectStatusListenerImpl()) + AdasManager.getInstance().create(AbsMogoApplication.getApp(), options, MoGoAdasMsgConnectStatusListenerImpl()) //////////////////////////////////注意先后顺序，AdasManager.getInstance().create后才可以设置监听///////////////////////////////////////////// // 监听ADAS-SDK获取到的工控机数据 AdasManager.getInstance().setOnAdasListener(MoGoAdasListenerImpl()) @@ -337,7 +337,7 @@ class MoGoAutopilotControlProvider : .setConnectionMode(AdasOptions.IPC_CONNECTION_MODE.SPECIFIED) .setSpecifiedAddress(autoPilotIp) .build() - AdasManager.getInstance().create(mContext, options, MoGoAdasMsgConnectStatusListenerImpl()) + AdasManager.getInstance().create(AbsMogoApplication.getApp(), options, MoGoAdasMsgConnectStatusListenerImpl()) AdasManager.getInstance().setOnAdasListener(MoGoAdasListenerImpl()) // AdasManager.getInstance().adasOptions.isClient = false // AdasManager.getInstance().adasOptions.ipcConnectionMode = 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 b0baec3a3b..8c3afca375 100644 --- a/libraries/mogo-adas-data/src/main/res/values/strings.xml +++ b/libraries/mogo-adas-data/src/main/res/values/strings.xml @@ -126,13 +126,4 @@ 系统软重启 请安全位置停车，保持上电，等待修复完成 - - 超时时间： - 最后刷新时间时间差： - 最后一条Telematics心跳接收时间 - 最后一条Telematics数据发送时间 - - - - diff --git a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasChannel.java b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasChannel.java index 51bce83cc9..927b7b4b3a 100644 --- a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasChannel.java +++ b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasChannel.java @@ -10,7 +10,7 @@ import static com.zhidao.support.adas.high.chain.AdasChain.CHAIN_SOURCE_ADAS; import static com.zhidao.support.adas.high.chain.AdasChain.CHAIN_TYPE_INIT_STATUS; import static com.zhidao.support.adas.high.chain.AdasChain.CHAIN_TYPE_SOCKET_AUTOPILOT; -import android.content.Context; +import android.app.Application; import android.os.SystemClock; import android.text.TextUtils; import android.util.Log; @@ -154,7 +154,7 @@ public class AdasChannel implements IAdasNetCommApi, FpgaSocket.IWebSocketConnec private OnAdasListener mAdasListener; //连接状态listener private final OnAdasConnectStatusListener adasConnectStatusListener; - private Context context; + private final Application context; private final ReceivedAckManager receivedAckManager = new ReceivedAckManager();//消息回执 private final AtomicBoolean isInitConfigure = new AtomicBoolean(false);//是否进行配置初始化 @@ -199,10 +199,11 @@ public class AdasChannel implements IAdasNetCommApi, FpgaSocket.IWebSocketConnec * @param options * @param listener */ - AdasChannel(Context context, @Nullable AdasOptions options, @Nullable OnAdasConnectStatusListener listener) { + AdasChannel(Application context, @Nullable AdasOptions options, @Nullable OnAdasConnectStatusListener listener) { this.context = context; this.adasConnectStatusListener = listener; setAdasOptions(options); + AutopilotAbilityManager.getInstance().init(context); initData(); if (!adasOptions.isPassenger() && listener != null && adasOptions.isAutoConnect()) connect(); diff --git a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasManager.java b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasManager.java index 9d123d1c6e..794777554f 100644 --- a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasManager.java +++ b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasManager.java @@ -1,5 +1,6 @@ package com.zhidao.support.adas.high; +import android.app.Application; import android.content.Context; import android.text.TextUtils; @@ -127,7 +128,7 @@ public class AdasManager implements IAdasNetCommApi { * @param options 连接参数 * @param onAdasConnectStatusListener 连接状态监听 */ - public synchronized void create(Context context, AdasOptions options, OnAdasConnectStatusListener onAdasConnectStatusListener) { + public synchronized void create(Application context, AdasOptions options, OnAdasConnectStatusListener onAdasConnectStatusListener) { if (mChannel != null) { mChannel.disconnect(); carConfig = null; diff --git a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/ReceiveTimeoutManager.java b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/ReceiveTimeoutManager.java index d1798e2094..a376ee8557 100644 --- a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/ReceiveTimeoutManager.java +++ b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/ReceiveTimeoutManager.java @@ -4,6 +4,7 @@ import android.content.Context; import android.os.SystemClock; import android.text.TextUtils; +import com.zhidao.support.adas.high.R; import com.zhjt.mogo.adas.data.AdasConstants; import java.util.Locale; @@ -160,11 +161,11 @@ public class ReceiveTimeoutManager { if (context != null) { try { type = isTimeout - ? context.getString(com.zhjt.mogo.adas.data.R.string.adas_time_out_period) - : context.getString(com.zhjt.mogo.adas.data.R.string.adas_last_refresh_time_difference); + ? context.getString(R.string.adas_time_out_period) + : context.getString(R.string.adas_last_refresh_time_difference); type1 = isHaveIpcHeartbeat - ? context.getString(com.zhjt.mogo.adas.data.R.string.adas_last_receive_heartbeat_time) - : context.getString(com.zhjt.mogo.adas.data.R.string.adas_last_receive_data_time); + ? context.getString(R.string.adas_last_receive_heartbeat_time) + : context.getString(R.string.adas_last_receive_data_time); } catch (Exception e) { type = null; type1 = null; diff --git a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/autopilot/ability/AutopilotAbility250.java b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/autopilot/ability/AutopilotAbility250.java index e49ae5fec9..964fb03ba2 100644 --- a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/autopilot/ability/AutopilotAbility250.java +++ b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/autopilot/ability/AutopilotAbility250.java @@ -3,6 +3,7 @@ package com.zhidao.support.adas.high.common.autopilot.ability; import androidx.annotation.NonNull; import com.zhidao.support.adas.high.AdasManager; +import com.zhidao.support.adas.high.R; import com.zhidao.support.adas.high.common.CupidLogUtils; import com.zhjt.mogo.adas.data.bean.LaunchConditionData; import com.zhjt.mogo.adas.data.bean.UnableLaunchReason; @@ -24,10 +25,13 @@ import system_master.SystemStatusInfo; public class AutopilotAbility250 extends BaseAutopilotAbilityChassis { private volatile Timer timer; private int masterVersion = -1;//Master版本 + @NonNull + private final String[] NODE_INFO_STATE; public AutopilotAbility250(@NonNull AutopilotAbilityManager manager) { super(manager); + NODE_INFO_STATE = manager.getStringArray(R.array.adas_node_info_state); } @@ -58,14 +62,14 @@ public class AutopilotAbility250 extends BaseAutopilotAbilityChassis { for (SystemStatusInfo.NodeInfo info : list) { String nodeName = info.getNodeName(); int state = info.getState(); - if (state < AutopilotAbilityManager.NODE_INFO_STATE.length) { - unableAutopilotReasons = manager.addUnableAutopilotReason(unableAutopilotReasons, UnableLaunchReason.SourceType.SSM, UnableLaunchReason.UnableType.SSM_OFFER, nodeName + AutopilotAbilityManager.NODE_INFO_STATE[state]); + if (state < NODE_INFO_STATE.length) { + unableAutopilotReasons = manager.addUnableAutopilotReason(unableAutopilotReasons, UnableLaunchReason.SourceType.SSM, UnableLaunchReason.UnableType.SSM_OFFER, nodeName + NODE_INFO_STATE[state]); } else { - unableAutopilotReasons = manager.addUnableAutopilotReason(unableAutopilotReasons, UnableLaunchReason.SourceType.SSM, UnableLaunchReason.UnableType.SSM_ERROR, nodeName + "未知异常"); + unableAutopilotReasons = manager.addUnableAutopilotReason(unableAutopilotReasons, UnableLaunchReason.SourceType.SSM, UnableLaunchReason.UnableType.SSM_ERROR, nodeName + manager.getString(R.string.adas_unknown_error)); } } } else { - unableAutopilotReasons = manager.addUnableAutopilotReason(unableAutopilotReasons, UnableLaunchReason.SourceType.SSM, UnableLaunchReason.UnableType.SSM_ERROR, "未知异常节点"); + unableAutopilotReasons = manager.addUnableAutopilotReason(unableAutopilotReasons, UnableLaunchReason.SourceType.SSM, UnableLaunchReason.UnableType.SSM_ERROR, manager.getString(R.string.adas_unknown_error_node)); } } } else { @@ -75,11 +79,11 @@ public class AutopilotAbility250 extends BaseAutopilotAbilityChassis { boolean isAutopilotAbility = false; String unableAutopilotReason = null; if (systemState == SystemStatusInfo.SystemState.SYS_STARTING) { - unableAutopilotReason = "系统正在启动"; + unableAutopilotReason = manager.getString(R.string.adas_system_starting); } else if (systemState == SystemStatusInfo.SystemState.SYS_EXITING) { - unableAutopilotReason = "系统正在关闭"; + unableAutopilotReason = manager.getString(R.string.adas_system_shutting_down); } else if (systemState == SystemStatusInfo.SystemState.SYS_FAULT) { - unableAutopilotReason = "系统异常"; + unableAutopilotReason = manager.getString(R.string.adas_system_error); } else if (systemState == SystemStatusInfo.SystemState.AUTO_PILOT_STARTING) { //TODO 如果第一次下发了启动自动驾驶，没起来或者存在干预 此时systemState是AUTO_PILOT_STARTING 需要二次下发启动自驾命令 所以需要排除此状态 isAutopilotAbility = true; @@ -89,11 +93,11 @@ public class AutopilotAbility250 extends BaseAutopilotAbilityChassis { isAutopilotAbility = true; // unableAutopilotReason = "自动驾驶运行中"; } else if (systemState == SystemStatusInfo.SystemState.REMOTE_PILOT_STARTING) { - unableAutopilotReason = "平行驾驶启动中"; + unableAutopilotReason = manager.getString(R.string.adas_parallel_drive_starting); } else if (systemState == SystemStatusInfo.SystemState.REMOTE_PILOT_RUNNING) { - unableAutopilotReason = "平行驾驶运行中"; + unableAutopilotReason = manager.getString(R.string.adas_parallel_drive_running); } else { - unableAutopilotReason = "未知系统状态"; + unableAutopilotReason = manager.getString(R.string.adas_unknown_system_state); } if (!isAutopilotAbility) { unableAutopilotReasons = manager.addUnableAutopilotReason(unableAutopilotReasons, UnableLaunchReason.SourceType.SSM, UnableLaunchReason.UnableType.SSM_OFFER, unableAutopilotReason); @@ -101,7 +105,7 @@ public class AutopilotAbility250 extends BaseAutopilotAbilityChassis { } } } else { - unableAutopilotReasons = manager.addUnableAutopilotReason(unableAutopilotReasons, UnableLaunchReason.SourceType.LIB, UnableLaunchReason.UnableType.SSM_TIMEOUT, "SSM查询超时无响应"); + unableAutopilotReasons = manager.addUnableAutopilotReason(unableAutopilotReasons, UnableLaunchReason.SourceType.LIB, UnableLaunchReason.UnableType.SSM_TIMEOUT, manager.getString(R.string.adas_ssm_find_timeout)); } //检测底盘相关 unableAutopilotReasons = onCallbackChassis(unableAutopilotReasons); diff --git a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/autopilot/ability/AutopilotAbility330.java b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/autopilot/ability/AutopilotAbility330.java index 18b56e72d4..40011f5258 100644 --- a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/autopilot/ability/AutopilotAbility330.java +++ b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/autopilot/ability/AutopilotAbility330.java @@ -5,6 +5,7 @@ import android.text.TextUtils; import androidx.annotation.NonNull; import com.zhidao.support.adas.high.AdasManager; +import com.zhidao.support.adas.high.R; import com.zhidao.support.adas.high.common.CupidLogUtils; import com.zhjt.mogo.adas.data.bean.LaunchConditionData; import com.zhjt.mogo.adas.data.bean.UnableLaunchReason; @@ -35,11 +36,13 @@ public class AutopilotAbility330 { private int mapVersion = -1;//MAP版本 private int masterVersion = -1;//Master版本 private OnAutopilotAbilityListener listener; + private final String[] NODE_INFO_STATE; protected AutopilotAbility330(@NonNull AutopilotAbilityManager manager, int mapVersion) { this.manager = manager; this.mapVersion = mapVersion; this.masterVersion = -1; + NODE_INFO_STATE = manager.getStringArray(R.array.adas_node_info_state); } protected synchronized void setFsmStatusReasonRespond(FSMStatusReasonQueryOuterClass.FSMStatusReasonRespond fsmStatusReasonRespond) { @@ -76,14 +79,14 @@ public class AutopilotAbility330 { for (SystemStatusInfo.NodeInfo info : list) { String nodeName = info.getNodeName(); int state = info.getState(); - if (state < AutopilotAbilityManager.NODE_INFO_STATE.length) { - unableAutopilotReasons = manager.addUnableAutopilotReason(unableAutopilotReasons, UnableLaunchReason.SourceType.SSM, UnableLaunchReason.UnableType.SSM_OFFER, nodeName + AutopilotAbilityManager.NODE_INFO_STATE[state]); + if (state < NODE_INFO_STATE.length) { + unableAutopilotReasons = manager.addUnableAutopilotReason(unableAutopilotReasons, UnableLaunchReason.SourceType.SSM, UnableLaunchReason.UnableType.SSM_OFFER, nodeName + NODE_INFO_STATE[state]); } else { - unableAutopilotReasons = manager.addUnableAutopilotReason(unableAutopilotReasons, UnableLaunchReason.SourceType.SSM, UnableLaunchReason.UnableType.SSM_ERROR, nodeName + "未知异常"); + unableAutopilotReasons = manager.addUnableAutopilotReason(unableAutopilotReasons, UnableLaunchReason.SourceType.SSM, UnableLaunchReason.UnableType.SSM_ERROR, nodeName + manager.getString(R.string.adas_unknown_error)); } } } else { - unableAutopilotReasons = manager.addUnableAutopilotReason(unableAutopilotReasons, UnableLaunchReason.SourceType.SSM, UnableLaunchReason.UnableType.SSM_ERROR, "未知异常节点"); + unableAutopilotReasons = manager.addUnableAutopilotReason(unableAutopilotReasons, UnableLaunchReason.SourceType.SSM, UnableLaunchReason.UnableType.SSM_ERROR, manager.getString(R.string.adas_unknown_error_node)); } } } else { @@ -93,11 +96,11 @@ public class AutopilotAbility330 { isAutopilotAbility = false; String unableAutopilotReason = null; if (systemState == SystemStatusInfo.SystemState.SYS_STARTING) { - unableAutopilotReason = "系统正在启动"; + unableAutopilotReason = manager.getString(R.string.adas_system_starting); } else if (systemState == SystemStatusInfo.SystemState.SYS_EXITING) { - unableAutopilotReason = "系统正在关闭"; + unableAutopilotReason = manager.getString(R.string.adas_system_shutting_down); } else if (systemState == SystemStatusInfo.SystemState.SYS_FAULT) { - unableAutopilotReason = "系统异常"; + unableAutopilotReason = manager.getString(R.string.adas_system_error); } else if (systemState == SystemStatusInfo.SystemState.AUTO_PILOT_STARTING) { //TODO 如果第一次下发了启动自动驾驶，没起来或者存在干预 此时systemState是AUTO_PILOT_STARTING 需要二次下发启动自驾命令 所以需要排除此状态 isAutopilotAbility = true; @@ -107,11 +110,11 @@ public class AutopilotAbility330 { isAutopilotAbility = true; // unableAutopilotReason = "自动驾驶运行中"; } else if (systemState == SystemStatusInfo.SystemState.REMOTE_PILOT_STARTING) { - unableAutopilotReason = "平行驾驶启动中"; + unableAutopilotReason = manager.getString(R.string.adas_parallel_drive_starting); } else if (systemState == SystemStatusInfo.SystemState.REMOTE_PILOT_RUNNING) { - unableAutopilotReason = "平行驾驶运行中"; + unableAutopilotReason = manager.getString(R.string.adas_parallel_drive_running); } else { - unableAutopilotReason = "未知系统状态"; + unableAutopilotReason = manager.getString(R.string.adas_unknown_system_state); } if (!isAutopilotAbility) { unableAutopilotReasons = manager.addUnableAutopilotReason(unableAutopilotReasons, UnableLaunchReason.SourceType.SSM, UnableLaunchReason.UnableType.SSM_OFFER, unableAutopilotReason); @@ -120,7 +123,7 @@ public class AutopilotAbility330 { } } else { isAutopilotAbility = false;//是否能启动自动驾驶 - unableAutopilotReasons = manager.addUnableAutopilotReason(unableAutopilotReasons, UnableLaunchReason.SourceType.LIB, UnableLaunchReason.UnableType.SSM_TIMEOUT, "SSM查询超时无响应"); + unableAutopilotReasons = manager.addUnableAutopilotReason(unableAutopilotReasons, UnableLaunchReason.SourceType.LIB, UnableLaunchReason.UnableType.SSM_TIMEOUT, manager.getString(R.string.adas_ssm_find_timeout)); } if (fsmStatusReasonRespond != null) { int count = fsmStatusReasonRespond.getFsmStatusReasonRespondCount(); @@ -133,7 +136,7 @@ public class AutopilotAbility330 { } } if (unableAutopilotReasons == null || unableAutopilotReasons.isEmpty()) { - unableAutopilotReasons = manager.addUnableAutopilotReason(unableAutopilotReasons, UnableLaunchReason.SourceType.LIB, UnableLaunchReason.UnableType.FSM_ERROR, "FSM数据异常"); + unableAutopilotReasons = manager.addUnableAutopilotReason(unableAutopilotReasons, UnableLaunchReason.SourceType.LIB, UnableLaunchReason.UnableType.FSM_ERROR, manager.getString(R.string.adas_fsm_data_error)); } } } diff --git a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/autopilot/ability/AutopilotAbility350And360.java b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/autopilot/ability/AutopilotAbility350And360.java index 5b4cca89d7..062a28b7b2 100644 --- a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/autopilot/ability/AutopilotAbility350And360.java +++ b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/autopilot/ability/AutopilotAbility350And360.java @@ -3,6 +3,7 @@ package com.zhidao.support.adas.high.common.autopilot.ability; import androidx.annotation.NonNull; import com.zhidao.support.adas.high.AdasManager; +import com.zhidao.support.adas.high.R; import com.zhidao.support.adas.high.common.CupidLogUtils; import com.zhjt.mogo.adas.data.bean.LaunchConditionData; import com.zhjt.mogo.adas.data.bean.UnableLaunchReason; @@ -26,11 +27,6 @@ import system_master.SsmInfo; */ public class AutopilotAbility350And360 { private final String TAG = this.getClass().getSimpleName(); - private static final String REASON_CHASSIS_BRAKE = "刹车踏板"; - private static final String REASON_CHASSIS_THROTTLE = "油门踏板"; - private static final String REASON_CHASSIS_GEAR = "档位"; - private static final String REASON_CHASSIS_HAZARD_LIGHTS = "危险报警灯"; - private static final String REASON_CHASSIS_STEERING = "方向盘"; @NonNull private final AutopilotAbilityManager manager; private volatile SsmInfo.SsmStatusInf statusInfo; @@ -54,9 +50,11 @@ public class AutopilotAbility350And360 { private int masterVersion = -1;//Master版本 private long seqNum = -1;//消息条数 + private final String[] NODE_INFO_STATE_FIXED_FREQUENCY; public AutopilotAbility350And360(@NonNull AutopilotAbilityManager manager) { this.manager = manager; + NODE_INFO_STATE_FIXED_FREQUENCY = manager.getStringArray(R.array.adas_node_info_state_fixed_frequency); } public void setCarConfig(@NonNull MessagePad.CarConfigResp carConfig) { @@ -151,14 +149,14 @@ public class AutopilotAbility350And360 { SsmInfo.NodeInf info = statusInfo.getAutoPilotUnreadyList(i); String nodeName = info.getNodeName(); int state = info.getState().getNumber(); - if (state < AutopilotAbilityManager.NODE_INFO_STATE_FIXED_FREQUENCY.length) { - unableAutopilotReasons = manager.addUnableAutopilotReason(unableAutopilotReasons, UnableLaunchReason.SourceType.SSM, UnableLaunchReason.UnableType.SSM_OFFER, nodeName + AutopilotAbilityManager.NODE_INFO_STATE_FIXED_FREQUENCY[state]); + if (state < NODE_INFO_STATE_FIXED_FREQUENCY.length) { + unableAutopilotReasons = manager.addUnableAutopilotReason(unableAutopilotReasons, UnableLaunchReason.SourceType.SSM, UnableLaunchReason.UnableType.SSM_OFFER, nodeName + NODE_INFO_STATE_FIXED_FREQUENCY[state]); } else { - unableAutopilotReasons = manager.addUnableAutopilotReason(unableAutopilotReasons, UnableLaunchReason.SourceType.SSM, UnableLaunchReason.UnableType.SSM_ERROR, nodeName + "未知异常"); + unableAutopilotReasons = manager.addUnableAutopilotReason(unableAutopilotReasons, UnableLaunchReason.SourceType.SSM, UnableLaunchReason.UnableType.SSM_ERROR, nodeName + manager.getString(R.string.adas_unknown_error)); } } } else { - unableAutopilotReasons = manager.addUnableAutopilotReason(unableAutopilotReasons, UnableLaunchReason.SourceType.SSM, UnableLaunchReason.UnableType.SSM_ERROR, "未知异常节点"); + unableAutopilotReasons = manager.addUnableAutopilotReason(unableAutopilotReasons, UnableLaunchReason.SourceType.SSM, UnableLaunchReason.UnableType.SSM_ERROR, manager.getString(R.string.adas_unknown_error_node)); } } } else { @@ -166,21 +164,21 @@ public class AutopilotAbility350And360 { if (modeState != SsmInfo.ModeState.MODE_RUN_UNREADY && modeState != SsmInfo.ModeState.MODE_RUN_READY) { String unableAutopilotReason = null; if (modeState == SsmInfo.ModeState.MODE_STOP_UNREADY) { - unableAutopilotReason = "系统处于停止模式（未就绪）"; + unableAutopilotReason = manager.getString(R.string.adas_mode_stop_unready); } else if (modeState == SsmInfo.ModeState.MODE_STOP_READY) { - unableAutopilotReason = "系统处于停止模式"; + unableAutopilotReason = manager.getString(R.string.adas_mode_stop_ready); } else if (modeState == SsmInfo.ModeState.MODE_IDLE_UNREADY) { - unableAutopilotReason = "系统处于空闲模式（未就绪）"; + unableAutopilotReason = manager.getString(R.string.adas_mode_idle_unready); } else if (modeState == SsmInfo.ModeState.MODE_IDLE_READY) { - unableAutopilotReason = "系统处于空闲模式"; + unableAutopilotReason = manager.getString(R.string.adas_mode_idle_ready); } else { - unableAutopilotReason = "未知系统模式"; + unableAutopilotReason = manager.getString(R.string.adas_unknown_system_mode); } unableAutopilotReasons = manager.addUnableAutopilotReason(unableAutopilotReasons, UnableLaunchReason.SourceType.SSM, UnableLaunchReason.UnableType.SSM_OFFER, unableAutopilotReason); } } } else { - unableAutopilotReasons = manager.addUnableAutopilotReason(unableAutopilotReasons, UnableLaunchReason.SourceType.LIB, UnableLaunchReason.UnableType.SSM_TIMEOUT, "SSM超时无响应"); + unableAutopilotReasons = manager.addUnableAutopilotReason(unableAutopilotReasons, UnableLaunchReason.SourceType.LIB, UnableLaunchReason.UnableType.SSM_TIMEOUT, manager.getString(R.string.adas_ssm_timeout)); } return unableAutopilotReasons; } @@ -240,26 +238,26 @@ public class AutopilotAbility350And360 { if (chassisStates.hasBrakeSystemStates()) { float brake = chassisStates.getBrakeSystemStates().getBrakePedalResponsePosition(); if (brake > 0) { - unableAutopilotReasons = manager.addUnableAutopilotReason(unableAutopilotReasons, UnableLaunchReason.SourceType.CHASSIS, UnableLaunchReason.UnableType.CHASSIS_BRAKE, REASON_CHASSIS_BRAKE); + unableAutopilotReasons = manager.addUnableAutopilotReason(unableAutopilotReasons, UnableLaunchReason.SourceType.CHASSIS, UnableLaunchReason.UnableType.CHASSIS_BRAKE, manager.getString(R.string.adas_reason_chassis_brake)); } } //油门踏板 if (chassisStates.hasDrivingSystemStates()) { float throttle = chassisStates.getDrivingSystemStates().getThrottleResponsePosition(); if (throttle > 0) { - unableAutopilotReasons = manager.addUnableAutopilotReason(unableAutopilotReasons, UnableLaunchReason.SourceType.CHASSIS, UnableLaunchReason.UnableType.CHASSIS_THROTTLE, REASON_CHASSIS_THROTTLE); + unableAutopilotReasons = manager.addUnableAutopilotReason(unableAutopilotReasons, UnableLaunchReason.SourceType.CHASSIS, UnableLaunchReason.UnableType.CHASSIS_THROTTLE, manager.getString(R.string.adas_reason_chassis_throttle)); } } //档位 if (chassisStates.hasGearSystemStates()) { Chassis.GearPosition gear = chassisStates.getGearSystemStates().getGearPosition(); if (!isLaunchAutopilotGear(gear)) { - unableAutopilotReasons = manager.addUnableAutopilotReason(unableAutopilotReasons, UnableLaunchReason.SourceType.CHASSIS, UnableLaunchReason.UnableType.CHASSIS_GEAR, REASON_CHASSIS_GEAR); + unableAutopilotReasons = manager.addUnableAutopilotReason(unableAutopilotReasons, UnableLaunchReason.SourceType.CHASSIS, UnableLaunchReason.UnableType.CHASSIS_GEAR, manager.getString(R.string.adas_reason_chassis_gear)); } } //危险报警灯 if (!isLaunchAutopilotLight(currentLight)) { - unableAutopilotReasons = manager.addUnableAutopilotReason(unableAutopilotReasons, UnableLaunchReason.SourceType.CHASSIS, UnableLaunchReason.UnableType.CHASSIS_HAZARD_LIGHTS, REASON_CHASSIS_HAZARD_LIGHTS); + unableAutopilotReasons = manager.addUnableAutopilotReason(unableAutopilotReasons, UnableLaunchReason.SourceType.CHASSIS, UnableLaunchReason.UnableType.CHASSIS_HAZARD_LIGHTS, manager.getString(R.string.adas_reason_chassis_hazard_lights)); } //延迟太高改用timer // //方向盘 @@ -288,7 +286,7 @@ public class AutopilotAbility350And360 { // } // Log.i(TAG, "方向盘是否在转动=" + isTurning.get()); if (isTurning.get()) { - unableAutopilotReasons = manager.addUnableAutopilotReason(unableAutopilotReasons, UnableLaunchReason.SourceType.CHASSIS, UnableLaunchReason.UnableType.CHASSIS_STEERING, REASON_CHASSIS_STEERING); + unableAutopilotReasons = manager.addUnableAutopilotReason(unableAutopilotReasons, UnableLaunchReason.SourceType.CHASSIS, UnableLaunchReason.UnableType.CHASSIS_STEERING, manager.getString(R.string.adas_reason_chassis_steering)); } } if (listener != null) { diff --git a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/autopilot/ability/AutopilotAbility360.java b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/autopilot/ability/AutopilotAbility360.java index 14a5484c7d..fd277a3e45 100644 --- a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/autopilot/ability/AutopilotAbility360.java +++ b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/autopilot/ability/AutopilotAbility360.java @@ -5,6 +5,7 @@ import android.text.TextUtils; import androidx.annotation.NonNull; import com.zhidao.support.adas.high.AdasManager; +import com.zhidao.support.adas.high.R; import com.zhidao.support.adas.high.common.CupidLogUtils; import com.zhjt.mogo.adas.data.bean.LaunchConditionData; import com.zhjt.mogo.adas.data.bean.UnableLaunchReason; @@ -28,10 +29,12 @@ public class AutopilotAbility360 { private volatile FSMStatusReasonQueryOuterClass.FSMStatusReasonRespond fsmStatusReasonRespond;//自动驾驶状态为OFF的原因 private int masterVersion = -1;//Master版本 private OnAutopilotAbilityListener listener; + private final String[] NODE_INFO_STATE_FIXED_FREQUENCY; protected AutopilotAbility360(@NonNull AutopilotAbilityManager manager) { this.manager = manager; this.masterVersion = -1; + NODE_INFO_STATE_FIXED_FREQUENCY = manager.getStringArray(R.array.adas_node_info_state_fixed_frequency); } protected synchronized void setFsmStatusReasonRespond(FSMStatusReasonQueryOuterClass.FSMStatusReasonRespond fsmStatusReasonRespond) { @@ -68,14 +71,14 @@ public class AutopilotAbility360 { SsmInfo.NodeInf info = statusInfo.getAutoPilotUnreadyList(i); String nodeName = info.getNodeName(); int state = info.getState().getNumber(); - if (state < AutopilotAbilityManager.NODE_INFO_STATE_FIXED_FREQUENCY.length) { - unableAutopilotReasons = manager.addUnableAutopilotReason(unableAutopilotReasons, UnableLaunchReason.SourceType.SSM, UnableLaunchReason.UnableType.SSM_OFFER, nodeName + AutopilotAbilityManager.NODE_INFO_STATE_FIXED_FREQUENCY[state]); + if (state < NODE_INFO_STATE_FIXED_FREQUENCY.length) { + unableAutopilotReasons = manager.addUnableAutopilotReason(unableAutopilotReasons, UnableLaunchReason.SourceType.SSM, UnableLaunchReason.UnableType.SSM_OFFER, nodeName + NODE_INFO_STATE_FIXED_FREQUENCY[state]); } else { - unableAutopilotReasons = manager.addUnableAutopilotReason(unableAutopilotReasons, UnableLaunchReason.SourceType.SSM, UnableLaunchReason.UnableType.SSM_ERROR, nodeName + "未知异常"); + unableAutopilotReasons = manager.addUnableAutopilotReason(unableAutopilotReasons, UnableLaunchReason.SourceType.SSM, UnableLaunchReason.UnableType.SSM_ERROR, nodeName + manager.getString(R.string.adas_unknown_error)); } } } else { - unableAutopilotReasons = manager.addUnableAutopilotReason(unableAutopilotReasons, UnableLaunchReason.SourceType.SSM, UnableLaunchReason.UnableType.SSM_ERROR, "未知异常节点"); + unableAutopilotReasons = manager.addUnableAutopilotReason(unableAutopilotReasons, UnableLaunchReason.SourceType.SSM, UnableLaunchReason.UnableType.SSM_ERROR, manager.getString(R.string.adas_unknown_error_node)); } } } else { @@ -84,22 +87,22 @@ public class AutopilotAbility360 { isAutopilotAbility = false; String unableAutopilotReason = null; if (modeState == SsmInfo.ModeState.MODE_STOP_UNREADY) { - unableAutopilotReason = "系统处于停止模式（未就绪）"; + unableAutopilotReason = manager.getString(R.string.adas_mode_stop_unready); } else if (modeState == SsmInfo.ModeState.MODE_STOP_READY) { - unableAutopilotReason = "系统处于停止模式"; + unableAutopilotReason = manager.getString(R.string.adas_mode_stop_ready); } else if (modeState == SsmInfo.ModeState.MODE_IDLE_UNREADY) { - unableAutopilotReason = "系统处于空闲模式（未就绪）"; + unableAutopilotReason = manager.getString(R.string.adas_mode_idle_unready); } else if (modeState == SsmInfo.ModeState.MODE_IDLE_READY) { - unableAutopilotReason = "系统处于空闲模式"; + unableAutopilotReason = manager.getString(R.string.adas_mode_idle_ready); } else { - unableAutopilotReason = "未知系统模式"; + unableAutopilotReason = manager.getString(R.string.adas_unknown_system_mode); } unableAutopilotReasons = manager.addUnableAutopilotReason(unableAutopilotReasons, UnableLaunchReason.SourceType.SSM, UnableLaunchReason.UnableType.SSM_OFFER, unableAutopilotReason); } } } else { isAutopilotAbility = false;//是否能启动自动驾驶 - unableAutopilotReasons = manager.addUnableAutopilotReason(unableAutopilotReasons, UnableLaunchReason.SourceType.LIB, UnableLaunchReason.UnableType.SSM_TIMEOUT, "SSM超时无响应"); + unableAutopilotReasons = manager.addUnableAutopilotReason(unableAutopilotReasons, UnableLaunchReason.SourceType.LIB, UnableLaunchReason.UnableType.SSM_TIMEOUT, manager.getString(R.string.adas_ssm_timeout)); } if (fsmStatusReasonRespond != null) { int count = fsmStatusReasonRespond.getFsmStatusReasonRespondCount(); @@ -112,7 +115,7 @@ public class AutopilotAbility360 { } } if (unableAutopilotReasons == null || unableAutopilotReasons.isEmpty()) { - unableAutopilotReasons = manager.addUnableAutopilotReason(unableAutopilotReasons, UnableLaunchReason.SourceType.LIB, UnableLaunchReason.UnableType.FSM_ERROR, "FSM数据异常"); + unableAutopilotReasons = manager.addUnableAutopilotReason(unableAutopilotReasons, UnableLaunchReason.SourceType.LIB, UnableLaunchReason.UnableType.FSM_ERROR, manager.getString(R.string.adas_fsm_data_error)); } } } diff --git a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/autopilot/ability/AutopilotAbilityFSM.java b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/autopilot/ability/AutopilotAbilityFSM.java index 9a24d0f6f3..b68cab8c66 100644 --- a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/autopilot/ability/AutopilotAbilityFSM.java +++ b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/autopilot/ability/AutopilotAbilityFSM.java @@ -2,6 +2,7 @@ package com.zhidao.support.adas.high.common.autopilot.ability; import androidx.annotation.NonNull; +import com.zhidao.support.adas.high.R; import com.zhjt.mogo.adas.data.bean.LaunchConditionData; import com.zhjt.mogo.adas.data.bean.UnableLaunchReason; @@ -38,7 +39,7 @@ public class AutopilotAbilityFSM { protected void onCallbackFsm(Fsm2024.FSMStateMsg fsmState) { ArrayList unableAutopilotReasons = null;//不能启动自动驾驶原因 if (fsmState == null) { - unableAutopilotReasons = manager.addUnableAutopilotReason(unableAutopilotReasons, UnableLaunchReason.SourceType.LIB, UnableLaunchReason.UnableType.FSM2024_TIMEOUT, "FSM超时无响应"); + unableAutopilotReasons = manager.addUnableAutopilotReason(unableAutopilotReasons, UnableLaunchReason.SourceType.LIB, UnableLaunchReason.UnableType.FSM2024_TIMEOUT, manager.getString(R.string.adas_fsm_timeout)); } else { if (!fsmState.getPilotStandbyFlag()) { List list = null; diff --git a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/autopilot/ability/AutopilotAbilityManager.java b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/autopilot/ability/AutopilotAbilityManager.java index 337886d0c2..9249a1e7e4 100644 --- a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/autopilot/ability/AutopilotAbilityManager.java +++ b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/autopilot/ability/AutopilotAbilityManager.java @@ -1,15 +1,19 @@ package com.zhidao.support.adas.high.common.autopilot.ability; +import android.app.Application; import android.text.TextUtils; +import androidx.annotation.ArrayRes; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import androidx.annotation.StringRes; import com.zhidao.support.adas.high.AdasManager; import com.zhidao.support.adas.high.AdasOptions; import com.zhidao.support.adas.high.BuildConfig; import com.zhidao.support.adas.high.OnAdasListener; +import com.zhidao.support.adas.high.R; import com.zhidao.support.adas.high.common.CupidLogUtils; import com.zhjt.mogo.adas.data.AdasConstants; import com.zhjt.mogo.adas.data.bean.LaunchConditionData; @@ -45,8 +49,6 @@ public class AutopilotAbilityManager implements OnAutopilotAbilityListener { private static final String TAG = AutopilotAbilityManager.class.getSimpleName(); protected static final long DEFAULT_TIMEOUT = 5000L;//SSM和FSM超时时间 protected static final long DEFAULT_DETECTION_TIME = 3 * 1000L;//默认检测周期 - protected static final String[] NODE_INFO_STATE = {"未知状态", "依赖未就绪", "启动中", "运行", "停止", "无法启动状态", "人为启动状态", "人为关闭状态"}; - protected static final String[] NODE_INFO_STATE_FIXED_FREQUENCY = {"未知状态", "依赖未就绪", "启动中", "运行", "停止", "无法启动状态", "非自动启动状态", "非自动关闭状态"}; private static volatile AutopilotAbilityManager INSTANCE; private OnAdasListener listener; @@ -75,6 +77,7 @@ public class AutopilotAbilityManager implements OnAutopilotAbilityListener { private final AtomicInteger isSupportFSM2024 = new AtomicInteger(-1);//-1：未初始化 0：不支持 1：通过SSM V2判断支持 2：通过FSM数据源判断支持 private final Map nodeStateInfos = new ConcurrentHashMap<>(); private int fsm2024Version = -1;//FSM2024版本 -1：未初始化 0：SSM判断存在FSM2024但是并不知道具体版本或根据FMS中Version解析失败 其他数值：根据FSM数据中的version 判断得出 + private Application context; private AutopilotAbilityManager() { } @@ -90,6 +93,10 @@ public class AutopilotAbilityManager implements OnAutopilotAbilityListener { return INSTANCE; } + public void init(@NonNull Application context) { + this.context = context; + } + private void initStartData() { nodeStateInfos.clear(); NodeStateInfo ssmInfo = new NodeStateInfo(AdasConstants.NodeName.SSM, AdasConstants.NodeState.NODE_EXIST); @@ -129,7 +136,7 @@ public class AutopilotAbilityManager implements OnAutopilotAbilityListener { */ protected ArrayList addUnableAutopilotReason(ArrayList unableAutopilotReasons, UnableLaunchReason.SourceType source, UnableLaunchReason.UnableType unableType, String unableAutopilotReason) { if (TextUtils.isEmpty(unableAutopilotReason)) { - unableAutopilotReason = "未知"; + unableAutopilotReason = getString(R.string.adas_unknown); } List list = new ArrayList<>(); list.add(unableAutopilotReason); @@ -587,4 +594,22 @@ public class AutopilotAbilityManager implements OnAutopilotAbilityListener { isJLB2 = false; } + + public String getString(@StringRes int resId) { + if (context == null) return ""; + try { + return context.getString(resId); + } catch (Exception e) { + return ""; + } + } + + public String[] getStringArray(@ArrayRes int resId) { + if (context == null) return new String[0]; + try { + return context.getResources().getStringArray(resId); + } catch (Exception e) { + return new String[0]; + } + } } diff --git a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/autopilot/ability/BaseAutopilotAbilityChassis.java b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/autopilot/ability/BaseAutopilotAbilityChassis.java index 3cccc7f54f..67662f8647 100644 --- a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/autopilot/ability/BaseAutopilotAbilityChassis.java +++ b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/autopilot/ability/BaseAutopilotAbilityChassis.java @@ -2,6 +2,7 @@ package com.zhidao.support.adas.high.common.autopilot.ability; import androidx.annotation.NonNull; +import com.zhidao.support.adas.high.R; import com.zhjt.mogo.adas.data.bean.UnableLaunchReason; import java.util.ArrayList; @@ -17,11 +18,6 @@ import mogo.telematics.pad.MessagePad; */ public abstract class BaseAutopilotAbilityChassis { protected final String TAG = this.getClass().getSimpleName(); - private static final String REASON_CHASSIS_BRAKE = "刹车踏板"; - private static final String REASON_CHASSIS_THROTTLE = "油门踏板"; - private static final String REASON_CHASSIS_GEAR = "档位"; - private static final String REASON_CHASSIS_HAZARD_LIGHTS = "危险报警灯"; - private static final String REASON_CHASSIS_STEERING = "方向盘"; @NonNull protected final AutopilotAbilityManager manager; protected ChassisStatesOuterClass.ChassisStates chassisStates; @@ -116,26 +112,26 @@ public abstract class BaseAutopilotAbilityChassis { if (chassisStates.hasBrakeSystemStates()) { float brake = chassisStates.getBrakeSystemStates().getBrakePedalResponsePosition(); if (brake > 0) { - unableAutopilotReasons = manager.addUnableAutopilotReason(unableAutopilotReasons, UnableLaunchReason.SourceType.CHASSIS, UnableLaunchReason.UnableType.CHASSIS_BRAKE, REASON_CHASSIS_BRAKE); + unableAutopilotReasons = manager.addUnableAutopilotReason(unableAutopilotReasons, UnableLaunchReason.SourceType.CHASSIS, UnableLaunchReason.UnableType.CHASSIS_BRAKE, manager.getString(R.string.adas_reason_chassis_brake)); } } //油门踏板 if (chassisStates.hasDrivingSystemStates()) { float throttle = chassisStates.getDrivingSystemStates().getThrottleResponsePosition(); if (throttle > 0) { - unableAutopilotReasons = manager.addUnableAutopilotReason(unableAutopilotReasons, UnableLaunchReason.SourceType.CHASSIS, UnableLaunchReason.UnableType.CHASSIS_THROTTLE, REASON_CHASSIS_THROTTLE); + unableAutopilotReasons = manager.addUnableAutopilotReason(unableAutopilotReasons, UnableLaunchReason.SourceType.CHASSIS, UnableLaunchReason.UnableType.CHASSIS_THROTTLE, manager.getString(R.string.adas_reason_chassis_throttle)); } } //档位 if (chassisStates.hasGearSystemStates()) { Chassis.GearPosition gear = chassisStates.getGearSystemStates().getGearPosition(); if (!isLaunchAutopilotGear(gear)) { - unableAutopilotReasons = manager.addUnableAutopilotReason(unableAutopilotReasons, UnableLaunchReason.SourceType.CHASSIS, UnableLaunchReason.UnableType.CHASSIS_GEAR, REASON_CHASSIS_GEAR); + unableAutopilotReasons = manager.addUnableAutopilotReason(unableAutopilotReasons, UnableLaunchReason.SourceType.CHASSIS, UnableLaunchReason.UnableType.CHASSIS_GEAR, manager.getString(R.string.adas_reason_chassis_gear)); } } //危险报警灯 if (!isLaunchAutopilotLight()) { - unableAutopilotReasons = manager.addUnableAutopilotReason(unableAutopilotReasons, UnableLaunchReason.SourceType.CHASSIS, UnableLaunchReason.UnableType.CHASSIS_HAZARD_LIGHTS, REASON_CHASSIS_HAZARD_LIGHTS); + unableAutopilotReasons = manager.addUnableAutopilotReason(unableAutopilotReasons, UnableLaunchReason.SourceType.CHASSIS, UnableLaunchReason.UnableType.CHASSIS_HAZARD_LIGHTS, manager.getString(R.string.adas_reason_chassis_hazard_lights)); } //方向盘 if (chassisStates.hasSteerSystemStates()) { @@ -150,7 +146,7 @@ public abstract class BaseAutopilotAbilityChassis { oldSteering = steering; // CupidLogUtils.log(TAG, "方向盘是否转动=" + isTurning); if (isTurning) { - unableAutopilotReasons = manager.addUnableAutopilotReason(unableAutopilotReasons, UnableLaunchReason.SourceType.CHASSIS, UnableLaunchReason.UnableType.CHASSIS_STEERING, REASON_CHASSIS_STEERING); + unableAutopilotReasons = manager.addUnableAutopilotReason(unableAutopilotReasons, UnableLaunchReason.SourceType.CHASSIS, UnableLaunchReason.UnableType.CHASSIS_STEERING, manager.getString(R.string.adas_reason_chassis_steering)); } } } diff --git a/libraries/mogo-adas/src/main/res/values/strings.xml b/libraries/mogo-adas/src/main/res/values/strings.xml new file mode 100644 index 0000000000..3ec8098563 --- /dev/null +++ b/libraries/mogo-adas/src/main/res/values/strings.xml @@ -0,0 +1,60 @@ + + + 超时时间： + 最后刷新时间时间差： + 最后一条Telematics心跳接收时间 + 最后一条Telematics数据发送时间 + + + + 未知状态 + 依赖未就绪 + 启动中 + 运行 + 停止 + 无法启动状态 + 人为启动状态 + 人为关闭状态 + + + + + 未知状态 + 依赖未就绪 + 启动中 + 运行 + 停止 + 无法启动状态 + 非自动启动状态 + 非自动关闭状态 + + + 未知 + 未知异常 + 未知异常节点 + 系统正在启动 + 系统正在关闭 + 系统异常 + 平行驾驶启动中 + 平行驾驶运行中 + 未知系统状态 + SSM查询超时无响应 + FSM数据异常 + 刹车踏板 + 油门踏板 + 档位 + 危险报警灯 + 方向盘 + 系统处于停止模式（未就绪） + 系统处于停止模式 + 系统处于空闲模式（未就绪） + 系统处于空闲模式 + 未知系统模式 + SSM超时无响应 + FSM超时无响应 + + + + + + From 08a5352df5c506741fb7262a23a23198d5b97064 Mon Sep 17 00:00:00 2001 From: xinfengkun Date: Tue, 11 Nov 2025 15:24:07 +0800 Subject: [PATCH 06/33] =?UTF-8?q?[8.2.6]appIdentityMode=20=E5=9F=8B?= =?UTF-8?q?=E7=82=B9=E5=92=8C=E9=93=BE=E8=B7=AF=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/biz/lansocket/LoginLanDriverSocket.kt | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/lansocket/LoginLanDriverSocket.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/lansocket/LoginLanDriverSocket.kt index 4f1121f4fd..76c027adde 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/lansocket/LoginLanDriverSocket.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/lansocket/LoginLanDriverSocket.kt @@ -1,6 +1,7 @@ package com.mogo.och.common.module.biz.lansocket import android.util.Log +import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.function.call.hmi.CallerHmiManager import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_OCHCOMMON @@ -48,6 +49,10 @@ object LoginLanDriverSocket : ILoginCallback { } if(LoginStatusManager.isLogin()) { FlavorUtils.getEnvCheck() + OchChainLogManager.writeChainLog( + "LoginLanDriverSocket", + "客户端注册 appIdentityMode :${FunctionBuildConfig.appIdentityMode} vehicleType: ${FlavorUtils.vehicleType} businessType: ${FlavorUtils.businessType} projectType: ${FlavorUtils.projectType} envType: ${FlavorUtils.envType}" + ) val msg = ChangeBusinessType(FlavorUtils.vehicleType!!, FlavorUtils.businessType!!, FlavorUtils.projectType!!, FlavorUtils.envType!!) LanSocketManager.sendMsgToClient(msg) }else{ @@ -82,6 +87,10 @@ object LoginLanDriverSocket : ILoginCallback { if (FlavorUtils.vehicleType != null && FlavorUtils.projectType != null && FlavorUtils.envType != null) { when (currentStatus) { EnumLoginStatus.Login -> { + OchChainLogManager.writeChainLog( + "LoginLanDriverSocket", + "司机端登录 appIdentityMode :${FunctionBuildConfig.appIdentityMode} vehicleType: ${FlavorUtils.vehicleType} businessType: ${FlavorUtils.businessType} projectType: ${FlavorUtils.projectType} envType: ${FlavorUtils.envType}" + ) val msg = ChangeBusinessType( FlavorUtils.vehicleType!!, @@ -114,6 +123,10 @@ object LoginLanDriverSocket : ILoginCallback { private fun loopCheck() { FlavorUtils.getEnvCheck() + OchChainLogManager.writeChainLog( + "LoginLanDriverSocket", + "轮询检查 appIdentityMode :${FunctionBuildConfig.appIdentityMode} vehicleType: ${FlavorUtils.vehicleType} businessType: ${FlavorUtils.businessType} projectType: ${FlavorUtils.projectType} envType: ${FlavorUtils.envType}" + ) val msg = EnvCheck(FlavorUtils.vehicleType!!, FlavorUtils.businessType!!, FlavorUtils.projectType!!, FlavorUtils.envType!!) LanSocketManager.sendMsgToClient(msg) } From 8f6e8de77e7b7726c5fe24d74aa67be082ccbbc4 Mon Sep 17 00:00:00 2001 From: xinfengkun Date: Wed, 12 Nov 2025 19:35:55 +0800 Subject: [PATCH 07/33] =?UTF-8?q?[8.2.8][i18n]=20=E6=89=80=E6=9C=89?= =?UTF-8?q?=E5=90=90=E5=8F=B8=20=E4=B8=AD=E6=96=87=E6=8A=BD=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/och/charter/model/DriverM1Model.kt | 3 +- .../autopilot/AutopilotStatusViewModel.kt | 4 +- .../passenger/model/CharterPassengerModel.kt | 15 +- .../net/BusPassengerServiceManager.kt | 4 +- .../presenter/BusPassengerPresenter.kt | 24 +- .../och/charter/passenger/ui/MainFragment.kt | 3 +- .../ui/bottom/impl/GoViewWithArrive.kt | 12 +- .../passenger/ui/bottom/impl/StopSiteView.kt | 9 +- .../passenger/ui/debugview/DebugView.kt | 3 +- .../ui/orderinfo/OrderInfoViewModel.kt | 4 +- .../ui/selectline/SelectLineViewModel.kt | 37 ++- .../adapter/OrderSiteItemAdapter.kt | 6 +- .../ui/softcontrol/SoftControlView.kt | 18 +- .../ui/softcontrol/SoftControlViewModel.kt | 31 +- .../passenger/ui/video/ConsultVideoPlayer.kt | 6 +- .../video/adapter/RecyclerVideoAdapter.java | 6 +- .../och/biz/media/video/MediaLoopPlayView.kt | 4 +- .../ui/errorpoint/ReportErrorPointView.kt | 3 +- .../errorpoint/ReportErrorPointViewModel.kt | 4 +- .../ui/routingselect/RoutingSelectModel.kt | 7 +- .../ui/routingselect/RoutingSelectView.kt | 6 +- .../ui/runing/other/TaskRunningView.kt | 3 +- .../routing/ui/runing/taxi/TaxiRunningView.kt | 3 +- .../autopilot/OchAutoPilotManager.kt | 4 +- .../och/bridge/autopilot/line/LineManager.kt | 19 +- .../manager/bluetooth/BaseBluetoothManager.kt | 4 +- .../bluetooth/OchBluetoothGattCallback.kt | 7 +- .../debug/DebugViewWatchDogFragment.kt | 6 +- .../cloud/AbnormalFactorsLoopManager.kt | 17 +- .../module/manager/xiaozhi/ZhiStateManager.kt | 4 +- .../map/AmapNaviToDestinationModel.java | 7 +- .../common/module/utils/ToastUtilsOch.java | 4 +- .../wigets/dialog/CommonFeedbackDialog.kt | 3 +- .../module/wigets/toast/ToastCharterUtils.kt | 22 ++ .../com/mogo/och/offline/model/LineModel.kt | 6 +- .../offline/repository/RepositoryManager.kt | 4 +- .../offline/ui/switchline/SwtichLineModel.kt | 4 +- .../com/mogo/och/weaknet/model/LineModel.kt | 9 +- .../mogo/och/weaknet/model/SynchDataModel.kt | 3 +- .../repository/line/impl/WeaknetRepository.kt | 4 +- .../weaknet/ui/switchtask/SwitchTaskView.kt | 9 +- .../weaknet/ui/switchtask/SwtichTaskModel.kt | 4 +- .../model/SweeperOperateTaskModel.java | 27 +- .../unmanned/taxi/ui/task/TaxiTaskModel.kt | 3 +- .../ui/task/cancleorder/CancleOrderView.kt | 3 +- .../passenger/model/AutopilotManager.kt | 4 +- .../ui/aiview/data/RoadCrossRoamViewModel.kt | 4 +- .../biz/dispatch/DispatchAutoPilotManager.kt | 43 ++- .../function/biz/v2x/vip/VipCarManager.kt | 4 +- .../autopilot/MoGoAutopilotControlProvider.kt | 10 +- .../MoGoAdasMsgConnectStatusListenerImpl.kt | 21 +- .../autopilot/telematic/TeleMsgHandler.kt | 13 +- .../badcase/BadCaseManager.kt | 33 +- .../badcase/biz/AIDataCollectView.kt | 9 +- .../badcase/biz/AIDataCollectWindow.kt | 12 +- .../badcase/biz/BadCaseConfigView.kt | 18 +- .../badcase/biz/BadCaseManagerView.kt | 31 +- .../badcase/biz/CaseTopicListDialog.java | 6 +- .../badcase/biz/InitiativeBadCaseWindow.kt | 21 +- .../badcase/biz/PassiveBadCaseWindow.kt | 21 +- .../biz/adapter/BagManagerListAdapter.kt | 3 +- .../binding/BindingCarNetWorkManager.kt | 3 +- .../logcatch/MogoLogCatchManager.kt | 29 +- .../mofang/MoGoMoFangProviderImpl.kt | 3 +- .../monitor/MonitorManager.kt | 10 +- .../ota/OTAUpgradeManager.kt | 16 +- .../status/flow/OverViewImpl.kt | 4 +- .../status/flow/gps/GpsImpl.kt | 4 +- .../upgrade/UpgradeAppNetWorkManager.kt | 3 +- .../weaknetwork/WeakNetworkStrategy.kt | 4 +- .../workorder/FaultReasonWindow.kt | 30 +- .../workorder/ReportTypeWindow.kt | 15 +- .../workorder/TakeOverReasonWindow.kt | 24 +- .../workorder/TakeOverRecordView.kt | 21 +- .../workorder/TakeOverSceneWindow.kt | 6 +- .../workorder/WorkOrderWindow.kt | 21 +- .../workorder/adapter/TakeOverListAdapter.kt | 6 +- .../function/hmi/bone/tab/CarInfoTabView.kt | 12 +- .../function/hmi/bone/tab/FaultReasonView.kt | 37 ++- .../function/hmi/bone/tab/ReportTypeView.kt | 15 +- .../function/hmi/bone/tab/WorkOrderView.kt | 24 +- .../hmi/bone/tab/adapter/MsgBoxTabAdapter.kt | 3 +- .../bone/toolkit/custom/ToolDriverRomaView.kt | 9 +- .../toolkit/custom/ToolRestartSystemView.kt | 9 +- .../toolkit/custom/ToolStopServiceView.kt | 18 +- .../function/hmi/ui/diskcopy/DiskCopyView.kt | 36 ++- .../ui/diskcopy/TerminateCopyDataDialog.kt | 6 +- .../hmi/ui/lookaround/M1LookAroundView.kt | 4 +- .../hmi/ui/mofang/MoFangStatusView.kt | 9 +- .../msgbox/adapter/DriverMsgBoxListAdapter.kt | 3 +- .../hmi/ui/operate/OperatePanelLayout.kt | 49 ++- .../preferences/PreferenceWithSpeedSetting.kt | 9 +- .../hmi/ui/setting/DebugSettingView.kt | 3 +- .../function/hmi/ui/setting/SOPSettingView.kt | 39 ++- .../core/function/hmi/ui/setting/ToolsView.kt | 4 +- .../function/hmi/ui/tools/AdUpgradeDialog.kt | 3 +- .../hmi/ui/tools/AutoPilotAndCheckView.kt | 36 ++- .../hmi/ui/tools/ModifyBindingCarDialog.kt | 6 +- .../function/hmi/ui/tools/OTAUpgradeDialog.kt | 36 ++- .../hmi/ui/tools/ToBindingCarDialog.kt | 6 +- .../function/hmi/ui/tools/UpgradeAppDialog.kt | 9 +- .../hmi/ui/widget/AutoPilotStatusView.kt | 3 +- .../function/hmi/ui/widget/BlueToothView.kt | 3 +- .../function/hmi/ui/widget/CheckSystemView.kt | 27 +- .../hmi/ui/widget/DriverMonitorView.kt | 6 +- .../hmi/ui/widget/ParallelDriveView.kt | 9 +- .../hmi/ui/widget/RomaPassengerView.kt | 6 +- .../hmi/ui/widget/SystemVersionView.kt | 18 +- .../core/function/business/ai/RomaManager.kt | 10 +- .../core/function/view/RoadCrossRoamView.kt | 3 +- .../src/main/res/values/string.xml | 285 ++++++++++++++++++ .../eagle/core/utilcode/kotlin/Extensions.kt | 3 +- .../eagle/core/utilcode/util/ToastUtils.java | 30 +- .../src/main/res/values/string.xml | 4 + .../java/com/mogo/commons/voice/AIAssist.java | 4 +- .../main/java/com/mogo/tts/pad/PadTTS.java | 3 +- tts/tts-pad/src/main/res/values/string.xml | 4 + .../main/java/com/mogo/tts/pad/ZhiTTS.java | 3 +- tts/tts-zhi/src/main/res/values/string.xml | 1 + 119 files changed, 1217 insertions(+), 430 deletions(-) create mode 100644 core/mogo-core-utils/src/main/res/values/string.xml create mode 100644 tts/tts-pad/src/main/res/values/string.xml diff --git a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/model/DriverM1Model.kt b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/model/DriverM1Model.kt index 41e7d46828..afff613c62 100644 --- a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/model/DriverM1Model.kt +++ b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/model/DriverM1Model.kt @@ -452,7 +452,8 @@ class DriverM1Model { && TextUtils.isEmpty(it.csvFileUrl) && TextUtils.isEmpty(it.csvFileUrlDPQP) ) { - ToastUtils.showLong("无发布轨迹, 请发布后重试") +// ToastUtils.showLong("无发布轨迹, 请发布后重试") + ToastUtils.showLong(R.string.module_taxi_no_publication_trajectory) CallerLogger.e( TAG, "isPassStartAutopilotCommand = " + FunctionBuildConfig.isPassStartAutopilotCommand diff --git a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/view/autopilot/AutopilotStatusViewModel.kt b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/view/autopilot/AutopilotStatusViewModel.kt index 38a7776c8c..b5129f776b 100644 --- a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/view/autopilot/AutopilotStatusViewModel.kt +++ b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/view/autopilot/AutopilotStatusViewModel.kt @@ -1,6 +1,7 @@ package com.magic.mogo.och.charter.view.autopilot import androidx.lifecycle.ViewModel +import com.magic.mogo.och.charter.R import com.magic.mogo.och.charter.bean.QueryCurrentOrderResponse.Result.Companion.ARRIVED import com.magic.mogo.och.charter.callback.IDriverM1ControllerStatusCallback import com.magic.mogo.och.charter.constant.CharterConst @@ -54,7 +55,8 @@ class AutopilotStatusViewModel: ViewModel(), IDriverM1ControllerStatusCallback, fun restartAutopilot() { // todo 启动自驾必须有订单路线 if(isAnimateRunning.get()){ - ToastUtils.showShort("启动自驾中") +// ToastUtils.showShort("启动自驾中") + ToastUtils.showShort(R.string.module_och_autopilot_starting) }else { if (DriverM1Model.get().isHaveOrder()) { DriverM1Model.get().restartAutopilot() diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/model/CharterPassengerModel.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/model/CharterPassengerModel.kt index 5c2b04d58c..f39e042cca 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/model/CharterPassengerModel.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/model/CharterPassengerModel.kt @@ -209,7 +209,8 @@ object CharterPassengerModel { super.onAutopilotGuardian(guardianInfo) guardianInfo?.let { if (it.code=="EMAP_ATTITUDE_INIT_FAILED") { - ToastCharterUtils.showToastShort("请等待车辆完成掉头后再出发吧～") +// ToastCharterUtils.showToastShort("请等待车辆完成掉头后再出发吧～") + ToastCharterUtils.showToastShort(R.string.module_och_emap_attitude_init_failed) } } } @@ -1122,7 +1123,8 @@ object CharterPassengerModel { fun startAutopilot() { orderInfo?.let { if (it.arriveStatus == OrderInfoResponse.ARRIVED) { - ToastCharterUtils.showToastLong("已到达目的地请重新选择线路") +// ToastCharterUtils.showToastLong("已到达目的地请重新选择线路") + ToastCharterUtils.showToastLong(R.string.module_och_car_arrived) return } //1、判断轨迹Id是否可用 @@ -1132,7 +1134,8 @@ object CharterPassengerModel { && TextUtils.isEmpty(it.csvFileUrl) && TextUtils.isEmpty(it.csvFileUrlDPQP) ) { - ToastUtils.showLong("无发布轨迹, 请发布后重试") +// ToastUtils.showLong("无发布轨迹, 请发布后重试") + ToastUtils.showLong(R.string.module_taxi_no_publication_trajectory) CallerLogger.e( TAG, "isPassStartAutopilotCommand = " + FunctionBuildConfig.isPassStartAutopilotCommand @@ -1151,14 +1154,16 @@ object CharterPassengerModel { } val parameters = initAutopilotControlParameters() if (null == parameters) { - ToastCharterUtils.showToastShort("请选择站点") +// ToastCharterUtils.showToastShort("请选择站点") + ToastCharterUtils.showToastShort(R.string.module_och_please_choose_station) e( SceneConstant.M_BUS + TAG, "行程日志-AutopilotControlParameters is empty." ) return } - ToastCharterUtils.showToastShort("启动自动驾驶中") +// ToastCharterUtils.showToastShort("启动自动驾驶中") + ToastCharterUtils.showToastShort(R.string.module_och_starting_autopilot) cleanRoutePoints() OchAutoPilotManager.startAutoPilot(parameters) d( diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/net/BusPassengerServiceManager.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/net/BusPassengerServiceManager.kt index 2e1035b131..61202de843 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/net/BusPassengerServiceManager.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/net/BusPassengerServiceManager.kt @@ -4,6 +4,7 @@ import android.content.Context import com.mogo.eagle.core.data.BaseData import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager import com.mogo.eagle.core.network.MoGoRetrofitFactory +import com.mogo.och.charter.passenger.R import com.mogo.och.charter.passenger.bean.request.ArriveDestRequest import com.mogo.och.charter.passenger.bean.request.EndOrderRequest import com.mogo.och.charter.passenger.bean.response.* @@ -40,7 +41,8 @@ object BusPassengerServiceManager { private fun beforeNet():Boolean{ if (draiverSn.isBlank()) { - ToastCharterUtils.showToastShort("已断开司机屏连接、请联系安全员") +// ToastCharterUtils.showToastShort("已断开司机屏连接、请联系安全员") + ToastCharterUtils.showToastShort(R.string.module_och_passenger_disconnect_driver) return true } return false diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/presenter/BusPassengerPresenter.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/presenter/BusPassengerPresenter.kt index c94d8a673c..aa283e44b6 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/presenter/BusPassengerPresenter.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/presenter/BusPassengerPresenter.kt @@ -123,11 +123,13 @@ class BusPassengerPresenter(view: MainFragment?) : OrderStatusEnum.NoOrderUse -> { when (CallerAutoPilotStatusListenerManager.getState()) { IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE -> {// 不可自动驾驶 - ToastCharterUtils.showToastShort("设备未就绪请稍等，请安全员主动停止车辆") +// ToastCharterUtils.showToastShort("设备未就绪请稍等，请安全员主动停止车辆") + ToastCharterUtils.showToastShort(R.string.module_och_status_autopilot_disable_hint) } IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE -> {// - ToastCharterUtils.showToastShort("因车辆正在人工驾驶中无法靠边停车，请安全员主动停止车辆") +// ToastCharterUtils.showToastShort("因车辆正在人工驾驶中无法靠边停车，请安全员主动停止车辆") + ToastCharterUtils.showToastShort(R.string.module_och_status_autopilot_enable_hint) } IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING -> { @@ -136,7 +138,8 @@ class BusPassengerPresenter(view: MainFragment?) : } IMoGoAutopilotStatusListener.STATUS_PARALLEL_DRIVING -> { - ToastCharterUtils.showToastShort("因车辆正在平行驾驶中无法靠边停车，请安全员主动停止车辆") +// ToastCharterUtils.showToastShort("因车辆正在平行驾驶中无法靠边停车，请安全员主动停止车辆") + ToastCharterUtils.showToastShort(R.string.module_och_status_parallel_driving_hint) } else -> {} @@ -209,7 +212,8 @@ class BusPassengerPresenter(view: MainFragment?) : StopSideStatus.EndingSuccess -> { BeautifyManager.notifyViewChange(BeautifyManager.ChangeTypeEnum.STOPSITE_SUCCESS) - ToastCharterUtils.showToastShort("靠边停车成功") +// ToastCharterUtils.showToastShort("靠边停车成功") + ToastCharterUtils.showToastShort(R.string.module_och_stop_site_success) VoiceNotice.showNotice( context.getString(R.string.charter_p_stop_site_success), AIAssist.LEVEL0 @@ -217,7 +221,8 @@ class BusPassengerPresenter(view: MainFragment?) : } StopSideStatus.EndingFaile -> { - ToastCharterUtils.showToastShort("车辆系统繁忙，请稍后再试") +// ToastCharterUtils.showToastShort("车辆系统繁忙，请稍后再试") + ToastCharterUtils.showToastShort(R.string.module_och_stop_site_ending_fail) } else -> {} @@ -228,9 +233,11 @@ class BusPassengerPresenter(view: MainFragment?) : override fun onDoorStatusCallback(isOpen: Boolean, isFirst: Boolean) { if (!isFirst) { if (isOpen) { - ToastCharterUtils.showToastShort("已开启车门") +// ToastCharterUtils.showToastShort("已开启车门") + ToastCharterUtils.showToastShort(R.string.module_och_car_door_opened) } else { - ToastCharterUtils.showToastShort("已关门车门") +// ToastCharterUtils.showToastShort("已关门车门") + ToastCharterUtils.showToastShort(R.string.module_och_car_door_closed) } } } @@ -281,7 +288,8 @@ class BusPassengerPresenter(view: MainFragment?) : temp = LatLng(it.latitude, it.longitude) indexPoint.add(temp) } - ToastCharterUtils.showToastShort("没有轨迹点") +// ToastCharterUtils.showToastShort("没有轨迹点") + ToastCharterUtils.showToastShort(R.string.module_och_not_point) return indexPoint } diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/MainFragment.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/MainFragment.kt index 5a4cf74a8a..8c0b936a14 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/MainFragment.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/MainFragment.kt @@ -126,7 +126,8 @@ class MainFragment : MvpFragment(), IMogo if (mPresenter?.haveOrder() == true) { } else { - ToastCharterUtils.showToastShort("请确认订单") +// ToastCharterUtils.showToastShort("请确认订单") + ToastCharterUtils.showToastShort(R.string.module_och_order_affirm) return true } } else { diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/impl/GoViewWithArrive.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/impl/GoViewWithArrive.kt index c2f0bfe4d1..f8a293cebb 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/impl/GoViewWithArrive.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/impl/GoViewWithArrive.kt @@ -65,7 +65,8 @@ class GoViewWithArrive @JvmOverloads constructor( }) setOnClickListener { if (ClickUtils.isClickTooFrequent(this,3000)) { - ToastCharterUtils.showToastShort("请稍后点击") +// ToastCharterUtils.showToastShort("请稍后点击") + ToastCharterUtils.showToastShort(R.string.module_och_please_click_later) return@setOnClickListener } startGo() @@ -82,7 +83,8 @@ class GoViewWithArrive @JvmOverloads constructor( } when (CallerAutoPilotStatusListenerManager.getState()) { IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE -> {// 不可自动驾驶 - ToastCharterUtils.showToastShort("设备未就绪请稍等") +// ToastCharterUtils.showToastShort("设备未就绪请稍等") + ToastCharterUtils.showToastShort(R.string.module_och_status_autopilot_disable_hint1) } IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE -> {// onceRegisterAutoStatus() @@ -90,10 +92,12 @@ class GoViewWithArrive @JvmOverloads constructor( IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING -> { // 重新起步 StopSideManager.resetStopSide() - ToastCharterUtils.showToastShort("车辆行驶中，不要频繁点击哦～") +// ToastCharterUtils.showToastShort("车辆行驶中，不要频繁点击哦～") + ToastCharterUtils.showToastShort(R.string.module_och_car_running_hint) } IMoGoAutopilotStatusListener.STATUS_PARALLEL_DRIVING -> { - ToastCharterUtils.showToastShort("车辆行驶中，不要频繁点击哦～") +// ToastCharterUtils.showToastShort("车辆行驶中，不要频繁点击哦～") + ToastCharterUtils.showToastShort(R.string.module_och_car_running_hint) } else -> {} } diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/impl/StopSiteView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/impl/StopSiteView.kt index 1fffbdcebd..2b0f2a0e6b 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/impl/StopSiteView.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/impl/StopSiteView.kt @@ -31,17 +31,20 @@ class StopSiteView @JvmOverloads constructor( private fun stopSite(){ when (CallerAutoPilotStatusListenerManager.getState()) { IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE -> {// 不可自动驾驶 - ToastCharterUtils.showToastShort("设备未就绪请稍等，请稍后再试") +// ToastCharterUtils.showToastShort("设备未就绪请稍等，请稍后再试") + ToastCharterUtils.showToastShort(R.string.module_och_status_autopilot_disable_hint2) } IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE -> {// - ToastCharterUtils.showToastShort("因车辆正在人工驾驶中无法靠边停车，请稍后再试") +// ToastCharterUtils.showToastShort("因车辆正在人工驾驶中无法靠边停车，请稍后再试") + ToastCharterUtils.showToastShort(R.string.module_och_car_running_not_stop) } IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING -> { // 靠边停车 StopSideManager.stopSide() } IMoGoAutopilotStatusListener.STATUS_PARALLEL_DRIVING -> { - ToastCharterUtils.showToastShort("远程守护卫士操作中，稍后再试试吧～") +// ToastCharterUtils.showToastShort("远程守护卫士操作中，稍后再试试吧～") + ToastCharterUtils.showToastShort(R.string.module_och_car_parallel_driving_hint) } else -> {} } diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/debugview/DebugView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/debugview/DebugView.kt index e95d4a161b..807449a207 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/debugview/DebugView.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/debugview/DebugView.kt @@ -77,7 +77,8 @@ class DebugView @JvmOverloads constructor( getFragment()?.showNoviceGuidanceFragment() } debug_change_modle.setOnClickListener { - ToastCharterUtils.showToastShort("因车辆正在人工驾驶中无法靠边停车，请安全员主动停止车辆") +// ToastCharterUtils.showToastShort("因车辆正在人工驾驶中无法靠边停车，请安全员主动停止车辆") + ToastCharterUtils.showToastShort(R.string.module_och_status_autopilot_enable_hint) when (HdMapBuildConfig.currentCarVrIconRes) { R.raw.aiqinghao -> { getFragment()?.setCarMode(OrderInfoResponse.M1_FAMILY) diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/orderinfo/OrderInfoViewModel.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/orderinfo/OrderInfoViewModel.kt index 541f777faf..4a1bb3f6c9 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/orderinfo/OrderInfoViewModel.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/orderinfo/OrderInfoViewModel.kt @@ -5,6 +5,7 @@ import com.mogo.eagle.core.data.BaseData import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.eagle.core.utilcode.util.UiThreadHandler +import com.mogo.och.charter.passenger.R import com.mogo.och.charter.passenger.callback.ITimeCallback import com.mogo.och.charter.passenger.model.CharterPassengerModel import com.mogo.och.common.module.wigets.toast.ToastCharterUtils @@ -66,7 +67,8 @@ class OrderInfoViewModel: ViewModel(), ITimeCallback { CharterPassengerModel.endOrder(object : OchCommonServiceCallback { override fun onSuccess(data: BaseData?) { if (null != data && 0 == data.code) { - ToastCharterUtils.showToastShort("结束成功") +// ToastCharterUtils.showToastShort("结束成功") + ToastCharterUtils.showToastShort(R.string.module_och_success_achieved) CharterPassengerModel.setEndOrderStatus() viewCallback?.setViewGone() val msg = EndOrderMsg( diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/selectline/SelectLineViewModel.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/selectline/SelectLineViewModel.kt index 2dbb22a562..69e907ba22 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/selectline/SelectLineViewModel.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/selectline/SelectLineViewModel.kt @@ -26,6 +26,7 @@ import com.mogo.och.common.module.manager.socket.lan.bean.DPMsgType import com.mogo.och.common.module.manager.socket.lan.bean.LineSite import com.mogo.och.common.module.constant.OchCommonConst import com.mogo.och.bridge.autopilot.location.OchLocationManager +import com.mogo.och.charter.passenger.R import com.mogo.och.common.module.network.OchCommonServiceCallback import com.mogo.och.common.module.manager.stopside.StopSideManager import com.mogo.och.common.module.manager.loop.BizLoopManager @@ -87,7 +88,8 @@ class SelectLineViewModel : ViewModel(), IOrderStatusChangeListener { if (msg.arriveStatus == 2) { return@post } - ToastCharterUtils.showToastShort("站点确定") +// ToastCharterUtils.showToastShort("站点确定") + ToastCharterUtils.showToastShort(R.string.module_och_site_determined) viewCallback?.setEnableSiteStatus(true) checkLine = tempCheckLine checkSite = tempCheckSite @@ -100,7 +102,8 @@ class SelectLineViewModel : ViewModel(), IOrderStatusChangeListener { CharterPassengerModel.cleanbroadcastListInfo(checkSite) CharterPassengerModel.queryOrder() } else { - ToastCharterUtils.showToastShort("司机端拒绝请重新选择") +// ToastCharterUtils.showToastShort("司机端拒绝请重新选择") + ToastCharterUtils.showToastShort(R.string.module_och_driver_end_rejected) viewCallback?.hideDataDriverRefuse() } RxUtils.disposeSubscribe(subscribeSelectSite) @@ -207,7 +210,8 @@ class SelectLineViewModel : ViewModel(), IOrderStatusChangeListener { } override fun onFail(code: Int, msg: String) { - ToastCharterUtils.showToastShort("查询线路失败") +// ToastCharterUtils.showToastShort("查询线路失败") + ToastCharterUtils.showToastShort(R.string.module_och_querying_route_failed) viewCallback?.setVisableByTrun(showNetError = true) } @@ -220,7 +224,8 @@ class SelectLineViewModel : ViewModel(), IOrderStatusChangeListener { fun changeSites(siteList: MutableList) { if (!CallerTelematicManager.getClientConnStatus()) { - ToastCharterUtils.showToastLong("乘客屏无法连接司机屏请联系安全员") +// ToastCharterUtils.showToastLong("乘客屏无法连接司机屏请联系安全员") + ToastCharterUtils.showToastLong(R.string.module_och_passenger_not_connect_driver) return } val sentDataSite: MutableList = mutableListOf() @@ -252,7 +257,8 @@ class SelectLineViewModel : ViewModel(), IOrderStatusChangeListener { RxUtils.disposeSubscribe(subscribeSelectSite) subscribeSelectSite = RxUtils.createSubscribe(120_000) { - ToastCharterUtils.showToastShort("请联系安全员确认") +// ToastCharterUtils.showToastShort("请联系安全员确认") + ToastCharterUtils.showToastShort(R.string.module_och_please_security_officer_confirm) viewCallback?.hideDataDriverRefuse() } } @@ -300,13 +306,15 @@ class SelectLineViewModel : ViewModel(), IOrderStatusChangeListener { } override fun onFail(code: Int, msg: String?) { - ToastCharterUtils.showToastShort("查询站点失败") +// ToastCharterUtils.showToastShort("查询站点失败") + ToastCharterUtils.showToastShort(R.string.module_och_query_site_failed) viewCallback?.setVisableByTrun(showNetError = true) } override fun onError() { super.onError() - ToastCharterUtils.showToastShort("查询站点失败") +// ToastCharterUtils.showToastShort("查询站点失败") + ToastCharterUtils.showToastShort(R.string.module_och_query_site_failed) viewCallback?.setVisableByTrun(showNetError = true) } }) @@ -314,7 +322,8 @@ class SelectLineViewModel : ViewModel(), IOrderStatusChangeListener { private fun checkServerStatus() { if (!CallerTelematicManager.getClientConnStatus()) { - ToastCharterUtils.showToastShort("断开和司机端连接、请联系安全员") +// ToastCharterUtils.showToastShort("断开和司机端连接、请联系安全员") + ToastCharterUtils.showToastShort(R.string.module_och_disconnect_driver) BizLoopManager.removeLoopFunction(TAGLINELOOP) viewCallback?.hideDataDriverRefuse() CallerLogger.d( @@ -385,14 +394,16 @@ class SelectLineViewModel : ViewModel(), IOrderStatusChangeListener { } else -> { - ToastCharterUtils.showToastShort("自动驾驶中无法切换线路") +// ToastCharterUtils.showToastShort("自动驾驶中无法切换线路") + ToastCharterUtils.showToastShort(R.string.module_och_autopilot_now_not_change_line) false } } } IMoGoAutopilotStatusListener.STATUS_PARALLEL_DRIVING -> { - ToastCharterUtils.showToastShort("远程守护卫士操作中，稍后再试试吧～") +// ToastCharterUtils.showToastShort("远程守护卫士操作中，稍后再试试吧～") + ToastCharterUtils.showToastShort(R.string.module_och_car_parallel_driving_hint) return false } @@ -401,11 +412,13 @@ class SelectLineViewModel : ViewModel(), IOrderStatusChangeListener { } else { when (CallerAutoPilotStatusListenerManager.getState()) { IMoGoAutopilotStatusListener.STATUS_PARALLEL_DRIVING -> { - ToastCharterUtils.showToastShort("远程守护卫士操作中，稍后再试试吧～") +// ToastCharterUtils.showToastShort("远程守护卫士操作中，稍后再试试吧～") + ToastCharterUtils.showToastShort(R.string.module_och_car_parallel_driving_hint) return false } } - ToastCharterUtils.showToastShort("请停车后再修改目的地～") +// ToastCharterUtils.showToastShort("请停车后再修改目的地～") + ToastCharterUtils.showToastShort(R.string.module_och_stop_car_and_change_site) return false } return true diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/selectline/adapter/OrderSiteItemAdapter.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/selectline/adapter/OrderSiteItemAdapter.kt index a727400f4a..8044770e49 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/selectline/adapter/OrderSiteItemAdapter.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/selectline/adapter/OrderSiteItemAdapter.kt @@ -95,9 +95,11 @@ class OrderSiteItemAdapter( checkChangeListener?.onCheckListener(tempInfo) } else { if (siteInfo.isNear) { - ToastCharterUtils.showToastShort("您已在此站点附近") +// ToastCharterUtils.showToastShort("您已在此站点附近") + ToastCharterUtils.showToastShort(R.string.module_och_in_site_nearby) } else { - ToastCharterUtils.showToastShort("站点已过，请选择返程路线") +// ToastCharterUtils.showToastShort("站点已过，请选择返程路线") + ToastCharterUtils.showToastShort(R.string.module_och_site_having_already_hint) } } } diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/SoftControlView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/SoftControlView.kt index 0ebb6c440b..cb45d7b852 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/SoftControlView.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/SoftControlView.kt @@ -385,11 +385,13 @@ class SoftControlView : ConstraintLayout, SoftControlViewModel.SoftControlCallba if (leftLight) { tv_light_top_01.text = context.getString(R.string.charter_p_open_light1) tv_light_top_01.isChecked = true - if (!isFirst) ToastCharterUtils.showToastShort("打开顶灯1") +// if (!isFirst) ToastCharterUtils.showToastShort("打开顶灯1") + if (!isFirst) ToastCharterUtils.showToastShort(R.string.module_och_open_ceiling_light_1) } else { tv_light_top_01.text = context.getString(R.string.charter_p_close_light1) tv_light_top_01.isChecked = false - if (!isFirst) ToastCharterUtils.showToastShort("关闭顶灯1") +// if (!isFirst) ToastCharterUtils.showToastShort("关闭顶灯1") + if (!isFirst) ToastCharterUtils.showToastShort(R.string.module_och_close_ceiling_light_1) } } } @@ -399,11 +401,13 @@ class SoftControlView : ConstraintLayout, SoftControlViewModel.SoftControlCallba if (rightLight) { tv_light_top_02.text = context.getString(R.string.charter_p_open_light2) tv_light_top_02.isChecked = true - if (!isFirst) ToastCharterUtils.showToastShort("打开顶灯2") +// if (!isFirst) ToastCharterUtils.showToastShort("打开顶灯2") + if (!isFirst) ToastCharterUtils.showToastShort(R.string.module_och_open_ceiling_light_2) } else { tv_light_top_02.text = context.getString(R.string.charter_p__close_light2) tv_light_top_02.isChecked = false - if (!isFirst) ToastCharterUtils.showToastShort("关闭顶灯2") +// if (!isFirst) ToastCharterUtils.showToastShort("关闭顶灯2") + if (!isFirst) ToastCharterUtils.showToastShort(R.string.module_och_close_ceiling_light_2) } } } @@ -414,12 +418,14 @@ class SoftControlView : ConstraintLayout, SoftControlViewModel.SoftControlCallba tv_light_atmosphere.text = context.getString(R.string.charter_p_open_atmosphere) tv_light_atmosphere.isChecked = true iv_bottom_light_setting.setImageResource(R.drawable.charter_p_function_atmosphere_select) - if (!isFirst) ToastCharterUtils.showToastShort("打开氛围灯") +// if (!isFirst) ToastCharterUtils.showToastShort("打开氛围灯") + if (!isFirst) ToastCharterUtils.showToastShort(R.string.module_och_open_ambient_light) } else { tv_light_atmosphere.text = context.getString(R.string.charter_p_close_atmosphere) tv_light_atmosphere.isChecked = false iv_bottom_light_setting.setImageResource(R.drawable.charter_p_function_atmosphere_nor) - if (!isFirst) ToastCharterUtils.showToastShort("关闭氛围灯") +// if (!isFirst) ToastCharterUtils.showToastShort("关闭氛围灯") + if (!isFirst) ToastCharterUtils.showToastShort(R.string.module_och_close_ambient_light) } } } diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/SoftControlViewModel.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/SoftControlViewModel.kt index eac7a88146..3994b2920d 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/SoftControlViewModel.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/SoftControlViewModel.kt @@ -11,6 +11,7 @@ import com.mogo.och.bridge.device.LightAirconditionDoorStatusManager import com.mogo.och.bridge.device.data.AirconditionStatus import com.mogo.och.bridge.device.data.HeaterStatue import com.mogo.och.bridge.device.data.LightStatus +import com.mogo.och.charter.passenger.R import com.mogo.och.common.module.utils.RxUtils import io.reactivex.disposables.Disposable @@ -146,7 +147,8 @@ class SoftControlViewModel : ViewModel(), LightAirconditionDoorCallback { RxUtils.disposeSubscribe(airconditionDisposable) airconditionDisposable = RxUtils.createSubscribe(10000) { if (!LightAirconditionDoorStatusManager.airconditionStatus.isOpen && LightAirconditionDoorStatusManager.airconditionStatus.windSpeed != windSpeedCmd && LightAirconditionDoorStatusManager.airconditionStatus.temperature != temperatureCmd && LightAirconditionDoorStatusManager.airconditionStatus.pattert != modeCmd) { - ToastCharterUtils.showToastShort("控制系统繁忙，请稍后再试") +// ToastCharterUtils.showToastShort("控制系统繁忙，请稍后再试") + ToastCharterUtils.showToastShort(R.string.module_och_control_system_busy) } } } @@ -159,7 +161,8 @@ class SoftControlViewModel : ViewModel(), LightAirconditionDoorCallback { RxUtils.disposeSubscribe(airconditionDisposable) airconditionDisposable = RxUtils.createSubscribe(10000) { if (LightAirconditionDoorStatusManager.airconditionStatus.isOpen) { - ToastCharterUtils.showToastShort("控制系统繁忙，请稍后再试") +// ToastCharterUtils.showToastShort("控制系统繁忙，请稍后再试") + ToastCharterUtils.showToastShort(R.string.module_och_control_system_busy) } } } @@ -173,7 +176,8 @@ class SoftControlViewModel : ViewModel(), LightAirconditionDoorCallback { RxUtils.disposeSubscribe(heaterDisposable) heaterDisposable = RxUtils.createSubscribe(10000) { if (!LightAirconditionDoorStatusManager.heaterStatue.isOpen && LightAirconditionDoorStatusManager.heaterStatue.windSpeed != windSpeedCmd) { - ToastCharterUtils.showToastShort("暖风机操作未生效，请稍后重试吧～") +// ToastCharterUtils.showToastShort("暖风机操作未生效，请稍后重试吧～") + ToastCharterUtils.showToastShort(R.string.module_och_fan_heater_operation_invalid) } } } @@ -184,7 +188,8 @@ class SoftControlViewModel : ViewModel(), LightAirconditionDoorCallback { RxUtils.disposeSubscribe(heaterDisposable) heaterDisposable = RxUtils.createSubscribe(10000) { if (LightAirconditionDoorStatusManager.heaterStatue.isOpen) { - ToastCharterUtils.showToastShort("暖风机操作未生效，请稍后重试吧～")//还是开着的 +// ToastCharterUtils.showToastShort("暖风机操作未生效，请稍后重试吧～")//还是开着的 + ToastCharterUtils.showToastShort(R.string.module_och_fan_heater_operation_invalid)//还是开着的 } } } @@ -196,14 +201,16 @@ class SoftControlViewModel : ViewModel(), LightAirconditionDoorCallback { CallerAutoPilotControlManager.sendRoboBusJinlvM1MainLamp1Cmd(1) RxUtils.createSubscribe { if (!LightAirconditionDoorStatusManager.lightStatus.isOpenLight1) { - ToastCharterUtils.showToastShort("控制系统繁忙，请稍后再试") +// ToastCharterUtils.showToastShort("控制系统繁忙，请稍后再试") + ToastCharterUtils.showToastShort(R.string.module_och_control_system_busy) } } } else { CallerAutoPilotControlManager.sendRoboBusJinlvM1MainLamp1Cmd(2) RxUtils.createSubscribe { if (LightAirconditionDoorStatusManager.lightStatus.isOpenLight1) { - ToastCharterUtils.showToastShort("控制系统繁忙，请稍后再试") +// ToastCharterUtils.showToastShort("控制系统繁忙，请稍后再试") + ToastCharterUtils.showToastShort(R.string.module_och_control_system_busy) } } } @@ -216,14 +223,16 @@ class SoftControlViewModel : ViewModel(), LightAirconditionDoorCallback { CallerAutoPilotControlManager.sendRoboBusJinlvM1MainLamp2Cmd(1) RxUtils.createSubscribe { if (!LightAirconditionDoorStatusManager.lightStatus.isOpenLight2) { - ToastCharterUtils.showToastShort("控制系统繁忙，请稍后再试") +// ToastCharterUtils.showToastShort("控制系统繁忙，请稍后再试") + ToastCharterUtils.showToastShort(R.string.module_och_control_system_busy) } } } else { CallerAutoPilotControlManager.sendRoboBusJinlvM1MainLamp2Cmd(2) RxUtils.createSubscribe { if (LightAirconditionDoorStatusManager.lightStatus.isOpenLight2) { - ToastCharterUtils.showToastShort("控制系统繁忙，请稍后再试") +// ToastCharterUtils.showToastShort("控制系统繁忙，请稍后再试") + ToastCharterUtils.showToastShort(R.string.module_och_control_system_busy) } } } @@ -236,14 +245,16 @@ class SoftControlViewModel : ViewModel(), LightAirconditionDoorCallback { CallerAutoPilotControlManager.sendRoboBusJinlvM1SmallLampCmd(1) RxUtils.createSubscribe { if (!LightAirconditionDoorStatusManager.lightStatus.isOpenatmosphere) { - ToastCharterUtils.showToastShort("控制系统繁忙，请稍后再试") +// ToastCharterUtils.showToastShort("控制系统繁忙，请稍后再试") + ToastCharterUtils.showToastShort(R.string.module_och_control_system_busy) } } } else { CallerAutoPilotControlManager.sendRoboBusJinlvM1SmallLampCmd(2) RxUtils.createSubscribe { if (LightAirconditionDoorStatusManager.lightStatus.isOpenatmosphere) { - ToastCharterUtils.showToastShort("控制系统繁忙，请稍后再试") +// ToastCharterUtils.showToastShort("控制系统繁忙，请稍后再试") + ToastCharterUtils.showToastShort(R.string.module_och_control_system_busy) } } } diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/video/ConsultVideoPlayer.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/video/ConsultVideoPlayer.kt index 13b9c5d8a9..a6d0ce4049 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/video/ConsultVideoPlayer.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/video/ConsultVideoPlayer.kt @@ -150,7 +150,8 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer { override fun setStateAndUi(state: Int) { super.setStateAndUi(state) if(state==CURRENT_STATE_PLAYING_BUFFERING_START){ - ToastCharterUtils.showToastShort("加载中请稍等") +// ToastCharterUtils.showToastShort("加载中请稍等") + ToastCharterUtils.showToastShort(R.string.module_och_loading) } } @@ -281,7 +282,8 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer { CallerLogger.d(TAG,"onError--${what}--${extra}") MediaManager.setVideoFocusChange(false) mThumbImageViewLayout?.visibility = View.VISIBLE - ToastCharterUtils.showToastLong("哎呀，出错了，看看其他视频吧") +// ToastCharterUtils.showToastLong("哎呀，出错了，看看其他视频吧") + ToastCharterUtils.showToastLong(R.string.module_och_video_error) currentTime = -1 if(isIfCurrentIsFullscreen){ smalllPlayer?.clearFullscreenLayout(this) diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/video/adapter/RecyclerVideoAdapter.java b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/video/adapter/RecyclerVideoAdapter.java index ab81860832..803e360406 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/video/adapter/RecyclerVideoAdapter.java +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/video/adapter/RecyclerVideoAdapter.java @@ -121,12 +121,14 @@ public class RecyclerVideoAdapter extends RecyclerView.Adapter { override fun onSuccess(data: BaseData?) { if (data != null && data.code == 0){ - ToastUtils.showShort("提交成功") +// ToastUtils.showShort("提交成功") + ToastUtils.showShort(R.string.module_och_submit_successfully) viewCallback?.submitErrorReasons() } } diff --git a/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/routingselect/RoutingSelectModel.kt b/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/routingselect/RoutingSelectModel.kt index 80e10d12b7..47ffd93a34 100644 --- a/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/routingselect/RoutingSelectModel.kt +++ b/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/routingselect/RoutingSelectModel.kt @@ -11,6 +11,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_ import com.mogo.eagle.core.utilcode.util.GsonUtils import com.mogo.eagle.core.utilcode.util.NetworkUtils import com.mogo.eagle.core.utilcode.util.ToastUtils +import com.mogo.och.biz.R import com.mogo.och.biz.routing.bean.GrayLineBean import com.mogo.och.biz.routing.bean.QueryGrayContrailListRsp import com.mogo.och.biz.routing.bean.QuerySitesReasons @@ -109,7 +110,8 @@ class RoutingSelectModel : ViewModel() { "queryRoutingGrayLineList onFail: code=$code, msg=$msg" ) OchChainLogManager.writeChainLogRouting("[查询灰度路线]","[查询灰度路线] 请求fail, code=$code, msg=$msg, sn=${SharedPrefsMgr.getInstance().sn}") - ToastUtils.showShort("查询灰度线路列表异常, 请稍后重试, code=$code") +// ToastUtils.showShort("查询灰度线路列表异常, 请稍后重试, code=$code") + ToastUtils.showShort(R.string.module_och_query_routing_gray_line_list_fail, code) viewCallback?.onQueryRoutingGrayLineListFailed(msg ?: "查询灰度线路列表异常, 请稍后重试") } @@ -191,7 +193,8 @@ class RoutingSelectModel : ViewModel() { val grayId = data.taskId val stationList = data.stationList if (grayLineBean == null || contrailBean == null || stationList.size < 2) { - ToastUtils.showShort("灰度线路或轨迹信息异常，请稍后再试") +// ToastUtils.showShort("灰度线路或轨迹信息异常，请稍后再试") + ToastUtils.showShort(R.string.module_och_query_routing_gray_line_error) OchChainLogManager.writeChainLogRouting("[开始任务]","[开始任务] 灰度线路或轨迹信息异常，请稍后再试") return } diff --git a/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/routingselect/RoutingSelectView.kt b/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/routingselect/RoutingSelectView.kt index 16082e3483..ef206ba28a 100644 --- a/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/routingselect/RoutingSelectView.kt +++ b/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/routingselect/RoutingSelectView.kt @@ -96,7 +96,8 @@ class RoutingSelectView: ConstraintLayout, SwtichRoutingViewCallback, InputTextC RoutingItemAdapter.LineItemClickListener { override fun onItemClick(data: GrayLineBean) { if(data.contrailId==null||data.contrailId!!<=0L){ - ToastUtils.showShort("请设置轨迹信息") +// ToastUtils.showShort("请设置轨迹信息") + ToastUtils.showShort(R.string.module_och_please_set_trajectory_info) } OchChainLogManager.writeChainLogRouting("[选择灰度任务]","[选择灰度任务] 当前选择 ${data} ") resetStatus() @@ -255,7 +256,8 @@ class RoutingSelectView: ConstraintLayout, SwtichRoutingViewCallback, InputTextC mRoutingLineList.clear() mRoutingLineList.addAll(data) mChooseLineListAdapter.notifyDataSetChanged() - ToastUtils.showShort("刷新成功") +// ToastUtils.showShort("刷新成功") + ToastUtils.showShort(R.string.module_och_please_refresh_success) } else { showEmptyView() } diff --git a/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/runing/other/TaskRunningView.kt b/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/runing/other/TaskRunningView.kt index c8749a38e8..efed469940 100644 --- a/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/runing/other/TaskRunningView.kt +++ b/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/runing/other/TaskRunningView.kt @@ -226,7 +226,8 @@ class TaskRunningView : ConstraintLayout, TaskRunningModel.SwtichLineViewCallbac * 服务完成 */ override fun onSubmitEndTaskSuccess() { - ToastUtils.showLong("结束任务成功") +// ToastUtils.showLong("结束任务成功") + ToastUtils.showLong(R.string.module_och_task_finish_success) RoutingServiceManager.invokeCallback(false) // 移除高德导航计算距离 AmapNaviToDestinationModel.getInstance(context).destroyAmaNavi() diff --git a/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/runing/taxi/TaxiRunningView.kt b/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/runing/taxi/TaxiRunningView.kt index 0706909876..9547bdf436 100644 --- a/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/runing/taxi/TaxiRunningView.kt +++ b/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/runing/taxi/TaxiRunningView.kt @@ -271,7 +271,8 @@ class TaxiRunningView: ConstraintLayout, TaxiRunningModel.RoutingRuningCallback, } override fun onSubmitEndTaskSuccess() { - ToastUtils.showLong("结束任务成功") +// ToastUtils.showLong("结束任务成功") + ToastUtils.showLong(R.string.module_och_task_finish_success) RoutingServiceManager.invokeCallback(false) // 移除高德导航计算距离 AmapNaviToDestinationModel.getInstance(context).destroyAmaNavi() diff --git a/OCH/common/bridge/src/main/java/com/mogo/och/bridge/autopilot/autopilot/OchAutoPilotManager.kt b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/autopilot/autopilot/OchAutoPilotManager.kt index d07607e4cf..2944298c46 100644 --- a/OCH/common/bridge/src/main/java/com/mogo/och/bridge/autopilot/autopilot/OchAutoPilotManager.kt +++ b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/autopilot/autopilot/OchAutoPilotManager.kt @@ -8,6 +8,7 @@ import com.mogo.eagle.core.data.msgbox.MsgBoxType import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager import com.mogo.eagle.core.utilcode.util.ToastUtils +import com.mogo.och.bridge.R import com.mogo.och.bridge.autopilot.OCHAdasAbilityManager import com.mogo.och.bridge.autopilot.autopilot.bean.SessionWithTime import com.mogo.och.bridge.autopilot.line.LineManager @@ -52,7 +53,8 @@ object OchAutoPilotManager { clearGlobalSessionId("检测session 自带的时间 ${currentTimeMillis}_${sessionInfo.setTime}_${sessionInfo.sessionId}") return true }else{ - ToastUtils.showLong("自驾启动中，请勿重复点击") +// ToastUtils.showLong("自驾启动中，请勿重复点击") + ToastUtils.showLong(R.string.module_och_autopilot_starting_not_click) OchAutopilotAnalytics.triggerCanStartAutopilotBySessionId(globalSessionId.get()) return false } diff --git a/OCH/common/bridge/src/main/java/com/mogo/och/bridge/autopilot/line/LineManager.kt b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/autopilot/line/LineManager.kt index feb0c34b2d..625f855612 100644 --- a/OCH/common/bridge/src/main/java/com/mogo/och/bridge/autopilot/line/LineManager.kt +++ b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/autopilot/line/LineManager.kt @@ -23,6 +23,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_ import com.mogo.eagle.core.utilcode.util.CoordinateUtils import com.mogo.eagle.core.utilcode.util.StringUtils import com.mogo.eagle.core.utilcode.util.ToastUtils +import com.mogo.och.bridge.R import com.mogo.och.common.module.constant.OchCommonConst import com.mogo.och.bridge.autopilot.OCHAdasAbilityManager import com.mogo.och.bridge.autopilot.autopilot.OchAutoPilotManager @@ -456,7 +457,8 @@ object LineManager : CallerBase() { } CallerLogger.d(TAG, "${parameters?.wayLatLons}\n${parameters?.blackLatLons}") if (parameters == null) { - ToastUtils.showShort("未设置起始或终点站点") +// ToastUtils.showShort("未设置起始或终点站点") + ToastUtils.showShort(R.string.module_och_not_stat_and_end_point) } return parameters } @@ -533,13 +535,15 @@ object LineManager : CallerBase() { fun startAutopilot() { if (startStation == null || endStation == null) { - ToastUtils.showShort("未设置起始或终点站点") +// ToastUtils.showShort("未设置起始或终点站点") + ToastUtils.showShort(R.string.module_och_not_stat_and_end_point) return } startStation?.let { if (!it.isLeaving) { - ToastUtils.showShort("请滑动出发后再启动自驾") +// ToastUtils.showShort("请滑动出发后再启动自驾") + ToastUtils.showShort(R.string.module_och_please_slide_hint) return } } @@ -555,14 +559,16 @@ object LineManager : CallerBase() { //1、判断轨迹url是否可用 if (_contraiInfo == null) { - ToastUtils.showLong("无发布轨迹, 请发布后重试") +// ToastUtils.showLong("无发布轨迹, 请发布后重试") + ToastUtils.showLong(R.string.module_taxi_no_publication_trajectory) return } else { if (FunctionBuildConfig.isPassStartAutopilotCommand && TextUtils.isEmpty(_contraiInfo!!.csvFileUrl) && TextUtils.isEmpty(_contraiInfo!!.csvFileMd5) ) { - ToastUtils.showLong("无发布轨迹, 请发布后重试") +// ToastUtils.showLong("无发布轨迹, 请发布后重试") + ToastUtils.showLong(R.string.module_taxi_no_publication_trajectory) e( TAG, "isPassStartAutopilotCommand = " + FunctionBuildConfig.isPassStartAutopilotCommand @@ -685,7 +691,8 @@ object LineManager : CallerBase() { } else { // 地盘有但是和och出不一样 // todo 需要och 重新出发轨迹下载操作 - ToastUtils.showShort("${autopilotIdFromFsm}_${teleOrderId}_自动驾驶id不同请排查") +// ToastUtils.showShort("${autopilotIdFromFsm}_${teleOrderId}_自动驾驶id不同请排查") + ToastUtils.showShort(R.string.module_och_autopilot_id_diff, autopilotIdFromFsm, teleOrderId) OchChainLogManager.writeChainLogAutopilot( "自驾Id", "${autopilotIdFromFsm}_${teleOrderId}_自动驾驶id不同请排查" diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/bluetooth/BaseBluetoothManager.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/bluetooth/BaseBluetoothManager.kt index afe96ca03c..03a70adc24 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/bluetooth/BaseBluetoothManager.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/bluetooth/BaseBluetoothManager.kt @@ -12,6 +12,7 @@ import com.mogo.eagle.core.function.main.MainPresenter import com.mogo.eagle.core.utilcode.mogo.permissions.PermissionsDialogUtils import com.mogo.eagle.core.utilcode.util.ActivityUtils import com.mogo.eagle.core.utilcode.util.ToastUtils +import com.mogo.och.common.module.R import com.mogo.och.common.module.utils.PermissionUtil open class BaseBluetoothManager { @@ -48,7 +49,8 @@ open class BaseBluetoothManager { return BluetoothState.OFF } } - ToastUtils.showShort("设备无蓝牙硬件") +// ToastUtils.showShort("设备无蓝牙硬件") + ToastUtils.showShort(R.string.module_och_not_bluetooth) return BluetoothState.NONE } diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/bluetooth/OchBluetoothGattCallback.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/bluetooth/OchBluetoothGattCallback.kt index 51f6316306..c912fd85eb 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/bluetooth/OchBluetoothGattCallback.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/bluetooth/OchBluetoothGattCallback.kt @@ -12,6 +12,7 @@ import android.bluetooth.BluetoothProfile import android.util.Log import com.mogo.commons.AbsMogoApplication import com.mogo.eagle.core.utilcode.util.ToastUtils +import com.mogo.och.common.module.R import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager import com.mogo.och.common.module.utils.RxUtils import io.reactivex.disposables.Disposable @@ -190,7 +191,8 @@ class OchBluetoothGattCallback(device: BluetoothDevice) : BluetoothGattCallback( return null } val service = mBluetoothGatt!!.getService(uuid) - if (service == null) ToastUtils.showShort("没有找到服务UUID=$uuid") +// if (service == null) ToastUtils.showShort("没有找到服务UUID=$uuid") + if (service == null) ToastUtils.showShort(R.string.module_och_bluetooth_not_find_uuid, "$uuid") return service } @@ -223,7 +225,8 @@ class OchBluetoothGattCallback(device: BluetoothDevice) : BluetoothGattCallback( fun connectGattAndSend(data: String) { RxUtils.disposeSubscribe(timeoutCLose) if(isConnected){ - ToastUtils.showShort("已连接成功") +// ToastUtils.showShort("已连接成功") + ToastUtils.showShort(R.string.module_och_bluetooth_connected) OchChainLogManager.writeChainLogWriteOff("司机端核销成功","已连接成功") waitSendData[data] = BleManager.UUID_CHAR_WRITE sendData() diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/debug/DebugViewWatchDogFragment.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/debug/DebugViewWatchDogFragment.kt index b7eeafedee..46096d24c7 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/debug/DebugViewWatchDogFragment.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/debug/DebugViewWatchDogFragment.kt @@ -43,7 +43,8 @@ class DebugViewWatchDogFragment : actv_password_submit.setOnClickListener { val text = acet_close.text if(text==null||text.isEmpty()){ - ToastCharterUtils.showToastShort("请输入密码") +// ToastCharterUtils.showToastShort("请输入密码") + ToastCharterUtils.showToastShort(R.string.module_och_input_pwd) }else{ if(text.toString() == "123987"){ dismissAllowingStateLoss() @@ -52,7 +53,8 @@ class DebugViewWatchDogFragment : } ToggleDebugView.toggleDebugView.toggle(requireContext()) }else{ - ToastCharterUtils.showToastShort("请输入正确密码") +// ToastCharterUtils.showToastShort("请输入正确密码") + ToastCharterUtils.showToastShort(R.string.module_och_input_pwd_error) } } } diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/socket/cloud/AbnormalFactorsLoopManager.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/socket/cloud/AbnormalFactorsLoopManager.kt index 2260880938..d247b9939c 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/socket/cloud/AbnormalFactorsLoopManager.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/socket/cloud/AbnormalFactorsLoopManager.kt @@ -9,6 +9,8 @@ import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.i import com.mogo.eagle.core.utilcode.util.NetworkUtils +import com.mogo.eagle.core.utilcode.util.StringUtils +import com.mogo.och.common.module.R import com.mogo.och.common.module.utils.PermissionUtil import com.mogo.och.common.module.wigets.toast.ToastCharterUtils import io.reactivex.Observable @@ -36,9 +38,11 @@ object AbnormalFactorsLoopManager : IMogoStatusChangedListener { return@observable } if (newValue) { - ToastCharterUtils.showToastLong("长链接状态恢复") +// ToastCharterUtils.showToastLong("长链接状态恢复") + ToastCharterUtils.showToastLong(R.string.module_och_long_link_status_restored) } else { - ToastCharterUtils.showToastLong("长链接异常，请开启相应权限或者查看网络") +// ToastCharterUtils.showToastLong("长链接异常，请开启相应权限或者查看网络") + ToastCharterUtils.showToastLong(R.string.module_och_long_link_error) } } @@ -82,13 +86,16 @@ object AbnormalFactorsLoopManager : IMogoStatusChangedListener { //长链接状态 socketStatus var toastStr = "" - if (!locationStatusPermsStatus) toastStr += "定位服务异常 " - if (!networkStatus) toastStr += " 网络异常 " +// if (!locationStatusPermsStatus) toastStr += "定位服务异常 " + if (!locationStatusPermsStatus) toastStr += StringUtils.getString(R.string.module_och_location_service_error) +// if (!networkStatus) toastStr += " 网络异常 " + if (!networkStatus) toastStr += StringUtils.getString(R.string.module_och_network_service_error) i(TAG, "abnormal_factors_Str = $toastStr") if (!FunctionBuildConfig.isDemoMode && toastStr !== "") { - ToastCharterUtils.showToastLong(toastStr + "请开启相应权限或者查看网络") +// ToastCharterUtils.showToastLong(toastStr + "请开启相应权限或者查看网络") + ToastCharterUtils.showToastLong(R.string.module_och_please_open_permission, toastStr) } } diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/xiaozhi/ZhiStateManager.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/xiaozhi/ZhiStateManager.kt index f264434b89..85b2a93097 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/xiaozhi/ZhiStateManager.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/xiaozhi/ZhiStateManager.kt @@ -13,6 +13,7 @@ import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.permissions.PermissionsDialogUtils import com.mogo.eagle.core.utilcode.util.ActivityUtils +import com.mogo.och.common.module.R import com.mogo.och.common.module.utils.PermissionUtil import com.mogo.och.common.module.wigets.toast.ToastCharterUtils import com.mogo.tts.base.zhi.AsrTextBean @@ -165,7 +166,8 @@ object ZhiStateManager : ZhiRecordWinUi { return } if (!isFastClick()) { - ToastCharterUtils.showToastShort("请稍后唤醒") +// ToastCharterUtils.showToastShort("请稍后唤醒") + ToastCharterUtils.showToastShort(R.string.module_och_please_wait_wake_up) return } if (PermissionUtil.checkPermission(AbsMogoApplication.getApp(), Manifest.permission.RECORD_AUDIO)) { diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/map/AmapNaviToDestinationModel.java b/OCH/common/common/src/main/java/com/mogo/och/common/module/map/AmapNaviToDestinationModel.java index 0451f89777..00987fff51 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/map/AmapNaviToDestinationModel.java +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/map/AmapNaviToDestinationModel.java @@ -26,6 +26,7 @@ import com.mogo.commons.AbsMogoApplication; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.utilcode.util.NetworkUtils; import com.mogo.eagle.core.utilcode.util.ThreadUtils; +import com.mogo.och.common.module.R; import com.mogo.och.common.module.utils.PermissionUtil; import com.mogo.och.common.module.wigets.toast.ToastCharterUtils; @@ -175,14 +176,16 @@ public class AmapNaviToDestinationModel implements AMapNaviListener { } } if (!NetworkUtils.isConnected(AbsMogoApplication.getApp()) || result.getErrorCode() == 2) { - ToastCharterUtils.showToastShort("网络异常，请重试"); +// ToastCharterUtils.showToastShort("网络异常，请重试"); + ToastCharterUtils.showToastShort(R.string.module_och_network_error_retry); if (mNaviChangedCallback != null) { mNaviChangedCallback.reInitNaviAmap(isPlay, false); } return; } if (!PermissionUtil.isLocServiceEnable(AbsMogoApplication.getApp()) || !PermissionUtil.checkPermission(AbsMogoApplication.getApp(), new String[]{Manifest.permission.ACCESS_FINE_LOCATION})) { - ToastCharterUtils.showToastShort("请开启车机定位后重试"); +// ToastCharterUtils.showToastShort("请开启车机定位后重试"); + ToastCharterUtils.showToastShort(R.string.module_och_open_location_permission_retry); if (mNaviChangedCallback != null) { mNaviChangedCallback.reInitNaviAmap(isPlay, false); } diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/utils/ToastUtilsOch.java b/OCH/common/common/src/main/java/com/mogo/och/common/module/utils/ToastUtilsOch.java index 248eb054cb..aee42a6805 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/utils/ToastUtilsOch.java +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/utils/ToastUtilsOch.java @@ -4,6 +4,7 @@ import android.content.Context; import com.mogo.commons.debug.DebugConfig; import com.mogo.eagle.core.utilcode.util.NetworkUtils; +import com.mogo.och.common.module.R; import com.mogo.och.common.module.wigets.toast.ToastCharterUtils; public class ToastUtilsOch { @@ -36,7 +37,8 @@ public class ToastUtilsOch { public static void toastRequestError(Context context,String failMsg){ if (!NetworkUtils.isConnected(context)) { - ToastCharterUtils.showToastShort("网络异常，请稍后重试"); +// ToastCharterUtils.showToastShort("网络异常，请稍后重试"); + ToastCharterUtils.showToastShort(R.string.module_och_network_error_retry1); }else { ToastCharterUtils.showToastShort(failMsg); } diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/dialog/CommonFeedbackDialog.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/dialog/CommonFeedbackDialog.kt index 75e51ad8d8..364c0e8c67 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/dialog/CommonFeedbackDialog.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/dialog/CommonFeedbackDialog.kt @@ -23,7 +23,8 @@ class CommonFeedbackDialog : BaseFloatDialog, LifecycleObserver { private var listener:Listener?=null private var mRunnable:Runnable= Runnable { - ToastUtils.showLong("超时未响应，请求失败") +// ToastUtils.showLong("超时未响应，请求失败") + ToastUtils.showLong(R.string.module_och_timeout) } constructor(builder: Builder, context: Context) : super(context) { diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/toast/ToastCharterUtils.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/toast/ToastCharterUtils.kt index 0e86882483..29f69d71fc 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/toast/ToastCharterUtils.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/toast/ToastCharterUtils.kt @@ -30,6 +30,22 @@ object ToastCharterUtils { }, UiThreadHandler.MODE.QUEUE) } + @JvmStatic + fun showToastLong(@StringRes resId: Int) { + val string = StringUtils.getString(resId) + string?.let { + showToastLong(it) + } + } + + @JvmStatic + fun showToastLong(@StringRes resId: Int, vararg args: Any?) { + val string = StringUtils.getString(resId, args) + string?.let { + showToastLong(it) + } + } + @JvmStatic fun showToastShort(toastText: String?){ CallerLogger.d(SceneConstant.M_OCHCOMMON + TAG,"showToastShort吐司内容：${toastText}") @@ -60,6 +76,12 @@ object ToastCharterUtils { } + fun showCharterLongToast(@StringRes resId: Int) { + val string = StringUtils.getString(resId) + string?.let { + showCharterLongToast(it) + } + } fun showCharterLongToast(toastText: String) { val context = ActivityUtils.getTopActivity() val marker = ToastCharterView(context) diff --git a/OCH/offline/driver/src/main/java/com/mogo/och/offline/model/LineModel.kt b/OCH/offline/driver/src/main/java/com/mogo/och/offline/model/LineModel.kt index 7e19fb84e9..d5e004f053 100644 --- a/OCH/offline/driver/src/main/java/com/mogo/och/offline/model/LineModel.kt +++ b/OCH/offline/driver/src/main/java/com/mogo/och/offline/model/LineModel.kt @@ -198,7 +198,8 @@ object LineModel { } if (!isBackground) { if (!NetworkUtils.isConnected(AbsMogoApplication.getApp())) { - ToastUtils.showShort("网络异常，请稍后重试") +// ToastUtils.showShort("网络异常，请稍后重试") + ToastUtils.showShort(R.string.module_och_network_error) } else { ToastUtils.showShort(failMsg) } @@ -293,7 +294,8 @@ object LineModel { d(TAG, "commitSwitchLineId onError${e.printStackTrace()}") if (e is DataException) { OchChainLogManager.writeChainLog("开始任务", "${e.message}") - ToastUtils.showShort("选择任务失败:${e.message}") +// ToastUtils.showShort("选择任务失败:${e.message}") + ToastUtils.showShort(R.string.module_och_choose_task_fail, e.message) mBusLinesCallbackMap.forEach { it.value.onChangeLineIdFail() } diff --git a/OCH/offline/driver/src/main/java/com/mogo/och/offline/repository/RepositoryManager.kt b/OCH/offline/driver/src/main/java/com/mogo/och/offline/repository/RepositoryManager.kt index ddf5369ca1..44ff3dc00e 100644 --- a/OCH/offline/driver/src/main/java/com/mogo/och/offline/repository/RepositoryManager.kt +++ b/OCH/offline/driver/src/main/java/com/mogo/och/offline/repository/RepositoryManager.kt @@ -12,6 +12,7 @@ import com.mogo.och.data.bean.BusStationBean import com.mogo.och.data.bean.ContraiInfo import com.mogo.och.data.bean.LineInfo import com.mogo.och.data.bean.SiteIntroduce +import com.mogo.och.offline.R import com.mogo.och.offline.repository.db.bean.LineDataBean import com.mogo.och.offline.model.LineModel import com.mogo.och.offline.model.LineModel.currentTask @@ -100,7 +101,8 @@ object RepositoryManager { currentTask?.lineId?.let { ContraiDb.queryAutopilotInfoByLineid(it)?.apply { if (lineId == null || lineId!! < 0L||csvFileUrl.isNullOrEmpty()||csvFileMd5.isNullOrEmpty()||txtFileUrl.isNullOrEmpty()||txtFileMd5.isNullOrEmpty()) { - ToastUtils.showLong("请设置轨迹信息") +// ToastUtils.showLong("请设置轨迹信息") + ToastUtils.showLong(R.string.module_och_set_line_info) OchChainLogManager.writeChainLogAutopilot("轨迹错误",this.toString()) CallerLogger.d(TAG,"轨迹错误,$this") } diff --git a/OCH/offline/driver/src/main/java/com/mogo/och/offline/ui/switchline/SwtichLineModel.kt b/OCH/offline/driver/src/main/java/com/mogo/och/offline/ui/switchline/SwtichLineModel.kt index 7feab574a1..e496ec981a 100644 --- a/OCH/offline/driver/src/main/java/com/mogo/och/offline/ui/switchline/SwtichLineModel.kt +++ b/OCH/offline/driver/src/main/java/com/mogo/och/offline/ui/switchline/SwtichLineModel.kt @@ -7,6 +7,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_ import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.och.common.module.utils.DateTimeUtil import com.mogo.och.common.module.utils.RxUtils +import com.mogo.och.offline.R import com.mogo.och.offline.repository.db.bean.LineDataBean import com.mogo.och.offline.callback.IBusLinesCallback import com.mogo.och.offline.model.LineModel @@ -86,7 +87,8 @@ class SwtichLineModel : ViewModel(), IBusLinesCallback { fun changeLineStart(checkTask:LineDataBean) { if(checkTask==null){ - ToastUtils.showShort("请重新选择线路") +// ToastUtils.showShort("请重新选择线路") + ToastUtils.showShort(R.string.module_och_please_choose_line) return } val newTask = TaskDataBean() diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/LineModel.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/LineModel.kt index 115531b989..cab4281bb7 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/LineModel.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/LineModel.kt @@ -130,14 +130,16 @@ object LineModel { if(RepositoryManager.supportDb()) { if (e is DataException) { OchChainLogManager.writeChainLog("开始任务", "${e.message}") - ToastUtils.showShort("选择任务失败:${e.message}") +// ToastUtils.showShort("选择任务失败:${e.message}") + ToastUtils.showShort(R.string.module_och_choose_task_fail, e.message) mBusLinesCallbackMap.forEach { it.value.onChangeLineIdFail() } } }else{ OchChainLogManager.writeChainLog("开始任务", "${e.message}") - ToastUtils.showShort("选择任务失败:${e.message}") +// ToastUtils.showShort("选择任务失败:${e.message}") + ToastUtils.showShort(R.string.module_och_choose_task_fail, e.message) mBusLinesCallbackMap.forEach { it.value.onChangeLineIdFail() } @@ -261,7 +263,8 @@ object LineModel { "taskId:${currentTask?.taskId}--lineInfo:${LineManager.lineInfos}" OchChainLogManager.writeChainLog("结束任务", changeInfo) } else { - ToastUtils.showShort("结束任务失败请稍后再试") +// ToastUtils.showShort("结束任务失败请稍后再试") + ToastUtils.showShort(R.string.module_och_task_finish_fail) mBusLinesCallbackMap.forEach { it.value.onCompleteTaskFail() } diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/SynchDataModel.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/SynchDataModel.kt index 2818e52bf7..6575dff3f8 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/SynchDataModel.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/SynchDataModel.kt @@ -117,7 +117,8 @@ object SynchDataModel { } if (!isBackground) { if (!NetworkUtils.isConnected(AbsMogoApplication.getApp())) { - ToastUtils.showShort("网络异常，请稍后重试") +// ToastUtils.showShort("网络异常，请稍后重试") + ToastUtils.showShort(R.string.module_och_network_error) } else { ToastUtils.showShort(failMsg) } diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/line/impl/WeaknetRepository.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/line/impl/WeaknetRepository.kt index 4bfb8e4a2f..e673fbb11c 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/line/impl/WeaknetRepository.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/line/impl/WeaknetRepository.kt @@ -16,6 +16,7 @@ import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager import com.mogo.och.common.module.network.OchCommonServiceCallback import com.mogo.och.common.module.utils.DateTimeUtil import com.mogo.och.data.bean.ContraiInfo +import com.mogo.och.shuttle.weaknet.R import com.mogo.och.weaknet.bean.request.QueryPointRequest import com.mogo.och.weaknet.bean.request.ShuttleEventRequest import com.mogo.och.weaknet.bean.response.BusRoutesResponse @@ -122,7 +123,8 @@ class WeaknetRepository : ILineRepository { currentTask?.lineId?.let { ContraiDb.queryAutopilotInfoByLineid(it)?.apply { if (lineId == null || lineId!! < 0L||csvFileUrl.isNullOrEmpty()||csvFileMd5.isNullOrEmpty()||txtFileUrl.isNullOrEmpty()||txtFileMd5.isNullOrEmpty()) { - ToastUtils.showLong("请设置轨迹信息") +// ToastUtils.showLong("请设置轨迹信息") + ToastUtils.showLong(R.string.module_och_set_line_info) OchChainLogManager.writeChainLogAutopilot("轨迹错误",this.toString()) CallerLogger.d(TAG,"轨迹错误,$this") } diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/switchtask/SwitchTaskView.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/switchtask/SwitchTaskView.kt index 61e22524f1..28fb386729 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/switchtask/SwitchTaskView.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/switchtask/SwitchTaskView.kt @@ -72,14 +72,17 @@ class SwitchTaskView: WindowRelativeLayout, SwtichTaskModel.SwtichLineViewCallba actv_submit_task.onClick { val tempCheckTask = mAdapter.getCheckTask() if(tempCheckTask==null){ - ToastUtils.showShort("请选择任务") +// ToastUtils.showShort("请选择任务") + ToastUtils.showShort(R.string.module_och_please_choose_task) }else{ if(tempCheckTask.status == TaskDataBean.used){ val reason = tempData[tempCheckTask.taskId] if(reason==null){ - ToastUtils.showShort("该任务已被其他车辆使用、请切换任务") +// ToastUtils.showShort("该任务已被其他车辆使用、请切换任务") + ToastUtils.showShort(R.string.module_och_this_task_not_use) }else{ - ToastUtils.showShort("该任务已被${reason}使用、请切换任务") +// ToastUtils.showShort("该任务已被${reason}使用、请切换任务") + ToastUtils.showShort(R.string.module_och_this_task_not_use1, reason) } }else { viewModel?.changeLineStart(tempCheckTask) diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/switchtask/SwtichTaskModel.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/switchtask/SwtichTaskModel.kt index f21c20a331..e2f96111de 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/switchtask/SwtichTaskModel.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/switchtask/SwtichTaskModel.kt @@ -7,6 +7,7 @@ import com.mogo.eagle.core.utilcode.util.ThreadUtils import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.och.common.module.manager.loop.BizLoopManager import com.mogo.och.common.module.utils.RxUtils +import com.mogo.och.shuttle.weaknet.R import com.mogo.och.weaknet.callback.IBusLinesCallback import com.mogo.och.weaknet.model.LineModel import com.mogo.och.weaknet.repository.RepositoryManager @@ -116,7 +117,8 @@ class SwtichTaskModel : ViewModel(), IBusLinesCallback { fun changeLineStart(checkTask:TaskDataBean) { if(tasksBelongLine==null){ - ToastUtils.showShort("请重新选择线路") +// ToastUtils.showShort("请重新选择线路") + ToastUtils.showShort(R.string.module_och_please_choose_line) return } viewCallback?.showLoading() diff --git a/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/model/SweeperOperateTaskModel.java b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/model/SweeperOperateTaskModel.java index c9e3cc0266..bb7aa622af 100644 --- a/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/model/SweeperOperateTaskModel.java +++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/model/SweeperOperateTaskModel.java @@ -404,7 +404,8 @@ public class SweeperOperateTaskModel { && TextUtils.isEmpty(mCurrentSubTaskDetail.getCsvFileUrl()) && TextUtils.isEmpty(mCurrentSubTaskDetail.getCsvFileUrlDPQP()) ) { - ToastUtils.showLong("无发布轨迹, 请发布后重试"); +// ToastUtils.showLong("无发布轨迹, 请发布后重试"); + ToastUtils.showLong(R.string.module_taxi_no_publication_trajectory); CallerLogger.e( TAG, "isPassStartAutopilotCommand = " + FunctionBuildConfig.isPassStartAutopilotCommand @@ -605,7 +606,8 @@ public class SweeperOperateTaskModel { public void onFail(int code, String msg) { if (ToastUtilsOch.isCustomFastClick(5000)) { if (!NetworkUtils.isConnected(mContext)) { - ToastUtils.showShort("网络异常，请稍后重试"); +// ToastUtils.showShort("网络异常，请稍后重试"); + ToastUtils.showShort(R.string.module_och_network_error); DebugView.Companion.printErrorMsg("[查询当前任务] 请求failed, 网络异常，请稍后重试"); } else { ToastUtils.showShort(msg); @@ -636,7 +638,8 @@ public class SweeperOperateTaskModel { public void onFail(int code, String msg) { if (ToastUtilsOch.isCustomFastClick(5000)) { if (!NetworkUtils.isConnected(mContext)) { - ToastUtils.showShort("网络异常，请稍后重试"); +// ToastUtils.showShort("网络异常，请稍后重试"); + ToastUtils.showShort(R.string.module_och_network_error); DebugView.Companion.printErrorMsg("[查询主任务] 请求error, 网络异常，请稍后重试"); } else { ToastUtils.showShort(msg); @@ -683,7 +686,8 @@ public class SweeperOperateTaskModel { public void onFail(int code, String msg) { if (ToastUtilsOch.isCustomFastClick(5000)) { if (!NetworkUtils.isConnected(mContext)) { - ToastUtils.showShort("网络异常，请稍后重试"); +// ToastUtils.showShort("网络异常，请稍后重试"); + ToastUtils.showShort(R.string.module_och_network_error); DebugView.Companion.printErrorMsg("[查询子任务] 请求failed, 网络异常，请稍后重试, taskId=" + taskId); } else { ToastUtils.showShort(msg); @@ -748,7 +752,8 @@ public class SweeperOperateTaskModel { public void onFail(int code, String msg) { if (ToastUtilsOch.isCustomFastClick(5000)) { if (!NetworkUtils.isConnected(mContext)) { - ToastUtils.showShort("网络异常，请稍后重试"); +// ToastUtils.showShort("网络异常，请稍后重试"); + ToastUtils.showShort(R.string.module_och_network_error); DebugView.Companion.printErrorMsg("[查询子任务详情及轨迹信息] 请求failed, 网络异常，请稍后重试, isFirst=" + isFirst + ", isEnd=" + isEnd + ", subTaskId=" + subTaskId); } else { ToastUtils.showShort(msg); @@ -804,7 +809,8 @@ public class SweeperOperateTaskModel { public void onFail(int code, String msg) { if (ToastUtilsOch.isCustomFastClick(5000)) { if (!NetworkUtils.isConnected(mContext)) { - ToastUtils.showShort("网络异常，请稍后重试"); +// ToastUtils.showShort("网络异常，请稍后重试"); + ToastUtils.showShort(R.string.module_och_network_error); DebugView.Companion.printErrorMsg("[子任务开始上报] 请求failed, 网络异常，请稍后重试, isFirst=" + isFirst + ", isEnd=" + isEnd + ", subTaskId=" + subTaskId); } else { ToastUtils.showShort(msg); @@ -859,7 +865,8 @@ public class SweeperOperateTaskModel { public void onFail(int code, String msg) { if (ToastUtilsOch.isCustomFastClick(5000)) { if (!NetworkUtils.isConnected(mContext)) { - ToastUtils.showShort("网络异常，请稍后重试"); +// ToastUtils.showShort("网络异常，请稍后重试"); + ToastUtils.showShort(R.string.module_och_network_error); DebugView.Companion.printErrorMsg("[子任务结束上报] 请求failed, 网络异常，请稍后重试, isFirst=" + isFirst + ", isEnd=" + isEnd + ", subTaskId=" + subTaskId); } else { if (isAutopilotSubTaskArriveEndSite) return; @@ -908,7 +915,8 @@ public class SweeperOperateTaskModel { public void onFail(int code, String msg) { if (ToastUtilsOch.isCustomFastClick(5000)) { if (!NetworkUtils.isConnected(mContext)) { - ToastUtils.showShort("网络异常，请稍后重试"); +// ToastUtils.showShort("网络异常，请稍后重试"); + ToastUtils.showShort(R.string.module_och_network_error); DebugView.Companion.printErrorMsg("[子任务跳过上报] 请求failed, 网络异常，请稍后重试, isFirst=" + isFirst + ", isEnd=" + isEnd + ", subTaskId=" + subTaskId); } else { ToastUtils.showShort(msg); @@ -952,7 +960,8 @@ public class SweeperOperateTaskModel { public void onFail(int code, String msg) { if (ToastUtilsOch.isCustomFastClick(5000)) { if (!NetworkUtils.isConnected(mContext)) { - ToastUtils.showShort("网络异常，请稍后重试"); +// ToastUtils.showShort("网络异常，请稍后重试"); + ToastUtils.showShort(R.string.module_och_network_error); DebugView.Companion.printErrorMsg("[主任务重置] 请求failed, 网络异常，请稍后重试, taskId=" + taskId); } else { ToastUtils.showShort(msg); diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiTaskModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiTaskModel.kt index d3ab0ebc36..b03f375f91 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiTaskModel.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiTaskModel.kt @@ -1252,7 +1252,8 @@ object TaxiTaskModel { && TextUtils.isEmpty(mCurrentTaskTrajectory!!.csvFileUrl) && TextUtils.isEmpty(mCurrentTaskTrajectory!!.csvFileUrlDPQP) ) { - ToastUtils.showLong("无发布轨迹, 请发布后重试") +// ToastUtils.showLong("无发布轨迹, 请发布后重试") + ToastUtils.showLong(R.string.module_taxi_no_publication_trajectory) DebugView.printErrorMsg("[启自驾] 无发布轨迹, 请发布后重试") e( TAG, "isPassStartAutopilotCommand = " + diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/cancleorder/CancleOrderView.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/cancleorder/CancleOrderView.kt index 70b45154b4..4eef9da7c1 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/cancleorder/CancleOrderView.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/cancleorder/CancleOrderView.kt @@ -78,7 +78,8 @@ class CancleOrderView : WindowRelativeLayout, CancleOrderViewModel.CancleOrderVi tv_report_cancle_reason.onClick { val checkDataList = cancleOrderItemAdapter.getCheckDataList() if (checkDataList.isEmpty()) { - ToastUtils.showShort("请选择问题类型") +// ToastUtils.showShort("请选择问题类型") + ToastUtils.showShort(R.string.module_mogo_core_function_devatools_choose_issue_type) return@onClick } tv_report_cancle_reason_cancel.isEnabled = false diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/model/AutopilotManager.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/model/AutopilotManager.kt index 76b5a1f72a..733ce26cf8 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/model/AutopilotManager.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/model/AutopilotManager.kt @@ -23,6 +23,7 @@ import com.mogo.och.data.taxi.TaxiOrderStatusEnum import com.mogo.och.unmanned.passenger.bean.TaxiPassengerBaseRespBean import com.mogo.och.unmanned.passenger.constant.TaxiPassengerConst import com.mogo.och.unmanned.passenger.network.TaxiPassengerServiceManager +import com.mogo.och.unmanned.taxi.passenger.R object AutopilotManager : IOchAutopilotStatusListener { @@ -68,7 +69,8 @@ object AutopilotManager : IOchAutopilotStatusListener { && TextUtils.isEmpty(it.csvFileUrl) && TextUtils.isEmpty(it.csvFileUrlDPQP) ) { - ToastUtils.showLong("无发布轨迹, 请发布后重试") +// ToastUtils.showLong("无发布轨迹, 请发布后重试") + ToastUtils.showLong(R.string.module_taxi_no_publication_trajectory) CallerLogger.e( TAG, "isPassStartAutopilotCommand = " + FunctionBuildConfig.isPassStartAutopilotCommand diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/aiview/data/RoadCrossRoamViewModel.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/aiview/data/RoadCrossRoamViewModel.kt index fd6eb8a2f4..42d69ab717 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/aiview/data/RoadCrossRoamViewModel.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/aiview/data/RoadCrossRoamViewModel.kt @@ -15,6 +15,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.och.unmanned.passenger.ui.aiview.AIMessageManager import com.mogo.och.unmanned.passenger.ui.aiview.bean.AIMessage +import com.mogo.och.unmanned.taxi.passenger.R class RoadCrossRoamViewModel: ViewModel(), IMoGoMapRoadListener { @@ -45,7 +46,8 @@ class RoadCrossRoamViewModel: ViewModel(), IMoGoMapRoadListener { // 处于漫游模式下不做处理 if (CallerMapIdentifyManager.roam.second) { if (CallerMapIdentifyManager.roam.first != TAG) { - ToastUtils.showLong("正在漫游中，不展示路口漫游") +// ToastUtils.showLong("正在漫游中，不展示路口漫游") + ToastUtils.showLong(R.string.module_mogo_core_function_roam_now) } CallerLogger.d(TAG, "正在漫游中，不展示路口漫游") return diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/dispatch/DispatchAutoPilotManager.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/dispatch/DispatchAutoPilotManager.kt index a0962857bd..acc5552062 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/dispatch/DispatchAutoPilotManager.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/dispatch/DispatchAutoPilotManager.kt @@ -15,6 +15,7 @@ import com.mogo.eagle.core.data.map.MogoLatLng import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener import com.mogo.eagle.core.function.api.autopilot.IMoGoPlanningRottingListener import com.mogo.eagle.core.function.api.hmi.autopilot.IMoGoCheckAutoPilotBtnListener +import com.mogo.eagle.core.function.biz.R import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager import com.mogo.eagle.core.function.call.autopilot.CallerPlanningRottingListenerManager @@ -24,6 +25,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_BIZ import com.mogo.eagle.core.utilcode.util.CoordinateUtils +import com.mogo.eagle.core.utilcode.util.StringUtils import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.eagle.function.biz.dispatch.network.DispatchServiceModel.Companion.DISPATCH_COMPLETED import com.mogo.eagle.function.biz.dispatch.network.DispatchServiceModel.Companion.DISPATCH_RESULT_AFFIRM @@ -162,42 +164,50 @@ class DispatchAutoPilotManager private constructor() : } if(it.trajUrl == null){ V2XBizTrace.onAck(M_BIZ + TAG, "trajUrl-null") - ToastUtils.showShort("trajUrl数据为空") +// ToastUtils.showShort("trajUrl数据为空") + ToastUtils.showShort(R.string.module_mogo_core_function_biz_traj_url_data_null) return } if(it.trajMd5 == null){ V2XBizTrace.onAck(M_BIZ + TAG, "trajMd5-null") - ToastUtils.showShort("trajMd5数据为空") +// ToastUtils.showShort("trajMd5数据为空") + ToastUtils.showShort(R.string.module_mogo_core_function_biz_traj_md5_data_null) return } if(it.stopUrl == null){ V2XBizTrace.onAck(M_BIZ + TAG, "stopUrl-null") - ToastUtils.showShort("stopUrl数据为空") +// ToastUtils.showShort("stopUrl数据为空") + ToastUtils.showShort(R.string.module_mogo_core_function_biz_stop_url_data_null) return } if(it.stopMd5 == null){ V2XBizTrace.onAck(M_BIZ + TAG, "stopMd5-null") - ToastUtils.showShort("stopMd5数据为空") +// ToastUtils.showShort("stopMd5数据为空") + ToastUtils.showShort(R.string.module_mogo_core_function_biz_stop_md5_data_null) return } if(it.vehicleModel == null){ V2XBizTrace.onAck(M_BIZ + TAG, "vehicleModel-null") - ToastUtils.showShort("vehicleModel数据为空") +// ToastUtils.showShort("vehicleModel数据为空") + ToastUtils.showShort(R.string.module_mogo_core_function_biz_vehicle_model_data_null) return } if(it.lineName == null){ V2XBizTrace.onAck(M_BIZ + TAG, "lineName-null") - ToastUtils.showShort("lineName数据为空") +// ToastUtils.showShort("lineName数据为空") + ToastUtils.showShort(R.string.module_mogo_core_function_biz_line_name_data_null) return } if(it.startLocAddress == null){ V2XBizTrace.onAck(M_BIZ + TAG, "startLocAddress-null") - ToastUtils.showShort("startLocAddress数据为空") +// ToastUtils.showShort("startLocAddress数据为空") + ToastUtils.showShort(R.string.module_mogo_core_function_biz_start_loc_address_data_null) return } if(it.endLocAddress == null){ V2XBizTrace.onAck(M_BIZ + TAG, "endLocAddress-null") - ToastUtils.showShort("endLocAddress数据为空") +// ToastUtils.showShort("endLocAddress数据为空") + ToastUtils.showShort(R.string.module_mogo_core_function_biz_end_loc_address_data_null) return } val currentAutoPilotLine = AutopilotControlParameters.AutoPilotLine(it.lineId.toLong(),it.lineName,it.trajUrl,it.trajMd5, @@ -227,7 +237,8 @@ class DispatchAutoPilotManager private constructor() : //调用工控机开启自动驾驶 startAutoPilot() },onError = { error-> - ToastUtils.showShort("上报调度失败${error}") +// ToastUtils.showShort("上报调度失败${error}") + ToastUtils.showShort(R.string.module_mogo_core_function_biz_reported_dispatch_failure, error) }) } } @@ -244,10 +255,13 @@ class DispatchAutoPilotManager private constructor() : //取消自动驾驶 CallerAutoPilotControlManager.cancelAutoPilot() isDispatch = false - ToastUtils.showShort("云调度取消确认成功") +// ToastUtils.showShort("云调度取消确认成功") + ToastUtils.showShort(R.string.module_mogo_core_function_biz_cloud_cancel_autopilot_success) CallerLogger.i("$M_BIZ$TAG","stopAffirm 取消自动驾驶") }, onError = {error -> - ToastUtils.showShort("停止调度确认失败${error}") +// ToastUtils.showShort("停止调度确认失败${error}") + ToastUtils.showShort(R.string.module_mogo_core_function_biz_cloud_cancel_autopilot_error, error) + } ) } @@ -341,11 +355,14 @@ class DispatchAutoPilotManager private constructor() : receiverBean?.let { //调度完成，同步云端，并且吐司提示 dispatchServiceModel.dispatchResultUpload(DISPATCH_COMPLETED, it.taskId) - ToastUtils.showLong("云调度完成，车辆已到达${it.endLocAddress}") + val msg = StringUtils.getString(R.string.module_mogo_core_function_biz_cloud_complete_arrive, it.endLocAddress) +// ToastUtils.showLong("云调度完成，车辆已到达${it.endLocAddress}") + ToastUtils.showShort(msg) //取消自动驾驶 CallerAutoPilotControlManager.cancelAutoPilot() //语音提示到站 - AIAssist.getInstance(mContext).speakTTSVoice("云调度完成，车辆已到达${it.endLocAddress}") +// AIAssist.getInstance(mContext).speakTTSVoice("云调度完成，车辆已到达${it.endLocAddress}") + AIAssist.getInstance(mContext).speakTTSVoice(msg) } }else{ V2XBizTrace.onAck(M_BIZ + TAG, mapOf("arriveErrorMsg" to "不在到站距离范围内", "ArriveAtStation" to arrivalNotification, "distanceFromSelf" to distanceFromSelf), true) diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/vip/VipCarManager.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/vip/VipCarManager.kt index 4633f25b20..a97e31c907 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/vip/VipCarManager.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/vip/VipCarManager.kt @@ -21,6 +21,7 @@ import com.mogo.eagle.core.data.msgbox.MsgBoxType import com.mogo.eagle.core.data.msgbox.V2XMsg import com.mogo.eagle.core.data.v2x.VipMessage import com.mogo.eagle.core.function.api.datacenter.union.IMoGoTrafficLightListener +import com.mogo.eagle.core.function.biz.R import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationWGS84ListenerManager import com.mogo.eagle.core.function.call.hmi.CallerHmiManager import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager @@ -259,7 +260,8 @@ class VipCarManager : IMogoOnMessageListener, IMoGoTrafficLightListe ",bearing:$bearing" + ",controlTime:$controlTime" ,true) - ToastUtils.showLong("服务异常，请稍后重试") +// ToastUtils.showLong("服务异常，请稍后重试") + ToastUtils.showLong(R.string.module_mogo_core_function_biz_serve_error) }) } 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 cc417ee2b1..cf8faf17f3 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 @@ -40,6 +40,7 @@ import com.mogo.eagle.core.function.call.hmi.CallerHmiViewControlListenerManager import com.mogo.eagle.core.function.call.map.CallerMapDataCollectorManager import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager import com.mogo.eagle.core.function.call.telematic.CallerTelematicStatusListenerManager +import com.mogo.eagle.core.function.datacenter.R import com.mogo.eagle.core.function.datacenter.autopilot.adapter.MoGoAdasListenerImpl import com.mogo.eagle.core.function.datacenter.autopilot.adapter.MoGoAdasMsgConnectStatusListenerImpl import com.mogo.eagle.core.function.datacenter.autopilot.server.AsyncDataToAutopilotServer @@ -156,7 +157,8 @@ class MoGoAutopilotControlProvider : } override fun onStartServer() { - ToastUtils.showShort("司机端服务启动成功!") +// ToastUtils.showShort("司机端服务启动成功!") + ToastUtils.showShort(R.string.module_mogo_core_function_datacenter_driver_service_started_successfully) if (timer == null) { timer = Timer() } @@ -175,7 +177,8 @@ class MoGoAutopilotControlProvider : } override fun onStopServer() { - ToastUtils.showLong("司机端服务停止!") +// ToastUtils.showLong("司机端服务停止!") + ToastUtils.showLong(R.string.module_mogo_core_function_datacenter_driver_service_stop) timer?.cancel() timer = null invokeNettyConnResult("司机端服务停止!") @@ -258,7 +261,8 @@ class MoGoAutopilotControlProvider : AsyncDataToAutopilotServer.INSTANCE.initServer() }.onFailure { throwable -> if (DebugConfig.isDebug()) { - ToastUtils.showLong("AutoPilot出现异常，请立即处理!") +// ToastUtils.showLong("AutoPilot出现异常，请立即处理!") + ToastUtils.showLong(R.string.module_mogo_core_function_datacenter_autopilot_exception) } throwable.printStackTrace() } diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt index f271e82363..0f9787e234 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt @@ -25,6 +25,7 @@ import com.mogo.eagle.core.function.call.autopilot.CallerIpcConnectStateToastMan import com.mogo.eagle.core.function.call.autopilot.CallerParallelDrivingActionsListenerManager import com.mogo.eagle.core.function.call.cloud.CallerCloudListenerManager import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager +import com.mogo.eagle.core.function.datacenter.R import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_D_C @@ -74,7 +75,7 @@ class MoGoAdasMsgConnectStatusListenerImpl : CallerAutopilotCarConfigListenerManager.invokeAutopilotCertFileResult(certificationResult) } - private fun connectToast(reason: String) { + private fun connectToast(reason: Int) { if (CallerIpcConnectStateToastManager.isToast) { ToastUtils.showShort(reason) } @@ -124,7 +125,8 @@ class MoGoAdasMsgConnectStatusListenerImpl : AdasConstants.IpcConnectionStatus.CONNECTED -> { connectStatusDescribe = "已连接" CallerLogger.d("$M_D_C$TAG", connectStatusDescribe) - connectToast("域控已连接") +// connectToast("域控已连接") + connectToast(R.string.module_core_ipc_connection_status_connected) CallerIpcConnectStateToastManager.ipcConnected() // 初始化自动驾驶状态信息 CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo().connectIP = @@ -182,19 +184,22 @@ class MoGoAdasMsgConnectStatusListenerImpl : AdasConstants.IpcConnectionStatus.CONNECTING -> { connectStatusDescribe = "连接中" CallerLogger.d("$M_D_C$TAG", connectStatusDescribe) - connectToast("域控连接中") +// connectToast("域控连接中") + connectToast(R.string.module_core_ipc_connection_status_connecting) } AdasConstants.IpcConnectionStatus.RECONNECTING_TIMER -> { connectStatusDescribe = "重连中（定时器）" CallerLogger.d("$M_D_C$TAG", connectStatusDescribe) - connectToast("域控重连中") +// connectToast("域控重连中") + connectToast(R.string.module_core_ipc_connection_status_reconnecting) } AdasConstants.IpcConnectionStatus.RECONNECTING_NETWORK -> { connectStatusDescribe = "重连中（网络监听）" CallerLogger.d("$M_D_C$TAG", connectStatusDescribe) - connectToast("域控重连中") +// connectToast("域控重连中") + connectToast(R.string.module_core_ipc_connection_status_reconnecting) } AdasConstants.IpcConnectionStatus.CONNECT_EXCEPTION -> { @@ -215,7 +220,8 @@ class MoGoAdasMsgConnectStatusListenerImpl : connectStatusDescribe ) resetArgs() - connectToast("非法域控地址") +// connectToast("非法域控地址") + connectToast(R.string.module_core_ipc_connection_status_illegal_address) } AdasConstants.IpcConnectionStatus.SEARCH_ADDRESS -> { @@ -224,7 +230,8 @@ class MoGoAdasMsgConnectStatusListenerImpl : "$M_D_C$TAG", connectStatusDescribe ) - connectToast("正在搜索域控地址") +// connectToast("正在搜索域控地址") + connectToast(R.string.module_core_ipc_connection_status_search_address) } AdasConstants.IpcConnectionStatus.NOT_FOUND_ADDRESS -> { diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/telematic/TeleMsgHandler.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/telematic/TeleMsgHandler.kt index 70c0c9c2f9..bd2b0fc04c 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/telematic/TeleMsgHandler.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/telematic/TeleMsgHandler.kt @@ -32,6 +32,7 @@ import com.mogo.eagle.core.function.call.och.CallerOchBizFunctionCall4EagleManag import com.mogo.eagle.core.function.call.telematic.CallerTelematicListenerManager import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager import com.mogo.eagle.core.function.call.v2x.CallerTrafficLightListenerManager +import com.mogo.eagle.core.function.datacenter.R import com.mogo.eagle.core.utilcode.kotlin.lifeCycleScope import com.mogo.eagle.core.utilcode.kotlin.scope import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger @@ -518,7 +519,8 @@ class TeleMsgHandler : IMsgHandler { CallerTelematicListenerManager.invokeReceivedMsg(TelematicConstant.DRIVE_SEAT_VIDEO_STREAM_RSP, it.body) } TelematicConstant.PASSENGER_APP_REBOOT -> { - ToastUtils.showLong("乘客屏已收到重启命令") +// ToastUtils.showLong("乘客屏已收到重启命令") + ToastUtils.showLong(R.string.module_mogo_core_function_datacenter_passenger_received_restart_command) } else -> { } @@ -550,7 +552,8 @@ class TeleMsgHandler : IMsgHandler { isReceiveSN = false } // AdasManager.getInstance().startDispatchHandler() - ToastUtils.showShort("连接司机屏成功!") +// ToastUtils.showShort("连接司机屏成功!") + ToastUtils.showShort(R.string.module_mogo_core_function_datacenter_passenger_link_driver_success) invokeReqStatusLog(mapOf("dpConnectStatus" to true)) val byteArray = byteArrayOf(0) NSDNettyManager.getInstance().sendMogoProtocolMsgToServer( @@ -567,7 +570,8 @@ class TeleMsgHandler : IMsgHandler { isFirstDisc = false AppConfigInfo.plateNumber = "" AppConfigInfo.iPCMacAddress = "" - ToastUtils.showLong("断开和司机屏的连接!") +// ToastUtils.showLong("断开和司机屏的连接!") + ToastUtils.showLong(R.string.module_mogo_core_function_datacenter_passenger_disconnect_driver) invokeReqStatusLog(mapOf("dpConnectStatus" to false)) AdasManager.getInstance().stopDispatchHandler() } @@ -575,7 +579,8 @@ class TeleMsgHandler : IMsgHandler { ConnectState.STATUS_CONNECT_ERROR -> { AppConfigInfo.plateNumber = "" - ToastUtils.showLong("和司机端连接异常!") +// ToastUtils.showLong("和司机端连接异常!") + ToastUtils.showLong(R.string.module_mogo_core_function_datacenter_passenger_connect_driver_error) invokeReqStatusLog(mapOf("dpConnectErrorMsg" to "$content")) AdasManager.getInstance().stopDispatchHandler() } diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/BadCaseManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/BadCaseManager.kt index 58c170d4e3..6f9010aa76 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/BadCaseManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/BadCaseManager.kt @@ -192,10 +192,12 @@ internal object BadCaseManager : LifecycleEventObserver, IMoGoAutopilotRecordLis BadCaseConfig.totalDuration, BadCaseConfig.previousDuration) } }else { - ToastUtils.showShort("工控机连接状态异常") +// ToastUtils.showShort("工控机连接状态异常") + ToastUtils.showShort(com.zhjt.mogo_core_function_devatools.R.string.module_mogo_core_function_devatools_bad_case_adas_connect_error) } }else { - ToastUtils.showShort("网络异常,请检查网络") +// ToastUtils.showShort("网络异常,请检查网络") + ToastUtils.showShort(com.zhjt.mogo_core_function_devatools.R.string.module_mogo_core_function_devatools_bad_case_network_error) } } @@ -273,13 +275,16 @@ internal object BadCaseManager : LifecycleEventObserver, IMoGoAutopilotRecordLis reportTypeWindow?.showFloatWindow(xPosition,yPosition) } }else{ - ToastUtils.showShort("工控机连接状态异常") +// ToastUtils.showShort("工控机连接状态异常") + ToastUtils.showShort(com.zhjt.mogo_core_function_devatools.R.string.module_mogo_core_function_devatools_bad_case_adas_connect_error) } }else{ - ToastUtils.showShort("网络异常,请检查网络") +// ToastUtils.showShort("网络异常,请检查网络") + ToastUtils.showShort(com.zhjt.mogo_core_function_devatools.R.string.module_mogo_core_function_devatools_bad_case_network_error) } }else{ - ToastUtils.showShort("请勿连续点击，稍后再试") +// ToastUtils.showShort("请勿连续点击，稍后再试") + ToastUtils.showShort(com.zhjt.mogo_core_function_devatools.R.string.module_mogo_core_function_devatools_bad_case_do_no_click_continuously) } } } @@ -324,13 +329,16 @@ internal object BadCaseManager : LifecycleEventObserver, IMoGoAutopilotRecordLis caseListDialog.show() } } else { - ToastUtils.showShort("工控机连接状态异常") +// ToastUtils.showShort("工控机连接状态异常") + ToastUtils.showShort(com.zhjt.mogo_core_function_devatools.R.string.module_mogo_core_function_devatools_bad_case_adas_connect_error) } } else { - ToastUtils.showShort("网络异常,请检查网络") +// ToastUtils.showShort("网络异常,请检查网络") + ToastUtils.showShort(com.zhjt.mogo_core_function_devatools.R.string.module_mogo_core_function_devatools_bad_case_network_error) } } else { - ToastUtils.showShort("请勿连续点击，稍后再试") +// ToastUtils.showShort("请勿连续点击，稍后再试") + ToastUtils.showShort(com.zhjt.mogo_core_function_devatools.R.string.module_mogo_core_function_devatools_bad_case_do_no_click_continuously) } } @@ -355,13 +363,16 @@ internal object BadCaseManager : LifecycleEventObserver, IMoGoAutopilotRecordLis }) aiDataCollectWindow.showFloatWindow() } else { - ToastUtils.showShort("工控机连接状态异常") +// ToastUtils.showShort("工控机连接状态异常") + ToastUtils.showShort(com.zhjt.mogo_core_function_devatools.R.string.module_mogo_core_function_devatools_bad_case_adas_connect_error) } } else { - ToastUtils.showShort("网络异常,请检查网络") +// ToastUtils.showShort("网络异常,请检查网络") + ToastUtils.showShort(com.zhjt.mogo_core_function_devatools.R.string.module_mogo_core_function_devatools_bad_case_network_error) } } else { - ToastUtils.showShort("请勿连续点击，稍后再试") +// ToastUtils.showShort("请勿连续点击，稍后再试") + ToastUtils.showShort(com.zhjt.mogo_core_function_devatools.R.string.module_mogo_core_function_devatools_bad_case_do_no_click_continuously) } } diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/AIDataCollectView.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/AIDataCollectView.kt index 91160223af..da0e87527d 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/AIDataCollectView.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/AIDataCollectView.kt @@ -137,7 +137,8 @@ class AIDataCollectView @JvmOverloads constructor( //上报 tvUpload.setOnClickListener { if(collectList.isEmpty()){ - ToastUtils.showShort("请选择最少一个原因") +// ToastUtils.showShort("请选择最少一个原因") + ToastUtils.showShort(R.string.module_mogo_core_function_devatools_last_chose_one) return@setOnClickListener } collectReason.clear() @@ -170,7 +171,8 @@ class AIDataCollectView @JvmOverloads constructor( }) if (uploadResult == null || uploadResult.code != 200) { - TipToast.shortTip("上报失败") +// TipToast.shortTip("上报失败") + TipToast.shortTip(R.string.module_core_reporting_failed) } else { //上报成功 ThreadUtils.runOnUiThread { @@ -270,7 +272,8 @@ class AIDataCollectView @JvmOverloads constructor( override fun onAiDataError() { if(BadCaseReasonStore.getAiDataRecord().isEmpty()){ - ToastUtils.showShort("AI数据采集数据请求错误且无缓存数据可用") +// ToastUtils.showShort("AI数据采集数据请求错误且无缓存数据可用") + ToastUtils.showShort(R.string.module_mogo_core_function_devatools_ai_data_gather_error) } } diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/AIDataCollectWindow.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/AIDataCollectWindow.kt index 86e0a5d304..8c238294c2 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/AIDataCollectWindow.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/AIDataCollectWindow.kt @@ -163,7 +163,8 @@ class AIDataCollectWindow constructor(activity: Activity) : View.OnTouchListener //上报 tvCollectReport.setOnClickListener { if(collectList.isEmpty()){ - ToastUtils.showShort("请选择最少一个原因") +// ToastUtils.showShort("请选择最少一个原因") + ToastUtils.showShort(R.string.module_mogo_core_function_devatools_last_chose_one) return@setOnClickListener } collectReason.clear() @@ -196,9 +197,11 @@ class AIDataCollectWindow constructor(activity: Activity) : View.OnTouchListener }) if (uploadResult == null || uploadResult.code != 200) { - TipToast.shortTip("上报失败") +// TipToast.shortTip("上报失败") + TipToast.shortTip(R.string.module_core_reporting_failed) } else { - TipToast.shortTip("上报成功") +// TipToast.shortTip("上报成功") + TipToast.shortTip(R.string.module_core_reporting_success) //将上报BI的结果同步给工控机记录保存 recordKey?.let { val descReqEntity = BagDescriptionEntity(collectReason.toString(),false,"",true) @@ -343,7 +346,8 @@ class AIDataCollectWindow constructor(activity: Activity) : View.OnTouchListener override fun onAiDataError() { if(BadCaseReasonStore.getAiDataRecord().isEmpty()){ - ToastUtils.showShort("AI数据采集数据请求错误且无缓存数据可用") +// ToastUtils.showShort("AI数据采集数据请求错误且无缓存数据可用") + ToastUtils.showShort(R.string.module_mogo_core_function_devatools_ai_data_gather_error) } } diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/BadCaseConfigView.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/BadCaseConfigView.kt index fe8b177f30..b64f95ff1d 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/BadCaseConfigView.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/BadCaseConfigView.kt @@ -95,19 +95,23 @@ internal class BadCaseConfigView @JvmOverloads constructor( } if (mPreviousDuration < 0 || mPreviousDuration > 30) { - ToastUtils.showLong("前溯采集时长最长30S") +// ToastUtils.showLong("前溯采集时长最长30S") + ToastUtils.showLong(R.string.module_mogo_core_function_devatools_bad_case_previous_duration) return@setOnClickListener } if (mBackDuration < 0 || mBackDuration > 300) { - ToastUtils.showLong("采集总时长最长300S") +// ToastUtils.showLong("采集总时长最长300S") + ToastUtils.showLong(R.string.module_mogo_core_function_devatools_bad_case_Back_duration_max) return@setOnClickListener } if ((mPreviousDuration + mBackDuration) < 5) { - ToastUtils.showLong("采集总时长最短5S") +// ToastUtils.showLong("采集总时长最短5S") + ToastUtils.showLong(R.string.module_mogo_core_function_devatools_bad_case_Back_duration_min) return@setOnClickListener } if ((mPreviousDuration + mBackDuration) > 300) { - ToastUtils.showLong("采集总时长最长300S") +// ToastUtils.showLong("采集总时长最长300S") + ToastUtils.showLong(R.string.module_mogo_core_function_devatools_bad_case_all) return@setOnClickListener } BadCaseConfig.previousDuration = mPreviousDuration @@ -115,7 +119,8 @@ internal class BadCaseConfigView @JvmOverloads constructor( BadCaseConfig.totalDuration = BadCaseConfig.previousDuration + BadCaseConfig.backDuration } catch (e: Exception) { - ToastUtils.showLong("输入时间格式不合法，请重新输入") +// ToastUtils.showLong("输入时间格式不合法，请重新输入") + ToastUtils.showLong(R.string.module_mogo_core_function_devatools_input_time_illegality) etInitiativePreTime.text = null etInitiativeAfterTime.text = null return@setOnClickListener @@ -125,7 +130,8 @@ internal class BadCaseConfigView @JvmOverloads constructor( //保存录制模板采集类型 BadCaseConfig.type = mType //吐司提示保存成功 - ToastUtils.showLong("保存成功") +// ToastUtils.showLong("保存成功") + ToastUtils.showLong(R.string.module_mogo_core_function_devatools_save_success) //关闭配置窗口 clickListener?.onClose() } diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/BadCaseManagerView.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/BadCaseManagerView.kt index 91a9798b34..15e5271a2d 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/BadCaseManagerView.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/BadCaseManagerView.kt @@ -143,7 +143,8 @@ class BadCaseManagerView @JvmOverloads constructor( bagUploadDialog?.show() bagUploadDialog?.setAllUpload(selectedBagNum,selectedBagSize) }else{ - ToastUtils.showShort("请先选择要上传的Bag包") +// ToastUtils.showShort("请先选择要上传的Bag包") + ToastUtils.showShort(R.string.module_mogo_core_function_devatools_choose_upload_bag) } } @@ -154,7 +155,8 @@ class BadCaseManagerView @JvmOverloads constructor( bagManagerEntity.keyReq = bagManagerList[0].key CallerAutoPilotControlManager.sendBagManagerCmd(bagManagerEntity) }else{ - ToastUtils.showShort("请先选择要删除的Bag包") +// ToastUtils.showShort("请先选择要删除的Bag包") + ToastUtils.showShort(R.string.module_mogo_core_function_devatools_choose_del_bag) } } @@ -412,32 +414,43 @@ class BadCaseManagerView @JvmOverloads constructor( } //上传Cos执行完成 if(bagManagerList.size == 0 && selectedBagNum != 0){ - ToastUtils.showShort("上传命令完成") +// ToastUtils.showShort("上传命令完成") + ToastUtils.showShort(R.string.module_mogo_core_function_devatools_upload_bag_complete) bagUploadDialog?.uploadCompleted() tvCancelSelect.performClick() } when (bagManager.uploadCosResp.stat) { 0 -> { - ToastUtils.showShort("${bagManager.uploadCosResp.key} 上传cos桶成功") +// ToastUtils.showShort("${bagManager.uploadCosResp.key} 上传cos桶成功") + ToastUtils.showShort(R.string.module_mogo_core_function_devatools_upload_cos_success, "${bagManager.uploadCosResp.key}") } 1 -> { //执行中 } 2 -> { - ToastUtils.showShort("${bagManager.uploadCosResp.key} 上传cos桶执行python失败") +// ToastUtils.showShort("${bagManager.uploadCosResp.key} 上传cos桶执行python失败") + ToastUtils.showShort(R.string.module_mogo_core_function_devatools_upload_cos_python_fail, "${bagManager.uploadCosResp.key}") } 3 -> { - ToastUtils.showShort("${bagManager.uploadCosResp.key} 上传cos桶拷贝过程失败") +// ToastUtils.showShort("${bagManager.uploadCosResp.key} 上传cos桶拷贝过程失败") + ToastUtils.showShort(R.string.module_mogo_core_function_devatools_upload_cos_copy_fail, "${bagManager.uploadCosResp.key}") } 4 -> { - ToastUtils.showShort("${bagManager.uploadCosResp.key} 上传cos桶合并过程失败") +// ToastUtils.showShort("${bagManager.uploadCosResp.key} 上传cos桶合并过程失败") + ToastUtils.showShort(R.string.module_mogo_core_function_devatools_upload_cos_merge_fail, "${bagManager.uploadCosResp.key}") } 5 -> { - ToastUtils.showShort("${bagManager.uploadCosResp.key} 上传cos桶上传过程失败") +// ToastUtils.showShort("${bagManager.uploadCosResp.key} 上传cos桶上传过程失败") + ToastUtils.showShort(R.string.module_mogo_core_function_devatools_upload_cos_fail, "${bagManager.uploadCosResp.key}") } else -> { - ToastUtils.showShort("${bagManager.uploadCosResp.key} 上传cos桶 ${bagManager.uploadCosResp.message}") +// ToastUtils.showShort("${bagManager.uploadCosResp.key} 上传cos桶 ${bagManager.uploadCosResp.message}") + ToastUtils.showShort( + R.string.module_mogo_core_function_devatools_upload_cos, + "${bagManager.uploadCosResp.key}", + bagManager.uploadCosResp.message + ) } } diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/CaseTopicListDialog.java b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/CaseTopicListDialog.java index b924f6213a..e82f6b7d26 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/CaseTopicListDialog.java +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/CaseTopicListDialog.java @@ -163,7 +163,8 @@ public class CaseTopicListDialog extends Dialog implements IMoGoAutopilotRecordL if (recordType != null) { Boolean success = CallerAutoPilotControlManager.INSTANCE.getBadCaseConfig(2, recordType.getId(), addTopicList); if (Boolean.TRUE.equals(success)) { - ToastUtils.showShort("Topic设置成功"); +// ToastUtils.showShort("Topic设置成功"); + ToastUtils.showShort(R.string.module_mogo_core_function_devatools_topic_set_success); if (recordType.getId() == 0) { //自定义Topic BadCaseConfig.customTopicList.clear(); @@ -173,7 +174,8 @@ public class CaseTopicListDialog extends Dialog implements IMoGoAutopilotRecordL recordType.getTopicsList().removeAll(allTopicList); dismiss(); } else { - ToastUtils.showShort("Topic设置失败"); +// ToastUtils.showShort("Topic设置失败"); + ToastUtils.showShort(R.string.module_mogo_core_function_devatools_topic_set_fail); } } }); diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/InitiativeBadCaseWindow.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/InitiativeBadCaseWindow.kt index d1eba6f878..19ae40a387 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/InitiativeBadCaseWindow.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/InitiativeBadCaseWindow.kt @@ -206,7 +206,8 @@ class InitiativeBadCaseWindow constructor(activity: Activity) : View.OnTouchList //上报 tvInitiativeReport.setOnClickListener { if(uploadList.isEmpty()){ - ToastUtils.showShort("请选择最少一个原因") +// ToastUtils.showShort("请选择最少一个原因") + ToastUtils.showShort(R.string.module_mogo_core_function_devatools_last_chose_one) return@setOnClickListener } uploadReason.clear() @@ -257,7 +258,8 @@ class InitiativeBadCaseWindow constructor(activity: Activity) : View.OnTouchList */ private val mInitListener = InitListener { code -> if (code != ErrorCode.SUCCESS) { - ToastUtils.showShort("讯飞语音听写初始化失败，错误码：$code") +// ToastUtils.showShort("讯飞语音听写初始化失败，错误码：$code") + ToastUtils.showShort(R.string.module_mogo_core_function_devatools_iflytek_speech_recognizer_init_fail, code) } } @@ -334,7 +336,8 @@ class InitiativeBadCaseWindow constructor(activity: Activity) : View.OnTouchList // 不显示听写对话框 ret = it.startListening(mRecognizerListener) if (ret != ErrorCode.SUCCESS) { - ToastUtils.showShort("听写失败,错误码：$ret,请点击网址https://www.xfyun.cn/document/error-code查询解决方案") +// ToastUtils.showShort("听写失败,错误码：$ret,请点击网址https://www.xfyun.cn/document/error-code查询解决方案") + ToastUtils.showShort(R.string.module_mogo_core_function_devatools_iflytek_speech_recognizer_fail, ret) } } audioFileName = "Audio_${System.currentTimeMillis()}_BadCase" @@ -389,7 +392,8 @@ class InitiativeBadCaseWindow constructor(activity: Activity) : View.OnTouchList } override fun onUploadFail(filePath: String) { - TipToast.shortTip("上传语音文件失败") +// TipToast.shortTip("上传语音文件失败") + TipToast.shortTip(R.string.module_core_upload_voice_file_failed) //将语音文件上传Cos监听移除 removeUploadListener(singlePath) } @@ -444,12 +448,14 @@ class InitiativeBadCaseWindow constructor(activity: Activity) : View.OnTouchList itx["coordinate"] = "latitude:${getChassisLocationWGS84().latitude};longitude:${getChassisLocationWGS84().longitude}" //坐标 }) if (uploadResult == null || uploadResult.code != 200) { - TipToast.shortTip("上报失败") +// TipToast.shortTip("上报失败") + TipToast.shortTip(R.string.module_core_reporting_failed) ThreadUtils.runOnUiThread { tvInitiativeReport.text = "上报" } } else { - TipToast.shortTip("上报成功") +// TipToast.shortTip("上报成功") + TipToast.shortTip(R.string.module_core_reporting_success) //将上报BI的结果同步给工控机记录保存 recordKey.let { val hasAudio = downloadUrl != null @@ -603,7 +609,8 @@ class InitiativeBadCaseWindow constructor(activity: Activity) : View.OnTouchList override fun onInitiativeError() { if(BadCaseReasonStore.getInitiativeDataRecord().isEmpty()){ - ToastUtils.showShort("主动录包数据采集错误且无缓存数据可用") +// ToastUtils.showShort("主动录包数据采集错误且无缓存数据可用") + ToastUtils.showShort(R.string.module_mogo_core_function_devatools_initiative_record_bad_fail) } } diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/PassiveBadCaseWindow.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/PassiveBadCaseWindow.kt index 883ca30e6c..dbf5aed520 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/PassiveBadCaseWindow.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/PassiveBadCaseWindow.kt @@ -197,7 +197,8 @@ class PassiveBadCaseWindow constructor(activity: Activity) : View.OnTouchListene tvPassiveReport.setOnClickListener { hasOperated = true if(uploadList.isEmpty()){ - TipToast.shortTip("请选择至少一个Case") +// TipToast.shortTip("请选择至少一个Case") + TipToast.shortTip(R.string.module_core_please_choose_noe_case) return@setOnClickListener } uploadReason.clear() @@ -259,7 +260,8 @@ class PassiveBadCaseWindow constructor(activity: Activity) : View.OnTouchListene private val mInitListener = InitListener { code -> Log.i(TAG, "SpeechRecognizer init() code = $code") if (code != ErrorCode.SUCCESS) { - ToastUtils.showShort("讯飞语音听写初始化失败，错误码：$code") +// ToastUtils.showShort("讯飞语音听写初始化失败，错误码：$code") + ToastUtils.showShort(R.string.module_mogo_core_function_devatools_iflytek_speech_recognizer_init_fail, code) } } @@ -337,7 +339,8 @@ class PassiveBadCaseWindow constructor(activity: Activity) : View.OnTouchListene // 不显示听写对话框 ret = it.startListening(mRecognizerListener) if (ret != ErrorCode.SUCCESS) { - ToastUtils.showShort("听写失败,错误码：$ret,请点击网址https://www.xfyun.cn/document/error-code查询解决方案") +// ToastUtils.showShort("听写失败,错误码：$ret,请点击网址https://www.xfyun.cn/document/error-code查询解决方案") + ToastUtils.showShort(R.string.module_mogo_core_function_devatools_iflytek_speech_recognizer_fail, ret) } } audioFileName = "Audio_${System.currentTimeMillis()}_BadCase" @@ -392,7 +395,8 @@ class PassiveBadCaseWindow constructor(activity: Activity) : View.OnTouchListene } override fun onUploadFail(filePath: String) { - TipToast.shortTip("上传语音文件失败") +// TipToast.shortTip("上传语音文件失败") + TipToast.shortTip(R.string.module_core_upload_voice_file_failed) //将语音文件上传Cos监听移除 removeUploadListener(singlePath) } @@ -449,12 +453,14 @@ class PassiveBadCaseWindow constructor(activity: Activity) : View.OnTouchListene }) if (uploadResult == null || uploadResult.code != 200) { - TipToast.shortTip("上报失败") +// TipToast.shortTip("上报失败") + TipToast.shortTip(R.string.module_core_reporting_failed) ThreadUtils.runOnUiThread{ tvPassiveReport.text = "上报" } } else { - TipToast.shortTip("上报成功") +// TipToast.shortTip("上报成功") + TipToast.shortTip(R.string.module_core_reporting_success) //将上报BI的结果同步给工控机记录保存 recordKey?.let { val hasAudio = downloadUrl != null @@ -571,7 +577,8 @@ class PassiveBadCaseWindow constructor(activity: Activity) : View.OnTouchListene override fun onPassiveError() { if(BadCaseReasonStore.getPassiveDataRecord().isEmpty()){ - ToastUtils.showShort("被动录包数据采集错误且无缓存数据可用") +// ToastUtils.showShort("被动录包数据采集错误且无缓存数据可用") + ToastUtils.showShort(R.string.module_mogo_core_function_devatools_passivity_record_bad_fail) } } diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/adapter/BagManagerListAdapter.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/adapter/BagManagerListAdapter.kt index b2621e40e1..a48aea55bd 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/adapter/BagManagerListAdapter.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/adapter/BagManagerListAdapter.kt @@ -171,7 +171,8 @@ class BagManagerListAdapter: RecyclerView.Adapter() { if(RecordBitmapUtils.checkHasImage(bagInfoEntity.key)){ bagClickListener?.lookMapScreen(bagInfoEntity.key) }else{ - ToastUtils.showShort("该截图录制失败或已删除") +// ToastUtils.showShort("该截图录制失败或已删除") + ToastUtils.showShort(R.string.module_mogo_core_function_devatools_record_bitmap_fail) } } } diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarNetWorkManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarNetWorkManager.kt index 9e5d3784a5..fce0ee43a8 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarNetWorkManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarNetWorkManager.kt @@ -94,7 +94,8 @@ class BindingCarNetWorkManager private constructor() { when (info.getData().compare) { "0" -> showBindingCarDialog() "3" -> showModifyBindingCarDialog() - "null" -> TipToast.shortTip("当前工控机没有入库") +// "null" -> TipToast.shortTip("当前工控机没有入库") + "null" -> TipToast.shortTip(R.string.module_core_ipc_not_db) } // updateCarVrIconRes(info.getData().brandId) } else { diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcatch/MogoLogCatchManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcatch/MogoLogCatchManager.kt index e538c9adb3..924ba38bd5 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcatch/MogoLogCatchManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcatch/MogoLogCatchManager.kt @@ -25,12 +25,14 @@ import com.mogo.commons.storage.SharedPrefsMgr import com.mogo.core.log.record.LogcatManager import com.mogo.eagle.core.data.deva.chain.ChainLogParam import com.mogo.eagle.core.utilcode.mogo.toast.TipToast +import com.mogo.eagle.core.utilcode.util.StringUtils import com.mogo.eagle.core.utilcode.util.ThreadUtils import com.mogo.map.MogoData.Companion.mogoMapData import com.zhidao.loglib.bean.RemoteLogPushContent import com.zhidao.loglib.call.LogInfoManagerFactory import com.zhidao.loglib.core.ILogListener import com.zhidao.loglib.core.LogInfoManager +import com.zhjt.mogo_core_function_devatools.R import com.zhjt.mogo_core_function_devatools.logcat.config.LogRecordConfig import com.zhjt.mogo_core_function_devatools.logcatch.MogoLogCatchConst.Companion.CACHE_MAP_UPLOAD import com.zhjt.mogo_core_function_devatools.logcatch.MogoLogCatchConst.Companion.CACHE_TRACE_UPLOAD @@ -114,27 +116,33 @@ object MogoLogCatchManager : IMogoOnMessageListener, Handl obj.pkgName = mContext?.packageName when (obj.type) { START_CATCH_LOG -> if (!catchingList.contains(obj.pkgName)) { - TipToast.longTip("云端下发抓取日志，时间:${obj.duration}分钟") +// TipToast.longTip("云端下发抓取日志，时间:${obj.duration}分钟") + TipToast.longTip(StringUtils.getString(R.string.module_core_cloud_send_get_log, obj.duration)) startCatchLog(obj.duration) } STOP_CATCH_LOG -> { - TipToast.longTip("云端下发停止抓取日志") +// TipToast.longTip("云端下发停止抓取日志") + TipToast.longTip(R.string.module_core_cloud_stop_send_get_log) stopCatchLog(obj) } LOCAL_CONFIG_OPEN_LOG -> { - TipToast.longTip("云端下发打开日志开关") +// TipToast.longTip("云端下发打开日志开关") + TipToast.longTip(R.string.module_core_cloud_send_open_log_switch) openLoggerLevel() } LOCAL_CONFIG_CLOSE_LOG -> { - TipToast.longTip("云端下发关闭日志开关") +// TipToast.longTip("云端下发关闭日志开关") + TipToast.longTip(R.string.module_core_cloud_send_close_log_switch) closeLoggerLevel() } CACHE_TRACE_UPLOAD -> { - TipToast.longTip("上传本地缓存链路日志") +// TipToast.longTip("上传本地缓存链路日志") + TipToast.longTip(R.string.module_core_upload_cache_log) LogInfoManagerFactory.cacheTraceLogUpload() } CACHE_MAP_UPLOAD -> { - TipToast.longTip("上传本地地图缓存日志") +// TipToast.longTip("上传本地地图缓存日志") + TipToast.longTip(R.string.module_core_upload_cache_map_log) mapCacheUpload = true } LOCAL_CONFIG_CLOSE_SINGLE_FW -> { @@ -200,7 +208,8 @@ object MogoLogCatchManager : IMogoOnMessageListener, Handl @BizConfig(FOUNDATION, "", BIZ_FULL_LOG) fun startCatchLog(duration: Int = 10, logPrefixName: String? = null) { if (catchingList.contains(manualContent.pkgName + logPrefixName)) { - TipToast.shortTip("已经在抓取日志了,请稍后再试") +// TipToast.shortTip("已经在抓取日志了,请稍后再试") + TipToast.shortTip(R.string.module_core_started_capture_log) } else { CallerLogger.d("$M_DEVA$TAG", "开始抓取日志==== duration : $duration") manualContent.type = START_CATCH_LOG @@ -220,7 +229,8 @@ object MogoLogCatchManager : IMogoOnMessageListener, Handl CallerLogger.d("$M_DEVA$TAG", "startCatchLog path : ${content.pkgName + logPrefixName}") if (SharedPrefsMgr.getInstance().sn == null) { ThreadUtils.runOnUiThread { - TipToast.shortTip("缺少设备唯一ID，请检查网络") +// TipToast.shortTip("缺少设备唯一ID，请检查网络") + TipToast.shortTip(R.string.module_core_device_not_uuid) } return } @@ -330,7 +340,8 @@ object MogoLogCatchManager : IMogoOnMessageListener, Handl override fun onError(errorCount: Int) { ThreadUtils.runOnUiThread { - TipToast.shortTip("日志抓取出现错误，出错数量:$errorCount") +// TipToast.shortTip("日志抓取出现错误，出错数量:$errorCount") + TipToast.shortTip(StringUtils.getString(R.string.module_core_get_log_error, errorCount)) } } diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/mofang/MoGoMoFangProviderImpl.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/mofang/MoGoMoFangProviderImpl.kt index 3d7ecc34e3..25028dabaf 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/mofang/MoGoMoFangProviderImpl.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/mofang/MoGoMoFangProviderImpl.kt @@ -322,7 +322,8 @@ internal class MoGoMoFangProviderImpl: IMoGoMoFangProvider, OnMoFangDeviceListen MoFangAnalyticUtils.track(EVENT_MOFANG_CONNECT, mutableMapOf(EVENT_MOFANG_CONNECT_PARAMS_SETTING_REQ to "${System.currentTimeMillis()}")) linkedLog.record(mapOf("callback" to "onBluetoothSettingRequest")) UiThreadHandler.post { - Toast.makeText(Utils.getApp(), "检测到魔方未正确连接，请在系统蓝牙设置页面，找到魔方并配对连接...", Toast.LENGTH_SHORT).show() +// Toast.makeText(Utils.getApp(), "检测到魔方未正确连接，请在系统蓝牙设置页面，找到魔方并配对连接...", Toast.LENGTH_SHORT).show() + Toast.makeText(Utils.getApp(), com.mogo.eagle.core.widget.R.string.module_core_mofang_connect_error, Toast.LENGTH_SHORT).show() } } diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/monitor/MonitorManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/monitor/MonitorManager.kt index 6e8564140a..4fcc6b54d9 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/monitor/MonitorManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/monitor/MonitorManager.kt @@ -4,6 +4,7 @@ import android.annotation.SuppressLint import android.content.Context import android.os.Looper import com.mogo.eagle.core.utilcode.util.ToastUtils +import com.zhjt.mogo_core_function_devatools.R import java.util.* class MonitorManager private constructor(var context: Context) { @@ -46,9 +47,11 @@ class MonitorManager private constructor(var context: Context) { } }, 1000, 60000) isStarted = true - ToastUtils.showShort("性能监控启动成功!") +// ToastUtils.showShort("性能监控启动成功!") + ToastUtils.showShort(R.string.module_mogo_core_function_devatools_start_monitor_success) } else { - ToastUtils.showShort("性能监控已启动，请勿重复启动!") +// ToastUtils.showShort("性能监控已启动，请勿重复启动!") + ToastUtils.showShort(R.string.module_mogo_core_function_devatools_monitor_started) } } } @@ -59,6 +62,7 @@ class MonitorManager private constructor(var context: Context) { timer?.cancel() timer = null isStarted = false - ToastUtils.showShort("性能监控停止成功!") +// ToastUtils.showShort("性能监控停止成功!") + ToastUtils.showShort(R.string.module_mogo_core_function_devatools_stop_monitor_success) } } \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/ota/OTAUpgradeManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/ota/OTAUpgradeManager.kt index d283ff19bd..766837554e 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/ota/OTAUpgradeManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/ota/OTAUpgradeManager.kt @@ -19,6 +19,7 @@ import com.mogo.eagle.core.function.call.hmi.CallerHmiManager import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils import com.mogo.eagle.core.utilcode.util.ToastUtils import com.zhjt.mogo.adas.data.AdasConstants +import com.zhjt.mogo_core_function_devatools.R import org.json.JSONArray import org.json.JSONObject import system_master.SsmInfo @@ -93,7 +94,8 @@ object OTAUpgradeManager: IMoGoAutopilotStatusListener, IDataCenterBizListener, } }else if(msg.what == 4){ if(shouldToast && secondVersionShouldToast){ - ToastUtils.showLong("暂无待升级任务！") +// ToastUtils.showLong("暂无待升级任务！") + ToastUtils.showLong(R.string.module_mogo_core_function_devatools_not_upgrade_task) } } } @@ -225,7 +227,8 @@ object OTAUpgradeManager: IMoGoAutopilotStatusListener, IDataCenterBizListener, //冷启动未完成（进行中），或驾驶状态为自驾状态，或当前有订单，直接默认选择稍后升级， // 并toast提示“收到车辆部署任务，请在车辆空闲时发起升级” CallerAutoPilotControlManager.sendSsmFuncOtaDownloadResponse(OTAUpgradeConfig.otaToken,SsmInfo.IfUpgrade.DELAY) - ToastUtils.showLong("收到车辆部署任务，请在车辆空闲时发起升级") +// ToastUtils.showLong("收到车辆部署任务，请在车辆空闲时发起升级") + ToastUtils.showLong(R.string.module_mogo_core_function_devatools_receive_upgrade_task) } OTAUpgradeConfig.promptedUpgrade.add(request.otaToken) } @@ -361,7 +364,8 @@ object OTAUpgradeManager: IMoGoAutopilotStatusListener, IDataCenterBizListener, //冷启动未完成（进行中），或驾驶状态为自驾状态，或当前有订单，直接默认选择稍后升级， // 并toast提示“收到车辆部署任务，请在车辆空闲时发起升级” CallerAutoPilotControlManager.sendSsmFuncOtaDownloadResponse(OTAUpgradeConfig.otaToken,SsmInfo.IfUpgrade.DELAY) - ToastUtils.showLong("收到车辆部署任务，请在车辆空闲时发起升级") +// ToastUtils.showLong("收到车辆部署任务，请在车辆空闲时发起升级") + ToastUtils.showLong(R.string.module_mogo_core_function_devatools_receive_upgrade_task) } OTAUpgradeConfig.promptedUpgrade.add(status.otaInfo.otaToken) } @@ -445,7 +449,8 @@ object OTAUpgradeManager: IMoGoAutopilotStatusListener, IDataCenterBizListener, val cmd = jsonObject.optString("cmd") //无升级任务 if("ASK_PAD_NO_UPGRADE" == cmd){ - ToastUtils.showShort("暂无OTA升级任务") +// ToastUtils.showShort("暂无OTA升级任务") + ToastUtils.showShort(R.string.module_mogo_core_function_devatools_not_ota_task) return } @@ -521,7 +526,8 @@ object OTAUpgradeManager: IMoGoAutopilotStatusListener, IDataCenterBizListener, Log.i(TAG,query.toString()) CallerAutoPilotControlManager.sendOtaPadMsgQuery(query.toString()) - ToastUtils.showLong("收到车辆部署任务，请在车辆空闲时发起升级") +// ToastUtils.showLong("收到车辆部署任务，请在车辆空闲时发起升级") + ToastUtils.showLong(R.string.module_mogo_core_function_devatools_receive_upgrade_task) } return } diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/OverViewImpl.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/OverViewImpl.kt index 2faadac60d..5c4400ff72 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/OverViewImpl.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/OverViewImpl.kt @@ -29,6 +29,7 @@ import com.mogo.eagle.core.utilcode.util.IAppStateListener import com.mogo.eagle.core.utilcode.util.PermissionUtils import com.mogo.eagle.core.utilcode.util.ToastUtils import com.zhjt.mogo.adas.data.AdasConstants +import com.zhjt.mogo_core_function_devatools.R import com.zhjt.mogo_core_function_devatools.status.entity.OverViewStatus import com.zhjt.mogo_core_function_devatools.status.entity.TracingStatus import com.zhjt.mogo_core_function_devatools.status.entity.toState @@ -156,7 +157,8 @@ internal class OverViewImpl(ctx: Context) : IFlow(ctx), } override fun onDenied() { - ToastUtils.showShort("定位权限被拒绝, 可能导致RTK定位不准确，请开启~") +// ToastUtils.showShort("定位权限被拒绝, 可能导致RTK定位不准确，请开启~") + ToastUtils.showShort(R.string.module_mogo_core_function_devatools_not_location_permission) isGpsException = true send(OverViewStatus(true)) CallerDevaToolsListenerManager.invokeGpsStatus(false) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/gps/GpsImpl.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/gps/GpsImpl.kt index 43c94c86b5..0d002d05ab 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/gps/GpsImpl.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/gps/GpsImpl.kt @@ -7,6 +7,7 @@ import android.util.* import androidx.core.location.* import com.mogo.eagle.core.utilcode.util.* import com.mogo.eagle.core.utilcode.util.PermissionUtils.SimpleCallback +import com.zhjt.mogo_core_function_devatools.R import com.zhjt.mogo_core_function_devatools.status.flow.IFlow import com.zhjt.mogo_core_function_devatools.status.entity.GpsStatus import java.util.concurrent.atomic.* @@ -71,7 +72,8 @@ internal class GpsImpl(ctx: Context): IFlow(ctx) { } override fun onDenied() { - ToastUtils.showShort("定位权限被拒绝, 可能导致RTK定位不准确，请开启~") +// ToastUtils.showShort("定位权限被拒绝, 可能导致RTK定位不准确，请开启~") + ToastUtils.showShort(R.string.module_mogo_core_function_devatools_not_location_permission) send(enabled = isLocationEnabled(), isGranted = false) } }) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeAppNetWorkManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeAppNetWorkManager.kt index c88e2df8d2..ccbcfabedb 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeAppNetWorkManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeAppNetWorkManager.kt @@ -189,7 +189,8 @@ class UpgradeAppNetWorkManager private constructor() { mDownloadRequested = true try { withContext(Dispatchers.Main) { - Toast.makeText(Utils.getApp(), "检测到新版本[${info.result.versionName}]并且当前设备支持静默升级，开始下载新版本...", Toast.LENGTH_SHORT).show() +// Toast.makeText(Utils.getApp(), "检测到新版本[${info.result.versionName}]并且当前设备支持静默升级，开始下载新版本...", Toast.LENGTH_SHORT).show() + Toast.makeText(Utils.getApp(),com.mogo.eagle.core.widget.R.string.module_core_find_new_version_quiesce_install , Toast.LENGTH_SHORT).show() } } catch (t: Throwable) { t.printStackTrace() diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/weaknetwork/WeakNetworkStrategy.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/weaknetwork/WeakNetworkStrategy.kt index 5a2b22f035..aa3e733e61 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/weaknetwork/WeakNetworkStrategy.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/weaknetwork/WeakNetworkStrategy.kt @@ -8,6 +8,7 @@ import com.mogo.eagle.core.data.deva.chain.ChainConstant import com.mogo.eagle.core.utilcode.util.ThreadUtils import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.weak.network.SdtManager +import com.zhjt.mogo_core_function_devatools.R import com.zhjt.service.chain.ChainLog import java.util.concurrent.locks.ReentrantReadWriteLock @@ -97,7 +98,8 @@ object WeakNetworkStrategy { invokeWeakResult("url为:$url, 耗时为:$timeStamp${if (isFail) " 连接失败!" else ""}") } if (timeStamp >= WEAK_HTTP_RTT) { - ToastUtils.showShort("当前网络质量差!") +// ToastUtils.showShort("当前网络质量差!") + ToastUtils.showShort(R.string.module_mogo_core_function_devatools_network_bad_quality) } else if (timeStamp in 300 until WEAK_HTTP_RTT) { // invokeWeakResult("url为:$url, 耗时为:$timeStamp${if (isFail) " 连接失败!" else ""}") SdtManager.startActiveCheck() diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/FaultReasonWindow.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/FaultReasonWindow.kt index 1b88a1b9ae..e026e76891 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/FaultReasonWindow.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/FaultReasonWindow.kt @@ -233,7 +233,8 @@ class FaultReasonWindow constructor(activity: Activity) : View.OnTouchListener, //故障类型选择 tvFaultType.setOnClickListener { if (!hasLevel2) { - ToastUtils.showShort("运营后台没有配置故障类型") +// ToastUtils.showShort("运营后台没有配置故障类型") + ToastUtils.showShort(R.string.module_mogo_core_function_devatools_operation_not_configured_fault_type) return@setOnClickListener } if (faultTypeSelectStatus) { @@ -273,7 +274,8 @@ class FaultReasonWindow constructor(activity: Activity) : View.OnTouchListener, //故障原因选择 tvFaultReason.setOnClickListener { if (tvFaultType.text.isEmpty()) { - ToastUtils.showShort("请先选择故障类型") +// ToastUtils.showShort("请先选择故障类型") + ToastUtils.showShort(R.string.module_mogo_core_function_devatools_operation_choose_fault_type) return@setOnClickListener } if (faultReasonSelectStatus) { @@ -305,7 +307,8 @@ class FaultReasonWindow constructor(activity: Activity) : View.OnTouchListener, } ivTimeAdd.setOnClickListener { if (workOrderOccurrenceTime + 60000 > System.currentTimeMillis()) { - ToastUtils.showShort("发生时间应在当前时间之前") +// ToastUtils.showShort("发生时间应在当前时间之前") + ToastUtils.showShort(R.string.module_mogo_core_function_devatools_occurrence_time_should_be_before_current_time) return@setOnClickListener } workOrderOccurrenceTime += 60000 @@ -358,11 +361,13 @@ class FaultReasonWindow constructor(activity: Activity) : View.OnTouchListener, //上报 tvFaultReport.setOnClickListener { if (level2Name.isEmpty()) { - ToastUtils.showShort("请完整填写再上报") +// ToastUtils.showShort("请完整填写再上报") + ToastUtils.showShort(R.string.module_mogo_core_function_devatools_complete_submit_again) return@setOnClickListener } if (hasLevel3 && level3Name.isEmpty()) { - ToastUtils.showShort("请完整填写再上报") +// ToastUtils.showShort("请完整填写再上报") + ToastUtils.showShort(R.string.module_mogo_core_function_devatools_complete_submit_again) return@setOnClickListener } reportNote = etNoteInput.text.toString() @@ -421,7 +426,8 @@ class FaultReasonWindow constructor(activity: Activity) : View.OnTouchListener, // 不显示听写对话框 ret = it.startListening(mRecognizerListener) if (ret != ErrorCode.SUCCESS) { - ToastUtils.showShort("听写失败,错误码：$ret,请点击网址https://www.xfyun.cn/document/error-code查询解决方案") +// ToastUtils.showShort("听写失败,错误码：$ret,请点击网址https://www.xfyun.cn/document/error-code查询解决方案") + ToastUtils.showShort(R.string.module_mogo_core_function_devatools_iflytek_speech_recognizer_fail, ret) } } //开始录音，展示放大缩小动效 @@ -450,7 +456,8 @@ class FaultReasonWindow constructor(activity: Activity) : View.OnTouchListener, */ private val mInitListener = InitListener { code -> if (code != ErrorCode.SUCCESS) { - ToastUtils.showShort("讯飞语音听写初始化失败，错误码：$code") +// ToastUtils.showShort("讯飞语音听写初始化失败，错误码：$code") + ToastUtils.showShort(R.string.module_mogo_core_function_devatools_iflytek_speech_recognizer_init_fail, code) } } @@ -592,7 +599,8 @@ class FaultReasonWindow constructor(activity: Activity) : View.OnTouchListener, override fun problemPadAddError(msg: String) { super.problemPadAddError(msg) - ToastUtils.showShort("故障原因上报失败$msg") +// ToastUtils.showShort("故障原因上报失败$msg") + ToastUtils.showShort(R.string.module_mogo_core_function_devatools_fault_cause_upload_fail, msg) } override fun getCategoriesSuccess(list: List) { @@ -627,7 +635,8 @@ class FaultReasonWindow constructor(activity: Activity) : View.OnTouchListener, hasLevel3 = false } else { hasLevel2 = false - ToastUtils.showShort("故障类型列表为空") +// ToastUtils.showShort("故障类型列表为空") + ToastUtils.showShort(R.string.module_mogo_core_function_devatools_fault_type_list_empty) } } } @@ -635,6 +644,7 @@ class FaultReasonWindow constructor(activity: Activity) : View.OnTouchListener, override fun getCategoriesError(msg: String) { super.getCategoriesError(msg) - ToastUtils.showShort("故障列表获取失败：$msg") +// ToastUtils.showShort("故障列表获取失败：$msg") + ToastUtils.showShort(R.string.module_mogo_core_function_devatools_fault_list_get_fail, msg) } } \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/ReportTypeWindow.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/ReportTypeWindow.kt index 2bf54e5212..e418786099 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/ReportTypeWindow.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/ReportTypeWindow.kt @@ -127,7 +127,8 @@ class ReportTypeWindow constructor(activity: Activity): IMoGoDevaToolsListener { //一键上报 ivOneClickReport.setOnClickListener { if(!canOneReport){ - ToastUtils.showShort("故障描述获取失败不能上报") +// ToastUtils.showShort("故障描述获取失败不能上报") + ToastUtils.showShort(R.string.module_mogo_core_function_devatools_fault_des_get_fail) return@setOnClickListener } hasReportOperate = true @@ -185,7 +186,8 @@ class ReportTypeWindow constructor(activity: Activity): IMoGoDevaToolsListener { clickListener?.closeWindow() },1500) }else{ - ToastUtils.showShort("主动录包命令下发失败") +// ToastUtils.showShort("主动录包命令下发失败") + ToastUtils.showShort(R.string.module_mogo_core_function_devatools_initiative_record_bad_cmd_send_fail) clickListener?.closeWindow() } } @@ -316,14 +318,16 @@ class ReportTypeWindow constructor(activity: Activity): IMoGoDevaToolsListener { override fun problemPadAddError(msg: String) { super.problemPadAddError(msg) - ToastUtils.showShort("故障原因上报失败$msg") +// ToastUtils.showShort("故障原因上报失败$msg") + ToastUtils.showShort(R.string.module_mogo_core_function_devatools_fault_cause_upload_fail, msg) clickListener?.closeWindow() } override fun getCategoriesSuccess(list: List) { super.getCategoriesSuccess(list) if(list.isEmpty()){ - ToastUtils.showShort("一键上报故障描述后台未配置") +// ToastUtils.showShort("一键上报故障描述后台未配置") + ToastUtils.showShort(R.string.module_mogo_core_function_devatools_fault_cloud_not_configured) canOneReport = false }else{ when (level) { @@ -352,7 +356,8 @@ class ReportTypeWindow constructor(activity: Activity): IMoGoDevaToolsListener { override fun getCategoriesError(msg: String) { super.getCategoriesError(msg) - ToastUtils.showShort("一键上报故障描述获取失败$msg") +// ToastUtils.showShort("一键上报故障描述获取失败$msg") + ToastUtils.showShort(R.string.module_mogo_core_function_devatools_fault_desc_get_fail, msg) canOneReport = false } diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/TakeOverReasonWindow.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/TakeOverReasonWindow.kt index 7d5cea2ea8..c237ae1ec0 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/TakeOverReasonWindow.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/TakeOverReasonWindow.kt @@ -205,7 +205,8 @@ class TakeOverReasonWindow constructor(activity: Activity) : View.OnTouchListene //接管类型选择 tvTakeOverType.setOnClickListener { if(!hasLevel2){ - ToastUtils.showShort("运营后台没有配置接管类型") +// ToastUtils.showShort("运营后台没有配置接管类型") + ToastUtils.showShort(R.string.module_mogo_core_function_devatools_cloud_not_take_over_type) return@setOnClickListener } if(faultTypeSelectStatus){ @@ -238,7 +239,8 @@ class TakeOverReasonWindow constructor(activity: Activity) : View.OnTouchListene //接管原因选择 tvTakeOverReason.setOnClickListener { if(tvTakeOverType.text.isEmpty()){ - ToastUtils.showShort("请先选择接管类型") +// ToastUtils.showShort("请先选择接管类型") + ToastUtils.showShort(R.string.module_mogo_core_function_devatools_choose_take_over_type) return@setOnClickListener } if(faultReasonSelectStatus){ @@ -299,11 +301,13 @@ class TakeOverReasonWindow constructor(activity: Activity) : View.OnTouchListene //保存 tvTakeOverSave.setOnClickListener{ if(level2Name.isEmpty()){ - ToastUtils.showShort("请完整填写再保存") +// ToastUtils.showShort("请完整填写再保存") + ToastUtils.showShort(R.string.module_mogo_core_function_devatools_input_save) return@setOnClickListener } if(hasLevel3 && level3Name.isEmpty()){ - ToastUtils.showShort("请完整填写再保存") +// ToastUtils.showShort("请完整填写再保存") + ToastUtils.showShort(R.string.module_mogo_core_function_devatools_input_save) return@setOnClickListener } mTakeOverRecordInfo.reportNote = etNoteInput.text.toString() @@ -347,7 +351,8 @@ class TakeOverReasonWindow constructor(activity: Activity) : View.OnTouchListene // 不显示听写对话框 ret = it.startListening(mRecognizerListener) if (ret != ErrorCode.SUCCESS) { - ToastUtils.showShort("听写失败,错误码：$ret,请点击网址https://www.xfyun.cn/document/error-code查询解决方案") +// ToastUtils.showShort("听写失败,错误码：$ret,请点击网址https://www.xfyun.cn/document/error-code查询解决方案") + ToastUtils.showShort(R.string.module_mogo_core_function_devatools_iflytek_speech_recognizer_fail, ret) } } //开始录音，展示放大缩小动效 @@ -372,7 +377,8 @@ class TakeOverReasonWindow constructor(activity: Activity) : View.OnTouchListene */ private val mInitListener = InitListener { code -> if (code != ErrorCode.SUCCESS) { - ToastUtils.showShort("讯飞语音听写初始化失败，错误码：$code") +// ToastUtils.showShort("讯飞语音听写初始化失败，错误码：$code") + ToastUtils.showShort(R.string.module_mogo_core_function_devatools_iflytek_speech_recognizer_init_fail, code) } } @@ -555,7 +561,8 @@ class TakeOverReasonWindow constructor(activity: Activity) : View.OnTouchListene hasLevel3 = false }else{ hasLevel2 = false - ToastUtils.showShort("接管类型列表为空") +// ToastUtils.showShort("接管类型列表为空") + ToastUtils.showShort(R.string.module_mogo_core_function_devatools_take_over_type_list_empty) } } } @@ -563,7 +570,8 @@ class TakeOverReasonWindow constructor(activity: Activity) : View.OnTouchListene override fun getCategoriesError(msg: String) { super.getCategoriesError(msg) - ToastUtils.showShort("接管列表获取失败：$msg") +// ToastUtils.showShort("接管列表获取失败：$msg") + ToastUtils.showShort(R.string.module_mogo_core_function_devatools_take_over_type_list_get_error, msg) } /** diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/TakeOverRecordView.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/TakeOverRecordView.kt index 9ad605e856..99acc28066 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/TakeOverRecordView.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/TakeOverRecordView.kt @@ -101,7 +101,8 @@ class TakeOverRecordView @JvmOverloads constructor( }) } if(takeOverReasonWindow?.getWindowShowStatus() == true){ - ToastUtils.showShort("接管原因弹窗已存在，请先编辑现有接管原因") +// ToastUtils.showShort("接管原因弹窗已存在，请先编辑现有接管原因") + ToastUtils.showShort(R.string.module_mogo_core_function_devatools_take_over_window_showing) }else{ takeOverReasonWindow?.showFloatWindow(takeOverRecordInfo) } @@ -129,7 +130,8 @@ class TakeOverRecordView @JvmOverloads constructor( tvUpload.setOnClickListener { if (ClickUtils.isFastClick()){ if(selectedUploadRecord.isEmpty()){ - ToastUtils.showShort("请选择需要上传的接管记录") +// ToastUtils.showShort("请选择需要上传的接管记录") + ToastUtils.showShort(R.string.module_mogo_core_function_devatools_choose_take_over_info) }else{ val recordIterator = selectedUploadRecord.iterator() val padProblemList= ArrayList() @@ -137,7 +139,8 @@ class TakeOverRecordView @JvmOverloads constructor( val uploadRecord = recordIterator.next() uploadRecord.let { if(it.level1Id == 0 || it.level2Id == 0 || it.level3Id == 0){ - ToastUtils.showShort("请编辑选中的接管记录") +// ToastUtils.showShort("请编辑选中的接管记录") + ToastUtils.showShort(R.string.module_mogo_core_function_devatools_choose_edit_take_over_info) return@setOnClickListener } val reason = if(it.reportNote.isEmpty()){ @@ -158,13 +161,15 @@ class TakeOverRecordView @JvmOverloads constructor( CallerDevaToolsManager.takeOverPadAdd(padAddProblemReq) } } else { - ToastUtils.showShort("请勿快速点击") +// ToastUtils.showShort("请勿快速点击") + ToastUtils.showShort(R.string.module_mogo_core_function_devatools_dot_quick_click) } } //删除 tvDeleteSelect.setOnClickListener { if(selectedUploadRecord.isEmpty()){ - ToastUtils.showShort("请选择需要删除的接管记录") +// ToastUtils.showShort("请选择需要删除的接管记录") + ToastUtils.showShort(R.string.module_mogo_core_function_devatools_choose_del_take_over_info) }else{ scope.launch(Dispatchers.IO){ CallerTakeOverRecordEventManager.invokeRemoveRecord(selectedUploadRecord) @@ -227,7 +232,8 @@ class TakeOverRecordView @JvmOverloads constructor( override fun problemPadAddSuccess() { super.problemPadAddSuccess() - ToastUtils.showShort("接管记录上传成功") +// ToastUtils.showShort("接管记录上传成功") + ToastUtils.showShort(R.string.module_mogo_core_function_devatools_take_over_info_upload_success) //更新记录状态并且刷新列表 ThreadUtils.runOnUiThread { selectedUploadRecord.forEach { @@ -243,7 +249,8 @@ class TakeOverRecordView @JvmOverloads constructor( override fun problemPadAddError(msg: String) { super.problemPadAddError(msg) - ToastUtils.showShort("接管记录上传失败$msg") +// ToastUtils.showShort("接管记录上传失败$msg") + ToastUtils.showShort(R.string.module_mogo_core_function_devatools_take_over_info_upload_fail, msg) } } \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/TakeOverSceneWindow.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/TakeOverSceneWindow.kt index a69064ee82..1f295d8620 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/TakeOverSceneWindow.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/TakeOverSceneWindow.kt @@ -74,7 +74,8 @@ class TakeOverSceneWindow constructor(activity: Activity) { //前一个场景 ivScenePrevious.setOnClickListener { if(currentIndex == 0){ - ToastUtils.showShort("没有上一个场景了") +// ToastUtils.showShort("没有上一个场景了") + ToastUtils.showShort(R.string.module_mogo_core_function_devatools_none_last_scene) }else{ currentIndex = (currentIndex-1).coerceAtLeast(0) vpSceneImage.currentItem = currentIndex @@ -86,7 +87,8 @@ class TakeOverSceneWindow constructor(activity: Activity) { currentIndex = (currentIndex + 1).coerceAtMost(2) vpSceneImage.currentItem = currentIndex }else{ - ToastUtils.showShort("没有下一个场景了") +// ToastUtils.showShort("没有下一个场景了") + ToastUtils.showShort(R.string.module_mogo_core_function_devatools_none_last_scene) } } } diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/WorkOrderWindow.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/WorkOrderWindow.kt index a1f053f661..14142c734b 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/WorkOrderWindow.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/WorkOrderWindow.kt @@ -170,7 +170,8 @@ class WorkOrderWindow constructor(activity: Activity) : View.OnTouchListener, } ivTimeAdd.setOnClickListener { if(workOrderOccurrenceTime + 60000 > System.currentTimeMillis()){ - ToastUtils.showShort("发生时间应在当前时间之前") +// ToastUtils.showShort("发生时间应在当前时间之前") + ToastUtils.showShort(R.string.module_mogo_core_function_devatools_occurrence_time_should_be_before_current_time) return@setOnClickListener } workOrderOccurrenceTime += 60000 @@ -209,11 +210,13 @@ class WorkOrderWindow constructor(activity: Activity) : View.OnTouchListener, tvWorkOrderReport.setOnClickListener { //工单问题类型必选，没有选择，进行提示 if(workOrderType.isEmpty()){ - ToastUtils.showShort("请选择问题类型") +// ToastUtils.showShort("请选择问题类型") + ToastUtils.showShort(R.string.module_mogo_core_function_devatools_choose_issue_type) return@setOnClickListener } if(etDescribeInput.text.toString().isEmpty()){ - ToastUtils.showShort("请填写问题描述") +// ToastUtils.showShort("请填写问题描述") + ToastUtils.showShort(R.string.module_mogo_core_function_devatools_choose_issue_desc) return@setOnClickListener } GlobalScope.launch(Dispatchers.IO){ @@ -254,7 +257,8 @@ class WorkOrderWindow constructor(activity: Activity) : View.OnTouchListener, // 不显示听写对话框 ret = it.startListening(mRecognizerListener) if (ret != ErrorCode.SUCCESS) { - ToastUtils.showShort("听写失败,错误码：$ret,请点击网址https://www.xfyun.cn/document/error-code查询解决方案") +// ToastUtils.showShort("听写失败,错误码：$ret,请点击网址https://www.xfyun.cn/document/error-code查询解决方案") + ToastUtils.showShort(R.string.module_mogo_core_function_devatools_iflytek_speech_recognizer_fail, ret) } } //开始录音，展示放大缩小动效 @@ -278,7 +282,8 @@ class WorkOrderWindow constructor(activity: Activity) : View.OnTouchListener, */ private val mInitListener = InitListener { code -> if (code != ErrorCode.SUCCESS) { - ToastUtils.showShort("讯飞语音听写初始化失败，错误码：$code") +// ToastUtils.showShort("讯飞语音听写初始化失败，错误码：$code") + ToastUtils.showShort(R.string.module_mogo_core_function_devatools_iflytek_speech_recognizer_init_fail, code) } } @@ -386,12 +391,14 @@ class WorkOrderWindow constructor(activity: Activity) : View.OnTouchListener, } override fun workOrderReportSuccess() { - ToastUtils.showShort("工单上报成功") +// ToastUtils.showShort("工单上报成功") + ToastUtils.showShort(R.string.module_mogo_core_function_devatools_work_order_upload_success) hideFloatWindow() } override fun workOrderReportError() { - ToastUtils.showShort("工单上报失败") +// ToastUtils.showShort("工单上报失败") + ToastUtils.showShort(R.string.module_mogo_core_function_devatools_work_order_upload_fail) } fun setClickListener(clickListener: ClickListener) { diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/adapter/TakeOverListAdapter.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/adapter/TakeOverListAdapter.kt index a2f26adcfd..28d1a9d268 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/adapter/TakeOverListAdapter.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/adapter/TakeOverListAdapter.kt @@ -78,7 +78,8 @@ class TakeOverListAdapter(private val context: Context): RecyclerView.Adapter @@ -168,7 +169,8 @@ class CarInfoTabView @JvmOverloads constructor( CallerAutoPilotControlManager.sendOtaPadMsgQuery(query.toString()) CallerOTAManager.invokeOtaPadMsgQuery() }else{ - ToastUtils.showLong("当前SSM节点未成功启动或当前版本不支持OTA升级") +// ToastUtils.showLong("当前SSM节点未成功启动或当前版本不支持OTA升级") + ToastUtils.showLong(R.string.module_mogo_core_function_hmi_ssm_not_start) } } @@ -391,10 +393,12 @@ class CarInfoTabView @JvmOverloads constructor( } CallerHmiManager.showOTAUpgradeDialog(1,true,upgradeReason+upgradeTime) }else{ - ToastUtils.showLong("请结束订单后触发升级") +// ToastUtils.showLong("请结束订单后触发升级") + ToastUtils.showLong(R.string.module_mogo_core_function_hmi_stop_order_upgrade) } }else{ - ToastUtils.showLong("暂无待升级任务！") +// ToastUtils.showLong("暂无待升级任务！") + ToastUtils.showLong(R.string.module_mogo_core_function_devatools_not_upgrade_task) } } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/FaultReasonView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/FaultReasonView.kt index bf90a71009..e645ba6b58 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/FaultReasonView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/FaultReasonView.kt @@ -183,7 +183,8 @@ class FaultReasonView @JvmOverloads constructor( //故障类型选择 tvFaultType.setOnClickListener { if (!hasLevel2) { - ToastUtils.showShort("运营后台没有配置故障类型") +// ToastUtils.showShort("运营后台没有配置故障类型") + ToastUtils.showShort(com.zhjt.mogo_core_function_devatools.R.string.module_mogo_core_function_devatools_operation_not_configured_fault_type) return@setOnClickListener } if (faultTypeSelectStatus) { @@ -223,11 +224,13 @@ class FaultReasonView @JvmOverloads constructor( //故障原因选择 tvFaultReason.setOnClickListener { if (tvFaultType.text.isEmpty()) { - ToastUtils.showShort("请先选择故障类型") +// ToastUtils.showShort("请先选择故障类型") + ToastUtils.showShort(R.string.module_mogo_core_function_devatools_operation_choose_fault_type) return@setOnClickListener } if(!hasLevel3){ - ToastUtils.showShort("后台未配置故障原因") +// ToastUtils.showShort("后台未配置故障原因") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_cloud_not_fault_cause) return@setOnClickListener } @@ -257,7 +260,8 @@ class FaultReasonView @JvmOverloads constructor( } ivTimeAdd.setOnClickListener { if (workOrderOccurrenceTime + 60000 > System.currentTimeMillis()) { - ToastUtils.showShort("发生时间应在当前时间之前") +// ToastUtils.showShort("发生时间应在当前时间之前") + ToastUtils.showShort(R.string.module_mogo_core_function_devatools_occurrence_time_should_be_before_current_time) return@setOnClickListener } workOrderOccurrenceTime += 60000 @@ -312,11 +316,13 @@ class FaultReasonView @JvmOverloads constructor( tvFaultReport.setOnClickListener { if(ClickUtils.isFastClick()){ if (level2Name.isEmpty()) { - ToastUtils.showShort("请完整填写再上报") +// ToastUtils.showShort("请完整填写再上报") + ToastUtils.showShort(R.string.module_mogo_core_function_devatools_complete_submit_again) return@setOnClickListener } if (hasLevel3 && level3Name.isEmpty()) { - ToastUtils.showShort("请完整填写再上报") +// ToastUtils.showShort("请完整填写再上报") + ToastUtils.showShort(R.string.module_mogo_core_function_devatools_complete_submit_again) return@setOnClickListener } reportNote = etNoteInput.text.toString() @@ -359,7 +365,8 @@ class FaultReasonView @JvmOverloads constructor( val q = RegeocodeQuery(latLon, 200f, GeocodeSearch.AMAP) geocodeSearch.getFromLocationAsyn(q) }else{ - ToastUtils.showShort("请勿连续上报，稍后再试") +// ToastUtils.showShort("请勿连续上报，稍后再试") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_dot_continuous_upload) } } @@ -380,7 +387,8 @@ class FaultReasonView @JvmOverloads constructor( // 不显示听写对话框 ret = it.startListening(mRecognizerListener) if (ret != ErrorCode.SUCCESS) { - ToastUtils.showShort("听写失败,错误码：$ret,请点击网址https://www.xfyun.cn/document/error-code查询解决方案") +// ToastUtils.showShort("听写失败,错误码：$ret,请点击网址https://www.xfyun.cn/document/error-code查询解决方案") + ToastUtils.showShort(com.zhjt.mogo_core_function_devatools.R.string.module_mogo_core_function_devatools_iflytek_speech_recognizer_fail, ret) } } //开始录音，展示放大缩小动效 @@ -405,7 +413,8 @@ class FaultReasonView @JvmOverloads constructor( */ private val mInitListener = InitListener { code -> if (code != ErrorCode.SUCCESS) { - ToastUtils.showShort("讯飞语音听写初始化失败，错误码：$code") +// ToastUtils.showShort("讯飞语音听写初始化失败，错误码：$code") + ToastUtils.showShort(com.zhjt.mogo_core_function_devatools.R.string.module_mogo_core_function_devatools_iflytek_speech_recognizer_init_fail, code) } } @@ -499,7 +508,9 @@ class FaultReasonView @JvmOverloads constructor( override fun problemPadAddError(msg: String) { super.problemPadAddError(msg) - ToastUtils.showShort("故障原因上报失败$msg") +// ToastUtils.showShort("故障原因上报失败$msg") + ToastUtils.showShort(R.string.module_mogo_core_function_devatools_fault_cause_upload_fail, msg) + } override fun getCategoriesSuccess(list: List) { @@ -533,7 +544,8 @@ class FaultReasonView @JvmOverloads constructor( hasLevel3 = false } else { hasLevel2 = false - ToastUtils.showShort("故障类型列表为空") +// ToastUtils.showShort("故障类型列表为空") + ToastUtils.showShort(R.string.module_mogo_core_function_devatools_fault_type_list_empty) } } } @@ -542,7 +554,8 @@ class FaultReasonView @JvmOverloads constructor( override fun getCategoriesError(msg: String) { super.getCategoriesError(msg) if(ProjectUtils.isSaas()){ - ToastUtils.showShort("故障列表获取失败：$msg") +// ToastUtils.showShort("故障列表获取失败：$msg") + ToastUtils.showShort(com.zhjt.mogo_core_function_devatools.R.string.module_mogo_core_function_devatools_fault_list_get_fail, msg) } } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/ReportTypeView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/ReportTypeView.kt index 28832c51a4..f174f979fb 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/ReportTypeView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/ReportTypeView.kt @@ -86,7 +86,8 @@ class ReportTypeView @JvmOverloads constructor( //一键上报 ivOneClickReport.setOnClickListener { if(!canOneReport){ - ToastUtils.showShort("故障描述获取失败不能上报") +// ToastUtils.showShort("故障描述获取失败不能上报") + ToastUtils.showShort(com.zhjt.mogo_core_function_devatools.R.string.module_mogo_core_function_devatools_fault_des_get_fail) return@setOnClickListener } hasReportOperate = true @@ -145,7 +146,8 @@ class ReportTypeView @JvmOverloads constructor( clickListener?.closeReportView() },1500) }else{ - ToastUtils.showShort("主动录包命令下发失败") +// ToastUtils.showShort("主动录包命令下发失败") + ToastUtils.showShort(com.zhjt.mogo_core_function_devatools.R.string.module_mogo_core_function_devatools_initiative_record_bad_cmd_send_fail) this@ReportTypeView.visibility = View.GONE clickListener?.closeReportView() } @@ -236,7 +238,8 @@ class ReportTypeView @JvmOverloads constructor( override fun problemPadAddError(msg: String) { super.problemPadAddError(msg) - ToastUtils.showShort("故障原因上报失败$msg") +// ToastUtils.showShort("故障原因上报失败$msg") + ToastUtils.showShort(R.string.module_mogo_core_function_devatools_fault_cause_upload_fail, msg) ThreadUtils.runOnUiThread { this.visibility = View.GONE clickListener?.closeReportView() @@ -246,7 +249,8 @@ class ReportTypeView @JvmOverloads constructor( override fun getCategoriesSuccess(list: List) { super.getCategoriesSuccess(list) if(list.isEmpty()){ - ToastUtils.showShort("一键上报故障描述后台未配置") +// ToastUtils.showShort("一键上报故障描述后台未配置") + ToastUtils.showShort(R.string.module_mogo_core_function_devatools_fault_cloud_not_configured) canOneReport = false }else{ when (level) { @@ -275,7 +279,8 @@ class ReportTypeView @JvmOverloads constructor( override fun getCategoriesError(msg: String) { super.getCategoriesError(msg) - ToastUtils.showShort("一键上报故障描述获取失败$msg") +// ToastUtils.showShort("一键上报故障描述获取失败$msg") + ToastUtils.showShort(R.string.module_mogo_core_function_devatools_fault_desc_get_fail, msg) canOneReport = false } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/WorkOrderView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/WorkOrderView.kt index 956d063d61..199f5764c9 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/WorkOrderView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/WorkOrderView.kt @@ -128,7 +128,8 @@ class WorkOrderView @JvmOverloads constructor( } iv_time_add.setOnClickListener { if(workOrderOccurrenceTime + 60000 > System.currentTimeMillis()){ - ToastUtils.showShort("发生时间应在当前时间之前") +// ToastUtils.showShort("发生时间应在当前时间之前") + ToastUtils.showShort(R.string.module_mogo_core_function_devatools_occurrence_time_should_be_before_current_time) return@setOnClickListener } workOrderOccurrenceTime += 60000 @@ -184,11 +185,13 @@ class WorkOrderView @JvmOverloads constructor( if(ClickUtils.isFastClick()){ //工单问题类型必选，没有选择，进行提示 if(workOrderType.isEmpty()){ - ToastUtils.showShort("请选择问题类型") +// ToastUtils.showShort("请选择问题类型") + ToastUtils.showShort(R.string.module_mogo_core_function_devatools_choose_issue_type) return@setOnClickListener } if(et_describe_input.text.toString().isEmpty()){ - ToastUtils.showShort("请填写问题描述") +// ToastUtils.showShort("请填写问题描述") + ToastUtils.showShort(R.string.module_mogo_core_function_devatools_choose_issue_desc) return@setOnClickListener } GlobalScope.launch(Dispatchers.IO){ @@ -212,7 +215,8 @@ class WorkOrderView @JvmOverloads constructor( CallerDevaToolsManager.workOrderReport(workOrderReportInfo) } }else{ - ToastUtils.showShort("请勿连续上报，稍后再试") +// ToastUtils.showShort("请勿连续上报，稍后再试") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_dot_continuous_upload) } } @@ -234,7 +238,8 @@ class WorkOrderView @JvmOverloads constructor( // 不显示听写对话框 ret = it.startListening(mRecognizerListener) if (ret != ErrorCode.SUCCESS) { - ToastUtils.showShort("听写失败,错误码：$ret,请点击网址https://www.xfyun.cn/document/error-code查询解决方案") +// ToastUtils.showShort("听写失败,错误码：$ret,请点击网址https://www.xfyun.cn/document/error-code查询解决方案") + ToastUtils.showShort(com.zhjt.mogo_core_function_devatools.R.string.module_mogo_core_function_devatools_iflytek_speech_recognizer_fail, ret) } } //开始录音，展示放大缩小动效 @@ -258,7 +263,8 @@ class WorkOrderView @JvmOverloads constructor( */ private val mInitListener = InitListener { code -> if (code != ErrorCode.SUCCESS) { - ToastUtils.showShort("讯飞语音听写初始化失败，错误码：$code") +// ToastUtils.showShort("讯飞语音听写初始化失败，错误码：$code") + ToastUtils.showShort(com.zhjt.mogo_core_function_devatools.R.string.module_mogo_core_function_devatools_iflytek_speech_recognizer_init_fail, code) } } @@ -322,7 +328,8 @@ class WorkOrderView @JvmOverloads constructor( } override fun workOrderReportSuccess() { - ToastUtils.showShort("工单上报成功") +// ToastUtils.showShort("工单上报成功") + ToastUtils.showShort(R.string.module_mogo_core_function_devatools_work_order_upload_success) ThreadUtils.runOnUiThread { this@WorkOrderView.visibility = View.GONE clickListener?.closeWorkOrderView() @@ -330,7 +337,8 @@ class WorkOrderView @JvmOverloads constructor( } override fun workOrderReportError() { - ToastUtils.showShort("工单上报失败") +// ToastUtils.showShort("工单上报失败") + ToastUtils.showShort(R.string.module_mogo_core_function_devatools_work_order_upload_fail) } interface ClickListener{ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/adapter/MsgBoxTabAdapter.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/adapter/MsgBoxTabAdapter.kt index abf2243c24..40c645d8ac 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/adapter/MsgBoxTabAdapter.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/adapter/MsgBoxTabAdapter.kt @@ -187,7 +187,8 @@ class MsgBoxTabAdapter(private val activity: Activity) : val recordBagMsg = msgBoxBean.bean as RecordBagMsg holder.tvRecordCheck.setOnClickListener { if(recordBagMsg.isShow){ - ToastUtils.showShort("当前录包上报面板已打开，请勿重复操作") +// ToastUtils.showShort("当前录包上报面板已打开，请勿重复操作") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_bad_case_view_opened) }else{ //打开被动录包弹窗 CallerDevaToolsManager.onReceiveBadCaseRecord(msgBoxBean, activity, false) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/toolkit/custom/ToolDriverRomaView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/toolkit/custom/ToolDriverRomaView.kt index fece3e38b4..efb325f536 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/toolkit/custom/ToolDriverRomaView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/toolkit/custom/ToolDriverRomaView.kt @@ -44,15 +44,18 @@ class ToolDriverRomaView @JvmOverloads constructor( toolDriverRomaContainer.setOnClickListener { if (ClickUtils.isClickTooFrequent(this, 2500)) { - ToastUtils.showShort("不要频繁点击哦~") +// ToastUtils.showShort("不要频繁点击哦~") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_dot_often_click) return@setOnClickListener } if (!click) { - ToastUtils.showShort("漫游准备中，请等待") +// ToastUtils.showShort("漫游准备中，请等待") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_roam_starting) return@setOnClickListener } if (!MogoStatusManager.getInstance().isSocketOnLine) { - ToastUtils.showShort("长链状态异常，请检查链接后开启漫游") +// ToastUtils.showShort("长链状态异常，请检查链接后开启漫游") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_long_connection_state_error) return@setOnClickListener } click = false diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/toolkit/custom/ToolRestartSystemView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/toolkit/custom/ToolRestartSystemView.kt index 6fd17e6b59..d2358b9e71 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/toolkit/custom/ToolRestartSystemView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/toolkit/custom/ToolRestartSystemView.kt @@ -48,7 +48,8 @@ class ToolRestartSystemView @JvmOverloads constructor( */ private fun showRebootDialog() { if (!connectStatus) { - ToastUtils.showShort("尚未连接工控机，无法重启系统") +// ToastUtils.showShort("尚未连接工控机，无法重启系统") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_not_sent_reboot_ipc) return } //dialog @@ -58,12 +59,14 @@ class ToolRestartSystemView @JvmOverloads constructor( override fun confirm() { if (CallerAutoPilotStatusListenerManager.getState() == 2) { //当前处于自动驾驶状态，不可进行重启，Toast提示 - ToastUtils.showShort("请先退出自动驾驶状态") +// ToastUtils.showShort("请先退出自动驾驶状态") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_please_exit_autopilot_state) } else { //确认重启 CallerLogger.d("$M_HMI$TAG", "reboot confirm") CallerAutoPilotControlManager.sendIpcReboot() - ToastUtils.showLong("重启命令已发送") +// ToastUtils.showLong("重启命令已发送") + ToastUtils.showLong(R.string.module_mogo_core_function_hmi_send_reboot_success) //打开冷启动页面 CallerHmiManager.showColdStartWindow() } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/toolkit/custom/ToolStopServiceView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/toolkit/custom/ToolStopServiceView.kt index 3eb8cfdd96..cd847de91a 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/toolkit/custom/ToolStopServiceView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/toolkit/custom/ToolStopServiceView.kt @@ -200,30 +200,36 @@ class ToolStopServiceView @JvmOverloads constructor( */ private fun powerOff() { if (!connectStatus) { - ToastUtils.showShort("尚未连接工控机，无法下发一键停服命令") +// ToastUtils.showShort("尚未连接工控机，无法下发一键停服命令") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_not_sent_shutdown_ipc) return } if (AppConfigInfo.dockerVersion.isEmpty()) { - ToastUtils.showShort("尚未连接工控机，无法下发一键停服命令") +// ToastUtils.showShort("尚未连接工控机，无法下发一键停服命令") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_not_sent_shutdown_ipc) return } if (ParseVersionUtils.parseVersion(true, AppConfigInfo.dockerVersion) < 40100) { - ToastUtils.showShort("此域控版本不支持一键停服功能，最低支持版本为4.1.0") +// ToastUtils.showShort("此域控版本不支持一键停服功能，最低支持版本为4.1.0") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_ipc_version_nonsupport_shutdown_ipc) return } if (CallerAutoPilotStatusListenerManager.getState() == 2) { //当前处于自动驾驶状态，不可进行重启，Toast提示 - ToastUtils.showShort("请先退出自动驾驶状态") +// ToastUtils.showShort("请先退出自动驾驶状态") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_please_exit_autopilot_state) return } if (isExecutingPowerOff) { //一键停服命令下发执行中 - ToastUtils.showShort("一键停服命令下发中，请勿重复点击") +// ToastUtils.showShort("一键停服命令下发中，请勿重复点击") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_sending_shutdown_ipc) return } if (isPowerOffCountDown) { //系统停服中 - ToastUtils.showShort("系统停服中，请勿重复点击") +// ToastUtils.showShort("系统停服中，请勿重复点击") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_shutdowning_ipc) return } //将是否正在下发一键停服命令标签改为true diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/diskcopy/DiskCopyView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/diskcopy/DiskCopyView.kt index 2909847e64..aa8fa04e69 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/diskcopy/DiskCopyView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/diskcopy/DiskCopyView.kt @@ -98,30 +98,37 @@ class DiskCopyView @JvmOverloads constructor( //开始拷贝数据 val result = CallerAutoPilotControlManager.sendCopyBagCopyDate(currentCopyDate) if(result){ - ToastUtils.showShort("已发起拷贝") +// ToastUtils.showShort("已发起拷贝") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_start_copy) }else{ - ToastUtils.showShort("拷贝命令发送失败") +// ToastUtils.showShort("拷贝命令发送失败") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_copy_cmd_error) } } 2 -> { //拷贝中 - ToastUtils.showShort("正在拷贝中...") +// ToastUtils.showShort("正在拷贝中...") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_copying) } 3 -> { //拷贝成功 - ToastUtils.showShort("当前日期数据已拷贝成功") +// ToastUtils.showShort("当前日期数据已拷贝成功") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_now_date_copy_success) } 4 -> { //剩余空间不足 - ToastUtils.showShort("当前硬盘剩余空间不足") +// ToastUtils.showShort("当前硬盘剩余空间不足") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_insufficient_disk_space) } 5 -> { //所选日期无法拷贝 - ToastUtils.showShort("所选日期无法拷贝") +// ToastUtils.showShort("所选日期无法拷贝") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_choose_date_not_copy) } } }else{ - ToastUtils.showShort("请勿连续点击，稍后再试") +// ToastUtils.showShort("请勿连续点击，稍后再试") + ToastUtils.showShort(R.string.module_mogo_core_function_devatools_bad_case_do_no_click_continuously) } } //拔出硬盘 @@ -134,13 +141,16 @@ class DiskCopyView @JvmOverloads constructor( //如果处于未拷贝状态，则调用硬盘安全弹出请求 val result = CallerAutoPilotControlManager.sendCopyBagSafeUnmount() if(result){ - ToastUtils.showShort("硬盘安全弹出命令已发送") +// ToastUtils.showShort("硬盘安全弹出命令已发送") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_send_disk_safely_ejecting) }else{ - ToastUtils.showShort("硬盘安全弹出命令发送失败") +// ToastUtils.showShort("硬盘安全弹出命令发送失败") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_send_disk_safely_ejecting_fail) } } }else{ - ToastUtils.showShort("请勿连续点击，稍后再试") +// ToastUtils.showShort("请勿连续点击，稍后再试") + ToastUtils.showShort(R.string.module_mogo_core_function_devatools_bad_case_do_no_click_continuously) } } @@ -148,7 +158,8 @@ class DiskCopyView @JvmOverloads constructor( viewDiskCopyDate.setOnClickListener { if(copyStatus == 2){ //数据拷贝中,不可再选择日期 - ToastUtils.showShort("数据拷贝中，不可再次选择日期，请耐心等待") +// ToastUtils.showShort("数据拷贝中，不可再次选择日期，请耐心等待") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_data_copying) }else{ //隐藏当前视图 pbDiskCopyProgress.visibility = View.GONE @@ -556,7 +567,8 @@ class DiskCopyView @JvmOverloads constructor( //硬盘是否已安全弹出,是-True,否-False Logger.i(TAG,"硬盘是否已安全弹出,是-True,否-False="+diskCopy.diskUnmount) if(diskCopy.diskUnmount){ - ToastUtils.showShort("硬盘已安全弹出") +// ToastUtils.showShort("硬盘已安全弹出") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_disk_safely_ejecting) //隐藏数据落盘辅助工具视图 this@DiskCopyView.visibility = View.GONE } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/diskcopy/TerminateCopyDataDialog.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/diskcopy/TerminateCopyDataDialog.kt index a900e10ec4..a3804219c1 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/diskcopy/TerminateCopyDataDialog.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/diskcopy/TerminateCopyDataDialog.kt @@ -30,9 +30,11 @@ class TerminateCopyDataDialog(context: Context) : tvCopyTerminateConfirm.setOnClickListener { val result = CallerAutoPilotControlManager.sendCopyBagAbortCopy() if(result){ - ToastUtils.showShort("终止数据拷贝命令已发送") +// ToastUtils.showShort("终止数据拷贝命令已发送") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_send_stop_copy) }else{ - ToastUtils.showShort("终止数据拷贝命令发送失败") +// ToastUtils.showShort("终止数据拷贝命令发送失败") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_send_stop_copy_fail) } dismiss() } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/lookaround/M1LookAroundView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/lookaround/M1LookAroundView.kt index 3b12b5f67c..45c53885e3 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/lookaround/M1LookAroundView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/lookaround/M1LookAroundView.kt @@ -13,6 +13,7 @@ import com.mogo.eagle.core.function.api.autopilot.* import com.mogo.eagle.core.function.api.lookaround.data.* import com.mogo.eagle.core.function.call.autopilot.* import com.mogo.eagle.core.function.call.devatools.* +import com.mogo.eagle.core.function.hmi.R import com.mogo.eagle.core.utilcode.kotlin.* import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_HMI @@ -299,7 +300,8 @@ class M1LookAroundView: SurfaceView, SurfaceHolder.Callback, Runnable, IMoGoChas delay(5000) val d = data if (d == null || !d.isValid()) { - Toast.makeText(Utils.getApp(), "当前MAP版本不支持360环视，请升级MAP版本", Toast.LENGTH_SHORT).show() +// Toast.makeText(Utils.getApp(), "当前MAP版本不支持360环视，请升级MAP版本", Toast.LENGTH_SHORT).show() + Toast.makeText(Utils.getApp(), R.string.module_core_ipc_version_nonsupport_360_look_around, Toast.LENGTH_SHORT).show() } } } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/mofang/MoFangStatusView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/mofang/MoFangStatusView.kt index 2114c61714..473d69e1cc 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/mofang/MoFangStatusView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/mofang/MoFangStatusView.kt @@ -91,7 +91,8 @@ class MoFangStatusView : LinearLayout, OnMoFangStatusListener, IMoGoAutopilotSta return } if (!CallerAutoPilotStatusListenerManager.isConnect()) { - ToastUtils.showShort("工控机连接异常，无法执行魔方命令") +// ToastUtils.showShort("工控机连接异常，无法执行魔方命令") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_ipc_disconnect_not_use_mofang) return } if (keyCode == KeyEvent.KEYCODE_A) { @@ -169,7 +170,8 @@ class MoFangStatusView : LinearLayout, OnMoFangStatusListener, IMoGoAutopilotSta return } if (!CallerAutoPilotStatusListenerManager.isConnect()) { - ToastUtils.showShort("工控机连接异常，无法执行魔方命令") +// ToastUtils.showShort("工控机连接异常，无法执行魔方命令") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_ipc_disconnect_not_use_mofang) return } if (keyCode == KeyEvent.KEYCODE_A) { @@ -218,7 +220,8 @@ class MoFangStatusView : LinearLayout, OnMoFangStatusListener, IMoGoAutopilotSta return } if (!CallerAutoPilotStatusListenerManager.isConnect()) { - ToastUtils.showShort("工控机连接异常，无法执行魔方命令") +// ToastUtils.showShort("工控机连接异常，无法执行魔方命令") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_ipc_disconnect_not_use_mofang) return } if (keyCodes.size != 2) { diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/DriverMsgBoxListAdapter.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/DriverMsgBoxListAdapter.kt index c0547a37d3..f1d1c3d815 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/DriverMsgBoxListAdapter.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/DriverMsgBoxListAdapter.kt @@ -177,7 +177,8 @@ class DriverMsgBoxListAdapter(private val activity: Activity) : val recordBagMsg = msgBoxBean.bean as RecordBagMsg holder.tvRecordCheck.setOnClickListener { if(recordBagMsg.isShow){ - ToastUtils.showShort("当前录包上报面板已打开，请勿重复操作") +// ToastUtils.showShort("当前录包上报面板已打开，请勿重复操作") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_bad_case_view_opened) }else{ //打开被动录包弹窗 CallerDevaToolsManager.onReceiveBadCaseRecord(msgBoxBean, activity, false) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/operate/OperatePanelLayout.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/operate/OperatePanelLayout.kt index 47801fb002..691aa695b7 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/operate/OperatePanelLayout.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/operate/OperatePanelLayout.kt @@ -1227,7 +1227,8 @@ class OperatePanelLayout : LinearLayout { "01" -> { //关闭成功 Log.d(TAG, "-- 驾驶位视频流关闭成功 --") - ToastUtils.showShort("驾驶位视频流功能已关闭") +// ToastUtils.showShort("驾驶位视频流功能已关闭") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_drive_seat_video_stream_close) FunctionBuildConfig.isDriveSeatVideoStream = false lastTimeOnSendDriveVideo = 0L preferenceScreen.findPreferenceReal(KEY_DRIVE_SEAT_VIDEO_STREAM)?.also { it.isChecked = false } @@ -1235,7 +1236,8 @@ class OperatePanelLayout : LinearLayout { "11" -> { //打开成功 Log.d(TAG, "-- 驾驶位视频流打开成功 --") - ToastUtils.showShort("驾驶位视频流功能已开启") +// ToastUtils.showShort("驾驶位视频流功能已开启") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_drive_seat_video_stream_open) FunctionBuildConfig.isDriveSeatVideoStream = true lastTimeOnSendDriveVideo = 0L preferenceScreen.findPreferenceReal(KEY_DRIVE_SEAT_VIDEO_STREAM)?.also { it.isChecked = true } @@ -1245,7 +1247,8 @@ class OperatePanelLayout : LinearLayout { "0" -> { Log.d(TAG, "-- 设备下线 --") FunctionBuildConfig.isDriveSeatVideoStream = false // 设备下线 - ToastUtils.showShort("驾驶位视频流功能因设备下线已关闭") +// ToastUtils.showShort("驾驶位视频流功能因设备下线已关闭") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_drive_seat_video_stream_device_live_close) preferenceScreen.findPreferenceReal(KEY_DRIVE_SEAT_VIDEO_STREAM)?.also { it.isChecked = false it.isEnabled = false @@ -1304,17 +1307,20 @@ class OperatePanelLayout : LinearLayout { if (CallerHmiManager.isTaxiUnmanedDriverPerformTask()|| CallerHmiManager.isShuttleDriverPerformTask() ) { - ToastUtils.showLong("请先结束当前任务") +// ToastUtils.showLong("请先结束当前任务") + ToastUtils.showLong(R.string.module_mogo_core_function_hmi_please_stop_current_task) return false } if (CallerHmiManager.isTaxiUnmanedDriverTakingOrders()) { - ToastUtils.showLong("请先结束接单状态") +// ToastUtils.showLong("请先结束接单状态") + ToastUtils.showLong(R.string.module_mogo_core_function_hmi_please_stop_receive_order_state) return false } CallerHmiManager.setTaxiUnmanedDriverLineRoutingVerifyMode(true) } else { if (CallerHmiManager.isTaxiUnmanedDriverLineRoutingPerformTask()) { - ToastUtils.showLong("请先结束当前任务") +// ToastUtils.showLong("请先结束当前任务") + ToastUtils.showLong(R.string.module_mogo_core_function_hmi_please_stop_current_task) return false } CallerHmiManager.setTaxiUnmanedDriverLineRoutingVerifyMode(false) @@ -1373,13 +1379,19 @@ class OperatePanelLayout : LinearLayout { val interval = SystemClock.elapsedRealtime() - lastTimeOnSendDriveVideo if (interval <= TimeUnit.SECONDS.toMillis(10)) { val seconds = TimeUnit.MILLISECONDS.toSeconds(interval) - ToastUtils.showShort("未收到乘客屏响应，${ if (seconds >= 1) "请${seconds}秒后再试" else "请稍候再试"}") +// ToastUtils.showShort("未收到乘客屏响应，${ if (seconds >= 1) "请${seconds}秒后再试" else "请稍候再试"}") + if (seconds >= 1) { + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_drive_seat_video_stream_device_response_second, seconds) + } else { + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_drive_seat_video_stream_device_response) + } return false } } lastTimeOnSendDriveVideo = SystemClock.elapsedRealtime() val isChecked = newValue as? Boolean ?: false - ToastUtils.showShort(if (isChecked) "驾驶位视频流功能开启指令已发送，等待乘客端响应" else "驾驶位视频流功能关闭指令已发送，等待乘客端响应") +// ToastUtils.showShort(if (isChecked) "驾驶位视频流功能开启指令已发送，等待乘客端响应" else "驾驶位视频流功能关闭指令已发送，等待乘客端响应") + ToastUtils.showShort(if (isChecked) R.string.module_mogo_core_function_hmi_send_open_drive_seat_video_stream_cmd else R.string.module_mogo_core_function_hmi_send_close_drive_seat_video_stream_cmd) clickEventAnalytics("视频流驾驶位开关", isChecked) val map = HashMap() map["open"] = if (isChecked) "1" else "0" @@ -2135,13 +2147,16 @@ class OperatePanelLayout : LinearLayout { val isSuccess = CallerAutoPilotControlManager.setAutoPilotSpeed(FunctionBuildConfig.maxSpeedLimit.toInt()) when { isSuccess -> { - ToastUtils.showShort("车速设置成功，立即生效") +// ToastUtils.showShort("车速设置成功，立即生效") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_set_auto_pilot_speed_success) } else -> { if (!CallerAutoPilotStatusListenerManager.isConnect()) { - ToastUtils.showShort("设置车速失败，请启动域控制器") +// ToastUtils.showShort("设置车速失败，请启动域控制器") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_set_auto_pilot_speed_fail) } else { - ToastUtils.showShort("设置车速失败") +// ToastUtils.showShort("设置车速失败") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_set_auto_pilot_speed_fail_disconnect) } } } @@ -2154,10 +2169,12 @@ class OperatePanelLayout : LinearLayout { hmiAction("SOP 变道绕障的目标障碍物速度阈值", FunctionBuildConfig.detouringSpeed) val isSuccess = CallerAutoPilotControlManager.sendDetouringSpeed(FunctionBuildConfig.detouringSpeed) if (isSuccess == true) { - ToastUtils.showShort("变道绕障的目标障碍物速度阈值设置成功") +// ToastUtils.showShort("变道绕障的目标障碍物速度阈值设置成功") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_send_detouring_speed_success) hmiAction("SOP 变道绕障的目标障碍物速度阈值设置", "成功") } else { - ToastUtils.showShort("变道绕障的目标障碍物速度阈值设置失败") +// ToastUtils.showShort("变道绕障的目标障碍物速度阈值设置失败") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_send_detouring_speed_fail) hmiAction("SOP 变道绕障的目标障碍物速度阈值设置", "失败") } clickEventAnalytics("变道速度阈值", true) @@ -2167,10 +2184,12 @@ class OperatePanelLayout : LinearLayout { FunctionBuildConfig.overTakeSpeed = preference.extras.getDouble(PreferenceWithSpeedSetting.KEY_BUNDLE_CURRENT_VALUE, FunctionBuildConfig.overTakeSpeed) val isSuccess = CallerAutoPilotControlManager.sendOvertakeMaxSpeed(FunctionBuildConfig.overTakeSpeed) if (isSuccess == true) { - ToastUtils.showShort("SOP 超车目标障碍物速度阈值设置成功") +// ToastUtils.showShort("SOP 超车目标障碍物速度阈值设置成功") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_send_sop_detouring_speed_success) hmiAction("SOP 超车目标障碍物速度阈值设置", "成功") } else { - ToastUtils.showShort("SOP 超车目标障碍物速度阈值设置失败") +// ToastUtils.showShort("SOP 超车目标障碍物速度阈值设置失败") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_send_sop_detouring_speed_fail) hmiAction("SOP 超车目标障碍物速度阈值设置", "失败") } clickEventAnalytics("超车速度阈值", true) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/operate/preferences/PreferenceWithSpeedSetting.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/operate/preferences/PreferenceWithSpeedSetting.kt index 48228ab1b2..28c41a8793 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/operate/preferences/PreferenceWithSpeedSetting.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/operate/preferences/PreferenceWithSpeedSetting.kt @@ -84,7 +84,8 @@ class PreferenceWithSpeedSetting : Preference { btnOk.isEnabled = false holder.itemView.isEnabled = false ll.isSelected = false - ToastUtils.showShort("阈值最大为${max.safeScale()}$unit") +// ToastUtils.showShort("阈值最大为${max.safeScale()}$unit") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_speed_limit_max_value, "${max.safeScale()}$unit") return@doAfterTextChanged } val temp = current.safeScale() @@ -118,7 +119,8 @@ class PreferenceWithSpeedSetting : Preference { minus.onClickWidthDuration(100) { val minusAfter = cur - step if (minusAfter < min) { - ToastUtils.showShort("阈值最小为${min.safeScale()}$unit") +// ToastUtils.showShort("阈值最小为${min.safeScale()}$unit") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_speed_limit_min_value, "${min.safeScale()}$unit") return@onClickWidthDuration } cur = minusAfter @@ -140,7 +142,8 @@ class PreferenceWithSpeedSetting : Preference { add.onClickWidthDuration(100) { val addAfter = cur + step if (addAfter > max) { - ToastUtils.showShort("阈值最大为${max.safeScale()}$unit") +// ToastUtils.showShort("阈值最大为${max.safeScale()}$unit") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_speed_limit_max_value, "${max.safeScale()}$unit") return@onClickWidthDuration } holder.itemView.isEnabled = false diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt index afc347be17..3a7ea809af 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt @@ -1129,7 +1129,8 @@ internal class DebugSettingView @JvmOverloads constructor( //重启工控机所有节点 btnIpcReboot.onClick { CallerAutoPilotControlManager.sendIpcReboot() - ToastUtils.showLong("重启命令已发送") +// ToastUtils.showLong("重启命令已发送") + ToastUtils.showLong(R.string.module_mogo_core_function_hmi_send_reboot_success) } btnAppReboot.onClick { killApp() diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt index 0c872a80d7..2029cfdae3 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt @@ -646,7 +646,8 @@ internal class SOPSettingView @JvmOverloads constructor( tvSpeed.text = "${FunctionBuildConfig.detouringSpeed} m/s" ivSpeedReduce.setOnClickListener { if (FunctionBuildConfig.detouringSpeed <= 3) { - ToastUtils.showShort("阈值最小可为3 m/s") +// ToastUtils.showShort("阈值最小可为3 m/s") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_detouring_speed_min_value) } else { FunctionBuildConfig.detouringSpeed-- tvSpeed.text = "${FunctionBuildConfig.detouringSpeed} m/s" @@ -655,7 +656,8 @@ internal class SOPSettingView @JvmOverloads constructor( } ivSpeedAdd.setOnClickListener { if (FunctionBuildConfig.detouringSpeed >= 7) { - ToastUtils.showShort("阈值最大可为7 m/s") +// ToastUtils.showShort("阈值最大可为7 m/s") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_detouring_speed_max_value) } else { FunctionBuildConfig.detouringSpeed++ tvSpeed.text = "${FunctionBuildConfig.detouringSpeed} m/s" @@ -666,10 +668,12 @@ internal class SOPSettingView @JvmOverloads constructor( val isSuccess = CallerAutoPilotControlManager.sendDetouringSpeed(FunctionBuildConfig.detouringSpeed.toDouble()) if (isSuccess == true) { - ToastUtils.showShort("变道绕障的目标障碍物速度阈值设置成功") +// ToastUtils.showShort("变道绕障的目标障碍物速度阈值设置成功") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_send_detouring_speed_success) hmiAction("SOP 变道绕障的目标障碍物速度阈值设置", "成功") } else { - ToastUtils.showShort("变道绕障的目标障碍物速度阈值设置失败") +// ToastUtils.showShort("变道绕障的目标障碍物速度阈值设置失败") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_send_detouring_speed_fail) hmiAction("SOP 变道绕障的目标障碍物速度阈值设置", "失败") } clickEventAnalytics("变道速度阈值",true) @@ -677,7 +681,8 @@ internal class SOPSettingView @JvmOverloads constructor( ivSpeedOverTakeReduce.setOnClickListener { if (FunctionBuildConfig.overTakeSpeed <= 3) { - ToastUtils.showShort("阈值最小可为3 m/s") +// ToastUtils.showShort("阈值最小可为3 m/s") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_detouring_speed_min_value) } else { FunctionBuildConfig.overTakeSpeed -= 0.5f tvOverTakeLimit.text = "${FunctionBuildConfig.overTakeSpeed} m/s" @@ -686,7 +691,8 @@ internal class SOPSettingView @JvmOverloads constructor( } ivSpeedOverTakeAdd.setOnClickListener { if (FunctionBuildConfig.overTakeSpeed >= 12.5) { - ToastUtils.showShort("阈值最大可为12.5 m/s") +// ToastUtils.showShort("阈值最大可为12.5 m/s") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_over_take_speed_max_value) } else { FunctionBuildConfig.overTakeSpeed += 0.5f tvOverTakeLimit.text = "${FunctionBuildConfig.overTakeSpeed} m/s" @@ -697,10 +703,12 @@ internal class SOPSettingView @JvmOverloads constructor( val isSuccess = CallerAutoPilotControlManager.sendOvertakeMaxSpeed(FunctionBuildConfig.overTakeSpeed.toDouble()) if (isSuccess == true) { - ToastUtils.showShort("SOP 超车目标障碍物速度阈值设置成功") +// ToastUtils.showShort("SOP 超车目标障碍物速度阈值设置成功") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_send_sop_detouring_speed_success) hmiAction("SOP 超车目标障碍物速度阈值设置", "成功") } else { - ToastUtils.showShort("SOP 超车目标障碍物速度阈值设置失败") +// ToastUtils.showShort("SOP 超车目标障碍物速度阈值设置失败") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_send_sop_detouring_speed_fail) hmiAction("SOP 超车目标障碍物速度阈值设置", "失败") } clickEventAnalytics("超车速度阈值",true) @@ -793,19 +801,22 @@ internal class SOPSettingView @JvmOverloads constructor( if(!buttonView.isPressed) return@setOnCheckedChangeListener if (isChecked) { if (CallerHmiManager.isTaxiUnmanedDriverPerformTask()) { - ToastUtils.showLong("请先结束当前任务") +// ToastUtils.showLong("请先结束当前任务") + ToastUtils.showLong(R.string.module_mogo_core_function_hmi_please_stop_current_task) buttonView.isChecked = !isChecked return@setOnCheckedChangeListener } if (CallerHmiManager.isTaxiUnmanedDriverTakingOrders()) { - ToastUtils.showLong("请先结束接单状态") +// ToastUtils.showLong("请先结束接单状态") + ToastUtils.showLong(R.string.module_mogo_core_function_hmi_please_stop_receive_order_state) buttonView.isChecked = !isChecked return@setOnCheckedChangeListener } CallerHmiManager.setTaxiUnmanedDriverLineRoutingVerifyMode(true) } else { if (CallerHmiManager.isTaxiUnmanedDriverLineRoutingPerformTask()) { - ToastUtils.showLong("请先结束当前任务") +// ToastUtils.showLong("请先结束当前任务") + ToastUtils.showLong(R.string.module_mogo_core_function_hmi_please_stop_current_task) buttonView.isChecked = !isChecked return@setOnCheckedChangeListener } @@ -938,7 +949,8 @@ internal class SOPSettingView @JvmOverloads constructor( if (tag == 0) { //断开魔方连接 if (!mf.isConnected()) { - Toast.makeText(context, "尚未建立连接", Toast.LENGTH_SHORT).show() +// Toast.makeText(context, "尚未建立连接", Toast.LENGTH_SHORT).show() + Toast.makeText(context, R.string.module_core_mofang_disconnect, Toast.LENGTH_SHORT).show() return@setOnClickCallback } mfStatusLayout.showLoadingView() @@ -948,7 +960,8 @@ internal class SOPSettingView @JvmOverloads constructor( if (tag == 1) { //建立魔方连接 if (mf.isConnected()) { - Toast.makeText(context, "已连接，不要重复连接", Toast.LENGTH_SHORT).show() +// Toast.makeText(context, "已连接，不要重复连接", Toast.LENGTH_SHORT).show() + Toast.makeText(context, R.string.module_core_mofang_connected, Toast.LENGTH_SHORT).show() return@setOnClickCallback } mf.connect() diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/ToolsView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/ToolsView.kt index 0917cfc7df..63bad06ca1 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/ToolsView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/ToolsView.kt @@ -11,6 +11,7 @@ import com.mogo.eagle.core.data.deva.bindingcar.IPCUpgradeStateInfo import com.mogo.eagle.core.data.enums.SidePattern import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWarningStatusListener import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager +import com.mogo.eagle.core.function.hmi.R import com.mogo.eagle.core.function.hmi.notification.WarningFloat import com.mogo.eagle.core.function.hmi.notification.anim.DefaultAnimator import com.mogo.eagle.core.function.hmi.ui.setting.SopView.Companion.sopView @@ -117,7 +118,8 @@ class ToolsView private constructor() { toolsView?.showAdUpgradeStatus(ipcUpgradeStateInfo) ipcUpgradeStateInfo.status.let { if (AdUpgradeStateHelper.isUpgradeSuccess(it)) { - ToastUtils.showLong("升级成功") +// ToastUtils.showLong("升级成功") + ToastUtils.showLong(R.string.module_mogo_core_function_hmi_ipc_upgrade_success) AdUpgradeStateHelper.setConfirmUpgrade(false) } } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AdUpgradeDialog.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AdUpgradeDialog.kt index 769725fa72..364027b8e0 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AdUpgradeDialog.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AdUpgradeDialog.kt @@ -59,7 +59,8 @@ class AdUpgradeDialog(context: Context, images: List, padSn: String, rel //确认升级 CallerDevaToolsManager.upgradeConfirm(images, padSn, releaseId) AdUpgradeStateHelper.setConfirmUpgrade(true) - ToastUtils.showLong("最新版本下载中...") +// ToastUtils.showLong("最新版本下载中...") + ToastUtils.showLong(R.string.module_mogo_core_function_hmi_ipc_upgrade_dow) dismiss() } upgradeCancel?.setOnClickListener { diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AutoPilotAndCheckView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AutoPilotAndCheckView.kt index 6e467376d4..dfb7a73f46 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AutoPilotAndCheckView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AutoPilotAndCheckView.kt @@ -82,7 +82,8 @@ internal class AutoPilotAndCheckView @JvmOverloads constructor( when { speed > 60 -> { // 设置失败键盘不消失，让用户直接修改 - ToastUtils.showShort("超过最大限速值60，设置失败") +// ToastUtils.showShort("超过最大限速值60，设置失败") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_speed_beyond_max_value) } else -> { keyBoardUtil?.hideKeyboard() @@ -93,10 +94,12 @@ internal class AutoPilotAndCheckView @JvmOverloads constructor( when { isSuccess -> { etInputSpeed.setText(speedLimit.toString()) - ToastUtils.showShort("车速设置成功，立即生效") +// ToastUtils.showShort("车速设置成功，立即生效") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_set_auto_pilot_speed_success) } else -> { - ToastUtils.showShort("设置车速失败，请启动域控制器") +// ToastUtils.showShort("设置车速失败，请启动域控制器") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_set_auto_pilot_speed_fail) } } } @@ -113,11 +116,13 @@ internal class AutoPilotAndCheckView @JvmOverloads constructor( speedLimit = inputContent.toInt() if(speedLimit>60){ speedLimit = 60 - ToastUtils.showShort("最大限速60") +// ToastUtils.showShort("最大限速60") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_speed_max_value) } } }catch (t: Exception){ - ToastUtils.showShort("最大限速60") +// ToastUtils.showShort("最大限速60") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_speed_max_value) speedLimit = 60 } @@ -200,7 +205,8 @@ internal class AutoPilotAndCheckView @JvmOverloads constructor( svLayout.fullScroll(View.FOCUS_DOWN) } if (!CallerAutoPilotStatusListenerManager.isConnect()) { - ToastUtils.showShort("设置车速失败，请启动域控制器") +// ToastUtils.showShort("设置车速失败，请启动域控制器") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_set_auto_pilot_speed_fail) keyBoardUtil?.hideKeyboard() return@setOnTouchListener true } else { @@ -216,7 +222,8 @@ internal class AutoPilotAndCheckView @JvmOverloads constructor( speedLimit = 0 etInputSpeed.setText(speedLimit.toString()) } else{ - ToastUtils.showShort("车速不能再减了") +// ToastUtils.showShort("车速不能再减了") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_speed_not_minus) } try{ etInputSpeed.setSelection(speedLimit.toString().length) @@ -231,7 +238,8 @@ internal class AutoPilotAndCheckView @JvmOverloads constructor( speedLimit = 60 etInputSpeed.setText(speedLimit.toString()) } else{ - ToastUtils.showShort("车速不能再加了") +// ToastUtils.showShort("车速不能再加了") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_speed_not_add) } try{ etInputSpeed.setSelection(speedLimit.toString().length) @@ -242,7 +250,8 @@ internal class AutoPilotAndCheckView @JvmOverloads constructor( tvSureModify.setOnClickListener { if(speedLimit>60){ // 设置失败键盘不消失，让用户直接修改 - ToastUtils.showShort("超过最大限速值60，设置失败") +// ToastUtils.showShort("超过最大限速值60，设置失败") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_speed_beyond_max_value) return@setOnClickListener } val isSuccess = CallerAutoPilotControlManager.setAutoPilotSpeed(speedLimit) @@ -250,10 +259,12 @@ internal class AutoPilotAndCheckView @JvmOverloads constructor( isSuccess -> { //速度显示 etInputSpeed.setText(speedLimit.toString()) - ToastUtils.showShort("车速设置成功，立即生效") +// ToastUtils.showShort("车速设置成功，立即生效") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_set_auto_pilot_speed_success) } else -> { - ToastUtils.showShort("设置车速失败，请启动域控制器") +// ToastUtils.showShort("设置车速失败，请启动域控制器") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_set_auto_pilot_speed_fail) } } try { @@ -267,7 +278,8 @@ internal class AutoPilotAndCheckView @JvmOverloads constructor( if (CallerAutoPilotStatusListenerManager.getState() == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING || CallerAutoPilotStatusListenerManager.getState() == IMoGoAutopilotStatusListener.STATUS_PARALLEL_DRIVING ) { - ToastUtils.showShort("请稍后退出") +// ToastUtils.showShort("请稍后退出") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_please_out_later) return@onClick } EventBus.getDefault().post(EventLogout(EventLogout.LOGOUT_TYPE)) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/ModifyBindingCarDialog.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/ModifyBindingCarDialog.kt index 62853c34a2..af41454186 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/ModifyBindingCarDialog.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/ModifyBindingCarDialog.kt @@ -76,9 +76,11 @@ class ModifyBindingCarDialog(context: Context) : BaseFloatDialog(context, TAG), private fun modifyBindingCar() { CallerDevaToolsManager.modifyCarInfo { if (it.code == 200) { - TipToast.shortTip("修改绑定成功") +// TipToast.shortTip("修改绑定成功") + TipToast.shortTip(R.string.module_core_change_bind_success) } else { - TipToast.shortTip("修改绑定失败") +// TipToast.shortTip("修改绑定失败") + TipToast.shortTip(R.string.module_core_change_bind_failed) } } dismiss() diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/OTAUpgradeDialog.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/OTAUpgradeDialog.kt index 9da052716b..43be3dbdae 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/OTAUpgradeDialog.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/OTAUpgradeDialog.kt @@ -45,9 +45,11 @@ class OTAUpgradeDialog(context: Context) : if(otaVersion == 1){ val result = CallerAutoPilotControlManager.sendSsmFuncOtaDownloadResponse(OTAUpgradeConfig.otaToken,SsmInfo.IfUpgrade.IMMEDIATELY) if(result){ - ToastUtils.showShort("立即升级命令发送成功") +// ToastUtils.showShort("立即升级命令发送成功") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_send_ipc_upgrade_cmd_success) }else{ - ToastUtils.showShort("立即升级命令发送失败") +// ToastUtils.showShort("立即升级命令发送失败") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_send_ipc_upgrade_cmd_fail) } }else if(otaVersion == 2){ val query = JSONObject() @@ -60,9 +62,11 @@ class OTAUpgradeDialog(context: Context) : }else{ val result = CallerAutoPilotControlManager.sendSsmFuncOtaDownloadResponse(OTAUpgradeConfig.otaToken,SsmInfo.IfUpgrade.IMMEDIATELY) if(result){ - ToastUtils.showShort("立即升级命令发送成功") +// ToastUtils.showShort("立即升级命令发送成功") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_send_ipc_upgrade_cmd_success) }else{ - ToastUtils.showShort("立即升级命令发送失败") +// ToastUtils.showShort("立即升级命令发送失败") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_send_ipc_upgrade_cmd_fail) } val query = JSONObject() @@ -80,9 +84,11 @@ class OTAUpgradeDialog(context: Context) : if(otaVersion == 1){ val delayResult = CallerAutoPilotControlManager.sendSsmFuncOtaDownloadResponse(OTAUpgradeConfig.otaToken,SsmInfo.IfUpgrade.DELAY) if(delayResult){ - ToastUtils.showShort("稍后升级命令发送成功") +// ToastUtils.showShort("稍后升级命令发送成功") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_later_send_ipc_upgrade_cmd_success) }else{ - ToastUtils.showShort("稍后升级命令发送失败") +// ToastUtils.showShort("稍后升级命令发送失败") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_later_send_ipc_upgrade_cmd_fail) } }else if(otaVersion == 2){ //不允许OTA升级 @@ -96,9 +102,11 @@ class OTAUpgradeDialog(context: Context) : }else{ val delayResult = CallerAutoPilotControlManager.sendSsmFuncOtaDownloadResponse(OTAUpgradeConfig.otaToken,SsmInfo.IfUpgrade.DELAY) if(delayResult){ - ToastUtils.showShort("稍后升级命令发送成功") +// ToastUtils.showShort("稍后升级命令发送成功") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_later_send_ipc_upgrade_cmd_success) }else{ - ToastUtils.showShort("稍后升级命令发送失败") +// ToastUtils.showShort("稍后升级命令发送失败") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_later_send_ipc_upgrade_cmd_fail) } //不允许OTA升级 @@ -121,9 +129,11 @@ class OTAUpgradeDialog(context: Context) : if(otaVersion == 1){ val result = CallerAutoPilotControlManager.sendSsmFuncOtaDownloadResponse(OTAUpgradeConfig.otaToken,SsmInfo.IfUpgrade.IMMEDIATELY) if(result){ - ToastUtils.showShort("立即升级命令发送成功") +// ToastUtils.showShort("立即升级命令发送成功") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_send_ipc_upgrade_cmd_success) }else{ - ToastUtils.showShort("立即升级命令发送失败") +// ToastUtils.showShort("立即升级命令发送失败") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_send_ipc_upgrade_cmd_fail) } }else if(otaVersion == 2){ val query = JSONObject() @@ -136,9 +146,11 @@ class OTAUpgradeDialog(context: Context) : }else{ val result = CallerAutoPilotControlManager.sendSsmFuncOtaDownloadResponse(OTAUpgradeConfig.otaToken,SsmInfo.IfUpgrade.IMMEDIATELY) if(result){ - ToastUtils.showShort("立即升级命令发送成功") +// ToastUtils.showShort("立即升级命令发送成功") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_send_ipc_upgrade_cmd_success) }else{ - ToastUtils.showShort("立即升级命令发送失败") +// ToastUtils.showShort("立即升级命令发送失败") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_send_ipc_upgrade_cmd_fail) } val query = JSONObject() diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/ToBindingCarDialog.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/ToBindingCarDialog.kt index 52fe405225..bbe4243069 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/ToBindingCarDialog.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/ToBindingCarDialog.kt @@ -79,9 +79,11 @@ class ToBindingCarDialog(context: Context) : BaseFloatDialog(context, TAG), Life private fun toBindingCar() { CallerDevaToolsManager.modifyCarInfo { if (it.code == 200) { - TipToast.shortTip("绑定成功") +// TipToast.shortTip("绑定成功") + TipToast.shortTip(R.string.module_core_bind_success) } else { - TipToast.shortTip("绑定失败") +// TipToast.shortTip("绑定失败") + TipToast.shortTip(R.string.module_core_bind_failed) } } dismiss() diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/UpgradeAppDialog.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/UpgradeAppDialog.kt index e2a8aa4942..3570106e37 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/UpgradeAppDialog.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/UpgradeAppDialog.kt @@ -70,7 +70,8 @@ class UpgradeAppDialog(context: Context) : BaseFloatDialog(context,TAG), Lifecyc confirmTv?.onClick { val provider = CallerDevaToolsManager.upgradeProvider() if (provider?.isDownloading() == true) { - ToastUtils.showShort("正在下载最新版本，请稍候再试...") +// ToastUtils.showShort("正在下载最新版本，请稍候再试...") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_downloading_new_version) return@onClick } downloadApp() @@ -83,7 +84,8 @@ class UpgradeAppDialog(context: Context) : BaseFloatDialog(context,TAG), Lifecyc confirmForceTv?.onClick { val provider = CallerDevaToolsManager.upgradeProvider() if (provider?.isDownloading() == true) { - ToastUtils.showShort("正在下载最新版本，请稍候再试...") +// ToastUtils.showShort("正在下载最新版本，请稍候再试...") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_downloading_new_version) return@onClick } downloadApp() @@ -95,7 +97,8 @@ class UpgradeAppDialog(context: Context) : BaseFloatDialog(context,TAG), Lifecyc * 去下载 */ private fun downloadApp() { - ToastUtils.showLong("开始下载APK,稍后可前往downloads文件夹查看,通知栏查看下载进度") +// ToastUtils.showLong("开始下载APK,稍后可前往downloads文件夹查看,通知栏查看下载进度") + ToastUtils.showLong(R.string.module_mogo_core_function_hmi_start_download_apk) tag?.let { downloadUrl?.let { url -> window?.decorView?.scope?.launch { diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/AutoPilotStatusView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/AutoPilotStatusView.kt index f42e95f556..2c73d7314a 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/AutoPilotStatusView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/AutoPilotStatusView.kt @@ -55,7 +55,8 @@ class AutoPilotStatusView constructor( when (mAutopilotStatus) { 0 -> {// 不可自动驾驶，adas与工控机没有链接，或工控机异常 CallerLogger.e("$M_HMI$TAG", "不可自动驾驶，adas与工控机没有链接，或工控机异常，请检查") - ToastUtils.showShort("不可自动驾驶，adas与工控机没有链接，或工控机异常，请检查") +// ToastUtils.showShort("不可自动驾驶，adas与工控机没有链接，或工控机异常，请检查") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_not_start_autopilot) } 1 -> {// 可自动驾驶，目前处于人工干预状态 CallerHmiListenerManager.invokeCheckAutoPilotBtnListener(true) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/BlueToothView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/BlueToothView.kt index 7a6daf0258..b6794adc3a 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/BlueToothView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/BlueToothView.kt @@ -153,7 +153,8 @@ open class BlueToothView: LinearLayout, IMoGoMoFangProvider.OnMoFangStatusListen val prev = prevTime.get() val current = SystemClock.elapsedRealtime() if (prev == 0L || TimeUnit.MILLISECONDS.toSeconds(current - prev) >= 30) { - ToastUtils.showShort("蘑方当前处于低电状态，请及时充电") +// ToastUtils.showShort("蘑方当前处于低电状态，请及时充电") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_mofang_low_power) prevTime.set(current) } ivMoFangStatus?.background = (ContextCompat.getDrawable(context, R.drawable.icon_mofang_low_power)) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/CheckSystemView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/CheckSystemView.kt index f4bf00e4d0..ccd59b32ec 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/CheckSystemView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/CheckSystemView.kt @@ -205,30 +205,36 @@ class CheckSystemView @JvmOverloads constructor( */ private fun powerOff() { if (!connectStatus) { - ToastUtils.showShort("尚未连接工控机，无法下发一键停服命令") +// ToastUtils.showShort("尚未连接工控机，无法下发一键停服命令") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_not_sent_shutdown_ipc) return } if(AppConfigInfo.dockerVersion.isEmpty()){ - ToastUtils.showShort("尚未连接工控机，无法下发一键停服命令") +// ToastUtils.showShort("尚未连接工控机，无法下发一键停服命令") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_not_sent_shutdown_ipc) return } if(ParseVersionUtils.parseVersion(true, AppConfigInfo.dockerVersion)<40100){ - ToastUtils.showShort("此域控版本不支持一键停服功能，最低支持版本为4.1.0") +// ToastUtils.showShort("此域控版本不支持一键停服功能，最低支持版本为4.1.0") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_ipc_version_nonsupport_shutdown_ipc) return } if(CallerAutoPilotStatusListenerManager.getState() == 2){ //当前处于自动驾驶状态，不可进行重启，Toast提示 - ToastUtils.showShort("请先退出自动驾驶状态") +// ToastUtils.showShort("请先退出自动驾驶状态") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_please_exit_autopilot_state) return } if (isExecutingPowerOff) { //一键停服命令下发执行中 - ToastUtils.showShort("一键停服命令下发中，请勿重复点击") +// ToastUtils.showShort("一键停服命令下发中，请勿重复点击") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_sending_shutdown_ipc) return } if (isPowerOffCountDown) { //系统停服中 - ToastUtils.showShort("系统停服中，请勿重复点击") +// ToastUtils.showShort("系统停服中，请勿重复点击") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_shutdowning_ipc) return } //将是否正在下发一键停服命令标签改为true @@ -247,7 +253,8 @@ class CheckSystemView @JvmOverloads constructor( */ private fun showRebootDialog() { if (!connectStatus) { - ToastUtils.showShort("尚未连接工控机，无法重启系统") +// ToastUtils.showShort("尚未连接工控机，无法重启系统") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_not_sent_reboot_ipc) return } //dialog @@ -257,12 +264,14 @@ class CheckSystemView @JvmOverloads constructor( override fun confirm() { if (CallerAutoPilotStatusListenerManager.getState() == 2) { //当前处于自动驾驶状态，不可进行重启，Toast提示 - ToastUtils.showShort("请先退出自动驾驶状态") +// ToastUtils.showShort("请先退出自动驾驶状态") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_please_exit_autopilot_state) } else { //确认重启 CallerLogger.d("$M_HMI$TAG", "reboot confirm") CallerAutoPilotControlManager.sendIpcReboot() - ToastUtils.showLong("重启命令已发送") +// ToastUtils.showLong("重启命令已发送") + ToastUtils.showLong(R.string.module_mogo_core_function_hmi_send_reboot_success) } } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/DriverMonitorView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/DriverMonitorView.kt index 1b10ed3e0a..5d1cdb41db 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/DriverMonitorView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/DriverMonitorView.kt @@ -139,10 +139,12 @@ class DriverMonitorView : carLiveCallBack ) } else { - ToastUtils.showShort("正在直播中") +// ToastUtils.showShort("正在直播中") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_live_streaming) } } else { - ToastUtils.showShort("当前车内没有直播源") +// ToastUtils.showShort("当前车内没有直播源") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_car_not_live_device) //为空又怎么撸 CallerLogger.d( "${SceneConstant.M_HMI}$TAG", diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ParallelDriveView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ParallelDriveView.kt index 539991d891..08ee19e391 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ParallelDriveView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ParallelDriveView.kt @@ -112,18 +112,21 @@ class ParallelDriveView @JvmOverloads constructor( APP_REQUESTING -> { cancelParaDrive() HmiActionLog.hmiAction(TAG,"Click-请求已取消") - ToastUtils.showShort("请求已取消！") +// ToastUtils.showShort("请求已取消！") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_cancel_para_drive) checkAvailableAndUpdateUI() } AD_REQUESTING -> { HmiActionLog.hmiAction(TAG,"Click-自动驾驶正在请求平行驾驶") - ToastUtils.showShort("自动驾驶正在请求平行驾驶") +// ToastUtils.showShort("自动驾驶正在请求平行驾驶") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_request_para_drive) } UNAVAILABLE -> { HmiActionLog.hmiAction(TAG,"Click-请P档驻车并松开油门刹车后请求") - ToastUtils.showShort("请P档驻车并松开油门刹车后请求") +// ToastUtils.showShort("请P档驻车并松开油门刹车后请求") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_para_drive_not_conditions) } } } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/RomaPassengerView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/RomaPassengerView.kt index 36f5bfb470..8f86bc9d24 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/RomaPassengerView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/RomaPassengerView.kt @@ -46,14 +46,16 @@ class RomaPassengerView @JvmOverloads constructor( a.recycle() setOnClickListener { if (ClickUtils.isClickTooFrequent(this,2500)) { - ToastUtils.showShort("不要频繁点击哦~") +// ToastUtils.showShort("不要频繁点击哦~") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_dot_often_click) return@setOnClickListener } if(!click){ return@setOnClickListener } if(!MogoStatusManager.getInstance().isSocketOnLine){ - ToastUtils.showShort("长链状态异常，请检查链接后开启漫游") +// ToastUtils.showShort("长链状态异常，请检查链接后开启漫游") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_long_connection_state_error) return@setOnClickListener } click = false diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SystemVersionView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SystemVersionView.kt index b347e768b8..2227945b0f 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SystemVersionView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SystemVersionView.kt @@ -71,7 +71,8 @@ class SystemVersionView @JvmOverloads constructor( hmiAction("$M_HMI$TAG", "pad version view clicked") val provider = CallerDevaToolsManager.upgradeProvider() if (provider?.isDownloading() == true) { - ToastUtils.showShort("正在下载最新版本，请稍候再试...") +// ToastUtils.showShort("正在下载最新版本，请稍候再试...") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_downloading_new_version) return@setOnClickListener } CallerDevaToolsManager.queryAppUpgrade() @@ -106,7 +107,8 @@ class SystemVersionView @JvmOverloads constructor( currentProgress ).isEmpty() ) { - ToastUtils.showShort("下载已完成") +// ToastUtils.showShort("下载已完成") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_download_complete) } else { ToastUtils.showShort( "预计" + AdUpgradeStateHelper.getRemainingTime( @@ -124,15 +126,18 @@ class SystemVersionView @JvmOverloads constructor( } AdUpgradeStateHelper.isUpgrading(it.status) -> { //工控机状态为“升级中” - ToastUtils.showShort("新版本升级中，预计5分钟升级完成") +// ToastUtils.showShort("新版本升级中，预计5分钟升级完成") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_ipc_upgrade_now) } AdUpgradeStateHelper.isUpgradeFailed(it.status) -> { //如果升级失败，则Toast提示：升级失败，请联系运维人员 - ToastUtils.showShort("升级失败，请联系运维人员") +// ToastUtils.showShort("升级失败，请联系运维人员") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_ipc_upgrade_fail) } AdUpgradeStateHelper.isUpgradeSuccess(it.status) -> { //升级成功 - ToastUtils.showLong("已是最新版本") +// ToastUtils.showLong("已是最新版本") + ToastUtils.showLong(R.string.module_mogo_core_function_hmi_ipc_last_version) } } @@ -342,7 +347,8 @@ class SystemVersionView @JvmOverloads constructor( // ivAdVersion?.setBackgroundResource(R.drawable.version_upgradeable_background) AdUpgradeStateHelper.setUpgradeableStatus(true) } else { - ToastUtils.showLong("已是最新版本") +// ToastUtils.showLong("已是最新版本") + ToastUtils.showLong(R.string.module_mogo_core_function_hmi_ipc_last_version) ivAdStatus?.setImageResource(R.drawable.icon_latest_version) adCircularProgressView?.visibility = View.GONE // ivAdVersion?.setBackgroundResource(R.drawable.version_latest_background) diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/RomaManager.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/RomaManager.kt index b0ac52e5ff..21aa3208d6 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/RomaManager.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/RomaManager.kt @@ -40,6 +40,7 @@ import com.mogo.eagle.core.function.call.map.CallerMapRomaListener import com.mogo.eagle.core.function.call.map.CallerMapRomaListener.invokeRomaViewStatus import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager import com.mogo.eagle.core.function.call.map.CallerVisualAngleManager +import com.mogo.eagle.core.function.map.R import com.mogo.eagle.core.function.utils.MapRomaTrace import com.mogo.eagle.core.function.utils.MapRomaTrace.Companion.getCurrentCNode import com.mogo.eagle.core.utilcode.mogo.logger.Logger @@ -117,7 +118,8 @@ class RomaManager() : IMoGoPlanningRottingListener, ) Logger.d(TAG, "H_ERROR_MAP msg=地图漫游模式启动失败,原因:${it.obj}") if (DebugConfig.isDebug()) { - ToastUtils.showShort("进入漫游模式失败, code:${it.obj}") +// ToastUtils.showShort("进入漫游模式失败, code:${it.obj}") + ToastUtils.showShort(R.string.module_mogo_core_function_map_roam_starting_fail, "${it.obj}") } } true @@ -127,7 +129,8 @@ class RomaManager() : IMoGoPlanningRottingListener, if (CallerMapIdentifyManager.roam.first.isNotEmpty() && CallerMapIdentifyManager.roam.first!= TAG && CallerMapIdentifyManager.roam.second) { - ToastUtils.showLong("正在展示路口漫游，请稍后重试") +// ToastUtils.showLong("正在展示路口漫游，请稍后重试") + ToastUtils.showLong(R.string.module_mogo_core_function_map_crossing_roam) MapRomaTrace.log( "", CHAIN_CODE_ROMA_REJECT, @@ -240,7 +243,8 @@ class RomaManager() : IMoGoPlanningRottingListener, CallerMapRomaListener.invokeMapRoma(false) CallerMapIdentifyManager.updateRoam("", false) if (DebugConfig.isDebug()) { - ToastUtils.showShort("漫游请求异常，msg:$errorMsg") +// ToastUtils.showShort("漫游请求异常，msg:$errorMsg") + ToastUtils.showShort(R.string.module_mogo_core_function_roam_fail, errorMsg) } return } diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/RoadCrossRoamView.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/RoadCrossRoamView.kt index e1f925d431..be590717ac 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/RoadCrossRoamView.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/RoadCrossRoamView.kt @@ -208,7 +208,8 @@ class RoadCrossRoamView @JvmOverloads constructor( // 处于漫游模式下不做处理 if (CallerMapIdentifyManager.roam.second) { if (CallerMapIdentifyManager.roam.first != TAG) { - ToastUtils.showLong("正在漫游中，不展示路口漫游") +// ToastUtils.showLong("正在漫游中，不展示路口漫游") + ToastUtils.showLong(R.string.module_mogo_core_function_roam_now) } CallerLogger.d("$M_MAP$TAG", "正在漫游中，不展示路口漫游") return 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 54b5d5ba23..4b3a00cf09 100644 --- a/core/mogo-core-res/src/main/res/values/string.xml +++ b/core/mogo-core-res/src/main/res/values/string.xml @@ -8,4 +8,289 @@ 中距视角 远距视角 + + trajUrl数据为空 + trajMd5数据为空 + stopUrl数据为空 + stopMd5数据为空 + vehicleModel数据为空 + lineName数据为空 + startLocAddress数据为空 + endLocAddress数据为空 + 上报调度失败%s + 云调度取消确认成功 + 停止调度确认失败%s + 云调度完成，车辆已到达%s + + 服务异常，请稍后重试 + + 司机端服务启动成功! + 司机端服务停止! + AutoPilot出现异常，请立即处理! + 乘客屏已收到重启命令 + 连接司机屏成功! + 断开和司机屏的连接! + 和司机端连接异常! + + 工控机连接状态异常 + 网络异常,请检查网络 + 请勿连续点击，稍后再试 + + 请选择最少一个原因 + AI数据采集数据请求错误且无缓存数据可用 + 前溯采集时长最长30S + 采集总时长最长300S + 采集总时长最短5S + 采集总时长最长300S + 输入时间格式不合法，请重新输入 + 保存成功 + 请先选择要上传的Bag包 + 请先选择要删除的Bag包 + 上传命令完成 + %s 上传cos桶成功 + %s 上传cos桶执行python失败 + %s 上传cos桶拷贝过程失败 + %s 上传cos桶合并过程失败 + %s 上传cos桶上传过程失败 + %s 上传cos桶 %s + Topic设置成功 + Topic设置失败 + 讯飞语音听写初始化失败，错误码：%d + 听写失败,错误码：%d,请点击网址https://www.xfyun.cn/document/error-code查询解决方案 + 主动录包数据采集错误且无缓存数据可用 + 被动录包数据采集错误且无缓存数据可用 + 该截图录制失败或已删除 + 性能监控启动成功! + 性能监控已启动，请勿重复启动! + 性能监控停止成功! + 暂无待升级任务！ + 收到车辆部署任务，请在车辆空闲时发起升级 + 暂无OTA升级任务 + 定位权限被拒绝, 可能导致RTK定位不准确，请开启~ + 当前网络质量差! + 运营后台没有配置故障类型 + 请先选择故障类型 + 发生时间应在当前时间之前 + 请完整填写再上报 + 故障原因上报失败%s + 故障类型列表为空 + 故障列表获取失败：%s + 故障描述获取失败不能上报 + 主动录包命令下发失败 + 一键上报故障描述后台未配置 + 一键上报故障描述获取失败%s + 运营后台没有配置接管类型 + 请先选择接管类型 + 请完整填写再保存 + 接管类型列表为空 + 接管列表获取失败：%s + 接管原因弹窗已存在，请先编辑现有接管原因 + 请选择需要上传的接管记录 + 请编辑选中的接管记录 + 请勿快速点击 + 请选择需要删除的接管记录 + 接管记录上传成功 + 接管记录上传失败%s + 没有上一个场景了 + 请选择问题类型 + 请填写问题描述 + 工单上报成功 + 工单上报失败 + 该条记录已上传，不可选择 + 此条记录已上传不可再次编辑 + + 正在下载最新版本，请稍候再试… + 当前SSM节点未成功启动或当前版本不支持OTA升级 + 请结束订单后触发升级 + 后台未配置故障原因 + 请勿连续上报，稍后再试 + 当前录包上报面板已打开，请勿重复操作 + 不要频繁点击哦~ + 漫游准备中，请等待 + 长链状态异常，请检查链接后开启漫游 + 尚未连接工控机，无法重启系统 + 请先退出自动驾驶状态 + 重启命令已发送 + 尚未连接工控机，无法下发一键停服命令 + 此域控版本不支持一键停服功能，最低支持版本为4.1.0 + 一键停服命令下发中，请勿重复点击 + 系统停服中，请勿重复点击 + 已发起拷贝 + 拷贝命令发送失败 + 正在拷贝中… + 当前日期数据已拷贝成功 + 当前硬盘剩余空间不足 + 所选日期无法拷贝 + 硬盘安全弹出命令已发送 + 硬盘安全弹出命令发送失败 + 数据拷贝中，不可再次选择日期，请耐心等待 + 硬盘已安全弹出 + 终止数据拷贝命令已发送 + 终止数据拷贝命令发送失败 + 工控机连接异常，无法执行魔方命令 + 驾驶位视频流功能已关闭 + 驾驶位视频流功能已开启 + 驾驶位视频流功能因设备下线已关闭 + 未收到乘客屏响应，请%d秒后再试 + 未收到乘客屏响应，请稍候再试 + 驾驶位视频流功能开启指令已发送，等待乘客端响应 + 驾驶位视频流功能关闭指令已发送，等待乘客端响应 + 请先结束当前任务 + 请先结束接单状态 + 车速设置成功，立即生效 + 设置车速失败，请启动域控制器 + 设置车速失败 + 变道绕障的目标障碍物速度阈值设置成功 + 变道绕障的目标障碍物速度阈值设置失败 + SOP 超车目标障碍物速度阈值设置成功 + SOP 超车目标障碍物速度阈值设置失败 + 阈值最大为%s + 阈值最小为%s + 阈值最小可为3 m/s + 阈值最大可为7 m/s + 阈值最大可为12.5 m/s + 升级成功 + 最新版本下载中… + 超过最大限速值60，设置失败 + 最大限速60 + 车速不能再减了 + 车速不能再加了 + 请稍后退出 + 立即升级命令发送成功 + 立即升级命令发送失败 + 稍后升级命令发送成功 + 稍后升级命令发送失败 + 开始下载APK,稍后可前往downloads文件夹查看,通知栏查看下载进度 + 不可自动驾驶，adas与工控机没有链接，或工控机异常，请检查 + 蘑方当前处于低电状态，请及时充电 + 正在直播中 + 当前车内没有直播源 + 请求已取消！ + 自动驾驶正在请求平行驾驶 + 请P档驻车并松开油门刹车后请求 + 下载已完成 + 新版本升级中，预计5分钟升级完成 + 升级失败，请联系运维人员 + 已是最新版本 + + + 进入漫游模式失败, code:%s + 正在展示路口漫游，请稍后重试 + 漫游请求异常，msg:%s + 正在漫游中，不展示路口漫游 + + TTS 模块初始化异常 + + 无发布轨迹, 请发布后重试 + + 启动自驾中 + 宣传视频数据已更新 + 提交成功 + 查询灰度线路列表异常, 请稍后重试, code=%d + 灰度线路或轨迹信息异常，请稍后再试 + 请设置轨迹信息 + 刷新成功 + 结束任务成功 + 自驾启动中，请勿重复点击 + 未设置起始或终点站点 + 请滑动出发后再启动自驾 + %s_%s_自动驾驶id不同请排查 + 设备无蓝牙硬件 + 没有找到服务UUID=%s + 已连接成功 + 超时未响应，请求失败 + 网络异常，请稍后重试 + 选择任务失败:%s + 请设置轨迹信息 + 请重新选择线路 + 结束任务失败请稍后再试 + 请选择任务 + 该任务已被其他车辆使用、请切换任务 + 该任务已被%s使用、请切换任务 + 请等待车辆完成掉头后再出发吧～ + 已到达目的地请重新选择线路 + 请选择站点 + 启动自动驾驶中 + 已断开司机屏连接、请联系安全员 + 设备未就绪请稍等，请安全员主动停止车辆 + 因车辆正在人工驾驶中无法靠边停车，请安全员主动停止车辆 + 因车辆正在平行驾驶中无法靠边停车，请安全员主动停止车辆 + 靠边停车成功 + 车辆系统繁忙，请稍后再试 + 已开启车门 + 已关门车门 + 没有轨迹点 + 请确认订单 + 请稍后点击 + 设备未就绪请稍等 + 车辆行驶中，不要频繁点击哦～ + 设备未就绪请稍等，请稍后再试 + 因车辆正在人工驾驶中无法靠边停车，请稍后再试 + 远程守护卫士操作中，稍后再试试吧～ + 结束成功 + 站点确定 + 司机端拒绝请重新选择 + 查询线路失败 + 乘客屏无法连接司机屏请联系安全员 + 请联系安全员确认 + 查询站点失败 + 断开和司机端连接、请联系安全员 + 自动驾驶中无法切换线路 + 请停车后再修改目的地～ + 您已在此站点附近 + 站点已过，请选择返程路线 + 打开顶灯1 + 关闭顶灯1 + 打开顶灯2 + 关闭顶灯2 + 打开氛围灯 + 关闭氛围灯 + 控制系统繁忙，请稍后再试 + 暖风机操作未生效，请稍后重试吧～ + 加载中请稍等 + 哎呀，出错了，看看其他视频吧 + 请输入密码 + 请输入正确密码 + 长链接状态恢复 + 长链接异常，请开启相应权限或者查看网络 + 定位服务异常 + 网络异常 + %s请开启相应权限或者查看网络 + 请稍后唤醒 + 网络异常，请重试 + 请开启车机定位后重试 + 网络异常，请稍后重试 + + + PadTTS 模块初始化异常 + + 域控已连接 + 域控连接中 + 域控重连中 + 非法域控地址 + 正在搜索域控地址 + 上报失败 + 上报成功 + 上传语音文件失败 + 请选择至少一个Case + 当前工控机没有入库 + 云端下发抓取日志，时间:%d分钟 + 云端下发停止抓取日志 + 云端下发打开日志开关 + 云端下发关闭日志开关 + 上传本地缓存链路日志 + 上传本地地图缓存日志 + 已经在抓取日志了,请稍后再试 + 缺少设备唯一ID，请检查网络 + 日志抓取出现错误，出错数量:%d + 修改绑定成功 + 修改绑定失败 + 绑定成功 + 绑定失败 + 检测到魔方未正确连接，请在系统蓝牙设置页面，找到魔方并配对连接… + 检测到新版本[%s]并且当前设备支持静默升级，开始下载新版本… + 当前MAP版本不支持360环视，请升级MAP版本 + 尚未建立连接 + 已连接，不要重复连接 + \ No newline at end of file diff --git a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/kotlin/Extensions.kt b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/kotlin/Extensions.kt index cbafd5e7fd..412a29e546 100644 --- a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/kotlin/Extensions.kt +++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/kotlin/Extensions.kt @@ -113,7 +113,8 @@ fun View.onClick(block: (View) -> Unit) { fun View.onClick(during:Int,block: (View) -> Unit) { this.setOnClickListener { if (ClickUtils.isClickTooFrequent(this,during)) { - ToastUtils.showShort("不要频繁点击哦~") +// ToastUtils.showShort("不要频繁点击哦~") + ToastUtils.showShort(R.string.module_mogo_core_function_hmi_dot_often_click1) return@setOnClickListener } block(it) diff --git a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/ToastUtils.java b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/ToastUtils.java index d054476dec..54d5268207 100644 --- a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/ToastUtils.java +++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/ToastUtils.java @@ -513,20 +513,24 @@ public final class ToastUtils { @Nullable final CharSequence text, final int duration, @NonNull final ToastUtils utils) { - UtilsBridge.runOnUiThread(new Runnable() { - @Override - public void run() { - cancel(); - IToast iToast = newToast(utils); - ToastUtils.sWeakToast = new WeakReference<>(iToast); - if (view != null) { - iToast.setToastView(view); - } else { - iToast.setToastView(text); + try { + UtilsBridge.runOnUiThread(new Runnable() { + @Override + public void run() { + cancel(); + IToast iToast = newToast(utils); + ToastUtils.sWeakToast = new WeakReference<>(iToast); + if (view != null) { + iToast.setToastView(view); + } else { + iToast.setToastView(text); + } + iToast.show(duration); } - iToast.show(duration); - } - }); + }); + } catch (Exception e) { + e.printStackTrace(); + } } private static CharSequence getToastFriendlyText(CharSequence src) { diff --git a/core/mogo-core-utils/src/main/res/values/string.xml b/core/mogo-core-utils/src/main/res/values/string.xml new file mode 100644 index 0000000000..36f99ecc87 --- /dev/null +++ b/core/mogo-core-utils/src/main/res/values/string.xml @@ -0,0 +1,4 @@ + + + 不要频繁点击哦~ + \ No newline at end of file diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/voice/AIAssist.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/voice/AIAssist.java index 69917234db..f75d1b544a 100644 --- a/foudations/mogo-commons/src/main/java/com/mogo/commons/voice/AIAssist.java +++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/voice/AIAssist.java @@ -3,6 +3,7 @@ package com.mogo.commons.voice; import android.content.Context; import android.util.Log; +import com.mogo.commons.R; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.utilcode.util.ToastUtils; import com.mogo.support.device.DevicesManager; @@ -96,7 +97,8 @@ public class AIAssist { // mTTS = (IMogoTTS) ARouter.getInstance().build(MogoTTSConstants.API_PATH).navigation(context.getApplicationContext()); } catch (Exception e) { e.printStackTrace(); - ToastUtils.showShort("TTS 模块初始化异常"); +// ToastUtils.showShort("TTS 模块初始化异常"); + ToastUtils.showShort(R.string.module_mogo_commons_tts_init_fail); } } diff --git a/tts/tts-pad/src/main/java/com/mogo/tts/pad/PadTTS.java b/tts/tts-pad/src/main/java/com/mogo/tts/pad/PadTTS.java index f095405111..d5ce7d0a2e 100644 --- a/tts/tts-pad/src/main/java/com/mogo/tts/pad/PadTTS.java +++ b/tts/tts-pad/src/main/java/com/mogo/tts/pad/PadTTS.java @@ -166,7 +166,8 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack { initDUILiteSDK(onlineBuilder, echoConfig); } catch (Exception e) { e.printStackTrace(); - ToastUtils.showShort("PadTTS 模块初始化异常"); +// ToastUtils.showShort("PadTTS 模块初始化异常"); + ToastUtils.showShort(R.string.module_tts_init_fail); } } diff --git a/tts/tts-pad/src/main/res/values/string.xml b/tts/tts-pad/src/main/res/values/string.xml new file mode 100644 index 0000000000..441d7d04a4 --- /dev/null +++ b/tts/tts-pad/src/main/res/values/string.xml @@ -0,0 +1,4 @@ + + + PadTTS 模块初始化异常 + \ No newline at end of file diff --git a/tts/tts-zhi/src/main/java/com/mogo/tts/pad/ZhiTTS.java b/tts/tts-zhi/src/main/java/com/mogo/tts/pad/ZhiTTS.java index 274311a6ee..58db56e347 100644 --- a/tts/tts-zhi/src/main/java/com/mogo/tts/pad/ZhiTTS.java +++ b/tts/tts-zhi/src/main/java/com/mogo/tts/pad/ZhiTTS.java @@ -66,7 +66,8 @@ public class ZhiTTS implements IMogoTTS, OnTtsListener { if(initStatus.get()){ ActionExecutor.getInstance().action("mos.action.config.trigger", null); }else { - ToastUtils.showShort("请稍后在试试吧"); +// ToastUtils.showShort("请稍后在试试吧"); + ToastUtils.showShort(R.string.please_later_again); } } diff --git a/tts/tts-zhi/src/main/res/values/string.xml b/tts/tts-zhi/src/main/res/values/string.xml index 3c3e14b786..0fe6debf1d 100644 --- a/tts/tts-zhi/src/main/res/values/string.xml +++ b/tts/tts-zhi/src/main/res/values/string.xml @@ -1,4 +1,5 @@ 278586132 + 请稍后在试试吧 \ No newline at end of file From 45f9af9e3dbd2fff8f2b599e249caae2de8c8f34 Mon Sep 17 00:00:00 2001 From: xinfengkun Date: Thu, 13 Nov 2025 17:36:00 +0800 Subject: [PATCH 08/33] =?UTF-8?q?[8.2.8][i18n]=20=E6=8E=A5=E9=A9=B3?= =?UTF-8?q?=E4=B9=98=E5=AE=A2=E5=B1=8F=20=E4=B8=AD=E6=96=87=E6=8A=BD?= =?UTF-8?q?=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mogo/och/biz/qrcode/QrParse.kt | 5 +++- .../biz/routing/ui/utils/TimeDistanceUtils.kt | 20 +++++++++++----- .../ui/BusPassengerRouteFragment.java | 13 +++++++---- .../passenger/ui/widget/BusPStatusBarView.kt | 4 +++- .../weaknet/passenger/ui/PM2BaseFragment.kt | 12 ++++++++-- .../ui/line/PM2DrivingInfoFragment.kt | 16 +++++++++---- .../ui/line/lineinfo/LineViewModel.kt | 14 +++++++---- .../line/lineinfo/item/StationViewHolder.kt | 7 ++++-- .../adapter/RoadCrossRoamListB2Adapter.kt | 19 ++++++++++----- .../ui/mind/data/RoadCrossRoamViewModel.kt | 5 +++- .../weaknet/passenger/model/TicketModel.kt | 5 +++- .../shuttle_p_weak_jl_route_fragment.xml | 7 +++--- .../mogo/och/unmanned/taxi/utils/TaskUtils.kt | 20 +++++++++++----- .../ui/aiview/data/RoadCrossRoamViewModel.kt | 4 +++- .../exploration/AutomaticExplorationView.kt | 22 ++++++++++++------ .../function/view/RoadCrossRoamListAdapter.kt | 19 ++++++++++----- .../core/function/view/RoadCrossRoamView.kt | 4 +++- .../src/main/res/values/string.xml | 23 +++++++++++++++++++ 18 files changed, 162 insertions(+), 57 deletions(-) diff --git a/OCH/common/biz/src/main/java/com/mogo/och/biz/qrcode/QrParse.kt b/OCH/common/biz/src/main/java/com/mogo/och/biz/qrcode/QrParse.kt index 8510b8b560..8e400951ce 100644 --- a/OCH/common/biz/src/main/java/com/mogo/och/biz/qrcode/QrParse.kt +++ b/OCH/common/biz/src/main/java/com/mogo/och/biz/qrcode/QrParse.kt @@ -5,6 +5,8 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_OCHCOMMON import com.mogo.eagle.core.utilcode.util.GsonUtils import com.mogo.eagle.core.utilcode.util.RegexUtils +import com.mogo.eagle.core.utilcode.util.StringUtils +import com.mogo.och.biz.R import com.mogo.och.common.module.biz.scanner.QrBean import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager import com.mogo.och.common.module.manager.socket.lan.LanSocketManager @@ -221,7 +223,8 @@ object QrParse { e.printStackTrace() CallerLogger.d(M_OCHCOMMON + TAG, "") // 通知司机屏二维码错误 - val writeOffDetail = WriteOffDetialMsg(code = 3001, msg = "出示错误二维码") +// val writeOffDetail = WriteOffDetialMsg(code = 3001, msg = "出示错误二维码") + val writeOffDetail = WriteOffDetialMsg(code = 3001, msg = StringUtils.getString(R.string.module_och_qr_code_error)) OchChainLogManager.writeChainLogWriteOff("核销失败", "二维码错误+参数错误") CallerLogger.d( M_OCHCOMMON + TAG, diff --git a/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/utils/TimeDistanceUtils.kt b/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/utils/TimeDistanceUtils.kt index da6d9ceb26..30c655b8fd 100644 --- a/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/utils/TimeDistanceUtils.kt +++ b/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/utils/TimeDistanceUtils.kt @@ -3,6 +3,8 @@ package com.mogo.och.biz.routing.ui.utils import android.text.Spanned import androidx.core.text.HtmlCompat import com.mogo.eagle.core.utilcode.util.DateTimeUtils +import com.mogo.eagle.core.utilcode.util.StringUtils +import com.mogo.och.biz.R import com.mogo.och.common.module.utils.DateTimeUtil import com.mogo.och.common.module.utils.NumberFormatUtil import java.util.Calendar @@ -13,13 +15,16 @@ object TimeDistanceUtils { fun getCurrentTaskDistance(meters: Long):String{ var dis = "0" - var disUnit = "公里" +// var disUnit = "公里" + var disUnit = StringUtils.getString(R.string.module_och_km) if (meters > 0) { if (meters / 1000 < 1) { - disUnit = "米" +// disUnit = "米" + disUnit = StringUtils.getString(R.string.module_och_m) dis = meters.toFloat().roundToInt().toString() } else { - disUnit = "公里" +// disUnit = "公里" + disUnit = StringUtils.getString(R.string.module_och_km) dis = NumberFormatUtil.formatLong(meters.toDouble() / 1000) } } @@ -36,13 +41,16 @@ object TimeDistanceUtils { */ fun getCurrentTaskTripHtml(meters: Long, timeInSecond: Long): Spanned { var dis = "0" - var disUnit = "公里" +// var disUnit = "公里" + var disUnit = StringUtils.getString(R.string.module_och_km) if (meters > 0) { if (meters / 1000 < 1) { - disUnit = "米" +// disUnit = "米" + disUnit = StringUtils.getString(R.string.module_och_m) dis = meters.toFloat().roundToInt().toString() } else { - disUnit = "公里" +// disUnit = "公里" + disUnit = StringUtils.getString(R.string.module_och_km) dis = NumberFormatUtil.formatLong(meters.toDouble() / 1000) } } diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/b1/com/mogo/och/shuttle/weaknet/passenger/ui/BusPassengerRouteFragment.java b/OCH/shuttle/passenger_weaknet/src/main/java/b1/com/mogo/och/shuttle/weaknet/passenger/ui/BusPassengerRouteFragment.java index 0c81a59595..d318aeeba8 100644 --- a/OCH/shuttle/passenger_weaknet/src/main/java/b1/com/mogo/och/shuttle/weaknet/passenger/ui/BusPassengerRouteFragment.java +++ b/OCH/shuttle/passenger_weaknet/src/main/java/b1/com/mogo/och/shuttle/weaknet/passenger/ui/BusPassengerRouteFragment.java @@ -22,6 +22,7 @@ import com.mogo.eagle.core.data.map.MogoLocation; import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener; import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager; import com.mogo.eagle.core.function.hmi.ui.setting.ToggleDebugView; +import com.mogo.eagle.core.utilcode.util.StringUtils; import com.mogo.map.overlay.IMoGoOverlayManager; import com.mogo.och.common.module.utils.ResourcesUtils; import com.mogo.och.shuttle.weaknet.passenger.R; @@ -315,19 +316,23 @@ public class BusPassengerRouteFragment extends public void updateRoutePlanningToNextStation(long meters, long timeInSecond){ //更新进度条 String dis = "0"; - String disUnit = "公里"; +// String disUnit = "公里"; + String disUnit = StringUtils.getString(R.string.module_och_km); if (meters > 0){ if (meters / 1000 < 1){ - disUnit = "米"; +// disUnit = "米"; + disUnit = StringUtils.getString(R.string.module_och_m); dis = String.valueOf(Math.round(meters)); }else { - disUnit = "公里"; +// disUnit = "公里"; + disUnit = StringUtils.getString(R.string.module_och_km); dis = NumberFormatUtil.formatLong((double)meters / 1000); } } // String strHtml2 = "距离 " + "" + dis + "" + " "+disUnit+"" // + "   剩余 " + "" + (int)Math.ceil((double)timeInSecond/ 60f) + "" + " 分钟"; - String str = dis+disUnit+" | "+(int)Math.ceil((double)timeInSecond/ 60f)+"分钟"; +// String str = dis+disUnit+" | "+(int)Math.ceil((double)timeInSecond/ 60f)+"分钟"; + String str = dis + disUnit + " | " + (int) Math.ceil((double) timeInSecond / 60f) + StringUtils.getString(R.string.module_och_minute); mCurrentArriveTip.setText(Html.fromHtml(str)); } diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/b1/com/mogo/och/shuttle/weaknet/passenger/ui/widget/BusPStatusBarView.kt b/OCH/shuttle/passenger_weaknet/src/main/java/b1/com/mogo/och/shuttle/weaknet/passenger/ui/widget/BusPStatusBarView.kt index 073bc9778b..592a2621cb 100644 --- a/OCH/shuttle/passenger_weaknet/src/main/java/b1/com/mogo/och/shuttle/weaknet/passenger/ui/widget/BusPStatusBarView.kt +++ b/OCH/shuttle/passenger_weaknet/src/main/java/b1/com/mogo/och/shuttle/weaknet/passenger/ui/widget/BusPStatusBarView.kt @@ -12,6 +12,7 @@ import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager import com.mogo.eagle.core.function.call.hmi.CallerHmiViewControlListenerManager import com.mogo.eagle.core.function.call.setting.CallerSkinModeListenerManager import com.mogo.eagle.core.utilcode.util.AppUtils +import com.mogo.eagle.core.utilcode.util.StringUtils import com.mogo.och.shuttle.weaknet.passenger.R import kotlinx.android.synthetic.main.shuttle_p_weak_jl_view_status_bar.view.tv_shuttle_b1_p_version import me.jessyan.autosize.utils.AutoSizeUtils @@ -34,7 +35,8 @@ class BusPStatusBarView @JvmOverloads constructor( isClickable = true isFocusable = true - tv_shuttle_b1_p_version.text = "版本：${AppUtils.getAppVersionName()}" +// tv_shuttle_b1_p_version.text = "版本：${AppUtils.getAppVersionName()}" + tv_shuttle_b1_p_version.text = StringUtils.getString(R.string.module_och_version, AppUtils.getAppVersionName()) } diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/PM2BaseFragment.kt b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/PM2BaseFragment.kt index d77c5f028b..41e7b1a457 100644 --- a/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/PM2BaseFragment.kt +++ b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/PM2BaseFragment.kt @@ -10,6 +10,7 @@ import com.mogo.eagle.core.function.call.hmi.CallerRoadV2NEventWindowListenerMan import com.mogo.eagle.core.function.call.map.CallerMapRoadListenerManager import com.mogo.eagle.core.utilcode.kotlin.onClick import com.mogo.eagle.core.utilcode.util.AppUtils +import com.mogo.eagle.core.utilcode.util.StringUtils import com.mogo.eagle.core.utilcode.util.UriUtils import com.mogo.och.common.module.biz.birdge.data.RoadMsg import com.mogo.och.common.module.biz.media.MediaManager @@ -77,7 +78,8 @@ class PM2BaseFragment : } override fun initViews() { - tv_shuttle_b2_p_version.text = "版本：${AppUtils.getAppVersionName()}" +// tv_shuttle_b2_p_version.text = "版本：${AppUtils.getAppVersionName()}" + tv_shuttle_b2_p_version.text = StringUtils.getString(R.string.module_och_version, AppUtils.getAppVersionName()) initFragment() OchTransform.addListener(TAG, ochTransform) } @@ -147,7 +149,13 @@ class PM2BaseFragment : sortedList.add(one) sortedList.add(two) sortedList.add(three) - val ndeEvent = AIMessage.NDEData(System.currentTimeMillis().toString(),"路口车龙","前方路口有车龙",sortedList) +// val ndeEvent = AIMessage.NDEData(System.currentTimeMillis().toString(),"路口车龙","前方路口有车龙",sortedList) + val ndeEvent = AIMessage.NDEData( + System.currentTimeMillis().toString(), + StringUtils.getString(R.string.module_och_crossing_tailback), + StringUtils.getString(R.string.module_och_crossing_tailback_desc), + sortedList + ) AIMessageManager.post(ndeEvent) // CallerRoadV2NEventWindowListenerManager.showImage( diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/line/PM2DrivingInfoFragment.kt b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/line/PM2DrivingInfoFragment.kt index bc01981b9c..1686735bd2 100644 --- a/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/line/PM2DrivingInfoFragment.kt +++ b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/line/PM2DrivingInfoFragment.kt @@ -3,10 +3,11 @@ package com.mogo.och.shuttle.weaknet.passenger.ui.line import android.os.Bundle import android.view.View import com.mogo.commons.mvp.MvpFragment -import com.mogo.och.shuttle.weaknet.passenger.R -import com.mogo.och.shuttle.weaknet.passenger.presenter.PM2DrivingPresenter +import com.mogo.eagle.core.utilcode.util.StringUtils import com.mogo.och.common.module.utils.NumberFormatUtil import com.mogo.och.data.bean.BusStationBean +import com.mogo.och.shuttle.weaknet.passenger.R +import com.mogo.och.shuttle.weaknet.passenger.presenter.PM2DrivingPresenter import kotlinx.android.synthetic.main.shuttle_p_m2_driving_info_fragment.arriveView import kotlinx.android.synthetic.main.shuttle_p_m2_driving_info_fragment.emptyView import kotlinx.android.synthetic.main.shuttle_p_m2_driving_info_fragment.lineView @@ -94,15 +95,20 @@ class PM2DrivingInfoFragment : * 剩余里程和时间 */ fun updateRemainMT(meters: Long, timeInSecond: Long) { //米。秒 - var disUnit = "公里" +// var disUnit = "公里" + var disUnit = StringUtils.getString(R.string.module_och_km) var remainDis: String? = "0" if (meters > 0) { if (meters / 1000 < 1) { - disUnit = "米" +// disUnit = "米" + disUnit = StringUtils.getString(R.string.module_och_m) remainDis = meters.toFloat().roundToInt().toString() } else { - disUnit = "公里" +// disUnit = "公里" + +// disUnit = "公里"; + disUnit = StringUtils.getString(R.string.module_och_km) remainDis = NumberFormatUtil.formatLong(meters.toDouble() / 1000) } } diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/line/lineinfo/LineViewModel.kt b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/line/lineinfo/LineViewModel.kt index 334d7d5ab4..4e6667ad7e 100644 --- a/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/line/lineinfo/LineViewModel.kt +++ b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/line/lineinfo/LineViewModel.kt @@ -3,9 +3,11 @@ package com.mogo.och.shuttle.weaknet.passenger.ui.line.lineinfo import androidx.lifecycle.ViewModel import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_BUS +import com.mogo.eagle.core.utilcode.util.StringUtils import com.mogo.och.common.module.manager.loop.BizLoopManager import com.mogo.och.common.module.utils.NumberFormatUtil import com.mogo.och.data.bean.BusStationBean +import com.mogo.och.shuttle.weaknet.passenger.R import com.mogo.och.shuttle.weaknet.passenger.callback.ICommonCallback import com.mogo.och.shuttle.weaknet.passenger.model.CommonModel import io.reactivex.disposables.Disposable @@ -44,15 +46,18 @@ class LineViewModel : ViewModel(), ICommonCallback { override fun updateRemainMT(meters: Long, timeInSecond: Long) { super.updateRemainMT(meters, timeInSecond) - var disUnit = "公里" +// var disUnit = "公里" + var disUnit = StringUtils.getString(R.string.module_och_km) var remainDis: String? = "0" if (meters > 0) { if (meters / 1000 < 1) { - disUnit = "米" +// disUnit = "米" + disUnit = StringUtils.getString(R.string.module_och_m) remainDis = meters.toFloat().roundToInt().toString() } else { - disUnit = "公里" +// disUnit = "公里" + disUnit = StringUtils.getString(R.string.module_och_km) remainDis = NumberFormatUtil.formatLong(meters.toDouble() / 1000) } } @@ -62,7 +67,8 @@ class LineViewModel : ViewModel(), ICommonCallback { // "$remainDis$disUnit".also { tv_distance.text = it } // "${time}分钟".also { tv_left_time.text = it } - this.viewCallback?.updateRemainMt("$remainDis$disUnit","${time}分钟") +// this.viewCallback?.updateRemainMt("$remainDis$disUnit","${time}分钟") + this.viewCallback?.updateRemainMt("$remainDis$disUnit","${time}${StringUtils.getString(R.string.module_och_minute)}") } interface LineViewCallback{ diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/line/lineinfo/item/StationViewHolder.kt b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/line/lineinfo/item/StationViewHolder.kt index 7efbd756fa..bf0a36e99f 100644 --- a/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/line/lineinfo/item/StationViewHolder.kt +++ b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/line/lineinfo/item/StationViewHolder.kt @@ -3,6 +3,7 @@ package com.mogo.och.shuttle.weaknet.passenger.ui.line.lineinfo.item import android.view.View import androidx.appcompat.widget.AppCompatTextView import androidx.recyclerview.widget.RecyclerView +import com.mogo.eagle.core.utilcode.util.StringUtils import com.mogo.och.common.module.utils.ResourcesUtils import com.mogo.och.common.module.wigets.OCHGradientTextView import com.mogo.och.data.bean.BusStationBean @@ -109,7 +110,8 @@ class OmitPassViewHolder(binding: View) : StationViewHolder(binding) { private var omitCout: AppCompatTextView = binding.findViewById(R.id.actv_pass_omit_cout) override fun bind(item: BusStationBean,distanceAndView:String) { if(item is StationBeanOmit){ - omitCout.text = "${item.coutOmit}站" +// omitCout.text = "${item.coutOmit}站" + omitCout.text = StringUtils.getString(R.string.module_och_station, item.coutOmit) } } } @@ -117,7 +119,8 @@ class OmitFutureViewHolder(binding: View) : StationViewHolder(binding) { private var omitCout: AppCompatTextView = binding.findViewById(R.id.actv_future_omit_count) override fun bind(item: BusStationBean,distanceAndView:String) { if(item is StationBeanOmit){ - omitCout.text = "${item.coutOmit}站" +// omitCout.text = "${item.coutOmit}站" + omitCout.text = StringUtils.getString(R.string.module_och_station, item.coutOmit) } } } diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/mind/adapter/RoadCrossRoamListB2Adapter.kt b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/mind/adapter/RoadCrossRoamListB2Adapter.kt index 162b8516ea..efe71dfe4d 100644 --- a/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/mind/adapter/RoadCrossRoamListB2Adapter.kt +++ b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/mind/adapter/RoadCrossRoamListB2Adapter.kt @@ -8,6 +8,7 @@ import android.widget.ImageView import android.widget.ProgressBar import android.widget.TextView import androidx.recyclerview.widget.RecyclerView +import com.mogo.eagle.core.utilcode.util.StringUtils import com.mogo.och.shuttle.weaknet.passenger.R import kotlin.random.Random @@ -17,12 +18,18 @@ class RoadCrossRoamListB2Adapter(private val mContext: Context) : RecyclerView. private val items: MutableList = mutableListOf() init { - items.add("前方路况拥堵分析") - items.add("路口危险车辆分析") - items.add("路口交通事故分析") - items.add("路口行人碰撞分析") - items.add("路口非机动车分析") - items.add("路口灯态分析") +// items.add("前方路况拥堵分析") + items.add(StringUtils.getString(R.string.module_och_analysis_traffic_conditions_ahead)) +// items.add("路口危险车辆分析") + items.add(StringUtils.getString(R.string.module_och_analysis_dangerous_vehicles_intersections)) +// items.add("路口交通事故分析") + items.add(StringUtils.getString(R.string.module_och_analysis_roadside_traffic_accidents)) +// items.add("路口行人碰撞分析") + items.add(StringUtils.getString(R.string.module_och_analysis_pedestrian_collisions_crossroads)) +// items.add("路口非机动车分析") + items.add(StringUtils.getString(R.string.module_och_analysis_non_motorized_vehicles_intersections)) +// items.add("路口灯态分析") + items.add(StringUtils.getString(R.string.module_och_analysis_intersection_signal_status)) } override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder { diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/mind/data/RoadCrossRoamViewModel.kt b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/mind/data/RoadCrossRoamViewModel.kt index 28e8a50d24..05920b7cd3 100644 --- a/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/mind/data/RoadCrossRoamViewModel.kt +++ b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/mind/data/RoadCrossRoamViewModel.kt @@ -12,7 +12,9 @@ import com.mogo.eagle.core.function.call.map.CallerMapIdentifyManager import com.mogo.eagle.core.function.call.map.CallerMapRoadListenerManager import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger +import com.mogo.eagle.core.utilcode.util.StringUtils import com.mogo.eagle.core.utilcode.util.ToastUtils +import com.mogo.och.shuttle.weaknet.passenger.R import com.mogo.och.shuttle.weaknet.passenger.ui.mind.AIMessageManager import com.mogo.och.shuttle.weaknet.passenger.ui.mind.bean.AIMessage @@ -55,7 +57,8 @@ class RoadCrossRoamViewModel: ViewModel(), IMoGoMapRoadListener { return } if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)){ - val disStr = "为您提供路口全息影像，助力出行" +// val disStr = "为您提供路口全息影像，助力出行" + val disStr = StringUtils.getString(R.string.module_och_offer_intersection_holographic_image) AIAssist.getInstance(mContext).speakTTSVoiceWithLevel(disStr, AIAssist.NEW_LEVEL_2) } CallerServicesEventManager.updateServicesNum(CallerServicesEventManager.ServiceType.ROAD) diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/weaknet/passenger/model/TicketModel.kt b/OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/weaknet/passenger/model/TicketModel.kt index 3c27d22f9a..beebff8300 100644 --- a/OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/weaknet/passenger/model/TicketModel.kt +++ b/OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/weaknet/passenger/model/TicketModel.kt @@ -4,6 +4,7 @@ import android.annotation.SuppressLint import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_BUS_P import com.mogo.eagle.core.utilcode.util.GsonUtils +import com.mogo.eagle.core.utilcode.util.StringUtils import com.mogo.och.common.module.biz.scanner.QrBean import com.mogo.och.common.module.biz.scanner.ScannerManager import com.mogo.och.common.module.manager.bluetooth.BleManager @@ -16,6 +17,7 @@ import com.mogo.och.common.module.manager.socket.lan.bean.DPMsgType import com.mogo.och.common.module.manager.socket.lan.bean.WriteOffDetialMsg import com.mogo.och.common.module.manager.socket.lan.bean.WriteOffResultMsg import com.mogo.och.common.module.utils.RxUtils +import com.mogo.och.shuttle.weaknet.passenger.R object TicketModel : StateChangeListener { @@ -106,7 +108,8 @@ object TicketModel : StateChangeListener { e.printStackTrace() CallerLogger.d(M_BUS_P + TAG, "") // 通知司机屏二维码错误 - val writeOffDetail = WriteOffDetialMsg(code = 3001, msg = "出示错误二维码") +// val writeOffDetail = WriteOffDetialMsg(code = 3001, msg = "出示错误二维码") + val writeOffDetail = WriteOffDetialMsg(code = 3001, msg = StringUtils.getString(R.string.module_och_qr_code_error)) OchChainLogManager.writeChainLogWriteOff("核销失败","二维码错误+参数错误") CallerLogger.d(M_BUS_P + TAG, "sendTaskDetailsToClients = " + GsonUtils.toJson(writeOffDetail)) LanSocketManager.sendMsgToServer(writeOffDetail) diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b1/layout/shuttle_p_weak_jl_route_fragment.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b1/layout/shuttle_p_weak_jl_route_fragment.xml index 5a6800f3b2..a631954ecd 100644 --- a/OCH/shuttle/passenger_weaknet/src/main/res/b1/layout/shuttle_p_weak_jl_route_fragment.xml +++ b/OCH/shuttle/passenger_weaknet/src/main/res/b1/layout/shuttle_p_weak_jl_route_fragment.xml @@ -142,14 +142,15 @@ app:layout_constraintBottom_toBottomOf="@+id/bus_p_speed_tv" app:layout_constraintLeft_toRightOf="@+id/dividing_line_1" app:layout_constraintTop_toTopOf="@+id/bus_p_speed_tv" /> - + + 0) { if (meters / 1000 < 1) { - disUnit = "米" +// disUnit = "米" + disUnit = StringUtils.getString(R.string.module_och_m) dis = meters.toFloat().roundToInt().toString() } else { - disUnit = "公里" +// disUnit = "公里" + disUnit = StringUtils.getString(R.string.module_och_km) dis = NumberFormatUtil.formatLong(meters.toDouble() / 1000) } } @@ -36,13 +41,16 @@ object TaskUtils { */ fun getCurrentTaskTripHtml(meters: Long, timeInSecond: Long): Spanned { var dis = "0" - var disUnit = "公里" +// var disUnit = "公里" + var disUnit = StringUtils.getString(R.string.module_och_km) if (meters > 0) { if (meters / 1000 < 1) { - disUnit = "米" +// disUnit = "米" + disUnit = StringUtils.getString(R.string.module_och_m) dis = meters.toFloat().roundToInt().toString() } else { - disUnit = "公里" +// disUnit = "公里" + disUnit = StringUtils.getString(R.string.module_och_km) dis = NumberFormatUtil.formatLong(meters.toDouble() / 1000) } } diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/aiview/data/RoadCrossRoamViewModel.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/aiview/data/RoadCrossRoamViewModel.kt index 42d69ab717..ae761836f3 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/aiview/data/RoadCrossRoamViewModel.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/aiview/data/RoadCrossRoamViewModel.kt @@ -12,6 +12,7 @@ import com.mogo.eagle.core.function.call.map.CallerMapIdentifyManager import com.mogo.eagle.core.function.call.map.CallerMapRoadListenerManager import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger +import com.mogo.eagle.core.utilcode.util.StringUtils import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.och.unmanned.passenger.ui.aiview.AIMessageManager import com.mogo.och.unmanned.passenger.ui.aiview.bean.AIMessage @@ -65,7 +66,8 @@ class RoadCrossRoamViewModel: ViewModel(), IMoGoMapRoadListener { return } if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)){ - val disStr = "为您提供路口全息影像，助力出行" +// val disStr = "为您提供路口全息影像，助力出行" + val disStr = StringUtils.getString(R.string.module_och_offer_intersection_holographic_image) AIAssist.getInstance(mContext).speakTTSVoiceWithLevel(disStr, AIAssist.NEW_LEVEL_2) } CallerServicesEventManager.updateServicesNum(CallerServicesEventManager.ServiceType.ROAD) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/exploration/AutomaticExplorationView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/exploration/AutomaticExplorationView.kt index e63f893d62..1b682a682e 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/exploration/AutomaticExplorationView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/exploration/AutomaticExplorationView.kt @@ -25,6 +25,7 @@ import com.mogo.eagle.core.function.call.hmi.CallerHmiViewControlListenerManager import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxListenerManager import com.mogo.eagle.core.function.hmi.R import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils +import com.mogo.eagle.core.utilcode.util.StringUtils import com.mogo.eagle.core.utilcode.util.ThreadUtils @@ -137,13 +138,20 @@ open class AutomaticExplorationView @JvmOverloads constructor( private fun initData() { val dataList = ArrayList(7) - dataList.add(AutoExplorationEntity("当前道路事件分析",2000L,false)) - dataList.add(AutoExplorationEntity("前方车辆",2000L,false)) - dataList.add(AutoExplorationEntity("两侧车辆",2600L,false)) - dataList.add(AutoExplorationEntity("后方车辆",3000L,false)) - dataList.add(AutoExplorationEntity("前方路口车辆流速分析",4000L,false)) - dataList.add(AutoExplorationEntity("前方路口行人/非机动车分析",4300L,false)) - dataList.add(AutoExplorationEntity("路侧视频分析",5000L,false)) +// dataList.add(AutoExplorationEntity("当前道路事件分析",2000L,false)) + dataList.add(AutoExplorationEntity(StringUtils.getString(R.string.module_och_crossing_event_analyse),2000L,false)) +// dataList.add(AutoExplorationEntity("前方车辆",2000L,false)) + dataList.add(AutoExplorationEntity(StringUtils.getString(R.string.module_och_vehicle_ahead),2000L,false)) +// dataList.add(AutoExplorationEntity("两侧车辆",2600L,false)) + dataList.add(AutoExplorationEntity(StringUtils.getString(R.string.module_och_vehicle_both_sides),2600L,false)) +// dataList.add(AutoExplorationEntity("后方车辆",3000L,false)) + dataList.add(AutoExplorationEntity(StringUtils.getString(R.string.module_och_vehicle_behind),3000L,false)) +// dataList.add(AutoExplorationEntity("前方路口车辆流速分析",4000L,false)) + dataList.add(AutoExplorationEntity(StringUtils.getString(R.string.module_och_analysis_vehicle_flow_ahead),4000L,false)) +// dataList.add(AutoExplorationEntity("前方路口行人/非机动车分析",4300L,false)) + dataList.add(AutoExplorationEntity(StringUtils.getString(R.string.module_och_pedestrians_ahead),4300L,false)) +// dataList.add(AutoExplorationEntity("路侧视频分析",5000L,false)) + dataList.add(AutoExplorationEntity(StringUtils.getString(R.string.module_och_sidewalk_video_analysis),5000L,false)) automaticExplorationAdapter?.setListener(object: AutomaticExplorationAdapter.CompleteListener{ override fun onComplete(entity: AutoExplorationEntity) { var allComplete = true //所有探查项目都探查完毕 diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/RoadCrossRoamListAdapter.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/RoadCrossRoamListAdapter.kt index 4e2e1a0516..8f6d48b478 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/RoadCrossRoamListAdapter.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/RoadCrossRoamListAdapter.kt @@ -9,6 +9,7 @@ import android.widget.ProgressBar import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.mogo.eagle.core.function.map.R +import com.mogo.eagle.core.utilcode.util.StringUtils import kotlin.random.Random @@ -17,13 +18,19 @@ class RoadCrossRoamListAdapter(private val mContext: Context, private val lightM private val items: MutableList = mutableListOf() init { - items.add("前方路况拥堵分析") - items.add("路口危险车辆分析") - items.add("路口交通事故分析") - items.add("路口行人碰撞分析") +// items.add("前方路况拥堵分析") + items.add(StringUtils.getString(R.string.module_och_analysis_traffic_conditions_ahead)) +// items.add("路口危险车辆分析") + items.add(StringUtils.getString(R.string.module_och_analysis_dangerous_vehicles_intersections)) +// items.add("路口交通事故分析") + items.add(StringUtils.getString(R.string.module_och_analysis_roadside_traffic_accidents)) +// items.add("路口行人碰撞分析") + items.add(StringUtils.getString(R.string.module_och_analysis_pedestrian_collisions_crossroads)) if(lightMode){ - items.add("路口非机动车分析") - items.add("路口灯态分析") +// items.add("路口非机动车分析") + items.add(StringUtils.getString(R.string.module_och_analysis_non_motorized_vehicles_intersections)) +// items.add("路口灯态分析") + items.add(StringUtils.getString(R.string.module_och_analysis_intersection_signal_status)) } } diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/RoadCrossRoamView.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/RoadCrossRoamView.kt index be590717ac..6b8e297c0a 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/RoadCrossRoamView.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/RoadCrossRoamView.kt @@ -30,6 +30,7 @@ import com.mogo.eagle.core.function.map.R import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_MAP +import com.mogo.eagle.core.utilcode.util.StringUtils import com.mogo.eagle.core.utilcode.util.ThreadUtils import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.skin.utils.SkinResources @@ -238,7 +239,8 @@ class RoadCrossRoamView @JvmOverloads constructor( // SkinResources.getInstance().getString(R.string.operation_platform_name) // }为您提供路口全息影像，助力出行" // } - val disStr = "为您提供路口全息影像，助力出行" +// val disStr = "为您提供路口全息影像，助力出行" + val disStr = StringUtils.getString(R.string.module_och_offer_intersection_holographic_image) AIAssist.getInstance(context).speakTTSVoiceWithLevel(disStr, AIAssist.NEW_LEVEL_2) } CallerHmiViewControlListenerManager.invokeV2XEvent(View.VISIBLE, TAG) 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 4b3a00cf09..53c08765de 100644 --- a/core/mogo-core-res/src/main/res/values/string.xml +++ b/core/mogo-core-res/src/main/res/values/string.xml @@ -260,6 +260,29 @@ 网络异常，请重试 请开启车机定位后重试 网络异常，请稍后重试 + 公里 + 米 + 分钟 + 版本： + 路口车龙 + 前方路口有车龙 + %d站 + 当前道路事件分析 + 前方车辆 + 两侧车辆 + 后方车辆 + 前方路口车辆流速分析 + 前方路口行人 + 路侧视频分析 + 前方路况拥堵分析 + 路口危险车辆分析 + 路口交通事故分析 + 路口行人碰撞分析 + 路口非机动车分析 + 路口灯态分析 + 为您提供路口全息影像，助力出行 + 出示错误二维码 + yyyy年MM月dd日 PadTTS 模块初始化异常 From 97eba6e368d404363e033033fb070c4da830a76a Mon Sep 17 00:00:00 2001 From: xinfengkun Date: Mon, 17 Nov 2025 14:04:12 +0800 Subject: [PATCH 09/33] =?UTF-8?q?[8.2.8][i18n]=20=E6=8E=A5=E9=A9=B3?= =?UTF-8?q?=E5=8F=B8=E6=9C=BA=E5=B1=8F=20=E4=B8=AD=E6=96=87=E6=8A=BD?= =?UTF-8?q?=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/runing/other/TaskRunningView.kt | 31 +++++++---- .../routing/layout/biz_other_running_item.xml | 4 +- .../repository/db/repository/TaskSiteDb.kt | 11 ++-- .../offline/ui/taskrunning/TaskRunningView.kt | 13 +++-- .../och/offline/util/ShuttleVoiceManager.kt | 7 ++- .../main/res/layout/offline_switch_line.xml | 3 +- .../res/layout/offline_task_running_item.xml | 4 +- .../mogo/och/weaknet/model/ThirdDeviceData.kt | 3 +- .../com/mogo/och/weaknet/model/TicketModel.kt | 41 +++++++++----- .../repository/db/repository/TaskDb.kt | 4 +- .../repository/db/repository/TaskSiteDb.kt | 14 +++-- .../repository/line/impl/NormalRepository.kt | 11 ++-- .../repository/line/impl/WeaknetRepository.kt | 10 ++-- .../writeoff/impl/WriteOffCacheRepository.kt | 53 +++++++++++++------ .../impl/WriteOffNormallRepository.kt | 11 ++-- .../weaknet/ui/fragment/ShuttleFragment.kt | 4 +- .../weaknet/ui/switchtask/SwitchTaskView.kt | 10 ++-- .../ui/taskrunned/RunningTaskAdapter.kt | 4 +- .../ui/taskrunned/RunningTaskManagerView.kt | 3 +- .../weaknet/ui/taskrunning/TaskRunningView.kt | 13 +++-- .../och/weaknet/util/ShuttleVoiceManager.kt | 10 ++-- .../res/layout/shuttle_wadk_task_running.xml | 7 +-- ...shuttle_weak_running_station_list_item.xml | 4 +- .../res/layout/shuttle_weak_switch_line.xml | 4 +- .../res/layout/shuttle_weak_switch_task.xml | 3 +- .../src/main/res/values/strings.xml | 2 + .../src/main/res/values/string.xml | 51 ++++++++++++++++++ 27 files changed, 245 insertions(+), 90 deletions(-) diff --git a/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/runing/other/TaskRunningView.kt b/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/runing/other/TaskRunningView.kt index efed469940..0249e9acc6 100644 --- a/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/runing/other/TaskRunningView.kt +++ b/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/runing/other/TaskRunningView.kt @@ -9,6 +9,7 @@ import androidx.lifecycle.findViewTreeViewModelStoreOwner import com.mogo.eagle.core.utilcode.kotlin.onClick import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_OCHCOMMON +import com.mogo.eagle.core.utilcode.util.StringUtils import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.och.biz.R import com.mogo.och.biz.routing.RoutingServiceManager @@ -86,18 +87,21 @@ class TaskRunningView : ConstraintLayout, TaskRunningModel.SwtichLineViewCallbac if (TaskRunningModel.currentIndex == mAdapter.mData.size-2) { LineManager.getStations { start, end -> if (viewModel?.arrivedStation == true && start.isLeaving) { - aciv_task_leave_station_slide_bg.setTextValue("单程结束") +// aciv_task_leave_station_slide_bg.setTextValue("单程结束") + aciv_task_leave_station_slide_bg.setTextValue(StringUtils.getString(R.string.module_och_one_way_completion)) aciv_task_leave_station_slide_bg.reset() viewModel?.data?.taskId?.let { showFeedbackDialog(it) } }else{ - aciv_task_leave_station_slide_bg.setTextValue("滑动出发") +// aciv_task_leave_station_slide_bg.setTextValue("滑动出发") + aciv_task_leave_station_slide_bg.setTextValue(StringUtils.getString(R.string.module_och_slide_moving)) viewModel?.leaveStation() } } } else { - aciv_task_leave_station_slide_bg.setTextValue("滑动出发") +// aciv_task_leave_station_slide_bg.setTextValue("滑动出发") + aciv_task_leave_station_slide_bg.setTextValue(StringUtils.getString(R.string.module_och_slide_moving)) viewModel?.leaveStation() } @@ -196,7 +200,8 @@ class TaskRunningView : ConstraintLayout, TaskRunningModel.SwtichLineViewCallbac bus_task_running_line_name.setText(data.grayLineBean.lineName) actv_running_task_last_station.text = "往${data.stationList.last().name ?: ""}" mAdapter.setDataList(data.stationList) - aciv_task_leave_station_slide_bg.setTextValue("滑动出发") +// aciv_task_leave_station_slide_bg.setTextValue("滑动出发") + aciv_task_leave_station_slide_bg.setTextValue(StringUtils.getString(R.string.module_och_slide_moving)) showLeaveStationView() } @@ -211,14 +216,17 @@ class TaskRunningView : ConstraintLayout, TaskRunningModel.SwtichLineViewCallbac if (TaskRunningModel.currentIndex == mAdapter.mData.size-2) { LineManager.getStations { start, end -> if(start.isLeaving){ - aciv_task_leave_station_slide_bg.setTextValue("单程结束") +// aciv_task_leave_station_slide_bg.setTextValue("单程结束") + aciv_task_leave_station_slide_bg.setTextValue(StringUtils.getString(R.string.module_och_one_way_completion)) }else{ - aciv_task_leave_station_slide_bg.setTextValue("滑动出发") +// aciv_task_leave_station_slide_bg.setTextValue("滑动出发") + aciv_task_leave_station_slide_bg.setTextValue(StringUtils.getString(R.string.module_och_slide_moving)) } } } else { - aciv_task_leave_station_slide_bg.setTextValue("滑动出发") +// aciv_task_leave_station_slide_bg.setTextValue("滑动出发") + aciv_task_leave_station_slide_bg.setTextValue(StringUtils.getString(R.string.module_och_slide_moving)) } } @@ -245,7 +253,8 @@ class TaskRunningView : ConstraintLayout, TaskRunningModel.SwtichLineViewCallbac } override fun showCompleteTask() { - aciv_task_leave_station_slide_bg.setTextValue("单程结束") +// aciv_task_leave_station_slide_bg.setTextValue("单程结束") + aciv_task_leave_station_slide_bg.setTextValue(StringUtils.getString(R.string.module_och_one_way_completion)) } override fun notifyItemChange(currentIndex: Int) { @@ -254,9 +263,11 @@ class TaskRunningView : ConstraintLayout, TaskRunningModel.SwtichLineViewCallbac override fun clearData() { bus_task_running_line_name.setText("--") - actv_running_task_last_station.text = "往--" +// actv_running_task_last_station.text = "往--" + actv_running_task_last_station.text = StringUtils.getString(R.string.module_och_go1) mAdapter.setDataList(mutableListOf()) - aciv_task_leave_station_slide_bg.setTextValue("滑动出发") +// aciv_task_leave_station_slide_bg.setTextValue("滑动出发") + aciv_task_leave_station_slide_bg.setTextValue(StringUtils.getString(R.string.module_och_slide_moving)) showLeaveStationView() } } diff --git a/OCH/common/biz/src/main/res/routing/layout/biz_other_running_item.xml b/OCH/common/biz/src/main/res/routing/layout/biz_other_running_item.xml index a91872fcb4..1c1a26697b 100644 --- a/OCH/common/biz/src/main/res/routing/layout/biz_other_running_item.xml +++ b/OCH/common/biz/src/main/res/routing/layout/biz_other_running_item.xml @@ -67,13 +67,13 @@ android:layout_marginStart="@dimen/dp_36" android:layout_marginEnd="@dimen/dp_36" app:layout_constraintEnd_toEndOf="parent" - android:text="天安门天安门天安门…" android:singleLine="true" android:textColor="@color/white" android:ellipsize="end" android:textSize="@dimen/dp_45" android:layout_width="0dp" - android:layout_height="wrap_content"/> + android:layout_height="wrap_content" + tools:text="天安门天安门天安门…"/> \ No newline at end of file diff --git a/OCH/offline/driver/src/main/java/com/mogo/och/offline/repository/db/repository/TaskSiteDb.kt b/OCH/offline/driver/src/main/java/com/mogo/och/offline/repository/db/repository/TaskSiteDb.kt index 11c88bf774..3c60549e2a 100644 --- a/OCH/offline/driver/src/main/java/com/mogo/och/offline/repository/db/repository/TaskSiteDb.kt +++ b/OCH/offline/driver/src/main/java/com/mogo/och/offline/repository/db/repository/TaskSiteDb.kt @@ -2,10 +2,12 @@ package com.mogo.och.offline.repository.db.repository import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_OFFLINE +import com.mogo.eagle.core.utilcode.util.StringUtils import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager import com.mogo.och.common.module.manager.loop.BizLoopManager import com.mogo.och.offline.repository.db.bean.LineDataBean import com.mogo.och.data.db.exception.DbException +import com.mogo.och.offline.R import com.mogo.och.offline.repository.db.IDbRepository import com.mogo.och.offline.repository.db.MyDataBase import com.mogo.och.offline.repository.db.bean.TaskSiteDataBean @@ -39,7 +41,8 @@ object TaskSiteDb : IDbRepository { var startTime = System.currentTimeMillis() val querySites = SiteDb.querySiteByLineId(linId)?.distinctBy { it.siteId } if (querySites.isNullOrEmpty()) { - throw DbException(DbException.NEEDSYNDATA,"没有站点数据") +// throw DbException(DbException.NEEDSYNDATA,"没有站点数据") + throw DbException(DbException.NEEDSYNDATA, StringUtils.getString(R.string.module_och_no_station_data)) } CallerLogger.d(TAG, "查询站点用时:${System.currentTimeMillis() - startTime}") startTime = System.currentTimeMillis() @@ -50,7 +53,8 @@ object TaskSiteDb : IDbRepository { ) CallerLogger.d(TAG, "数据转换用时:${System.currentTimeMillis() - startTime}") if (toTaskSiteDatas.size < 2) { - throw DbException(DbException.NEEDSYNDATA,"站点数据不全请稍后再试") +// throw DbException(DbException.NEEDSYNDATA,"站点数据不全请稍后再试") + throw DbException(DbException.NEEDSYNDATA,StringUtils.getString(R.string.module_och_station_data_incomplete)) } // 把线路所有的站点搬迁到运行中表格中 startTime = System.currentTimeMillis() @@ -123,7 +127,8 @@ object TaskSiteDb : IDbRepository { // 获取线路的站点 val querySites = SiteDb.querySiteByLineId(lineInfo.lineId!!)?.distinctBy { it.siteId } if (querySites.isNullOrEmpty()) { - throw DbException(DbException.NEEDSYNDATA,"没有站点数据") +// throw DbException(DbException.NEEDSYNDATA,"没有站点数据") + throw DbException(DbException.NEEDSYNDATA,StringUtils.getString(R.string.module_och_no_station_data)) } // val toTaskSiteDatas = TaskSiteDataBean.toTaskSiteDatas( // querySites, diff --git a/OCH/offline/driver/src/main/java/com/mogo/och/offline/ui/taskrunning/TaskRunningView.kt b/OCH/offline/driver/src/main/java/com/mogo/och/offline/ui/taskrunning/TaskRunningView.kt index 1f6f5783f1..5219592c94 100644 --- a/OCH/offline/driver/src/main/java/com/mogo/och/offline/ui/taskrunning/TaskRunningView.kt +++ b/OCH/offline/driver/src/main/java/com/mogo/och/offline/ui/taskrunning/TaskRunningView.kt @@ -9,6 +9,7 @@ import androidx.lifecycle.findViewTreeViewModelStoreOwner import com.mogo.eagle.core.utilcode.kotlin.onClick import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_OFFLINE +import com.mogo.eagle.core.utilcode.util.StringUtils import com.mogo.och.bridge.autopilot.line.LineManager import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager import com.mogo.och.common.module.utils.ResourcesUtils @@ -118,9 +119,11 @@ class TaskRunningView : ConstraintLayout, TaskRunningModel.SwtichLineViewCallbac LineManager.getLineInfo { lineInfo -> bus_task_running_line_name.text = lineInfo.lineName } - actv_running_task_time.text = "班次:${LineModel.getTaskTime()}" +// actv_running_task_time.text = "班次:${LineModel.getTaskTime()}" + actv_running_task_time.text = "${StringUtils.getString(R.string.module_och_classes)}${LineModel.getTaskTime()}" LineModel.stationList?.takeIf { it.size >= 2 }?.let { - actv_running_task_last_station.text = "往${it.last().name ?: ""}" +// actv_running_task_last_station.text = "往${it.last().name ?: ""}" + actv_running_task_last_station.text = "${StringUtils.getString(R.string.module_och_go)}${it.last().name ?: ""}" mAdapter.setDataList(it) CallerLogger.d( TAG, @@ -133,9 +136,11 @@ class TaskRunningView : ConstraintLayout, TaskRunningModel.SwtichLineViewCallbac showLeaveStationView() } if (LineModel.startStationIndex == it.size - 1) { - aciv_task_leave_station_slide_bg.setTextValue("单程结束") +// aciv_task_leave_station_slide_bg.setTextValue("单程结束") + aciv_task_leave_station_slide_bg.setTextValue(StringUtils.getString(R.string.module_och_one_way_completion)) } else { - aciv_task_leave_station_slide_bg.setTextValue("滑动出发") +// aciv_task_leave_station_slide_bg.setTextValue("滑动出发") + aciv_task_leave_station_slide_bg.setTextValue(StringUtils.getString(R.string.module_och_slide_moving)) } } } diff --git a/OCH/offline/driver/src/main/java/com/mogo/och/offline/util/ShuttleVoiceManager.kt b/OCH/offline/driver/src/main/java/com/mogo/och/offline/util/ShuttleVoiceManager.kt index 30d2e4645f..e231537c68 100644 --- a/OCH/offline/driver/src/main/java/com/mogo/och/offline/util/ShuttleVoiceManager.kt +++ b/OCH/offline/driver/src/main/java/com/mogo/och/offline/util/ShuttleVoiceManager.kt @@ -4,6 +4,7 @@ import com.mogo.commons.AbsMogoApplication import com.mogo.commons.voice.AIAssist 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.och.common.module.manager.socket.lan.LanSocketManager import com.mogo.och.common.module.manager.socket.lan.bean.AppConnectMsg import com.mogo.och.common.module.utils.ResourcesUtils @@ -132,10 +133,12 @@ object ShuttleVoiceManager { fun writeOffCount(successNum:Int){ if(successNum<=1){ - VoiceNotice.showNotice("核验通过", AIAssist.LEVEL3) +// VoiceNotice.showNotice("核验通过", AIAssist.LEVEL3) + VoiceNotice.showNotice(StringUtils.getString(R.string.module_och_verification_successful), AIAssist.LEVEL3) //sendWriteOffNumToClient("核验通过") }else{ - VoiceNotice.showNotice("$successNum 人核验通过", AIAssist.LEVEL3) +// VoiceNotice.showNotice("$successNum 人核验通过", AIAssist.LEVEL3) + VoiceNotice.showNotice(StringUtils.getString(R.string.module_och_verification_successful1, successNum), AIAssist.LEVEL3) //sendWriteOffNumToClient("$successNum 人核验通过") } } diff --git a/OCH/offline/driver/src/main/res/layout/offline_switch_line.xml b/OCH/offline/driver/src/main/res/layout/offline_switch_line.xml index 5937445bff..343c5a8fb7 100644 --- a/OCH/offline/driver/src/main/res/layout/offline_switch_line.xml +++ b/OCH/offline/driver/src/main/res/layout/offline_switch_line.xml @@ -50,12 +50,13 @@ app:layout_constraintBottom_toBottomOf="parent" android:layout_marginTop="@dimen/dp_22" /> + + android:layout_height="wrap_content" + tools:text="天安门天安门天安门…"/> \ No newline at end of file diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/ThirdDeviceData.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/ThirdDeviceData.kt index bef73ee15a..86887ea2cf 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/ThirdDeviceData.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/ThirdDeviceData.kt @@ -50,7 +50,8 @@ object ThirdDeviceData { end.isPlayTts = true if (StringUtils.isEmpty(end.introduction)) { if(!StringUtils.isEmpty(end.name)){ - val message = "前方到站:${end.name}，请下车的乘客做好准备" +// val message = "前方到站:${end.name}，请下车的乘客做好准备" + val message = StringUtils.getString(R.string.module_och_next_station, end.name) ShuttleVoiceManager.leave200Distance(message) } }else{ diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/TicketModel.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/TicketModel.kt index fd4f60ebfd..ad458081ae 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/TicketModel.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/TicketModel.kt @@ -13,6 +13,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.i import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_BUS import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_BUS_P +import com.mogo.eagle.core.utilcode.util.StringUtils import com.mogo.och.bridge.autopilot.line.LineManager import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager import com.mogo.och.common.module.manager.loop.BizLoopManager @@ -25,6 +26,7 @@ import com.mogo.och.common.module.manager.socket.lan.bean.DPMsgType import com.mogo.och.common.module.manager.socket.lan.bean.WriteOffDetialMsg import com.mogo.och.common.module.manager.socket.lan.bean.WriteOffResultMsg import com.mogo.och.common.module.utils.OchPhoneUtil +import com.mogo.och.shuttle.weaknet.R import com.mogo.och.weaknet.bean.WriteOffPassenger import com.mogo.och.weaknet.repository.RepositoryManager import com.mogo.och.weaknet.repository.exception.DataException @@ -212,16 +214,26 @@ object TicketModel { */ private fun parseData(code:Int,msg:String,phone: String,orderNo: String){ when (code) { - 1009 -> sendMessage2Driver("乘车日期非今日", phone,1009,orderNo) - 1005 -> sendMessage2Driver("当前无路线任务", phone,1005,orderNo) - 1006 -> sendMessage2Driver("车票非当前路线", phone,1006,orderNo) - 1008 -> sendMessage2Driver("车票无剩余可用次数", phone,99,orderNo) - 6001 -> sendMessage2Driver("二维码已过期", phone,6001,orderNo) - 6002 -> sendMessage2Driver("同一订单核销间隔时间需大于2分钟", phone,6002,orderNo) - 6003 -> sendMessage2Driver("车票非当前站点", phone,6003,orderNo) - 6004 -> sendMessage2Driver("车辆未执行任务", phone,6004,orderNo) - 6005 -> sendMessage2Driver("车票非当前班次", phone,6005,orderNo) - 1012 -> sendMessage2Driver("车票与车辆所属租户不一致", phone,1012,orderNo) +// 1009 -> sendMessage2Driver("乘车日期非今日", phone,1009,orderNo) + 1009 -> sendMessage2Driver(StringUtils.getString(R.string.module_och_travel_date_not_today), phone,1009,orderNo) +// 1005 -> sendMessage2Driver("当前无路线任务", phone,1005,orderNo) + 1005 -> sendMessage2Driver(StringUtils.getString(R.string.module_och_there_are_no_route_tasks), phone,1005,orderNo) +// 1006 -> sendMessage2Driver("车票非当前路线", phone,1006,orderNo) + 1006 -> sendMessage2Driver(StringUtils.getString(R.string.module_och_ticket_not_current_route), phone,1006,orderNo) +// 1008 -> sendMessage2Driver("车票无剩余可用次数", phone,99,orderNo) + 1008 -> sendMessage2Driver(StringUtils.getString(R.string.module_och_ticket_has_no_remaining_valid_rides_available), phone,99,orderNo) +// 6001 -> sendMessage2Driver("二维码已过期", phone,6001,orderNo) + 6001 -> sendMessage2Driver(StringUtils.getString(R.string.module_och_qr_code_expired), phone,6001,orderNo) +// 6002 -> sendMessage2Driver("同一订单核销间隔时间需大于2分钟", phone,6002,orderNo) + 6002 -> sendMessage2Driver(StringUtils.getString(R.string.module_och_interval_canceling_same_order_too_short), phone,6002,orderNo) +// 6003 -> sendMessage2Driver("车票非当前站点", phone,6003,orderNo) + 6003 -> sendMessage2Driver(StringUtils.getString(R.string.module_och_ticket_not_valid_for_current_station), phone,6003,orderNo) +// 6004 -> sendMessage2Driver("车辆未执行任务", phone,6004,orderNo) + 6004 -> sendMessage2Driver(StringUtils.getString(R.string.module_och_vehicle_not_duty), phone,6004,orderNo) +// 6005 -> sendMessage2Driver("车票非当前班次", phone,6005,orderNo) + 6005 -> sendMessage2Driver(StringUtils.getString(R.string.module_och_ticket_not_for_current_train), phone,6005,orderNo) +// 1012 -> sendMessage2Driver("车票与车辆所属租户不一致", phone,1012,orderNo) + 1012 -> sendMessage2Driver(StringUtils.getString(R.string.module_och_ticket_does_not_match_tenant_who_owns_vehicle), phone,1012,orderNo) else -> { try { val tempcode=msg.toInt() @@ -242,14 +254,16 @@ object TicketModel { private fun sendMessage2Driver(message:String,phone:String,code:Int,orderNo: String){ // 发送乘客屏 通过蓝牙告知小程序 LanSocketManager.sendMsgToClient(WriteOffResultMsg(code, phone,orderNo, System.currentTimeMillis(),LineManager.lineInfos?.lineId?:0,LineManager.getStations()?.first?.siteId?.toLong()?:0L)) - val failedReason = "核销失败，${message}" +// val failedReason = "核销失败，${message}" + val failedReason = StringUtils.getString(R.string.module_och_recognition_failed, message) // tts ShuttleVoiceManager.writeOffFaile(failedReason) val tempPhone = OchPhoneUtil.getPhoneWithoutMiddle(phone) val reaseonAndPhone = if(tempPhone.isEmpty()) { failedReason }else{ - "${failedReason};乘客：${tempPhone}" +// "${failedReason};乘客：${tempPhone}" + "${failedReason}${StringUtils.getString(R.string.module_och_passenger)}${tempPhone}" } saveMsgBox( MsgBoxBean( @@ -295,7 +309,8 @@ object TicketModel { val phoneNumFix = tempPhone.substring(7) tempPhone = "$phoneNumPre****$phoneNumFix" } - val content = "${ticketSize}张 $ticketName $tempPhone" +// val content = "${ticketSize}张 $ticketName $tempPhone" + val content = "${ticketSize}${StringUtils.getString(R.string.module_och_piece)} $ticketName $tempPhone" saveMsgBox(MsgBoxBean( MsgBoxType.V2X, V2XMsg( diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/TaskDb.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/TaskDb.kt index 1d26006346..36396cfdbd 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/TaskDb.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/TaskDb.kt @@ -2,6 +2,7 @@ package com.mogo.och.weaknet.repository.db.repository import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_BUS +import com.mogo.eagle.core.utilcode.util.StringUtils import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager import com.mogo.och.common.module.manager.loop.BizLoopManager import com.mogo.och.common.module.utils.DateTimeUtil @@ -11,6 +12,7 @@ import com.mogo.och.weaknet.repository.db.MyDataBase import com.mogo.och.weaknet.repository.db.bean.TaskDataBean import com.mogo.och.weaknet.repository.db.dao.TaskDataDao import com.mogo.och.data.db.exception.DbException +import com.mogo.och.shuttle.weaknet.R import com.mogo.och.weaknet.repository.exception.DataException import io.reactivex.Observable @@ -136,7 +138,7 @@ object TaskDb : IDbRepository { updateCount?.let { if(it<=0){ // 插入失败 - return@flatMap Observable.error(DataException(DataException.startTaskErrorCode,"未插入数据")) + return@flatMap Observable.error(DataException(DataException.startTaskErrorCode,StringUtils.getString(R.string.module_och_no_data_inserted))) }else{ // 开始任务成功 return@flatMap Observable.just(true) diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/TaskSiteDb.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/TaskSiteDb.kt index a9b44148db..b17d30720c 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/TaskSiteDb.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/TaskSiteDb.kt @@ -2,6 +2,7 @@ package com.mogo.och.weaknet.repository.db.repository import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_BUS +import com.mogo.eagle.core.utilcode.util.StringUtils import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager import com.mogo.och.common.module.manager.loop.BizLoopManager import com.mogo.och.weaknet.repository.db.IDbRepository @@ -9,6 +10,7 @@ import com.mogo.och.weaknet.repository.db.MyDataBase import com.mogo.och.weaknet.repository.db.bean.TaskSiteDataBean import com.mogo.och.weaknet.repository.db.dao.TaskSiteDataDao import com.mogo.och.data.db.exception.DbException +import com.mogo.och.shuttle.weaknet.R import com.mogo.och.weaknet.repository.db.bean.LineDataBean object TaskSiteDb : IDbRepository { @@ -38,11 +40,13 @@ object TaskSiteDb : IDbRepository { // 获取线路的站点 val querySites = SiteDb.querySiteByLineId(linId)?.distinctBy { it.siteId }?.sortedBy { it.seq } if (querySites.isNullOrEmpty()) { - throw DbException(DbException.NEEDSYNDATA,"没有站点数据") +// throw DbException(DbException.NEEDSYNDATA,"没有站点数据") + throw DbException(DbException.NEEDSYNDATA,StringUtils.getString(R.string.module_och_no_station_data)) } querySites.forEachIndexed { index, siteDataBean -> if(index+1!=siteDataBean.seq){ - throw DbException(DbException.NEEDSYNDATA,"站点数据排序不对") +// throw DbException(DbException.NEEDSYNDATA,"站点数据排序不对") + throw DbException(DbException.NEEDSYNDATA,StringUtils.getString(R.string.module_och_station_data_order_incorrect)) } } val toTaskSiteDatas = TaskSiteDataBean.toTaskSiteDatas( @@ -52,7 +56,8 @@ object TaskSiteDb : IDbRepository { lineName ) if (toTaskSiteDatas.size < 2) { - throw DbException(DbException.NEEDSYNDATA,"站点数据不全请稍后再试") +// throw DbException(DbException.NEEDSYNDATA,"站点数据不全请稍后再试") + throw DbException(DbException.NEEDSYNDATA,StringUtils.getString(R.string.module_och_station_data_incomplete)) } // 把线路所有的站点搬迁到运行中表格中 val result = taskSiteDataDao?.insert(*toTaskSiteDatas.toTypedArray()) @@ -124,7 +129,8 @@ object TaskSiteDb : IDbRepository { // 获取线路的站点 val querySites = SiteDb.querySiteByLineId(lineInfo.lineId!!)?.distinctBy { it.siteId } if (querySites.isNullOrEmpty()) { - throw DbException(DbException.NEEDSYNDATA,"没有站点数据") +// throw DbException(DbException.NEEDSYNDATA,"没有站点数据") + throw DbException(DbException.NEEDSYNDATA,StringUtils.getString(R.string.module_och_no_station_data)) } val toTaskSiteDatas = TaskSiteDataBean.toTaskSiteDatas( querySites, diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/line/impl/NormalRepository.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/line/impl/NormalRepository.kt index 5a5ca1bc50..5f31dee35c 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/line/impl/NormalRepository.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/line/impl/NormalRepository.kt @@ -8,12 +8,14 @@ import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_BUS +import com.mogo.eagle.core.utilcode.util.StringUtils import com.mogo.och.bridge.autopilot.line.LineManager import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager import com.mogo.och.common.module.network.OchCommonServiceCallback import com.mogo.och.data.bean.BusStationBean import com.mogo.och.data.bean.ContraiInfo import com.mogo.och.data.bean.LineInfo +import com.mogo.och.shuttle.weaknet.R import com.mogo.och.weaknet.bean.request.ShuttleEventRequest import com.mogo.och.weaknet.bean.response.CarExecutableTaskResponse import com.mogo.och.weaknet.bean.response.PointResponse @@ -39,14 +41,17 @@ class NormalRepository: ILineRepository { when (ProjectUtils.getProjectType()) { Project.SAAS -> { if(AppIdentityModeUtils.isShuttle(FunctionBuildConfig.appIdentityMode)) { - throw NetException("非缓存weakNetInterface 初始化环境错误 isBus") +// throw NetException("非缓存weakNetInterface 初始化环境错误 isBus") + throw NetException(StringUtils.getString(R.string.module_och_init_env_error_bus)) }else if(AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)) { - throw NetException("非缓存weakNetInterface 初始化环境错误 isBus") +// throw NetException("非缓存weakNetInterface 初始化环境错误 isBus") + throw NetException(StringUtils.getString(R.string.module_och_init_env_error_bus)) } } Project.DALI -> { if(AppIdentityModeUtils.isShuttle(FunctionBuildConfig.appIdentityMode)) { - throw NetException("非缓存weakNetInterface 初始化环境错误 isBus") +// throw NetException("非缓存weakNetInterface 初始化环境错误 isBus") + throw NetException(StringUtils.getString(R.string.module_och_init_env_error_bus)) }else if(AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)) { field = DaliBusServiceManager } diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/line/impl/WeaknetRepository.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/line/impl/WeaknetRepository.kt index e673fbb11c..b064df810a 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/line/impl/WeaknetRepository.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/line/impl/WeaknetRepository.kt @@ -9,6 +9,7 @@ import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_BUS +import com.mogo.eagle.core.utilcode.util.StringUtils import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.och.bridge.autopilot.line.LineManager import com.mogo.och.common.module.biz.login.LoginStatusManager @@ -65,14 +66,17 @@ class WeaknetRepository : ILineRepository { if(AppIdentityModeUtils.isShuttle(FunctionBuildConfig.appIdentityMode)) { field = DaliShuttleServiceManager }else if(AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)) { - throw NetException("缓存weakNetInterface 初始化环境错误 isBus") +// throw NetException("缓存weakNetInterface 初始化环境错误 isBus") + throw NetException(StringUtils.getString(R.string.module_och_cache_init_env_error_bus)) } } Project.MOGO -> { - throw NetException("缓存weakNetInterface 初始化环境错误 MOGO") +// throw NetException("缓存weakNetInterface 初始化环境错误 MOGO") + throw NetException(StringUtils.getString(R.string.module_och_cache_init_env_error_mogo)) } else->{ - throw NetException("缓存weakNetInterface 初始化环境错误 未知") +// throw NetException("缓存weakNetInterface 初始化环境错误 未知") + throw NetException(StringUtils.getString(R.string.module_och_cache_init_env_error_unknown)) } } } diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/writeoff/impl/WriteOffCacheRepository.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/writeoff/impl/WriteOffCacheRepository.kt index 747f021a16..f0aef762ef 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/writeoff/impl/WriteOffCacheRepository.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/writeoff/impl/WriteOffCacheRepository.kt @@ -8,11 +8,13 @@ import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils import com.mogo.eagle.core.utilcode.mogo.Product import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_BUS +import com.mogo.eagle.core.utilcode.util.StringUtils import com.mogo.och.common.module.biz.login.LoginStatusManager import com.mogo.och.bridge.autopilot.line.LineManager import com.mogo.och.common.module.manager.cache.OchSPManager import com.mogo.och.common.module.manager.socket.lan.bean.WriteOffDetialMsg import com.mogo.och.common.module.utils.DateTimeUtil +import com.mogo.och.shuttle.weaknet.R import com.mogo.och.weaknet.bean.WaitUploadLine import com.mogo.och.weaknet.bean.WaitUploadTask import com.mogo.och.weaknet.bean.WriteOffPassenger @@ -46,13 +48,16 @@ class WriteOffCacheRepository : IWriteOffRepository { } } Project.DALI -> { - throw NetException("缓存weakNetInterface 初始化环境错误 Dali") +// throw NetException("缓存weakNetInterface 初始化环境错误 Dali") + throw NetException(StringUtils.getString(R.string.module_och_cache_init_env_error_dali)) } Project.MOGO -> { - throw NetException("缓存weakNetInterface 初始化环境错误 MOGO") +// throw NetException("缓存weakNetInterface 初始化环境错误 MOGO") + throw NetException(StringUtils.getString(R.string.module_och_cache_init_env_error_mogo)) } else->{ - throw NetException("缓存weakNetInterface 初始化环境错误 未知") +// throw NetException("缓存weakNetInterface 初始化环境错误 未知") + throw NetException(StringUtils.getString(R.string.module_och_cache_init_env_error_unknown)) } } } @@ -110,51 +115,61 @@ class WriteOffCacheRepository : IWriteOffRepository { if(LoginStatusManager.getOchCarInfo()?.tenantId==tenantId){ }else{ - throw DataException(1012,"当前用户下单路线非当前的车辆所属公司") +// throw DataException(1012,"当前用户下单路线非当前的车辆所属公司") + throw DataException(1012, StringUtils.getString(R.string.module_och_current_user_order_not_current_company)) } } // 2、校验project if(ProjectUtils.isSaas()){ if(it.pipe != WriteOffDataBean.saasXiaoChengXu){ - throw DataException(1012,"当前用户下单路线非当前的车辆所属公司") +// throw DataException(1012,"当前用户下单路线非当前的车辆所属公司") + throw DataException(1012, StringUtils.getString(R.string.module_och_current_user_order_not_current_company)) } }else if(ProjectUtils.isDali()){ if(it.pipe != WriteOffDataBean.daliXiaoChengXu){ - throw DataException(1012,"当前用户下单路线非当前的车辆所属公司") +// throw DataException(1012,"当前用户下单路线非当前的车辆所属公司") + throw DataException(1012, StringUtils.getString(R.string.module_och_current_user_order_not_current_company)) } } // 3、校验 bus和shuttle if (LoginStatusManager.getProductType()!=Product.valueOf(it.typeBiz)) { - throw DataException(1005,"车辆未登录、或没有任务") +// throw DataException(1005,"车辆未登录、或没有任务") + throw DataException(1005, StringUtils.getString(R.string.module_och_not_login_car)) } // 4 二维码1分钟失效 if(System.currentTimeMillis()-(it.expiryTime?:0L)>60_000){ - throw DataException(6001,"二维码已过期") +// throw DataException(6001,"二维码已过期") + throw DataException(6001, StringUtils.getString(R.string.module_och_qr_code_expires)) } // 5 校验乘车日期 if(!DateTimeUtil.isSameDay(System.currentTimeMillis(),it.bookingTime?:0)){ - throw DataException(1009,"车票所选乘车日期非今日") +// throw DataException(1009,"车票所选乘车日期非今日") + throw DataException(1009, StringUtils.getString(R.string.module_och_ticket_not_today)) } // 6、校验线路 if(LineManager.lineInfos==null||LineManager.lineInfos?.lineId==null){ - throw DataException(1005,"车辆未登录、或没有任务") +// throw DataException(1005,"车辆未登录、或没有任务") + throw DataException(1005, StringUtils.getString(R.string.module_och_not_login_car)) } if(it.lineId==LineManager.lineInfos?.lineId){ lineId = it.lineId }else{ - throw DataException(1006,"车票路线信息与当前车辆执行任务的路线信息不符合") +// throw DataException(1006,"车票路线信息与当前车辆执行任务的路线信息不符合") + throw DataException(1006, StringUtils.getString(R.string.module_och_ticket_line_current_car_line_inconformity)) } if (!it.orderNo.isNullOrEmpty()) { val lastWriteOff = WriteOffDb.queryWaitUpdateEventCount(it.orderNo!!) // 7、校验次数 if ((it.availableTimes ?: 0) <= (lastWriteOff?.size ?: 0)) { - throw DataException(1008, "车票剩余可用次数为0") +// throw DataException(1008, "车票剩余可用次数为0") + throw DataException(1008, StringUtils.getString(R.string.module_och_ticket_not_used)) } if (AppIdentityModeUtils.isShuttle(FunctionBuildConfig.appIdentityMode)) { // 8、同一个订单2分钟内只能核销一次 if (lastWriteOff != null && lastWriteOff.size > 0) { if (System.currentTimeMillis() - lastWriteOff.last().eventSaveTime <= 120_000) { - throw DataException(6002, "同一订单核销间隔时间需大于2分钟") +// throw DataException(6002, "同一订单核销间隔时间需大于2分钟") + throw DataException(6002, StringUtils.getString(R.string.module_och_interval_canceling_same_order_too_short)) } } @@ -166,7 +181,8 @@ class WriteOffCacheRepository : IWriteOffRepository { if (start?.siteId?.toLong() == it.startStationId) { siteId = it.startStationId } else { - throw DataException(6003, "车票站点信息与当前车辆执行任务的站点信息不符合") +// throw DataException(6003, "车票站点信息与当前车辆执行任务的站点信息不符合") + throw DataException(6003, StringUtils.getString(R.string.module_och_ticket_station_current_car_station_inconformity)) } } else if(AppIdentityModeUtils.isScheduled(FunctionBuildConfig.appIdentityMode)){ val (start, _) = LineManager.getStations() @@ -174,15 +190,18 @@ class WriteOffCacheRepository : IWriteOffRepository { // 8、校验起始站点 val task = LineModel.currentTask if(task==null){ - throw DataException(6004, "车辆未执行任务") +// throw DataException(6004, "车辆未执行任务") + throw DataException(6004, StringUtils.getString(R.string.module_och_vehicle_not_duty)) }else{ if (task.taskId!=it.shiftsId) { - throw DataException(6005, "车票站点信息与当前车辆执行任务信息不符合") +// throw DataException(6005, "车票站点信息与当前车辆执行任务信息不符合") + throw DataException(6005, StringUtils.getString(R.string.module_och_ticket_station_current_car_task_inconformity)) } } } } else { - throw DataException(11000, "缺少orderNo") +// throw DataException(11000, "缺少orderNo") + throw DataException(11000, StringUtils.getString(R.string.module_och_not_order_no)) } val addWrite = WriteOffDataBean() diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/writeoff/impl/WriteOffNormallRepository.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/writeoff/impl/WriteOffNormallRepository.kt index 1ce1ebd7a0..ba58e6184e 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/writeoff/impl/WriteOffNormallRepository.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/writeoff/impl/WriteOffNormallRepository.kt @@ -8,8 +8,10 @@ import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_BUS +import com.mogo.eagle.core.utilcode.util.StringUtils import com.mogo.och.common.module.manager.socket.lan.bean.WriteOffDetialMsg import com.mogo.och.common.module.network.OchCommonServiceCallback +import com.mogo.och.shuttle.weaknet.R import com.mogo.och.weaknet.bean.WaitUploadLine import com.mogo.och.weaknet.bean.WaitUploadTask import com.mogo.och.weaknet.bean.response.WriteOffCountResponse @@ -34,7 +36,8 @@ class WriteOffNormallRepository: IWriteOffRepository { if(field==null){ when (ProjectUtils.getProjectType()) { Project.SAAS -> { - throw NetException("writeoff 核销 初始化环境错误 SAAS") +// throw NetException("writeoff 核销 初始化环境错误 SAAS") + throw NetException(StringUtils.getString(R.string.module_och_verification_init_env_error_saas)) } Project.DALI -> { if(AppIdentityModeUtils.isShuttle(FunctionBuildConfig.appIdentityMode)) { @@ -44,10 +47,12 @@ class WriteOffNormallRepository: IWriteOffRepository { } } Project.MOGO -> { - throw NetException("writeoff 核销 初始化环境错误 MOGO") +// throw NetException("writeoff 核销 初始化环境错误 MOGO") + throw NetException(StringUtils.getString(R.string.module_och_verification_init_env_error_mogo)) } else->{ - throw NetException("writeoff 核销 初始化环境错误 未知") +// throw NetException("writeoff 核销 初始化环境错误 未知") + throw NetException(StringUtils.getString(R.string.module_och_verification_init_env_error_unknown)) } } } diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/fragment/ShuttleFragment.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/fragment/ShuttleFragment.kt index 2e952e14b6..ee8429b725 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/fragment/ShuttleFragment.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/fragment/ShuttleFragment.kt @@ -15,6 +15,7 @@ import com.mogo.eagle.core.function.call.och.CallerEagleBaseFunctionCall4OchMana import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_BUS +import com.mogo.eagle.core.utilcode.util.StringUtils import com.mogo.och.bridge.ui.drawline.LineView import com.mogo.och.shuttle.weaknet.R import com.mogo.och.weaknet.repository.RepositoryManager @@ -51,7 +52,8 @@ class ShuttleFragment : MvpFragment() { context?.let { if(RepositoryManager.supportDb()){ - CallerEagleBaseFunctionCall4OchManager.addSingleToolKitDefaultItem(runningTaskGateWay,"本地缓存任务", R.drawable.bus_running_task_history,4) +// CallerEagleBaseFunctionCall4OchManager.addSingleToolKitDefaultItem(runningTaskGateWay,"本地缓存任务", R.drawable.bus_running_task_history,4) + CallerEagleBaseFunctionCall4OchManager.addSingleToolKitDefaultItem(runningTaskGateWay,StringUtils.getString(R.string.module_och_local_cache_task), R.drawable.bus_running_task_history,4) CallerEagleBaseFunctionCall4OchManager.addToolKitDefaultItemClickListener(runningTaskGateWay,object : IToolKitItemClickListener{ override fun onItemClick(toolTag: String, ctx: Context?) { diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/switchtask/SwitchTaskView.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/switchtask/SwitchTaskView.kt index 28fb386729..ded5f351d3 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/switchtask/SwitchTaskView.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/switchtask/SwitchTaskView.kt @@ -9,6 +9,7 @@ import androidx.recyclerview.widget.GridLayoutManager import com.mogo.eagle.core.utilcode.kotlin.onClick import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_BUS +import com.mogo.eagle.core.utilcode.util.StringUtils import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.och.common.module.manager.loop.BizLoopManager import com.mogo.och.common.module.utils.ResourcesUtils @@ -117,7 +118,8 @@ class SwitchTaskView: WindowRelativeLayout, SwtichTaskModel.SwtichLineViewCallba d(TAG, "queryTaskByLineInfo 查询线路的任务线路id:${lineInfo}") viewModel?.queryBusLineTasksById(lineInfo) busLineName.text = lineInfo.lineName - actvLineEndStationName.text = "往${lineInfo.endStationName}方向" +// actvLineEndStationName.text = "往${lineInfo.endStationName}方向" + actvLineEndStationName.text = StringUtils.getString(R.string.module_och_leave_for, lineInfo.endStationName) } override fun showTaskByLineIdResult(taskList: MutableList?) { @@ -157,7 +159,8 @@ class SwitchTaskView: WindowRelativeLayout, SwtichTaskModel.SwtichLineViewCallba } override fun showErrorInfo() { - tv_error_msg.text = "发生错误点击重试" +// tv_error_msg.text = "发生错误点击重试" + tv_error_msg.text = StringUtils.getString(R.string.module_och_error_try_again) actv_submit_task.setTextColor(ResourcesUtils.getColor(R.color.bus_color_66666)) actv_submit_task.isEnabled = false include_error.visibility = VISIBLE @@ -173,7 +176,8 @@ class SwitchTaskView: WindowRelativeLayout, SwtichTaskModel.SwtichLineViewCallba override fun setCurrentTaskUsed(taskId: Long,plateNumber: String) { BizLoopManager.runInMainThread{ mAdapter.setCurrentTaskUsed(taskId) - tempData[taskId] = "该任务已被${plateNumber}使用" +// tempData[taskId] = "该任务已被${plateNumber}使用" + tempData[taskId] = StringUtils.getString(R.string.module_och_task_has_been_completed) } } diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/taskrunned/RunningTaskAdapter.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/taskrunned/RunningTaskAdapter.kt index 55f8ac57cc..d9f349bece 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/taskrunned/RunningTaskAdapter.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/taskrunned/RunningTaskAdapter.kt @@ -8,6 +8,7 @@ import android.widget.TextView import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.DiffUtil.Callback import androidx.recyclerview.widget.RecyclerView +import com.mogo.eagle.core.utilcode.util.StringUtils import com.mogo.eagle.core.utilcode.util.TimeUtils import com.mogo.och.shuttle.weaknet.R import com.mogo.och.weaknet.bean.WaitUploadLine @@ -42,7 +43,8 @@ class RunningTaskAdapter( override fun onBindViewHolder(holder: RunningTaskViewHolder, position: Int) { val currentPosition = holder.bindingAdapterPosition val lineTasks = dataList!![currentPosition] - val sb = StringBuilder().append("班次：") +// val sb = StringBuilder().append("班次：") + val sb = StringBuilder().append(StringUtils.getString(R.string.module_och_classes)) lineTasks.task.forEach { sb.append(TimeUtils.millis2String(it.taskStartTime, "HH:mm")) if(it.waitUploadWriteOff>0){ diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/taskrunned/RunningTaskManagerView.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/taskrunned/RunningTaskManagerView.kt index be9de0da6e..b029135e8e 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/taskrunned/RunningTaskManagerView.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/taskrunned/RunningTaskManagerView.kt @@ -133,7 +133,8 @@ class RunningTaskManagerView : WindowRelativeLayout, RunningTastViewModel.Runnin override fun showUpdating(isupload: Boolean) { if (isupload) { upload_btn_commit_progress.visibility = VISIBLE - upload_btn_commit_title.text = "上传中" +// upload_btn_commit_title.text = "上传中" + upload_btn_commit_title.text = ResourcesUtils.getString(R.string.bus_running_task_uploading) } else { upload_btn_commit_progress.visibility = GONE upload_btn_commit_title.text = diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/taskrunning/TaskRunningView.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/taskrunning/TaskRunningView.kt index 74e291bfd4..7652a19937 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/taskrunning/TaskRunningView.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/taskrunning/TaskRunningView.kt @@ -9,6 +9,7 @@ import androidx.lifecycle.findViewTreeViewModelStoreOwner import com.mogo.eagle.core.utilcode.kotlin.onClick import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_BUS +import com.mogo.eagle.core.utilcode.util.StringUtils import com.mogo.och.bridge.autopilot.line.LineManager import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager import com.mogo.och.common.module.utils.ResourcesUtils @@ -120,9 +121,11 @@ class TaskRunningView : ConstraintLayout, TaskRunningModel.SwtichLineViewCallbac LineManager.getLineInfo { lineInfo -> bus_task_running_line_name.text = lineInfo.lineName } - actv_running_task_time.text = "班次:${LineModel.getTaskTime()}" +// actv_running_task_time.text = "班次:${LineModel.getTaskTime()}" + actv_running_task_time.text = "${StringUtils.getString(R.string.module_och_classes)}${LineModel.getTaskTime()}" LineModel.stationList?.takeIf { it.size >= 2 }?.let { - actv_running_task_last_station.text = "往${it.last().name ?: ""}" +// actv_running_task_last_station.text = "往${it.last().name ?: ""}" + actv_running_task_last_station.text = "${StringUtils.getString(R.string.module_och_go)}${it.last().name ?: ""}" mAdapter.setDataList(it) CallerLogger.d( TAG, @@ -135,9 +138,11 @@ class TaskRunningView : ConstraintLayout, TaskRunningModel.SwtichLineViewCallbac showLeaveStationView() } if (LineModel.startStationIndex == it.size - 1) { - aciv_task_leave_station_slide_bg.setTextValue("单程结束") +// aciv_task_leave_station_slide_bg.setTextValue("单程结束") + aciv_task_leave_station_slide_bg.setTextValue(StringUtils.getString(R.string.module_och_one_way_completion)) } else { - aciv_task_leave_station_slide_bg.setTextValue("滑动出发") +// aciv_task_leave_station_slide_bg.setTextValue("滑动出发") + aciv_task_leave_station_slide_bg.setTextValue(StringUtils.getString(R.string.module_och_slide_moving)) } } } diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/util/ShuttleVoiceManager.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/util/ShuttleVoiceManager.kt index bfac519aa7..bdedf58b66 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/util/ShuttleVoiceManager.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/util/ShuttleVoiceManager.kt @@ -4,6 +4,7 @@ import com.mogo.commons.AbsMogoApplication import com.mogo.commons.voice.AIAssist 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.och.common.module.manager.socket.lan.LanSocketManager import com.mogo.och.common.module.manager.socket.lan.bean.AppConnectMsg import com.mogo.och.common.module.utils.ResourcesUtils @@ -105,9 +106,11 @@ object ShuttleVoiceManager { fun writeOffCount(successNum:Int){ if(successNum<=1){ - VoiceNotice.showNotice("核验通过", AIAssist.LEVEL3) +// VoiceNotice.showNotice("核验通过", AIAssist.LEVEL3) + VoiceNotice.showNotice(StringUtils.getString(R.string.module_och_verification_successful), AIAssist.LEVEL3) }else{ - VoiceNotice.showNotice("$successNum 人核验通过", AIAssist.LEVEL3) +// VoiceNotice.showNotice("$successNum 人核验通过", AIAssist.LEVEL3) + VoiceNotice.showNotice(StringUtils.getString(R.string.module_och_verification_successful1, successNum), AIAssist.LEVEL3) } } @@ -137,7 +140,8 @@ object ShuttleVoiceManager { VoiceNotice.showNotice(message, AIAssist.LEVEL0) } else if (AppIdentityModeUtils.isB2(FunctionBuildConfig.appIdentityMode)) { sendPassengerPlay(message) - arrivedStationOut("车辆遇到紧急情况，正在安全处理") +// arrivedStationOut("车辆遇到紧急情况，正在安全处理") + arrivedStationOut(ResourcesUtils.getString(R.string.m2_vehicle_emergency)) } } diff --git a/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_wadk_task_running.xml b/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_wadk_task_running.xml index c08221881d..b4be3d6848 100644 --- a/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_wadk_task_running.xml +++ b/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_wadk_task_running.xml @@ -46,11 +46,12 @@ android:layout_width="@dimen/dp_97" android:layout_height="@dimen/dp_39"/> + - + + android:layout_height="wrap_content" + tools:text="天安门天安门天安门…"/> - + + 蘑菇小巴正在进站 蘑菇小巴出发咯 尊敬的乘客，车辆遇到紧急情况，正在安全处理，请坐稳扶好，听从指引，感谢配合 + 车辆遇到紧急情况，正在安全处理 @@ -62,6 +63,7 @@ 暂无待上传任务 一键上传 + 上传中 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 53c08765de..7fd6cba2ca 100644 --- a/core/mogo-core-res/src/main/res/values/string.xml +++ b/core/mogo-core-res/src/main/res/values/string.xml @@ -283,6 +283,57 @@ 为您提供路口全息影像，助力出行 出示错误二维码 yyyy年MM月dd日 + 前方到站：%s，请下车的乘客做好准备 + 乘车日期非今日 + 当前无路线任务 + 车票非当前路线 + 车票无剩余可用次数 + 二维码已过期 + 同一订单核销间隔时间需大于2分钟 + 车票非当前站点 + 车辆未执行任务 + 车票非当前班次 + 车票与车辆所属租户不一致 + 核销失败，%s + 张 + ；乘客： + 未插入数据 + 没有站点数据 + 站点数据排序不对 + 站点数据不全请稍后再试 + 非缓存weakNetInterface 初始化环境错误 isBus + 缓存weakNetInterface 初始化环境错误 isBus + 缓存weakNetInterface 初始化环境错误 MOGO + 缓存weakNetInterface 初始化环境错误 未知 + 缓存weakNetInterface 初始化环境错误 Dali + 当前用户下单路线非当前的车辆所属公司 + 车辆未登录、或没有任务 + 二维码已过期 + 车票所选乘车日期非今日 + 车票路线信息与当前车辆执行任务的路线信息不符合 + 车票剩余可用次数为0 + 车票站点信息与当前车辆执行任务的站点信息不符合 + 车票站点信息与当前车辆执行任务信息不符合 + 缺少orderNo + writeoff 核销 初始化环境错误 SAAS + writeoff 核销 初始化环境错误 MOGO + writeoff 核销 初始化环境错误 未知 + 本地缓存任务 + 往%s方向 + 发生错误点击重试 + 该任务已被%s使用 + 班次： + 往 + 往-- + 单程结束 + 滑动出发 + 核验通过 + %d 人核验通过 + 本地任务执行信息 + 时间 + 暂无线路 + 暂无班次 + PadTTS 模块初始化异常 From 619aa89a57e83efda4f915ea60e45088878070fc Mon Sep 17 00:00:00 2001 From: xinfengkun Date: Mon, 17 Nov 2025 17:10:50 +0800 Subject: [PATCH 10/33] =?UTF-8?q?[8.2.8][i18n]=20biz=20=E4=B8=AD=E6=96=87?= =?UTF-8?q?=E6=8A=BD=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dispatch/network/DispatchServiceModel.kt | 5 +++- .../biz/monitoring/CronTaskManager.kt | 5 +++- .../redlightwarning/RedLightWarningManager.kt | 20 +++++++++----- .../network/TrafficLightNetWorkModel.kt | 5 +++- .../function/biz/v2x/v2n/V2XEventManager.kt | 14 +++++++--- .../function/biz/v2x/v2n/V2XPoiLoader.kt | 8 +++++- .../biz/v2x/v2n/pnc/V2NIdentifyDrawer.kt | 17 ++++++++---- .../warning/V2XFrontWarningScenario.java | 14 +++++++--- .../function/biz/v2x/v2n/utils/V2NUtils.kt | 26 +++++++++++++------ .../src/main/res/values/string.xml | 18 +++++++++++++ 10 files changed, 102 insertions(+), 30 deletions(-) diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/dispatch/network/DispatchServiceModel.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/dispatch/network/DispatchServiceModel.kt index 09534eeaaa..9d5cc789b2 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/dispatch/network/DispatchServiceModel.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/dispatch/network/DispatchServiceModel.kt @@ -7,10 +7,12 @@ import com.mogo.eagle.core.data.BaseData import com.mogo.eagle.core.data.autopilot.AutopilotRouteInfo.RouteModels import com.mogo.eagle.core.data.biz.dispatch.ReportDispatchResult import com.mogo.eagle.core.data.biz.dispatch.ReportedRoute +import com.mogo.eagle.core.function.biz.R import com.mogo.eagle.core.network.MoGoRetrofitFactory import com.mogo.eagle.core.network.RequestOptions import com.mogo.eagle.core.network.SubscribeImpl import com.mogo.eagle.core.network.utils.GsonUtil +import com.mogo.eagle.core.utilcode.util.StringUtils import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.schedulers.Schedulers import java.util.* @@ -106,7 +108,8 @@ class DispatchServiceModel private constructor() { if (!e.message.isNullOrBlank()) { onError?.invoke(e.message!!) } else { - onError?.invoke("上报失败") +// onError?.invoke("上报失败") + onError?.invoke(StringUtils.getString(R.string.module_core_reporting_failed)) } } diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/monitoring/CronTaskManager.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/monitoring/CronTaskManager.kt index 36ceb1af06..d0acd18efe 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/monitoring/CronTaskManager.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/monitoring/CronTaskManager.kt @@ -7,11 +7,13 @@ import com.mogo.commons.constants.HostConst import com.mogo.commons.utils.RetryWithDelay import com.mogo.eagle.core.data.biz.camera.CameraEntity import com.mogo.eagle.core.data.biz.camera.ReqLiveCarBean +import com.mogo.eagle.core.function.biz.R import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager import com.mogo.eagle.core.function.call.hmi.CallerHmiManager import com.mogo.eagle.core.network.MoGoRetrofitFactory import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_BIZ +import com.mogo.eagle.core.utilcode.util.StringUtils import com.mogo.eagle.function.biz.monitoring.net.ICameraListServices import io.reactivex.Observable import io.reactivex.android.schedulers.AndroidSchedulers @@ -178,7 +180,8 @@ class CronTaskManager { if (!flvString.isNullOrEmpty()) { success(flvString) } else { - error(Throwable("flvUrl为空")) +// error(Throwable("flvUrl为空")) + error(Throwable(StringUtils.getString(R.string.module_core_fvl_url_null))) } } else { error(Throwable(it.msg)) diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/redlightwarning/RedLightWarningManager.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/redlightwarning/RedLightWarningManager.kt index 5283eb0ce0..c4047aa8ed 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/redlightwarning/RedLightWarningManager.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/redlightwarning/RedLightWarningManager.kt @@ -14,6 +14,7 @@ import com.mogo.eagle.core.data.biz.trafficlight.TrafficLightStatusHelper.getCur import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Listener import com.mogo.eagle.core.function.api.datacenter.union.IMoGoTrafficLightListener import com.mogo.eagle.core.function.api.v2x.IMoGoVipSetListener +import com.mogo.eagle.core.function.biz.R import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager import com.mogo.eagle.core.function.call.hmi.CallerHmiManager import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager @@ -23,6 +24,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_V2X import com.mogo.eagle.core.utilcode.util.CoordinateUtils import com.mogo.eagle.core.utilcode.util.LocationUtils +import com.mogo.eagle.core.utilcode.util.StringUtils import com.mogo.eagle.core.utilcode.util.ThreadUtils import com.mogo.eagle.function.biz.v2x.trafficlight.core.MogoTrafficLightManager import com.zhjt.service_biz.BizConfig @@ -132,8 +134,10 @@ class RedLightWarningManager : IMoGoTrafficLightListener, IMoGoVipSetListener, val originRemainSpeed = floor(distance / (remainTime + trafficLightResult.flashYellow + 1.5) * 3.6).toInt() when { - originRemainSpeed > 50 -> greenLightWarning("10到50") - originRemainSpeed in 10..50 -> greenLightWarning("10到$originRemainSpeed") +// originRemainSpeed > 50 -> greenLightWarning("10到50") + originRemainSpeed > 50 -> greenLightWarning(StringUtils.getString(R.string.module_core_10_to_50)) +// originRemainSpeed in 10..50 -> greenLightWarning("10到$originRemainSpeed") + originRemainSpeed in 10..50 -> greenLightWarning("${StringUtils.getString(R.string.module_core_10_to_any)}$originRemainSpeed") } } } @@ -146,8 +150,10 @@ class RedLightWarningManager : IMoGoTrafficLightListener, IMoGoVipSetListener, // 单位Km/h，当前为黄灯，推荐速度越慢越容易绿灯通过，且要满足[10,50] val originRemainSpeed = floor(distance / (remainTime + 1.5) * 3.6).toInt() when { - originRemainSpeed > 50 -> greenLightWarning("10到50") - originRemainSpeed in 10..50 -> greenLightWarning("10到$originRemainSpeed") +// originRemainSpeed > 50 -> greenLightWarning("10到50") + originRemainSpeed > 50 -> greenLightWarning(StringUtils.getString(R.string.module_core_10_to_50)) +// originRemainSpeed in 10..50 -> greenLightWarning("10到$originRemainSpeed") + originRemainSpeed in 10..50 -> greenLightWarning("${StringUtils.getString(R.string.module_core_10_to_any)}$originRemainSpeed") } } } @@ -160,8 +166,10 @@ class RedLightWarningManager : IMoGoTrafficLightListener, IMoGoVipSetListener, // 单位Km/h，当前为绿灯，推荐速度越快越容易绿灯通过，且要满足[10,50] val originRemainSpeed = ceil(distance / (remainTime - 1.5) * 3.6).toInt() when { - originRemainSpeed < 10 -> greenLightWarning("10到50") - originRemainSpeed in 10..50 -> greenLightWarning("${originRemainSpeed}到50") +// originRemainSpeed < 10 -> greenLightWarning("10到50") + originRemainSpeed < 10 -> greenLightWarning(StringUtils.getString(R.string.module_core_10_to_50)) +// originRemainSpeed in 10..50 -> greenLightWarning("${originRemainSpeed}到50") + originRemainSpeed in 10..50 -> greenLightWarning("${originRemainSpeed}${StringUtils.getString(R.string.module_core_any_to_50)}") } } } diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/trafficlight/network/TrafficLightNetWorkModel.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/trafficlight/network/TrafficLightNetWorkModel.kt index e5360016e6..6b0d613fc2 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/trafficlight/network/TrafficLightNetWorkModel.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/trafficlight/network/TrafficLightNetWorkModel.kt @@ -4,11 +4,13 @@ import com.mogo.commons.constants.HostConst import com.mogo.commons.storage.SharedPrefsMgr import com.mogo.eagle.core.data.BaseResponse import com.mogo.eagle.core.data.biz.trafficlight.* +import com.mogo.eagle.core.function.biz.R import com.mogo.eagle.core.network.MoGoRetrofitFactory import com.mogo.eagle.core.network.apiCall import com.mogo.eagle.core.network.cancel import com.mogo.eagle.core.network.request import com.mogo.eagle.core.utilcode.util.GsonUtils +import com.mogo.eagle.core.utilcode.util.StringUtils import com.mogo.map.MogoData.Companion.mogoMapData class TrafficLightNetWorkModel { @@ -86,7 +88,8 @@ class TrafficLightNetWorkModel { if (it.result != null) { onSuccess.invoke(it.result) } else { - onError.invoke(it.msg ?: "返回result数据为null") +// onError.invoke(it.msg ?: "返回result数据为null") + onError.invoke(it.msg ?: StringUtils.getString(R.string.module_core_result_data_null)) } } onError { diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/V2XEventManager.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/V2XEventManager.kt index 97c3bae91d..8e71439dd0 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/V2XEventManager.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/V2XEventManager.kt @@ -32,6 +32,7 @@ import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Listener import com.mogo.eagle.core.function.api.autopilot.IMoGoV2XListener import com.mogo.eagle.core.function.api.cloud.IMoGoCloudListener +import com.mogo.eagle.core.function.biz.R import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotIdentifyListenerManager import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager @@ -47,6 +48,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_V2X import com.mogo.eagle.core.utilcode.util.CoordinateUtils import com.mogo.eagle.core.utilcode.util.GsonUtils +import com.mogo.eagle.core.utilcode.util.StringUtils import com.mogo.eagle.core.utilcode.util.Utils import com.mogo.eagle.function.biz.v2x.V2XBizTrace import com.mogo.eagle.function.biz.v2x.v2n.V2XPoiLoader.Companion.v2xPoiLoader @@ -233,11 +235,13 @@ object V2XEventManager : IMoGoChassisLocationGCJ02Listener, IV2XCallback, // 1004 -> { //V2N_RSM,静止事件，包括异常停车、异常静止障碍物 // } 1005 -> { //V2N_RSI,施工事件，包括锥桶或者挡板围城的施工场景，是个多边形包围区域 - tts = "自动驾驶正在提前规划绕开前方道路施工" +// tts = "自动驾驶正在提前规划绕开前方道路施工" + tts = StringUtils.getString(R.string.module_core_auto_drive_preplan_avoid_road_construction) EventTypeEnumNew.TYPE_SOCKET_ROAD_SHIGONG.poiType } 1007 -> { //三角牌 - tts = "自动驾驶正在提前规划绕开前方交通事故" +// tts = "自动驾驶正在提前规划绕开前方交通事故" + tts = StringUtils.getString(R.string.module_core_auto_drive_preplan_avoid_front_accident) EventTypeEnumNew.FOURS_ACCIDENT_04.poiType } else -> { @@ -334,7 +338,11 @@ object V2XEventManager : IMoGoChassisLocationGCJ02Listener, IV2XCallback, private fun sendToMsgBox(count: Int) { val msgBoxBean = - MsgBoxBean(MsgBoxType.V2X, V2XMsg("", "查询到当前全程共${count}个事件", "",CommunicationType.V2N.name)) +// MsgBoxBean(MsgBoxType.V2X, V2XMsg("", "查询到当前全程共${count}个事件", "",CommunicationType.V2N.name)) + MsgBoxBean( + MsgBoxType.V2X, + V2XMsg("", StringUtils.getString(R.string.module_core_query_whole_route_total_events, count), "", CommunicationType.V2N.name) + ) msgBoxBean.sourceType = DataSourceType.SUMMARY V2XBizTrace.onAck("$M_V2X$TAG", mapOf("v2xEventsSummary" to msgBoxBean)) CallerMsgBoxManager.saveMsgBox(msgBoxBean) diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/V2XPoiLoader.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/V2XPoiLoader.kt index 3c8f1ff45a..c2e958db39 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/V2XPoiLoader.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/V2XPoiLoader.kt @@ -10,9 +10,11 @@ import com.mogo.eagle.core.data.msgbox.MsgBoxType import com.mogo.eagle.core.data.msgbox.V2XMsg import com.mogo.eagle.core.data.v2x.V2XEvent import com.mogo.eagle.core.data.v2x.V2XMarkerResponse +import com.mogo.eagle.core.function.biz.R import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant +import com.mogo.eagle.core.utilcode.util.StringUtils import com.mogo.eagle.core.utilcode.util.UiThreadHandler import com.mogo.eagle.function.biz.v2x.V2XBizTrace import com.mogo.eagle.function.biz.v2x.v2n.network.V2XRefreshModel @@ -160,7 +162,11 @@ class V2XPoiLoader private constructor() { val size = it?.size ?: 0 if (size > 0) { val msgBoxBean = - MsgBoxBean(MsgBoxType.V2X, V2XMsg("", "查询到当前全程共${size}个事件", "",CommunicationType.V2N.name)) +// MsgBoxBean(MsgBoxType.V2X, V2XMsg("", "查询到当前全程共${size}个事件", "",CommunicationType.V2N.name)) + MsgBoxBean( + MsgBoxType.V2X, + V2XMsg("", StringUtils.getString(R.string.module_core_query_whole_route_total_events, size), "", CommunicationType.V2N.name) + ) msgBoxBean.sourceType = DataSourceType.SUMMARY V2XBizTrace.onAck("${SceneConstant.M_V2X}$TAG", mapOf("v2xEventsSummary" to msgBoxBean)) CallerMsgBoxManager.saveMsgBox(msgBoxBean) diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/pnc/V2NIdentifyDrawer.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/pnc/V2NIdentifyDrawer.kt index c3a548e264..e52b921051 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/pnc/V2NIdentifyDrawer.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/pnc/V2NIdentifyDrawer.kt @@ -39,6 +39,7 @@ import com.mogo.eagle.core.utilcode.util.CoordinateTransform import com.mogo.eagle.core.utilcode.util.CoordinateUtils import com.mogo.eagle.core.utilcode.util.DrivingDirectionUtils import com.mogo.eagle.core.utilcode.util.GsonUtils +import com.mogo.eagle.core.utilcode.util.StringUtils import com.mogo.eagle.core.utilcode.util.ThreadUtils import com.mogo.eagle.core.utilcode.util.Utils import com.mogo.eagle.function.biz.v2x.V2XBizTrace @@ -190,9 +191,13 @@ internal object V2NIdentifyDrawer : IEventDismissListener { } } val contentType = - if (poiType == EventTypeEnumNew.TYPE_SOCKET_ROAD_SHIGONG.poiType) "道路施工" else "道路事故" - val content = "前方${distance.toInt()}米有$contentType" - val tts = "前方${distance.toInt()}米有$contentType" +// if (poiType == EventTypeEnumNew.TYPE_SOCKET_ROAD_SHIGONG.poiType) "道路施工" else "道路事故" + StringUtils.getString(if (poiType == EventTypeEnumNew.TYPE_SOCKET_ROAD_SHIGONG.poiType) R.string.module_core_road_construction else R.string.module_core_road_accident) + +// val content = "前方${distance.toInt()}米有$contentType" + val content = StringUtils.getString(R.string.module_core_front_have, distance.toInt(), contentType) +// val tts = "前方${distance.toInt()}米有$contentType" + val tts = content V2XBizTrace.onAck(TAG, "绘制poi事件:$poiType") saveMsgBox( MsgBoxBean( @@ -806,7 +811,8 @@ internal object V2NIdentifyDrawer : IEventDismissListener { saveMsgBox(MsgBoxBean( MsgBoxType.NDE, NDEMsg( - "", "路口车龙", "前方路口有车龙" +// "", "路口车龙", "前方路口有车龙" + "", StringUtils.getString(R.string.module_och_crossing_tailback), StringUtils.getString(R.string.module_och_crossing_tailback_desc) ).also { it.setRoadList(sortedList) } @@ -815,7 +821,8 @@ internal object V2NIdentifyDrawer : IEventDismissListener { if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) { ThreadUtils.runOnUiThread { AIAssist.getInstance(Utils.getApp()) - .speakTTSVoiceWithLevel("前方路口有车龙", AIAssist.NEW_LEVEL_2) +// .speakTTSVoiceWithLevel("前方路口有车龙", AIAssist.NEW_LEVEL_2) + .speakTTSVoiceWithLevel(StringUtils.getString(R.string.module_och_crossing_tailback_desc), AIAssist.NEW_LEVEL_2) } } } diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/warning/V2XFrontWarningScenario.java b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/warning/V2XFrontWarningScenario.java index 44c9598e1e..425ff7b33e 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/warning/V2XFrontWarningScenario.java +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/warning/V2XFrontWarningScenario.java @@ -21,8 +21,10 @@ import com.mogo.eagle.core.data.msgbox.MsgBoxType; import com.mogo.eagle.core.data.msgbox.V2XMsg; import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Listener; import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWarningStatusListener; +import com.mogo.eagle.core.function.biz.R; import com.mogo.eagle.core.function.call.hmi.CallerHmiManager; import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager; +import com.mogo.eagle.core.utilcode.util.StringUtils; import com.mogo.eagle.function.biz.v2x.v2n.scenario.impl.AbsV2XScenario; import com.mogo.eagle.function.biz.v2x.v2n.scenario.view.IV2XMarker; import com.mogo.eagle.core.data.v2x.V2XWarningTarget; @@ -100,12 +102,15 @@ public class V2XFrontWarningScenario extends AbsV2XScenario implements IMoGoChas switch (entity.getType()) { case 1: case 11: - entity.setTts("注意行人"); +// entity.setTts("注意行人"); + entity.setTts(StringUtils.getString(R.string.module_core_watch_pedestrians)); return EventTypeEnumNew.TYPE_USECASE_ID_VRUCW_PERSON.getPoiType(); case 2: - entity.setTts("注意自行车"); +// entity.setTts("注意自行车"); + entity.setTts(StringUtils.getString(R.string.module_core_watch_bicycle)); case 4: - entity.setTts("注意摩托车"); +// entity.setTts("注意摩托车"); + entity.setTts(StringUtils.getString(R.string.module_core_watch_motorbike)); return EventTypeEnumNew.TYPE_USECASE_ID_VRUCW_MOTOR_VEHICLES.getPoiType(); } return "0"; @@ -116,7 +121,8 @@ public class V2XFrontWarningScenario extends AbsV2XScenario implements IMoGoChas //距离四舍五入保留整数 BigDecimal bg = BigDecimal.valueOf(dis); double disBig = bg.setScale(0, RoundingMode.HALF_UP).doubleValue(); - String distance = String.format(Locale.getDefault(), "%.0f", disBig) + "米"; +// String distance = String.format(Locale.getDefault(), "%.0f", disBig) + "米"; + String distance = String.format(Locale.getDefault(), "%.0f", disBig) + StringUtils.getString(R.string.module_och_m); String content = entity.getWarningContent(); SpannableStringBuilder ssb = new SpannableStringBuilder(content + distance); ssb.setSpan(new ForegroundColorSpan(Color.parseColor("#FF3036")), content.length(), ssb.length(), Spannable.SPAN_INCLUSIVE_EXCLUSIVE); diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/utils/V2NUtils.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/utils/V2NUtils.kt index 78e7d903bf..a023d6248b 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/utils/V2NUtils.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/utils/V2NUtils.kt @@ -2,6 +2,8 @@ package com.mogo.eagle.function.biz.v2x.v2n.utils import android.util.Log import androidx.annotation.WorkerThread +import com.mogo.eagle.core.function.biz.R +import com.mogo.eagle.core.utilcode.util.StringUtils import com.mogo.map.MapDataWrapper import com.mogo.map.entities.Lane import com.zhidaoauto.map.data.road.CenterLine @@ -70,7 +72,8 @@ object V2NUtils { fun computeBestLane(laneId: Int, occupy: List, total: List): Pair { if (occupy.size == total.size) { - return Pair(Int.MIN_VALUE, "更换路线") +// return Pair(Int.MIN_VALUE, "更换路线") + return Pair(Int.MIN_VALUE, StringUtils.getString(R.string.module_core_change_line)) } val map = HashMap() if (total.size % 2 == 0) { @@ -78,17 +81,22 @@ object V2NUtils { for (i in 0 until half) { val left = total[i] val right = total[half + i] - map[left.id] = "驶入左${i + 1}车道" - map[right.id] = "驶入右${i + 1}车道" +// map[left.id] = "驶入左${i + 1}车道" + map[left.id] = StringUtils.getString(R.string.module_core_drive_into_left_lane, (i + 1)) +// map[right.id] = "驶入右${i + 1}车道" + map[right.id] = StringUtils.getString(R.string.module_core_drive_into_right_lane, (i + 1)) } } else { val middle = total.size / 2 - map[total[middle].id] = "驶入中间车道" +// map[total[middle].id] = "驶入中间车道" + map[total[middle].id] = StringUtils.getString(R.string.module_core_drive_into_center_lane) for (i in 0 until middle) { val left = total[i] val right = total[middle + i + 1] - map[left.id] = "驶入左${i + 1}车道" - map[right.id] = "驶入右${i + 1}车道" +// map[left.id] = "驶入左${i + 1}车道" + map[left.id] = StringUtils.getString(R.string.module_core_drive_into_left_lane, (i + 1)) +// map[right.id] = "驶入右${i + 1}车道" + map[right.id] = StringUtils.getString(R.string.module_core_drive_into_right_lane, (i + 1)) } } val ids = occupy.map { it.id } @@ -103,8 +111,10 @@ object V2NUtils { delta = abs } } - return Pair(best, map[best] ?: "更换路线") +// return Pair(best, map[best] ?: "更换路线") + return Pair(best, map[best] ?: StringUtils.getString(R.string.module_core_change_line)) } - return Pair(Int.MIN_VALUE, "更换路线") +// return Pair(Int.MIN_VALUE, "更换路线") + return Pair(Int.MIN_VALUE, StringUtils.getString(R.string.module_core_change_line)) } } \ No newline at end of file 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 7fd6cba2ca..635c63dff3 100644 --- a/core/mogo-core-res/src/main/res/values/string.xml +++ b/core/mogo-core-res/src/main/res/values/string.xml @@ -366,5 +366,23 @@ 当前MAP版本不支持360环视，请升级MAP版本 尚未建立连接 已连接，不要重复连接 + flvUrl为空 + 10到50 + 10到 + 到50 + 返回result数据为null + 自动驾驶正在提前规划绕开前方道路施工 + 自动驾驶正在提前规划绕开前方交通事故 + 查询到当前全程共%d个事件 + 道路施工 + 道路事故 + 前方%d米有%s + 注意行人 + 注意自行车 + 注意摩托车 + 更换路线 + 驶入左%d车道 + 驶入右%d车道 + 驶入中间车道 \ No newline at end of file From 5689649a834ced7b8ae26b3055c8c55c2e2f3e93 Mon Sep 17 00:00:00 2001 From: xinfengkun Date: Tue, 18 Nov 2025 16:45:43 +0800 Subject: [PATCH 11/33] =?UTF-8?q?[8.2.8][i18n]=20data=20center=20=E4=B8=AD?= =?UTF-8?q?=E6=96=87=E6=8A=BD=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../autopilot/MoGoAutopilotControlProvider.kt | 13 +++-- .../MoGoAdasMsgConnectStatusListenerImpl.kt | 25 ++++++--- .../datacenter/obu/MogoObuDcCombineManager.kt | 11 ++-- .../obu/MogoPrivateObuNewManager.kt | 47 +++++++++++------ .../datacenter/v2x/TrafficLightDispatcher.kt | 4 +- .../src/main/res/values/string.xml | 51 ++++++++++++++++++- 6 files changed, 119 insertions(+), 32 deletions(-) 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 cf8faf17f3..1b5c9c9661 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 @@ -53,6 +53,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_ import com.mogo.eagle.core.utilcode.util.DeviceUtils import com.mogo.eagle.core.utilcode.util.GsonUtils import com.mogo.eagle.core.utilcode.util.ParseVersionUtils +import com.mogo.eagle.core.utilcode.util.StringUtils import com.mogo.eagle.core.utilcode.util.ThreadUtils import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.eagle.core.utilcode.util.UiThreadHandler @@ -172,7 +173,8 @@ class MoGoAutopilotControlProvider : msgHandler.synMsgToAllClients() } }, 1000, 10000) - invokeNettyConnResult("司机端服务启动成功!") +// invokeNettyConnResult("司机端服务启动成功!") + invokeNettyConnResult(StringUtils.getString(R.string.module_mogo_core_function_datacenter_driver_service_started_successfully)) CallerTelematicStatusListenerManager.invokeServerStatusChanged(true) } @@ -181,7 +183,8 @@ class MoGoAutopilotControlProvider : ToastUtils.showLong(R.string.module_mogo_core_function_datacenter_driver_service_stop) timer?.cancel() timer = null - invokeNettyConnResult("司机端服务停止!") +// invokeNettyConnResult("司机端服务停止!") + invokeNettyConnResult(StringUtils.getString(R.string.module_mogo_core_function_datacenter_driver_service_stop)) CallerTelematicStatusListenerManager.invokeServerStatusChanged(false) } @@ -195,7 +198,8 @@ class MoGoAutopilotControlProvider : override fun onReceiveClientSign(channel: Channel?, sn: String?) { sn?.let { - invokeNettyConnResult("连接成功的乘客屏sn为:$it") +// invokeNettyConnResult("连接成功的乘客屏sn为:$it") + invokeNettyConnResult("${StringUtils.getString(R.string.module_core_connected_passenger_sn)}$it") } } }, SharedPrefsMgr.getInstance().sn) @@ -1198,7 +1202,8 @@ class MoGoAutopilotControlProvider : carConfigResp.macAddress, SharedPrefsMgr.getInstance().sn ) - invokeNettyConnResult("乘客屏车牌号:${carConfigResp.plateNumber},Mac地址为：${carConfigResp.macAddress}") +// invokeNettyConnResult("乘客屏车牌号:${carConfigResp.plateNumber},Mac地址为：${carConfigResp.macAddress}") + invokeNettyConnResult("${StringUtils.getString(R.string.module_core_passenger_plate)}${carConfigResp.plateNumber},${StringUtils.getString(R.string.module_core_mac_address)}${carConfigResp.macAddress}") } if (carConfigResp.dockVersion.isNotEmpty() && !isRainModeInit) { diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt index 0f9787e234..2c3dd90ee8 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt @@ -30,6 +30,7 @@ import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_D_C import com.mogo.eagle.core.utilcode.util.AppUtils +import com.mogo.eagle.core.utilcode.util.StringUtils import com.mogo.eagle.core.utilcode.util.ToastUtils import com.zhidao.support.adas.high.AdasManager import com.zhidao.support.adas.high.OnAdasConnectStatusListener @@ -365,27 +366,35 @@ class MoGoAdasMsgConnectStatusListenerImpl : AdasConstants.IpcConnectionStatus.DISCONNECTED -> { if (isFirstDisconnected) { - title = "连接异常" - content = "域控未连接或主动断开连接" +// title = "连接异常" + title = StringUtils.getString(R.string.module_core_msg_box_connection_error) +// content = "域控未连接或主动断开连接" + content = StringUtils.getString(R.string.module_core_msg_box_connection_error_desc) isFirstDisconnected = false } } AdasConstants.IpcConnectionStatus.CONNECT_EXCEPTION -> { - title = "域控连接异常" - content = "建议检查WiFi连接情况及域控是否开机" +// title = "域控连接异常" + title = StringUtils.getString(R.string.module_core_msg_box_ipc_connection_error) +// content = "建议检查WiFi连接情况及域控是否开机" + content = StringUtils.getString(R.string.module_core_msg_box_ipc_connection_error_desc) } AdasConstants.IpcConnectionStatus.NOT_FOUND_ADDRESS -> { if (isFirstException) { - title = "找不到域控可用地址" - content = "建议检查车载路由器及域控是否开机" +// title = "找不到域控可用地址" + title = StringUtils.getString(R.string.module_core_msg_box_not_find_address) +// content = "建议检查车载路由器及域控是否开机" + content = StringUtils.getString(R.string.module_core_msg_box_not_find_address_desc) isFirstException = false } } AdasConstants.IpcConnectionStatus.HEARTBEAT_TIMEOUT -> { - title = "域控心跳超时" - content = "建议检查车载路由器连接是否正常" +// title = "域控心跳超时" + title = StringUtils.getString(R.string.module_core_msg_box_ipc_heartbeat_timeout) +// content = "建议检查车载路由器连接是否正常" + content = StringUtils.getString(R.string.module_core_msg_box_ipc_heartbeat_timeout_desc) } else -> {} diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoObuDcCombineManager.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoObuDcCombineManager.kt index b172f96feb..de273cc75f 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoObuDcCombineManager.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoObuDcCombineManager.kt @@ -21,11 +21,13 @@ import com.mogo.eagle.core.function.call.map.* import com.mogo.eagle.core.function.call.obu.* import com.mogo.eagle.core.function.call.v2x.CallerLimitingVelocityListenerManager import com.mogo.eagle.core.function.call.v2x.CallerTrafficLightListenerManager +import com.mogo.eagle.core.function.datacenter.R import com.mogo.eagle.core.function.datacenter.obu.drawer.* import com.mogo.eagle.core.function.datacenter.obu.utils.TrafficDataConvertUtilsNew import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_OBU import com.mogo.eagle.core.utilcode.util.ConvertUtils +import com.mogo.eagle.core.utilcode.util.StringUtils import com.mogo.support.obu.ObuScene import com.zhidao.support.obu.constants.MogoObuShowConstants import kotlin.math.roundToInt @@ -629,11 +631,14 @@ class MogoObuDcCombineManager private constructor() : IMoGoObuWarningRsiListener if (currentSpeed > 0) { ttsContentNew = if ((currentSpeed * 3.6).roundToInt() in (minSpeedTemp + 1) until maxSpeedTemp) { - "建议保持当前车速通过路口" +// "建议保持当前车速通过路口" + StringUtils.getString(R.string.module_core_suggest_keep_current_speed_pass_intersection) } else { - "推荐保持车速10-30KM/H通过路口" +// "推荐保持车速10-30KM/H通过路口" + StringUtils.getString(R.string.module_core_suggest_keep_speed_10_30kmh_pass_intersection) } - alertContentNew = "推荐车速$minSpeedTemp - $maxSpeedTemp KM/H" +// alertContentNew = "推荐车速$minSpeedTemp - $maxSpeedTemp KM/H" + alertContentNew = "${StringUtils.getString(R.string.module_core_suggest_speed)}$minSpeedTemp - $maxSpeedTemp KM/H" } saveObuToDcData( EventTypeEnumNew.TYPE_USECASE_ID_IVP_GREEN.poiType, diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoPrivateObuNewManager.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoPrivateObuNewManager.kt index 1291e731b1..c573180ac1 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoPrivateObuNewManager.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoPrivateObuNewManager.kt @@ -17,6 +17,7 @@ import com.mogo.eagle.core.function.call.map.CallerVisualAngleManager import com.mogo.eagle.core.function.call.obu.* import com.mogo.eagle.core.function.call.v2x.CallerLimitingVelocityListenerManager import com.mogo.eagle.core.function.call.v2x.CallerTrafficLightListenerManager +import com.mogo.eagle.core.function.datacenter.R import com.mogo.eagle.core.function.datacenter.obu.drawer.* import com.mogo.eagle.core.function.datacenter.obu.utils.TrafficDataConvertUtilsNew import com.mogo.eagle.core.utilcode.download.Config @@ -24,6 +25,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_OBU import com.mogo.eagle.core.utilcode.util.ConvertUtils import com.mogo.eagle.core.utilcode.util.FileUtils +import com.mogo.eagle.core.utilcode.util.StringUtils import com.mogo.eagle.core.utilcode.util.UiThreadHandler import com.mogo.support.obu.ObuBase import com.mogo.support.obu.ObuScene @@ -817,8 +819,10 @@ class MogoPrivateObuNewManager private constructor() : OnUpgradeListener { //前向碰撞预警 MogoObuShowConstants.V2X_WARNING_TYPE.FCW.toString() -> { if (FunctionBuildConfig.isObuWarningFusionUnion && level == 3) { - alertContent = "前车距离过近" - ttsContent = "前车距离过近" +// alertContent = "前车距离过近" + alertContent = StringUtils.getString(R.string.module_core_warning_vehicle_ahead_distance_too_close) +// ttsContent = "前车距离过近" + ttsContent = alertContent } else { alertContent = EventTypeEnumNew.getWarningContent(EventTypeEnumNew.TYPE_USECASE_ID_FCW.poiType) @@ -858,18 +862,24 @@ class MogoPrivateObuNewManager private constructor() : OnUpgradeListener { direction == WarningDirectionEnum.ALERT_WARNING_TOP_LEFT || direction == WarningDirectionEnum.ALERT_WARNING_BOTTOM_LEFT ) { //左后 - ttsContent = String.format(ttsContent, "左") - alertContent = String.format(alertContent, "左") +// ttsContent = String.format(ttsContent, "左") + ttsContent = String.format(ttsContent, StringUtils.getString(R.string.module_core_left)) +// alertContent = String.format(alertContent, "左") + alertContent = String.format(alertContent, StringUtils.getString(R.string.module_core_left)) } else if ( direction == WarningDirectionEnum.ALERT_WARNING_RIGHT || direction == WarningDirectionEnum.ALERT_WARNING_TOP_RIGHT || direction == WarningDirectionEnum.ALERT_WARNING_BOTTOM_RIGHT ) { //右后 - ttsContent = String.format(ttsContent, "右") - alertContent = String.format(alertContent, "右") +// ttsContent = String.format(ttsContent, "右") + ttsContent = String.format(ttsContent, StringUtils.getString(R.string.module_core_right)) +// alertContent = String.format(alertContent, "右") + alertContent = String.format(alertContent, StringUtils.getString(R.string.module_core_right)) } else{ - ttsContent = "注意周围车辆" - alertContent = "盲区预警" +// ttsContent = "注意周围车辆" + ttsContent = StringUtils.getString(R.string.module_core_warning_pay_attention_to_surrounding_vehicles) +// alertContent = "盲区预警" + alertContent = StringUtils.getString(R.string.module_core_warning_blind_spot) } } @@ -885,15 +895,19 @@ class MogoPrivateObuNewManager private constructor() : OnUpgradeListener { direction == WarningDirectionEnum.ALERT_WARNING_TOP_LEFT || direction == WarningDirectionEnum.ALERT_WARNING_BOTTOM_LEFT ) { - ttsContent = String.format(ttsContent, "左") - alertContent = String.format(alertContent, "左") +// ttsContent = String.format(ttsContent, "左") + ttsContent = String.format(ttsContent, StringUtils.getString(R.string.module_core_left)) +// alertContent = String.format(alertContent, "左") + alertContent = String.format(alertContent, StringUtils.getString(R.string.module_core_left)) } else if ( direction == WarningDirectionEnum.ALERT_WARNING_RIGHT || direction == WarningDirectionEnum.ALERT_WARNING_TOP_RIGHT || direction == WarningDirectionEnum.ALERT_WARNING_BOTTOM_RIGHT ) { - ttsContent = String.format(ttsContent, "右") - alertContent = String.format(alertContent, "右") +// ttsContent = String.format(ttsContent, "右") + ttsContent = String.format(ttsContent, StringUtils.getString(R.string.module_core_right)) +// alertContent = String.format(alertContent, "右") + alertContent = String.format(alertContent, StringUtils.getString(R.string.module_core_right)) } } @@ -1111,11 +1125,14 @@ class MogoPrivateObuNewManager private constructor() : OnUpgradeListener { if (currentSpeed > 0) { ttsContentNew = if ((currentSpeed * 3.6).roundToInt() in (minSpeedTemp + 1) until maxSpeedTemp) { - "建议保持当前车速通过路口" +// "建议保持当前车速通过路口" + StringUtils.getString(R.string.module_core_suggest_keep_current_speed_pass_intersection) } else { - "推荐保持车速10-30KM/H通过路口" +// "推荐保持车速10-30KM/H通过路口" + StringUtils.getString(R.string.module_core_suggest_keep_speed_10_30kmh_pass_intersection) } - alertContentNew = "推荐车速$minSpeedTemp - $maxSpeedTemp KM/H" +// alertContentNew = "推荐车速$minSpeedTemp - $maxSpeedTemp KM/H" + alertContentNew = "${StringUtils.getString(R.string.module_core_suggest_speed)}$minSpeedTemp - $maxSpeedTemp KM/H" } saveObuData( EventTypeEnumNew.TYPE_USECASE_ID_IVP_GREEN.poiType, diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/TrafficLightDispatcher.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/TrafficLightDispatcher.kt index df48ff67a7..32892cfcaf 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/TrafficLightDispatcher.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/TrafficLightDispatcher.kt @@ -36,6 +36,7 @@ import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.eagle.core.utilcode.util.GsonUtils +import com.mogo.eagle.core.utilcode.util.StringUtils import com.mogo.eagle.core.utilcode.util.UiThreadHandler import com.mogo.skin.utils.SkinResources import com.zhjt.mogo.adas.common.cloud.AstFuncTlmPhaseStateLightState @@ -246,7 +247,8 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight if((light.state == FusionTrafficLightOuterClass.FusionLightState.STATE_YELLOW_FUSION || light.state ==FusionTrafficLightOuterClass.FusionLightState.STATE_RED_FUSION) && light.duration < 5 && light.nextState == FusionTrafficLightOuterClass.FusionLightState.STATE_GREEN_FUSION){ //语音播放:红灯即将变绿 - AIAssist.getInstance(mContext).speakTTSVoiceWithLevel("红灯即将变绿", NEW_LEVEL_2) +// AIAssist.getInstance(mContext).speakTTSVoiceWithLevel("红灯即将变绿", NEW_LEVEL_2) + AIAssist.getInstance(mContext).speakTTSVoiceWithLevel(StringUtils.getString(R.string.module_core_hint_red_light_about_to_turn_green), NEW_LEVEL_2) isTurnGreen = true } } 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 635c63dff3..1bc9d6f6c3 100644 --- a/core/mogo-core-res/src/main/res/values/string.xml +++ b/core/mogo-core-res/src/main/res/values/string.xml @@ -335,7 +335,6 @@ 暂无班次 - PadTTS 模块初始化异常 域控已连接 @@ -384,5 +383,55 @@ 驶入左%d车道 驶入右%d车道 驶入中间车道 + 连接成功的乘客屏SN为： + 乘客屏车牌号： + Mac地址为： + + + + + + + 连接异常 + 域控未连接或主动断开连接 + 域控连接异常 + 建议检查WiFi连接情况及域控是否开机 + 找不到域控可用地址 + 建议检查车载路由器及域控是否开机 + 域控心跳超时 + 建议检查车载路由器连接是否正常 + 建议保持当前车速通过路口 + 推荐保持车速10–30KM/H通过路口 + 推荐车速 + 前车距离过近 + 左 + 右 + 注意周围车辆 + 盲区预警 + 红灯即将变绿 + 识别故障即将停车，请注意观察，小心接管 + 请接管恢复车辆状态 + bag录制成功 + bag录制失败 + 正常 + 异常 + 寻迹算路 + 云Socket连接 + 时间： + + + + 自定义 + 已选%d个包，共 + %s月%s日 + 共计%d个包 (%sG) 已上传%d个包 (%sG) 剩余%d个包 (%sG) + 自定义A + 上报中… + 上报 + 人工 + 采集 + 自动 + 录包失败 + 已上报 \ No newline at end of file From 038d2d6bb6a14715f6a7e3e0e4dad2fb8fed3d1f Mon Sep 17 00:00:00 2001 From: xinfengkun Date: Wed, 19 Nov 2025 16:07:05 +0800 Subject: [PATCH 12/33] =?UTF-8?q?[8.2.8][i18n]=20CloudControlManager?= =?UTF-8?q?=E4=B8=AD=E6=96=87=E6=8A=BD=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cloudcontrol/CloudControlManager.kt | 156 ++++++++++++------ .../src/main/res/values/string.xml | 103 ++++++++---- 2 files changed, 185 insertions(+), 74 deletions(-) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/cloudcontrol/CloudControlManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/cloudcontrol/CloudControlManager.kt index 08bf8a366d..ec5f379ab8 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/cloudcontrol/CloudControlManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/cloudcontrol/CloudControlManager.kt @@ -11,6 +11,7 @@ import com.mogo.eagle.core.function.api.devatools.INDECloudListener import com.mogo.eagle.core.function.call.devatools.CallerNDECloudManager import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils +import com.mogo.eagle.core.utilcode.util.StringUtils import com.zhjt.mogo.adas.common.cloud.AdviceEvwType import com.zhjt.mogo.adas.common.cloud.AdviceType import com.zhjt.mogo.adas.data.bean.cloud.info.AdviceAvwInfo @@ -21,6 +22,7 @@ import com.zhjt.mogo.adas.data.bean.cloud.info.AdviceLaneSpdLmtInfo import com.zhjt.mogo.adas.data.bean.cloud.info.AstFuncTlmInfo import com.zhjt.mogo.adas.data.bean.cloud.pojo.AdvicePojo import com.zhjt.mogo.adas.data.bean.cloud.pojo.AstFuncPojo +import com.zhjt.mogo_core_function_devatools.R /** * 云控基础平台信息管理 @@ -56,9 +58,16 @@ object CloudControlManager: INDECloudListener{ val speedMax = adviceGlosaInfo.spdExps[0].spdMax*3.6 val num = adviceGlosaInfo.spdExps[0].numIntersection val desc = if(num ==0 || num == 255){ - "建议车速${speedMin}km/h-${speedMax}km/h" +// "建议车速${speedMin}km/h-${speedMax}km/h" + "${StringUtils.getString(R.string.module_core_suggest_speed1)}${speedMin}km/h-${speedMax}km/h" }else{ - "建议车速${speedMin}km/h-${speedMax}km/h，可绿灯通过前方${num}个路口" +// "建议车速${speedMin}km/h-${speedMax}km/h，可绿灯通过前方${num}个路口" + "${StringUtils.getString(R.string.module_core_suggest_speed1)}${speedMin}km/h-${speedMax}km/h${ + StringUtils.getString( + R.string.module_core_hint_green_wave_pass_intersection, + num + ) + }" } CallerMsgBoxManager.saveMsgBox( MsgBoxBean( @@ -101,7 +110,8 @@ object CloudControlManager: INDECloudListener{ MsgBoxType.CLOUD, CloudControlMsg(EventTypeEnumNew.CLOUD_RED_LIGHT_WARN.poiType, EventTypeEnumNew.CLOUD_RED_LIGHT_WARN.poiTypeStr, - "存在闯红灯风险" +// "存在闯红灯风险" + StringUtils.getString(R.string.module_core_warning_running_red_light_risk) ) ) ) @@ -109,9 +119,11 @@ object CloudControlManager: INDECloudListener{ //行驶车道建议 6031,6032->{ if(it.adviceRsiLaneProposalInfo.tagLaneDataNum > 0){ - var desc = "推荐车道：" +// var desc = "推荐车道：" + var desc = StringUtils.getString(R.string.module_core_hint_recommended_lane) it.adviceRsiLaneProposalInfo.tagLaneData.forEach {lane-> - desc += "第${lane.tagLaneSeq}车道 " +// desc += "第${lane.tagLaneSeq}车道 " + desc += StringUtils.getString(R.string.module_core_lane_sequence_number, lane.tagLaneSeq) } CallerMsgBoxManager.saveMsgBox( MsgBoxBean( @@ -128,7 +140,11 @@ object CloudControlManager: INDECloudListener{ 6061->{ //eventLevel 2:拥堵; 3:重拥堵 if(it.adviceRsiTrafficJamInfo.eventLevel ==2 || it.adviceRsiTrafficJamInfo.eventLevel == 3){ - val desc = "前方${it.adviceRsiTrafficJamInfo.queueLength}米${it.adviceRsiTrafficJamInfo.roadIdNum}车道拥堵" +// val desc = "前方${it.adviceRsiTrafficJamInfo.queueLength}米${it.adviceRsiTrafficJamInfo.roadIdNum}车道拥堵" + val desc = StringUtils.getString( + R.string.module_core_front_have_block, + it.adviceRsiTrafficJamInfo.queueLength, + it.adviceRsiTrafficJamInfo.roadIdNum) CallerMsgBoxManager.saveMsgBox( MsgBoxBean( MsgBoxType.CLOUD, @@ -146,9 +162,16 @@ object CloudControlManager: INDECloudListener{ if(it.adviceRsiRoadDangerHintInfo.laneOfEventNum > 0){ var lane = "" it.adviceRsiRoadDangerHintInfo.laneOfEvent.forEach { - lane += "第${it}" +// lane += "第${it}" + lane += "${StringUtils.getString(R.string.module_core_di)}${it}" } - val desc = "前方${it.eventRadius}米有${getAlterType(it.adviceRsiRoadDangerHintInfo.alterType)}，影响${lane}车道通行" +// val desc = "前方${it.eventRadius}米有${getAlterType(it.adviceRsiRoadDangerHintInfo.alterType)}，影响${lane}车道通行" + val desc = StringUtils.getString( + R.string.module_core_front_have_alter, + it.eventRadius, + getAlterType(it.adviceRsiRoadDangerHintInfo.alterType), + lane + ) CallerMsgBoxManager.saveMsgBox( MsgBoxBean( MsgBoxType.CLOUD, @@ -164,7 +187,11 @@ object CloudControlManager: INDECloudListener{ //超视距弱势交通参与者提醒 6051->{ if(it.adviceRsiOverSightDistanceInfo.valid == 1){ - val desc = "前方${it.adviceRsiOverSightDistanceInfo.distance}米有${getWeakType(it.adviceRsiOverSightDistanceInfo.type)}" +// val desc = "前方${it.adviceRsiOverSightDistanceInfo.distance}米有${getWeakType(it.adviceRsiOverSightDistanceInfo.type)}" + val desc = StringUtils.getString( + R.string.module_core_front_have_rsi, + it.adviceRsiOverSightDistanceInfo.distance, + getWeakType(it.adviceRsiOverSightDistanceInfo.type)) CallerMsgBoxManager.saveMsgBox( MsgBoxBean( MsgBoxType.CLOUD, @@ -180,9 +207,11 @@ object CloudControlManager: INDECloudListener{ 6041->{ if(it.adviceRsiOtherCarBreakReadWarningInfo.valid == 1){ val desc = if(it.adviceRsiOtherCarBreakReadWarningInfo.d2StopLine == -1.0){ - "路口内有他车闯红灯" +// "路口内有他车闯红灯" + StringUtils.getString(R.string.module_core_warning_other_vehicle_running_red_light_in_intersection) }else{ - "路口前有他车闯红灯" +// "路口前有他车闯红灯" + StringUtils.getString(R.string.module_core_warning_other_vehicle_running_red_light_before_intersection) } CallerMsgBoxManager.saveMsgBox( MsgBoxBean( @@ -201,9 +230,11 @@ object CloudControlManager: INDECloudListener{ if(it.adviceRsiAbandonInfo.laneOfEventNum > 0){ var lane = "" it.adviceRsiAbandonInfo.lanOfEvent.forEach {lan-> - lane = "$lane${lan}车道" +// lane = "$lane${lan}车道" + lane = "$lane${lan}${StringUtils.getString(R.string.module_core_lane)}" } - val desc = "前方${it.adviceRsiAbandonInfo.distance}米${lane}存在障碍物，影响${lane}通行" +// val desc = "前方${it.adviceRsiAbandonInfo.distance}米${lane}存在障碍物，影响${lane}通行" + val desc = StringUtils.getString(R.string.module_core_front_have_barrier, it.adviceRsiAbandonInfo.distance, lane, lane) CallerMsgBoxManager.saveMsgBox( MsgBoxBean( MsgBoxType.CLOUD, @@ -219,7 +250,8 @@ object CloudControlManager: INDECloudListener{ //能见度预警 6071->{ if(it.adviceRsiVisibilityInfo.valid == 1){ - val desc = "当前能见度为${it.adviceRsiVisibilityInfo.visibilityDis}米" +// val desc = "当前能见度为${it.adviceRsiVisibilityInfo.visibilityDis}米" + val desc = StringUtils.getString(R.string.module_core_current_visibility_distance, it.adviceRsiVisibilityInfo.visibilityDis) CallerMsgBoxManager.saveMsgBox( MsgBoxBean( MsgBoxType.CLOUD, @@ -246,9 +278,11 @@ object CloudControlManager: INDECloudListener{ //紧急车辆优先通行 TODO 没有具体车道 if(adviceEvwInfo.valid == 1){ val desc = if(adviceEvwInfo.alertRadius == 6553.5){ - "前方有${getVehicleType(adviceEvwInfo.type.desc)}" +// "前方有${getVehicleType(adviceEvwInfo.type.desc)}" + StringUtils.getString(R.string.module_core_ahead_has, getVehicleType(adviceEvwInfo.type.desc)) }else{ - "后方${adviceEvwInfo.alertRadius}米有${getVehicleType(adviceEvwInfo.type.desc)}" +// "后方${adviceEvwInfo.alertRadius}米有${getVehicleType(adviceEvwInfo.type.desc)}" + StringUtils.getString(R.string.module_core_behind_has, adviceEvwInfo.alertRadius, getVehicleType(adviceEvwInfo.type.desc)) } CallerMsgBoxManager.saveMsgBox( MsgBoxBean( @@ -273,7 +307,8 @@ object CloudControlManager: INDECloudListener{ ) { //动态限速信息 if(adviceLaneSpdLmtInfo.valid == 1){ - val desc = "道路限速${adviceLaneSpdLmtInfo.speedLmt[0].speedLimit}km/h" +// val desc = "道路限速${adviceLaneSpdLmtInfo.speedLmt[0].speedLimit}km/h" + val desc = "${StringUtils.getString(R.string.module_core_road_speed_limit)}${adviceLaneSpdLmtInfo.speedLmt[0].speedLimit}km/h" CallerMsgBoxManager.saveMsgBox( MsgBoxBean( MsgBoxType.CLOUD, @@ -294,7 +329,8 @@ object CloudControlManager: INDECloudListener{ override fun onNdeCloudAdviceAvw(advicePojo: AdvicePojo, adviceAvwInfo: AdviceAvwInfo) { //异常车辆预警 if(adviceAvwInfo.valid == 1){ - val desc = "前方${adviceAvwInfo.distance}米${adviceAvwInfo.rsiLaneId}车道存在异常车辆" +// val desc = "前方${adviceAvwInfo.distance}米${adviceAvwInfo.rsiLaneId}车道存在异常车辆" + val desc = StringUtils.getString(R.string.module_core_warning_abnormal_vehicle_ahead_lane, adviceAvwInfo.distance, adviceAvwInfo.rsiLaneId) CallerMsgBoxManager.saveMsgBox( MsgBoxBean( MsgBoxType.CLOUD, @@ -322,7 +358,8 @@ object CloudControlManager: INDECloudListener{ AdviceEvwType.FIRE_TRUCK.desc } else->{ - "应急车辆" +// "应急车辆" + StringUtils.getString(R.string.module_core_emergency_vehicle) } } } @@ -330,76 +367,100 @@ object CloudControlManager: INDECloudListener{ private fun getAlterType(alterType: Int): String{ return when(alterType){ 5501->{ - "行人提醒" +// "行人提醒" + StringUtils.getString(R.string.module_core_warning_pedestrian_ahead) } 5502->{ - "非机动车提醒" +// "非机动车提醒" + StringUtils.getString(R.string.module_core_warning_non_motor_vehicle_ahead) } 5503->{ - "紧急制动预警" +// "紧急制动预警" + StringUtils.getString(R.string.module_core_warning_emergency_braking) } 5504->{ - "倒车预警" +// "倒车预警" + StringUtils.getString(R.string.module_core_warning_reverse_alert) } 5505->{ - "逆行预警" +// "逆行预警" + StringUtils.getString(R.string.module_core_warning_opposite_direction_traffic) } 5506->{ - "异常低速预警" +// "异常低速预警" + StringUtils.getString(R.string.module_core_warning_abnormal_low_speed) } 5507->{ - "异常停车预警" +// "异常停车预警" + StringUtils.getString(R.string.module_core_warning_abnormal_parking) } 5508->{ - "超速预" +// "超速预警" + StringUtils.getString(R.string.module_core_warning_speed_exceed_limit) } 5509->{ - "交通拥堵预警" +// "交通拥堵预警" + StringUtils.getString(R.string.module_core_warning_traffic_congestion) } 5510->{ - "特殊车辆预警" +// "特殊车辆预警" + StringUtils.getString(R.string.module_core_warning_special_vehicle_approaching) } 5511->{ - "紧急车辆预警" +// "紧急车辆预警" + StringUtils.getString(R.string.module_core_warning_emergency_vehicle_approaching) } 5512->{ - "车辆状态异常预警" +// "车辆状态异常预警" + StringUtils.getString(R.string.module_core_warning_vehicle_status_abnormal) } 5513->{ - "连续并道预警" +// "连续并道预警" + StringUtils.getString(R.string.module_core_warning_continuous_lane_changing) } 5514->{ - "匝道退回主路预警" +// "匝道退回主路预警" + StringUtils.getString(R.string.module_core_warning_ramp_return_to_main_road) } 5515->{ - "交通管控预警" +// "交通管控预警" + StringUtils.getString(R.string.module_core_warning_traffic_control_implemented) } 5516->{ - "路面低摩阻预警" +// "路面低摩阻预警" + StringUtils.getString(R.string.module_core_warning_road_low_friction) } 5517->{ - "动态车道级限速预警" +// "动态车道级限速预警" + StringUtils.getString(R.string.module_core_warning_dynamic_lane_speed_limit) } 5518->{ - "障碍物提醒" +// "障碍物提醒" + StringUtils.getString(R.string.module_core_warning_obstacle_ahead) } 5519->{ - "红绿灯故障预警" +// "红绿灯故障预警" + StringUtils.getString(R.string.module_core_warning_traffic_light_fault) } 5520->{ - "弱势交通参与者预警" +// "弱势交通参与者预警" + StringUtils.getString(R.string.module_core_warning_vulnerable_road_user_ahead) } 5521->{ - "闯红灯" +// "闯红灯" + StringUtils.getString(R.string.module_core_warning_red_light_run_imminent) } 5522->{ - "机动车压实线变道" +// "机动车压实线变道" + StringUtils.getString(R.string.module_core_notice_solid_line_lane_change) } 5523->{ - "机动车不按导向标识行驶" +// "机动车不按导向标识行驶" + StringUtils.getString(R.string.module_core_notice_incorrect_guide_sign_driving) } else->{ - "预警" +// "预警" + StringUtils.getString(R.string.module_core_warning) } } } @@ -410,13 +471,16 @@ object CloudControlManager: INDECloudListener{ private fun getWeakType(type: Int): String{ return when(type){ 0->{ - "未知" +// "未知" + StringUtils.getString(R.string.module_core_unknown) } 1->{ - "行人" +// "行人" + StringUtils.getString(R.string.module_core_pedestrian) } 2->{ - "非机动车" +// "非机动车" + StringUtils.getString(R.string.module_core_non_motor_vehicle) } else->{ "" 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 1bc9d6f6c3..f60fd6422b 100644 --- a/core/mogo-core-res/src/main/res/values/string.xml +++ b/core/mogo-core-res/src/main/res/values/string.xml @@ -386,12 +386,12 @@ 连接成功的乘客屏SN为： 乘客屏车牌号： Mac地址为： - - - - - - + + + + + + 连接异常 域控未连接或主动断开连接 域控连接异常 @@ -411,27 +411,74 @@ 红灯即将变绿 识别故障即将停车，请注意观察，小心接管 请接管恢复车辆状态 - bag录制成功 - bag录制失败 - 正常 - 异常 - 寻迹算路 - 云Socket连接 - 时间： - - - - 自定义 - 已选%d个包，共 - %s月%s日 - 共计%d个包 (%sG) 已上传%d个包 (%sG) 剩余%d个包 (%sG) - 自定义A - 上报中… - 上报 - 人工 - 采集 - 自动 - 录包失败 - 已上报 + + + + + + + + + + + + + + + + + + + + + + + 建议车速 + ，可绿灯通过前方%d个路口 + 存在闯红灯风险 + 推荐车道： + 第%d车道 + 前方%f米%s车道拥堵 + 第 + 前方%f米有%s，影响%s车道通行 + 前方%f米有%s + 路口内有他车闯红灯 + 路口前有他车闯红灯 + 车道 + 前方%f米%s存在障碍物，影响%s通行 + 当前能见度为%f米 + 前方有%s + 后方%f米有%s + 道路限速 + 前方%f米%d车道存在异常车辆 + 应急车辆 + 行人提醒 + 非机动车提醒 + 紧急制动预警 + 倒车预警 + 逆行预警 + 异常低速预警 + 异常停车预警 + 超速预警 + 交通拥堵预警 + 特殊车辆预警 + 紧急车辆预警 + 车辆状态异常预警 + 连续并道预警 + 匝道退回主路预警 + 交通管控预警 + 路面低摩阻预警 + 动态车道级限速预警 + 障碍物提醒 + 红绿灯故障预警 + 弱势交通参与者预警 + 闯红灯 + 机动车压实线变道 + 机动车不按导向标识行驶 + 预警 + 未知 + 行人 + 非机动车 + \ No newline at end of file From a284fd24da967fbdac8c36353851f416871c3a55 Mon Sep 17 00:00:00 2001 From: xinfengkun Date: Fri, 21 Nov 2025 10:34:56 +0800 Subject: [PATCH 13/33] =?UTF-8?q?[8.2.8][i18n]=20mogo-core-function-datace?= =?UTF-8?q?nter=20=E4=B8=AD=E6=96=87=E6=8A=BD=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../res/layout/charter_p_order_fragment.xml | 3 +- .../biz_taxi_report_error_point_panel.xml | 3 +- .../res/layout/sweeper_operate_task_menu.xml | 4 +- .../res/layout/taxt_cancle_order_reson.xml | 3 +- .../unmanned_taxi_order_cancel_view.xml | 3 +- .../layout/dialog_select_autopilot_line.xml | 3 +- .../rviz_common_dialog_default_config.xml | 3 +- .../layout/rviz_fmd_dialog_fmd_user_pwd.xml | 3 +- .../DevaToolsProvider.kt | 7 ++- .../coldstart/ColdStartNodeAdapter.kt | 4 +- .../video/DriveSeatVideoProviderImpl.kt | 14 ++++-- .../env/EnvChangeManager.kt | 8 +++- .../mofang/MoGoMoFangProviderImpl.kt | 3 +- .../ota/OTAUpgradeManager.kt | 22 ++++++--- .../report/adapter/ReportListAdapter.kt | 4 +- .../status/flow/fsm/FSMImpl.kt | 23 +++++++--- .../upgrade/UpgradeAppNetWorkManager.kt | 13 ++++-- .../upgrade/UpgradeManager.kt | 27 +++++++---- .../workorder/FaultReasonWindow.kt | 4 +- .../workorder/TakeOverReasonWindow.kt | 4 +- .../workorder/WorkOrderWindow.kt | 22 ++++++--- .../workorder/adapter/TakeOverListAdapter.kt | 7 ++- .../src/main/res/layout/dialog_bag_upload.xml | 9 ++-- .../src/main/res/layout/dialog_case_list.xml | 6 ++- .../res/layout/dialog_case_topic_list.xml | 10 +++-- .../main/res/layout/dialog_space_warning.xml | 9 ++-- .../src/main/res/layout/item_bag_manager.xml | 4 +- .../res/layout/layout_badcase_manager.xml | 3 +- .../res/layout/view_initiative_bad_case.xml | 6 ++- .../main/res/layout/view_passive_bad_case.xml | 6 ++- .../res/layout/window_ai_data_collect.xml | 6 ++- .../function/hmi/bone/tab/CarInfoTabView.kt | 7 ++- .../function/hmi/bone/tab/FaultReasonView.kt | 4 +- .../function/hmi/bone/tab/WorkOrderView.kt | 22 ++++++--- .../src/main/res/values/string.xml | 45 +++++++++++++++++++ 35 files changed, 237 insertions(+), 87 deletions(-) diff --git a/OCH/charter/passenger/src/main/res/layout/charter_p_order_fragment.xml b/OCH/charter/passenger/src/main/res/layout/charter_p_order_fragment.xml index 049869fcc0..06fc3ee03a 100644 --- a/OCH/charter/passenger/src/main/res/layout/charter_p_order_fragment.xml +++ b/OCH/charter/passenger/src/main/res/layout/charter_p_order_fragment.xml @@ -63,6 +63,7 @@ + + + + + + diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/layout/dialog_select_autopilot_line.xml b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/layout/dialog_select_autopilot_line.xml index fef58e1458..a105809a0f 100644 --- a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/layout/dialog_select_autopilot_line.xml +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/layout/dialog_select_autopilot_line.xml @@ -86,13 +86,14 @@ app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" /> + +