From d1c8263b2518a0b08ca392e3c488321fd0531f4c Mon Sep 17 00:00:00 2001
From: xiaowusky <chenyangyang3858@dingtalk.com>
Date: Wed, 29 Nov 2023 14:12:12 +0800
Subject: [PATCH] =?UTF-8?q?desc:=E4=BC=A0=E6=84=9F=E5=99=A8=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=B1=95=E7=A4=BA=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/yinuo/safetywatcher/watcher/App.kt  | 11 -----------
 .../yinuo/safetywatcher/watcher/port/GasPortUtils.kt  |  6 +++++-
 .../java/com/common/commonlib/db/dao/GasTypeDao.kt    |  3 +++
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/App.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/App.kt
index 473a1cb..cdccf07 100644
--- a/app/src/main/java/com/yinuo/safetywatcher/watcher/App.kt
+++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/App.kt
@@ -63,19 +63,8 @@ class App : CommonApplication() {
                     }
                 }
             }
-
-            // 初始时，所以串口连接状态都应该是未连接
-            val gasAsync = async(Dispatchers.IO) {
-                val gasTypeDao = DBUtils.gasTypeDao()
-                val all = gasTypeDao.getAll()
-                all.onEach { gasType ->
-                    gasType.status = GasPortStatus.OUTLINE
-                    gasTypeDao.insert(gasType)
-                }
-            }
             warningAsync.await()
             videoAsync.await()
-            gasAsync.await()
         }
     }
 
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 a4738ca..5efec46 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
@@ -1,8 +1,9 @@
 package com.yinuo.safetywatcher.watcher.port
 
+import android.os.Process
+import com.common.commonlib.db.DBUtils
 import com.common.serialport.ComMultiPortUtils
 import com.yinuo.safetywatcher.watcher.port.cmd.CMD
-import android.os.Process
 import com.yinuo.safetywatcher.watcher.port.cmd.CalibrationCmd
 
 object GasPortUtils {
@@ -37,6 +38,9 @@ object GasPortUtils {
             readGasMsgThread = Thread {
                 try {
                     Process.setThreadPriority(Process.THREAD_PRIORITY_BACKGROUND);
+                    // 删除老的传感器列表数据
+                    val gasTypeDao = DBUtils.gasTypeDao()
+                    gasTypeDao.deleteAll()
                     while (true) {
                         // 延时一段时间后，发送指令读取气体数据
                         Thread.sleep(READ_MSG_INTERVAL)
diff --git a/library-common/src/main/java/com/common/commonlib/db/dao/GasTypeDao.kt b/library-common/src/main/java/com/common/commonlib/db/dao/GasTypeDao.kt
index 689bf05..71998d1 100644
--- a/library-common/src/main/java/com/common/commonlib/db/dao/GasTypeDao.kt
+++ b/library-common/src/main/java/com/common/commonlib/db/dao/GasTypeDao.kt
@@ -27,4 +27,7 @@ interface GasTypeDao {
 
     @Delete
     suspend fun delete(gas: GasType)
+
+    @Query("DELETE FROM gas_type")
+    fun deleteAll()
 }
\ No newline at end of file