diff options
7 files changed, 96 insertions, 6 deletions
diff --git a/src/org/traccar/protocol/KhdProtocol.java b/src/org/traccar/protocol/KhdProtocol.java index be89df580..a2edbfd5e 100644 --- a/src/org/traccar/protocol/KhdProtocol.java +++ b/src/org/traccar/protocol/KhdProtocol.java @@ -20,6 +20,7 @@ import org.jboss.netty.channel.ChannelPipeline; import org.jboss.netty.handler.codec.frame.LengthFieldBasedFrameDecoder; import org.traccar.BaseProtocol; import org.traccar.TrackerServer; +import org.traccar.model.Command; import java.util.List; @@ -27,6 +28,9 @@ public class KhdProtocol extends BaseProtocol { public KhdProtocol() { super("khd"); + setSupportedCommands( + Command.TYPE_ENGINE_STOP, + Command.TYPE_ENGINE_RESUME); } @Override @@ -34,8 +38,9 @@ public class KhdProtocol extends BaseProtocol { serverList.add(new TrackerServer(new ServerBootstrap(), this.getName()) { @Override protected void addSpecificHandlers(ChannelPipeline pipeline) { - pipeline.addLast("frameDecoder", new LengthFieldBasedFrameDecoder(256, 3, 2)); + pipeline.addLast("frameDecoder", new LengthFieldBasedFrameDecoder(512, 3, 2)); pipeline.addLast("objectDecoder", new KhdProtocolDecoder(KhdProtocol.this)); + pipeline.addLast("objectEncoder", new KhdProtocolEncoder()); } }); } diff --git a/src/org/traccar/protocol/KhdProtocolDecoder.java b/src/org/traccar/protocol/KhdProtocolDecoder.java index bff7568a7..f98f3e963 100644 --- a/src/org/traccar/protocol/KhdProtocolDecoder.java +++ b/src/org/traccar/protocol/KhdProtocolDecoder.java @@ -130,14 +130,14 @@ public class KhdProtocolDecoder extends BaseProtocolDecoder { buf.skipBytes(4); // serial number buf.readByte(); // reserved - ChannelBuffer response = ChannelBuffers.directBuffer(10); + ChannelBuffer response = ChannelBuffers.dynamicBuffer(); response.writeByte(0x29); response.writeByte(0x29); // header response.writeByte(MSG_CONFIRMATION); response.writeShort(5); // size response.writeByte(buf.readUnsignedByte()); response.writeByte(type); response.writeByte(0); // reserved - response.writeByte(Crc.xorChecksum(response.toByteBuffer(0, 8))); + response.writeByte(Crc.xorChecksum(response.toByteBuffer())); response.writeByte(0x0D); // ending channel.write(response); diff --git a/src/org/traccar/protocol/KhdProtocolEncoder.java b/src/org/traccar/protocol/KhdProtocolEncoder.java new file mode 100644 index 000000000..20d8eb40a --- /dev/null +++ b/src/org/traccar/protocol/KhdProtocolEncoder.java @@ -0,0 +1,60 @@ +/* + * 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.traccar.BaseProtocolEncoder; +import org.traccar.helper.Crc; +import org.traccar.model.Command; + +public class KhdProtocolEncoder extends BaseProtocolEncoder { + + private static final int MSG_CUT_OIL = 0x39; + private static final int MSG_RESUME_OIL = 0x38; + + private ChannelBuffer encodeCommand(int command) { + + ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); + + buf.writeByte(0x29); + buf.writeByte(0x29); + + buf.writeByte(command); + buf.writeShort(6); // size + + buf.writeInt(0); // terminal id + + buf.writeByte(Crc.xorChecksum(buf.toByteBuffer())); + buf.writeByte(0x0D); // ending + + return buf; + } + + @Override + protected Object encodeCommand(Command command) { + + switch (command.getType()) { + case Command.TYPE_ENGINE_STOP: + return encodeCommand(MSG_CUT_OIL); + case Command.TYPE_ENGINE_RESUME: + return encodeCommand(MSG_RESUME_OIL); + } + + return null; + } + +} diff --git a/test/org/traccar/protocol/Gps103ProtocolEncoderTest.java b/test/org/traccar/protocol/Gps103ProtocolEncoderTest.java index bf8c06232..019c92523 100644 --- a/test/org/traccar/protocol/Gps103ProtocolEncoderTest.java +++ b/test/org/traccar/protocol/Gps103ProtocolEncoderTest.java @@ -7,7 +7,7 @@ import org.traccar.model.Command; public class Gps103ProtocolEncoderTest { @Test - public void testDecode() throws Exception { + public void testEncode() throws Exception { Gps103ProtocolEncoder encoder = new Gps103ProtocolEncoder(); diff --git a/test/org/traccar/protocol/Gt06ProtocolEncoderTest.java b/test/org/traccar/protocol/Gt06ProtocolEncoderTest.java index a24045584..0a79bfca7 100644 --- a/test/org/traccar/protocol/Gt06ProtocolEncoderTest.java +++ b/test/org/traccar/protocol/Gt06ProtocolEncoderTest.java @@ -9,7 +9,7 @@ import org.traccar.model.Command; public class Gt06ProtocolEncoderTest { @Test - public void testDecode() throws Exception { + public void testEncode() throws Exception { Gt06ProtocolEncoder encoder = new Gt06ProtocolEncoder(); diff --git a/test/org/traccar/protocol/KhdProtocolEncoderTest.java b/test/org/traccar/protocol/KhdProtocolEncoderTest.java new file mode 100644 index 000000000..ec620aa60 --- /dev/null +++ b/test/org/traccar/protocol/KhdProtocolEncoderTest.java @@ -0,0 +1,25 @@ +package org.traccar.protocol; + +import org.jboss.netty.buffer.ChannelBuffers; +import org.junit.Assert; +import org.junit.Test; +import org.traccar.helper.ChannelBufferTools; +import org.traccar.model.Command; + +public class KhdProtocolEncoderTest { + + @Test + public void testEncode() throws Exception { + + KhdProtocolEncoder encoder = new KhdProtocolEncoder(); + + Command command = new Command(); + command.setDeviceId(1); + command.setType(Command.TYPE_ENGINE_STOP); + + Assert.assertEquals(encoder.encodeCommand(command), ChannelBuffers.wrappedBuffer(ChannelBufferTools.convertHexString( + "2929390006000000003F0D"))); + + } + +} diff --git a/test/org/traccar/protocol/TotemProtocolEncoderTest.java b/test/org/traccar/protocol/TotemProtocolEncoderTest.java index 840165070..e228ca5a5 100644 --- a/test/org/traccar/protocol/TotemProtocolEncoderTest.java +++ b/test/org/traccar/protocol/TotemProtocolEncoderTest.java @@ -21,7 +21,7 @@ import org.traccar.model.Command; public class TotemProtocolEncoderTest { @Test - public void testDecode() throws Exception { + public void testEncode() throws Exception { TotemProtocolEncoder encoder = new TotemProtocolEncoder(); |