diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2015-01-10 10:11:55 +1300 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2015-01-10 10:11:55 +1300 |
| commit | ab0e4b7519890aa5b1d38f9ea62868ec23239d0d (patch) | |
| tree | 3cf08ca40d097e71f4c97d2ab53fddc66f1714fb | |
| parent | 9c6511f387e8e58d086fa45663478394a31eaf9e (diff) | |
| parent | 88cce4463160d31923d3be2ad893a436a8aef8cf (diff) | |
| download | trackermap-server-ab0e4b7519890aa5b1d38f9ea62868ec23239d0d.tar.gz trackermap-server-ab0e4b7519890aa5b1d38f9ea62868ec23239d0d.tar.bz2 trackermap-server-ab0e4b7519890aa5b1d38f9ea62868ec23239d0d.zip | |
Merge branch master of github
| -rw-r--r-- | src/org/traccar/protocol/SuntechProtocolDecoder.java | 5 | ||||
| -rw-r--r-- | test/org/traccar/protocol/SuntechProtocolDecoderTest.java | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/org/traccar/protocol/SuntechProtocolDecoder.java b/src/org/traccar/protocol/SuntechProtocolDecoder.java index 868425e8d..cdfca7905 100644 --- a/src/org/traccar/protocol/SuntechProtocolDecoder.java +++ b/src/org/traccar/protocol/SuntechProtocolDecoder.java @@ -1,5 +1,5 @@ /* - * Copyright 2013 Anton Tananaev (anton.tananaev@gmail.com) + * Copyright 2013 - 2015 Anton Tananaev (anton.tananaev@gmail.com) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -39,7 +39,8 @@ public class SuntechProtocolDecoder extends BaseProtocolDecoder { static private Pattern pattern = Pattern.compile( "S.\\d{3}(?:\\w{3})?;" + // Header "(?:[^;]+;)?" + - "(\\d{6});" + // Device ID + "(\\d{6,});" + // Device ID + "(?:\\d+;)?" + "(\\d+);" + // Version "(\\d{4})(\\d{2})(\\d{2});" + // Date (YYYYMMDD) "(\\d{2}):(\\d{2}):(\\d{2});" + // Time (HH:MM:SS) diff --git a/test/org/traccar/protocol/SuntechProtocolDecoderTest.java b/test/org/traccar/protocol/SuntechProtocolDecoderTest.java index f021ccdf3..f3a18f70a 100644 --- a/test/org/traccar/protocol/SuntechProtocolDecoderTest.java +++ b/test/org/traccar/protocol/SuntechProtocolDecoderTest.java @@ -41,6 +41,9 @@ public class SuntechProtocolDecoderTest { verify(decoder.decode(null, null, "ST910;Location;344506;017;20130727;14:10:00;-25.398714;-049.296818;000.187;000.00;1;4.32;1;1;0001")); + verify(decoder.decode(null, null, + "ST300STT;205027329;03;374;20150108;17:54:42;177b38;-23.566052;-046.477588;000.000;000.00;0;0;0;12.11;000000;1;0312")); + } } |