From d447b34f6fa1ff799787e766c7df19932fbdefe6 Mon Sep 17 00:00:00 2001 From: renwj Date: Mon, 21 Oct 2024 15:51:46 +0800 Subject: [PATCH] =?UTF-8?q?[6.7.0][=E8=BF=90=E8=90=A5=E9=9D=A2=E6=9D=BF]?= =?UTF-8?q?=20=E4=BC=98=E5=8C=96V2I=E6=80=BB=E5=BC=80=E5=85=B3=E7=9A=84?= =?UTF-8?q?=E5=A4=84=E7=90=86=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../function/hmi/ui/operate/OperatePanelLayout.kt | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/operate/OperatePanelLayout.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/operate/OperatePanelLayout.kt index acc1a200ba..94c97d38f0 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/operate/OperatePanelLayout.kt +++ b/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(KEY_V2I_TO_PNC)?.also { changeValue(it, false) } + preferenceScreen.findPreferenceReal(KEY_V2I_RED_LIGHT_WARNING)?.also { changeValue(it, false) } + preferenceScreen.findPreferenceReal(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)