diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/DriverMsgBoxBubbleView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/DriverMsgBoxBubbleView.kt index 55210ed9b4..f5c87af79d 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/DriverMsgBoxBubbleView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/DriverMsgBoxBubbleView.kt @@ -88,7 +88,7 @@ class DriverMsgBoxBubbleView @JvmOverloads constructor( } if(isShowData){ if(category == MsgCategory.RECORD_BAG){ - if(!FunctionBuildConfig.isDemoMode){ + if(!FunctionBuildConfig.isDemoMode && FunctionBuildConfig.isShowBagRecordWindow){ //弹出被动录包弹窗 CallerDevaToolsManager.onReceiveBadCaseRecord(msgBoxBean,context as Activity,true) CallerMsgBoxEventListenerManager.invokeUpdateTipListener(true) 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 0eb27acdf8..3704c2ffec 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 @@ -271,6 +271,12 @@ internal class SOPSettingView @JvmOverloads constructor( hmiAction("SOP 故障减速停车, ",isChecked) } + //是否展示被动触发的录包弹窗(自动驾驶下出现问题触发的录包) + tbShowBagRecordWindow.isChecked = FunctionBuildConfig.isShowBagRecordWindow + tbShowBagRecordWindow.setOnCheckedChangeListener{_, isChecked -> + FunctionBuildConfig.isShowBagRecordWindow = isChecked + hmiAction("SOP 是否展示被动触发的录包弹窗, ",isChecked) + } //变道绕障的目标障碍物速度阈值 tvSpeed.text = "${FunctionBuildConfig.detouringSpeed} m/s" diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_sop_setting.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_sop_setting.xml index 83498eb0b9..d962fb88f4 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_sop_setting.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_sop_setting.xml @@ -318,9 +318,23 @@ android:scaleY="1.2" android:scaleX="1.2" app:layout_constraintTop_toBottomOf="@id/tbWeakNetSlowDown" - app:layout_constraintRight_toLeftOf="@+id/verticalGuideLine" + app:layout_constraintRight_toLeftOf="@id/verticalGuideLine" app:layout_constraintLeft_toLeftOf="parent" /> + + 工控机->App) */