From 259512005923831d1221bd49568751bf519dc020 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期三, 18 九月 2019 23:18:10 +0800
Subject: [PATCH] 1. 修复保存obd 信息体方法未被调用的问题
---
src/main/kotlin/com/flightfeather/obd/socket/decoder/impl/DataUnitDecoderImpl.kt | 11 ++++++-----
1 files changed, 6 insertions(+), 5 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..a2875b4 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
@@ -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
}
}
@@ -116,6 +116,7 @@
val sec = b[5].toInt(16)
val cal = Calendar.getInstance().apply {
set(year, month - 1, day, hour, min, sec)
+ set(Calendar.MILLISECOND, 0)
}
return cal.time
--
Gitblit v1.9.3