[6.7.0][运营面板] 优化V2I总开关的处理逻辑

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/operate/OperatePanelLayout.kt

@@ -233,7 +233,6 @@ class OperatePanelLayout : LinearLayout {
                         pref.setDefaultValue(defVal)
                     }
                 }
-            } else { //TODO renwj 处理持久化存储时，将持久化的值重新赋给业务层的静态变量
             }
         }
 
@@ -305,11 +304,11 @@ class OperatePanelLayout : LinearLayout {
         }
 
         override fun onPreferenceChange(preference: Preference, newValue: Any?): Boolean {
-            return !preference.isPersistent
+            return true
         }
 
         override fun onPreferenceClick(preference: Preference): Boolean {
-            return !preference.isPersistent
+            return true
         }
     }
 
@@ -420,6 +419,11 @@ class OperatePanelLayout : LinearLayout {
                     val isChecked = newValue as? Boolean ?: false
                     HmiBuildConfig.v2iTotalSwitch = isChecked
                     hmiAction("V2I总开关, ", isChecked)
+                    if (!isChecked) {
+                        preferenceScreen.findPreferenceReal<SwitchPreferenceCompat>(KEY_V2I_TO_PNC)?.also { changeValue(it, false)  }
+                        preferenceScreen.findPreferenceReal<SwitchPreferenceCompat>(KEY_V2I_RED_LIGHT_WARNING)?.also { changeValue(it, false)  }
+                        preferenceScreen.findPreferenceReal<SwitchPreferenceCompat>(KEY_V2I_WEAKNESS_TRAFFIC)?.also { changeValue(it, false)  }
+                    }
                     clickEventAnalytics("V2I总开关", isChecked)
                     return true
                 }
@@ -430,7 +434,6 @@ class OperatePanelLayout : LinearLayout {
                     FunctionBuildConfig.fusionMode = 2
                     CallerAutoPilotControlManager.sendFusionMode(2)
                     CallerHmiViewControlListenerManager.invokeFuncMode(IViewControlListener.FUNC_FUSION_COLOR,isChecked)
-
                     CallerAutoPilotControlManager.sendV2iToPncCmd(isChecked)
                     hmiAction("V2I场景进PNC, ", isChecked)
                     clickEventAnalytics("V2I场景进PNC", isChecked)