From 830b117453b913802c52af25cf67e11a2e6d4ea9 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Sat, 6 Jul 2019 21:56:56 -0700 Subject: Support comma-separated id --- src/main/java/org/traccar/protocol/PluginProtocolDecoder.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/main/java/org/traccar') diff --git a/src/main/java/org/traccar/protocol/PluginProtocolDecoder.java b/src/main/java/org/traccar/protocol/PluginProtocolDecoder.java index 3f87a774b..106889ee0 100644 --- a/src/main/java/org/traccar/protocol/PluginProtocolDecoder.java +++ b/src/main/java/org/traccar/protocol/PluginProtocolDecoder.java @@ -34,8 +34,8 @@ public class PluginProtocolDecoder extends BaseProtocolDecoder { } private static final Pattern PATTERN = new PatternBuilder() - .expression("[^0-9]*") - .number("(d+),") // device id + .expression("[^0-9,]*,?") + .number("([^,]+),") // device id .number("(dddd)(dd)(dd)") // date (yyyymmdd) .number("(dd)(dd)(dd),") // time (hhmmss) .number("(-?d+.d+),") // longitude -- cgit v1.2.3