From 56913c6f7f0a8131eb9a1b09842d430ae0182c12 Mon Sep 17 00:00:00 2001 From: xinfengkun Date: Fri, 7 Nov 2025 14:25:23 +0800 Subject: [PATCH] =?UTF-8?q?[8.2.8][i18n]=20adas-data=20ReceiveTimeoutManag?= =?UTF-8?q?er.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 -