Merge pull request #3018 from jon-stumpf/jss-parse-nextDateTime

Date and time decoding improvements

1 files changed, 6 insertions, 17 deletions

diff --git a/src/org/traccar/protocol/GnxProtocolDecoder.java b/src/org/traccar/protocol/GnxProtocolDecoder.java
index aff86ea7b..cb29f5d23 100644
--- a/src/org/traccar/protocol/GnxProtocolDecoder.java
+++ b/src/org/traccar/protocol/GnxProtocolDecoder.java
@@ -18,13 +18,11 @@ 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.model.Position;
 
 import java.net.SocketAddress;
-import java.util.TimeZone;
 import java.util.regex.Pattern;
 
 public class GnxProtocolDecoder extends BaseProtocolDecoder {
@@ -37,10 +35,10 @@ public class GnxProtocolDecoder extends BaseProtocolDecoder {
             .number("(d+),")                     // imei
             .number("d+,")                       // length
             .expression("([01]),")               // history
-            .number("(dd)(dd)(dd),")             // device time
-            .number("(dd)(dd)(dd),")             // device date
-            .number("(dd)(dd)(dd),")             // fix time
-            .number("(dd)(dd)(dd),")             // fix date
+            .number("(dd)(dd)(dd),")             // device time (hhmmss)
+            .number("(dd)(dd)(dd),")             // device date (ddmmyy)
+            .number("(dd)(dd)(dd),")             // fix time (hhmmss)
+            .number("(dd)(dd)(dd),")             // fix date (ddmmyy)
             .number("(d),")                      // valid
             .number("(dd.d+),")                  // latitude
             .expression("([NS]),")
@@ -95,17 +93,8 @@ public class GnxProtocolDecoder extends BaseProtocolDecoder {
             position.set(Position.KEY_ARCHIVE, true);
         }
 
-        DateBuilder dateBuilder;
-
-        dateBuilder = new DateBuilder(TimeZone.getTimeZone("GMT+5:30"))
-                .setTime(parser.nextInt(), parser.nextInt(), parser.nextInt())
-                .setDateReverse(parser.nextInt(), parser.nextInt(), parser.nextInt());
-        position.setDeviceTime(dateBuilder.getDate());
-
-        dateBuilder = new DateBuilder(TimeZone.getTimeZone("GMT+5:30"))
-                .setTime(parser.nextInt(), parser.nextInt(), parser.nextInt())
-                .setDateReverse(parser.nextInt(), parser.nextInt(), parser.nextInt());
-        position.setFixTime(dateBuilder.getDate());
+        position.setDeviceTime(parser.nextDateTime(Parser.DateTimeFormat.HMS_DMY, "GMT+5:30"));
+        position.setFixTime(parser.nextDateTime(Parser.DateTimeFormat.HMS_DMY, "GMT+5:30"));
 
         position.setValid(parser.nextInt() != 0);