From 48f3fa80a366ed37ed8ec6ec0f2ca2c23deb3474 Mon Sep 17 00:00:00 2001
From: renwj <renwenjie920@hotmail.com>
Date: Wed, 9 Oct 2024 17:29:24 +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=E8=87=AA=E9=80=9F=E5=BA=A6=E9=98=88=E5=80=BC=E5=BD=93?=
 =?UTF-8?q?=E5=89=8D=E5=80=BC=E8=8E=B7=E5=8F=96=E9=80=BB=E8=BE=91=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/function/hmi/ui/operate/OperatePanelLayout.kt | 10 ++++++++--
 .../CallerAutopilotCarConfigListenerManager.kt         |  1 -
 2 files changed, 8 insertions(+), 3 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 0b68de836c..dd3966d056 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
@@ -19,6 +19,7 @@ import androidx.preference.SwitchPreferenceCompat
 import androidx.preference.TwoStatePreference
 import androidx.preference.forEach
 import androidx.recyclerview.widget.RecyclerView
+import com.mogo.eagle.core.data.app.AppConfigInfo
 import com.mogo.eagle.core.data.config.FunctionBuildConfig
 import com.mogo.eagle.core.data.config.HmiBuildConfig
 import com.mogo.eagle.core.data.multidisplay.TelematicConstant
@@ -52,6 +53,7 @@ import com.mogo.eagle.core.function.hmi.ui.utils.SOPAnalyticsManager.clickEventA
 import com.mogo.eagle.core.utilcode.kotlin.onClick
 import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
+import com.mogo.eagle.core.utilcode.mogo.logger.Logger
 import com.mogo.eagle.core.utilcode.mogo.vehicle.SweeperVehicleConfigUtils
 import com.mogo.eagle.core.utilcode.rv.divider.CommonDividerItemDecoration
 import com.mogo.eagle.core.utilcode.util.AppStateManager
@@ -963,6 +965,9 @@ class OperatePanelLayout : LinearLayout {
         private var prevCheckedKeyForFusionMode: String? = null
 
         override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
+            if (AppConfigInfo.isConnectAutopilot) {
+                CallerAutoPilotControlManager.getCarConfig()
+            }
             CallerAutopilotCarConfigListenerManager.addListener(TAG, this)
             CallerSopSettingManager.addListener(TAG, this)
             CallerHmiViewControlListenerManager.addListener(TAG, this)
@@ -1088,10 +1093,11 @@ class OperatePanelLayout : LinearLayout {
         }
 
         override fun onPreferenceClick(preference: Preference): Boolean {
-            Log.d(TAG, "-- onPreferenceClick --:pref -> $preference")
+            Logger.d(TAG, "-- onPreferenceClick --:pref -> ${preference.key}")
             when (preference.key) {
                 KEY_AUTO_PILOT_SPEED_THRESHOLDS -> {
-                    FunctionBuildConfig.maxSpeedLimit = preference.extras.getDouble(PreferenceWithSpeedSetting.KEY_BUNDLE_CURRENT_VALUE, FunctionBuildConfig.maxSpeedLimit)
+                    val currentValue = preference.extras.getDouble(PreferenceWithSpeedSetting.KEY_BUNDLE_CURRENT_VALUE, FunctionBuildConfig.maxSpeedLimit)
+                    FunctionBuildConfig.maxSpeedLimit = currentValue
                     val isSuccess = CallerAutoPilotControlManager.setAutoPilotSpeed(FunctionBuildConfig.maxSpeedLimit.toInt())
                     when {
                         isSuccess -> {
diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutopilotCarConfigListenerManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutopilotCarConfigListenerManager.kt
index be3164e6b4..3e842deeac 100644
--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutopilotCarConfigListenerManager.kt
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutopilotCarConfigListenerManager.kt
@@ -29,7 +29,6 @@ object CallerAutopilotCarConfigListenerManager : CallerBase<IMoGoAutopilotCarCon
     @Synchronized
     fun invokeAutopilotCarConfigData(carConfigResp: MessagePad.CarConfigResp) {
         mCarConfigResp = carConfigResp
-        FunctionBuildConfig.maxSpeedLimit = carConfigResp.maxSpeedLimit
         M_LISTENERS.forEach {
             val listener = it.value
             try {