From 613598ee4a92615f28fa58f2dbb2e1e40db7e727 Mon Sep 17 00:00:00 2001
From: xuxinchao <13522809046@163.com>
Date: Fri, 13 May 2022 19:16:16 +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

版本信息模块增加工控机镜像信息
---
 .../hmi/ui/setting/DebugSettingView.kt        | 24 ++-----------------
 .../main/res/layout/view_debug_setting.xml    | 11 +++++++++
 2 files changed, 13 insertions(+), 22 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 d8bd0bf1f4..7b60224762 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
@@ -116,20 +116,7 @@ class DebugSettingView @JvmOverloads constructor(
 
     //日志过滤标签集合
     private val sceneMap = mutableMapOf<String, SceneModule>()
-
-    private var dockerRebootDialog: DockerRebootDialog? = null  //docker重启对话框
-    private var adUpgradeDialog: AdUpgradeDialog? = null //工控机升级对话框
-    private var upgradeMode: Int = -1 //升级模式
-    private var downloadStatus: Int = -1 //下载状态
-    private var currentProgress: Int = -1 //当前已下载包体大小
-    private var previousProgress: Int = -1 //前一秒的下载进度，用于计算下载剩余时间
-    private var totalProgress: Int = -1 //包体总大小
-    private var downloadVersion: String? = null //工控机docker版本
-    private var upgradeStatus: Int = -1 //升级状态
-
-    //ADAS连接状态
-    private var adasConnectStatus: Boolean = false
-
+    
     //OBU连接状态
     private var obuConnectStatus: Boolean = false
 
@@ -1350,6 +1337,7 @@ class DebugSettingView @JvmOverloads constructor(
         } else {
             tvIpcProtocolVersionInfo.text = "工控机协议版本：${AppConfigInfo.protocolVersionNumber}"
         }
+        tvIpcVersionInfo.text = "工控机镜像：${mAutoPilotStatusInfo?.dockVersion}"
         tvMoGoMapVersion.text = "HD-Map版本：${MogoMap.getInstance().mogoMap.mapVersion}"
         tvGitBranchInfo.text = "Git分支：${AppConfigInfo.workingBranchName}"
         tvAppBuildTimeInfo.text = "版本构建时间：${AppConfigInfo.appBuildTime}"
@@ -1513,14 +1501,6 @@ class DebugSettingView @JvmOverloads constructor(
         AppConfigInfo.isConnectAutopilot = autoPilotStatusInfo.connectStatus
         AppConfigInfo.connectStatusDescribe = autoPilotStatusInfo.connectStatusDescribe
 
-//        if (autoPilotStatusInfo.connectStatus) {
-//            adasConnectStatus = true
-//        }
-        //ADAS断开连接，提示异常
-//        if (adasConnectStatus && !autoPilotStatusInfo.connectStatus) {
-//            adasConnectStatus = false
-//            toastMsg("工控机连接断开")
-//        }
     }
 
     override fun onAutopilotCarStateData(gnssInfo: MessagePad.GnssInfo?) {
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 c0cfc04875..771260a6b6 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
@@ -293,6 +293,17 @@
                     android:layout_height="1dp"
                     android:background="#F0F0F0" />
 
+                <TextView
+                    android:id="@+id/tvIpcVersionInfo"
+                    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/tvMoGoMapVersion"
                     style="@style/DebugSettingText"