diff options
Diffstat (limited to 'src/org/traccar/protocol')
| -rw-r--r-- | src/org/traccar/protocol/AtrackFrameDecoder.java | 43 | ||||
| -rw-r--r-- | src/org/traccar/protocol/DmtProtocolDecoder.java | 1 | ||||
| -rw-r--r-- | src/org/traccar/protocol/Gps103ProtocolDecoder.java | 3 |
3 files changed, 34 insertions, 13 deletions
diff --git a/src/org/traccar/protocol/AtrackFrameDecoder.java b/src/org/traccar/protocol/AtrackFrameDecoder.java index a075254ea..ce4a9a65f 100644 --- a/src/org/traccar/protocol/AtrackFrameDecoder.java +++ b/src/org/traccar/protocol/AtrackFrameDecoder.java @@ -1,5 +1,5 @@ /* - * Copyright 2013 - 2014 Anton Tananaev (anton@traccar.org) + * Copyright 2017 Anton Tananaev (anton@traccar.org) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,27 +18,46 @@ package org.traccar.protocol; import org.jboss.netty.buffer.ChannelBuffer; import org.jboss.netty.channel.Channel; import org.jboss.netty.channel.ChannelHandlerContext; -import org.jboss.netty.handler.codec.frame.LengthFieldBasedFrameDecoder; +import org.jboss.netty.handler.codec.frame.FrameDecoder; +import org.traccar.helper.StringFinder; -public class AtrackFrameDecoder extends LengthFieldBasedFrameDecoder { +public class AtrackFrameDecoder extends FrameDecoder { private static final int KEEPALIVE_LENGTH = 12; - public AtrackFrameDecoder() { - super(1024, 4, 2); - } - @Override protected Object decode( ChannelHandlerContext ctx, Channel channel, ChannelBuffer buf) throws Exception { - // Keep alive message - if (buf.readableBytes() >= KEEPALIVE_LENGTH - && buf.getUnsignedShort(buf.readerIndex()) == 0xfe02) { - return buf.readBytes(KEEPALIVE_LENGTH); + if (buf.readableBytes() >= 2) { + + if (buf.getUnsignedShort(buf.readerIndex()) == 0xfe02) { + + if (buf.readableBytes() >= KEEPALIVE_LENGTH) { + return buf.readBytes(KEEPALIVE_LENGTH); + } + + } else if (buf.getUnsignedShort(buf.readerIndex()) == 0x4050) { + + if (buf.readableBytes() > 6) { + int length = buf.getUnsignedShort(buf.readerIndex() + 4) + 4 + 2; + if (buf.readableBytes() >= length) { + return buf.readBytes(length); + } + } + + } else { + + int endIndex = buf.indexOf(buf.readerIndex(), buf.writerIndex(), new StringFinder("\r\n")); + if (endIndex > 0) { + return buf.readBytes(endIndex - buf.readerIndex() + 2); + } + + } + } - return super.decode(ctx, channel, buf); + return null; } } diff --git a/src/org/traccar/protocol/DmtProtocolDecoder.java b/src/org/traccar/protocol/DmtProtocolDecoder.java index 9b4f9400b..de51cce7a 100644 --- a/src/org/traccar/protocol/DmtProtocolDecoder.java +++ b/src/org/traccar/protocol/DmtProtocolDecoder.java @@ -117,6 +117,7 @@ public class DmtProtocolDecoder extends BaseProtocolDecoder { position.setFixTime(new Date(1356998400000L + buf.readUnsignedInt() * 1000)); position.setLatitude(buf.readInt() * 0.0000001); position.setLongitude(buf.readInt() * 0.0000001); + position.setLongitude(buf.readShort()); position.setSpeed(UnitsConverter.knotsFromCps(buf.readUnsignedShort())); buf.readUnsignedByte(); // speed accuracy diff --git a/src/org/traccar/protocol/Gps103ProtocolDecoder.java b/src/org/traccar/protocol/Gps103ProtocolDecoder.java index 2b546bb26..ec8871865 100644 --- a/src/org/traccar/protocol/Gps103ProtocolDecoder.java +++ b/src/org/traccar/protocol/Gps103ProtocolDecoder.java @@ -92,7 +92,7 @@ public class Gps103ProtocolDecoder extends BaseProtocolDecoder { .number("(d+.d+)?,") // fuel average .number("(d+)?,") // hours .number("(d+),") // speed - .number("d+.?d*%,") // power load + .number("(d+.?d*%),") // power load .number("(?:([-+]?d+)|[-+]?),") // temperature .number("(d+.?d*%),") // throttle .number("(d+),") // rpm @@ -211,6 +211,7 @@ public class Gps103ProtocolDecoder extends BaseProtocolDecoder { position.set(Position.KEY_FUEL_CONSUMPTION, parser.nextDouble(0)); position.set(Position.KEY_HOURS, parser.nextInt()); position.set(Position.KEY_OBD_SPEED, parser.nextInt(0)); + position.set("powerLoad", parser.next()); position.set(Position.PREFIX_TEMP + 1, parser.nextInt()); position.set(Position.KEY_THROTTLE, parser.next()); position.set(Position.KEY_RPM, parser.nextInt(0)); |