diff options
| -rw-r--r-- | setup/default.xml | 1 | ||||
| -rw-r--r-- | src/org/traccar/protocol/VtfmsFrameDecoder.java | 40 | ||||
| -rw-r--r-- | src/org/traccar/protocol/VtfmsProtocol.java | 52 | ||||
| -rw-r--r-- | src/org/traccar/protocol/VtfmsProtocolDecoder.java | 141 | ||||
| -rw-r--r-- | test/org/traccar/protocol/VtfmsFrameDecoderTest.java | 20 | ||||
| -rw-r--r-- | test/org/traccar/protocol/VtfmsProtocolDecoderTest.java | 18 |
6 files changed, 272 insertions, 0 deletions
diff --git a/setup/default.xml b/setup/default.xml index 47954c9aa..2fc6c3cf0 100644 --- a/setup/default.xml +++ b/setup/default.xml @@ -578,5 +578,6 @@ <entry key='flexcomm.port'>5142</entry> <entry key='vt200.port'>5143</entry> <entry key='owntracks.port'>5144</entry> + <entry key='vtfms.port'>5145</entry> </properties> diff --git a/src/org/traccar/protocol/VtfmsFrameDecoder.java b/src/org/traccar/protocol/VtfmsFrameDecoder.java new file mode 100644 index 000000000..2e6033fcc --- /dev/null +++ b/src/org/traccar/protocol/VtfmsFrameDecoder.java @@ -0,0 +1,40 @@ +/* + * Copyright 2017 Anton Tananaev (anton@traccar.org) + * + * 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.buffer.ChannelBuffer; +import org.jboss.netty.channel.Channel; +import org.jboss.netty.channel.ChannelHandlerContext; +import org.jboss.netty.handler.codec.frame.FrameDecoder; + +public class VtfmsFrameDecoder extends FrameDecoder { + + @Override + protected Object decode( + ChannelHandlerContext ctx, Channel channel, ChannelBuffer buf) throws Exception { + + int endIndex = buf.indexOf(buf.readerIndex(), buf.writerIndex(), (byte) ')'); + if (endIndex > 0) { + endIndex += 1 + 3; + if (buf.writerIndex() >= endIndex) { + return buf.readBytes(endIndex - buf.readerIndex()); + } + } + + return null; + } + +} diff --git a/src/org/traccar/protocol/VtfmsProtocol.java b/src/org/traccar/protocol/VtfmsProtocol.java new file mode 100644 index 000000000..61e0bf2b9 --- /dev/null +++ b/src/org/traccar/protocol/VtfmsProtocol.java @@ -0,0 +1,52 @@ +/* + * Copyright 2015 Anton Tananaev (anton@traccar.org) + * + * 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.ConnectionlessBootstrap; +import org.jboss.netty.bootstrap.ServerBootstrap; +import org.jboss.netty.channel.ChannelPipeline; +import org.jboss.netty.handler.codec.string.StringDecoder; +import org.traccar.BaseProtocol; +import org.traccar.TrackerServer; + +import java.util.List; + +public class VtfmsProtocol extends BaseProtocol { + + public VtfmsProtocol() { + super("vtfms"); + } + + @Override + public void initTrackerServers(List<TrackerServer> serverList) { + serverList.add(new TrackerServer(new ServerBootstrap(), getName()) { + @Override + protected void addSpecificHandlers(ChannelPipeline pipeline) { + pipeline.addLast("frameDecoder", new VtfmsFrameDecoder()); + pipeline.addLast("stringDecoder", new StringDecoder()); + pipeline.addLast("objectDecoder", new VtfmsProtocolDecoder(VtfmsProtocol.this)); + } + }); + serverList.add(new TrackerServer(new ConnectionlessBootstrap(), getName()) { + @Override + protected void addSpecificHandlers(ChannelPipeline pipeline) { + pipeline.addLast("stringDecoder", new StringDecoder()); + pipeline.addLast("objectDecoder", new VtfmsProtocolDecoder(VtfmsProtocol.this)); + } + }); + } + +} diff --git a/src/org/traccar/protocol/VtfmsProtocolDecoder.java b/src/org/traccar/protocol/VtfmsProtocolDecoder.java new file mode 100644 index 000000000..9f8cea04f --- /dev/null +++ b/src/org/traccar/protocol/VtfmsProtocolDecoder.java @@ -0,0 +1,141 @@ +/* + * Copyright 2017 Anton Tananaev (anton@traccar.org) + * + * 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.Parser; +import org.traccar.helper.PatternBuilder; +import org.traccar.helper.UnitsConverter; +import org.traccar.model.Position; + +import java.net.SocketAddress; +import java.util.regex.Pattern; + +public class VtfmsProtocolDecoder extends BaseProtocolDecoder { + + public VtfmsProtocolDecoder(VtfmsProtocol protocol) { + super(protocol); + } + + private static final Pattern PATTERN = new PatternBuilder() + .text("(") + .number("(d{15}),") // imei + .number("[0-9A-Z]{3}dd,") // packet count + .number("(dd),") // packet id + .number("[^,]*,") // reserved + .number("(d+),") // rssi + .number("d+,") // fix status + .number("(d+),") // satellites + .number("[^,]*,") // reserved + .expression("([AV]),") // validity + .number("(dd)(dd)(dd),") // time (hhmmss) + .number("(dd)(dd)(dd),") // time (ddmmyy) + .number("(-?d+.d+),") // latitude + .number("(-?d+.d+),") // longitude + .number("(d+),") // course + .number("(d+),") // speed + .number("(d+),") // hours + .number("(d+),") // idle hours + .expression("[KNT],") // antenna status + .number("(d+),") // odometer + .expression("([01]),") // power status + .number("(d+.d+),") // power voltage + .number("[^,]*,") // reserved + .number("(d+),") // fuel level + .number("(d+.d+),") // adc 1 + .number("[^,]*,") // reserved + .number("(d+.d+),") // adc 2 + .expression("([01]),") // di 1 + .expression("([01]),") // di 2 + .expression("([01]),") // di 3 + .expression("([01]),") // di 4 + .expression("([01]),") // do 1 + .expression("([01]),") // do 2 + .expression("([01]),") // do 3 + .number("[^,]*,") // reserved + .number("[^,]*") // reserved + .text(")") + .number("ddd") // checksum + .compile(); + + private String decodeAlarm(int value) { + switch (value) { + case 10: + return Position.ALARM_OVERSPEED; + case 14: + return Position.ALARM_POWER_CUT; + case 15: + return Position.ALARM_POWER_RESTORED; + case 32: + return Position.ALARM_BREAKING; + case 33: + return Position.ALARM_ACCELERATION; + default: + return null; + } + } + + @Override + protected Object decode( + Channel channel, SocketAddress remoteAddress, Object msg) throws Exception { + + Parser parser = new Parser(PATTERN, (String) msg); + if (!parser.matches()) { + return null; + } + + DeviceSession deviceSession = getDeviceSession(channel, remoteAddress, parser.next()); + if (deviceSession == null) { + return null; + } + + Position position = new Position(); + position.setProtocol(getProtocolName()); + position.setDeviceId(deviceSession.getDeviceId()); + + position.set(Position.KEY_ALARM, decodeAlarm(parser.nextInt())); + position.set(Position.KEY_RSSI, parser.nextInt()); + position.set(Position.KEY_SATELLITES, parser.nextInt()); + + position.setValid(parser.next().equals("A")); + position.setTime(parser.nextDateTime(Parser.DateTimeFormat.HMS_DMY)); + position.setLatitude(parser.nextDouble(0)); + position.setLongitude(parser.nextDouble(0)); + position.setCourse(parser.nextDouble(0)); + position.setSpeed(UnitsConverter.knotsFromKph(parser.nextDouble(0))); + + position.set(Position.KEY_HOURS, parser.nextInt()); + position.set("idleHours", parser.nextInt()); + position.set(Position.KEY_ODOMETER, parser.nextInt() * 100); + position.set(Position.KEY_CHARGE, parser.next().equals("1")); + position.set(Position.KEY_POWER, parser.nextDouble()); + position.set(Position.KEY_FUEL_LEVEL, parser.nextInt()); + position.set(Position.PREFIX_ADC + 1, parser.nextDouble()); + position.set(Position.PREFIX_ADC + 2, parser.nextDouble()); + position.set(Position.PREFIX_IN + 1, parser.nextInt()); + position.set(Position.PREFIX_IN + 2, parser.nextInt()); + position.set(Position.PREFIX_IN + 3, parser.nextInt()); + position.set(Position.PREFIX_IN + 4, parser.nextInt()); + position.set(Position.PREFIX_OUT + 1, parser.nextInt()); + position.set(Position.PREFIX_OUT + 2, parser.nextInt()); + position.set(Position.PREFIX_OUT + 3, parser.nextInt()); + + return position; + } + +} diff --git a/test/org/traccar/protocol/VtfmsFrameDecoderTest.java b/test/org/traccar/protocol/VtfmsFrameDecoderTest.java new file mode 100644 index 000000000..e5897549b --- /dev/null +++ b/test/org/traccar/protocol/VtfmsFrameDecoderTest.java @@ -0,0 +1,20 @@ +package org.traccar.protocol; + +import org.junit.Assert; +import org.junit.Test; +import org.traccar.ProtocolTest; + +public class VtfmsFrameDecoderTest extends ProtocolTest { + + @Test + public void testDecode() throws Exception { + + VtfmsFrameDecoder decoder = new VtfmsFrameDecoder(); + + Assert.assertEquals( + buffer("(863071010087648,0HK44,00,000,14,2,9,,A,114946,180313,11.0244,076.9768,282,000,00000,00000,K,0000128,1,12.8,,200,2.501,,4.001,0,0,0,0,0,0,0,,)105"), + decoder.decode(null, null, buffer("(863071010087648,0HK44,00,000,14,2,9,,A,114946,180313,11.0244,076.9768,282,000,00000,00000,K,0000128,1,12.8,,200,2.501,,4.001,0,0,0,0,0,0,0,,)105"))); + + } + +} diff --git a/test/org/traccar/protocol/VtfmsProtocolDecoderTest.java b/test/org/traccar/protocol/VtfmsProtocolDecoderTest.java new file mode 100644 index 000000000..a08bfb926 --- /dev/null +++ b/test/org/traccar/protocol/VtfmsProtocolDecoderTest.java @@ -0,0 +1,18 @@ +package org.traccar.protocol; + +import org.junit.Test; +import org.traccar.ProtocolTest; + +public class VtfmsProtocolDecoderTest extends ProtocolTest { + + @Test + public void testDecode() throws Exception { + + VtfmsProtocolDecoder decoder = new VtfmsProtocolDecoder(new VtfmsProtocol()); + + verifyPosition(decoder, text( + "(863071010087648,0HK44,00,000,14,2,9,,A,114946,180313,11.0244,076.9768,282,000,00000,00000,K,0000128,1,12.8,,200,2.501,,4.001,0,0,0,0,0,0,0,,)105")); + + } + +} |