mirror of
https://github.com/traccar/traccar.git
synced 2025-01-09 04:07:38 +08:00
Start MXT protocol implementation
This commit is contained in:
Anton Tananaev
parent
ec7b47684c
commit
67e2c8f8e0
@ -294,5 +294,6 @@
|
||||
<entry key='tytan.port'>5084</entry>
|
||||
<entry key='avl301.port'>5085</entry>
|
||||
<entry key='castel.port'>5086</entry>
|
||||
<entry key='mxt.port'>5087</entry>
|
||||
|
||||
</properties>
|
||||
|
||||
@ -30,114 +30,7 @@ import org.jboss.netty.handler.codec.http.HttpRequestDecoder;
|
||||
import org.jboss.netty.handler.codec.http.HttpResponseEncoder;
|
||||
import org.jboss.netty.handler.codec.string.StringDecoder;
|
||||
import org.jboss.netty.handler.codec.string.StringEncoder;
|
||||
import org.traccar.protocol.ApelProtocolDecoder;
|
||||
import org.traccar.protocol.AplicomFrameDecoder;
|
||||
import org.traccar.protocol.AplicomProtocolDecoder;
|
||||
import org.traccar.protocol.Ardi01ProtocolDecoder;
|
||||
import org.traccar.protocol.AtrackFrameDecoder;
|
||||
import org.traccar.protocol.AtrackProtocolDecoder;
|
||||
import org.traccar.protocol.AutoFon45FrameDecoder;
|
||||
import org.traccar.protocol.AutoFon45ProtocolDecoder;
|
||||
import org.traccar.protocol.AutoFonFrameDecoder;
|
||||
import org.traccar.protocol.AutoFonProtocolDecoder;
|
||||
import org.traccar.protocol.Avl301ProtocolDecoder;
|
||||
import org.traccar.protocol.BceFrameDecoder;
|
||||
import org.traccar.protocol.BceProtocolDecoder;
|
||||
import org.traccar.protocol.BoxProtocolDecoder;
|
||||
import org.traccar.protocol.CalAmpProtocolDecoder;
|
||||
import org.traccar.protocol.CarTrackProtocolDecoder;
|
||||
import org.traccar.protocol.CarscopProtocolDecoder;
|
||||
import org.traccar.protocol.CastelProtocolDecoder;
|
||||
import org.traccar.protocol.CellocatorFrameDecoder;
|
||||
import org.traccar.protocol.CellocatorProtocolDecoder;
|
||||
import org.traccar.protocol.EasyTrackProtocolDecoder;
|
||||
import org.traccar.protocol.EelinkProtocolDecoder;
|
||||
import org.traccar.protocol.EnforaProtocolDecoder;
|
||||
import org.traccar.protocol.Ev603ProtocolDecoder;
|
||||
import org.traccar.protocol.FreedomProtocolDecoder;
|
||||
import org.traccar.protocol.GalileoFrameDecoder;
|
||||
import org.traccar.protocol.GalileoProtocolDecoder;
|
||||
import org.traccar.protocol.GatorProtocolDecoder;
|
||||
import org.traccar.protocol.Gl100ProtocolDecoder;
|
||||
import org.traccar.protocol.Gl200ProtocolDecoder;
|
||||
import org.traccar.protocol.GlobalSatProtocolDecoder;
|
||||
import org.traccar.protocol.GoSafeProtocolDecoder;
|
||||
import org.traccar.protocol.GotopProtocolDecoder;
|
||||
import org.traccar.protocol.Gps103ProtocolDecoder;
|
||||
import org.traccar.protocol.GpsGateProtocolDecoder;
|
||||
import org.traccar.protocol.Gt02ProtocolDecoder;
|
||||
import org.traccar.protocol.Gt06FrameDecoder;
|
||||
import org.traccar.protocol.Gt06ProtocolDecoder;
|
||||
import org.traccar.protocol.H02FrameDecoder;
|
||||
import org.traccar.protocol.H02ProtocolDecoder;
|
||||
import org.traccar.protocol.HaicomProtocolDecoder;
|
||||
import org.traccar.protocol.IntellitracFrameDecoder;
|
||||
import org.traccar.protocol.IntellitracProtocolDecoder;
|
||||
import org.traccar.protocol.Jt600FrameDecoder;
|
||||
import org.traccar.protocol.Jt600ProtocolDecoder;
|
||||
import org.traccar.protocol.KhdProtocolDecoder;
|
||||
import org.traccar.protocol.LaipacProtocolDecoder;
|
||||
import org.traccar.protocol.M2mProtocolDecoder;
|
||||
import org.traccar.protocol.ManPowerProtocolDecoder;
|
||||
import org.traccar.protocol.MaxonProtocolDecoder;
|
||||
import org.traccar.protocol.MegastekProtocolDecoder;
|
||||
import org.traccar.protocol.MeiligaoFrameDecoder;
|
||||
import org.traccar.protocol.MeiligaoProtocolDecoder;
|
||||
import org.traccar.protocol.MeitrackFrameDecoder;
|
||||
import org.traccar.protocol.MeitrackProtocolDecoder;
|
||||
import org.traccar.protocol.MiniFinderProtocolDecoder;
|
||||
import org.traccar.protocol.Mta6ProtocolDecoder;
|
||||
import org.traccar.protocol.MtxProtocolDecoder;
|
||||
import org.traccar.protocol.NavigilFrameDecoder;
|
||||
import org.traccar.protocol.NavigilProtocolDecoder;
|
||||
import org.traccar.protocol.NavisProtocolDecoder;
|
||||
import org.traccar.protocol.NoranProtocolDecoder;
|
||||
import org.traccar.protocol.OrionFrameDecoder;
|
||||
import org.traccar.protocol.OrionProtocolDecoder;
|
||||
import org.traccar.protocol.OsmAndProtocolDecoder;
|
||||
import org.traccar.protocol.PiligrimProtocolDecoder;
|
||||
import org.traccar.protocol.ProgressProtocolDecoder;
|
||||
import org.traccar.protocol.Pt3000ProtocolDecoder;
|
||||
import org.traccar.protocol.Pt502FrameDecoder;
|
||||
import org.traccar.protocol.Pt502ProtocolDecoder;
|
||||
import org.traccar.protocol.RitiProtocolDecoder;
|
||||
import org.traccar.protocol.RuptelaProtocolDecoder;
|
||||
import org.traccar.protocol.SanavProtocolDecoder;
|
||||
import org.traccar.protocol.SkypatrolProtocolDecoder;
|
||||
import org.traccar.protocol.Stl060FrameDecoder;
|
||||
import org.traccar.protocol.Stl060ProtocolDecoder;
|
||||
import org.traccar.protocol.SuntechProtocolDecoder;
|
||||
import org.traccar.protocol.SyrusProtocolDecoder;
|
||||
import org.traccar.protocol.T55ProtocolDecoder;
|
||||
import org.traccar.protocol.TelikProtocolDecoder;
|
||||
import org.traccar.protocol.TeltonikaFrameDecoder;
|
||||
import org.traccar.protocol.TeltonikaProtocolDecoder;
|
||||
import org.traccar.protocol.Tk102ProtocolDecoder;
|
||||
import org.traccar.protocol.Tk103ProtocolDecoder;
|
||||
import org.traccar.protocol.Tlt2hProtocolDecoder;
|
||||
import org.traccar.protocol.TopflytechProtocolDecoder;
|
||||
import org.traccar.protocol.TotemFrameDecoder;
|
||||
import org.traccar.protocol.TotemProtocolDecoder;
|
||||
import org.traccar.protocol.Tr20ProtocolDecoder;
|
||||
import org.traccar.protocol.Tr900ProtocolDecoder;
|
||||
import org.traccar.protocol.TrackboxProtocolDecoder;
|
||||
import org.traccar.protocol.TramigoFrameDecoder;
|
||||
import org.traccar.protocol.TramigoProtocolDecoder;
|
||||
import org.traccar.protocol.TytanProtocolDecoder;
|
||||
import org.traccar.protocol.UlbotechFrameDecoder;
|
||||
import org.traccar.protocol.UlbotechProtocolDecoder;
|
||||
import org.traccar.protocol.V680ProtocolDecoder;
|
||||
import org.traccar.protocol.VisiontekProtocolDecoder;
|
||||
import org.traccar.protocol.WialonProtocolDecoder;
|
||||
import org.traccar.protocol.WondexFrameDecoder;
|
||||
import org.traccar.protocol.WondexProtocolDecoder;
|
||||
import org.traccar.protocol.Xexun2ProtocolDecoder;
|
||||
import org.traccar.protocol.XexunFrameDecoder;
|
||||
import org.traccar.protocol.XexunProtocolDecoder;
|
||||
import org.traccar.protocol.XirgoProtocolDecoder;
|
||||
import org.traccar.protocol.Xt013ProtocolDecoder;
|
||||
import org.traccar.protocol.Xt7ProtocolDecoder;
|
||||
import org.traccar.protocol.YwtProtocolDecoder;
|
||||
import org.traccar.protocol.*;
|
||||
|
||||
|
||||
public class ServerManager {
|
||||
@ -232,6 +125,7 @@ public class ServerManager {
|
||||
initTytanServer("tytan");
|
||||
initAvl301Server("avl301");
|
||||
initCastelServer("castel");
|
||||
initMxtServer("mxt");
|
||||
|
||||
initProtocolDetector();
|
||||
}
|
||||
@ -1461,4 +1355,18 @@ public class ServerManager {
|
||||
}
|
||||
}
|
||||
|
||||
private void initMxtServer(final String protocol) throws SQLException {
|
||||
if (isProtocolEnabled(protocol)) {
|
||||
TrackerServer server = new TrackerServer(new ServerBootstrap(), protocol) {
|
||||
@Override
|
||||
protected void addSpecificHandlers(ChannelPipeline pipeline) {
|
||||
pipeline.addLast("frameDecoder", new MxtFrameDecoder());
|
||||
pipeline.addLast("objectDecoder", new MxtProtocolDecoder(protocol));
|
||||
}
|
||||
};
|
||||
server.setEndianness(ByteOrder.LITTLE_ENDIAN);
|
||||
serverList.add(server);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
55
src/org/traccar/protocol/MxtFrameDecoder.java
Normal file
55
src/org/traccar/protocol/MxtFrameDecoder.java
Normal file
@ -0,0 +1,55 @@
|
||||
/*
|
||||
* 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.buffer.ChannelBuffer;
|
||||
import org.jboss.netty.buffer.ChannelBuffers;
|
||||
import org.jboss.netty.channel.Channel;
|
||||
import org.jboss.netty.channel.ChannelHandlerContext;
|
||||
import org.jboss.netty.handler.codec.frame.FrameDecoder;
|
||||
|
||||
public class MxtFrameDecoder extends FrameDecoder {
|
||||
|
||||
@Override
|
||||
protected Object decode(
|
||||
ChannelHandlerContext ctx,
|
||||
Channel channel,
|
||||
ChannelBuffer buf) throws Exception {
|
||||
|
||||
if (buf.readableBytes() < 2) {
|
||||
return null;
|
||||
}
|
||||
|
||||
int index = buf.indexOf(buf.readerIndex() + 1, buf.writerIndex(), (byte) 0x04);
|
||||
if (index != -1) {
|
||||
ChannelBuffer result = ChannelBuffers.buffer(index + 1 - buf.readerIndex());
|
||||
|
||||
while (buf.readerIndex() <= index) {
|
||||
int b = buf.readUnsignedByte();
|
||||
if (b == 0x10) {
|
||||
result.writeByte(buf.readUnsignedByte() - 0x20);
|
||||
} else {
|
||||
result.writeByte(b);
|
||||
}
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
}
|
||||
93
src/org/traccar/protocol/MxtProtocolDecoder.java
Normal file
93
src/org/traccar/protocol/MxtProtocolDecoder.java
Normal file
@ -0,0 +1,93 @@
|
||||
/*
|
||||
* 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.buffer.ChannelBuffer;
|
||||
import org.jboss.netty.channel.Channel;
|
||||
import org.jboss.netty.channel.ChannelHandlerContext;
|
||||
import org.traccar.BaseProtocolDecoder;
|
||||
import org.traccar.helper.ChannelBufferTools;
|
||||
import org.traccar.helper.UnitsConverter;
|
||||
import org.traccar.model.Event;
|
||||
import org.traccar.model.Position;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
public class MxtProtocolDecoder extends BaseProtocolDecoder {
|
||||
|
||||
public MxtProtocolDecoder(String protocol) {
|
||||
super(protocol);
|
||||
}
|
||||
|
||||
@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();
|
||||
position.setProtocol(getProtocol());
|
||||
|
||||
// Get device id
|
||||
String imei = ChannelBufferTools.readHexString(buf, 16).substring(1);
|
||||
if (!identify(imei)) {
|
||||
return null;
|
||||
}
|
||||
position.setDeviceId(getDeviceId());
|
||||
|
||||
// Time
|
||||
long seconds = buf.readUnsignedInt() & 0x7fffffffl;
|
||||
seconds += 946684800l; // 2000-01-01 00:00
|
||||
position.setTime(new Date(seconds * 1000));
|
||||
|
||||
boolean hasLocation = false;
|
||||
|
||||
while (buf.readableBytes() > 3) {
|
||||
|
||||
short type = buf.readUnsignedByte();
|
||||
short length = buf.readUnsignedByte();
|
||||
|
||||
switch (type) {
|
||||
|
||||
case DATA_GPS:
|
||||
hasLocation = true;
|
||||
position.setValid(true);
|
||||
position.setLatitude(buf.readInt() / 1000000.0);
|
||||
position.setLongitude(buf.readInt() / 1000000.0);
|
||||
position.setSpeed(UnitsConverter.knotsFromKph(buf.readUnsignedShort()));
|
||||
position.setCourse(buf.readUnsignedShort());
|
||||
position.set(Event.KEY_HDOP, buf.readUnsignedShort());
|
||||
break;
|
||||
|
||||
default:
|
||||
buf.skipBytes(length);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (hasLocation) {
|
||||
return position;
|
||||
}*/
|
||||
return null;
|
||||
}
|
||||
|
||||
}
|
||||
39
test/org/traccar/protocol/MxtProtocolDecoderTest.java
Normal file
39
test/org/traccar/protocol/MxtProtocolDecoderTest.java
Normal file
@ -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 MxtProtocolDecoderTest extends ProtocolDecoderTest {
|
||||
|
||||
@Test
|
||||
public void testDecode() throws Exception {
|
||||
|
||||
MxtProtocolDecoder decoder = new MxtProtocolDecoder(null);
|
||||
|
||||
/*verify(decoder.decode(null, null, ChannelBuffers.wrappedBuffer(ByteOrder.LITTLE_ENDIAN, ChannelBufferTools.convertHexString(
|
||||
"01a631e3f97e00087cf40a98151c2cc46898fee0ce3afd1021001030c0000006102116072e003829bb00000036102100001024000000062b0000f42730004b06a6384b4304"))));
|
||||
|
||||
verify(decoder.decode(null, null, ChannelBuffers.wrappedBuffer(ByteOrder.LITTLE_ENDIAN, ChannelBufferTools.convertHexString(
|
||||
"01a631e3f97e00087cfa0af3151c2c126798febace3afd1021801030c0000006102122082f003e29bb00000037102100001024000000ab2f0000f42730004b060000488c04"))));
|
||||
|
||||
verify(decoder.decode(null, null, ChannelBuffers.wrappedBuffer(ByteOrder.LITTLE_ENDIAN, ChannelBufferTools.convertHexString(
|
||||
"01a63118787d00086468457a466a2bc26a97feac8a3afd10212010308000000000001fe1053d291024000000922f0000f4271021007b17553599bb04"))));
|
||||
|
||||
verify(decoder.decode(null, null, ChannelBuffers.wrappedBuffer(ByteOrder.LITTLE_ENDIAN, ChannelBufferTools.convertHexString(
|
||||
"01a63118787d0008648645ec486a2bc26a97feac8a3afd1021001030c0000000001419eb05372b1024000000982a0000f4271021007b17000010308c04"))));
|
||||
|
||||
verify(decoder.decode(null, null, ChannelBuffers.wrappedBuffer(ByteOrder.LITTLE_ENDIAN, ChannelBufferTools.convertHexString(
|
||||
"01a631e3f97e00087cfe0a4b161c2c126798febace3afd1021801030800000071021240731003e2abb00000038102100001024000000c12f0000f42730004b06a638633104"))));
|
||||
|
||||
verify(decoder.decode(null, null, ChannelBuffers.wrappedBuffer(ByteOrder.LITTLE_ENDIAN, ChannelBufferTools.convertHexString(
|
||||
"01a63118787d0008648645ec486a2bc26a97feac8a3afd1021001030c0000000001419eb05372b1024000000982a0000f4271021007b17000010308c04"))));*/
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user