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/BoxProtocolDecoder.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/BoxProtocolDecoder.java')
| -rw-r--r-- | src/org/traccar/protocol/BoxProtocolDecoder.java | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/org/traccar/protocol/BoxProtocolDecoder.java b/src/org/traccar/protocol/BoxProtocolDecoder.java index e4dcd6ad7..bbb0d284e 100644 --- a/src/org/traccar/protocol/BoxProtocolDecoder.java +++ b/src/org/traccar/protocol/BoxProtocolDecoder.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; @@ -35,8 +34,8 @@ public class BoxProtocolDecoder extends BaseProtocolDecoder { private static final Pattern PATTERN = new PatternBuilder() .text("L,") - .number("(dd)(dd)(dd)") // date - .number("(dd)(dd)(dd),") // time + .number("(dd)(dd)(dd)") // date (yymmdd) + .number("(dd)(dd)(dd),") // time (hhmmss) .text("G,") .number("(-?d+.d+),") // latitude .number("(-?d+.d+),") // longitude @@ -82,10 +81,7 @@ public class BoxProtocolDecoder extends BaseProtocolDecoder { position.setDeviceId(deviceSession.getDeviceId()); position.setProtocol(getProtocolName()); - DateBuilder dateBuilder = new DateBuilder() - .setDate(parser.nextInt(), parser.nextInt(), parser.nextInt()) - .setTime(parser.nextInt(), parser.nextInt(), parser.nextInt()); - position.setTime(dateBuilder.getDate()); + position.setTime(parser.nextDateTime(Parser.DateTimeFormat.Y2MD_HMS)); position.setLatitude(parser.nextDouble()); position.setLongitude(parser.nextDouble()); |