修改监测因子类型

riku

2020-12-11 7269d4a4755fa48c45e827bdc5b5ac56c6eca99c

 src/main/kotlin/com/flightfeather/uav/socket/decoder/impl/DataUnitDecoderImpl.kt

@@ -45,7 +45,7 @@
                    val valid = b[i].toInt(16).toChar()//经纬度是否有效（有效: A; 无效: V）
                    val a1 = b[i + 1].toInt(16)
                    val b1 = b[i + 2].toInt(16)
                    var b2 = "${b[i + 3]}${b[i + 4]}".toInt(16).toLong()
                    var b2 = "${b[i + 3]}${b[i + 4]}".toInt(16).toDouble()
                    while (b2 >= 1) {
                        b2 /= 10
                    }
@@ -62,7 +62,7 @@
                FactorType.LAT -> {
                    val a1 = b[i].toInt(16)
                    val b1 = b[i + 1].toInt(16)
                    var b2 = "${b[i + 2]}${b[i + 3]}".toInt(16).toLong()
                    var b2 = "${b[i + 2]}${b[i + 3]}".toInt(16).toDouble()
                    while (b2 >= 1) {
                        b2 /= 10
                    }
@@ -87,7 +87,7 @@
                    resultList.add(AirData().apply {
                        factorId = it.factorType.value.toString()
                        factorName = it.factorType.des
                        factorData = time
                        factorData = time.toDouble()
                        statusList = listOf(date)
                    })
                }
@@ -95,7 +95,7 @@
                    when (it.factorType.byteLength) {
                        AirDataPackage.FACTOR_BIT_LENGTH_2 -> {
                            val a1 = "${b[i]}${b[i + 1]}".toInt(16)
                            var b1 = b[i + 2].toInt(16).toLong()
                            var b1 = b[i + 2].toInt(16).toDouble()
                            while (b1 >= 1) {
                                b1 /= 10
                            }
@@ -110,7 +110,7 @@
                        AirDataPackage.FACTOR_BIT_LENGTH_1 -> {
                            //数据实际值（3位字节表示）
                            val a1 = "${b[i]}${b[i + 1]}".toInt(16)
                            var b1 = b[i + 2].toInt(16).toLong()
                            var b1 = b[i + 2].toInt(16).toDouble()
                            while (b1 >= 1) {
                                b1 /= 10
                            }
@@ -118,7 +118,7 @@

                            //数据物理量（3位字节表示）
                            val a2 = "${b[i+3]}${b[i + 4]}".toInt(16)
                            var b2 = b[i + 5].toInt(16).toLong()
                            var b2 = b[i + 5].toInt(16).toDouble()
                            while (b2 >= 1) {
                                b2 /= 10
                            }