diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2016-03-02 10:17:34 +1300 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2016-03-02 10:17:34 +1300 |
| commit | ea5d08507fc82073bf198b2c3fffd90870d291d3 (patch) | |
| tree | 045077a77b49e2f441f0e87e95fdc9be72fd74d2 | |
| parent | c922091c83d02760fcd2c15cbbcb1eb91fbf548f (diff) | |
| download | traccar-server-ea5d08507fc82073bf198b2c3fffd90870d291d3.tar.gz traccar-server-ea5d08507fc82073bf198b2c3fffd90870d291d3.tar.bz2 traccar-server-ea5d08507fc82073bf198b2c3fffd90870d291d3.zip | |
Another update for GL200 decoder
| -rw-r--r-- | src/org/traccar/protocol/Gl200ProtocolDecoder.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/org/traccar/protocol/Gl200ProtocolDecoder.java b/src/org/traccar/protocol/Gl200ProtocolDecoder.java index 7dd60f44f..8605d8295 100644 --- a/src/org/traccar/protocol/Gl200ProtocolDecoder.java +++ b/src/org/traccar/protocol/Gl200ProtocolDecoder.java @@ -129,7 +129,7 @@ public class Gl200ProtocolDecoder extends BaseProtocolDecoder { .compile(); private static final Pattern PATTERN_FRI = new PatternBuilder() - .text("+RESP:GTFRI,") + .text("+").expression("(?:RESP|BUFF):GTFRI,") .number("(?:[0-9A-Z]{2}xxxx)?,") // protocol version .number("(d{15}|x{14}),") // imei .expression("[^,]*,") // device name @@ -158,8 +158,7 @@ public class Gl200ProtocolDecoder extends BaseProtocolDecoder { .compile(); private static final Pattern PATTERN = new PatternBuilder() - .text("+").expression("(?:RESP|BUFF)").text(":") - .expression("GT...,") + .text("+").expression("(?:RESP|BUFF):GT...,") .number("(?:[0-9A-Z]{2}xxxx)?,") // protocol version .number("(d{15}),") // imei .expression("[^,]*,") // device name |