diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/App.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/App.kt index e71969c..473a1cb 100644 --- a/app/src/main/java/com/yinuo/safetywatcher/watcher/App.kt +++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/App.kt @@ -28,7 +28,6 @@ class App : CommonApplication() { // LztekUtil.setObject(Lztek.create(this)) ipConfig() tryFixDbData() - TestUtils.insertData() } private fun ipConfig() { diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/port/cmd/GasTypeEnum.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/port/cmd/GasTypeEnum.kt index 4d7e740..0568ae9 100644 --- a/app/src/main/java/com/yinuo/safetywatcher/watcher/port/cmd/GasTypeEnum.kt +++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/port/cmd/GasTypeEnum.kt @@ -44,15 +44,15 @@ enum class GasTypeEnum( TYPE_CH4(11, CH4, MOLECULAR_H2S, CH4_LEL2PPMFACTOR), TYPE_O2(67, O2, MOLECULAR_CH4), TYPE_H2S(52, H2S, MOLECULAR_O2, H2S_LEL2PPMFACTOR), - TYPE_H2(52, H2, MOLECULAR_H2, H2_LEL2PPMFACTOR), - TYPE_NH3(52, NH3, MOLECULAR_NH3), - TYPE_S02(52, S02, MOLECULAR_S02), - TYPE_CL2(52, CL2, MOLECULAR_CL2), - TYPE_NO2(52, NO2, MOLECULAR_NO2), - TYPE_NO(52, NO, MOLECULAR_NO), - TYPE_HF(52, HF, MOLECULAR_HF), - TYPE_C02(52, C02, MOLECULAR_C02), - TYPE_VOCS(52, VOCS), + TYPE_H2(50, H2, MOLECULAR_H2, H2_LEL2PPMFACTOR), + TYPE_NH3(63, NH3, MOLECULAR_NH3), + TYPE_S02(72, S02, MOLECULAR_S02), + TYPE_CL2(17, CL2, MOLECULAR_CL2), + TYPE_NO2(60, NO2, MOLECULAR_NO2), + TYPE_NO(59, NO, MOLECULAR_NO), + TYPE_HF(57, HF, MOLECULAR_HF), + TYPE_C02(6, C02, MOLECULAR_C02), + TYPE_VOCS(80, VOCS), TYPE_UNKNOW(-1, "UNKNOW") }