From 3fc6417afa3db8e9d6a888a46f17aad24dcb1c27 Mon Sep 17 00:00:00 2001
From: lixiaopeng <lixiaopeng@zhidaoauto.com>
Date: Tue, 21 Mar 2023 10:51:51 +0800
Subject: [PATCH] =?UTF-8?q?[dev=5Farch=5Fopt=5F3.0]=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E8=B0=83=E8=AF=95=E9=9D=A2=E6=9D=BF=E5=BC=80=E5=85=B3?=
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   | 16 ----------------
 2 files changed, 4 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 db71c709e7..e6bb0e1390 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
@@ -2,6 +2,7 @@ package com.mogo.eagle.core.function.hmi.ui.setting
 
 import android.content.Context
 import android.util.AttributeSet
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import androidx.constraintlayout.widget.ConstraintLayout
@@ -71,20 +72,18 @@ internal class SOPSettingView @JvmOverloads constructor(
         }
 
         /**
-         * obu弱势交通控制
+         * obu弱势交通控制, 默认开启
          */
         tbObuWeaknessTrafficSop.isChecked = HmiBuildConfig.isShowObuWeaknessTrafficView
         tbObuWeaknessTrafficSop.setOnCheckedChangeListener { _, isChecked ->
-            // 默认开启
-            HmiBuildConfig.isShowObuWeaknessTrafficView = !isChecked
+            HmiBuildConfig.isShowObuWeaknessTrafficView = isChecked
         }
 
         /**
-         * 云端弱势交通控制
+         * 云端弱势交通控制  默认关闭
          */
         tbCloudWeaknessTrafficSop.isChecked = HmiBuildConfig.isShowCloudWeaknessTrafficView
         tbCloudWeaknessTrafficSop.setOnCheckedChangeListener { _, isChecked ->
-            // 默认关闭
             HmiBuildConfig.isShowCloudWeaknessTrafficView = isChecked
         }
 
@@ -93,7 +92,6 @@ internal class SOPSettingView @JvmOverloads constructor(
          */
         tbObuV2vView.isChecked = HmiBuildConfig.isShowObuV2vView
         tbObuV2vView.setOnCheckedChangeListener { _, isChecked ->
-            // 默认关闭
             HmiBuildConfig.isShowObuV2vView = isChecked
         }
 
@@ -105,14 +103,6 @@ internal class SOPSettingView @JvmOverloads constructor(
             HmiBuildConfig.isShowObuV2iView = isChecked
         }
 
-        /**
-         * obu 数据通过dc 传输V2i事件 开关 TODO pm确定下开关功能 HmiBuildConfig.isShowObuToDcV2iView
-         */
-        tbObuToDcView.setOnCheckedChangeListener { _, isChecked ->
-            // 默认开启
-            HmiBuildConfig.isShowObuToDcV2iView = !isChecked
-        }
-
         //红绿灯标识
         tbTrafficLight.isChecked = HmiBuildConfig.isShowTrafficLightView
         tbTrafficLight.setOnCheckedChangeListener { _, isChecked ->
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 cb84b6d654..3ccfc31835 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,22 +163,6 @@
         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"
-        android:scaleX="1.2"
-        app:layout_constraintTop_toBottomOf="@id/tbObuV2vView"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toLeftOf="@id/verticalGuideLine"
-        />
-
     <androidx.appcompat.widget.SwitchCompat
         android:id="@+id/tbObuWeaknessTrafficSop"
         android:layout_width="wrap_content"