From cac1d03c05b79862003e247e10ec2f2386a68348 Mon Sep 17 00:00:00 2001
From: xuxinchao <13522809046@163.com>
Date: Mon, 20 Jun 2022 17:45:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E4=B8=8A=E6=8A=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修改调试窗异常上报开关控制域，开关控制异常上报弹窗是否会弹出+提示音是否提示
---
 .../mogo/eagle/core/function/report/IPCReportManager.kt   | 4 +++-
 .../mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt    | 4 +---
 .../core/function/hmi/ui/setting/DebugSettingView.kt      | 8 ++++----
 .../src/main/res/layout/view_debug_setting.xml            | 6 +++---
 .../mogo/eagle/core/data/config/FunctionBuildConfig.kt    | 4 ++--
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/report/IPCReportManager.kt b/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/report/IPCReportManager.kt
index b67437298d..1e158f6777 100644
--- a/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/report/IPCReportManager.kt
+++ b/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/report/IPCReportManager.kt
@@ -47,7 +47,9 @@ class IPCReportManager : IMoGoAutopilotStatusListener {
                         it.src,it.level,it.msg,it.code,it.resultList,it.actionsList))
                 //当前不处于美化模式时，展示监控节点上报
                 if(!FunctionBuildConfig.isDemoMode){
-                    CallerHmiManager.showIPCReportWindow(ipcReportList)
+                    if(FunctionBuildConfig.isReportWarning){
+                        CallerHmiManager.showIPCReportWindow(ipcReportList)
+                    }
                 }
             }
         }
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt
index 6e5b9def14..6abcf9ee64 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt
@@ -248,9 +248,7 @@ class MoGoHmiFragment : MvpFragment<MoGoHmiContract.View?, HmiPresenter?>(),
                     }
                 })
                 ipcReportWindow?.let {
-                    if(FunctionBuildConfig.isWarningTone){
-                        SoundUtils.playRing(requireContext())
-                    }
+                    SoundUtils.playRing(requireContext())
                 }
             }
             ipcReportWindow?.showFloatWindow()
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 dcee449911..7cb0246840 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
@@ -779,10 +779,10 @@ class DebugSettingView @JvmOverloads constructor(
             }
         }
 
-        //是否开启异常上报语音提示
-        tbWarningTone.isChecked = FunctionBuildConfig.isWarningTone
-        tbWarningTone.setOnCheckedChangeListener { _, isChecked ->
-            FunctionBuildConfig.isWarningTone = isChecked
+        //是否开启异常上报
+        tbReportWarning.isChecked = FunctionBuildConfig.isReportWarning
+        tbReportWarning.setOnCheckedChangeListener { _, isChecked ->
+            FunctionBuildConfig.isReportWarning = isChecked
         }
 
     }
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 b1a26a0e13..a92f6810e7 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
@@ -1112,13 +1112,13 @@
                         app:layout_constraintTop_toTopOf="@id/btnConnectServerIp" />
 
                     <ToggleButton
-                        android:id="@+id/tbWarningTone"
+                        android:id="@+id/tbReportWarning"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_margin="@dimen/dp_10"
                         android:textColor="#000"
-                        android:textOff="开启异常上报语音提示"
-                        android:textOn="关闭异常上报语音提示"
+                        android:textOff="开启异常上报提示"
+                        android:textOn="关闭异常上报提示"
                         android:textSize="@dimen/dp_24"
                         app:layout_constraintTop_toBottomOf="@id/btnConnectServerIp"
                         />
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 f2301365af..1a26d2f71c 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
@@ -118,10 +118,10 @@ object FunctionBuildConfig {
     var skinMode = 0
 
     /**
-     * 异常上报是否有语音提示
+     * 是否进行异常上报提示
      */
     @Volatile
     @JvmField
-    var isWarningTone = true
+    var isReportWarning = true
 
 }
\ No newline at end of file