zhangxn
/
puwei
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

desc:字母O和数字0混了的问题

Browse Source
main
xiaowusky 1 year ago
parent b47dd5aecb
commit e9f4ddd46d
3 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File

40
app/src/main/java/com/yinuo/safetywatcher/watcher/port/GasConstants.kt
Unescape Escape View File

@ -1,12 +1,12 @@
package com.yinuo.safetywatcher.watcher.port package com.yinuo.safetywatcher.watcher.port
import com.yinuo.safetywatcher.watcher.port.cmd.C02 import com.yinuo.safetywatcher.watcher.port.cmd.CO2
import com.yinuo.safetywatcher.watcher.port.cmd.CL2 import com.yinuo.safetywatcher.watcher.port.cmd.CL2
import com.yinuo.safetywatcher.watcher.port.cmd.CO import com.yinuo.safetywatcher.watcher.port.cmd.CO
import com.yinuo.safetywatcher.watcher.port.cmd.H2 import com.yinuo.safetywatcher.watcher.port.cmd.H2
import com.yinuo.safetywatcher.watcher.port.cmd.H2S import com.yinuo.safetywatcher.watcher.port.cmd.H2S
import com.yinuo.safetywatcher.watcher.port.cmd.HF import com.yinuo.safetywatcher.watcher.port.cmd.HF
import com.yinuo.safetywatcher.watcher.port.cmd.MOLECULAR_C02 import com.yinuo.safetywatcher.watcher.port.cmd.MOLECULAR_CO2
import com.yinuo.safetywatcher.watcher.port.cmd.MOLECULAR_CL2 import com.yinuo.safetywatcher.watcher.port.cmd.MOLECULAR_CL2
import com.yinuo.safetywatcher.watcher.port.cmd.MOLECULAR_CO import com.yinuo.safetywatcher.watcher.port.cmd.MOLECULAR_CO
import com.yinuo.safetywatcher.watcher.port.cmd.MOLECULAR_H2S import com.yinuo.safetywatcher.watcher.port.cmd.MOLECULAR_H2S
@ -14,11 +14,11 @@ import com.yinuo.safetywatcher.watcher.port.cmd.MOLECULAR_HF
import com.yinuo.safetywatcher.watcher.port.cmd.MOLECULAR_NH3 import com.yinuo.safetywatcher.watcher.port.cmd.MOLECULAR_NH3
import com.yinuo.safetywatcher.watcher.port.cmd.MOLECULAR_NO import com.yinuo.safetywatcher.watcher.port.cmd.MOLECULAR_NO
import com.yinuo.safetywatcher.watcher.port.cmd.MOLECULAR_NO2 import com.yinuo.safetywatcher.watcher.port.cmd.MOLECULAR_NO2
import com.yinuo.safetywatcher.watcher.port.cmd.MOLECULAR_S02 import com.yinuo.safetywatcher.watcher.port.cmd.MOLECULAR_SO2
import com.yinuo.safetywatcher.watcher.port.cmd.NH3 import com.yinuo.safetywatcher.watcher.port.cmd.NH3
import com.yinuo.safetywatcher.watcher.port.cmd.NO import com.yinuo.safetywatcher.watcher.port.cmd.NO
import com.yinuo.safetywatcher.watcher.port.cmd.NO2 import com.yinuo.safetywatcher.watcher.port.cmd.NO2
import com.yinuo.safetywatcher.watcher.port.cmd.S02 import com.yinuo.safetywatcher.watcher.port.cmd.SO2
// ppm转mgm3转化率 // ppm转mgm3转化率
const val PPM_TO_MGM3_CONVERSION_RATE = 0.0409f const val PPM_TO_MGM3_CONVERSION_RATE = 0.0409f
@ -41,8 +41,8 @@ const val H2_MIN_LEL = 25f
const val H2_MAX_LEL = 50f const val H2_MAX_LEL = 50f
const val NH3_MIN_PPM = 25f const val NH3_MIN_PPM = 25f
const val NH3_MAX_PPM = 50f const val NH3_MAX_PPM = 50f
const val S02_MIN_PPM = 2f const val SO2_MIN_PPM = 2f
const val S02_MAX_PPM = 5f const val SO2_MAX_PPM = 5f
const val CL2_MIN_PPM = 0.5f const val CL2_MIN_PPM = 0.5f
const val CL2_MAX_PPM = 1f const val CL2_MAX_PPM = 1f
const val NO2_MIN_PPM = 2f const val NO2_MIN_PPM = 2f
@ -51,8 +51,8 @@ const val NO_MIN_PPM = 13f
const val NO_MAX_PPM = 25f const val NO_MAX_PPM = 25f
const val HF_MIN_PPM = 2f const val HF_MIN_PPM = 2f
const val HF_MAX_PPM = 6f const val HF_MAX_PPM = 6f
const val C02_MIN_PPM = 5000f const val CO2_MIN_PPM = 5000f
const val C02_MAX_PPM = 30000f const val CO2_MAX_PPM = 30000f
//?? TODO VOCS 这个值现在不对 //?? TODO VOCS 这个值现在不对
const val VOCS_MIN_PPM = 2f const val VOCS_MIN_PPM = 2f
@ -77,8 +77,8 @@ val default_threshold_map_ppm = hashMapOf(
// Pair("${H2}_$MAX_SUFFIX", lel2ppm(H2_MAX_LEL, H2_LEL2PPMFACTOR)), // Pair("${H2}_$MAX_SUFFIX", lel2ppm(H2_MAX_LEL, H2_LEL2PPMFACTOR)),
Pair("${NH3}_$MIN_SUFFIX", NH3_MIN_PPM), Pair("${NH3}_$MIN_SUFFIX", NH3_MIN_PPM),
Pair("${NH3}_$MAX_SUFFIX", NH3_MAX_PPM), Pair("${NH3}_$MAX_SUFFIX", NH3_MAX_PPM),
Pair("${S02}_$MIN_SUFFIX", S02_MIN_PPM), Pair("${SO2}_$MIN_SUFFIX", SO2_MIN_PPM),
Pair("${S02}_$MAX_SUFFIX", S02_MAX_PPM), Pair("${SO2}_$MAX_SUFFIX", SO2_MAX_PPM),
Pair("${CL2}_$MIN_SUFFIX", CL2_MIN_PPM), Pair("${CL2}_$MIN_SUFFIX", CL2_MIN_PPM),
Pair("${CL2}_$MAX_SUFFIX", CL2_MAX_PPM), Pair("${CL2}_$MAX_SUFFIX", CL2_MAX_PPM),
Pair("${NO2}_$MIN_SUFFIX", NO2_MIN_PPM), Pair("${NO2}_$MIN_SUFFIX", NO2_MIN_PPM),
@ -87,8 +87,8 @@ val default_threshold_map_ppm = hashMapOf(
Pair("${NO}_$MAX_SUFFIX", NO_MAX_PPM), Pair("${NO}_$MAX_SUFFIX", NO_MAX_PPM),
Pair("${HF}_$MIN_SUFFIX", HF_MIN_PPM), Pair("${HF}_$MIN_SUFFIX", HF_MIN_PPM),
Pair("${HF}_$MAX_SUFFIX", HF_MAX_PPM), Pair("${HF}_$MAX_SUFFIX", HF_MAX_PPM),
Pair("${C02}_$MIN_SUFFIX", C02_MIN_PPM), Pair("${CO2}_$MIN_SUFFIX", CO2_MIN_PPM),
Pair("${C02}_$MAX_SUFFIX", C02_MAX_PPM), Pair("${CO2}_$MAX_SUFFIX", CO2_MAX_PPM),
) )
// 气体默认阈值表 // 气体默认阈值表
@ -103,8 +103,8 @@ val default_threshold_map_mgm3 = hashMapOf(
// Pair("${H2}_$MAX_SUFFIX", ppm2mgm3(lel2ppm(H2_MAX_LEL, H2_LEL2PPMFACTOR), MOLECULAR_H2)), // Pair("${H2}_$MAX_SUFFIX", ppm2mgm3(lel2ppm(H2_MAX_LEL, H2_LEL2PPMFACTOR), MOLECULAR_H2)),
Pair("${NH3}_$MIN_SUFFIX", ppm2mgm3(NH3_MIN_PPM, MOLECULAR_NH3)), Pair("${NH3}_$MIN_SUFFIX", ppm2mgm3(NH3_MIN_PPM, MOLECULAR_NH3)),
Pair("${NH3}_$MAX_SUFFIX", ppm2mgm3(NH3_MAX_PPM, MOLECULAR_NH3)), Pair("${NH3}_$MAX_SUFFIX", ppm2mgm3(NH3_MAX_PPM, MOLECULAR_NH3)),
Pair("${S02}_$MIN_SUFFIX", ppm2mgm3(S02_MIN_PPM, MOLECULAR_S02)), Pair("${SO2}_$MIN_SUFFIX", ppm2mgm3(SO2_MIN_PPM, MOLECULAR_SO2)),
Pair("${S02}_$MAX_SUFFIX", ppm2mgm3(S02_MAX_PPM, MOLECULAR_S02)), Pair("${SO2}_$MAX_SUFFIX", ppm2mgm3(SO2_MAX_PPM, MOLECULAR_SO2)),
Pair("${CL2}_$MIN_SUFFIX", ppm2mgm3(CL2_MIN_PPM, MOLECULAR_CL2)), Pair("${CL2}_$MIN_SUFFIX", ppm2mgm3(CL2_MIN_PPM, MOLECULAR_CL2)),
Pair("${CL2}_$MAX_SUFFIX", ppm2mgm3(CL2_MAX_PPM, MOLECULAR_CL2)), Pair("${CL2}_$MAX_SUFFIX", ppm2mgm3(CL2_MAX_PPM, MOLECULAR_CL2)),
Pair("${NO2}_$MIN_SUFFIX", ppm2mgm3(NO2_MIN_PPM, MOLECULAR_NO2)), Pair("${NO2}_$MIN_SUFFIX", ppm2mgm3(NO2_MIN_PPM, MOLECULAR_NO2)),
@ -113,8 +113,8 @@ val default_threshold_map_mgm3 = hashMapOf(
Pair("${NO}_$MAX_SUFFIX", ppm2mgm3(NO_MAX_PPM, MOLECULAR_NO)), Pair("${NO}_$MAX_SUFFIX", ppm2mgm3(NO_MAX_PPM, MOLECULAR_NO)),
Pair("${HF}_$MIN_SUFFIX", ppm2mgm3(HF_MIN_PPM, MOLECULAR_HF)), Pair("${HF}_$MIN_SUFFIX", ppm2mgm3(HF_MIN_PPM, MOLECULAR_HF)),
Pair("${HF}_$MAX_SUFFIX", ppm2mgm3(HF_MAX_PPM, MOLECULAR_HF)), Pair("${HF}_$MAX_SUFFIX", ppm2mgm3(HF_MAX_PPM, MOLECULAR_HF)),
Pair("${C02}_$MIN_SUFFIX", ppm2mgm3(C02_MIN_PPM, MOLECULAR_C02)), Pair("${CO2}_$MIN_SUFFIX", ppm2mgm3(CO2_MIN_PPM, MOLECULAR_CO2)),
Pair("${C02}_$MAX_SUFFIX", ppm2mgm3(C02_MAX_PPM, MOLECULAR_C02)), Pair("${CO2}_$MAX_SUFFIX", ppm2mgm3(CO2_MAX_PPM, MOLECULAR_CO2)),
) )
val default_threshold_map_unit = hashMapOf( val default_threshold_map_unit = hashMapOf(
@ -132,7 +132,7 @@ val so2_gas_cross_impact_map = hashMapOf(
val co_gas_cross_impact_map = hashMapOf( val co_gas_cross_impact_map = hashMapOf(
Pair(H2S, -0.25f), Pair(H2S, -0.25f),
Pair(S02, -0.25f), Pair(SO2, -0.25f),
Pair(NO, -0.5f), Pair(NO, -0.5f),
Pair(H2, -0.125f) Pair(H2, -0.125f)
) )
@ -144,9 +144,9 @@ val h2s_gas_cross_impact_map = hashMapOf(
val nh3_gas_cross_impact_map = hashMapOf( val nh3_gas_cross_impact_map = hashMapOf(
Pair(CO, 0.02f), Pair(CO, 0.02f),
Pair(H2S, -3.4f), Pair(H2S, -3.4f),
Pair(C02, 0.0005f), Pair(CO2, 0.0005f),
Pair(H2, 0.0015f), Pair(H2, 0.0015f),
Pair(S02, -1.6f), Pair(SO2, -1.6f),
Pair(NO2, 1f), Pair(NO2, 1f),
Pair(CL2, 0.5f) Pair(CL2, 0.5f)
) )
@ -160,7 +160,7 @@ val no_gas_cross_impact_map = hashMapOf(
* 气体交叉影响系数表 * 气体交叉影响系数表
*/ */
val gas_cross_impact_map = hashMapOf( val gas_cross_impact_map = hashMapOf(
Pair(S02, so2_gas_cross_impact_map), Pair(SO2, so2_gas_cross_impact_map),
Pair(CO, co_gas_cross_impact_map), Pair(CO, co_gas_cross_impact_map),
Pair(H2S, h2s_gas_cross_impact_map), Pair(H2S, h2s_gas_cross_impact_map),
// Pair(CL2, gas_cross_impact_map), // Pair(CL2, gas_cross_impact_map),

6
app/src/main/java/com/yinuo/safetywatcher/watcher/port/GasUtilss.kt
Unescape Escape View File

@ -4,7 +4,7 @@ import android.content.Context
import com.common.commonlib.db.entity.Warning import com.common.commonlib.db.entity.Warning
import com.common.commonlib.utils.MMKVUtils import com.common.commonlib.utils.MMKVUtils
import com.yinuo.safetywatcher.R import com.yinuo.safetywatcher.R
import com.yinuo.safetywatcher.watcher.port.cmd.C02 import com.yinuo.safetywatcher.watcher.port.cmd.CO2
import com.yinuo.safetywatcher.watcher.port.cmd.CH4 import com.yinuo.safetywatcher.watcher.port.cmd.CH4
import com.yinuo.safetywatcher.watcher.port.cmd.CL2 import com.yinuo.safetywatcher.watcher.port.cmd.CL2
import com.yinuo.safetywatcher.watcher.port.cmd.CO import com.yinuo.safetywatcher.watcher.port.cmd.CO
@ -17,7 +17,7 @@ import com.yinuo.safetywatcher.watcher.port.cmd.NH3
import com.yinuo.safetywatcher.watcher.port.cmd.NO import com.yinuo.safetywatcher.watcher.port.cmd.NO
import com.yinuo.safetywatcher.watcher.port.cmd.NO2 import com.yinuo.safetywatcher.watcher.port.cmd.NO2
import com.yinuo.safetywatcher.watcher.port.cmd.O2 import com.yinuo.safetywatcher.watcher.port.cmd.O2
import com.yinuo.safetywatcher.watcher.port.cmd.S02 import com.yinuo.safetywatcher.watcher.port.cmd.SO2
import com.yinuo.safetywatcher.watcher.port.cmd.VOCS import com.yinuo.safetywatcher.watcher.port.cmd.VOCS
import com.yinuo.safetywatcher.watcher.port.cmd.getGasTypeEnumByDesc import com.yinuo.safetywatcher.watcher.port.cmd.getGasTypeEnumByDesc
@ -149,7 +149,7 @@ fun getDefaultUnit(gasType: String): String {
O2 -> UNIT_VOL O2 -> UNIT_VOL
CH4, H2 -> UNIT_LEL CH4, H2 -> UNIT_LEL
VOCS -> UNIT_PPM VOCS -> UNIT_PPM
CO, H2S, NH3, S02, CL2, NO2, NO, HF, C02 -> UNIT_PPM CO, H2S, NH3, SO2, CL2, NO2, NO, HF, CO2 -> UNIT_PPM
else -> UNIT_PPM else -> UNIT_PPM
} }
} }

12
app/src/main/java/com/yinuo/safetywatcher/watcher/port/cmd/GasTypeEnum.kt
Unescape Escape View File

@ -6,12 +6,12 @@ const val O2 = "O2"
const val H2S = "H2S" const val H2S = "H2S"
const val H2 = "H2" const val H2 = "H2"
const val NH3 = "NH3" const val NH3 = "NH3"
const val S02 = "S02" const val SO2 = "SO2"
const val CL2 = "CL2" const val CL2 = "CL2"
const val NO2 = "NO2" const val NO2 = "NO2"
const val NO = "NO" const val NO = "NO"
const val HF = "HF" const val HF = "HF"
const val C02 = "C02" const val CO2 = "CO2"
const val VOCS = "VOCS" const val VOCS = "VOCS"
/** /**
@ -23,12 +23,12 @@ const val MOLECULAR_CH4 = 16
const val MOLECULAR_O2 = 32 const val MOLECULAR_O2 = 32
const val MOLECULAR_H2 = 2 const val MOLECULAR_H2 = 2
const val MOLECULAR_NH3 = 17 const val MOLECULAR_NH3 = 17
const val MOLECULAR_S02 = 64 const val MOLECULAR_SO2 = 64
const val MOLECULAR_CL2 = 71 const val MOLECULAR_CL2 = 71
const val MOLECULAR_NO2 = 46 const val MOLECULAR_NO2 = 46
const val MOLECULAR_NO = 30 const val MOLECULAR_NO = 30
const val MOLECULAR_HF = 20 const val MOLECULAR_HF = 20
const val MOLECULAR_C02 = 44 const val MOLECULAR_CO2 = 44
const val CH4_LEL2PPMFACTOR = 500f const val CH4_LEL2PPMFACTOR = 500f
const val H2S_LEL2PPMFACTOR = 430f const val H2S_LEL2PPMFACTOR = 430f
@ -61,12 +61,12 @@ enum class GasTypeEnum(
TYPE_H2S(52, H2S, RANGE_MAX_H2S, MOLECULAR_O2, H2S_LEL2PPMFACTOR), TYPE_H2S(52, H2S, RANGE_MAX_H2S, MOLECULAR_O2, H2S_LEL2PPMFACTOR),
TYPE_H2(50, H2, RANGE_MAX_H2_CH4, MOLECULAR_H2, H2_LEL2PPMFACTOR), TYPE_H2(50, H2, RANGE_MAX_H2_CH4, MOLECULAR_H2, H2_LEL2PPMFACTOR),
TYPE_NH3(63, NH3, RANGE_MAX_NH3, MOLECULAR_NH3), TYPE_NH3(63, NH3, RANGE_MAX_NH3, MOLECULAR_NH3),
TYPE_S02(72, S02, RANGE_MAX_SO2, MOLECULAR_S02), TYPE_SO2(72, SO2, RANGE_MAX_SO2, MOLECULAR_SO2),
TYPE_CL2(17, CL2, RANGE_MAX_CL2, MOLECULAR_CL2), TYPE_CL2(17, CL2, RANGE_MAX_CL2, MOLECULAR_CL2),
TYPE_NO2(60, NO2, RANGE_MAX_NO2, MOLECULAR_NO2), TYPE_NO2(60, NO2, RANGE_MAX_NO2, MOLECULAR_NO2),
TYPE_NO(59, NO, RANGE_MAX_NO, MOLECULAR_NO), TYPE_NO(59, NO, RANGE_MAX_NO, MOLECULAR_NO),
TYPE_HF(57, HF, RANGE_MAX_HF, MOLECULAR_HF), TYPE_HF(57, HF, RANGE_MAX_HF, MOLECULAR_HF),
TYPE_C02(6, C02, RANGE_MAX_CO2, MOLECULAR_C02), TYPE_CO2(6, CO2, RANGE_MAX_CO2, MOLECULAR_CO2),
TYPE_VOCS(80, VOCS, RANGE_MAX_VOCS), TYPE_VOCS(80, VOCS, RANGE_MAX_VOCS),
TYPE_UNKNOW(-1, "UNKNOW", -1) TYPE_UNKNOW(-1, "UNKNOW", -1)
} }

Write Preview
Loading…
Cancel
Save