From 0bc8b79b73ab7cdd45e39c618279db0a3f6296e3 Mon Sep 17 00:00:00 2001
From: lixiaopeng <lixiaopeng@zhidaoauto.com>
Date: Fri, 3 Mar 2023 16:33:43 +0800
Subject: [PATCH] =?UTF-8?q?[dev=5Farch=5Fopt=5F3.0]=20=E5=8E=BB=E6=8E=89?=
 =?UTF-8?q?=E8=BF=90=E8=90=A5=E9=9D=A2=E6=9D=BF=E6=97=A0=E7=94=A8=E7=9A=84?=
 =?UTF-8?q?=E5=BC=80=E5=85=B3=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../function/hmi/ui/setting/SOPSettingView.kt | 18 +++++----------
 .../src/main/res/layout/view_sop_setting.xml  | 22 +++++--------------
 2 files changed, 10 insertions(+), 30 deletions(-)

diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt
index 116662754b..8861936c58 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt
@@ -73,11 +73,11 @@ internal class SOPSettingView @JvmOverloads constructor(
         /**
          * obu弱势交通控制
          */
-        tbObuWeaknessTrafficSop.isChecked = HmiBuildConfig.isShowObuWeaknessTrafficView
-        tbObuWeaknessTrafficSop.setOnCheckedChangeListener { _, isChecked ->
-            // 默认开启
-            HmiBuildConfig.isShowObuWeaknessTrafficView = !isChecked
-        }
+//        tbObuWeaknessTrafficSop.isChecked = HmiBuildConfig.isShowObuWeaknessTrafficView
+//        tbObuWeaknessTrafficSop.setOnCheckedChangeListener { _, isChecked ->
+//            // 默认开启
+//            HmiBuildConfig.isShowObuWeaknessTrafficView = !isChecked
+//        }
 
         /**
          * 云端弱势交通控制
@@ -88,14 +88,6 @@ internal class SOPSettingView @JvmOverloads constructor(
             HmiBuildConfig.isShowCloudWeaknessTrafficView = isChecked
         }
 
-        /**
-         * 限速数据来源开关
-         */
-        tbRoadLimitSpeedSop.setOnCheckedChangeListener { _, isChecked ->
-            // 默认关闭
-            HmiBuildConfig.isShowObuLimitSpeedView = isChecked
-        }
-
         /**
          * obu V2V开关，默认打开
          */
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_sop_setting.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_sop_setting.xml
index 4558cc99a4..38db5038ad 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_sop_setting.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_sop_setting.xml
@@ -163,11 +163,13 @@
         app:layout_constraintRight_toRightOf="parent"
         />
 
+    <!--这个后面产品会统一去掉-->
     <androidx.appcompat.widget.SwitchCompat
         android:id="@+id/tbObuToDcView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="OBU到工控机V2I显示"
+        android:visibility="gone"
         android:paddingTop="25dp"
         android:paddingBottom="25dp"
         android:scaleY="1.2"
@@ -200,7 +202,7 @@
         android:paddingBottom="25dp"
         android:scaleY="1.2"
         android:scaleX="1.2"
-        app:layout_constraintTop_toBottomOf="@id/tbObuToDcView"
+        app:layout_constraintTop_toBottomOf="@id/tbObuV2vView"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toLeftOf="@id/verticalGuideLine"
         />
@@ -214,31 +216,17 @@
         android:paddingBottom="25dp"
         android:scaleY="1.2"
         android:scaleX="1.2"
-        app:layout_constraintTop_toBottomOf="@id/tbObuToDcView"
+        app:layout_constraintTop_toBottomOf="@id/tbObuWeaknessTrafficSop"
         app:layout_constraintLeft_toRightOf="@id/verticalGuideLine"
         app:layout_constraintRight_toRightOf="parent"
         />
 
-    <androidx.appcompat.widget.SwitchCompat
-        android:id="@+id/tbRoadLimitSpeedSop"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="路侧限速提醒"
-        android:paddingTop="25dp"
-        android:paddingBottom="25dp"
-        android:scaleY="1.2"
-        android:scaleX="1.2"
-        app:layout_constraintTop_toBottomOf="@id/tbCloudWeaknessTrafficSop"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toLeftOf="@id/verticalGuideLine"
-        />
-
     <TextView
         android:id="@+id/tvSpeedThresholdTitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tbRoadLimitSpeedSop"
+        app:layout_constraintTop_toBottomOf="@id/tbCloudWeaknessTrafficSop"
         android:text="变道速度阈值："
         android:textSize="@dimen/dp_36"
         android:textColor="#1A1A1A"