From 387d798a8fc66ec6792851a199fc83c4636fc6d8 Mon Sep 17 00:00:00 2001 From: Abyss777 Date: Tue, 5 Jul 2016 17:16:06 +0500 Subject: Granit protocol implementation --- .../traccar/protocol/GranitProtocolEncoder.java | 57 ++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 src/org/traccar/protocol/GranitProtocolEncoder.java (limited to 'src/org/traccar/protocol/GranitProtocolEncoder.java') diff --git a/src/org/traccar/protocol/GranitProtocolEncoder.java b/src/org/traccar/protocol/GranitProtocolEncoder.java new file mode 100644 index 000000000..2f9e0aa10 --- /dev/null +++ b/src/org/traccar/protocol/GranitProtocolEncoder.java @@ -0,0 +1,57 @@ +/* + * Copyright 2016 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 java.nio.ByteOrder; +import java.nio.charset.StandardCharsets; + +import org.jboss.netty.buffer.ChannelBuffer; +import org.jboss.netty.buffer.ChannelBuffers; +import org.traccar.BaseProtocolEncoder; +import org.traccar.helper.Log; +import org.traccar.model.Command; + +public class GranitProtocolEncoder extends BaseProtocolEncoder { + @Override + protected Object encodeCommand(Command command) { + + ChannelBuffer commandString; + + switch (command.getType()) { + case Command.TYPE_IDENTIFICATION: + commandString = ChannelBuffers.directBuffer(ByteOrder.LITTLE_ENDIAN, 12); + commandString.writeBytes("BB+IDNT".getBytes(StandardCharsets.US_ASCII)); + GranitProtocolDecoder.appendChecksum(commandString, 7); + return commandString; + case Command.TYPE_REBOOT_DEVICE: + commandString = ChannelBuffers.directBuffer(ByteOrder.LITTLE_ENDIAN, 13); + commandString.writeBytes("BB+RESET".getBytes(StandardCharsets.US_ASCII)); + GranitProtocolDecoder.appendChecksum(commandString, 8); + return commandString; + case Command.TYPE_POSITION_SINGLE: + commandString = ChannelBuffers.directBuffer(ByteOrder.LITTLE_ENDIAN, 12); + commandString.writeBytes("BB+RRCD".getBytes(StandardCharsets.US_ASCII)); + GranitProtocolDecoder.appendChecksum(commandString, 7); + return commandString; + default: + Log.warning(new UnsupportedOperationException(command.getType())); + break; + } + + return null; + } + +} -- cgit v1.2.3 From 801f9e25448be8a3b27c3b56798525b2fff27633 Mon Sep 17 00:00:00 2001 From: Abyss777 Date: Wed, 6 Jul 2016 15:43:37 +0500 Subject: Use dynamicBuffer and some hardcoded lengths. --- .../traccar/protocol/GranitProtocolDecoder.java | 4 +-- .../traccar/protocol/GranitProtocolEncoder.java | 30 ++++++++++------------ 2 files changed, 16 insertions(+), 18 deletions(-) (limited to 'src/org/traccar/protocol/GranitProtocolEncoder.java') diff --git a/src/org/traccar/protocol/GranitProtocolDecoder.java b/src/org/traccar/protocol/GranitProtocolDecoder.java index 6f334d3c5..c919b3d65 100644 --- a/src/org/traccar/protocol/GranitProtocolDecoder.java +++ b/src/org/traccar/protocol/GranitProtocolDecoder.java @@ -47,7 +47,7 @@ public class GranitProtocolDecoder extends BaseProtocolDecoder { } private static void sendResponseCurrent(Channel channel, int deviceId, long time) { - ChannelBuffer response = ChannelBuffers.directBuffer(ByteOrder.LITTLE_ENDIAN, 21); + ChannelBuffer response = ChannelBuffers.dynamicBuffer(ByteOrder.LITTLE_ENDIAN, 0); response.writeBytes("BB+UGRC~".getBytes(StandardCharsets.US_ASCII)); response.writeShort(6); //binary length response.writeInt((int) time); @@ -57,7 +57,7 @@ public class GranitProtocolDecoder extends BaseProtocolDecoder { } private static void sendResponseArchive(Channel channel, int deviceId, int packNum) { - ChannelBuffer response = ChannelBuffers.directBuffer(ByteOrder.LITTLE_ENDIAN, 19); + ChannelBuffer response = ChannelBuffers.dynamicBuffer(ByteOrder.LITTLE_ENDIAN, 0); response.writeBytes("BB+ARCF~".getBytes(StandardCharsets.US_ASCII)); response.writeShort(4); //binary length response.writeShort(packNum); diff --git a/src/org/traccar/protocol/GranitProtocolEncoder.java b/src/org/traccar/protocol/GranitProtocolEncoder.java index 2f9e0aa10..961f183f5 100644 --- a/src/org/traccar/protocol/GranitProtocolEncoder.java +++ b/src/org/traccar/protocol/GranitProtocolEncoder.java @@ -15,7 +15,6 @@ */ package org.traccar.protocol; -import java.nio.ByteOrder; import java.nio.charset.StandardCharsets; import org.jboss.netty.buffer.ChannelBuffer; @@ -28,29 +27,28 @@ public class GranitProtocolEncoder extends BaseProtocolEncoder { @Override protected Object encodeCommand(Command command) { - ChannelBuffer commandString; + String commandString = ""; switch (command.getType()) { case Command.TYPE_IDENTIFICATION: - commandString = ChannelBuffers.directBuffer(ByteOrder.LITTLE_ENDIAN, 12); - commandString.writeBytes("BB+IDNT".getBytes(StandardCharsets.US_ASCII)); - GranitProtocolDecoder.appendChecksum(commandString, 7); - return commandString; + commandString = "BB+IDNT"; + break; case Command.TYPE_REBOOT_DEVICE: - commandString = ChannelBuffers.directBuffer(ByteOrder.LITTLE_ENDIAN, 13); - commandString.writeBytes("BB+RESET".getBytes(StandardCharsets.US_ASCII)); - GranitProtocolDecoder.appendChecksum(commandString, 8); - return commandString; + commandString = "BB+RESET"; + break; case Command.TYPE_POSITION_SINGLE: - commandString = ChannelBuffers.directBuffer(ByteOrder.LITTLE_ENDIAN, 12); - commandString.writeBytes("BB+RRCD".getBytes(StandardCharsets.US_ASCII)); - GranitProtocolDecoder.appendChecksum(commandString, 7); - return commandString; + commandString = "BB+RRCD"; + break; default: Log.warning(new UnsupportedOperationException(command.getType())); - break; + return null; + } + if (!commandString.isEmpty()) { + ChannelBuffer commandBuf = ChannelBuffers.dynamicBuffer(); + commandBuf.writeBytes(commandString.getBytes(StandardCharsets.US_ASCII)); + GranitProtocolDecoder.appendChecksum(commandBuf, commandString.length()); + return commandBuf; } - return null; } -- cgit v1.2.3