From ecde707c81d1e5a84357b96109641fb8ad44009c Mon Sep 17 00:00:00 2001 From: xuxinchao <13522809046@163.com> Date: Mon, 25 Apr 2022 15:04:11 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E8=AF=95=E7=AA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1、修改工控机协议版本获取方式 2、修改默认值显示 --- .../core/function/hmi/ui/setting/DebugSettingView.kt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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 3ab3c27cc9..9eb94d9601 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 @@ -1408,7 +1408,11 @@ class DebugSettingView @JvmOverloads constructor( tvObuSdkVersion.text = "OBU-SDK版本：${AppConfigInfo.obuSdkVersion}" tvAutopilotProtocolVersionInfo.text = "Autopilot协议版本：${CallerAutoPilotManager.getProtocolVersion()}" - tvIpcProtocolVersionInfo.text = "工控机协议版本：${AppConfigInfo.protocolVersionNumber}" + if(AppConfigInfo.protocolVersionNumber==0){ + tvIpcProtocolVersionInfo.text="工控机协议版本：未知" + }else{ + tvIpcProtocolVersionInfo.text = "工控机协议版本：${AppConfigInfo.protocolVersionNumber}" + } tvMoGoMapVersion.text = "HD-Map版本：${MogoMap.getInstance().mogoMap.mapVersion}" tvGitBranchInfo.text = "Git分支：${AppConfigInfo.workingBranchName}" tvGitHashInfo.text = "Git-Hash：${AppConfigInfo.workingBranchHash}" @@ -1609,7 +1613,7 @@ class DebugSettingView @JvmOverloads constructor( carConfigResp.let { AppConfigInfo.plateNumber = it.plateNumber//车牌号 AppConfigInfo.iPCMacAddress = it.macAddress//工控机MAC地址 - AppConfigInfo.protocolVersionNumber = it.protocolVersion.number//工控机协议版本 + AppConfigInfo.protocolVersionNumber = it.protocolVersionValue//工控机协议版本 } }