diff options
| -rw-r--r-- | setup/default.xml | 1 | ||||
| -rw-r--r-- | src/org/traccar/protocol/Gps103ProtocolDecoder.java | 8 | ||||
| -rw-r--r-- | src/org/traccar/protocol/Vt200Protocol.java | 43 | ||||
| -rw-r--r-- | src/org/traccar/protocol/Vt200ProtocolDecoder.java | 105 | ||||
| -rw-r--r-- | src/org/traccar/reports/Trips.java | 2 | ||||
| -rw-r--r-- | test/org/traccar/protocol/Gps103ProtocolDecoderTest.java | 6 | ||||
| -rw-r--r-- | test/org/traccar/protocol/Gt06ProtocolDecoderTest.java | 3 | ||||
| -rw-r--r-- | test/org/traccar/protocol/Vt200ProtocolDecoderTest.java | 21 | ||||
| -rwxr-xr-x | tools/test-trips.py | 35 |
9 files changed, 219 insertions, 5 deletions
diff --git a/setup/default.xml b/setup/default.xml index 7eaf6bcad..171ba3200 100644 --- a/setup/default.xml +++ b/setup/default.xml @@ -574,5 +574,6 @@ <entry key='alematics.port'>5140</entry> <entry key='gps056.port'>5141</entry> <entry key='flexcomm'>5142</entry> + <entry key='vt200'>5143</entry> </properties> diff --git a/src/org/traccar/protocol/Gps103ProtocolDecoder.java b/src/org/traccar/protocol/Gps103ProtocolDecoder.java index b0113e0be..2b546bb26 100644 --- a/src/org/traccar/protocol/Gps103ProtocolDecoder.java +++ b/src/org/traccar/protocol/Gps103ProtocolDecoder.java @@ -90,10 +90,10 @@ public class Gps103ProtocolDecoder extends BaseProtocolDecoder { .number("(d+),") // odometer .number("(d+.d+)?,") // fuel instant .number("(d+.d+)?,") // fuel average - .number("(d+),") // hours + .number("(d+)?,") // hours .number("(d+),") // speed .number("d+.?d*%,") // power load - .number("(d+),") // temperature + .number("(?:([-+]?d+)|[-+]?),") // temperature .number("(d+.?d*%),") // throttle .number("(d+),") // rpm .number("(d+.d+),") // battery @@ -209,9 +209,9 @@ public class Gps103ProtocolDecoder extends BaseProtocolDecoder { position.set(Position.KEY_ODOMETER, parser.nextInt(0)); parser.nextDouble(0); // instant fuel consumption position.set(Position.KEY_FUEL_CONSUMPTION, parser.nextDouble(0)); - position.set(Position.KEY_HOURS, parser.nextInt(0)); + position.set(Position.KEY_HOURS, parser.nextInt()); position.set(Position.KEY_OBD_SPEED, parser.nextInt(0)); - position.set(Position.PREFIX_TEMP + 1, parser.nextInt(0)); + position.set(Position.PREFIX_TEMP + 1, parser.nextInt()); position.set(Position.KEY_THROTTLE, parser.next()); position.set(Position.KEY_RPM, parser.nextInt(0)); position.set(Position.KEY_BATTERY, parser.nextDouble(0)); diff --git a/src/org/traccar/protocol/Vt200Protocol.java b/src/org/traccar/protocol/Vt200Protocol.java new file mode 100644 index 000000000..4a8587b21 --- /dev/null +++ b/src/org/traccar/protocol/Vt200Protocol.java @@ -0,0 +1,43 @@ +/* + * 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.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 Vt200Protocol extends BaseProtocol { + + public Vt200Protocol() { + super("vt200"); + } + + @Override + public void initTrackerServers(List<TrackerServer> serverList) { + serverList.add(new TrackerServer(new ServerBootstrap(), getName()) { + @Override + protected void addSpecificHandlers(ChannelPipeline pipeline) { + pipeline.addLast("frameDecoder", new LengthFieldBasedFrameDecoder(1024, 1 + 6 + 2, 2, 2, 0)); + pipeline.addLast("objectDecoder", new Vt200ProtocolDecoder(Vt200Protocol.this)); + } + }); + } + +} diff --git a/src/org/traccar/protocol/Vt200ProtocolDecoder.java b/src/org/traccar/protocol/Vt200ProtocolDecoder.java new file mode 100644 index 000000000..b9af11b43 --- /dev/null +++ b/src/org/traccar/protocol/Vt200ProtocolDecoder.java @@ -0,0 +1,105 @@ +/* + * 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.buffer.ChannelBuffers; +import org.jboss.netty.channel.Channel; +import org.traccar.BaseProtocolDecoder; +import org.traccar.DeviceSession; +import org.traccar.helper.BcdUtil; +import org.traccar.helper.BitUtil; +import org.traccar.helper.DateBuilder; +import org.traccar.helper.UnitsConverter; +import org.traccar.model.Position; + +import java.net.SocketAddress; + +public class Vt200ProtocolDecoder extends BaseProtocolDecoder { + + public Vt200ProtocolDecoder(Vt200Protocol protocol) { + super(protocol); + } + + private static double decodeCoordinate(int value) { + int degrees = value / 1000000; + int minutes = value % 1000000; + return degrees + minutes * 0.0001 / 60; + } + + @Override + protected Object decode( + Channel channel, SocketAddress remoteAddress, Object msg) throws Exception { + + ChannelBuffer buf = (ChannelBuffer) msg; + + buf.skipBytes(1); // header + + String id = ChannelBuffers.hexDump(buf.readBytes(6)); + DeviceSession deviceSession = getDeviceSession(channel, remoteAddress, id); + if (deviceSession == null) { + return null; + } + + int type = buf.readUnsignedShort(); + buf.readUnsignedShort(); // length + + if (type == 0x2084) { + + Position position = new Position(); + position.setProtocol(getProtocolName()); + position.setDeviceId(deviceSession.getDeviceId()); + + buf.readUnsignedByte(); // data type + buf.readUnsignedShort(); // trip id + + DateBuilder dateBuilder = new DateBuilder(); + dateBuilder.setDateReverse( + BcdUtil.readInteger(buf, 2), BcdUtil.readInteger(buf, 2), BcdUtil.readInteger(buf, 2)); + dateBuilder.setTime( + BcdUtil.readInteger(buf, 2), BcdUtil.readInteger(buf, 2), BcdUtil.readInteger(buf, 2)); + position.setTime(dateBuilder.getDate()); + + position.setLatitude(decodeCoordinate(BcdUtil.readInteger(buf, 8))); + position.setLongitude(decodeCoordinate(BcdUtil.readInteger(buf, 9))); + + int flags = buf.readUnsignedByte(); + position.setValid(BitUtil.check(flags, 0)); + if (!BitUtil.check(flags, 1)) { + position.setLatitude(-position.getLatitude()); + } + if (!BitUtil.check(flags, 1)) { + position.setLongitude(-position.getLongitude()); + } + + position.setSpeed(UnitsConverter.knotsFromKph(buf.readUnsignedByte())); + position.setCourse(buf.readUnsignedByte() * 2); + + position.set(Position.KEY_SATELLITES, buf.readUnsignedByte()); + position.set(Position.KEY_RSSI, buf.readUnsignedByte()); + position.set(Position.KEY_ODOMETER, buf.readUnsignedInt() * 1000); + position.set(Position.KEY_STATUS, buf.readUnsignedInt()); + + // additional data + + return position; + + } + + return null; + } + +} diff --git a/src/org/traccar/reports/Trips.java b/src/org/traccar/reports/Trips.java index eeb2f2681..966c3a817 100644 --- a/src/org/traccar/reports/Trips.java +++ b/src/org/traccar/reports/Trips.java @@ -55,7 +55,7 @@ public final class Trips { TripReport trip = new TripReport(); - long tripDuration = endTrip.getFixTime().getTime() - positions.get(startIndex).getFixTime().getTime(); + long tripDuration = endTrip.getFixTime().getTime() - startTrip.getFixTime().getTime(); long deviceId = startTrip.getDeviceId(); trip.setDeviceId(deviceId); trip.setDeviceName(Context.getIdentityManager().getDeviceById(deviceId).getName()); diff --git a/test/org/traccar/protocol/Gps103ProtocolDecoderTest.java b/test/org/traccar/protocol/Gps103ProtocolDecoderTest.java index c1f29add6..345a89ad9 100644 --- a/test/org/traccar/protocol/Gps103ProtocolDecoderTest.java +++ b/test/org/traccar/protocol/Gps103ProtocolDecoderTest.java @@ -10,6 +10,12 @@ public class Gps103ProtocolDecoderTest extends ProtocolTest { Gps103ProtocolDecoder decoder = new Gps103ProtocolDecoder(new Gps103Protocol()); + verifyAttributes(decoder, text( + "imei:862106025092216,OBD,170612165656,196043,,145803.9,,000,0.0%,+,0.0%,00000,12.6,,,,;")); + + verifyAttributes(decoder, text( + "imei:862106025092216,OBD,170605095949,195874,,370.8,808,066,30.0%,+87,13.0%,02444,14.3,,,,;")); + verifyPosition(decoder, text( "imei:353451044508750,DTC,0809231929,,F,055403.000,A,2233.1870,N,11354.3067,E,0.00,30.1,,1,0,10.5%,P0021,;")); diff --git a/test/org/traccar/protocol/Gt06ProtocolDecoderTest.java b/test/org/traccar/protocol/Gt06ProtocolDecoderTest.java index c677b72ae..a3c3f71f3 100644 --- a/test/org/traccar/protocol/Gt06ProtocolDecoderTest.java +++ b/test/org/traccar/protocol/Gt06ProtocolDecoderTest.java @@ -16,6 +16,9 @@ public class Gt06ProtocolDecoderTest extends ProtocolTest { verifyNull(decoder, binary( "78780D01086471700328358100093F040D0A")); + verifyNotNull(decoder, binary( + "7878661500000000004459443d537563636573732100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010009e82b0d0a")); + verifyAttributes(decoder, binary( "7979000894000000000338ba0d0a")); diff --git a/test/org/traccar/protocol/Vt200ProtocolDecoderTest.java b/test/org/traccar/protocol/Vt200ProtocolDecoderTest.java new file mode 100644 index 000000000..e61c5f9f2 --- /dev/null +++ b/test/org/traccar/protocol/Vt200ProtocolDecoderTest.java @@ -0,0 +1,21 @@ +package org.traccar.protocol; + +import org.junit.Test; +import org.traccar.ProtocolTest; + +public class Vt200ProtocolDecoderTest extends ProtocolTest { + + @Test + public void testDecode() throws Exception { + + Vt200ProtocolDecoder decoder = new Vt200ProtocolDecoder(new Vt200Protocol()); + + verifyPosition(decoder, binary( + "28631037309456208400340102dc0906171616454415760201144494473f920a0c0000030500200100417c1f383a9d1090510000006a00007000000e00180ee129")); + + verifyPosition(decoder, binary( + "28631037309456208400340102dc090617161654441577230114439597368c0a0c0000030500200100417c1baa349d3290510000006a00007000003d15004c11c629")); + + } + +} diff --git a/tools/test-trips.py b/tools/test-trips.py new file mode 100755 index 000000000..a71357fdb --- /dev/null +++ b/tools/test-trips.py @@ -0,0 +1,35 @@ +#!/usr/bin/python + +import urllib +import httplib +import time +import datetime + +id = '123456789012345' +server = 'localhost:5055' + +points = [ + ('2017-01-01 00:00:00', 59.93211887, 30.33050537, 0.0), + ('2017-01-01 00:05:00', 59.93266715, 30.33190012, 50.0), + ('2017-01-01 00:10:00', 59.93329069, 30.33333778, 50.0), + ('2017-01-01 00:15:00', 59.93390346, 30.33468962, 0.0), + ('2017-01-01 00:20:00', 59.93390346, 30.33468962, 0.0), + ('2017-01-01 00:25:00', 59.93416146, 30.33580542, 50.0), + ('2017-01-01 00:30:00', 59.93389271, 30.33790827, 50.0), + ('2017-01-01 00:35:00', 59.93357020, 30.34033298, 50.0), + ('2017-01-01 00:40:00', 59.93330144, 30.34252167, 0.0), + ('2017-01-01 00:44:00', 59.93355945, 30.34413099, 50.0), + ('2017-01-01 00:50:00', 59.93458072, 30.34458160, 0.0), + ('2017-01-01 00:55:00', 59.93458072, 30.34458160, 0.0), +] + +def send(conn, time, lat, lon, speed): + params = (('id', id), ('timestamp', int(time)), ('lat', lat), ('lon', lon), ('speed', speed)) + conn.request('POST', '?' + urllib.urlencode(params)) + conn.getresponse().read() + +conn = httplib.HTTPConnection(server) + +for i in range(0, len(points)): + (moment, lat, lon, speed) = points[i] + send(conn, time.mktime(datetime.datetime.strptime(moment, "%Y-%m-%d %H:%M:%S").timetuple()), lat, lon, speed) |