aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/org/traccar/protocol/NoranProtocol.java8
-rw-r--r--src/org/traccar/protocol/NoranProtocolDecoder.java1
-rw-r--r--src/org/traccar/protocol/NoranProtocolEncoder.java71
-rw-r--r--test/org/traccar/protocol/NoranProtocolEncoderTest.java23
4 files changed, 103 insertions, 0 deletions
diff --git a/src/org/traccar/protocol/NoranProtocol.java b/src/org/traccar/protocol/NoranProtocol.java
index 6c16fe6bc..6bc15296e 100644
--- a/src/org/traccar/protocol/NoranProtocol.java
+++ b/src/org/traccar/protocol/NoranProtocol.java
@@ -19,6 +19,7 @@ import org.jboss.netty.bootstrap.ConnectionlessBootstrap;
import org.jboss.netty.channel.ChannelPipeline;
import org.traccar.BaseProtocol;
import org.traccar.TrackerServer;
+import org.traccar.model.Command;
import java.nio.ByteOrder;
import java.util.List;
@@ -27,6 +28,12 @@ public class NoranProtocol extends BaseProtocol {
public NoranProtocol() {
super("noran");
+ setSupportedCommands(
+ Command.TYPE_POSITION_SINGLE,
+ Command.TYPE_POSITION_PERIODIC,
+ Command.TYPE_POSITION_STOP,
+ Command.TYPE_ENGINE_STOP,
+ Command.TYPE_ENGINE_RESUME);
}
@Override
@@ -34,6 +41,7 @@ public class NoranProtocol extends BaseProtocol {
TrackerServer server = new TrackerServer(new ConnectionlessBootstrap(), this.getName()) {
@Override
protected void addSpecificHandlers(ChannelPipeline pipeline) {
+ pipeline.addLast("objectEncoder", new NoranProtocolEncoder());
pipeline.addLast("objectDecoder", new NoranProtocolDecoder(NoranProtocol.this));
}
};
diff --git a/src/org/traccar/protocol/NoranProtocolDecoder.java b/src/org/traccar/protocol/NoranProtocolDecoder.java
index 2140317e7..ff1bc2549 100644
--- a/src/org/traccar/protocol/NoranProtocolDecoder.java
+++ b/src/org/traccar/protocol/NoranProtocolDecoder.java
@@ -38,6 +38,7 @@ public class NoranProtocolDecoder extends BaseProtocolDecoder {
public static final int MSG_UPLOAD_POSITION = 0x0008;
public static final int MSG_UPLOAD_POSITION_NEW = 0x0032;
+ public static final int MSG_CONTROL = 0x0002;
public static final int MSG_CONTROL_RESPONSE = 0x8009;
public static final int MSG_ALARM = 0x0003;
public static final int MSG_SHAKE_HAND = 0x0000;
diff --git a/src/org/traccar/protocol/NoranProtocolEncoder.java b/src/org/traccar/protocol/NoranProtocolEncoder.java
new file mode 100644
index 000000000..6a5bfdcb2
--- /dev/null
+++ b/src/org/traccar/protocol/NoranProtocolEncoder.java
@@ -0,0 +1,71 @@
+/*
+ * 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 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;
+
+import java.nio.ByteOrder;
+import java.nio.charset.Charset;
+
+public class NoranProtocolEncoder extends BaseProtocolEncoder {
+
+ private ChannelBuffer encodeContent(String content) {
+
+ ChannelBuffer buf = ChannelBuffers.buffer(ByteOrder.LITTLE_ENDIAN, 12 + 56);
+
+ buf.writeBytes(
+ ChannelBuffers.copiedBuffer(ByteOrder.LITTLE_ENDIAN, "\r\n*KW", Charset.defaultCharset()));
+ buf.writeByte(0);
+ buf.writeShort(buf.capacity());
+ buf.writeShort(NoranProtocolDecoder.MSG_CONTROL);
+ buf.writeInt(0); // gis ip
+ buf.writeShort(0); // gis port
+ buf.writeBytes(content.getBytes(Charset.defaultCharset()));
+ buf.writerIndex(buf.writerIndex() + 50 - content.length());
+ buf.writeBytes(
+ ChannelBuffers.copiedBuffer(ByteOrder.LITTLE_ENDIAN, "\r\n", Charset.defaultCharset()));
+
+ return buf;
+ }
+
+ @Override
+ protected Object encodeCommand(Command command) {
+
+ switch (command.getType()) {
+ case Command.TYPE_POSITION_SINGLE:
+ return encodeContent("*KW,000,000,000000#");
+ case Command.TYPE_POSITION_PERIODIC:
+ int interval = ((Number) command.getAttributes().get(Command.KEY_FREQUENCY)).intValue();
+ return encodeContent("*KW,000,002,000000," + interval + "#");
+ case Command.TYPE_POSITION_STOP:
+ return encodeContent("*KW,000,002,000000,0#");
+ case Command.TYPE_ENGINE_STOP:
+ return encodeContent("*KW,000,007,000000,0#");
+ case Command.TYPE_ENGINE_RESUME:
+ return encodeContent("*KW,000,007,000000,1#");
+ default:
+ Log.warning(new UnsupportedOperationException(command.getType()));
+ break;
+ }
+
+ return null;
+ }
+
+}
diff --git a/test/org/traccar/protocol/NoranProtocolEncoderTest.java b/test/org/traccar/protocol/NoranProtocolEncoderTest.java
new file mode 100644
index 000000000..38599e0ba
--- /dev/null
+++ b/test/org/traccar/protocol/NoranProtocolEncoderTest.java
@@ -0,0 +1,23 @@
+package org.traccar.protocol;
+
+import org.junit.Test;
+import org.traccar.ProtocolTest;
+import org.traccar.model.Command;
+
+public class NoranProtocolEncoderTest extends ProtocolTest {
+
+ @Test
+ public void testEncode() throws Exception {
+
+ NoranProtocolEncoder encoder = new NoranProtocolEncoder();
+
+ Command command = new Command();
+ command.setDeviceId(1);
+ command.setType(Command.TYPE_ENGINE_STOP);
+
+ verifyCommand(encoder, command, binary(
+ "0d0a2a4b5700440002000000000000002a4b572c3030302c3030372c3030303030302c302300000000000000000000000000000000000000000000000000000000000d0a"));
+
+ }
+
+}