From 88e777a2ceb50e34dbe9577237483d8d3cebf346 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Mon, 4 May 2015 10:53:27 +1200 Subject: Create other data keys --- src/org/traccar/protocol/Avl301ProtocolDecoder.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'src/org/traccar/protocol/Avl301ProtocolDecoder.java') diff --git a/src/org/traccar/protocol/Avl301ProtocolDecoder.java b/src/org/traccar/protocol/Avl301ProtocolDecoder.java index c74e10f5e..7a53c3d3f 100644 --- a/src/org/traccar/protocol/Avl301ProtocolDecoder.java +++ b/src/org/traccar/protocol/Avl301ProtocolDecoder.java @@ -20,6 +20,7 @@ import org.jboss.netty.buffer.ChannelBuffers; import org.jboss.netty.channel.Channel; import org.jboss.netty.channel.ChannelHandlerContext; import org.traccar.BaseProtocolDecoder; +import org.traccar.model.Event; import org.traccar.model.Position; import java.util.Calendar; @@ -99,7 +100,7 @@ public class Avl301ProtocolDecoder extends BaseProtocolDecoder { // GPS length and Satellites count int gpsLength = buf.readUnsignedByte(); - position.set("satellites", gpsLength & 0xf); + position.set(Event.KEY_SATELLITES, gpsLength & 0xf); gpsLength >>= 4; //Skip Satellite numbers @@ -124,16 +125,16 @@ public class Avl301ProtocolDecoder extends BaseProtocolDecoder { position.set("acc", (union & 0x8000) != 0); } - position.set("lac", buf.readUnsignedShort()); - position.set("cell", buf.readUnsignedMedium()); - position.set("alarm", true); + position.set(Event.KEY_LAC, buf.readUnsignedShort()); + position.set(Event.KEY_CELL, buf.readUnsignedMedium()); + position.set(Event.KEY_ALARM, true); int flags = buf.readUnsignedByte(); position.set("acc", (flags & 0x2) != 0); // TODO parse other flags - position.set("power", buf.readUnsignedByte()); - position.set("gsm", buf.readUnsignedByte()); + position.set(Event.KEY_POWER, buf.readUnsignedByte()); + position.set(Event.KEY_GSM, buf.readUnsignedByte()); return position; } -- cgit v1.2.3