From 2f6967e7e53b70bfb0f8e20df2b6b351b8b817cb Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Wed, 21 Jun 2017 21:10:26 +1200 Subject: Add VTFMS protocol test case --- src/org/traccar/protocol/VtfmsProtocolDecoder.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/org/traccar/protocol/VtfmsProtocolDecoder.java b/src/org/traccar/protocol/VtfmsProtocolDecoder.java index 9f8cea04f..f4ff941d0 100644 --- a/src/org/traccar/protocol/VtfmsProtocolDecoder.java +++ b/src/org/traccar/protocol/VtfmsProtocolDecoder.java @@ -35,12 +35,12 @@ public class VtfmsProtocolDecoder extends BaseProtocolDecoder { private static final Pattern PATTERN = new PatternBuilder() .text("(") .number("(d{15}),") // imei - .number("[0-9A-Z]{3}dd,") // packet count + .number("[0-9A-Z]{3}dd,") // packet count .number("(dd),") // packet id .number("[^,]*,") // reserved - .number("(d+),") // rssi - .number("d+,") // fix status - .number("(d+),") // satellites + .number("(d+)?,") // rssi + .number("(?:d+)?,") // fix status + .number("(d+)?,") // satellites .number("[^,]*,") // reserved .expression("([AV]),") // validity .number("(dd)(dd)(dd),") // time (hhmmss) -- cgit v1.2.3