From 8980231d141cf93710354f75a9f747c1dead18a0 Mon Sep 17 00:00:00 2001
From: xuxinchao <xuxinchao@zhidaoauto.com>
Date: Tue, 19 Sep 2023 16:54:55 +0800
Subject: [PATCH] =?UTF-8?q?[6.1.0]=E6=89=93=E5=BC=80=E7=82=B9=E4=BA=91?=
 =?UTF-8?q?=E6=95=88=E6=9E=9C=E6=97=B6=EF=BC=8C=E5=A6=82=E6=9E=9C=E8=87=AA?=
 =?UTF-8?q?=E8=BD=A6=E5=85=89=E5=9C=88=E6=98=AF=E5=85=B3=E9=97=AD=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=EF=BC=8C=E5=88=99=E8=87=AA=E5=8A=A8=E6=89=93=E5=BC=80?=
 =?UTF-8?q?=E8=87=AA=E8=BD=A6=E5=85=89=E5=9C=88=EF=BC=88=E7=82=B9=E4=BA=91?=
 =?UTF-8?q?=E6=98=AF=E8=B7=9F=E9=9A=8F=E5=85=89=E5=9C=88=E7=9A=84=20?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E6=B2=A1=E6=9C=89=E5=85=89=E5=9C=88=E5=B0=B1?=
 =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E7=82=B9=E4=BA=91=E7=9A=84=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/function/hmi/ui/setting/SOPSettingView.kt  | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

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 99a7a4e955..66602b194a 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
@@ -362,6 +362,12 @@ internal class SOPSettingView @JvmOverloads constructor(
         scDrawPointCloudData.isChecked = FunctionBuildConfig.isDrawPointCloudData
         //是否渲染点云数据
         scDrawPointCloudData.setOnCheckedChangeListener { _, isChecked ->
+            //打开点云效果时，如果自车光圈是关闭状态，则自动打开自车光圈（点云是跟随光圈的 默认没有光圈就不显示点云的）
+            if(isChecked && !FunctionBuildConfig.isDisplayAnimEnable){
+                scCarAperture.isChecked = true
+            }else{
+                scCarAperture.isChecked = FunctionBuildConfig.isDisplayAnimEnable
+            }
             CallerAutoPilotControlManager.setIsDrawPointCloud(isChecked)
             FunctionBuildConfig.isDrawPointCloudData = isChecked
             CallerMapUIServiceManager.getMapUIController()?.setIsDrawPointCloud(isChecked)
@@ -371,11 +377,14 @@ internal class SOPSettingView @JvmOverloads constructor(
 
         //自车光圈
         scCarAperture.isChecked = FunctionBuildConfig.isDisplayAnimEnable
-        scCarAperture.setOnCheckedChangeListener { _, isChecked ->
+        scCarAperture.setOnCheckedChangeListener { compoundButton, isChecked ->
             CallerMapUIServiceManager.getMapUIController()?.setDisplayAnimEnable(isChecked)
-            FunctionBuildConfig.isDisplayAnimEnable = isChecked
             hmiAction("SOP 是否展示自车光圈，",isChecked)
             Log.i(TAG,"SOP 是否展示自车光圈，$isChecked")
+            if(!compoundButton.isPressed){
+                return@setOnCheckedChangeListener
+            }
+            FunctionBuildConfig.isDisplayAnimEnable = isChecked
         }
     }