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/PathAwayProtocolDecoder.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/PathAwayProtocolDecoder.java')
-rw-r--r-- | src/org/traccar/protocol/PathAwayProtocolDecoder.java | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/org/traccar/protocol/PathAwayProtocolDecoder.java b/src/org/traccar/protocol/PathAwayProtocolDecoder.java index 036cfa445..142d3724b 100644 --- a/src/org/traccar/protocol/PathAwayProtocolDecoder.java +++ b/src/org/traccar/protocol/PathAwayProtocolDecoder.java @@ -25,7 +25,6 @@ import org.jboss.netty.handler.codec.http.HttpVersion; import org.jboss.netty.handler.codec.http.QueryStringDecoder; 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.model.Position; @@ -46,7 +45,7 @@ public class PathAwayProtocolDecoder extends BaseProtocolDecoder { .expression("[^,]*,") // icon .expression("[^,]*,") // color .number("(dd)(dd)(dd),") // date (ddmmyy) - .number("(dd)(dd)(dd),") // time + .number("(dd)(dd)(dd),") // time (hhmmss) .number("(-?d+.d+),") // latitude .number("(-?d+.d+),") // longitude .number("(-?d+.?d*),") // altitude @@ -77,10 +76,7 @@ public class PathAwayProtocolDecoder extends BaseProtocolDecoder { position.setProtocol(getProtocolName()); position.setDeviceId(deviceSession.getDeviceId()); - 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.DMY2_HMS)); position.setValid(true); position.setLatitude(parser.nextDouble()); |