调试窗

1、将APP版本、SN、MAP版本、MAP等信息提到一级页面
2、调整调试窗高度

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" +

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">
 
             <TextView
-                android:id="@+id/tvIpcConnectStatus"
+                android:id="@+id/tvAppVersionNameKey"
                 style="@style/DebugSettingText"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:minLines="3"/>
+                />
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="#F0F0F0" />
+
+            <TextView
+                android:id="@+id/tvPadSnKey"
+                style="@style/DebugSettingText"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                />
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="#F0F0F0" />
+
+            <TextView
+                android:id="@+id/tvMoGoMapVersionKey"
+                style="@style/DebugSettingText"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                />
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="#F0F0F0" />
+
+            <TextView
+                android:id="@+id/tvIpcVersionInfoKey"
+                style="@style/DebugSettingText"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+               />
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="#F0F0F0" />
+
+            <TextView
+                android:id="@+id/tvIpcConnectStatus"
+                style="@style/DebugSettingText"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="#F0F0F0" />
+
+            <TextView
+                android:id="@+id/tvIpcInfoKey"
+                style="@style/DebugSettingText"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:minLines="7"/>
 
             <View
                 android:layout_width="match_parent"

modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml

@@ -1017,6 +1017,8 @@
     <dimen name="dp_998">998px</dimen>
     <dimen name="dp_999">999px</dimen>
     <dimen name="dp_1000">1000px</dimen>
+    <dimen name="dp_1100">1100px</dimen>
+    <dimen name="dp_1200">1200px</dimen>
     <dimen name="dp_1300">1300px</dimen>
     <dimen name="dp_1920">1920px</dimen>
 

modules/mogo-module-common/src/main/res/values/dimens.xml

@@ -1013,6 +1013,8 @@
 	<dimen name="dp_997">545.2344px</dimen>
 	<dimen name="dp_998">545.7812px</dimen>
 	<dimen name="dp_999">546.3281px</dimen>
+	<dimen name="dp_1100">601.5624px</dimen>
+	<dimen name="dp_1200">656.250px</dimen>
 	<dimen name="dp_1300">710.9375px</dimen>
 	<dimen name="sp_6">3.2812px</dimen>
 	<dimen name="sp_7">3.8281px</dimen>