diff --git a/libraries/mogo-adas/build.gradle b/libraries/mogo-adas/build.gradle index 02f8e9c803..cba1699887 100644 --- a/libraries/mogo-adas/build.gradle +++ b/libraries/mogo-adas/build.gradle @@ -102,6 +102,7 @@ dependencies { implementation 'com.squareup.okhttp3:okhttp:3.12.3' implementation 'com.tencent:mmkv:1.2.14' implementation project(':libraries:mogo-adas-data') + implementation project(':core:mogo-core-utils') } task androidSourcesJar(type: Jar) { diff --git a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/PingAddressHelper.java b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/PingAddressHelper.java index e500cc822a..da7434e0c5 100644 --- a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/PingAddressHelper.java +++ b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/PingAddressHelper.java @@ -3,6 +3,7 @@ package com.zhidao.support.adas.high.common; import androidx.annotation.NonNull; import com.zhidao.support.adas.high.AdasOptions; +import com.zhidao.support.adas.high.R; import java.io.BufferedReader; import java.io.IOException; @@ -188,7 +189,8 @@ public class PingAddressHelper { while ((line = in.readLine()) != null) { builder.append(line).append("\n"); } - builder.append("工控机IP：").append(str).append(" 是否可以连通：").append(status == 0 ? "是" : "否"); +// builder.append("工控机IP：").append(str).append(" 是否可以连通：").append(status == 0 ? "是" : "否"); + builder.append(R.string.adas_ipc_ip).append(str).append(R.string.adas_whether_connectable).append(status == 0 ? R.string.adas_connect_yes : R.string.adas_connect_no); CupidLogUtils.i(TAG, builder.toString()); return status == 0; } catch (IOException | InterruptedException e) { diff --git a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/ProtocolStatus.java b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/ProtocolStatus.java index 2ed3a7e911..0cbd015e37 100644 --- a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/ProtocolStatus.java +++ b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/ProtocolStatus.java @@ -1,17 +1,20 @@ package com.zhidao.support.adas.high.common; +import com.mogo.eagle.core.utilcode.util.StringUtils; +import com.zhidao.support.adas.high.R; + /** * 数据协议解析状态 */ public enum ProtocolStatus { - SUCCEED(0x00, "数据解析成功"), - MAGIC_CODE_CHECK_FAILED(0x01, "数据头校验失败"), - PACKAGE_LENGTH_CHECK_FAILED(0x02, "数据包长度校验失败"), - MESSAGE_TYPE_UNKNOWN(0x03, "MessageType未知"), - HEADER_DECODE_FAILED(0x04, "Header解析失败"), - BUSINESS_DATA_PARSE_FAILED(0x05, "业务数据解析失败"); + SUCCEED(0x00, StringUtils.getString(R.string.adas_data_parsing_succeeded)), + MAGIC_CODE_CHECK_FAILED(0x01, StringUtils.getString(R.string.adas_data_header_verification_failed)), + PACKAGE_LENGTH_CHECK_FAILED(0x02, StringUtils.getString(R.string.adas_data_package_length_verification_failed)), + MESSAGE_TYPE_UNKNOWN(0x03, StringUtils.getString(R.string.adas_message_type_unknown)), + HEADER_DECODE_FAILED(0x04, StringUtils.getString(R.string.adas_header_parsing_failed)), + BUSINESS_DATA_PARSE_FAILED(0x05, StringUtils.getString(R.string.adas_business_data_parsing_failed)); public final int code; 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 a376ee8557..b730d20695 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 @@ -173,11 +173,11 @@ public class ReceiveTimeoutManager { } if (TextUtils.isEmpty(type) || TextUtils.isEmpty(type1)) { type = isTimeout - ? "超时时间：" - : "最后刷新时间时间差："; + ? context.getString(R.string.adas_timeout_duration) + : context.getString(R.string.adas_last_refresh_time_interval); type1 = isHaveIpcHeartbeat - ? "最后一条Telematics心跳接收时间" - : "最后一条Telematics数据发送时间"; + ? context.getString(R.string.adas_last_telematics_heartbeat_receive_time) + : context.getString(R.string.adas_last_telematics_data_send_time); } return String.format(Locale.getDefault(), "%s%dms %s：%d", diff --git a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/msg/CloudControlMessage.java b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/msg/CloudControlMessage.java index 0d6dfb8fea..2b4a2fdad7 100644 --- a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/msg/CloudControlMessage.java +++ b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/msg/CloudControlMessage.java @@ -1515,14 +1515,14 @@ public class CloudControlMessage extends MyAbstractMessageHandler { @Override public String toString() { return "Packet{" + - "原始数据=" + ByteUtil.byteArrToHex(original) + - ", 标识位=0x" + Integer.toHexString(marker & 0xFF) + - ", 负载数据长度=" + payloadLength + - ", 数据类型=" + cloudDataType + - ", 版本=" + (version & 0xFF) + - ", 时间戳=" + timestamp + - ", 控制=" + (control & 0xFF) + - ", 负载数据=" + (payload == null ? null : ByteUtil.byteArrToHex(payload.toByteArray())) + + "raw_data=" + ByteUtil.byteArrToHex(original) + + ", marker=0x" + Integer.toHexString(marker & 0xFF) + + ", payloadLength=" + payloadLength + + ", cloudDataType=" + cloudDataType + + ", version=" + (version & 0xFF) + + ", timestamp=" + timestamp + + ", control=" + (control & 0xFF) + + ", payload=" + (payload == null ? null : ByteUtil.byteArrToHex(payload.toByteArray())) + '}'; } } diff --git a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/msg/V2nNioCrossoverEventAndOtherRetrogradeEventMessage.java b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/msg/V2nNioCrossoverEventAndOtherRetrogradeEventMessage.java index 4350431594..52abdfcd4e 100644 --- a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/msg/V2nNioCrossoverEventAndOtherRetrogradeEventMessage.java +++ b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/msg/V2nNioCrossoverEventAndOtherRetrogradeEventMessage.java @@ -20,7 +20,7 @@ public class V2nNioCrossoverEventAndOtherRetrogradeEventMessage extends MyAbstra public V2nNioCrossoverEventAndOtherRetrogradeEventMessage(MessagePad.MessageType messageType) { this.messageType = messageType; - TAG = messageType == MessageType.TYPE_RECEIVE_V2N_NIO_CROSSOVER_EVENT.typeCode ? "V2N NIO行人横穿（路侧）" : "V2N NIO他车逆行（路侧）"; + TAG = messageType == MessageType.TYPE_RECEIVE_V2N_NIO_CROSSOVER_EVENT.typeCode ? "V2N NIO roadside_pedestrian_crossing" : "V2N NIO roadside_other_vehicle_retrograde"; } @Override diff --git a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/socket/FpgaSocket.java b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/socket/FpgaSocket.java index e48655e83d..803ea8237d 100644 --- a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/socket/FpgaSocket.java +++ b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/socket/FpgaSocket.java @@ -14,7 +14,9 @@ import android.util.Log; import androidx.annotation.NonNull; import com.google.protobuf.InvalidProtocolBufferException; +import com.mogo.eagle.core.utilcode.util.StringUtils; import com.zhidao.support.adas.high.AdasChannel; +import com.zhidao.support.adas.high.R; import com.zhidao.support.adas.high.common.CupidLogUtils; import com.zhidao.support.adas.high.common.ReceiveTimeoutManager; import com.zhidao.support.adas.high.common.ReconnectManager; @@ -373,13 +375,13 @@ public class FpgaSocket implements IWebSocket { String closeReason = null; AdasConstants.IpcConnectionStatus s = status.get(); if (s == AdasConstants.IpcConnectionStatus.DISCONNECTED) { - closeReason = "用户主动关闭"; + closeReason = StringUtils.getString(R.string.adas_user_active_close); } else if (s == AdasConstants.IpcConnectionStatus.CERTIFICATION_FAILED) { - closeReason = "认证失败"; + closeReason = StringUtils.getString(R.string.adas_authentication_failed); } else if (s == AdasConstants.IpcConnectionStatus.HEARTBEAT_TIMEOUT) { - closeReason = "心跳超时"; + closeReason = StringUtils.getString(R.string.adas_heartbeat_timeout); } else if (s == AdasConstants.IpcConnectionStatus.PROTOCOL_MISMATCH) { - closeReason = "協議不匹配"; + closeReason = StringUtils.getString(R.string.adas_protocol_mismatch); } boolean isClose = mWebSocket.close(code, closeReason); CupidLogUtils.log(TAG, "WebSocket code=" + code + " isCancel=" + isCancel + " 断开连接是否成功= " + isClose); diff --git a/libraries/mogo-adas/src/main/res/values/strings.xml b/libraries/mogo-adas/src/main/res/values/strings.xml index 3ec8098563..c90a8d91d4 100644 --- a/libraries/mogo-adas/src/main/res/values/strings.xml +++ b/libraries/mogo-adas/src/main/res/values/strings.xml @@ -4,6 +4,10 @@ 最后刷新时间时间差： 最后一条Telematics心跳接收时间 最后一条Telematics数据发送时间 + 超时时间： + 最后刷新时间时间差： + 最后一条Telematics心跳接收时间 + 最后一条Telematics数据发送时间 @@ -52,9 +56,19 @@ 未知系统模式 SSM超时无响应 FSM超时无响应 - - - - - + 工控机IP： + 是否可以连通： + 是 + 否 + 数据解析成功 + 数据头校验失败 + 数据包长度校验失败 + MessageType未知 + Header解析失败 + 业务数据解析失败 + 用户主动关闭 + 认证失败 + 心跳超时 + 协议不匹配 +