From d0e7cef076bfdfae99271e4f52b8ac2127962d2d Mon Sep 17 00:00:00 2001
From: donghongyu <donghongyu@zhidaoauto.com>
Date: Wed, 16 Feb 2022 12:08:48 +0800
Subject: [PATCH] =?UTF-8?q?[Change]=20=E7=BE=8E=E5=8C=96=E8=B0=83=E8=AF=95?=
 =?UTF-8?q?=E9=9D=A2=E6=9D=BF=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
---
 .../adapter/MoGoAdasListenerImpl.java         | 12 ++-
 .../hmi/ui/setting/DebugSettingView.kt        |  3 +-
 .../main/res/layout/view_debug_setting.xml    | 21 -----
 .../mogo/eagle/core/data/app/AppConfigInfo.kt | 77 +++++++++++--------
 4 files changed, 58 insertions(+), 55 deletions(-)

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" />
 
-                <!-- <LinearLayout
-                     android:layout_width="wrap_content"
-                     android:layout_height="wrap_content">
-
-                     <TextView
-                         android:layout_width="wrap_content"
-                         android:layout_height="wrap_content"
-                         android:text="PAD系统时间："
-                         android:textColor="#000"
-                         android:textSize="@dimen/dp_36" />
-
-                     <TextClock
-                         android:id="@+id/tvNowTime"
-                         android:layout_width="wrap_content"
-                         android:layout_height="wrap_content"
-                         android:format12Hour="yyyy年MM月dd日  EEEE  aa  HH:mm:ss"
-                         android:format24Hour="yyyy年MM月dd日  EEEE  aa  HH:mm:ss"
-                         android:textColor="#000"
-                         android:textSize="@dimen/dp_36" />
-                 </LinearLayout>-->
-
                 <TextView
                     android:id="@+id/tvAppInfo"
                     android:layout_width="match_parent"
diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/app/AppConfigInfo.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/app/AppConfigInfo.kt
index a786bdad16..0e05f8996e 100644
--- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/app/AppConfigInfo.kt
+++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/app/AppConfigInfo.kt
@@ -48,34 +48,26 @@ object AppConfigInfo {
     // GPS数据提供源： 0-Android系统，1-工控机，2-OBU
     var GPS_PROVIDER = 1
 
-    // 是否在地图上绘制感知元素
-    // 网络下发 false--不绘制，true--绘制
-    var TRAFFIC_PROVIDER_NET_STATUS = false
-
-    // 域控制器 false--不绘制，true--绘制
-    var TRAFFIC_PROVIDER_AUTOPILOT_STATUS = true
-
-    // OBU false--不绘制，true--绘制
-    var TRAFFIC_PROVIDER_OBU_STATUS = false
-
-    // 进入应用的地图模式。0-2D模式，1-VR模式
-    var MAP_STYLE_MODE = 1
 
     override fun toString(): String {
-        return "应用名称：${appName}\n" +
-                "应用版本：${appVersionCode}\n" +
-                "应用版本名称：${appVersionName}\n" +
-                "Git分支名称：${workingBranchName}\n" +
-                "Git分支HASH：${workingBranchHash}\n" +
-                "HD-MAP-SDK版本：${mapSdkVersion}\n" +
-                "ADAS-SDK版本：${adasSdkVersion}\n" +
-                "OBU-SDK版本：${obuSdkVersion}\n" +
-                "PAD唯一标志：${uniqueDeviceId}\n" +
-                //"mogoToken：${mogoToken}\n"+
-                "中台分配的SN：${mogoSN}\n" +
-                "网络是否正常：${isConnectNet}\n" +
+        return "<font color='red' size='30'>-------------------应用信息--------------------</font><br/>" +
+                "应用名称：${appName}<br/>" +
+                "应用版本号：${appVersionCode}<br/>" +
+                "应用版本名称：${appVersionName}<br/>" +
+                "<font color='red' size='30'>------------------Git信息---------------------</font><br/>" +
+                "Git分支名称：<br/>${workingBranchName}<br/>" +
+                "Git分支HASH：${workingBranchHash}<br/>" +
+                "<font color='red' size='30'>------------------依赖信息---------------------</font><br/>" +
+                "MAP-SDK版本：${mapSdkVersion}<br/>" +
+                "ADAS-SDK版本：${adasSdkVersion}<br/>" +
+                "OBU-SDK版本：${obuSdkVersion}<br/>" +
+                "<font color='red' size='30'>------------------鉴权信息---------------------</font><br/>" +
+                "PAD唯一标志：${uniqueDeviceId}<br/>" +
+                //"mogoToken：${mogoToken}<br/>"+
+                "中台分配的SN：${mogoSN}<br/>" +
+                "<font color='red' size='30'>------------------连接信息---------------------</font><br/>" +
                 "当前网络服务连接：${netMode} -- ${
-                    (when (netMode) {
+                    when (netMode) {
                         2 -> {
                             "测试环境"
                         }
@@ -88,10 +80,35 @@ object AppConfigInfo {
                         else -> {
                             "未知环境"
                         }
-                    })
-                }\n" +
-                "Socket是否正常：${isConnectSocket}\n" +
-                "ADAS连接是否正常：${isConnectAutopilot}\n" +
-                "OBU连接是否正常：${isConnectObu}\n"
+                    }
+                }<br/>" +
+                "网络是否正常：${
+                    if (isConnectNet) {
+                        "<font color='green'>"
+                    } else {
+                        "<font color='red'>"
+                    }
+                }${isConnectNet}</font><br/>" +
+                "Socket是否正常：${
+                    if (isConnectSocket) {
+                        "<font color='green'>"
+                    } else {
+                        "<font color='red'>"
+                    }
+                }${isConnectSocket}</font><br/>" +
+                "ADAS连接是否正常：${
+                    if (isConnectAutopilot) {
+                        "<font color='green'>"
+                    } else {
+                        "<font color='red'>"
+                    }
+                }${isConnectAutopilot}</font><br/>" +
+                "OBU连接是否正常：${
+                    if (isConnectObu) {
+                        "<font color='green'>"
+                    } else {
+                        "<font color='red'>"
+                    }
+                }${isConnectObu}</font><br/>"
     }
 }
\ No newline at end of file