From d673fa357b64ffa34209465a535d00983cba5576 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Thu, 5 May 2011 06:28:25 +0000 Subject: --- src/net/sourceforge/opentracking/Server.java | 39 ++++- .../protocol/gps103/Gps103ProtocolDecoder.java | 15 +- .../protocol/tk103/Tk103ProtocolDecoder.java | 174 +++++++++++++++++++++ .../protocol/xexun/XexunFrameDecoder.java | 20 ++- .../protocol/xexun/XexunProtocolDecoder.java | 47 +++++- .../protocol/gps103/Gps103ProtocolDecoderTest.java | 2 +- .../protocol/tk103/Tk103ProtocolDecoderTest.java | 41 +++++ .../protocol/xexun/XexunProtocolDecoderTest.java | 2 +- 8 files changed, 321 insertions(+), 19 deletions(-) create mode 100644 src/net/sourceforge/opentracking/protocol/tk103/Tk103ProtocolDecoder.java create mode 100644 test/net/sourceforge/opentracking/protocol/tk103/Tk103ProtocolDecoderTest.java diff --git a/src/net/sourceforge/opentracking/Server.java b/src/net/sourceforge/opentracking/Server.java index 278a4589a..8769d1d04 100644 --- a/src/net/sourceforge/opentracking/Server.java +++ b/src/net/sourceforge/opentracking/Server.java @@ -40,6 +40,7 @@ import org.jboss.netty.handler.logging.LoggingHandler; import net.sourceforge.opentracking.protocol.xexun.XexunFrameDecoder; import net.sourceforge.opentracking.protocol.xexun.XexunProtocolDecoder; import net.sourceforge.opentracking.protocol.gps103.Gps103ProtocolDecoder; +import net.sourceforge.opentracking.protocol.tk103.Tk103ProtocolDecoder; /** * Server @@ -75,6 +76,7 @@ public class Server implements DataManager { initXexunServer(properties); initGps103Server(properties); + initTk103Server(properties); } /** @@ -216,7 +218,9 @@ public class Server implements DataManager { } server.getPipeline().addLast("frameDecoder", new XexunFrameDecoder()); server.getPipeline().addLast("stringDecoder", new StringDecoder()); - server.getPipeline().addLast("objectDecoder", new XexunProtocolDecoder(this)); + String resetDelay = properties.getProperty("xexun.resetDelay"); + server.getPipeline().addLast("objectDecoder", new XexunProtocolDecoder(this, + (resetDelay == null) ? 0 : Integer.valueOf(resetDelay))); server.getPipeline().addLast("handler", new TrackerEventHandler(this)); @@ -243,7 +247,38 @@ public class Server implements DataManager { new DelimiterBasedFrameDecoder(1024, ChannelBuffers.wrappedBuffer(delimiter))); server.getPipeline().addLast("stringDecoder", new StringDecoder()); server.getPipeline().addLast("stringEncoder", new StringEncoder()); - server.getPipeline().addLast("objectDecoder", new Gps103ProtocolDecoder(this)); + String resetDelay = properties.getProperty("gps103.resetDelay"); + server.getPipeline().addLast("objectDecoder", new Gps103ProtocolDecoder(this, + (resetDelay == null) ? 0 : Integer.valueOf(resetDelay))); + + server.getPipeline().addLast("handler", new TrackerEventHandler(this)); + + serverList.add(server); + } + } + + /** + * Init Tk103 server + */ + public void initTk103Server(Properties properties) throws SQLException { + + boolean enable = Boolean.valueOf(properties.getProperty("tk103.enable")); + if (enable) { + + TrackerServer server = new TrackerServer( + Integer.valueOf(properties.getProperty("tk103.port"))); + + if (loggerEnable) { + server.getPipeline().addLast("logger", new LoggingHandler("logger")); + } + byte delimiter[] = { (byte) ')' }; + server.getPipeline().addLast("frameDecoder", + new DelimiterBasedFrameDecoder(1024, ChannelBuffers.wrappedBuffer(delimiter))); + server.getPipeline().addLast("stringDecoder", new StringDecoder()); + server.getPipeline().addLast("stringEncoder", new StringEncoder()); + String resetDelay = properties.getProperty("tk103.resetDelay"); + server.getPipeline().addLast("objectDecoder", new Tk103ProtocolDecoder(this, + (resetDelay == null) ? 0 : Integer.valueOf(resetDelay))); server.getPipeline().addLast("handler", new TrackerEventHandler(this)); diff --git a/src/net/sourceforge/opentracking/protocol/gps103/Gps103ProtocolDecoder.java b/src/net/sourceforge/opentracking/protocol/gps103/Gps103ProtocolDecoder.java index 63e904600..663ca22bb 100644 --- a/src/net/sourceforge/opentracking/protocol/gps103/Gps103ProtocolDecoder.java +++ b/src/net/sourceforge/opentracking/protocol/gps103/Gps103ProtocolDecoder.java @@ -43,11 +43,17 @@ public class Gps103ProtocolDecoder extends OneToOneDecoder { */ private DataManager dataManager; + /** + * Reset connection delay + */ + private Integer resetDelay; + /** * Init device table */ - public Gps103ProtocolDecoder(DataManager newDataManager) { - dataManager = newDataManager; + public Gps103ProtocolDecoder(DataManager dataManager, Integer resetDelay) { + this.dataManager = dataManager; + this.resetDelay = resetDelay; } /** @@ -152,11 +158,10 @@ public class Gps103ProtocolDecoder extends OneToOneDecoder { if (evt instanceof ChannelStateEvent) { ChannelStateEvent event = (ChannelStateEvent) evt; - if (event.getState() == ChannelState.CONNECTED && event.getValue() != null) { - new Timer().schedule(new DisconnectTask(evt.getChannel()) , 5 * 60 * 1000); + if (event.getState() == ChannelState.CONNECTED && event.getValue() != null && resetDelay != 0) { + new Timer().schedule(new DisconnectTask(evt.getChannel()), resetDelay); } } - } } diff --git a/src/net/sourceforge/opentracking/protocol/tk103/Tk103ProtocolDecoder.java b/src/net/sourceforge/opentracking/protocol/tk103/Tk103ProtocolDecoder.java new file mode 100644 index 000000000..ab88bf69c --- /dev/null +++ b/src/net/sourceforge/opentracking/protocol/tk103/Tk103ProtocolDecoder.java @@ -0,0 +1,174 @@ +/* + * Copyright 2010 Anton Tananaev (anton@tananaev.com) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package net.sourceforge.opentracking.protocol.tk103; + +import java.util.Calendar; +import java.util.GregorianCalendar; +import java.util.TimeZone; +import java.util.Timer; +import java.util.TimerTask; +import java.util.regex.Pattern; +import java.util.regex.Matcher; +import org.jboss.netty.channel.Channel; +import org.jboss.netty.channel.ChannelHandlerContext; +import org.jboss.netty.handler.codec.oneone.OneToOneDecoder; +import org.jboss.netty.channel.ChannelPipelineCoverage; +import net.sourceforge.opentracking.Position; +import net.sourceforge.opentracking.DataManager; +import org.jboss.netty.channel.ChannelEvent; +import org.jboss.netty.channel.ChannelState; +import org.jboss.netty.channel.ChannelStateEvent; + +/** + * Gps 103 tracker protocol decoder + */ +@ChannelPipelineCoverage("all") +public class Tk103ProtocolDecoder extends OneToOneDecoder { + + /** + * Data manager + */ + private DataManager dataManager; + + /** + * Reset connection delay + */ + private Integer resetDelay; + + /** + * Init device table + */ + public Tk103ProtocolDecoder(DataManager dataManager, Integer resetDelay) { + this.dataManager = dataManager; + this.resetDelay = resetDelay; + } + + /** + * Regular expressions pattern + */ + static private Pattern pattern = Pattern.compile( + "\\(" + + "(\\d+)" + // Device ID + "(.{4})" + // Command + "(\\d{15})" + // IMEI (?) + "(\\d{2})(\\d{2})(\\d{2})" + // Date (YYMMDD) + "([AV])" + // Validity + "(\\d{2})(\\d{2}.\\d{4})" + // Latitude (DDMM.MMMM) + "([NS])" + + "(\\d{3})(\\d{2}.\\d{4})" + // Longitude (DDDMM.MMMM) + "([EW])" + + "(\\d+.\\d)" + // Speed + "(\\d{2})(\\d{2})(\\d{2})" + // Time (HHMMSS) + "(\\d+.\\d{2})" + // Course + "(\\d+)" + // State + ".+"); // Mileage (?) + + /** + * Decode message + */ + protected Object decode( + ChannelHandlerContext ctx, Channel channel, Object msg) + throws Exception { + + String sentence = (String) msg; + + // TODO: Send response (?) + + // Parse message + Matcher parser = pattern.matcher(sentence); + if (!parser.matches()) { + return null; + } + + // Create new position + Position position = new Position(); + + Integer index = 1; + index += 2; // Skip Device ID and command + + // Get device by IMEI + String imei = parser.group(index++); + position.setDeviceId(dataManager.getDeviceByImei(imei).getId()); + + // Date + Calendar time = new GregorianCalendar(); + time.clear(); + time.set(Calendar.YEAR, 2000 + Integer.valueOf(parser.group(index++))); + time.set(Calendar.MONTH, Integer.valueOf(parser.group(index++)) - 1); + time.set(Calendar.DAY_OF_MONTH, Integer.valueOf(parser.group(index++))); + + // Validity + position.setValid(parser.group(index++).compareTo("A") == 0 ? true : false); + + // Latitude + Double latitude = Double.valueOf(parser.group(index++)); + latitude += Double.valueOf(parser.group(index++)) / 60; + if (parser.group(index++).compareTo("S") == 0) latitude = -latitude; + position.setLatitude(latitude); + + // Longitude + Double lonlitude = Double.valueOf(parser.group(index++)); + lonlitude += Double.valueOf(parser.group(index++)) / 60; + if (parser.group(index++).compareTo("W") == 0) lonlitude = -lonlitude; + position.setLongitude(lonlitude); + + // Speed + position.setSpeed(Double.valueOf(parser.group(index++))); + + // Time + time.set(Calendar.HOUR, Integer.valueOf(parser.group(index++))); + time.set(Calendar.MINUTE, Integer.valueOf(parser.group(index++))); + time.set(Calendar.SECOND, Integer.valueOf(parser.group(index++))); + position.setTime(time.getTime()); + + // Course + position.setCourse(Double.valueOf(parser.group(index++))); + + return position; + } + + /** + * Disconnect channel + */ + class DisconnectTask extends TimerTask { + private Channel channel; + + public DisconnectTask(Channel channel) { + this.channel = channel; + } + + public void run() { + channel.disconnect(); + } + } + + /** + * Handle connect event + */ + @Override + public void handleUpstream(ChannelHandlerContext ctx, ChannelEvent evt) throws Exception { + super.handleUpstream(ctx, evt); + + if (evt instanceof ChannelStateEvent) { + ChannelStateEvent event = (ChannelStateEvent) evt; + + if (event.getState() == ChannelState.CONNECTED && event.getValue() != null && resetDelay != 0) { + new Timer().schedule(new DisconnectTask(evt.getChannel()), resetDelay); + } + } + } + +} diff --git a/src/net/sourceforge/opentracking/protocol/xexun/XexunFrameDecoder.java b/src/net/sourceforge/opentracking/protocol/xexun/XexunFrameDecoder.java index 8c4c4eb70..839e5b3ec 100644 --- a/src/net/sourceforge/opentracking/protocol/xexun/XexunFrameDecoder.java +++ b/src/net/sourceforge/opentracking/protocol/xexun/XexunFrameDecoder.java @@ -1,9 +1,18 @@ /* - * Минимум - 100 - * Начало - (10 цифр) + ',' - * Длина 16 x ',' + * Copyright 2010 Anton Tananaev (anton@tananaev.com) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ - package net.sourceforge.opentracking.protocol.xexun; import org.jboss.netty.handler.codec.frame.FrameDecoder; @@ -11,9 +20,6 @@ import org.jboss.netty.channel.Channel; import org.jboss.netty.channel.ChannelHandlerContext; import org.jboss.netty.buffer.ChannelBuffer; -/** - * - */ public class XexunFrameDecoder extends FrameDecoder { /** diff --git a/src/net/sourceforge/opentracking/protocol/xexun/XexunProtocolDecoder.java b/src/net/sourceforge/opentracking/protocol/xexun/XexunProtocolDecoder.java index 7b21a1a72..94b1cb31b 100644 --- a/src/net/sourceforge/opentracking/protocol/xexun/XexunProtocolDecoder.java +++ b/src/net/sourceforge/opentracking/protocol/xexun/XexunProtocolDecoder.java @@ -20,13 +20,17 @@ import java.util.GregorianCalendar; import java.util.regex.Pattern; import java.util.regex.Matcher; import java.text.ParseException; +import java.util.Timer; +import java.util.TimerTask; import org.jboss.netty.channel.Channel; import org.jboss.netty.channel.ChannelHandlerContext; import org.jboss.netty.handler.codec.oneone.OneToOneDecoder; import org.jboss.netty.channel.ChannelPipelineCoverage; import net.sourceforge.opentracking.Position; import net.sourceforge.opentracking.DataManager; -import java.sql.SQLException; +import org.jboss.netty.channel.ChannelEvent; +import org.jboss.netty.channel.ChannelState; +import org.jboss.netty.channel.ChannelStateEvent; /** * Xexun tracker protocol decoder @@ -39,11 +43,17 @@ public class XexunProtocolDecoder extends OneToOneDecoder { */ private DataManager dataManager; + /** + * Reset connection delay + */ + private Integer resetDelay; + /** * Init device table */ - public XexunProtocolDecoder(DataManager newDataManager) { - dataManager = newDataManager; + public XexunProtocolDecoder(DataManager dataManager, Integer resetDelay) { + this.dataManager = dataManager; + this.resetDelay = resetDelay; } /** @@ -129,4 +139,35 @@ public class XexunProtocolDecoder extends OneToOneDecoder { return position; } + /** + * Disconnect channel + */ + class DisconnectTask extends TimerTask { + private Channel channel; + + public DisconnectTask(Channel channel) { + this.channel = channel; + } + + public void run() { + channel.disconnect(); + } + } + + /** + * Handle connect event + */ + @Override + public void handleUpstream(ChannelHandlerContext ctx, ChannelEvent evt) throws Exception { + super.handleUpstream(ctx, evt); + + if (evt instanceof ChannelStateEvent) { + ChannelStateEvent event = (ChannelStateEvent) evt; + + if (event.getState() == ChannelState.CONNECTED && event.getValue() != null && resetDelay != 0) { + new Timer().schedule(new DisconnectTask(evt.getChannel()), resetDelay); + } + } + } + } diff --git a/test/net/sourceforge/opentracking/protocol/gps103/Gps103ProtocolDecoderTest.java b/test/net/sourceforge/opentracking/protocol/gps103/Gps103ProtocolDecoderTest.java index 3d1adcf34..1372c1c2c 100644 --- a/test/net/sourceforge/opentracking/protocol/gps103/Gps103ProtocolDecoderTest.java +++ b/test/net/sourceforge/opentracking/protocol/gps103/Gps103ProtocolDecoderTest.java @@ -43,7 +43,7 @@ public class Gps103ProtocolDecoderTest { String testMsg2 = "imei:10000000000000,help me,1004171910,,F,010203.000,A,0102.0003,N,00102.0003,E,1.02,"; - Gps103ProtocolDecoder decoder = new Gps103ProtocolDecoder(new TestDataManager()); + Gps103ProtocolDecoder decoder = new Gps103ProtocolDecoder(new TestDataManager(), 0); //assertNull(decoder.decode(null, null, testMsg1)); Position position = (Position) decoder.decode(null, null, testMsg2); diff --git a/test/net/sourceforge/opentracking/protocol/tk103/Tk103ProtocolDecoderTest.java b/test/net/sourceforge/opentracking/protocol/tk103/Tk103ProtocolDecoderTest.java new file mode 100644 index 000000000..a94657c04 --- /dev/null +++ b/test/net/sourceforge/opentracking/protocol/tk103/Tk103ProtocolDecoderTest.java @@ -0,0 +1,41 @@ +package net.sourceforge.opentracking.protocol.tk103; + +import java.util.Calendar; +import java.util.TimeZone; +import java.util.GregorianCalendar; +import java.util.List; +import org.junit.Test; +import net.sourceforge.opentracking.Device; +import net.sourceforge.opentracking.Position; +import net.sourceforge.opentracking.DataManager; +import static org.junit.Assert.*; + +public class Tk103ProtocolDecoderTest { + + private class TestDataManager implements DataManager { + public List getDevices() { + return null; + } + + public Device getDeviceByImei(String imei) { + Device device = new Device(); + device.setId(new Long(1)); + device.setImei("10000000000000"); + return device; + } + + public void setPosition(Position position) { + } + } + + @Test + public void testDecode() throws Exception { + + String testMsg1 = "(035988863964BP05000035988863964110430A4241.8399N02318.8131E000.0110112311.8310000000L00000094"; + Tk103ProtocolDecoder decoder = new Tk103ProtocolDecoder(new TestDataManager(), 0); + Position position = (Position) decoder.decode(null, null, testMsg1); + + assertEquals(true, position.getValid()); + } + +} diff --git a/test/net/sourceforge/opentracking/protocol/xexun/XexunProtocolDecoderTest.java b/test/net/sourceforge/opentracking/protocol/xexun/XexunProtocolDecoderTest.java index efbd020ed..2d0653bb2 100644 --- a/test/net/sourceforge/opentracking/protocol/xexun/XexunProtocolDecoderTest.java +++ b/test/net/sourceforge/opentracking/protocol/xexun/XexunProtocolDecoderTest.java @@ -39,7 +39,7 @@ public class XexunProtocolDecoderTest { //"GPRMC,080303.000,A,5546.7313,N,03738.6005,E,0.56,160.13,100311,,,A*6A,L," + //"imei:354778030461167,"; - XexunProtocolDecoder decoder = new XexunProtocolDecoder(new TestDataManager()); + XexunProtocolDecoder decoder = new XexunProtocolDecoder(new TestDataManager(), 0); Position position = (Position) decoder.decode(null, null, testMsg); Date time = new GregorianCalendar(2003, 1, 1, 1, 2, 3).getTime(); -- cgit v1.2.3