desc:步长设置

app/src/main/java/com/yinuo/safetywatcher/TestUtils.kt

@@ -49,21 +49,21 @@ object TestUtils {
 
             val gasDao = DBUtils.gasDao()
             val gases = mutableListOf<Gas>()
-            gases.add(Gas(timeMillis - 90 * 1000, "CO", 5.0))
+            gases.add(Gas(timeMillis - 150 * 1000, "CO", 5.0))
-            gases.add(Gas(timeMillis - 90 * 1000, "O2", 5.0))
+            gases.add(Gas(timeMillis - 150 * 1000, "O2", 5.0))
-            gases.add(Gas(timeMillis - 90 * 1000, "CO2", 5.0))
+            gases.add(Gas(timeMillis - 150 * 1000, "CO2", 5.0))
 
-            gases.add(Gas(timeMillis - 60 * 1000, "CO2", 4.0))
+            gases.add(Gas(timeMillis - 100 * 1000, "CO2", 4.0))
-            gases.add(Gas(timeMillis - 60 * 1000, "CO", 4.0))
+            gases.add(Gas(timeMillis - 100 * 1000, "CO", 4.0))
-            gases.add(Gas(timeMillis - 60 * 1000, "O2", 4.0))
+            gases.add(Gas(timeMillis - 100 * 1000, "O2", 4.0))
 
-            gases.add(Gas(timeMillis - 30 * 1000, "O2", 3.0))
+            gases.add(Gas(timeMillis - 45 * 1000, "O2", 3.0))
-            gases.add(Gas(timeMillis - 30 * 1000, "CO", 3.0))
+            gases.add(Gas(timeMillis - 45 * 1000, "CO", 3.0))
-            gases.add(Gas(timeMillis - 30 * 1000, "CO2", 3.0))
+            gases.add(Gas(timeMillis - 45 * 1000, "CO2", 3.0))
 
-            gases.add(Gas(timeMillis - 15_000, "CO", 2.0))
+            gases.add(Gas(timeMillis - 30_000, "CO", 2.0))
-            gases.add(Gas(timeMillis - 15_000, "CO2", 2.0))
+            gases.add(Gas(timeMillis - 30_000, "CO2", 2.0))
-            gases.add(Gas(timeMillis - 15_000, "O2", 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))

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!!)
                         }
                     }