diff options
author | jon-stumpf <jon.stumpf@gmail.com> | 2017-03-12 11:50:59 -0400 |
---|---|---|
committer | jon-stumpf <jon.stumpf@gmail.com> | 2017-03-12 11:58:08 -0400 |
commit | 2ba06b327a08432ebfc9e8a41a36bf124e087af6 (patch) | |
tree | f92d6aab1192a6f53eb2f43d50463159a164baa9 /src/org/traccar/protocol/AuroProtocolDecoder.java | |
parent | 9c6706bc8ae37776689c61e237978b364fb392e8 (diff) | |
download | trackermap-server-2ba06b327a08432ebfc9e8a41a36bf124e087af6.tar.gz trackermap-server-2ba06b327a08432ebfc9e8a41a36bf124e087af6.tar.bz2 trackermap-server-2ba06b327a08432ebfc9e8a41a36bf124e087af6.zip |
Implemented Parser.nextDateTime();
Diffstat (limited to 'src/org/traccar/protocol/AuroProtocolDecoder.java')
-rw-r--r-- | src/org/traccar/protocol/AuroProtocolDecoder.java | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/org/traccar/protocol/AuroProtocolDecoder.java b/src/org/traccar/protocol/AuroProtocolDecoder.java index 26bf7dfc8..c5c9c1dcb 100644 --- a/src/org/traccar/protocol/AuroProtocolDecoder.java +++ b/src/org/traccar/protocol/AuroProtocolDecoder.java @@ -18,7 +18,6 @@ package org.traccar.protocol; import org.jboss.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; -import org.traccar.helper.DateBuilder; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; import org.traccar.helper.UnitsConverter; @@ -44,8 +43,8 @@ public class AuroProtocolDecoder extends BaseProtocolDecoder { .number("d{10}") // status .number("([-+])(ddd)(dd)(dddd)") // longitude .number("([-+])(ddd)(dd)(dddd)") // latitude - .number("(dd)(dd)(dddd)") // date - .number("(dd)(dd)(dd)") // time + .number("(dd)(dd)(dddd)") // date (ddmmyyyy) + .number("(dd)(dd)(dd)") // time (hhmmss) .number("(ddd)") // course .number("d{6}") .number("(ddd)") // speed @@ -78,10 +77,7 @@ public class AuroProtocolDecoder extends BaseProtocolDecoder { position.setLongitude(parser.nextCoordinate(Parser.CoordinateFormat.HEM_DEG_MIN_MIN)); position.setLatitude(parser.nextCoordinate(Parser.CoordinateFormat.HEM_DEG_MIN_MIN)); - DateBuilder dateBuilder = new DateBuilder() - .setDateReverse(parser.nextInt(), parser.nextInt(), parser.nextInt()) - .setTime(parser.nextInt(), parser.nextInt(), parser.nextInt()); - position.setTime(dateBuilder.getDate()); + position.setTime(parser.nextDateTime(Parser.DateTimeFormat.DMY4_HMS)); position.setCourse(parser.nextDouble()); position.setSpeed(UnitsConverter.knotsFromKph(parser.nextDouble())); |