From c469f9dcf20f9724a01654431eb0c05780cb42d2 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Sat, 6 Sep 2014 12:37:37 +1200 Subject: Support UDP for TK103 (fix #828) --- src/org/traccar/ServerManager.java | 8 ++++++++ src/org/traccar/protocol/Tk103ProtocolDecoder.java | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/org/traccar/ServerManager.java b/src/org/traccar/ServerManager.java index c6204441d..2f49e0923 100644 --- a/src/org/traccar/ServerManager.java +++ b/src/org/traccar/ServerManager.java @@ -274,6 +274,14 @@ public class ServerManager { pipeline.addLast("objectDecoder", new Tk103ProtocolDecoder(ServerManager.this)); } }); + serverList.add(new TrackerServer(this, new ConnectionlessBootstrap(), protocol) { + @Override + protected void addSpecificHandlers(ChannelPipeline pipeline) { + pipeline.addLast("stringDecoder", new StringDecoder()); + pipeline.addLast("stringEncoder", new StringEncoder()); + pipeline.addLast("objectDecoder", new Tk103ProtocolDecoder(ServerManager.this)); + } + }); } } diff --git a/src/org/traccar/protocol/Tk103ProtocolDecoder.java b/src/org/traccar/protocol/Tk103ProtocolDecoder.java index c699a247c..d3220368a 100644 --- a/src/org/traccar/protocol/Tk103ProtocolDecoder.java +++ b/src/org/traccar/protocol/Tk103ProtocolDecoder.java @@ -47,7 +47,7 @@ public class Tk103ProtocolDecoder extends BaseProtocolDecoder { "(\\d{2})(\\d{2})(\\d{2}),?" + // Time (HHMMSS) "(\\d+\\.?\\d+),?" + // Course "([0-9a-fA-F]{8})?,?" + // State - "(?:L([0-9a-fA-F]+))?"); // Milage + "(?:L([0-9a-fA-F]+))?\\)?"); // Milage @Override protected Object decode( -- cgit v1.2.3