diff options
| -rw-r--r-- | default.cfg | 4 | ||||
| -rw-r--r-- | src/org/traccar/ServerManager.java | 13 | ||||
| -rw-r--r-- | src/org/traccar/protocol/UlbotechProtocolDecoder.java | 122 | ||||
| -rw-r--r-- | test/org/traccar/protocol/UlbotechProtocolDecoderTest.java | 26 |
4 files changed, 165 insertions, 0 deletions
diff --git a/default.cfg b/default.cfg index 94ccdcc1b..666338687 100644 --- a/default.cfg +++ b/default.cfg @@ -356,4 +356,8 @@ <entry key='riti.enable'>true</entry> <entry key='riti.port'>5071</entry> + <!-- Ulbotech server configuration --> + <entry key='ulbotech.enable'>true</entry> + <entry key='ulbotech.port'>5072</entry> + </properties> diff --git a/src/org/traccar/ServerManager.java b/src/org/traccar/ServerManager.java index 75a569393..71b71975e 100644 --- a/src/org/traccar/ServerManager.java +++ b/src/org/traccar/ServerManager.java @@ -176,6 +176,7 @@ public class ServerManager { initVisiontekServer("visiontek"); initOrionServer("orion"); initRitiServer("riti"); + initUlbotechServer("ulbotech"); // Initialize web server if (Boolean.valueOf(properties.getProperty("http.enable"))) { @@ -1271,4 +1272,16 @@ public class ServerManager { } } + private void initUlbotechServer(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, 2, 1, 2, 0)); + pipeline.addLast("objectDecoder", new UlbotechProtocolDecoder(dataManager, protocol, properties)); + } + }); + } + } + } diff --git a/src/org/traccar/protocol/UlbotechProtocolDecoder.java b/src/org/traccar/protocol/UlbotechProtocolDecoder.java new file mode 100644 index 000000000..cf152ebc5 --- /dev/null +++ b/src/org/traccar/protocol/UlbotechProtocolDecoder.java @@ -0,0 +1,122 @@ +/* + * 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.jboss.netty.channel.ChannelHandlerContext; +import org.traccar.BaseProtocolDecoder; +import org.traccar.database.DataManager; +import org.traccar.helper.ChannelBufferTools; +import org.traccar.helper.Log; +import org.traccar.model.ExtendedInfoFormatter; +import org.traccar.model.Position; + +import java.util.Calendar; +import java.util.Date; +import java.util.Properties; +import java.util.TimeZone; + +public class UlbotechProtocolDecoder extends BaseProtocolDecoder { + + public UlbotechProtocolDecoder(DataManager dataManager, String protocol, Properties properties) { + super(dataManager, protocol, properties); + } + + private String readImei(ChannelBuffer buf) { + int b = buf.readUnsignedByte(); + StringBuilder imei = new StringBuilder(); + imei.append(b & 0x0F); + for (int i = 0; i < 7; i++) { + b = buf.readUnsignedByte(); + imei.append((b & 0xF0) >> 4); + imei.append(b & 0x0F); + } + return imei.toString(); + } + + private static final short DATA_GPS = 0x01; + private static final short DATA_LBS = 0x02; + private static final short DATA_STATUS = 0x03; + private static final short DATA_MILAGE = 0x04; + private static final short DATA_ADC = 0x05; + private static final short DATA_GEOFENCE = 0x06; + private static final short DATA_OBD2 = 0x07; + private static final short DATA_FUEL = 0x08; + private static final short DATA_OBD2_ALARM = 0x09; + private static final short DATA_HARSH_DRIVER = 0x0A; + private static final short DATA_CANBUS = 0x0B; + + @Override + protected Object decode( + ChannelHandlerContext ctx, Channel channel, Object msg) + throws Exception { + + ChannelBuffer buf = (ChannelBuffer) msg; + + buf.readByte(); // header + buf.readUnsignedByte(); // version + buf.readUnsignedByte(); // type + + // Create new position + Position position = new Position(); + ExtendedInfoFormatter extendedInfo = new ExtendedInfoFormatter(getProtocol()); + + // Get device id + String imei = ChannelBufferTools.readHexString(buf, 16).substring(1); + try { + position.setDeviceId(getDataManager().getDeviceByImei(imei).getId()); + } catch(Exception error) { + Log.warning("Unknown device - " + imei); + } + + // Time + long seconds = buf.readUnsignedInt() & 0x7fffffffl; + seconds += 946684800l; // 2000-01-01 00:00 + position.setTime(new Date(seconds * 1000)); + + while (buf.readableBytes() > 3) { + + short type = buf.readUnsignedByte(); + short length = buf.readUnsignedByte(); + + switch (type) { + + case DATA_GPS: + + position.setValid(true); + position.setLatitude(buf.readInt() / 1000000.0); + position.setLongitude(buf.readInt() / 1000000.0); + position.setAltitude(0.0); + position.setSpeed(buf.readUnsignedShort() * 0.539957); + position.setCourse((double) buf.readUnsignedShort()); + extendedInfo.set("hdop", buf.readUnsignedShort()); + + break; + + + default: + buf.skipBytes(length); + break; + } + } + + position.setExtendedInfo(extendedInfo.toString()); + return position; + } + +} diff --git a/test/org/traccar/protocol/UlbotechProtocolDecoderTest.java b/test/org/traccar/protocol/UlbotechProtocolDecoderTest.java new file mode 100644 index 000000000..a8b21c0b1 --- /dev/null +++ b/test/org/traccar/protocol/UlbotechProtocolDecoderTest.java @@ -0,0 +1,26 @@ +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 UlbotechProtocolDecoderTest { + + @Test + public void testDecode() throws Exception { + + UlbotechProtocolDecoder decoder = new UlbotechProtocolDecoder(new TestDataManager(), null, null); + + //verify(decoder.decode(null, null, ChannelBuffers.wrappedBuffer(ChannelBufferTools.convertArray( + // new int[] {0xF8,0x01,0x01,0x08,0x63,0x07,0x00,0x18,0x98,0x72,0x98,0x72,0x96,0x19,0x02,0x27,0x01,0xCC,0x00,0x00,0x28,0x55,0x34,0xBA,0x4F,0x28,0x55,0x3A,0xB1,0x4C,0x28,0x55,0xBC,0x9C,0x57,0x28,0x55,0xBC,0x9D,0x5B,0x28,0x55,0x3A,0xB2,0x5C,0x28,0x55,0x44,0x58,0x61,0x28,0x55,0x44,0x58,0x63,0x03,0x04,0x00,0x00,0x00,0x00,0x04,0x04,0x00,0x00,0x07,0x6F,0x05,0x08,0x03,0x3A,0x18,0xCF,0x22,0x0D,0x3D,0xE6,0xA6,0x38,0xF8})))); + + verify(decoder.decode(null, null, ChannelBuffers.wrappedBuffer(ChannelBufferTools.convertArray( + new int[] {0xF8,0x01,0x01,0x03,0x57,0x85,0x20,0x34,0x57,0x28,0x94,0x95,0xD6,0x02,0x35,0x01,0x0E,0x01,0x61,0x75,0xA5,0x06,0xC2,0xC8,0x38,0x00,0x00,0x00,0x00,0x00,0x64})))); + + } + +} |