From 14ce5d2ccfae554497763da846ffb9eb39cd6d34 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期一, 23 九月 2019 12:55:26 +0800
Subject: [PATCH] 1. 修改实时数据各项的转换逻辑
---
src/test/kotlin/com/flightfeather/obd/socket/decoder/VehicleDataDecoderTest.kt | 37 +++++++++++--------------------------
1 files changed, 11 insertions(+), 26 deletions(-)
diff --git a/src/test/kotlin/com/flightfeather/obd/socket/decoder/VehicleDataDecoderTest.kt b/src/test/kotlin/com/flightfeather/obd/socket/decoder/VehicleDataDecoderTest.kt
index 8eac338..261acfa 100644
--- a/src/test/kotlin/com/flightfeather/obd/socket/decoder/VehicleDataDecoderTest.kt
+++ b/src/test/kotlin/com/flightfeather/obd/socket/decoder/VehicleDataDecoderTest.kt
@@ -15,9 +15,9 @@
@Test
fun decode() {
- val msg = "23 23 02 31 37 36 39 31 35 33 31 39 30 39 31 32 30 30 30 36 01 01 00 42 13 09 11 08 3b 36 02 00 3a 00 00 d4 00 00 12 c0 09 5e 00 c8 00 c8 00 15 a9 00 00 00 00 00 00 73 00 00 00 b9 1b c7 00 2e e1 24 00 00 00 00 80 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 dc"
+ val msg = "23 23 02 31 37 36 39 31 35 33 31 39 30 39 31 32 30 30 31 36 01 01 00 40 13 09 17 09 05 29 00 cd 02 17 00 da fd ff 12 c0 ff ff 00 c8 04 ec ff 15 a9 ff ff ff ff ff ff 73 00 00 07 43 ec 88 01 d6 de cc ff ff ff ff 80 ff 00 ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff f6"
val msg2 = "23 23 02 31 37 36 39 31 35 33 31 39 30 39 31 32 30 30 30 36 01 01 00 42 13 09 11 08 3b 36 02 00 3b 00 00 d4 00 00 12 c0 09 5e 00 c8 00 c8 00 15 a9 00 00 00 00 00 00 73 00 00 00 b9 1b c7 00 2e e1 25 00 00 00 00 80 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 dc"
- val packageData = vehicleDataDecoder.decode(msg2)
+ val packageData = vehicleDataDecoder.decode(msg)
val obdData = ObdData().apply {
obdVin = packageData.deviceCode
@@ -36,11 +36,14 @@
}
ObdCommandUnit.RealTimeData.value,
ObdCommandUnit.ReplacementData.value -> {
+
packageData.dataUnit.forEach {
+ obdData.apply {
+ obdTime = it.time
+ }
when (it) {
- is com.flightfeather.obd.socket.bean.ObdData -> {
+ is com.flightfeather.obd.socket.bean.ObdInfo -> {
obdData.apply {
- obdTime = it.time
obdProtocol = it.obdProtocol
obdMil = it.obdMil
obdIdCode = it.obdCrn
@@ -51,7 +54,6 @@
}
is EngineDataStream -> {
obdData.apply {
- obdTime = it.time
obdLng = it.obdLong
obdLat = it.obdLat
obdSpeed = it.obdSpeed?.toInt()
@@ -60,8 +62,8 @@
obdFrictionTorque = it.obdFrictionTorque
obdEngineRpm = it.obdEngineRpm?.toInt()
obdStartFuelFlow = it.obdEngineFuelFlow
- obdScrUpstreamNo = it.obdScrUpstreamNo
- obdScrDownstreamNo = it.obdScrDownstreamNo
+ obdScrUpstreamNo = it.obdScrUpstreamNox
+ obdScrDownstreamNo = it.obdScrDownstreamNox
obdRemainReactant = it.obdRemainReactant
obdAirInput = it.obdAirInput
obdScrInputTemp = it.obdScrInputTemp
@@ -75,7 +77,6 @@
}
is SupplementDataStream -> {
obdData.apply {
- obdTime = it.time
obdEngineTorqueMode = it.obdEngineTorqueMode?.toString()
obdAcceleratorPedal = it.obdAcceleratorPedal
obdTotalOilConsumption = it.obdTotalOilConsumption
@@ -91,26 +92,10 @@
}
ObdCommandUnit.CarLogOut.value -> {
- packageData.dataUnit.forEach {
- when (it) {
- is CarLogOutData -> {
- obdData.apply {
- obdTime = it.time
- }
- }
- }
- }
+
}
ObdCommandUnit.TimeCalibration.value -> {
- packageData.dataUnit.forEach {
- when (it) {
- is TimeCalibrationData -> {
- obdData.apply {
- obdTime = it.time
- }
- }
- }
- }
+
}
}
}
--
Gitblit v1.9.3