yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[8.3.0] 修复空指针

Browse Source
This commit is contained in:
xinfengkun
2025-12-19 15:04:57 +08:00
parent c24c09d738
commit ce9fa6cc03
3 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/ReceiveTimeoutManager.java
View File

@@ -173,11 +173,11 @@ public class ReceiveTimeoutManager {
} }
if (TextUtils.isEmpty(type) || TextUtils.isEmpty(type1)) { if (TextUtils.isEmpty(type) || TextUtils.isEmpty(type1)) {
type = isTimeout type = isTimeout
? context.getString(R.string.adas_timeout_duration) ? "超时时间："
: context.getString(R.string.adas_last_refresh_time_interval); : "最后刷新时间时间差：";
type1 = isHaveIpcHeartbeat type1 = isHaveIpcHeartbeat
? context.getString(R.string.adas_last_telematics_heartbeat_receive_time) ? "最后一条Telematics心跳接收时间"
: context.getString(R.string.adas_last_telematics_data_send_time); : "最后一条Telematics数据发送时间";
} }
return String.format(Locale.getDefault(), return String.format(Locale.getDefault(),
"%s%dms %s：%d", "%s%dms %s：%d",

5
libraries/mogo-adas/src/main/res/values-en/strings.xml
View File

@@ -4,10 +4,7 @@
<string name="adas_last_refresh_time_difference">Time difference since last refresh:</string> <string name="adas_last_refresh_time_difference">Time difference since last refresh:</string>
<string name="adas_last_receive_heartbeat_time">Last Telematics heartbeat received time</string> <string name="adas_last_receive_heartbeat_time">Last Telematics heartbeat received time</string>
<string name="adas_last_receive_data_time">Last Telematics data sent time</string> <string name="adas_last_receive_data_time">Last Telematics data sent time</string>
<string name="adas_timeout_duration">Timeout period:</string>
<string name="adas_last_refresh_time_interval">Time difference since last refresh:</string>
<string name="adas_last_telematics_heartbeat_receive_time">Last Telematics heartbeat received time</string>
<string name="adas_last_telematics_data_send_time">Last Telematics data sent time</string>
<string-array name="adas_node_info_state"> <string-array name="adas_node_info_state">

4
libraries/mogo-adas/src/main/res/values/strings.xml
View File

@@ -4,10 +4,6 @@
<string name="adas_last_refresh_time_difference">最后刷新时间时间差：</string> <string name="adas_last_refresh_time_difference">最后刷新时间时间差：</string>
<string name="adas_last_receive_heartbeat_time">最后一条Telematics心跳接收时间</string> <string name="adas_last_receive_heartbeat_time">最后一条Telematics心跳接收时间</string>
<string name="adas_last_receive_data_time">最后一条Telematics数据发送时间</string> <string name="adas_last_receive_data_time">最后一条Telematics数据发送时间</string>
<string name="adas_timeout_duration">超时时间：</string>
<string name="adas_last_refresh_time_interval">最后刷新时间时间差：</string>
<string name="adas_last_telematics_heartbeat_receive_time">最后一条Telematics心跳接收时间</string>
<string name="adas_last_telematics_data_send_time">最后一条Telematics数据发送时间</string>
<string-array name="adas_node_info_state"> <string-array name="adas_node_info_state">