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/Tk103ProtocolDecoder.java | |
| parent | 9c6706bc8ae37776689c61e237978b364fb392e8 (diff) | |
| download | traccar-server-2ba06b327a08432ebfc9e8a41a36bf124e087af6.tar.gz traccar-server-2ba06b327a08432ebfc9e8a41a36bf124e087af6.tar.bz2 traccar-server-2ba06b327a08432ebfc9e8a41a36bf124e087af6.zip | |
Implemented Parser.nextDateTime();
Diffstat (limited to 'src/org/traccar/protocol/Tk103ProtocolDecoder.java')
| -rw-r--r-- | src/org/traccar/protocol/Tk103ProtocolDecoder.java | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/org/traccar/protocol/Tk103ProtocolDecoder.java b/src/org/traccar/protocol/Tk103ProtocolDecoder.java index 9dc94678e..2eed0f15f 100644 --- a/src/org/traccar/protocol/Tk103ProtocolDecoder.java +++ b/src/org/traccar/protocol/Tk103ProtocolDecoder.java @@ -61,7 +61,7 @@ public class Tk103ProtocolDecoder extends BaseProtocolDecoder { .number("(d+),") // device id .text("ZC20,") .number("(dd)(dd)(dd),") // date (ddmmyy) - .number("(dd)(dd)(dd),") // time + .number("(dd)(dd)(dd),") // time (hhmmss) .number("d+,") // battery level .number("(d+),") // battery voltage .number("(d+),") // power voltage @@ -138,11 +138,7 @@ public class Tk103ProtocolDecoder extends BaseProtocolDecoder { } position.setDeviceId(deviceSession.getDeviceId()); - DateBuilder dateBuilder = new DateBuilder() - .setDateReverse(parser.nextInt(), parser.nextInt(), parser.nextInt()) - .setTime(parser.nextInt(), parser.nextInt(), parser.nextInt()); - - getLastLocation(position, dateBuilder.getDate()); + getLastLocation(position, parser.nextDateTime(Parser.DateTimeFormat.DMY2_HMS)); int battery = parser.nextInt(); if (battery != 65535) { |