diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2017-04-17 16:32:02 +1200 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2017-04-17 16:32:02 +1200 |
| commit | 1c756c57653b72a656407da9c53ac292c5551cdb (patch) | |
| tree | 69e88e24aae184508ab51932ef2692ae9515eef2 /src/org/traccar/protocol/Stl060ProtocolDecoder.java | |
| parent | 4ab007201bd177a2fbf46a90b7b73262c5792caf (diff) | |
| download | traccar-server-1c756c57653b72a656407da9c53ac292c5551cdb.tar.gz traccar-server-1c756c57653b72a656407da9c53ac292c5551cdb.tar.bz2 traccar-server-1c756c57653b72a656407da9c53ac292c5551cdb.zip | |
Allow optional primitives
Diffstat (limited to 'src/org/traccar/protocol/Stl060ProtocolDecoder.java')
| -rw-r--r-- | src/org/traccar/protocol/Stl060ProtocolDecoder.java | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/org/traccar/protocol/Stl060ProtocolDecoder.java b/src/org/traccar/protocol/Stl060ProtocolDecoder.java index 599c16a3c..c81e83aab 100644 --- a/src/org/traccar/protocol/Stl060ProtocolDecoder.java +++ b/src/org/traccar/protocol/Stl060ProtocolDecoder.java @@ -88,28 +88,28 @@ public class Stl060ProtocolDecoder extends BaseProtocolDecoder { position.setLatitude(parser.nextCoordinate(Parser.CoordinateFormat.DEG_MIN_MIN_HEM)); position.setLongitude(parser.nextCoordinate(Parser.CoordinateFormat.DEG_MIN_MIN_HEM)); - position.setSpeed(parser.nextDouble()); - position.setCourse(parser.nextDouble()); + position.setSpeed(parser.nextDouble(0)); + position.setCourse(parser.nextDouble(0)); // Old format if (parser.hasNext(5)) { - position.set(Position.KEY_ODOMETER, parser.nextInt()); - position.set(Position.KEY_IGNITION, parser.nextInt() == 1); - position.set(Position.KEY_INPUT, parser.nextInt() + parser.nextInt() << 1); - position.set(Position.KEY_FUEL_LEVEL, parser.nextInt()); + position.set(Position.KEY_ODOMETER, parser.nextInt(0)); + position.set(Position.KEY_IGNITION, parser.nextInt(0) == 1); + position.set(Position.KEY_INPUT, parser.nextInt(0) + parser.nextInt(0) << 1); + position.set(Position.KEY_FUEL_LEVEL, parser.nextInt(0)); } // New format if (parser.hasNext(10)) { - position.set(Position.KEY_CHARGE, parser.nextInt() == 1); - position.set(Position.KEY_IGNITION, parser.nextInt() == 1); - position.set(Position.KEY_INPUT, parser.nextInt()); + position.set(Position.KEY_CHARGE, parser.nextInt(0) == 1); + position.set(Position.KEY_IGNITION, parser.nextInt(0) == 1); + position.set(Position.KEY_INPUT, parser.nextInt(0)); position.set(Position.KEY_RFID, parser.next()); - position.set(Position.KEY_ODOMETER, parser.nextInt()); - position.set(Position.PREFIX_TEMP + 1, parser.nextInt()); - position.set(Position.KEY_FUEL_LEVEL, parser.nextInt()); - position.set(Position.KEY_ACCELERATION, parser.nextInt() == 1); - position.set(Position.KEY_OUTPUT, parser.nextInt() + parser.nextInt() << 1); + position.set(Position.KEY_ODOMETER, parser.nextInt(0)); + position.set(Position.PREFIX_TEMP + 1, parser.nextInt(0)); + position.set(Position.KEY_FUEL_LEVEL, parser.nextInt(0)); + position.set(Position.KEY_ACCELERATION, parser.nextInt(0) == 1); + position.set(Position.KEY_OUTPUT, parser.nextInt(0) + parser.nextInt(0) << 1); } position.setValid(parser.next().equals("A")); |