aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/protocol
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2013-06-03 01:51:45 +1200
committerAnton Tananaev <anton.tananaev@gmail.com>2013-06-03 01:51:45 +1200
commit35033a6176e06d14c9fc7118f1320d01ede6ac89 (patch)
tree51eb9643f6ea856ab79ffb8edbf0ffa494cfba08 /src/org/traccar/protocol
parentb16593f062d304e000899085b22d1232b055639b (diff)
downloadtraccar-server-35033a6176e06d14c9fc7118f1320d01ede6ac89.tar.gz
traccar-server-35033a6176e06d14c9fc7118f1320d01ede6ac89.tar.bz2
traccar-server-35033a6176e06d14c9fc7118f1320d01ede6ac89.zip
Update Apel decoder
Diffstat (limited to 'src/org/traccar/protocol')
-rw-r--r--src/org/traccar/protocol/ApelProtocolDecoder.java14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/org/traccar/protocol/ApelProtocolDecoder.java b/src/org/traccar/protocol/ApelProtocolDecoder.java
index 4a4596591..5f626a496 100644
--- a/src/org/traccar/protocol/ApelProtocolDecoder.java
+++ b/src/org/traccar/protocol/ApelProtocolDecoder.java
@@ -153,7 +153,7 @@ public class ApelProtocolDecoder extends BaseProtocolDecoder {
else if (type == MSG_TYPE_LAST_LOG_INDEX) {
long index = buf.readUnsignedInt();
if (index > 0) {
- newIndex = index - 1;
+ newIndex = index;
requestArchive(channel);
}
}
@@ -173,16 +173,18 @@ public class ApelProtocolDecoder extends BaseProtocolDecoder {
position.setDeviceId(deviceId);
// Message index
+ int subtype = type;
if (type == MSG_TYPE_LOG_RECORDS) {
extendedInfo.set("archive", true);
- lastIndex = buf.readUnsignedInt();
+ lastIndex = buf.readUnsignedInt() + 1;
position.setId(lastIndex);
- int subtype = buf.readUnsignedShort();
- if (subtype != MSG_TYPE_CURRENT_GPS_DATA) {
+ subtype = buf.readUnsignedShort();
+ if (subtype != MSG_TYPE_CURRENT_GPS_DATA && subtype != MSG_TYPE_STATE_FULL_INFO_T104) {
buf.skipBytes(buf.readUnsignedShort());
continue;
}
+ buf.readUnsignedShort(); // length
}
// Time
@@ -198,7 +200,7 @@ public class ApelProtocolDecoder extends BaseProtocolDecoder {
position.setLongitude(buf.readInt() * 180.0 / 0x7FFFFFFF);
// Speed and Validity
- if (type == MSG_TYPE_STATE_FULL_INFO_T104) {
+ if (subtype == MSG_TYPE_STATE_FULL_INFO_T104) {
int speed = buf.readUnsignedByte();
position.setValid(speed != 255);
position.setSpeed(speed * 0.539957);
@@ -215,7 +217,7 @@ public class ApelProtocolDecoder extends BaseProtocolDecoder {
// Altitude
position.setAltitude((double) buf.readShort());
- if (type == MSG_TYPE_STATE_FULL_INFO_T104) {
+ if (subtype == MSG_TYPE_STATE_FULL_INFO_T104) {
// Satellites
extendedInfo.set("satellites", buf.readUnsignedByte());