1. 修改实时数据各项的转换逻辑

riku

2019-09-23 14ce5d2ccfae554497763da846ffb9eb39cd6d34

 src/main/kotlin/com/flightfeather/obd/socket/decoder/impl/DataUnitDecoderImpl.kt

@@ -4,11 +4,9 @@
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 org.slf4j.LoggerFactory
import java.lang.StringBuilder
import java.util.*
import javax.annotation.PostConstruct

/**
 * @author riku
@@ -16,6 +14,7 @@
 */
class DataUnitDecoderImpl : DataUnitDecoder {

    private val logger = LoggerFactory.getLogger(javaClass.name)
    private var realTimeDataDecoder: RealTimeDataDecoder = RealTimeDataDecoderImpl()

    override fun getCarRegisterData(b: List<String>): List<CarRegisterData> {
@@ -72,8 +71,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 +83,10 @@
                for (i in 0 until data.size) {
                    if (dataList.isNotEmpty()) dataList.removeAt(0)
                }
            }else if (dataList.isNotEmpty()) {
                //按照规则没有取到信息体，并且原数据不为空，表示原数据格式错误，退出循环
                logger.error("-------数据信息流或补充数据流格式错误")
                break
            }
        }

@@ -116,6 +119,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