From a5e09f5596a13960c2ea6a3a252823e7b880a26c Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Fri, 22 Sep 2023 19:21:03 +0800 Subject: [PATCH] =?UTF-8?q?[6.1.0]=E8=B0=83=E8=AF=95=E9=9D=A2=E6=9D=BF?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=87=AA=E8=BD=A6=E5=85=89=E5=9C=88=E5=BC=80?= =?UTF-8?q?=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hmi/ui/setting/DebugSettingView.kt | 29 +++++++++++++++++++ .../function/hmi/ui/setting/SOPSettingView.kt | 5 ++++ .../main/res/layout/view_debug_setting.xml | 23 +++++++++++++-- .../api/setting/ISopSettingListener.kt | 5 ++++ .../call/setting/CallerSopSettingManager.kt | 10 +++++++ 5 files changed, 69 insertions(+), 3 deletions(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt index fe2fd33d5c..ccddb81fe0 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt +++ b/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 + } + } \ No newline at end of file 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 c887f5020f..2a0c4259bc 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 @@ -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 + } + /** * 工控机配置参数获取 */ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml index 52650e45ff..aa979a2730 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml +++ b/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" /> + + + + app:layout_constraintLeft_toLeftOf="@id/tbChangeAutoPilotStatus" + app:layout_constraintRight_toRightOf="@id/tbChangeAutoPilotStatus" + app:layout_constraintTop_toBottomOf="@id/tbChangeAutoPilotStatus" + />