diff options
| -rw-r--r-- | debug.xml | 1 | ||||
| -rw-r--r-- | src/org/traccar/protocol/RaveonProtocol.java | 47 | ||||
| -rw-r--r-- | src/org/traccar/protocol/RaveonProtocolDecoder.java | 103 | ||||
| -rw-r--r-- | test/org/traccar/protocol/RaveonProtocolDecoderTest.java | 18 |
4 files changed, 169 insertions, 0 deletions
@@ -451,5 +451,6 @@ <entry key='carcell.port'>5114</entry> <entry key='obddongle.port'>5115</entry> <entry key='hunterpro.port'>5116</entry> + <entry key='raveon.port'>5117</entry> </properties> diff --git a/src/org/traccar/protocol/RaveonProtocol.java b/src/org/traccar/protocol/RaveonProtocol.java new file mode 100644 index 000000000..290eb01a8 --- /dev/null +++ b/src/org/traccar/protocol/RaveonProtocol.java @@ -0,0 +1,47 @@ +/* + * Copyright 2015 - 2016 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.LineBasedFrameDecoder; +import org.jboss.netty.handler.codec.string.StringDecoder; +import org.jboss.netty.handler.codec.string.StringEncoder; +import org.traccar.BaseProtocol; +import org.traccar.TrackerServer; + +import java.util.List; + +public class RaveonProtocol extends BaseProtocol { + + public RaveonProtocol() { + super("t55"); + } + + @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 LineBasedFrameDecoder(1024)); + pipeline.addLast("stringDecoder", new StringDecoder()); + pipeline.addLast("stringEncoder", new StringEncoder()); + pipeline.addLast("objectDecoder", new RaveonProtocolDecoder(RaveonProtocol.this)); + } + }); + } + +} diff --git a/src/org/traccar/protocol/RaveonProtocolDecoder.java b/src/org/traccar/protocol/RaveonProtocolDecoder.java new file mode 100644 index 000000000..d6942da6f --- /dev/null +++ b/src/org/traccar/protocol/RaveonProtocolDecoder.java @@ -0,0 +1,103 @@ +/* + * Copyright 2016 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.channel.Channel; +import org.traccar.BaseProtocolDecoder; +import org.traccar.DeviceSession; +import org.traccar.helper.DateBuilder; +import org.traccar.helper.Parser; +import org.traccar.helper.PatternBuilder; +import org.traccar.helper.UnitsConverter; +import org.traccar.model.Position; + +import java.net.SocketAddress; +import java.util.Date; +import java.util.regex.Pattern; + +public class RaveonProtocolDecoder extends BaseProtocolDecoder { + + public RaveonProtocolDecoder(RaveonProtocol protocol) { + super(protocol); + } + + private static final Pattern PATTERN = new PatternBuilder() + .text("$PRAVE,") + .number("(d+),") // id + .number("d+,") + .number("(-?)(d+)(dd.d+),") // latitude + .number("(-?)(d+)(dd.d+),") // longitude + .number("(dd)(dd)(dd),") // time + .number("(d),") // validity + .number("(d+),") // satellites + .number("(-?d+),") // altitude + .number("(-?d+),") // temperature + .number("(d+.d+),") // power + .number("(d+),") // inputs + .number("(-?d+),") // gsm + .number("(d+),") // speed + .number("(d+),") // course + .expression("([PMACIVSX])?,") // status + .any() + .compile(); + + @Override + protected Object decode( + Channel channel, SocketAddress remoteAddress, Object msg) throws Exception { + + String sentence = (String) msg; + + Parser parser = new Parser(PATTERN, sentence); + if (!parser.matches()) { + return null; + } + + Position position = new Position(); + position.setProtocol(getProtocolName()); + + DeviceSession deviceSession = getDeviceSession(channel, remoteAddress, parser.next()); + if (deviceSession == null) { + return null; + } + position.setDeviceId(deviceSession.getDeviceId()); + + position.setLatitude(parser.nextCoordinate(Parser.CoordinateFormat.HEM_DEG_MIN)); + position.setLongitude(parser.nextCoordinate(Parser.CoordinateFormat.HEM_DEG_MIN)); + + DateBuilder dateBuilder = new DateBuilder(new Date()) + .setTime(parser.nextInt(), parser.nextInt(), parser.nextInt()); + position.setTime(dateBuilder.getDate()); + + position.setValid(parser.nextInt() != 0); + + position.set(Position.KEY_SATELLITES, parser.nextInt()); + + position.setAltitude(parser.nextInt()); + + position.set(Position.PREFIX_TEMP + 1, parser.nextInt()); + position.set(Position.KEY_POWER, parser.nextDouble()); + position.set(Position.KEY_INPUT, parser.nextInt()); + position.set(Position.KEY_GSM, parser.nextInt()); + + position.setSpeed(UnitsConverter.knotsFromKph(parser.nextInt())); + position.setCourse(parser.nextInt()); + + parser.next(); // alerts + + return position; + } + +} diff --git a/test/org/traccar/protocol/RaveonProtocolDecoderTest.java b/test/org/traccar/protocol/RaveonProtocolDecoderTest.java new file mode 100644 index 000000000..fdaf0939d --- /dev/null +++ b/test/org/traccar/protocol/RaveonProtocolDecoderTest.java @@ -0,0 +1,18 @@ +package org.traccar.protocol; + +import org.junit.Test; +import org.traccar.ProtocolTest; + +public class RaveonProtocolDecoderTest extends ProtocolTest { + + @Test + public void testDecode() throws Exception { + + RaveonProtocolDecoder decoder = new RaveonProtocolDecoder(new RaveonProtocol()); + + verifyPosition(decoder, text( + "$PRAVE,0001,0001,3308.9051,-11713.1164,195348,1,10,168,31,13.3,3,-83,0,0,,1003.4*66")); + + } + +} |