From 2bf337ab074f1c047c4f4e4df29ed994d3decaf1 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期二, 17 九月 2019 13:57:32 +0800
Subject: [PATCH] 修改一些属性及类的命名
---
src/main/kotlin/com/flightfeather/obd/socket/decoder/impl/DataUnitDecoderImpl.kt | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/main/kotlin/com/flightfeather/obd/socket/decoder/impl/DataUnitDecoderImpl.kt b/src/main/kotlin/com/flightfeather/obd/socket/decoder/impl/DataUnitDecoderImpl.kt
index 139051c..02ad0de 100644
--- a/src/main/kotlin/com/flightfeather/obd/socket/decoder/impl/DataUnitDecoderImpl.kt
+++ b/src/main/kotlin/com/flightfeather/obd/socket/decoder/impl/DataUnitDecoderImpl.kt
@@ -4,11 +4,8 @@
import com.flightfeather.obd.socket.decoder.DataUnitDecoder
import com.flightfeather.obd.socket.decoder.RealTimeDataDecoder
import com.flightfeather.obd.socket.eunm.ObdDataType
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.stereotype.Component
import java.lang.StringBuilder
import java.util.*
-import javax.annotation.PostConstruct
/**
* @author riku
@@ -35,10 +32,10 @@
val time = decodeDataTime(b)
//鍥芥爣娉�: 璧峰瀛楄妭涓�7 寮�濮嬬殑2涓瓧鑺傝〃绀� 娴佹按鍙�
-// val serialNum = "${b[7]}${b[8]}".toInt(16)
+ val serialNum = "${b[7]}${b[8]}".toInt(16)
//涓婃捣娉�: 璧峰瀛楄妭涓�6 寮�濮嬬殑2涓瓧鑺傝〃绀� 娴佹按鍙�
- val serialNum = "${b[6]}${b[7]}".toInt(16)
+// val serialNum = "${b[6]}${b[7]}".toInt(16)
val dataList = mutableListOf<String>().apply { addAll(b) }
//鍒犲幓鍓�6浣嶆椂闂�
@@ -51,15 +48,15 @@
* 鍒犲幓娴佹按鍙凤紝寰楀埌淇℃伅鏍囧織涓庝俊鎭綋鐨勭粍鍚�
* (鍥芥爣娉曪細鍘婚櫎鍓�6浣嶆椂闂村悗锛岃捣濮嬪瓧鑺備负1 寮�濮嬬殑2涓瓧鑺傝〃绀� 娴佹按鍙�)
*/
-// if (dataList.size >= 2) dataList.removeAt(1)
-// if (dataList.size >= 2) dataList.removeAt(1)
+ if (dataList.size >= 2) dataList.removeAt(1)
+ if (dataList.size >= 2) dataList.removeAt(1)
/*
* 鍒犲幓娴佹按鍙凤紝寰楀埌淇℃伅鏍囧織涓庝俊鎭綋鐨勭粍鍚�
* (涓婃捣娉曪細鍘婚櫎鍓�6浣嶆椂闂村悗锛岃捣濮嬪瓧鑺備负0 寮�濮嬬殑2涓瓧鑺傝〃绀� 娴佹按鍙�)
*/
- if (dataList.isNotEmpty()) dataList.removeAt(0)
- if (dataList.isNotEmpty()) dataList.removeAt(0)
+// if (dataList.isNotEmpty()) dataList.removeAt(0)
+// if (dataList.isNotEmpty()) dataList.removeAt(0)
val resultList = mutableListOf<RealTimeData>()
@@ -72,8 +69,8 @@
if (data.isNotEmpty()) {
val r = when (data[0].toInt(16)) {
ObdDataType.ObdData.value -> realTimeDataDecoder.getObdData(time, serialNum, data)
- ObdDataType.EngineDataFlow.value -> realTimeDataDecoder.getEngineDataFlow(time, serialNum, data)
- ObdDataType.SupplementDataFlow.value -> realTimeDataDecoder.getSupplementDataFlow(time, serialNum, data)
+ ObdDataType.EngineDataFlow.value -> realTimeDataDecoder.getEngineDataStream(time, serialNum, data)
+ ObdDataType.SupplementDataFlow.value -> realTimeDataDecoder.getSupplementDataStream(time, serialNum, data)
else -> null
}
@@ -84,6 +81,9 @@
for (i in 0 until data.size) {
if (dataList.isNotEmpty()) dataList.removeAt(0)
}
+ }else if (dataList.isNotEmpty()) {
+ //鎸夌収瑙勫垯娌℃湁鍙栧埌淇℃伅浣擄紝骞朵笖鍘熸暟鎹笉涓虹┖锛岃〃绀哄師鏁版嵁鏍煎紡閿欒锛岄��鍑哄惊鐜�
+// break
}
}
--
Gitblit v1.9.3