From 879378a9a2e73278dc822c97f8d1dda589919b6d Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期五, 21 五月 2021 17:36:44 +0800
Subject: [PATCH] 1. 根据新的协议，扩展了设备编号的位数从1位至6位； 2. 新增监测因子无人机高度；
---
src/main/kotlin/com/flightfeather/uav/socket/decoder/DataUnitDecoder.kt | 23 ++++-------------------
1 files changed, 4 insertions(+), 19 deletions(-)
diff --git a/src/main/kotlin/com/flightfeather/uav/socket/decoder/DataUnitDecoder.kt b/src/main/kotlin/com/flightfeather/uav/socket/decoder/DataUnitDecoder.kt
index a2fb584..0975dd8 100644
--- a/src/main/kotlin/com/flightfeather/uav/socket/decoder/DataUnitDecoder.kt
+++ b/src/main/kotlin/com/flightfeather/uav/socket/decoder/DataUnitDecoder.kt
@@ -1,7 +1,7 @@
package com.flightfeather.uav.socket.decoder
import com.flightfeather.uav.socket.bean.*
-import com.flightfeather.uav.socket.eunm.ObdCommandUnit
+import com.flightfeather.uav.socket.eunm.AirCommandUnit
import java.util.*
/**
@@ -10,27 +10,12 @@
* Date: 2019/9/12
*
* 鏁版嵁鍗曞厓鎸夌収鍛戒护鍗曞厓鐨勭被鍨嬪叡鏈変互涓嬪嚑绉嶇被鍨嬶細
- * 鍛戒护鍗曞厓 @see [ObdCommandUnit]
- * 缂栫爜(byte) 瀹氫箟
- * 0x01 杞﹁締鐧诲叆
- * 0x02 瀹炴椂淇℃伅涓婃姤
- * 0x03 琛ュ彂淇℃伅涓婃姤
- * 0x04 杞﹁締鐧诲嚭
- * 0x05 缁堢鏍℃椂
- * 0x06~0x7f 涓婅鏁版嵁绯荤粺棰勭暀
+ * 鍛戒护鍗曞厓 @see [AirCommandUnit]
*/
interface DataUnitDecoder {
- fun getCarRegisterData(b: List<String>): List<CarRegisterData>
+ fun getAirConfirmData(b: List<String>, deviceCode: String?): List<AirTypeData>
- fun getRealTimeData(b: List<String>): List<RealTimeData>
-
- fun getReplacementData(b: List<String>): List<ReplacementData>
-
- fun getCarLogOutData(b: List<String>): List<CarLogOutData>
-
- fun getTimeCalibrationData(b: List<String>): List<TimeCalibrationData>
-
- fun decodeDataTime(b: List<String>): Date?
+ fun getAirData(b: List<String>, deviceCode: String?): List<AirData>
}
\ No newline at end of file
--
Gitblit v1.9.3