diff options
| author | jon-stumpf <jon.stumpf@gmail.com> | 2017-03-16 23:35:43 -0400 |
|---|---|---|
| committer | jon-stumpf <jon.stumpf@gmail.com> | 2017-03-17 13:48:21 -0400 |
| commit | 001ee6acf3052fd99970e75a7f55b11332b9442f (patch) | |
| tree | 50d6d6d374601b9c0f03224ea7d297707a98d9a5 /src/org/traccar/protocol/CguardProtocolDecoder.java | |
| parent | b0fed2ff54b79a47c61e9c6d0ac39963fd4a3a67 (diff) | |
| download | traccar-server-001ee6acf3052fd99970e75a7f55b11332b9442f.tar.gz traccar-server-001ee6acf3052fd99970e75a7f55b11332b9442f.tar.bz2 traccar-server-001ee6acf3052fd99970e75a7f55b11332b9442f.zip | |
Merged Y4 and Y2 DateTimeFormats, simplifying switch;
Diffstat (limited to 'src/org/traccar/protocol/CguardProtocolDecoder.java')
| -rw-r--r-- | src/org/traccar/protocol/CguardProtocolDecoder.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/org/traccar/protocol/CguardProtocolDecoder.java b/src/org/traccar/protocol/CguardProtocolDecoder.java index 59a10d804..19144017a 100644 --- a/src/org/traccar/protocol/CguardProtocolDecoder.java +++ b/src/org/traccar/protocol/CguardProtocolDecoder.java @@ -62,7 +62,7 @@ public class CguardProtocolDecoder extends BaseProtocolDecoder { position.setProtocol(getProtocolName()); position.setDeviceId(deviceSession.getDeviceId()); - position.setTime(parser.nextDateTime(Parser.DateTimeFormat.Y2MD_HMS)); + position.setTime(parser.nextDateTime()); position.setValid(true); position.setLatitude(parser.nextDouble()); @@ -88,7 +88,7 @@ public class CguardProtocolDecoder extends BaseProtocolDecoder { position.setProtocol(getProtocolName()); position.setDeviceId(deviceSession.getDeviceId()); - getLastLocation(position, parser.nextDateTime(Parser.DateTimeFormat.Y2MD_HMS)); + getLastLocation(position, parser.nextDateTime()); String[] data = parser.next().split(":"); for (int i = 0; i < data.length / 2; i++) { |