diff options
| -rw-r--r-- | default.cfg | 4 | ||||
| -rw-r--r-- | src/org/traccar/ServerManager.java | 16 | ||||
| -rw-r--r-- | src/org/traccar/protocol/Gt02ProtocolDecoder.java | 1 | ||||
| -rw-r--r-- | src/org/traccar/protocol/TramigoProtocolDecoder.java | 107 | ||||
| -rw-r--r-- | test/org/traccar/protocol/TramigoProtocolDecoderTest.java | 23 |
5 files changed, 151 insertions, 0 deletions
diff --git a/default.cfg b/default.cfg index 666338687..d77738f1f 100644 --- a/default.cfg +++ b/default.cfg @@ -360,4 +360,8 @@ <entry key='ulbotech.enable'>true</entry> <entry key='ulbotech.port'>5072</entry> + <!-- Tramigo server configuration --> + <entry key='tramigo.enable'>true</entry> + <entry key='tramigo.port'>5073</entry> + </properties> diff --git a/src/org/traccar/ServerManager.java b/src/org/traccar/ServerManager.java index 71b71975e..f6504fd27 100644 --- a/src/org/traccar/ServerManager.java +++ b/src/org/traccar/ServerManager.java @@ -177,6 +177,7 @@ public class ServerManager { initOrionServer("orion"); initRitiServer("riti"); initUlbotechServer("ulbotech"); + initTramigoServer("tramigo"); // Initialize web server if (Boolean.valueOf(properties.getProperty("http.enable"))) { @@ -1273,6 +1274,9 @@ public class ServerManager { } private void initUlbotechServer(final String protocol) throws SQLException { + + // TODO: Waiting for feedback from manufacturer + if (isProtocolEnabled(properties, protocol)) { serverList.add(new TrackerServer(this, new ServerBootstrap(), protocol) { @Override @@ -1284,4 +1288,16 @@ public class ServerManager { } } + private void initTramigoServer(final String protocol) throws SQLException { + if (isProtocolEnabled(properties, protocol)) { + serverList.add(new TrackerServer(this, new ServerBootstrap(), protocol) { + @Override + protected void addSpecificHandlers(ChannelPipeline pipeline) { + pipeline.addLast("frameDecoder", new LengthFieldBasedFrameDecoder(1024, 6, 2, -8, 0)); + pipeline.addLast("objectDecoder", new TramigoProtocolDecoder(dataManager, protocol, properties)); + } + }); + } + } + } diff --git a/src/org/traccar/protocol/Gt02ProtocolDecoder.java b/src/org/traccar/protocol/Gt02ProtocolDecoder.java index 546f7dc56..3857766c7 100644 --- a/src/org/traccar/protocol/Gt02ProtocolDecoder.java +++ b/src/org/traccar/protocol/Gt02ProtocolDecoder.java @@ -88,6 +88,7 @@ public class Gt02ProtocolDecoder extends BaseProtocolDecoder { position.setDeviceId(getDataManager().getDeviceByImei(imei).getId()); } catch(Exception error) { Log.warning("Unknown device - " + imei); + return null; } // Date and time diff --git a/src/org/traccar/protocol/TramigoProtocolDecoder.java b/src/org/traccar/protocol/TramigoProtocolDecoder.java new file mode 100644 index 000000000..9bc8a5ae8 --- /dev/null +++ b/src/org/traccar/protocol/TramigoProtocolDecoder.java @@ -0,0 +1,107 @@ +/* + * Copyright 2014 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.channel.Channel; +import org.jboss.netty.channel.ChannelHandlerContext; +import org.traccar.BaseProtocolDecoder; +import org.traccar.database.DataManager; +import org.traccar.helper.Log; +import org.traccar.model.ExtendedInfoFormatter; +import org.traccar.model.Position; + +import java.util.Date; +import java.util.Properties; + +public class TramigoProtocolDecoder extends BaseProtocolDecoder { + + public TramigoProtocolDecoder(DataManager dataManager, String protocol, Properties properties) { + super(dataManager, protocol, properties); + } + + private static final int MSG_COMPACT = 0x0100; + private static final int MSG_FULL = 0x00FE; + + @Override + protected Object decode( + ChannelHandlerContext ctx, Channel channel, Object msg) + throws Exception { + + ChannelBuffer buf = (ChannelBuffer) msg; + + if (buf.readUnsignedByte() != 1) { + return null; // wrong protocol version + } + + buf.readUnsignedByte(); // version id + int index = buf.readUnsignedShort(); + int type = buf.readUnsignedShort(); + buf.readUnsignedShort(); // length + buf.readUnsignedShort(); // mask + buf.readUnsignedShort(); // checksum + long id = buf.readUnsignedInt(); + buf.readUnsignedInt(); // time + + if (type == MSG_COMPACT || type == MSG_FULL) { + + // Create new position + Position position = new Position(); + ExtendedInfoFormatter extendedInfo = new ExtendedInfoFormatter(getProtocol()); + extendedInfo.set("index", index); + + // Get device id + try { + position.setDeviceId(getDataManager().getDeviceByImei(String.valueOf(id)).getId()); + } catch(Exception error) { + Log.warning("Unknown device - " + id); + return null; + } + + buf.readUnsignedShort(); // report trigger + buf.readUnsignedShort(); // state flag + + position.setValid(true); + position.setLatitude(buf.readUnsignedInt() * 0.0000001); + position.setLongitude(buf.readUnsignedInt() * 0.0000001); + position.setAltitude(0.0); + + buf.readUnsignedShort(); // GSM signal quality + buf.readUnsignedShort(); // satellites in fix + buf.readUnsignedShort(); // satellites in track + buf.readUnsignedShort(); // GPS antenna state + + position.setSpeed(buf.readUnsignedShort() * 0.194384); + position.setCourse((double )buf.readUnsignedShort()); + + buf.readUnsignedInt(); // distance + + extendedInfo.set("battery", buf.readUnsignedShort()); + + buf.readUnsignedShort(); // battery charger status + + position.setTime(new Date(buf.readUnsignedInt() * 1000)); + + // TODO: parse other data + + position.setExtendedInfo(extendedInfo.toString()); + return position; + } + + return null; + } + +} diff --git a/test/org/traccar/protocol/TramigoProtocolDecoderTest.java b/test/org/traccar/protocol/TramigoProtocolDecoderTest.java new file mode 100644 index 000000000..d9024e3bd --- /dev/null +++ b/test/org/traccar/protocol/TramigoProtocolDecoderTest.java @@ -0,0 +1,23 @@ +package org.traccar.protocol; + +import org.jboss.netty.buffer.ChannelBuffers; +import org.junit.Test; +import org.traccar.helper.ChannelBufferTools; +import org.traccar.helper.TestDataManager; + +import static org.junit.Assert.assertNull; +import static org.traccar.helper.DecoderVerifier.verify; + +public class TramigoProtocolDecoderTest { + + @Test + public void testDecode() throws Exception { + + TramigoProtocolDecoder decoder = new TramigoProtocolDecoder(new TestDataManager(), null, null); + + //verify(decoder.decode(null, null, ChannelBuffers.wrappedBuffer(ChannelBufferTools.convertArray( + // new int[] {0x68,0x68,0x25,0x00,0x00,0x01,0x23,0x45,0x67,0x89,0x01,0x23,0x45,0x00,0x01,0x10,0x01,0x01,0x01,0x01,0x01,0x01,0x02,0x6B,0x3F,0x3E,0x02,0x6B,0x3F,0x3E,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x0D,0x0A})))); + + } + +} |