From 1074bb5c8473dcb99d6edea5fa67ae7aa78af248 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期二, 17 九月 2019 15:54:59 +0800
Subject: [PATCH] 1. 按照数据分类添加新的数据库表格 2. 完成数据分表存储逻辑并debug完成
---
src/test/kotlin/com/flightfeather/obd/socket/decoder/VehicleDataDecoderTest.kt | 33 +++++++++------------------------
1 files changed, 9 insertions(+), 24 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..bfdb760 100644
--- a/src/test/kotlin/com/flightfeather/obd/socket/decoder/VehicleDataDecoderTest.kt
+++ b/src/test/kotlin/com/flightfeather/obd/socket/decoder/VehicleDataDecoderTest.kt
@@ -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