From 52bfac25c2d9f0fd455d25671e247b5833d57d83 Mon Sep 17 00:00:00 2001
From: renwj <renwenjie@zhidaoauto.com>
Date: Thu, 24 Oct 2024 19:23:03 +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=96=E4=BB=A3=E7=A0=81=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/function/hmi/ui/operate/OperatePanelLayout.kt | 10 +++++-----
 1 file changed, 5 insertions(+), 5 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 eccde5f3ba..fb71bff54c 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
@@ -1263,9 +1263,9 @@ class OperatePanelLayout : LinearLayout {
                         prevCheckedKeyForFusionMode?.takeIf { it != KEY_ALL_MERGE_MODE }?.let {
                             preferenceScreen.findPreferenceReal<TwoStatePreference>(it)
                         }?.also {
-                            prevCheckedKeyForFusionMode = KEY_ALL_MERGE_MODE
                             changeValue(it, false)
                         }
+                        prevCheckedKeyForFusionMode = KEY_ALL_MERGE_MODE
                         hmiAction("SOP 融合模式, ", FunctionBuildConfig.fusionMode)
                         clickEventAnalytics("融合模式", true)
                         CallerAutoPilotControlManager.sendFusionMode(FunctionBuildConfig.fusionMode)
@@ -1283,9 +1283,9 @@ class OperatePanelLayout : LinearLayout {
                         prevCheckedKeyForFusionMode?.takeIf { it != KEY_BLIND_AREA_MODE }?.let {
                             preferenceScreen.findPreferenceReal<TwoStatePreference>(it)
                         }?.also {
-                            prevCheckedKeyForFusionMode = KEY_BLIND_AREA_MODE
                             changeValue(it, false)
                         }
+                        prevCheckedKeyForFusionMode = KEY_BLIND_AREA_MODE
                         hmiAction("SOP 融合模式, ", FunctionBuildConfig.fusionMode)
                         clickEventAnalytics("融合模式", true)
                         CallerAutoPilotControlManager.sendFusionMode(FunctionBuildConfig.fusionMode)
@@ -1303,9 +1303,9 @@ class OperatePanelLayout : LinearLayout {
                         prevCheckedKeyForFusionMode?.takeIf { it != KEY_BEYOND_VISUAL_RANGE_MODE }?.let {
                                     preferenceScreen.findPreferenceReal<TwoStatePreference>(it)
                                 }?.also {
-                                    prevCheckedKeyForFusionMode = KEY_BEYOND_VISUAL_RANGE_MODE
                                     changeValue(it, false)
                                 }
+                        prevCheckedKeyForFusionMode = KEY_BEYOND_VISUAL_RANGE_MODE
                         hmiAction("SOP 融合模式, ", FunctionBuildConfig.fusionMode)
                         clickEventAnalytics("融合模式", true)
                         CallerAutoPilotControlManager.sendFusionMode(FunctionBuildConfig.fusionMode)
@@ -1323,9 +1323,9 @@ class OperatePanelLayout : LinearLayout {
                         prevCheckedKeyForFusionMode?.takeIf { it != KEY_TRANSPARENT_TRANSFER_MODE }?.let {
                                     preferenceScreen.findPreferenceReal<TwoStatePreference>(it)
                                 }?.also {
-                                    prevCheckedKeyForFusionMode = KEY_TRANSPARENT_TRANSFER_MODE
                                     changeValue(it, false)
                                 }
+                        prevCheckedKeyForFusionMode = KEY_TRANSPARENT_TRANSFER_MODE
                         hmiAction("SOP 融合模式, ", FunctionBuildConfig.fusionMode)
                         clickEventAnalytics("融合模式", true)
                         CallerAutoPilotControlManager.sendFusionMode(FunctionBuildConfig.fusionMode)
@@ -1343,9 +1343,9 @@ class OperatePanelLayout : LinearLayout {
                         prevCheckedKeyForFusionMode?.takeIf { it != KEY_PURE_OBU_MODE }?.let {
                             preferenceScreen.findPreferenceReal<TwoStatePreference>(it)
                         }?.also {
-                            prevCheckedKeyForFusionMode = KEY_PURE_OBU_MODE
                             changeValue(it, false)
                         }
+                        prevCheckedKeyForFusionMode = KEY_PURE_OBU_MODE
                         hmiAction("SOP 融合模式, ", FunctionBuildConfig.fusionMode)
                         clickEventAnalytics("融合模式", true)
                         CallerAutoPilotControlManager.sendFusionMode(FunctionBuildConfig.fusionMode)