From 92ba453ec406098a77d29cd427edd171b1750946 Mon Sep 17 00:00:00 2001
From: xiaowusky <chenyangyang3858@dingtalk.com>
Date: Sat, 2 Mar 2024 17:34:43 +0800
Subject: [PATCH] =?UTF-8?q?desc:=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/yinuo/safetywatcher/watcher/port/ParseHelper.kt  | 2 +-
 .../com/yinuo/safetywatcher/watcher/ui/HomeActivity.kt   | 9 ++++++---
 .../watcher/wifi/ui/GlobalMonitorActivity.kt             | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/port/ParseHelper.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/port/ParseHelper.kt
index c780604..686fc2b 100644
--- a/app/src/main/java/com/yinuo/safetywatcher/watcher/port/ParseHelper.kt
+++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/port/ParseHelper.kt
@@ -273,11 +273,11 @@ object ParseHelper {
      */
     @OptIn(DelicateCoroutinesApi::class)
     private fun updateGasTypeDb(type: GasTypeEnum, sensorIndex: Int, status: Int) {
+        GasCache.setStatus(type.desc, getShowStatus(CommonApplication.getContext(), status))
         if (statusChange(type.desc, status)) {
             GlobalScope.launch(Dispatchers.Unconfined) {
                 val typeDao = DBUtils.gasTypeDao()
                 val gasType = typeDao.getByName(type.desc)
-                GasCache.setStatus(type.desc, getShowStatus(CommonApplication.getContext(), status))
                 gasType?.type = type.desc
                 gasType?.status = status
                 gasType?.sensorIndex = sensorIndex
diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/HomeActivity.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/HomeActivity.kt
index 060e38a..dbb0e97 100644
--- a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/HomeActivity.kt
+++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/HomeActivity.kt
@@ -259,17 +259,20 @@ class HomeActivity : NoOptionsActivity() {
                 }
             }
             launch(Dispatchers.Main) {
+                val warnText = builder.toString()
+                if (warnText.isNotEmpty()) {
+                    SoundUtils.warnSound(isOverHighThreshold(warnText))
+                } else {
+                    SoundUtils.warnSoundClose()
+                }
                 lifecycleScope.launchWhenResumed {
-                    val warnText = builder.toString()
                     if (warnText.isNotEmpty()) {
                         mBinding.tvWarn.text = warnText
                         mBinding.tvWarn.visibility = View.VISIBLE
                         LztekUtil.openLinkI0()
-                        SoundUtils.warnSound(isOverHighThreshold(warnText))
                     } else {
                         mBinding.tvWarn.visibility = View.GONE
                         LztekUtil.closeLinkIO()
-                        SoundUtils.warnSoundClose()
                     }
                 }
             }
diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/wifi/ui/GlobalMonitorActivity.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/wifi/ui/GlobalMonitorActivity.kt
index 9148e57..fe7b3dc 100644
--- a/app/src/main/java/com/yinuo/safetywatcher/watcher/wifi/ui/GlobalMonitorActivity.kt
+++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/wifi/ui/GlobalMonitorActivity.kt
@@ -160,7 +160,7 @@ class GlobalMonitorActivity : NoOptionsActivity() {
 //                showDelErrorDialog()
 //                return
 //            }
-//            mBinding.tvStatus!!.text = info.SSID + "删除成功！"
+            mBinding.tvStatus!!.text = info.SSID + "删除成功！"
             for (connectInfo in mData!!) {
                 if (!TextUtils.isEmpty(info.SSID) && info.SSID == connectInfo.scanResult.SSID) {
                     connectInfo.configuration = null