From 4cb662daa3d2760cc4c892e58f73cbf10b265f6f Mon Sep 17 00:00:00 2001 From: riku <risaku@163.com> Date: 星期五, 11 十二月 2020 11:55:56 +0800 Subject: [PATCH] 新增经纬度、和时间的解析逻辑 --- src/main/kotlin/com/flightfeather/uav/socket/decoder/DataPackageDecoder.kt | 19 +++++++------------ 1 files changed, 7 insertions(+), 12 deletions(-) diff --git a/src/main/kotlin/com/flightfeather/uav/socket/decoder/DataPackageDecoder.kt b/src/main/kotlin/com/flightfeather/uav/socket/decoder/DataPackageDecoder.kt index 1849efa..8740c9c 100644 --- a/src/main/kotlin/com/flightfeather/uav/socket/decoder/DataPackageDecoder.kt +++ b/src/main/kotlin/com/flightfeather/uav/socket/decoder/DataPackageDecoder.kt @@ -1,7 +1,8 @@ package com.flightfeather.uav.socket.decoder import com.flightfeather.uav.socket.bean.DataUnit -import com.flightfeather.uav.socket.eunm.ObdCommandUnit +import com.flightfeather.uav.socket.eunm.AirCommandUnit +import java.util.* /** * uav 绗竴灞傛暟鎹寘瑙g爜鍣� @@ -11,13 +12,9 @@ * 鏁版嵁绗竴灞傜粨鏋勫畾涔夊涓嬶細 * 璧峰瀛楄妭 瀹氫箟 * 0 璧峰绗� - * 2 鍛戒护鍗曞厓 绫诲瀷@see [ObdCommandUnit] - * 3 杞﹁締璇嗗埆鍙� - * 4 缁堢杞欢鐗堟湰鍙� - * 21 鏁版嵁鍔犲瘑鏂瑰紡 - * 22 鏁版嵁鍗曞厓闀垮害 - * 24 鏁版嵁鍗曞厓 瑙g爜鍣ˊsee [DataUnitDecoder] - * 鍊掓暟绗�1 鏍¢獙鐮� + * 1 鍛戒护鍗曞厓 绫诲瀷@see [AirCommandUnit] + * 2 鏁版嵁鍗曞厓闀垮害 + * 鍊掓暟绗�2 鏍¢獙鐮� */ interface DataPackageDecoder { @@ -25,11 +22,9 @@ fun getCommandUnit(b: List<String>): Int? - fun getVinCode(b: List<String>): String? + fun getDeviceCode(b: List<String>): String? - fun getSoftwareVersion(b: List<String>): Int? - - fun getEncryptionWay(b: List<String>): Int? + fun getDataTime(b: List<String>): Date fun getDataLength(b: List<String>): Int -- Gitblit v1.9.3