From 22fc7c31ee6c4a49a04c61e2ec774d7d8b6e9a0c Mon Sep 17 00:00:00 2001
From: xiaowusky <chenyangyang3858@dingtalk.com>
Date: Thu, 7 Sep 2023 15:34:01 +0800
Subject: [PATCH] =?UTF-8?q?desc:=E6=8A=98=E7=BA=BF=E5=9B=BE=E8=A1=A5?=
 =?UTF-8?q?=E7=82=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/yinuo/safetywatcher/TestUtils.kt | 26 -------------------
 .../safetywatcher/watcher/port/ParseHelper.kt |  4 +++
 .../watcher/ui/QueryDataActivity.kt           |  9 ++++---
 3 files changed, 9 insertions(+), 30 deletions(-)

diff --git a/app/src/main/java/com/yinuo/safetywatcher/TestUtils.kt b/app/src/main/java/com/yinuo/safetywatcher/TestUtils.kt
index 05cefbe..c28aa9c 100644
--- a/app/src/main/java/com/yinuo/safetywatcher/TestUtils.kt
+++ b/app/src/main/java/com/yinuo/safetywatcher/TestUtils.kt
@@ -8,11 +8,9 @@ import android.os.FileUtils
 import android.provider.Settings
 import com.common.commonlib.db.DBUtils
 import com.common.commonlib.db.entity.Gas
-import com.common.commonlib.db.entity.GasType
 import com.common.commonlib.db.entity.Video
 import com.common.commonlib.db.entity.Warning
 import com.yinuo.library.vlc.PushHelper
-import com.yinuo.library.vlc.TxtOverlay
 import com.yinuo.safetywatcher.watcher.net.UploadFileApi
 import com.yinuo.safetywatcher.watcher.ui.view.CommonDialog
 import com.yinuo.safetywatcher.watcher.utils.DateUtils
@@ -31,35 +29,11 @@ object TestUtils {
 
 
     fun insertData() {
-        TxtOverlay.setShowTip("co2:50%@co:44%")
         PushHelper.setPushUrl("rtsp://192.168.5.17:554/123")
         GlobalScope.launch() {
             // 构造气体数据
             val timeMillis = System.currentTimeMillis()
 
-//            val gasDao = DBUtils.gasDao()
-//            val gases = mutableListOf<Gas>()
-//            gases.add(Gas(timeMillis - 150 * 1000, "CO", 5.0))
-//            gases.add(Gas(timeMillis - 150 * 1000, "O2", 5.0))
-//            gases.add(Gas(timeMillis - 150 * 1000, "CO2", 5.0))
-//
-//            gases.add(Gas(timeMillis - 100 * 1000, "CO2", 4.0))
-//            gases.add(Gas(timeMillis - 100 * 1000, "CO", 4.0))
-//            gases.add(Gas(timeMillis - 100 * 1000, "O2", 4.0))
-//
-//            gases.add(Gas(timeMillis - 45 * 1000, "O2", 3.0))
-//            gases.add(Gas(timeMillis - 45 * 1000, "CO", 3.0))
-//            gases.add(Gas(timeMillis - 45 * 1000, "CO2", 3.0))
-//
-//            gases.add(Gas(timeMillis - 30_000, "CO", 2.0))
-//            gases.add(Gas(timeMillis - 30_000, "CO2", 2.0))
-//            gases.add(Gas(timeMillis - 30_000, "O2", 2.0))
-//
-//            gases.add(Gas(timeMillis, "CO", 1.0))
-//            gases.add(Gas(timeMillis, "CO2", 1.0))
-//            gases.add(Gas(timeMillis, "O2", 1.0))
-//            gasDao.insertAll(gases)
-
             // 构造告警数据
             val warningDao = DBUtils.warningDao()
             val warnings = mutableListOf<Warning>()
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 761e146..5653d4d 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
@@ -41,6 +41,10 @@ object ParseHelper {
                 val gasIndex = it[0].toInt()
                 val status = it[14].toInt()
                 val gasType = getGasTypeByCode(it[19].toInt())
+                if (gasType.isEmpty()) {
+                    LogUtils.v("receive msg, unknown gas")
+                    return
+                }
                 when (status) {
                     // 预热
                     0 -> {
diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/QueryDataActivity.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/QueryDataActivity.kt
index 8c799e2..8427e91 100644
--- a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/QueryDataActivity.kt
+++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/QueryDataActivity.kt
@@ -161,6 +161,11 @@ class QueryDataActivity : BaseActivity() {
                             startGas!!.gasValue = gasValue / count
                             startGas!!.time = tempTime
                             newMapList.add(startGas!!)
+
+                            tempTime += intervalMs
+                            startGas = gas
+                            gasValue = gas.gasValue
+                            count = 1
                         }
                         val offsetTime = gas.time - tempTime
                         val num = offsetTime / intervalMs
@@ -170,10 +175,6 @@ class QueryDataActivity : BaseActivity() {
                                 newMapList.add(gas.copy(time = tempTime, gasValue = -1.0))
                             }
                         }
-                        tempTime += intervalMs
-                        startGas = gas
-                        gasValue = gas.gasValue
-                        count = 1
                     } else {
                         gasValue += gas.gasValue
                         count++