From 044e696f40c838d19aaffbd7ed7f8788625be477 Mon Sep 17 00:00:00 2001
From: EmArrow <zhongchao@zhidaoauto.com>
Date: Wed, 18 Sep 2024 15:34:54 +0800
Subject: [PATCH] [6.6.2] fix bug of sop fusionMode

---
 .../autopilot/adapter/MoGoAdasListenerImpl.kt |  2 +
 .../function/hmi/ui/setting/SOPSettingView.kt | 51 ++++++++++---------
 .../core/data/config/FunctionBuildConfig.kt   |  2 +-
 3 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt
index 851ea1c280..5c0b7daf04 100644
--- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt
+++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt
@@ -5,6 +5,7 @@ import chassis.Chassis
 import chassis.ChassisStatesOuterClass
 import chassis.VehicleStateOuterClass
 import com.mogo.eagle.core.data.app.AppConfigInfo
+import com.mogo.eagle.core.data.config.FunctionBuildConfig
 import com.mogo.eagle.core.data.config.HdMapBuildConfig
 import com.mogo.eagle.core.data.deva.chain.ChainConstant
 import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_ADAS_ARRIVE
@@ -1116,6 +1117,7 @@ class MoGoAdasListenerImpl : OnAdasListener {
         getParamResp: MessagePad.SetParamReq,
         adasParam: AdasParam
     ) {
+        FunctionBuildConfig.fusionMode = adasParam.fusionMode
         CallerAutopilotGetParamResponseDispatcher.dispatchResponse(header, getParamResp, adasParam)
     }
 
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt
index 8d26abe38d..4117a06ef9 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt
@@ -610,6 +610,7 @@ internal class SOPSettingView @JvmOverloads constructor(
 
         // 6.6.2 与海江确认，默认发盲区模式
         CallerAutoPilotControlManager.sendFusionMode(2)
+        updateFusionModeUI()
         //融合模式
         rgFusionMode.setOnCheckedChangeListener { _, p1 ->
             when (p1) {
@@ -1111,32 +1112,34 @@ internal class SOPSettingView @JvmOverloads constructor(
     ) {
         //融合模式
         ThreadUtils.runOnUiThread {
-            FunctionBuildConfig.fusionMode = adasParam.fusionMode
-            when (FunctionBuildConfig.fusionMode) {
-                1 -> {
-                    //全融合模式
-                    rgFusionMode.check(R.id.rbFullIntegration)
-                }
-                2 -> {
-                    //盲区模式
-                    rgFusionMode.check(R.id.rbBlind)
-                }
-                3 -> {
-                    //超视距模式
-                    rgFusionMode.check(R.id.rbBeyondSight)
-                }
-                4 -> {
-                    //透传模式
-                    rgFusionMode.check(R.id.rbTransparent)
-                }
-                5 -> {
-                    //纯路侧模式
-                    rgFusionMode.check(R.id.rbPureRoad)
-                }
-            }
-
+            updateFusionModeUI()
             val overTakeSpeed = adasParam.overtakeMaxSpeed
             tvOverTakeLimit.text = "$overTakeSpeed m/s"
         }
     }
+
+    private fun updateFusionModeUI(){
+        when (FunctionBuildConfig.fusionMode) {
+            1 -> {
+                //全融合模式
+                rgFusionMode.check(R.id.rbFullIntegration)
+            }
+            2 -> {
+                //盲区模式
+                rgFusionMode.check(R.id.rbBlind)
+            }
+            3 -> {
+                //超视距模式
+                rgFusionMode.check(R.id.rbBeyondSight)
+            }
+            4 -> {
+                //透传模式
+                rgFusionMode.check(R.id.rbTransparent)
+            }
+            5 -> {
+                //纯路侧模式
+                rgFusionMode.check(R.id.rbPureRoad)
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt
index 721d6477c3..efd731f3ce 100644
--- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt
+++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt
@@ -304,7 +304,7 @@ object FunctionBuildConfig {
      */
     @Volatile
     @JvmField
-    var fusionMode = 1
+    var fusionMode = 2
 
     /**
      * V2X总开关