diff options
Diffstat (limited to 'src/org/traccar/protocol')
| -rwxr-xr-x | src/org/traccar/protocol/AppelloProtocolDecoder.java | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/src/org/traccar/protocol/AppelloProtocolDecoder.java b/src/org/traccar/protocol/AppelloProtocolDecoder.java index f04623759..d422a5aa1 100755 --- a/src/org/traccar/protocol/AppelloProtocolDecoder.java +++ b/src/org/traccar/protocol/AppelloProtocolDecoder.java @@ -35,14 +35,18 @@ public class AppelloProtocolDecoder extends BaseProtocolDecoder { private static final Pattern PATTERN = new PatternBuilder() .text("FOLLOWIT,") // brand .number("(d+),") // imei + .groupBegin() .number("(dd)(dd)(dd)") // date .number("(dd)(dd)(dd).?d*,") // time + .or() + .text("UTCTIME,") + .groupEnd() .number("(-?d+.d+),") // latitude .number("(-?d+.d+),") // longitude .number("(d+),") // speed .number("(d+),") // course .number("(d+),") // satellites - .number("(d+),") // altitude + .number("(-?d+),") // altitude .expression("([FL]),") // gps state .any() .compile(); @@ -65,10 +69,14 @@ public class AppelloProtocolDecoder extends BaseProtocolDecoder { position.setProtocol(getProtocolName()); position.setDeviceId(getDeviceId()); - DateBuilder dateBuilder = new DateBuilder() - .setDate(parser.nextInt(), parser.nextInt(), parser.nextInt()) - .setTime(parser.nextInt(), parser.nextInt(), parser.nextInt()); - position.setTime(dateBuilder.getDate()); + if (parser.hasNext(6)) { + DateBuilder dateBuilder = new DateBuilder() + .setDate(parser.nextInt(), parser.nextInt(), parser.nextInt()) + .setTime(parser.nextInt(), parser.nextInt(), parser.nextInt()); + position.setTime(dateBuilder.getDate()); + } else { + getLastLocation(position, null); + } position.setLatitude(parser.nextDouble()); position.setLongitude(parser.nextDouble()); |