diff options
Diffstat (limited to 'src/org/traccar/protocol/TzoneProtocolDecoder.java')
| -rw-r--r-- | src/org/traccar/protocol/TzoneProtocolDecoder.java | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/src/org/traccar/protocol/TzoneProtocolDecoder.java b/src/org/traccar/protocol/TzoneProtocolDecoder.java index 01e42964d..f4d6c68f3 100644 --- a/src/org/traccar/protocol/TzoneProtocolDecoder.java +++ b/src/org/traccar/protocol/TzoneProtocolDecoder.java @@ -21,7 +21,6 @@ import org.jboss.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.helper.BitUtil; import org.traccar.helper.DateBuilder; -import org.traccar.model.Event; import org.traccar.model.Position; import java.net.SocketAddress; @@ -66,7 +65,7 @@ public class TzoneProtocolDecoder extends BaseProtocolDecoder { return null; } - position.set(Event.KEY_SATELLITES, buf.readUnsignedByte()); + position.set(Position.KEY_SATELLITES, buf.readUnsignedByte()); double lat = buf.readUnsignedInt() / 600000.0; double lon = buf.readUnsignedInt() / 600000.0; @@ -78,7 +77,7 @@ public class TzoneProtocolDecoder extends BaseProtocolDecoder { position.setSpeed(buf.readUnsignedShort() * 0.01); - position.set(Event.KEY_ODOMETER, buf.readUnsignedMedium()); + position.set(Position.KEY_ODOMETER, buf.readUnsignedMedium()); int flags = buf.readUnsignedShort(); position.setCourse(BitUtil.to(flags, 9)); @@ -101,8 +100,8 @@ public class TzoneProtocolDecoder extends BaseProtocolDecoder { if (blockLength > 0) { - position.set(Event.KEY_LAC, buf.readUnsignedShort()); - position.set(Event.KEY_CID, buf.readUnsignedShort()); + position.set(Position.KEY_LAC, buf.readUnsignedShort()); + position.set(Position.KEY_CID, buf.readUnsignedShort()); } @@ -115,16 +114,16 @@ public class TzoneProtocolDecoder extends BaseProtocolDecoder { if (blockLength > 0) { - position.set(Event.KEY_ALARM, buf.readUnsignedByte()); + position.set(Position.KEY_ALARM, buf.readUnsignedByte()); buf.readUnsignedByte(); // terminal info - position.set(Event.PREFIX_IO + 1, buf.readUnsignedShort()); - position.set(Event.KEY_GSM, buf.readUnsignedByte()); + position.set(Position.PREFIX_IO + 1, buf.readUnsignedShort()); + position.set(Position.KEY_GSM, buf.readUnsignedByte()); buf.readUnsignedByte(); // GSM status - position.set(Event.KEY_BATTERY, buf.readUnsignedShort()); - position.set(Event.KEY_POWER, buf.readUnsignedShort()); - position.set(Event.PREFIX_ADC + 1, buf.readUnsignedShort()); - position.set(Event.PREFIX_ADC + 2, buf.readUnsignedShort()); - position.set(Event.PREFIX_TEMP + 1, buf.readUnsignedShort()); + position.set(Position.KEY_BATTERY, buf.readUnsignedShort()); + position.set(Position.KEY_POWER, buf.readUnsignedShort()); + position.set(Position.PREFIX_ADC + 1, buf.readUnsignedShort()); + position.set(Position.PREFIX_ADC + 2, buf.readUnsignedShort()); + position.set(Position.PREFIX_TEMP + 1, buf.readUnsignedShort()); } |