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/main/kotlin/com/flightfeather/obd/repository/impl/ObdDataDaoImpl.kt | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/kotlin/com/flightfeather/obd/repository/impl/ObdDataDaoImpl.kt b/src/main/kotlin/com/flightfeather/obd/repository/impl/ObdDataDaoImpl.kt
index 0ecfaae..54eeee9 100644
--- a/src/main/kotlin/com/flightfeather/obd/repository/impl/ObdDataDaoImpl.kt
+++ b/src/main/kotlin/com/flightfeather/obd/repository/impl/ObdDataDaoImpl.kt
@@ -66,18 +66,18 @@
ObdCommandUnit.ReplacementData.value -> {
packageData.dataUnit.forEach {
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.obdSoftwareCode
+ obdIdCode = it.obdCrn
obdVerificationCode = it.obdCvn
obdFaultCodeNum = it.obdFaultCodeNum
obdFaultCode = it.obdFaultCode
}
}
- is EngineDataFlow -> {
+ is EngineDataStream -> {
obdData.apply {
obdTime = it.time
obdLng = it.obdLong
@@ -88,8 +88,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
@@ -101,7 +101,7 @@
obdTotalMileage = it.obdTotalMileage
}
}
- is SupplementDataFlow -> {
+ is SupplementDataStream -> {
obdData.apply {
obdTime = it.time
obdEngineTorqueMode = it.obdEngineTorqueMode?.toString()
--
Gitblit v1.9.3