From 25d0f31f22f77a914a50bbc088902e00e28c4889 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期三, 15 七月 2020 11:10:42 +0800
Subject: [PATCH] 根据新的多参数传输协议，修改解析规则
---
src/main/kotlin/com/flightfeather/uav/socket/eunm/FactorType.kt | 28 ++++++++++++++++++----------
1 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/src/main/kotlin/com/flightfeather/uav/socket/eunm/FactorType.kt b/src/main/kotlin/com/flightfeather/uav/socket/eunm/FactorType.kt
index e14c100..da16a68 100644
--- a/src/main/kotlin/com/flightfeather/uav/socket/eunm/FactorType.kt
+++ b/src/main/kotlin/com/flightfeather/uav/socket/eunm/FactorType.kt
@@ -4,16 +4,20 @@
* @author riku
* Date: 2020/6/10
*/
-enum class FactorType(val value: Int, val des: String){
- NO2(1, "NO2"),
- CO(2,"CO"),
- H2S(3,"H2S"),
- SO2(4,"SO2"),
- O3(5,"O3"),
- PM25(6,"PM25"),
- PM10(7, "PM10"),
- TEMPERATURE(8,"TEMPERATURE"),
- HUMIDITY(9, "HUMIDITY");
+enum class FactorType(val value: Int, val des: String, val byteLength: Int){
+ NO2(1, "NO2", 6),
+ CO(2,"CO", 6),
+ H2S(3,"H2S",6),
+ SO2(4,"SO2",6),
+ O3(5,"O3",6),
+ PM25(6,"PM25",3),
+ PM10(7, "PM10",3),
+ TEMPERATURE(8,"TEMPERATURE",3),
+ HUMIDITY(9, "HUMIDITY",3),
+ VOC(10, "VOC",3),
+ NOI(11, "NOI",3),//璐熸哀绂诲瓙
+ LNG(12,"LNG",3),//缁忓害
+ LAT(13,"LAT",3);//绾害
companion object {
@@ -27,6 +31,10 @@
PM10.value -> PM10
TEMPERATURE.value -> TEMPERATURE
HUMIDITY.value -> HUMIDITY
+ VOC.value -> VOC
+ NOI.value -> NOI
+ LNG.value -> LNG
+ LAT.value -> LAT
else -> null
}
}
--
Gitblit v1.9.3