From cabf326a2f97706d6d501511b28d56dc3ba04af6 Mon Sep 17 00:00:00 2001
From: xiaowusky <chenyangyang3858@dingtalk.com>
Date: Wed, 29 Nov 2023 14:22:10 +0800
Subject: [PATCH] =?UTF-8?q?desc:4=E7=A7=8D=E6=B0=94=E4=BD=93=E5=85=A8?=
 =?UTF-8?q?=E9=83=A8=E6=9F=A5=E8=AF=A2=E4=B8=80=E9=81=8D=E4=B9=8B=E5=90=8E?=
 =?UTF-8?q?=EF=BC=8C=E6=89=8D=E5=8E=BB=E5=8F=98=E5=8C=96=E6=B0=B4=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../watcher/port/GasPortUtils.kt              |  2 +-
 .../safetywatcher/watcher/port/ParseHelper.kt | 24 +++++++++----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/port/GasPortUtils.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/port/GasPortUtils.kt
index 5efec46..448cf77 100644
--- a/app/src/main/java/com/yinuo/safetywatcher/watcher/port/GasPortUtils.kt
+++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/port/GasPortUtils.kt
@@ -11,7 +11,7 @@ object GasPortUtils {
     private const val PORT_PATH = "/dev/ttyS6"
     const val FULL_MSG_SIZE = 25
     const val CHECK_TIME = 10000L
-    private const val READ_MSG_INTERVAL = 300L
+    private const val READ_MSG_INTERVAL = 200L
     private var mInitFlag = false
     private var readGasMsgThread: Thread? = null;
 
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 e9dab14..44b340d 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
@@ -126,22 +126,22 @@ object ParseHelper {
     }
 
     private val overlayBuilder: StringBuilder = java.lang.StringBuilder()
-    private var lastTipTime = -1L
     private fun setOverlayData() {
+        if (gasMap.size < 4) {
+            return
+        }
         val currentTimeMillis = System.currentTimeMillis()
-        if (currentTimeMillis - lastTipTime > 1000) {
-            lastTipTime = currentTimeMillis
-            overlayBuilder.clear()
-            gasMap.forEach { item ->
-                val gas = item.value
-                val time = gas.time
-                // 3S内的数据我们认为有效
-                if (currentTimeMillis - time <= 3000) {
-                    overlayBuilder.append("${gas.gasName}: ${gas.gasValue} ${gas.unit}").append("@")
-                }
+        overlayBuilder.clear()
+        gasMap.forEach { item ->
+            val gas = item.value
+            val time = gas.time
+            // 3S内的数据我们认为有效
+            if (currentTimeMillis - time <= 3000) {
+                overlayBuilder.append("${gas.gasName}: ${gas.gasValue} ${gas.unit}").append("@")
             }
-            TxtOverlay.setShowTip(overlayBuilder.toString())
         }
+        TxtOverlay.setShowTip(overlayBuilder.toString())
+        gasMap.clear()
     }
 
     /**