From a2c4bd6c15300ee319611998fc69224fbfe8713d Mon Sep 17 00:00:00 2001 From: xiaowusky Date: Fri, 15 Sep 2023 15:13:36 +0800 Subject: [PATCH] =?UTF-8?q?desc:=E6=B0=94=E4=BD=93=E6=B5=93=E5=BA=A6?= =?UTF-8?q?=E4=BD=BF=E7=94=A8float?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/yinuo/safetywatcher/TestUtils.kt | 8 ++++---- .../safetywatcher/watcher/port/GasUtilss.kt | 20 +++++++++---------- .../safetywatcher/watcher/port/ParseHelper.kt | 8 ++++---- .../watcher/ui/QueryDataActivity.kt | 12 +++++------ .../com/common/commonlib/db/entity/Gas.kt | 6 +++--- .../com/common/commonlib/db/entity/Warning.kt | 6 +++--- 6 files changed, 30 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 c28aa9c..7edb872 100644 --- a/app/src/main/java/com/yinuo/safetywatcher/TestUtils.kt +++ b/app/src/main/java/com/yinuo/safetywatcher/TestUtils.kt @@ -37,10 +37,10 @@ object TestUtils { // 构造告警数据 val warningDao = DBUtils.warningDao() val warnings = mutableListOf() - warnings.add(Warning("CO", 60.0, "", timeMillis)) - warnings.add(Warning("CO", 80.0, "", timeMillis - 30 * 1000)) - warnings.add(Warning("CO2", 80.0, "", timeMillis - 30 * 1000)) - warnings.add(Warning("O2", 10.0, "", timeMillis - 90 * 1000)) + warnings.add(Warning("CO", 60f, "", timeMillis)) + warnings.add(Warning("CO", 80f, "", timeMillis - 30 * 1000)) + warnings.add(Warning("CO2", 80f, "", timeMillis - 30 * 1000)) + warnings.add(Warning("O2", 10f, "", timeMillis - 90 * 1000)) warningDao.insertAll(warnings) } } diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/port/GasUtilss.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/port/GasUtilss.kt index cef8b25..c4e3bcc 100644 --- a/app/src/main/java/com/yinuo/safetywatcher/watcher/port/GasUtilss.kt +++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/port/GasUtilss.kt @@ -165,16 +165,16 @@ fun getGasRange(gasType: String, gasUnit: String): String { return "" } -fun ppm2mgm3(ppmValue: Double, molecular: Int): Double { - return ppmValue * molecular / 22.4 +fun ppm2mgm3(ppmValue: Float, molecular: Int): Float { + return ppmValue * molecular / 22.4f } -fun mgm3ToPpm(mValue: Double, molecular: Int): Double { - return mValue * 22.4 / molecular +fun mgm3ToPpm(mValue: Float, molecular: Int): Float { + return mValue * 22.4f / molecular } -fun ch4Lel2ppm(lelValue: Double): Double { - return lelValue * 10000 / 20.0 +fun ch4Lel2ppm(lelValue: Float): Float { + return lelValue * 10000 / 20f } /** @@ -184,10 +184,10 @@ fun ch4Lel2ppm(lelValue: Double): Double { */ fun convertData( gasType: String, - value: Double, + value: Float, unit: String, localGasUnit: String -): Double { +): Float { var retValue = value if (CH4 == gasType) { retValue = convertCH4(unit, value, localGasUnit) @@ -218,9 +218,9 @@ fun convertData( */ private fun convertCH4( unit: String, - value: Double, + value: Float, localGasUnit: String -): Double { +): Float { var ret = value if (UNIT_LEL == unit) { // to ppm 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 e34918f..53604f2 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 @@ -100,7 +100,7 @@ object ParseHelper { val valueHexLong: Long = HexUtils.hexToLong(valueHex) // 浓度 var value = - c18.plus(c17).plus(java.lang.Long.toBinaryString(valueHexLong)).toInt(2) / 10.0.pow( + c18.plus(c17).plus(java.lang.Long.toBinaryString(valueHexLong)).toInt(2) / 10f.pow( pointNum ) // 量程 @@ -147,11 +147,11 @@ object ParseHelper { /** * 插入气体数据 */ - private fun insertGasData(gasType: String, value: Double, unit: String) { + private fun insertGasData(gasType: String, value: Float, unit: String) { GlobalScope.launch { // 阈值范围 - val min = getGasLowThreshold(gasType).toDouble() - val max = getGasHighThreshold(gasType).toDouble() + val min = getGasLowThreshold(gasType) + val max = getGasHighThreshold(gasType) // 构造气体数据 val timeMillis = System.currentTimeMillis() 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 34caf37..7f5e8b8 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 @@ -151,18 +151,18 @@ class QueryDataActivity : BaseActivity() { gasMap.forEach { (type, list) -> val newMapList = mutableListOf() var startGas: Gas? = null - var gasValue = 0.0 + var gasValue = 0f var tempTime = 0L var count = 0 list.forEachIndexed { index, gas -> if (startGas == null) { startGas = gas.copy() tempTime = gas.time - ((gas.time - startTime) % intervalMs) - gasValue = 0.0 + gasValue = 0f count = 0 } if (gas.time - tempTime > intervalMs) { - if (gasValue >= 0.0) { + if (gasValue >= 0f) { startGas!!.gasValue = gasValue / count startGas!!.time = tempTime newMapList.add(startGas!!) @@ -177,7 +177,7 @@ class QueryDataActivity : BaseActivity() { if (num > 0) { for (i in num downTo 1) { tempTime += intervalMs - newMapList.add(gas.copy(time = tempTime, gasValue = -1.0)) + newMapList.add(gas.copy(time = tempTime, gasValue = -1.0f)) } } } else { @@ -187,7 +187,7 @@ class QueryDataActivity : BaseActivity() { // 最后一个特殊处理 if (list.size - 1 == index) { - if (gasValue >= 0.0) { + if (gasValue >= 0f) { startGas!!.gasValue = gasValue / count startGas!!.time = tempTime newMapList.add(startGas!!) @@ -201,7 +201,7 @@ class QueryDataActivity : BaseActivity() { gasNewMap.forEach { (t, u) -> newList.addAll(u) } - newList = newList.filter { it.gasValue >= 0.0 } as MutableList + newList = newList.filter { it.gasValue >= 0f } as MutableList newList.sortWith { o1, o2 -> (o2.time - o1.time).toInt() } diff --git a/library-common/src/main/java/com/common/commonlib/db/entity/Gas.kt b/library-common/src/main/java/com/common/commonlib/db/entity/Gas.kt index 0d0728c..0b0b239 100644 --- a/library-common/src/main/java/com/common/commonlib/db/entity/Gas.kt +++ b/library-common/src/main/java/com/common/commonlib/db/entity/Gas.kt @@ -8,10 +8,10 @@ import androidx.room.PrimaryKey data class Gas( @ColumnInfo(name = "time") var time: Long, @ColumnInfo(name = "gas_name") var gasName: String, - @ColumnInfo(name = "gas_value") var gasValue: Double = 0.0, + @ColumnInfo(name = "gas_value") var gasValue: Float = 0f, @ColumnInfo(name = "unit") var unit: String = "", - @ColumnInfo(name = "threshold_low") var thresholdLow: Double = 0.0, - @ColumnInfo(name = "threshold_high") var thresholdHigh: Double = 0.0, + @ColumnInfo(name = "threshold_low") var thresholdLow: Float = 0f, + @ColumnInfo(name = "threshold_high") var thresholdHigh: Float = 0f, @ColumnInfo(name = "sync_flag") var syncFlag: Boolean = false, @PrimaryKey(autoGenerate = true) var id: Int = 0 ) diff --git a/library-common/src/main/java/com/common/commonlib/db/entity/Warning.kt b/library-common/src/main/java/com/common/commonlib/db/entity/Warning.kt index e4fb7ce..043b330 100644 --- a/library-common/src/main/java/com/common/commonlib/db/entity/Warning.kt +++ b/library-common/src/main/java/com/common/commonlib/db/entity/Warning.kt @@ -7,11 +7,11 @@ import androidx.room.PrimaryKey @Entity data class Warning( @ColumnInfo(name = "gas_name") var gasName: String, - @ColumnInfo(name = "gas_value") var gasValue: Double, + @ColumnInfo(name = "gas_value") var gasValue: Float, @ColumnInfo(name = "unit") var unit: String, @ColumnInfo(name = "start_time") var startTime: Long, - @ColumnInfo(name = "threshold_low") var thresholdLow: Double = 0.0, - @ColumnInfo(name = "threshold_high") var thresholdHigh: Double = 0.0, + @ColumnInfo(name = "threshold_low") var thresholdLow: Float = 0f, + @ColumnInfo(name = "threshold_high") var thresholdHigh: Float = 0f, @ColumnInfo(name = "end_time") var endTime: Long = -1L, @PrimaryKey(autoGenerate = true) var id: Int = 0 )