diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2015-03-03 21:47:30 +1300 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2015-03-03 21:47:30 +1300 |
| commit | 4e3a90ca42dfd3871c92d06e769b988002f4f0bb (patch) | |
| tree | 3921e50ce8f2d2816907bfc5f7a8d48538bb75d1 | |
| parent | f2e3a4e9d299e03c6afd45c0850871a150e23649 (diff) | |
| download | trackermap-server-4e3a90ca42dfd3871c92d06e769b988002f4f0bb.tar.gz trackermap-server-4e3a90ca42dfd3871c92d06e769b988002f4f0bb.tar.bz2 trackermap-server-4e3a90ca42dfd3871c92d06e769b988002f4f0bb.zip | |
Handle line break in Taip (fix #1106)
| -rw-r--r-- | src/org/traccar/protocol/SyrusProtocolDecoder.java | 2 | ||||
| -rw-r--r-- | test/org/traccar/protocol/SyrusProtocolDecoderTest.java | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/org/traccar/protocol/SyrusProtocolDecoder.java b/src/org/traccar/protocol/SyrusProtocolDecoder.java index 72347ac03..ee11b35ef 100644 --- a/src/org/traccar/protocol/SyrusProtocolDecoder.java +++ b/src/org/traccar/protocol/SyrusProtocolDecoder.java @@ -53,7 +53,7 @@ public class SyrusProtocolDecoder extends BaseProtocolDecoder { "(\\d{3})" + // Course "\\d" + // Fix mode "(\\d)" + // Fix age - ".*"); + ".*\r?\n?"); private Date getTime(long week, long day, long seconds) { Calendar time = Calendar.getInstance(TimeZone.getTimeZone("UTC")); diff --git a/test/org/traccar/protocol/SyrusProtocolDecoderTest.java b/test/org/traccar/protocol/SyrusProtocolDecoderTest.java index 72c06d3fc..9b2457c99 100644 --- a/test/org/traccar/protocol/SyrusProtocolDecoderTest.java +++ b/test/org/traccar/protocol/SyrusProtocolDecoderTest.java @@ -26,6 +26,10 @@ public class SyrusProtocolDecoderTest { assertNotNull(decoder.decode(null, null, ">RPV02138+4555512-0735478000000032;ID=1005;*76<")); + + assertNotNull(decoder.decode(null, null, + ">RPV19105+4538405-0739518900000012;ID=9999;*7A<\r\n")); + } |