From 45fdacbb43f2b83bafc267f1554cb4d2244d4bcb Mon Sep 17 00:00:00 2001 From: xiaowusky Date: Mon, 11 Dec 2023 10:46:15 +0800 Subject: [PATCH] =?UTF-8?q?desc:=E5=AF=BC=E5=87=BA=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E5=88=AB=E5=90=8D=EF=BC=8C=E4=BC=A0=E6=84=9F=E5=99=A8=E5=8D=95?= =?UTF-8?q?=E4=BD=8D=E4=B8=8D=E8=BD=AC=E6=8D=A2=E6=95=B0=E5=80=BC=EF=BC=8C?= =?UTF-8?q?=E5=8D=95=E7=BA=AF=E5=8F=98=E5=8C=96=E6=98=BE=E7=A4=BA=E5=8D=95?= =?UTF-8?q?=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../safetywatcher/watcher/port/GasUtilss.kt | 23 ++++++++++--------- .../watcher/ui/SensorCalibrationActivity.kt | 4 ++-- .../watcher/utils/ExportUtils.kt | 10 ++++---- 3 files changed, 20 insertions(+), 17 deletions(-) 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 595d69e..4a6b820 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 @@ -145,7 +145,7 @@ fun getLocalGasUnit(gasType: String): String { return getDefaultUnit(gasType) } -fun getDefaultUnit(gasType: String): String { +private fun getDefaultUnit(gasType: String): String { return when (gasType.uppercase()) { O2 -> UNIT_VOL CH4_H2 -> UNIT_LEL @@ -194,16 +194,17 @@ fun convertData( return 0f } var retValue = value - // lel需要先转ppm - if (unit == UNIT_LEL) { - retValue = value * gasType.lel2ppmFactor - } - // 有两种可能场景：ppm->mgm3 mgm3->ppm - if (UNIT_MGM3 == localGasUnit) { - retValue = ppm2mgm3(retValue, gasType.molecular) - } else if (UNIT_PPM == localGasUnit) { - retValue = mgm3ToPpm(retValue, gasType.molecular) - } + // TODO 客户说不需要公式转换，单纯换单位 +// // lel需要先转ppm +// if (unit == UNIT_LEL) { +// retValue = value * gasType.lel2ppmFactor +// } +// // 有两种可能场景：ppm->mgm3 mgm3->ppm +// if (UNIT_MGM3 == localGasUnit) { +// retValue = ppm2mgm3(retValue, gasType.molecular) +// } else if (UNIT_PPM == localGasUnit) { +// retValue = mgm3ToPpm(retValue, gasType.molecular) +// } return retValue } diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/SensorCalibrationActivity.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/SensorCalibrationActivity.kt index f210730..cb2192b 100644 --- a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/SensorCalibrationActivity.kt +++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/SensorCalibrationActivity.kt @@ -13,7 +13,7 @@ import com.yinuo.safetywatcher.databinding.ActivitySensorCalibrationBinding import com.yinuo.safetywatcher.watcher.base.NoOptionsActivity import com.yinuo.safetywatcher.watcher.port.GasPortUtils import com.yinuo.safetywatcher.watcher.port.ParseHelper -import com.yinuo.safetywatcher.watcher.port.getDefaultUnit +import com.yinuo.safetywatcher.watcher.port.getLocalGasUnit import com.yinuo.safetywatcher.watcher.utils.showIme import com.yinuo.safetywatcher.watcher.utils.showToast import kotlinx.coroutines.Dispatchers @@ -61,7 +61,7 @@ class SensorCalibrationActivity : NoOptionsActivity() { sensorIndex = intent.getIntExtra("index", -1) val isZero = intent.getBooleanExtra("isZero", false) val gasName = intent.getStringExtra("GasType")!! - val defaultUnit = getDefaultUnit(gasName) + val defaultUnit = getLocalGasUnit(gasName) mBinding.tvUnit.text = defaultUnit if (isZero) { diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/utils/ExportUtils.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/utils/ExportUtils.kt index 529c2e6..d02bcbe 100644 --- a/app/src/main/java/com/yinuo/safetywatcher/watcher/utils/ExportUtils.kt +++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/utils/ExportUtils.kt @@ -6,6 +6,8 @@ import com.common.commonlib.db.entity.Gas import com.common.commonlib.db.entity.Video import com.common.commonlib.db.entity.Warning import com.common.commonlib.utils.LogUtils +import com.common.commonlib.utils.forShowStr +import com.common.commonlib.utils.getGasShowName import com.yinuo.safetywatcher.watcher.ui.view.CommonDialog import com.yinuo.safetywatcher.watcher.xls.SimpleCellValue import com.yinuo.safetywatcher.watcher.xls.utils.ExcelUtils @@ -22,8 +24,8 @@ object ExportUtils { datas.forEach { val row = mutableListOf() row.add(SimpleCellValue(DateUtils.formatHistoryTime(it.time) ?: "")) - row.add(SimpleCellValue(it.gasName)) - row.add(SimpleCellValue(it.gasValue.toString())) + row.add(SimpleCellValue(it.gasName.getGasShowName())) + row.add(SimpleCellValue(it.gasValue.forShowStr())) row.add(SimpleCellValue(it.unit)) allData.add(row) } @@ -44,8 +46,8 @@ object ExportUtils { datas.forEach { val row = mutableListOf() row.add(SimpleCellValue(DateUtils.formatHistoryTime(it.startTime) ?: "")) - row.add(SimpleCellValue(it.gasName)) - row.add(SimpleCellValue(it.gasValue.toString())) + row.add(SimpleCellValue(it.gasName.getGasShowName())) + row.add(SimpleCellValue(it.gasValue.forShowStr())) row.add(SimpleCellValue(it.unit)) allData.add(row) }