diff options
| -rw-r--r-- | debug.xml | 1 | ||||
| -rw-r--r-- | src/org/traccar/protocol/Xt7Protocol.java | 43 | ||||
| -rw-r--r-- | src/org/traccar/protocol/Xt7ProtocolDecoder.java | 157 | ||||
| -rw-r--r-- | test/org/traccar/protocol/MegastekProtocolDecoderTest.java | 6 | ||||
| -rw-r--r-- | test/org/traccar/protocol/Xt7ProtocolDecoderTest.java | 23 |
5 files changed, 4 insertions, 226 deletions
@@ -285,7 +285,6 @@ <entry key='ywt.port'>5035</entry> <entry key='tk102.port'>5036</entry> <entry key='intellitrac.port'>5037</entry> - <entry key='xt7.port'>5038</entry> <entry key='wialon.port'>5039</entry> <entry key='carscop.port'>5040</entry> <entry key='apel.port'>5041</entry> diff --git a/src/org/traccar/protocol/Xt7Protocol.java b/src/org/traccar/protocol/Xt7Protocol.java deleted file mode 100644 index da19b6e2d..000000000 --- a/src/org/traccar/protocol/Xt7Protocol.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright 2015 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 org.jboss.netty.bootstrap.ServerBootstrap; -import org.jboss.netty.channel.ChannelPipeline; -import org.jboss.netty.handler.codec.frame.LengthFieldBasedFrameDecoder; -import org.traccar.BaseProtocol; -import org.traccar.TrackerServer; - -import java.util.List; - -public class Xt7Protocol extends BaseProtocol { - - public Xt7Protocol() { - super("xt7"); - } - - @Override - public void initTrackerServers(List<TrackerServer> serverList) { - serverList.add(new TrackerServer(new ServerBootstrap(), this.getName()) { - @Override - protected void addSpecificHandlers(ChannelPipeline pipeline) { - pipeline.addLast("frameDecoder", new LengthFieldBasedFrameDecoder(256, 20, 1, 5, 0)); - pipeline.addLast("objectDecoder", new Xt7ProtocolDecoder(Xt7Protocol.this)); - } - }); - } - -} diff --git a/src/org/traccar/protocol/Xt7ProtocolDecoder.java b/src/org/traccar/protocol/Xt7ProtocolDecoder.java deleted file mode 100644 index 1e7ab0aac..000000000 --- a/src/org/traccar/protocol/Xt7ProtocolDecoder.java +++ /dev/null @@ -1,157 +0,0 @@ -/* - * 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.net.SocketAddress; -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.model.Event; -import org.traccar.model.Position; - -public class Xt7ProtocolDecoder extends BaseProtocolDecoder { - - public Xt7ProtocolDecoder(Xt7Protocol protocol) { - super(protocol); - } - - private static final 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( - Channel channel, SocketAddress remoteAddress, Object msg) - throws Exception { - - ChannelBuffer buf = (ChannelBuffer) msg; - - buf.skipBytes(3); // STX - - // Create new position - Position position = new Position(); - position.setProtocol(getProtocolName()); - - // Get device by id - String id = buf.readBytes(16).toString(Charset.defaultCharset()).trim(); - if (!identify(id, channel)) { - return null; - } - position.setDeviceId(getDeviceId()); - - 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_OF_DAY, 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); - - // 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 longitude = Double.valueOf(parser.group(index++)); - longitude += Double.valueOf(parser.group(index++)) / 60; - if (parser.group(index++).compareTo("W") == 0) longitude = -longitude; - position.setLongitude(longitude); - - // Speed - position.setSpeed(Double.valueOf(parser.group(index++))); - - // Course - String course = parser.group(index++); - if (course != null) { - position.setCourse(Double.valueOf(course)); - } - - // 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 - position.set("imsi", parser.group(index++)); - - // Cell - position.set(Event.KEY_CELL, parser.group(index++)); - - // GSM signal quality - position.set(Event.KEY_GSM, parser.group(index++)); - - // Battery - position.set(Event.KEY_POWER, Double.valueOf(parser.group(index++))); - - // Flags - position.set(Event.KEY_FLAGS, parser.group(index++)); - - // Sensors - position.set(Event.KEY_INPUT, parser.group(index++)); - - // Fuel - position.set(Event.KEY_FUEL, parser.group(index++)); - - // Alarm - position.set(Event.KEY_ALARM, parser.group(index++)); - - return position; - } - -} diff --git a/test/org/traccar/protocol/MegastekProtocolDecoderTest.java b/test/org/traccar/protocol/MegastekProtocolDecoderTest.java index d9911f922..7c0cedb8c 100644 --- a/test/org/traccar/protocol/MegastekProtocolDecoderTest.java +++ b/test/org/traccar/protocol/MegastekProtocolDecoderTest.java @@ -1,8 +1,7 @@ package org.traccar.protocol; -import org.traccar.helper.TestIdentityManager; -import static org.traccar.helper.DecoderVerifier.verify; import org.junit.Test; +import static org.traccar.helper.DecoderVerifier.verify; public class MegastekProtocolDecoderTest extends ProtocolDecoderTest { @@ -10,6 +9,9 @@ public class MegastekProtocolDecoderTest extends ProtocolDecoderTest { public void testDecode() throws Exception { MegastekProtocolDecoder decoder = new MegastekProtocolDecoder(new MegastekProtocol()); + + verify(decoder.decode(null, null, + "STX2010101801 j$GPRMC,101053.000,A,2232.7607,N,11404.7669,E,0.00,,231110,,,A*7F,460,00,2795,0E6A,14,94,1000,0000,91,Timer;1D")); verify(decoder.decode(null, null, "STX,861001005215757,$GPRMC,180118.000,A,4241.330116,N,2321.931251,E,0.00,182.19,130915,,E,A,F,Nil-Alarms,imei:861001005215757,8,577.0,Battery=38%,0,284,03,03E8,3139;7A")); diff --git a/test/org/traccar/protocol/Xt7ProtocolDecoderTest.java b/test/org/traccar/protocol/Xt7ProtocolDecoderTest.java deleted file mode 100644 index 3ad84a0eb..000000000 --- a/test/org/traccar/protocol/Xt7ProtocolDecoderTest.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.traccar.protocol; - -import org.jboss.netty.buffer.ChannelBuffers; -import org.traccar.helper.ChannelBufferTools; -import org.traccar.helper.TestIdentityManager; -import org.jboss.netty.buffer.ChannelBufferFactory; -import org.jboss.netty.buffer.HeapChannelBufferFactory; -import static org.traccar.helper.DecoderVerifier.verify; -import org.junit.Test; - -public class Xt7ProtocolDecoderTest extends ProtocolDecoderTest { - - @Test - public void testDecode() throws Exception { - - Xt7ProtocolDecoder decoder = new Xt7ProtocolDecoder(new Xt7Protocol()); - - verify(decoder.decode(null, null, ChannelBuffers.wrappedBuffer(ChannelBufferTools.convertHexString( - "53545832303130313031383031202020202020026A244750524D432C3130313035332E3030302C412C323233322E373630372C4E2C31313430342E373636392C452C302E30302C2C3233313131302C2C2C412A37462C3436302C30302C323739352C304536412C31342C39342C313030302C303030302C39312C54696D65723B31440D0A")))); - - } - -} |