aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debug.xml1
-rw-r--r--src/org/traccar/protocol/AdmProtocol.java46
-rw-r--r--src/org/traccar/protocol/AdmProtocolDecoder.java117
-rw-r--r--test/org/traccar/protocol/AdmProtocolDecoderTest.java39
4 files changed, 203 insertions, 0 deletions
diff --git a/debug.xml b/debug.xml
index 5c1600bf1..43070f9ec 100644
--- a/debug.xml
+++ b/debug.xml
@@ -333,5 +333,6 @@
<entry key='aquila.port'>5089</entry>
<entry key='flextrack.port'>5090</entry>
<entry key='blackkite.port'>5091</entry>
+ <entry key='adm.port'>5092</entry>
</properties>
diff --git a/src/org/traccar/protocol/AdmProtocol.java b/src/org/traccar/protocol/AdmProtocol.java
new file mode 100644
index 000000000..c07acb033
--- /dev/null
+++ b/src/org/traccar/protocol/AdmProtocol.java
@@ -0,0 +1,46 @@
+/*
+ * 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.nio.ByteOrder;
+import java.util.List;
+
+public class AdmProtocol extends BaseProtocol {
+
+ public AdmProtocol() {
+ super("adm");
+ }
+
+ @Override
+ public void initTrackerServers(List<TrackerServer> serverList) {
+ TrackerServer server = new TrackerServer(new ServerBootstrap(), this.getName()) {
+ @Override
+ protected void addSpecificHandlers(ChannelPipeline pipeline) {
+ pipeline.addLast("frameDecoder", new LengthFieldBasedFrameDecoder(1024, 2, 1, -4, 0));
+ pipeline.addLast("objectDecoder", new AdmProtocolDecoder(AdmProtocol.this));
+ }
+ };
+ server.setEndianness(ByteOrder.LITTLE_ENDIAN);
+ serverList.add(server);
+ }
+
+}
diff --git a/src/org/traccar/protocol/AdmProtocolDecoder.java b/src/org/traccar/protocol/AdmProtocolDecoder.java
new file mode 100644
index 000000000..300f38346
--- /dev/null
+++ b/src/org/traccar/protocol/AdmProtocolDecoder.java
@@ -0,0 +1,117 @@
+/*
+ * Copyright 2012 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.buffer.ChannelBuffer;
+import org.jboss.netty.buffer.ChannelBuffers;
+import org.jboss.netty.channel.Channel;
+import org.traccar.BaseProtocolDecoder;
+import org.traccar.helper.BitUtil;
+import org.traccar.helper.UnitsConverter;
+import org.traccar.model.Event;
+import org.traccar.model.Position;
+
+import java.net.SocketAddress;
+import java.nio.charset.Charset;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.TimeZone;
+
+public class AdmProtocolDecoder extends BaseProtocolDecoder {
+
+ public AdmProtocolDecoder(AdmProtocol protocol) {
+ super(protocol);
+ }
+
+ public static final int MSG_IMEI = 0x03;
+ public static final int MSG_PHOTO = 0x0A;
+ public static final int MSG_ADM5 = 0x01;
+
+ @Override
+ protected Object decode(
+ Channel channel, SocketAddress remoteAddress, Object msg) throws Exception {
+
+ ChannelBuffer buf = (ChannelBuffer) msg;
+
+ buf.readUnsignedShort(); // device id
+ buf.readUnsignedByte(); // length
+
+ int type = buf.readUnsignedByte();
+
+ if (type == MSG_IMEI) {
+ identify(buf.toString(buf.readerIndex(), 15, Charset.defaultCharset()), channel);
+ }
+
+ if (hasDeviceId() && BitUtil.range(type, 0, 2) == 0) {
+
+ Position position = new Position();
+ position.setProtocol(getProtocolName());
+ position.setDeviceId(getDeviceId());
+
+ buf.readUnsignedByte(); // firmware version
+ buf.readUnsignedShort(); // index
+
+ position.set(Event.KEY_STATUS, buf.readUnsignedShort());
+
+ position.setValid(true);
+ position.setLatitude(buf.readFloat());
+ position.setLongitude(buf.readFloat());
+ position.setCourse(buf.readUnsignedShort() * 0.1);
+ position.setSpeed(UnitsConverter.knotsFromKph(buf.readUnsignedShort() * 0.1));
+
+ buf.readUnsignedByte(); // acceleration
+
+ position.setAltitude(buf.readUnsignedShort());
+
+ position.set(Event.KEY_HDOP, buf.readUnsignedByte() * 0.1);
+ position.set(Event.KEY_SATELLITES, buf.readUnsignedByte() & 0x0f);
+
+ position.setTime(new Date(buf.readUnsignedInt() * 1000));
+
+ position.set(Event.KEY_POWER, buf.readUnsignedShort());
+ position.set(Event.KEY_BATTERY, buf.readUnsignedShort());
+
+ if (BitUtil.check(type, 2)) {
+ buf.skipBytes(4);
+ }
+
+ if (BitUtil.check(type, 3)) {
+ buf.skipBytes(12);
+ }
+
+ if (BitUtil.check(type, 4)) {
+ buf.skipBytes(8);
+ }
+
+ if (BitUtil.check(type, 5)) {
+ buf.skipBytes(9);
+ }
+
+ if (BitUtil.check(type, 6)) {
+ buf.skipBytes(buf.getUnsignedByte(buf.readerIndex()));
+ }
+
+ if (BitUtil.check(type, 7)) {
+ position.set(Event.KEY_ODOMETER, buf.readUnsignedInt());
+ }
+
+ return position;
+ }
+
+ return null;
+ }
+
+}
diff --git a/test/org/traccar/protocol/AdmProtocolDecoderTest.java b/test/org/traccar/protocol/AdmProtocolDecoderTest.java
new file mode 100644
index 000000000..3720afbea
--- /dev/null
+++ b/test/org/traccar/protocol/AdmProtocolDecoderTest.java
@@ -0,0 +1,39 @@
+package org.traccar.protocol;
+
+import org.jboss.netty.buffer.ChannelBuffers;
+import org.junit.Test;
+import org.traccar.helper.ChannelBufferTools;
+
+import java.nio.ByteOrder;
+
+import static org.junit.Assert.assertNull;
+import static org.traccar.helper.DecoderVerifier.verify;
+
+public class AdmProtocolDecoderTest extends ProtocolDecoderTest {
+
+ @Test
+ public void testDecode() throws Exception {
+
+ AdmProtocolDecoder decoder = new AdmProtocolDecoder(new AdmProtocol());
+
+ assertNull(decoder.decode(null, null, ChannelBuffers.wrappedBuffer(ByteOrder.LITTLE_ENDIAN, ChannelBufferTools.convertHexString(
+ "010042033836313331313030323639343838320501000000000000000000000000000000000000000000000000000000000000000000000000000000000000000073"))));
+
+ verify(decoder.decode(null, null, ChannelBuffers.wrappedBuffer(ByteOrder.LITTLE_ENDIAN, ChannelBufferTools.convertHexString(
+ "01002680336510002062A34C423DCF8E42A50B1700005801140767E30F568F2534107D220000"))));
+
+ verify(decoder.decode(null, null, ChannelBuffers.wrappedBuffer(ByteOrder.LITTLE_ENDIAN, ChannelBufferTools.convertHexString(
+ "010022003300072020000000000000000044062A330000000000107F10565D4A8310"))));
+
+ verify(decoder.decode(null, null, ChannelBuffers.wrappedBuffer(ByteOrder.LITTLE_ENDIAN, ChannelBufferTools.convertHexString(
+ "0100268033641080207AA34C424CCF8E4239030800005B01140755E30F560000F00F70220000"))));
+
+ verify(decoder.decode(null, null, ChannelBuffers.wrappedBuffer(ByteOrder.LITTLE_ENDIAN, ChannelBufferTools.convertHexString(
+ "01002680336510002062A34C423DCF8E42A50B1700005801140767E30F568F2534107D220000"))));
+
+ verify(decoder.decode(null, null, ChannelBuffers.wrappedBuffer(ByteOrder.LITTLE_ENDIAN, ChannelBufferTools.convertHexString(
+ "01002200333508202000000000000000007F0D9F030000000000E39A1056E24A8210"))));
+
+ }
+
+}