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 461cf45baa..a1b21d7fe7 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
@@ -1366,6 +1366,7 @@ class DebugSettingView @JvmOverloads constructor(
* 设备绑定关系
*/
tvPadSn.text = "PAD中台生成SN:${AppConfigInfo.mogoSN}"
+ tvPadSnKey.text = "PAD中台生成SN:${AppConfigInfo.mogoSN}"
tvPadCopyrightId.text = "PAD数字版权ID:${AppConfigInfo.widevineIDMd5}"
tvIPCMac.text = "工控机MAC:${AppConfigInfo.iPCMacAddress}"
tvUniqueDeviceId.text = "PAD唯一标志:${AppConfigInfo.uniqueDeviceId}"
@@ -1375,6 +1376,8 @@ class DebugSettingView @JvmOverloads constructor(
* 版本信息
*/
tvAppVersionName.text = "鹰眼版本名:${AppUtils.getAppVersionName()}"
+ tvAppVersionNameKey.text = "鹰眼版本名:${AppUtils.getAppVersionName()}"
+
tvAutopilotProtocolVersionInfo.text =
"Autopilot协议版本:${CallerAutoPilotManager.getProtocolVersion()}"
if (AppConfigInfo.protocolVersionNumber == 0) {
@@ -1382,8 +1385,10 @@ class DebugSettingView @JvmOverloads constructor(
} else {
tvIpcProtocolVersionInfo.text = "工控机协议版本:${AppConfigInfo.protocolVersionNumber}"
}
- tvIpcVersionInfo.text = "工控机镜像:${mAutoPilotStatusInfo?.dockVersion}"
+ tvIpcVersionInfo.text = "MAP:${mAutoPilotStatusInfo?.dockVersion}"
+ tvIpcVersionInfoKey.text = "MAP:${mAutoPilotStatusInfo?.dockVersion}"
tvMoGoMapVersion.text = "HD-Map版本:${MogoMap.getInstance().mogoMap.mapVersion}"
+ tvMoGoMapVersionKey.text = "HD-Map版本:${MogoMap.getInstance().mogoMap.mapVersion}"
tvGitBranchInfo.text = "Git分支:${AppConfigInfo.workingBranchName}"
tvAppBuildTimeInfo.text = "版本构建时间:${AppConfigInfo.appBuildTime}"
@@ -1452,6 +1457,12 @@ class DebugSettingView @JvmOverloads constructor(
}"
)
+ if(AppConfigInfo.isConnectAutopilot){
+ tvIpcConnectStatus.minLines = 1
+ }else{
+ tvIpcConnectStatus.minLines = 4
+ }
+
tvIpcConnectStatus.text = Html.fromHtml(
"工控机连接状态:${
if (AppConfigInfo.isConnectAutopilot) {
@@ -1526,6 +1537,7 @@ class DebugSettingView @JvmOverloads constructor(
tvAutopilotInfo.text = GsonUtils.toJson(mAutoPilotStatusInfo)
tvIpcInfo.text = GsonUtils.toJson(mAutoPilotStatusInfo)
+ tvIpcInfoKey.text = GsonUtils.toJson(mAutoPilotStatusInfo)
tvCarInfo.text =
"GPS时间:${(mGnssInfo?.satelliteTime?.times(1000))?.toLong()}\n" +
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 cf4407f0b7..6c50eca4b3 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
@@ -3,7 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="@dimen/dp_800"
- android:layout_height="@dimen/dp_999"
+ android:layout_height="@dimen/dp_1100"
android:background="#FFFFFF">
@@ -167,11 +167,70 @@
android:orientation="vertical">
+ />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
998px
999px
1000px
+ 1100px
+ 1200px
1300px
1920px
diff --git a/modules/mogo-module-common/src/main/res/values/dimens.xml b/modules/mogo-module-common/src/main/res/values/dimens.xml
index 3a3061909a..d966a043df 100644
--- a/modules/mogo-module-common/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-common/src/main/res/values/dimens.xml
@@ -1013,6 +1013,8 @@
545.2344px
545.7812px
546.3281px
+ 601.5624px
+ 656.250px
710.9375px
3.2812px
3.8281px