From 961b06f9a233c81dc3370a0ea9b2a1c1fa29ee80 Mon Sep 17 00:00:00 2001
From: lixiaopeng <lixiaopeng@zhidaoauto.com>
Date: Wed, 15 Mar 2023 15:46:15 +0800
Subject: [PATCH] =?UTF-8?q?[dev=5Farch=5Fopt=5F3.0]=20=E4=BC=98=E5=8C=96ob?=
 =?UTF-8?q?u=E4=BF=A1=E6=81=AF=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hmi/ui/setting/DebugSettingView.kt        |  6 +-
 .../main/res/layout/view_debug_setting.xml    | 62 +++++++++----------
 2 files changed, 32 insertions(+), 36 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 b784faaac9..bdac5fc95c 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
@@ -564,7 +564,7 @@ internal class DebugSettingView @JvmOverloads constructor(
         setLogCheckedChangeListener()
 
         //OBU配置信息
-        tvObuInfo.text = CallerObuConnectListenerManager.getObuStatusInfoJsonString()
+//        tvObuInfo.text = CallerObuConnectListenerManager.getObuStatusInfoJsonString()
 
         //工控机配置信息
         tvAutopilotInfo.text =
@@ -1637,7 +1637,7 @@ internal class DebugSettingView @JvmOverloads constructor(
 
         //obu TODO 后面会添加很多os那边需要显示的内容
         obuVersionNameTv.text = Html.fromHtml(
-            "OBU版本号：$mObuVersionName"
+            "OBU信息：$mObuVersionName"
         )
 
         obuConnectStatusTv.text = Html.fromHtml(
@@ -1657,7 +1657,7 @@ internal class DebugSettingView @JvmOverloads constructor(
      */
     override fun onConnectStatus(obuStatusInfo: ObuStatusInfo) {
         lifecycleOwner.lifecycleScope.launch {
-            tvObuInfo.text = GsonUtils.toJson(obuStatusInfo)
+//            tvObuInfo.text = GsonUtils.toJson(obuStatusInfo)
 
             AppConfigInfo.obuSdkVersion = obuStatusInfo.obuSdkVersion
             AppConfigInfo.isConnectObu = obuStatusInfo.obuStatus
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 0ab7cf9f74..d044cb3c01 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
@@ -1085,16 +1085,16 @@
                         android:background="#F0F0F0"
                         app:layout_constraintTop_toBottomOf="@id/btnSetObuIP" />
 
-                    <TextView
-                        android:id="@+id/tvObuInfo"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_margin="@dimen/dp_5"
-                        android:minLines="4"
-                        android:text="OBU配置信息"
-                        android:textColor="#000"
-                        android:textSize="@dimen/dp_24"
-                        app:layout_constraintTop_toBottomOf="@id/obuDivider" />
+<!--                    <TextView-->
+<!--                        android:id="@+id/tvObuInfo"-->
+<!--                        android:layout_width="match_parent"-->
+<!--                        android:layout_height="wrap_content"-->
+<!--                        android:layout_margin="@dimen/dp_5"-->
+<!--                        android:minLines="3"-->
+<!--                        android:text="OBU配置信息"-->
+<!--                        android:textColor="#000"-->
+<!--                        android:textSize="@dimen/dp_24"-->
+<!--                        app:layout_constraintTop_toBottomOf="@id/obuDivider" />-->
 
                     <LinearLayout
                         android:id="@+id/obuStatusCenterLayout"
@@ -1103,30 +1103,26 @@
                         android:orientation="vertical"
                         android:visibility="visible"
                         tools:visibility="visible"
-                        app:layout_constraintTop_toBottomOf="@id/tvObuInfo"
+                        app:layout_constraintTop_toBottomOf="@id/obuDivider"
                         tools:ignore="MissingConstraints">
-
-                    <TextView
-                        android:id="@+id/obuVersionNameTv"
-                        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/obuConnectStatusTv"
-                        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/obuConnectStatusTv"
+                            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/obuVersionNameTv"
+                            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" />
 
                     </LinearLayout>