desc:导出使用别名，传感器单位不转换数值，单纯变化显示单位

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
 }
 

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) {

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<SimpleCellValue>()
             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<SimpleCellValue>()
             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)
         }