From f04cc53a59ade4ee05615867763aa077ada18cfe Mon Sep 17 00:00:00 2001
From: xiaowusky <chenyangyang3858@dingtalk.com>
Date: Wed, 29 Nov 2023 09:37:43 +0800
Subject: [PATCH] =?UTF-8?q?desc:=E8=B0=83=E6=95=B4=E5=8D=8F=E7=A8=8BDispat?=
 =?UTF-8?q?chers?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/yinuo/safetywatcher/watcher/port/ParseHelper.kt     | 6 ++++--
 .../java/com/yinuo/safetywatcher/watcher/ui/HomeActivity.kt | 6 +++---
 2 files changed, 7 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 eb4546f..8674ec1 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
@@ -109,8 +109,10 @@ object ParseHelper {
 //        val rangHexLong: Long = HexUtils.hexToLong(rangHex)
         // 是否超量程
         val overRange = value > type.rangMax || status == 8
-
         LogUtils.w("receive msg 单位转换前 $type, 浓度 = $value $unit, 最大量程 = ${type.rangMax}")
+        if (overRange) {
+            value = type.rangMax.toFloat()
+        }
 
         //根据单位进行数值转换
         val localGasUnit = getLocalGasUnit(type.desc)
@@ -151,7 +153,7 @@ object ParseHelper {
         unit: String,
         overRange: Boolean
     ) {
-        GlobalScope.launch(Dispatchers.IO) {
+        GlobalScope.launch(Dispatchers.Unconfined) {
             // 阈值范围
             val min = getGasLowThreshold(typeEnum.desc, unit)
             val max = getGasHighThreshold(typeEnum.desc, unit)
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 87b0caa..d9825d5 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
@@ -165,8 +165,8 @@ class HomeActivity : NoOptionsActivity() {
     }
 
     private fun showTipView() {
-        lifecycleScope.launch(Dispatchers.Main) {
-            TxtOverlay.getOverlayBitmap()?.let {
+        TxtOverlay.getOverlayBitmap()?.let {
+            lifecycleScope.launch(Dispatchers.Main) {
                 mBinding.tipView.setImageBitmap(it)
             }
         }
@@ -198,13 +198,13 @@ class HomeActivity : NoOptionsActivity() {
     // 设置传感器
     private fun setForSensor() {
         TxtOverlay.setTipChangeListener {
+            showTipView()
             if (!AppData.hasSensorData()) {
                 // 有传感器数据回调
                 AppData.setSensorData(true)
                 closeLoadingDialog()
                 changeViewStatus()
             }
-            showTipView()
             setWarnView()
             watchSensor(DELAY_TIME_CHECK_SENSOR)
         }