[dev_robotaxi-d-app-module_2132_221223_2.13.2_sop] obu的v2v和v2i事件开关添加

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt

@@ -103,24 +103,28 @@ class SOPSettingView @JvmOverloads constructor(
          * 限速数据来源开关
          */
         tbRoadLimitSpeedSop.setOnCheckedChangeListener { _, isChecked ->
-            //默认关闭
+            //默认开启
             HmiBuildConfig.isShowObuLimitSpeedView = isChecked
         }
 
         /**
          * obu V2V开关
          */
+        tbObuV2vView.isChecked = HmiBuildConfig.isShowObuV2vView
         tbObuV2vView.setOnCheckedChangeListener { _, isChecked ->
-            //默认关闭
+            //默认开启
             HmiBuildConfig.isShowObuV2vView = isChecked
+//            Log.e("liyz", "---2222-- v2v = ${HmiBuildConfig.isShowObuV2vView}")
         }
 
         /**
          * obu V2i开关
          */
+        tbObuV2iView.isChecked = HmiBuildConfig.isShowObuV2iView
         tbObuV2iView.setOnCheckedChangeListener { _, isChecked ->
             //默认关闭
             HmiBuildConfig.isShowObuV2iView = isChecked
+//            Log.d("liyz", "---2--- v2i = ${HmiBuildConfig.isShowObuV2iView}")
         }
 
         /**

core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_sop_setting.xml

@@ -208,6 +208,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:padding="@dimen/dp_20"
+                android:visibility="gone"
                 android:background="@drawable/radio_button_normal_background_right"
                 android:textColor="#000"
                 android:textOff="获取路侧限速提醒"

core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuNewManager.kt

@@ -164,7 +164,7 @@ class MogoPrivateObuNewManager private constructor() {
          */
         override fun onMogoObuRvWarning(data: MogoObuRvWarningData) {
             super.onMogoObuRvWarning(data)
-//            if (HmiBuildConfig.isShowObuV2vView) { //TODO 临时需要关闭v2v开关
+            if (HmiBuildConfig.isShowObuV2vView) {
             mObuStatusInfo.obuRvStatus = true
             CallerObuListenerManager.invokeListener(mObuStatusInfo)
             if (!data.warningMsg.warningData.isNullOrEmpty()) {
@@ -218,7 +218,7 @@ class MogoPrivateObuNewManager private constructor() {
                     }
                 }
             }
-//            }
+            }
         }
 
         /**
@@ -227,13 +227,13 @@ class MogoPrivateObuNewManager private constructor() {
         override fun onMogoObuSpatWarning(data: MogoObuSpatWarningData) {
             super.onMogoObuSpatWarning(data)
             if (data != null) {
-//                if (HmiBuildConfig.isShowObuV2iView) {
+                if (HmiBuildConfig.isShowObuV2iView) {
                 handlerTrafficLight(
                     data.warningType,
                     data.status,
                     data.lights
                 )
-//                }
+                }
             }
         }
 
@@ -247,7 +247,7 @@ class MogoPrivateObuNewManager private constructor() {
          */
         override fun onMogoObuRsiWarning(data: MogoObuRsiWarningData) {
             super.onMogoObuRsiWarning(data)
-//            if (HmiBuildConfig.isShowObuV2iView) {
+            if (HmiBuildConfig.isShowObuV2iView) {
             if (data != null && data.warningMsg != null && data.warningMsg.size > 0) {
                 var alertContent = ""
                 var ttsContent = ""
@@ -493,7 +493,7 @@ class MogoPrivateObuNewManager private constructor() {
                     }
                 }
             }
-//            }
+            }
         }
 
         /**
@@ -513,7 +513,7 @@ class MogoPrivateObuNewManager private constructor() {
                 "$M_OBU${MogoObuConst.TAG_MOGO_NEW_OBU}",
                 "onMogoObuRsmWarning ------> ${data.toString()}"
             )
-//            if (HmiBuildConfig.isShowObuV2iView) {
+            if (HmiBuildConfig.isShowObuV2iView) {
             if (HmiBuildConfig.isShowObuWeaknessTrafficView) {
                 // 交通参与者类型 0x0:未知 UNKNOWN | 1机动车  2:非机动车 NON_MOTOR | 3:行人 PEDESTRIAN 4:obu
                 if (data != null && data.participant != null) {
@@ -666,7 +666,7 @@ class MogoPrivateObuNewManager private constructor() {
                     }
                 }
             }
-//            }
+            }
         }
 
         /**
@@ -1049,6 +1049,10 @@ class MogoPrivateObuNewManager private constructor() {
                     if (minSpeedTemp == maxSpeedTemp) {
                         minSpeedTemp -= 5
                     }
+                    if (minSpeedTemp < 0) {
+                        minSpeedTemp = 1
+                    }
+
                     val adviceSpeed = "$minSpeedTemp - $maxSpeedTemp"
                     val adviceSpeedTts = "$minSpeedTemp 到 $maxSpeedTemp"