From c662b34e9464a9e5bfb3faa04471d3ca48d62406 Mon Sep 17 00:00:00 2001
From: xiaowusky <chenyangyang3858@dingtalk.com>
Date: Thu, 14 Dec 2023 13:52:13 +0800
Subject: [PATCH] =?UTF-8?q?desc:=E9=A6=96=E9=A1=B5logo=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../safetywatcher/watcher/port/ParseHelper.kt  | 18 ++++++++++++++----
 app/src/main/res/layout/activity_home.xml      |  7 ++++---
 2 files changed, 18 insertions(+), 7 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 9aa5c3b..3d7312c 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
@@ -29,7 +29,8 @@ object ParseHelper {
 
     private val mPortRunnable = hashMapOf<Int, FlagRunnable?>()
     private val mHandler = Handler(Looper.getMainLooper())
-    private val tempGasData = mutableListOf<GasReqBean>()
+    private val tempGasReqData = mutableListOf<GasReqBean>()
+    private val tempGasData = mutableListOf<Gas>()
     private val devicesApi by lazy {
         DevicesApi()
     }
@@ -245,9 +246,18 @@ object ParseHelper {
     private suspend fun uploadGasData(gas: Gas) {
         try {
             // 上传实时气体数据
-            tempGasData.add(GasReqBean(gas))
-            if (tempGasData.size > GAS_CLOUD_UPLOAD_SIZE_ONCE) {
-                devicesApi.uploadGasData(tempGasData)
+            tempGasData.add(gas)
+            tempGasReqData.add(GasReqBean(gas))
+            if (tempGasReqData.size > GAS_CLOUD_UPLOAD_SIZE_ONCE) {
+                val uploadGasData = devicesApi.uploadGasData(tempGasReqData)
+                if (uploadGasData?.isOk() == true) {
+                    val gasDao = DBUtils.gasDao()
+                    tempGasData.forEach { item ->
+                        item.syncFlag = true
+                        gasDao.update(item)
+                    }
+                }
+                tempGasReqData.clear()
                 tempGasData.clear()
             }
         } catch (e: Exception) {
diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml
index 9162788..159f2a0 100644
--- a/app/src/main/res/layout/activity_home.xml
+++ b/app/src/main/res/layout/activity_home.xml
@@ -11,9 +11,10 @@
 
     <ImageView
         android:id="@+id/error_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:scaleType="fitXY"
+        android:layout_width="@dimen/_1920dp"
+        android:layout_height="@dimen/_1080dp"
+        android:scaleType="centerCrop"
+        android:layout_alignParentBottom="true"
         android:src="@drawable/ic_icon"/>
 
     <ImageView