From c8fcfc9543e5fda56d166a737243152ebb4e2475 Mon Sep 17 00:00:00 2001
From: lixiaopeng <lixiaopeng@zhidaoauto.com>
Date: Thu, 8 Dec 2022 15:44:57 +0800
Subject: [PATCH] =?UTF-8?q?[2.13.0=20=E4=BF=AE=E6=94=B9=E9=99=90=E9=80=9F?=
 =?UTF-8?q?=E7=9A=84=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/DebugSettingView.kt    |  2 +-
 .../core/function/hmi/ui/setting/SOPSettingView.kt |  6 ++++++
 .../src/main/res/layout/view_debug_setting.xml     |  4 ++--
 .../src/main/res/layout/view_sop_setting.xml       | 14 +++++++++++++-
 .../function/obu/mogo/MogoPrivateObuNewManager.kt  |  1 +
 .../mogo/eagle/core/data/config/HmiBuildConfig.kt  |  2 +-
 6 files changed, 24 insertions(+), 5 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 2a0d1868dd..b36220de4e 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
@@ -1145,7 +1145,7 @@ class DebugSettingView @JvmOverloads constructor(
          * 限速数据，优先使用obu，默认打开
          */
         tbRoadLimitSpeed.setOnCheckedChangeListener { _, isChecked ->
-            HmiBuildConfig.isShowObuLimitSpeedView = !isChecked
+            HmiBuildConfig.isShowObuLimitSpeedView = isChecked
         }
 
         /**
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 b3f44f967d..c4c112f21d 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
@@ -94,6 +95,11 @@ class SOPSettingView @JvmOverloads constructor(
             }
         }
 
+        tbRoadLimitSpeedSop.setOnCheckedChangeListener { _, isChecked ->
+            //默认关闭
+            HmiBuildConfig.isShowObuLimitSpeedView = isChecked
+        }
+
         //红绿灯标识
         tbTrafficLight.isChecked = HmiBuildConfig.isShowTrafficLightView
         tbTrafficLight.setOnCheckedChangeListener { _, isChecked ->
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 4ec2b8f47a..7a32567b16 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
@@ -1082,8 +1082,8 @@
                             android:layout_columnWeight="1"
                             android:layout_margin="2dp"
                             android:gravity="center"
-                            android:textOff="关闭路侧限速"
-                            android:textOn="获取路侧限速"
+                            android:textOff="获取路侧限速提醒"
+                            android:textOn="关闭路侧限速提醒"
                             android:textSize="@dimen/dp_24" />
 
                     </GridLayout>
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 5546db154c..906309f37f 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
@@ -167,12 +167,24 @@
                 app:layout_constraintTop_toBottomOf="@id/tbCloudWeaknessTrafficSop"
                 />
 
+            <ToggleButton
+                android:id="@+id/tbRoadLimitSpeedSop"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:padding="@dimen/dp_20"
+                android:background="@drawable/radio_button_normal_background_right"
+                android:textColor="#000"
+                android:textOff="获取路侧限速提醒"
+                android:textOn="关闭路侧限速提醒"
+                app:layout_constraintTop_toBottomOf="@id/tbIPCReport"
+                android:textSize="@dimen/dp_24" />
+
             <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/tbIPCReport"
+                app:layout_constraintTop_toBottomOf="@id/tbRoadLimitSpeedSop"
                 android:text="变道速度阈值："
                 android:textSize="@dimen/dp_36"
                 android:textColor="#1A1A1A"
diff --git a/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuNewManager.kt b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuNewManager.kt
index 730f9469b6..e3d6d6d264 100644
--- a/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuNewManager.kt
+++ b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuNewManager.kt
@@ -1,6 +1,7 @@
 package com.mogo.eagle.core.function.obu.mogo
 
 import android.content.Context
+import android.util.Log
 import com.mogo.eagle.core.data.config.FunctionBuildConfig
 import com.mogo.eagle.core.data.config.HmiBuildConfig
 import com.mogo.eagle.core.data.config.HmiBuildConfig.isShowObuLimitSpeedView
diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/HmiBuildConfig.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/HmiBuildConfig.kt
index b626dab4b5..e05da17109 100644
--- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/HmiBuildConfig.kt
+++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/HmiBuildConfig.kt
@@ -98,6 +98,6 @@ object HmiBuildConfig {
      */
     @JvmField
     @Volatile
-    var isShowObuLimitSpeedView = true
+    var isShowObuLimitSpeedView = false
 
 }
\ No newline at end of file