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/BceProtocolDecoder.java | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'src/org/traccar/protocol/BceProtocolDecoder.java') diff --git a/src/org/traccar/protocol/BceProtocolDecoder.java b/src/org/traccar/protocol/BceProtocolDecoder.java index 28570b63c..5baafd9dd 100644 --- a/src/org/traccar/protocol/BceProtocolDecoder.java +++ b/src/org/traccar/protocol/BceProtocolDecoder.java @@ -25,6 +25,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; public class BceProtocolDecoder extends BaseProtocolDecoder { @@ -97,17 +98,17 @@ public class BceProtocolDecoder extends BaseProtocolDecoder { position.setSpeed(buf.readUnsignedByte()); int gps = buf.readUnsignedByte(); - position.set("satellites", gps & 0xf); - position.set("hdop", gps >> 4); + position.set(Event.KEY_SATELLITES, gps & 0xf); + position.set(Event.KEY_HDOP, gps >> 4); position.setCourse(buf.readUnsignedByte()); position.setAltitude(buf.readUnsignedShort()); - position.set("milage", buf.readUnsignedInt()); + position.set(Event.KEY_ODOMETER, buf.readUnsignedInt()); } if (checkBit(mask, 1)) { - position.set("input", buf.readUnsignedShort()); + position.set(Event.KEY_INPUT, buf.readUnsignedShort()); } for (int i = 1; i <= 8; i++) { @@ -122,11 +123,11 @@ public class BceProtocolDecoder extends BaseProtocolDecoder { if (checkBit(mask, 13)) buf.skipBytes(2); if (checkBit(mask, 14)) { - position.set("mcc", buf.readUnsignedShort()); - position.set("mnc", buf.readUnsignedByte()); - position.set("lac", buf.readUnsignedShort()); - position.set("cell", buf.readUnsignedShort()); - position.set("gsm", buf.readUnsignedByte()); + position.set(Event.KEY_MCC, buf.readUnsignedShort()); + position.set(Event.KEY_MNC, buf.readUnsignedByte()); + position.set(Event.KEY_LAC, buf.readUnsignedShort()); + position.set(Event.KEY_CELL, buf.readUnsignedShort()); + position.set(Event.KEY_GSM, buf.readUnsignedByte()); buf.readUnsignedByte(); } -- cgit v1.2.3