aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAbyss777 <abyss@fox5.ru>2016-05-16 10:43:03 +0500
committerAbyss777 <abyss@fox5.ru>2016-05-16 10:43:03 +0500
commit79fd341d2ee1d6ff2ce9139e84dab0ad6820a1ec (patch)
treec69a0d5c6f51ed10dbf85e8ae15e94c1c3c373f3
parentf5f8e079b27d44012dc74d586a1f4ddb9b06db33 (diff)
downloadtrackermap-server-79fd341d2ee1d6ff2ce9139e84dab0ad6820a1ec.tar.gz
trackermap-server-79fd341d2ee1d6ff2ce9139e84dab0ad6820a1ec.tar.bz2
trackermap-server-79fd341d2ee1d6ff2ce9139e84dab0ad6820a1ec.zip
Implemented few commands for Wondex protocol.
-rw-r--r--src/org/traccar/protocol/WondexProtocol.java10
-rw-r--r--src/org/traccar/protocol/WondexProtocolEncoder.java29
-rw-r--r--test/org/traccar/protocol/WondexProtocolEncoderTest.java23
3 files changed, 62 insertions, 0 deletions
diff --git a/src/org/traccar/protocol/WondexProtocol.java b/src/org/traccar/protocol/WondexProtocol.java
index b07f84909..574b36e6d 100644
--- a/src/org/traccar/protocol/WondexProtocol.java
+++ b/src/org/traccar/protocol/WondexProtocol.java
@@ -19,8 +19,10 @@ import org.jboss.netty.bootstrap.ConnectionlessBootstrap;
import org.jboss.netty.bootstrap.ServerBootstrap;
import org.jboss.netty.channel.ChannelPipeline;
import org.jboss.netty.handler.codec.string.StringDecoder;
+import org.jboss.netty.handler.codec.string.StringEncoder;
import org.traccar.BaseProtocol;
import org.traccar.TrackerServer;
+import org.traccar.model.Command;
import java.util.List;
@@ -28,6 +30,10 @@ public class WondexProtocol extends BaseProtocol {
public WondexProtocol() {
super("wondex");
+ setSupportedCommands(
+ Command.TYPE_REBOOT_DEVICE,
+ Command.TYPE_POSITION_SINGLE,
+ Command.TYPE_CUSTOM);
}
@Override
@@ -36,14 +42,18 @@ public class WondexProtocol extends BaseProtocol {
@Override
protected void addSpecificHandlers(ChannelPipeline pipeline) {
pipeline.addLast("frameDecoder", new WondexFrameDecoder());
+ pipeline.addLast("stringEncoder", new StringEncoder());
pipeline.addLast("stringDecoder", new StringDecoder());
+ pipeline.addLast("objectEncoder", new WondexProtocolEncoder());
pipeline.addLast("objectDecoder", new WondexProtocolDecoder(WondexProtocol.this));
}
});
serverList.add(new TrackerServer(new ConnectionlessBootstrap(), this.getName()) {
@Override
protected void addSpecificHandlers(ChannelPipeline pipeline) {
+ pipeline.addLast("stringEncoder", new StringEncoder());
pipeline.addLast("stringDecoder", new StringDecoder());
+ pipeline.addLast("objectEncoder", new WondexProtocolEncoder());
pipeline.addLast("objectDecoder", new WondexProtocolDecoder(WondexProtocol.this));
}
});
diff --git a/src/org/traccar/protocol/WondexProtocolEncoder.java b/src/org/traccar/protocol/WondexProtocolEncoder.java
new file mode 100644
index 000000000..83db4ecda
--- /dev/null
+++ b/src/org/traccar/protocol/WondexProtocolEncoder.java
@@ -0,0 +1,29 @@
+package org.traccar.protocol;
+
+import org.traccar.StringProtocolEncoder;
+import org.traccar.helper.Log;
+import org.traccar.model.Command;;
+
+public class WondexProtocolEncoder extends StringProtocolEncoder {
+ @Override
+ protected Object encodeCommand(Command command) {
+
+ // Temporary put default password
+ command.set(Command.KEY_DEVICE_PASSWORD, "0000");
+
+ switch (command.getType()) {
+ case Command.TYPE_REBOOT_DEVICE:
+ return formatCommand(command, "$WP+REBOOT={%s}", Command.KEY_DEVICE_PASSWORD);
+ case Command.TYPE_POSITION_SINGLE:
+ return formatCommand(command, "$WP+GETLOCATION={%s}", Command.KEY_DEVICE_PASSWORD);
+ case Command.TYPE_CUSTOM:
+ return formatCommand(command, Command.KEY_DATA);
+ default:
+ Log.warning(new UnsupportedOperationException(command.getType()));
+ break;
+ }
+
+ return null;
+ }
+
+}
diff --git a/test/org/traccar/protocol/WondexProtocolEncoderTest.java b/test/org/traccar/protocol/WondexProtocolEncoderTest.java
new file mode 100644
index 000000000..b898b2c8a
--- /dev/null
+++ b/test/org/traccar/protocol/WondexProtocolEncoderTest.java
@@ -0,0 +1,23 @@
+package org.traccar.protocol;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.traccar.ProtocolTest;
+import org.traccar.model.Command;
+
+public class WondexProtocolEncoderTest extends ProtocolTest {
+ @Test
+ public void testEncode() throws Exception {
+
+ WondexProtocolEncoder encoder = new WondexProtocolEncoder();
+
+ Command command = new Command();
+ command.setDeviceId(2);
+ command.setType(Command.TYPE_POSITION_SINGLE);
+ command.set(Command.KEY_DEVICE_PASSWORD, "0000");
+
+ Assert.assertEquals("$WP+GETLOCATION=0000", encoder.encodeCommand(command));
+
+ }
+
+}