From fcbb481e0155bf05dd8597f629442fba9922c862 Mon Sep 17 00:00:00 2001
From: lixiaopeng <lixiaopeng@zhidaoauto.com>
Date: Thu, 1 Dec 2022 18:13:38 +0800
Subject: [PATCH] =?UTF-8?q?2.13.0=20obu=E5=BC=80=E5=85=B3=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=8C=BA=E5=9F=9F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hmi/ui/setting/DebugSettingView.kt        |  7 +-
 .../main/res/layout/view_debug_setting.xml    | 84 ++++++++++---------
 2 files changed, 48 insertions(+), 43 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 8acf02e5ae..65fa14e813 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
@@ -384,11 +384,14 @@ class DebugSettingView @JvmOverloads constructor(
                 //展示OBU控制中心
                 obuControllerLayout.visibility = View.VISIBLE
                 tbVehicleStateController.isChecked = true
+                //展示HMI控制中心
+                hmiObuLayout.visibility = View.VISIBLE
             } else {
                 buttonView.setCompoundDrawables(null, null, iconRight, null)
                 //隐藏OBU控制中心
                 obuControllerLayout.visibility = View.GONE
                 tbVehicleStateController.isChecked = false
+                hmiObuLayout.visibility = View.GONE
             }
         }
 
@@ -2078,9 +2081,7 @@ class DebugSettingView @JvmOverloads constructor(
      * 时延显示
      */
     override fun onObuV2iDelayTime(delayTime: Long) {
-        ThreadUtils.runOnUiThread {
-            tvObuDelay.text = "obu时延：" + delayTime.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 b8a2f334e9..4ec2b8f47a 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
@@ -969,6 +969,7 @@
 
                 </LinearLayout>
 
+                <!-- OBU 配置 start -->
                 <ToggleButton
                     android:id="@+id/tbObuController"
                     android:layout_width="match_parent"
@@ -1042,16 +1043,52 @@
                         android:background="#F0F0F0"
                         app:layout_constraintTop_toBottomOf="@id/tvObuInfo" />
 
-                    <TextView
-                        android:id="@+id/tvObuDelay"
+                    <GridLayout
+                        android:id="@+id/hmiObuLayout"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_margin="@dimen/dp_10"
-                        android:text="obu时延:"
-                        android:textColor="#000"
-                        android:textSize="@dimen/dp_24"
-                        app:layout_constraintTop_toBottomOf="@id/obuDivider2" />
+                        android:columnCount="2"
+                        android:visibility="gone"
+                        tools:visibility="visible"
+                        app:layout_constraintTop_toBottomOf="@id/obuDivider2"
+                        tools:ignore="MissingConstraints">
+
+                        <ToggleButton
+                            android:id="@+id/tbObuWeaknessTraffic"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_columnWeight="1"
+                            android:layout_margin="2dp"
+                            android:gravity="center"
+                            android:textOff="关闭路侧弱势群体预警"
+                            android:textOn="打开路侧弱势群体预警"
+                            android:textSize="@dimen/dp_24" />
+
+                        <ToggleButton
+                            android:id="@+id/tbCloudWeaknessTraffic"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_columnWeight="1"
+                            android:layout_margin="2dp"
+                            android:gravity="center"
+                            android:textOff="开启云端弱势群体预警"
+                            android:textOn="关闭云端弱势群体预警"
+                            android:textSize="@dimen/dp_24" />
+
+                        <ToggleButton
+                            android:id="@+id/tbRoadLimitSpeed"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_columnWeight="1"
+                            android:layout_margin="2dp"
+                            android:gravity="center"
+                            android:textOff="关闭路侧限速"
+                            android:textOn="获取路侧限速"
+                            android:textSize="@dimen/dp_24" />
+
+                    </GridLayout>
                 </androidx.constraintlayout.widget.ConstraintLayout>
+                <!-- OBU 配置 end -->
 
                 <ToggleButton
                     android:id="@+id/tbEagleEyeController"
@@ -1357,39 +1394,6 @@
                         android:textOn="关闭「引导线动态效果」"
                         android:textSize="@dimen/dp_24" />
 
-                    <ToggleButton
-                        android:id="@+id/tbObuWeaknessTraffic"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_columnWeight="1"
-                        android:layout_margin="2dp"
-                        android:gravity="center"
-                        android:textOff="关闭路侧弱势群体预警"
-                        android:textOn="打开路侧弱势群体预警"
-                        android:textSize="@dimen/dp_24" />
-
-                    <ToggleButton
-                        android:id="@+id/tbCloudWeaknessTraffic"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_columnWeight="1"
-                        android:layout_margin="2dp"
-                        android:gravity="center"
-                        android:textOff="开启云端弱势群体预警"
-                        android:textOn="关闭云端弱势群体预警"
-                        android:textSize="@dimen/dp_24" />
-
-                    <ToggleButton
-                        android:id="@+id/tbRoadLimitSpeed"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_columnWeight="1"
-                        android:layout_margin="2dp"
-                        android:gravity="center"
-                        android:textOff="关闭路侧限速"
-                        android:textOn="获取路侧限速"
-                        android:textSize="@dimen/dp_24" />
-
                     <androidx.appcompat.widget.AppCompatEditText
                         android:id="@+id/etThreshold"
                         android:layout_width="wrap_content"