diff options
| -rw-r--r-- | default.cfg | 6 | ||||
| -rw-r--r-- | src/org/traccar/ServerManager.java | 13 | ||||
| -rw-r--r-- | src/org/traccar/protocol/Xt7ProtocolDecoder.java | 176 | ||||
| -rw-r--r-- | test/org/traccar/protocol/Xt7ProtocolDecoderTest.java | 22 |
4 files changed, 216 insertions, 1 deletions
diff --git a/default.cfg b/default.cfg index e5c0ca105..e85a10de4 100644 --- a/default.cfg +++ b/default.cfg @@ -208,9 +208,13 @@ <!-- TK102 server configuration --> <entry key='tk102.enable'>true</entry> <entry key='tk102.port'>5036</entry> - + <!-- IntelliTrac server configuration --> <entry key='intellitrac.enable'>true</entry> <entry key='intellitrac.port'>5037</entry> + <!-- XT7 server configuration --> + <entry key='xt7.enable'>true</entry> + <entry key='xt7.port'>5038</entry> + </properties> diff --git a/src/org/traccar/ServerManager.java b/src/org/traccar/ServerManager.java index 48dd2ddc8..4a6682679 100644 --- a/src/org/traccar/ServerManager.java +++ b/src/org/traccar/ServerManager.java @@ -143,6 +143,7 @@ public class ServerManager { initYwtServer("ywt"); initTk102Server("tk102"); initIntellitracServer("intellitrac"); + initXt7Server("xt7"); // Initialize web server if (Boolean.valueOf(properties.getProperty("http.enable"))) { @@ -798,4 +799,16 @@ public class ServerManager { } } + private void initXt7Server(String protocol) throws SQLException { + if (isProtocolEnabled(properties, protocol)) { + serverList.add(new TrackerServer(this, new ServerBootstrap(), protocol) { + @Override + protected void addSpecificHandlers(ChannelPipeline pipeline) { + pipeline.addLast("frameDecoder", new LengthFieldBasedFrameDecoder(256, 20, 1, 5, 0)); + pipeline.addLast("objectDecoder", new Xt7ProtocolDecoder(ServerManager.this)); + } + }); + } + } + } diff --git a/src/org/traccar/protocol/Xt7ProtocolDecoder.java b/src/org/traccar/protocol/Xt7ProtocolDecoder.java new file mode 100644 index 000000000..79f793d8a --- /dev/null +++ b/src/org/traccar/protocol/Xt7ProtocolDecoder.java @@ -0,0 +1,176 @@ +/* + * Copyright 2013 Anton Tananaev (anton.tananaev@gmail.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 org.traccar.protocol; + +import java.nio.charset.Charset; +import java.util.Calendar; +import java.util.TimeZone; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import org.jboss.netty.buffer.ChannelBuffer; +import org.jboss.netty.channel.Channel; +import org.jboss.netty.channel.ChannelHandlerContext; +import org.traccar.BaseProtocolDecoder; +import org.traccar.ServerManager; +import org.traccar.helper.Log; +import org.traccar.model.Position; + +public class Xt7ProtocolDecoder extends BaseProtocolDecoder { + + public Xt7ProtocolDecoder(ServerManager serverManager) { + super(serverManager); + } + + static private Pattern pattern = Pattern.compile( + "\\$GPRMC," + + "(\\d{2})(\\d{2})(\\d{2})\\.(\\d+)," + // Time (HHMMSS.SSS) + "([AV])," + // Validity + "(\\d{2})(\\d{2}\\.\\d+)," + // Latitude (DDMM.MMMM) + "([NS])," + + "(\\d{3})(\\d{2}\\.\\d+)," + // Longitude (DDDMM.MMMM) + "([EW])," + + "(\\d+.\\d+)," + // Speed + "(\\d+\\.?\\d*)?," + // Course + "(\\d{2})(\\d{2})(\\d{2})" + // Date (DDMMYY) + "[^\\*]+\\*[0-9a-fA-F]{2}," + + "(\\d+,\\d+)," + // IMSI + "([0-9a-fA-F]+,[0-9a-fA-F]+)," + // Cell + "(\\d+)," + // Signal quality + "(\\d+)," + // Battery + "([01]{4})," + // Flags + "([01]{4})," + // Sensors + "(\\d+)," + // Fuel + "(.+)?"); // Alarm + + @Override + protected Object decode( + ChannelHandlerContext ctx, Channel channel, Object msg) + throws Exception { + + ChannelBuffer buf = (ChannelBuffer) msg; + + buf.skipBytes(3); // STX + + // Create new position + Position position = new Position(); + StringBuilder extendedInfo = new StringBuilder("<protocol>xt7</protocol>"); + + // Get device by id + String id = buf.readBytes(16).toString(Charset.defaultCharset()).trim(); + try { + position.setDeviceId(getDataManager().getDeviceByImei(id).getId()); + } catch(Exception error) { + Log.warning("Unknown device - " + id); + return null; + } + + buf.readUnsignedByte(); // command + int length = buf.readUnsignedByte(); + + // Parse message + String sentence = buf.readBytes(length).toString(Charset.defaultCharset()); + Matcher parser = pattern.matcher(sentence); + if (!parser.matches()) { + return null; + } + + Integer index = 1; + + // Time + Calendar time = Calendar.getInstance(TimeZone.getTimeZone("UTC")); + time.clear(); + 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++))); + time.set(Calendar.MILLISECOND, 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++))); + + // Course + String course = parser.group(index++); + if (course != null) { + position.setCourse(Double.valueOf(course)); + } else { + position.setCourse(0.0); + } + + // Date + time.set(Calendar.DAY_OF_MONTH, Integer.valueOf(parser.group(index++))); + time.set(Calendar.MONTH, Integer.valueOf(parser.group(index++)) - 1); + time.set(Calendar.YEAR, 2000 + Integer.valueOf(parser.group(index++))); + position.setTime(time.getTime()); + + // IMSI + extendedInfo.append("<imsi>"); + extendedInfo.append(parser.group(index++)); + extendedInfo.append("</imsi>"); + + // Cell + extendedInfo.append("<cell>"); + extendedInfo.append(parser.group(index++)); + extendedInfo.append("</cell>"); + + // GSM signal quality + extendedInfo.append("<gsm>"); + extendedInfo.append(parser.group(index++)); + extendedInfo.append("</gsm>"); + + // Battery + position.setPower(Double.valueOf(parser.group(index++))); + + // Flags + extendedInfo.append("<flags>"); + extendedInfo.append(parser.group(index++)); + extendedInfo.append("</flags>"); + + // Sensors + extendedInfo.append("<sensors>"); + extendedInfo.append(parser.group(index++)); + extendedInfo.append("</sensors>"); + + // Fuel + extendedInfo.append("<fuel>"); + extendedInfo.append(parser.group(index++)); + extendedInfo.append("</fuel>"); + + // Alarm + extendedInfo.append("<alarm>"); + extendedInfo.append(parser.group(index++)); + extendedInfo.append("</alarm>"); + + // Extended info + position.setExtendedInfo(extendedInfo.toString()); + + return position; + } + +} diff --git a/test/org/traccar/protocol/Xt7ProtocolDecoderTest.java b/test/org/traccar/protocol/Xt7ProtocolDecoderTest.java new file mode 100644 index 000000000..0f1194c73 --- /dev/null +++ b/test/org/traccar/protocol/Xt7ProtocolDecoderTest.java @@ -0,0 +1,22 @@ +package org.traccar.protocol; + +import org.jboss.netty.buffer.ChannelBufferFactory; +import org.jboss.netty.buffer.HeapChannelBufferFactory; +import static org.junit.Assert.assertNotNull; +import org.junit.Test; + +public class Xt7ProtocolDecoderTest { + + @Test + public void testDecode() throws Exception { + + Xt7ProtocolDecoder decoder = new Xt7ProtocolDecoder(null); + decoder.setDataManager(new TestDataManager()); + ChannelBufferFactory factory = new HeapChannelBufferFactory(); + + byte[] buf1 = {0x53,0x54,0x58,0x32,0x30,0x31,0x30,0x31,0x30,0x31,0x38,0x30,0x31,0x20,0x20,0x20,0x20,0x20,0x20,0x02,0x6A,0x24,0x47,0x50,0x52,0x4D,0x43,0x2C,0x31,0x30,0x31,0x30,0x35,0x33,0x2E,0x30,0x30,0x30,0x2C,0x41,0x2C,0x32,0x32,0x33,0x32,0x2E,0x37,0x36,0x30,0x37,0x2C,0x4E,0x2C,0x31,0x31,0x34,0x30,0x34,0x2E,0x37,0x36,0x36,0x39,0x2C,0x45,0x2C,0x30,0x2E,0x30,0x30,0x2C,0x2C,0x32,0x33,0x31,0x31,0x31,0x30,0x2C,0x2C,0x2C,0x41,0x2A,0x37,0x46,0x2C,0x34,0x36,0x30,0x2C,0x30,0x30,0x2C,0x32,0x37,0x39,0x35,0x2C,0x30,0x45,0x36,0x41,0x2C,0x31,0x34,0x2C,0x39,0x34,0x2C,0x31,0x30,0x30,0x30,0x2C,0x30,0x30,0x30,0x30,0x2C,0x39,0x31,0x2C,0x54,0x69,0x6D,0x65,0x72,0x3B,0x31,0x44,0x0D,0x0A}; + assertNotNull(decoder.decode(null, null, factory.getBuffer(buf1, 0, buf1.length))); + + } + +} |