From dc53f34f5f823fcea8ec3a94c78716262e4fb42f Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Sun, 31 Jan 2016 00:38:03 +1300 Subject: Add new MiniFinder message types --- src/org/traccar/protocol/MiniFinderProtocolDecoder.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/org/traccar/protocol') diff --git a/src/org/traccar/protocol/MiniFinderProtocolDecoder.java b/src/org/traccar/protocol/MiniFinderProtocolDecoder.java index eda085bc3..631a4b56b 100644 --- a/src/org/traccar/protocol/MiniFinderProtocolDecoder.java +++ b/src/org/traccar/protocol/MiniFinderProtocolDecoder.java @@ -33,7 +33,7 @@ public class MiniFinderProtocolDecoder extends BaseProtocolDecoder { } private static final Pattern PATTERN = new PatternBuilder() - .expression("![AD],") + .expression("![A-D],") .number("(d+)/(d+)/(d+),") // date .number("(d+):(d+):(d+),") // time .number("(-?d+.d+),") // latitude @@ -62,7 +62,7 @@ public class MiniFinderProtocolDecoder extends BaseProtocolDecoder { identify(sentence.substring(3, sentence.length()), channel, remoteAddress); - } else if ((sentence.startsWith("!D") || sentence.startsWith("!A")) && hasDeviceId()) { + } else if (sentence.matches("![A-D].*") && hasDeviceId()) { Parser parser = new Parser(PATTERN, sentence); if (!parser.matches()) { -- cgit v1.2.3