From a5d55cd8497cb9a5ca151cea5dbd965e240af37e Mon Sep 17 00:00:00 2001 From: xiaowusky Date: Wed, 5 Jul 2023 17:12:59 +0800 Subject: [PATCH] =?UTF-8?q?desc:=E6=AD=A5=E9=95=BF=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/yinuo/safetywatcher/TestUtils.kt | 24 +++++++++---------- .../watcher/ui/QueryDataActivity.kt | 10 ++++---- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/app/src/main/java/com/yinuo/safetywatcher/TestUtils.kt b/app/src/main/java/com/yinuo/safetywatcher/TestUtils.kt index 95843c2..00ef7ea 100644 --- a/app/src/main/java/com/yinuo/safetywatcher/TestUtils.kt +++ b/app/src/main/java/com/yinuo/safetywatcher/TestUtils.kt @@ -49,21 +49,21 @@ object TestUtils { val gasDao = DBUtils.gasDao() val gases = mutableListOf() - gases.add(Gas(timeMillis - 90 * 1000, "CO", 5.0)) - gases.add(Gas(timeMillis - 90 * 1000, "O2", 5.0)) - gases.add(Gas(timeMillis - 90 * 1000, "CO2", 5.0)) + 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 - 60 * 1000, "CO2", 4.0)) - gases.add(Gas(timeMillis - 60 * 1000, "CO", 4.0)) - gases.add(Gas(timeMillis - 60 * 1000, "O2", 4.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 - 30 * 1000, "O2", 3.0)) - gases.add(Gas(timeMillis - 30 * 1000, "CO", 3.0)) - gases.add(Gas(timeMillis - 30 * 1000, "CO2", 3.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 - 15_000, "CO", 2.0)) - gases.add(Gas(timeMillis - 15_000, "CO2", 2.0)) - gases.add(Gas(timeMillis - 15_000, "O2", 2.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)) 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 6f64037..1940103 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 @@ -152,6 +152,11 @@ class QueryDataActivity : BaseActivity() { count = 0 } if (gas.time - tempTime > intervalMs) { + if (gasValue >= 0.0) { + startGas!!.gasValue = gasValue / count + startGas!!.time = tempTime + newMapList?.add(startGas!!) + } val offsetTime = gas.time - tempTime val num = offsetTime / intervalMs if (num > 0) { @@ -160,10 +165,6 @@ class QueryDataActivity : BaseActivity() { newMapList?.add(gas.copy(time = tempTime, gasValue = -1.0)) } } - if (gasValue >= 0.0) { - startGas!!.gasValue = gasValue / count - newMapList?.add(startGas!!) - } tempTime += intervalMs startGas = gas gasValue = gas.gasValue @@ -177,6 +178,7 @@ class QueryDataActivity : BaseActivity() { if (list.size - 1 == index) { if (gasValue >= 0.0) { startGas!!.gasValue = gasValue / count + startGas!!.time = tempTime newMapList?.add(startGas!!) } }