diff options
| author | Abyss777 <abyss@fox5.ru> | 2016-10-06 13:59:31 +0500 |
|---|---|---|
| committer | Abyss777 <abyss@fox5.ru> | 2016-10-06 13:59:31 +0500 |
| commit | 4b816255f5e55cddd8ea022b940f33bd204aeb60 (patch) | |
| tree | 49d61d1a2e43c7f0e22344def6fae684bfd30fbe | |
| parent | 453bd2ed647d66725790b35eaab4932bf86b3ad1 (diff) | |
| download | trackermap-server-4b816255f5e55cddd8ea022b940f33bd204aeb60.tar.gz trackermap-server-4b816255f5e55cddd8ea022b940f33bd204aeb60.tar.bz2 trackermap-server-4b816255f5e55cddd8ea022b940f33bd204aeb60.zip | |
GTINF can come from buffer
| -rw-r--r-- | src/org/traccar/protocol/Gl200ProtocolDecoder.java | 2 | ||||
| -rw-r--r-- | test/org/traccar/protocol/Gl200ProtocolDecoderTest.java | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/org/traccar/protocol/Gl200ProtocolDecoder.java b/src/org/traccar/protocol/Gl200ProtocolDecoder.java index 2d28ea199..7187aa7cc 100644 --- a/src/org/traccar/protocol/Gl200ProtocolDecoder.java +++ b/src/org/traccar/protocol/Gl200ProtocolDecoder.java @@ -50,7 +50,7 @@ public class Gl200ProtocolDecoder extends BaseProtocolDecoder { .compile(); private static final Pattern PATTERN_INF = new PatternBuilder() - .text("+RESP:GTINF,") + .text("+").expression("(?:RESP|BUFF):GTINF,") .number("[0-9A-Z]{2}xxxx,") // protocol version .number("(d{15}),") // imei .expression("(?:[0-9A-Z]{17},)?") // vin diff --git a/test/org/traccar/protocol/Gl200ProtocolDecoderTest.java b/test/org/traccar/protocol/Gl200ProtocolDecoderTest.java index 914db782e..c2cdafb49 100644 --- a/test/org/traccar/protocol/Gl200ProtocolDecoderTest.java +++ b/test/org/traccar/protocol/Gl200ProtocolDecoderTest.java @@ -22,6 +22,9 @@ public class Gl200ProtocolDecoderTest extends ProtocolTest { verifyAttributes(decoder, text( "+RESP:GTINF,1A0800,860599000773978,GL300,41,89701016426133851978,17,0,1,26.6,,3.90,1,1,0,0,0,20161003184043,69,1,44,,,20161004040811,022C$")); + verifyAttributes(decoder, text( + "+BUFF:GTINF,1A0800,860599000773978,GL300,41,89701016426133851978,23,0,1,204.7,,3.84,1,1,0,0,0,20161006072548,62,1,38,,,20161006082343,0C98$")); + verifyPosition(decoder, text( "+RESP:GTFRI,360100,864251020141408,3VWGW6AJ0FM237324,gv500,,10,1,1,0.0,0,2258.4,-99.256948,19.555800,20160929214743,0334,0020,0084,65AC,00,0.0,,,,100,410000,0,nan,,20160929214743,13BA$")); |