From 44f026f881efa6207ab79fb5bada20ab67f018a0 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Wed, 27 Apr 2016 11:21:27 +1200 Subject: Rename ChannelBufferTools to BcdUtil --- src/org/traccar/protocol/Jt600ProtocolDecoder.java | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'src/org/traccar/protocol/Jt600ProtocolDecoder.java') diff --git a/src/org/traccar/protocol/Jt600ProtocolDecoder.java b/src/org/traccar/protocol/Jt600ProtocolDecoder.java index 7c6ab8a4d..3cd6aedb7 100644 --- a/src/org/traccar/protocol/Jt600ProtocolDecoder.java +++ b/src/org/traccar/protocol/Jt600ProtocolDecoder.java @@ -22,7 +22,7 @@ import org.jboss.netty.buffer.ChannelBuffer; import org.jboss.netty.buffer.ChannelBuffers; import org.jboss.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; -import org.traccar.helper.ChannelBufferTools; +import org.traccar.helper.BcdUtil; import org.traccar.helper.DateBuilder; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; @@ -55,21 +55,21 @@ public class Jt600ProtocolDecoder extends BaseProtocolDecoder { } position.setDeviceId(getDeviceId()); - int version = ChannelBufferTools.readHexInteger(buf, 1); + int version = BcdUtil.readInteger(buf, 1); buf.readUnsignedByte(); // type buf.readBytes(2); // length DateBuilder dateBuilder = new DateBuilder() - .setDay(ChannelBufferTools.readHexInteger(buf, 2)) - .setMonth(ChannelBufferTools.readHexInteger(buf, 2)) - .setYear(ChannelBufferTools.readHexInteger(buf, 2)) - .setHour(ChannelBufferTools.readHexInteger(buf, 2)) - .setMinute(ChannelBufferTools.readHexInteger(buf, 2)) - .setSecond(ChannelBufferTools.readHexInteger(buf, 2)); + .setDay(BcdUtil.readInteger(buf, 2)) + .setMonth(BcdUtil.readInteger(buf, 2)) + .setYear(BcdUtil.readInteger(buf, 2)) + .setHour(BcdUtil.readInteger(buf, 2)) + .setMinute(BcdUtil.readInteger(buf, 2)) + .setSecond(BcdUtil.readInteger(buf, 2)); position.setTime(dateBuilder.getDate()); - double latitude = convertCoordinate(ChannelBufferTools.readHexInteger(buf, 8)); - double longitude = convertCoordinate(ChannelBufferTools.readHexInteger(buf, 9)); + double latitude = convertCoordinate(BcdUtil.readInteger(buf, 8)); + double longitude = convertCoordinate(BcdUtil.readInteger(buf, 9)); byte flags = buf.readByte(); position.setValid((flags & 0x1) == 0x1); @@ -82,7 +82,7 @@ public class Jt600ProtocolDecoder extends BaseProtocolDecoder { } position.setLongitude(longitude); - position.setSpeed(ChannelBufferTools.readHexInteger(buf, 2)); + position.setSpeed(BcdUtil.readInteger(buf, 2)); position.setCourse(buf.readUnsignedByte() * 2.0); if (version == 1) { -- cgit v1.2.3