Merge pull request #1947 from Abyss777/master

Implement commands for Wondex protocol

3 files changed, 59 insertions, 0 deletions

diff --git a/src/org/traccar/protocol/WondexProtocol.java b/src/org/traccar/protocol/WondexProtocol.java
index b07f84909..639669767 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,9 @@ public class WondexProtocol extends BaseProtocol {
 
     public WondexProtocol() {
         super("wondex");
+        setSupportedCommands(
+                Command.TYPE_REBOOT_DEVICE,
+                Command.TYPE_POSITION_SINGLE);
     }
 
     @Override
@@ -36,14 +41,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..c8bc58b40
--- /dev/null
+++ b/src/org/traccar/protocol/WondexProtocolEncoder.java
@@ -0,0 +1,27 @@
+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);
+        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..fb038a18b
--- /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));

+

+    }

+

+}