[6.1.0]调试面板增加自车光圈开关

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt

@@ -80,6 +80,7 @@ import com.mogo.map.uicontroller.VisualAngleMode
 import com.mogo.map.uicontroller.VisualAngleMode.*
 import kotlinx.android.synthetic.main.view_debug_setting.view.*
 import kotlinx.android.synthetic.main.view_debug_setting.view.tbRouteDynamicEffect
+import kotlinx.android.synthetic.main.view_sop_setting.view.scCarAperture
 import kotlinx.coroutines.*
 import mogo.telematics.pad.MessagePad
 import mogo_msg.MogoReportMsg
@@ -848,7 +849,22 @@ internal class DebugSettingView @JvmOverloads constructor(
 
         //TODO
         tbIsDrawPath.setOnCheckedChangeListener { _, isChecked ->
+            ToastUtils.showShort("功能开发中")
+        }
 
+        if(FunctionBuildConfig.isDrawPointCloudData){
+            //如果点云效果是打开的，则自车光圈也跟随打开
+            tbCarAperture.isChecked = true
+        }else{
+            tbCarAperture.isChecked = FunctionBuildConfig.isDisplayAnimEnable
+        }
+        tbCarAperture.setOnCheckedChangeListener { compoundButton, isChecked ->
+            CallerMapUIServiceManager.getMapUIController()?.setDisplayAnimEnable(isChecked)
+            CallerSopSettingManager.invokeCarApertureListener(isChecked)
+            if(!compoundButton.isPressed){
+                return@setOnCheckedChangeListener
+            }
+            FunctionBuildConfig.isDisplayAnimEnable = isChecked
         }
 
         //初始化点云数据渲染情况
@@ -858,6 +874,12 @@ internal class DebugSettingView @JvmOverloads constructor(
             if(!compoundButton.isPressed){
                 return@setOnCheckedChangeListener
             }
+            //打开点云效果时，如果自车光圈是关闭状态，则自动打开自车光圈（点云是跟随光圈的 默认没有光圈就不显示点云的）
+            if(isChecked && !FunctionBuildConfig.isDisplayAnimEnable){
+                tbCarAperture.isChecked = true
+            }else{
+                tbCarAperture.isChecked = FunctionBuildConfig.isDisplayAnimEnable
+            }
             CallerAutoPilotControlManager.setIsDrawPointCloud(isChecked)
             FunctionBuildConfig.isDrawPointCloudData = isChecked
             CallerMapUIServiceManager.getMapUIController()?.setIsDrawPointCloud(isChecked)
@@ -2209,4 +2231,11 @@ internal class DebugSettingView @JvmOverloads constructor(
         tbDrawPointCloudData.isChecked = status
     }
 
+    /**
+     * 自车光圈
+     */
+    override fun onCarApertureClickEvent(status: Boolean) {
+        tbCarAperture.isChecked = status
+    }
+
 }

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt

@@ -390,6 +390,7 @@ internal class SOPSettingView @JvmOverloads constructor(
         }
         scCarAperture.setOnCheckedChangeListener { compoundButton, isChecked ->
             CallerMapUIServiceManager.getMapUIController()?.setDisplayAnimEnable(isChecked)
+            CallerSopSettingManager.invokeCarApertureListener(isChecked)
             hmiAction("SOP 是否展示自车光圈，",isChecked)
             Log.i(TAG,"SOP 是否展示自车光圈，$isChecked")
             if(!compoundButton.isPressed){
@@ -768,6 +769,10 @@ internal class SOPSettingView @JvmOverloads constructor(
         scDrawPointCloudData.isChecked = status
     }
 
+    override fun onCarApertureClickEvent(status: Boolean) {
+        scCarAperture.isChecked = status
+    }
+
     /**
      * 工控机配置参数获取
      */

core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml

@@ -1775,6 +1775,22 @@
                         app:layout_constraintRight_toRightOf="@id/tbIsDrawAutopilotTrajectoryData"
                         app:layout_constraintTop_toBottomOf="@id/tbIsDrawAutopilotTrajectoryData" />
 
+                    <ToggleButton
+                        android:id="@+id/tbCarAperture"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_margin="2dp"
+                        android:padding="@dimen/dp_20"
+                        android:textColor="#000"
+                        android:textOff="开启自车光圈"
+                        android:textOn="关闭自车光圈"
+                        android:textSize="@dimen/dp_24"
+                        app:layout_constraintLeft_toRightOf="@id/tbChangeAutoPilotStatus"
+                        app:layout_constraintRight_toRightOf="parent"
+                        app:layout_constraintTop_toBottomOf="@id/tbIsDrawAutopilotTrajectoryData"
+                        />
+
+
                     <ToggleButton
                         android:id="@+id/tbDrawPointCloudData"
                         android:layout_width="0dp"
@@ -1785,9 +1801,10 @@
                         android:textOff="开启渲染点云数据"
                         android:textOn="关闭渲染点云数据"
                         android:textSize="@dimen/dp_24"
-                        app:layout_constraintLeft_toRightOf="@id/tbChangeAutoPilotStatus"
-                        app:layout_constraintRight_toRightOf="parent"
-                        app:layout_constraintTop_toBottomOf="@id/tbIsDrawAutopilotTrajectoryData" />
+                        app:layout_constraintLeft_toLeftOf="@id/tbChangeAutoPilotStatus"
+                        app:layout_constraintRight_toRightOf="@id/tbChangeAutoPilotStatus"
+                        app:layout_constraintTop_toBottomOf="@id/tbChangeAutoPilotStatus"
+                        />
 
                     <Button
                         android:id="@+id/btnPointCloudSize"