From e3b62d35a7d4f237872e45056c1911f2c616a229 Mon Sep 17 00:00:00 2001
From: xuxinchao <xuxinchao@zhidaoauto.com>
Date: Wed, 2 Aug 2023 16:51:26 +0800
Subject: [PATCH] =?UTF-8?q?[3.4.0]=E8=BF=90=E8=90=A5=E9=9D=A2=E6=9D=BF?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BD=95=E5=8C=85=E5=BC=B9=E7=AA=97=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/msgbox/DriverMsgBoxBubbleView.kt      |  2 +-
 .../function/hmi/ui/setting/SOPSettingView.kt    |  6 ++++++
 .../src/main/res/layout/view_sop_setting.xml     | 16 +++++++++++++++-
 .../core/data/config/FunctionBuildConfig.kt      |  7 +++++++
 4 files changed, 29 insertions(+), 2 deletions(-)

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"
             />
+        <!--是否展示被动录包弹窗-->
+        <androidx.appcompat.widget.SwitchCompat
+            android:id="@+id/tbShowBagRecordWindow"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="录包弹窗"
+            android:paddingTop="25dp"
+            android:paddingBottom="25dp"
+            android:scaleY="1.2"
+            android:scaleX="1.2"
+            app:layout_constraintTop_toBottomOf="@id/tbWeakNetSlowDown"
+            app:layout_constraintLeft_toRightOf="@id/verticalGuideLine"
+            app:layout_constraintRight_toRightOf="parent"
+            />
 
         <TextView
             android:id="@+id/tvSpeedThresholdTitle"
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 2b9eec2a14..483aff534c 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
@@ -197,6 +197,13 @@ object FunctionBuildConfig {
     @JvmField
     var isReportWarning = true
 
+    /**
+     * 是否展示被动触发的录包弹窗（自动驾驶下出现问题触发的录包）
+     */
+    @Volatile
+    @JvmField
+    var isShowBagRecordWindow = true
+
     /**
      * 是否是V2N新链路(云->工控机->App)
      */