diff --git a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasListenerImpl.java b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasListenerImpl.java index b4e1860e4a..9e5ec04f04 100644 --- a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasListenerImpl.java +++ b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasListenerImpl.java @@ -162,9 +162,15 @@ public class MoGoAdasListenerImpl implements OnAdasListener { autopilotStatusInfo.setRadar(autopilotStatusValues.getRadar()); autopilotStatusInfo.setSpeed(autopilotStatusValues.getSpeed()); // 初始化自动驾驶状态信息 - autopilotStatusInfo.setVersion(AdasManager.getInstance().getAdasConfig().getVersion()); - autopilotStatusInfo.setConnectIP(AdasManager.getInstance().getAdasConfig().getAddress()); - autopilotStatusInfo.setDockVersion(AdasManager.getInstance().getAdasConfig().getDockVersion()); + if (autopilotStatusInfo.getVersion() == null) { + autopilotStatusInfo.setVersion(AdasManager.getInstance().getAdasConfig().getVersion()); + } + if (autopilotStatusInfo.getConnectIP() == null) { + autopilotStatusInfo.setConnectIP(AdasManager.getInstance().getAdasConfig().getAddress()); + } + if (autopilotStatusInfo.getDockVersion() == null) { + autopilotStatusInfo.setDockVersion(AdasManager.getInstance().getAdasConfig().getDockVersion()); + } CallerAutoPilotStatusListenerManager.INSTANCE.invokeAutoPilotStatus(); } 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 f08fd8433a..faf450483d 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 @@ -1,6 +1,7 @@ package com.mogo.eagle.core.function.hmi.ui.setting import android.content.Context +import android.text.Html import android.util.AttributeSet import android.view.LayoutInflater import android.view.View @@ -371,7 +372,7 @@ class DebugSettingView @JvmOverloads constructor( AppConfigInfo.isConnectSocket = DebugConfig.isDownloadSnapshot() // 将数据绘制 - tvAppInfo.text = AppConfigInfo.toString() + tvAppInfo.text =Html.fromHtml( AppConfigInfo.toString()) } /** diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml index 363871d735..3c2f36e4ae 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml @@ -31,27 +31,6 @@ android:textSize="@dimen/dp_28" android:textStyle="bold" /> - - -------------------应用信息--------------------
" + + "应用名称:${appName}
" + + "应用版本号:${appVersionCode}
" + + "应用版本名称:${appVersionName}
" + + "------------------Git信息---------------------
" + + "Git分支名称:
${workingBranchName}
" + + "Git分支HASH:${workingBranchHash}
" + + "------------------依赖信息---------------------
" + + "MAP-SDK版本:${mapSdkVersion}
" + + "ADAS-SDK版本:${adasSdkVersion}
" + + "OBU-SDK版本:${obuSdkVersion}
" + + "------------------鉴权信息---------------------
" + + "PAD唯一标志:${uniqueDeviceId}
" + + //"mogoToken:${mogoToken}
"+ + "中台分配的SN:${mogoSN}
" + + "------------------连接信息---------------------
" + "当前网络服务连接:${netMode} -- ${ - (when (netMode) { + when (netMode) { 2 -> { "测试环境" } @@ -88,10 +80,35 @@ object AppConfigInfo { else -> { "未知环境" } - }) - }\n" + - "Socket是否正常:${isConnectSocket}\n" + - "ADAS连接是否正常:${isConnectAutopilot}\n" + - "OBU连接是否正常:${isConnectObu}\n" + } + }
" + + "网络是否正常:${ + if (isConnectNet) { + "" + } else { + "" + } + }${isConnectNet}
" + + "Socket是否正常:${ + if (isConnectSocket) { + "" + } else { + "" + } + }${isConnectSocket}
" + + "ADAS连接是否正常:${ + if (isConnectAutopilot) { + "" + } else { + "" + } + }${isConnectAutopilot}
" + + "OBU连接是否正常:${ + if (isConnectObu) { + "" + } else { + "" + } + }${isConnectObu}
" } } \ No newline at end of file