- Added device identification on ping packet for Wondex protocol

- Store result of command execution to "result" field of position
- Fixed wrong class in WondexFrameDecoderTest

2 files changed, 59 insertions, 32 deletions

diff --git a/src/org/traccar/protocol/WondexFrameDecoder.java b/src/org/traccar/protocol/WondexFrameDecoder.java
index c217166e8..7502c3320 100644
--- a/src/org/traccar/protocol/WondexFrameDecoder.java
+++ b/src/org/traccar/protocol/WondexFrameDecoder.java
@@ -15,7 +15,9 @@
  */
 package org.traccar.protocol;
 
+import java.nio.charset.StandardCharsets;
 import org.jboss.netty.buffer.ChannelBuffer;
+import org.jboss.netty.buffer.ChannelBuffers;
 import org.jboss.netty.channel.Channel;
 import org.jboss.netty.channel.ChannelHandlerContext;
 import org.jboss.netty.handler.codec.frame.FrameDecoder;
@@ -40,6 +42,9 @@ public class WondexFrameDecoder extends FrameDecoder {
             if (channel != null) {
                 channel.write(frame);
             }
+            // Pass deviceId to protocol decoder
+            long deviceId = ((Long.reverseBytes((frame.getLong(0)))) >> 32) & 0xFFFFFFFFL;
+            return ChannelBuffers.copiedBuffer("$ID:"+String.valueOf(deviceId), StandardCharsets.US_ASCII);
 
         } else {
 
diff --git a/src/org/traccar/protocol/WondexProtocolDecoder.java b/src/org/traccar/protocol/WondexProtocolDecoder.java
index def878727..d35d1d930 100644
--- a/src/org/traccar/protocol/WondexProtocolDecoder.java
+++ b/src/org/traccar/protocol/WondexProtocolDecoder.java
@@ -25,6 +25,7 @@ import org.traccar.model.Event;
 import org.traccar.model.Position;
 
 import java.net.SocketAddress;
+import java.util.Date;
 import java.util.regex.Pattern;
 
 public class WondexProtocolDecoder extends BaseProtocolDecoder {
@@ -58,43 +59,64 @@ public class WondexProtocolDecoder extends BaseProtocolDecoder {
     protected Object decode(
             Channel channel, SocketAddress remoteAddress, Object msg) throws Exception {
 
-        Parser parser = new Parser(PATTERN, (String) msg);
-        if (!parser.matches()) {
+        if (((String) msg).startsWith("$ID:")) {
+            identify(((String) msg).substring(4), channel, remoteAddress); 
             return null;
         }
 
-        Position position = new Position();
-        position.setProtocol(getProtocolName());
+        else if (((String) msg).startsWith("$OK:") || ((String) msg).startsWith("$ERR:")) {
 
-        if (!identify(parser.next(), channel, remoteAddress)) {
-            return null;
+            Position position = new Position();
+            position.setProtocol(getProtocolName());
+            position.setDeviceId(getDeviceId());
+            getLastLocation(position, null);
+            position.setTime(new Date());
+            position.setValid(false);
+            position.set(Event.KEY_RESULT, (String) msg);
+
+            return position;
+
+        } else {
+
+            Parser parser = new Parser(PATTERN, (String) msg);
+            if (!parser.matches()) {
+                return null;
+            }
+
+            Position position = new Position();
+            position.setProtocol(getProtocolName());
+
+            if (!identify(parser.next(), channel, remoteAddress)) {
+                return null;
+            }
+            position.setDeviceId(getDeviceId());
+
+            DateBuilder dateBuilder = new DateBuilder()
+                    .setDate(parser.nextInt(), parser.nextInt(), parser.nextInt())
+                    .setTime(parser.nextInt(), parser.nextInt(), parser.nextInt());
+            position.setTime(dateBuilder.getDate());
+
+            position.setLongitude(parser.nextDouble());
+            position.setLatitude(parser.nextDouble());
+            position.setSpeed(UnitsConverter.knotsFromKph(parser.nextDouble()));
+            position.setCourse(parser.nextDouble());
+            position.setAltitude(parser.nextDouble());
+
+            int satellites = parser.nextInt();
+            position.setValid(satellites >= 3);
+            position.set(Event.KEY_SATELLITES, satellites);
+
+            position.set(Event.KEY_EVENT, parser.next());
+            position.set(Event.KEY_BATTERY, parser.next());
+            position.set(Event.KEY_ODOMETER, parser.next());
+            position.set(Event.KEY_INPUT, parser.next());
+            position.set(Event.PREFIX_ADC + 1, parser.next());
+            position.set(Event.PREFIX_ADC + 2, parser.next());
+            position.set(Event.KEY_OUTPUT, parser.next());
+
+            return position;
         }
-        position.setDeviceId(getDeviceId());
-
-        DateBuilder dateBuilder = new DateBuilder()
-                .setDate(parser.nextInt(), parser.nextInt(), parser.nextInt())
-                .setTime(parser.nextInt(), parser.nextInt(), parser.nextInt());
-        position.setTime(dateBuilder.getDate());
-
-        position.setLongitude(parser.nextDouble());
-        position.setLatitude(parser.nextDouble());
-        position.setSpeed(UnitsConverter.knotsFromKph(parser.nextDouble()));
-        position.setCourse(parser.nextDouble());
-        position.setAltitude(parser.nextDouble());
-
-        int satellites = parser.nextInt();
-        position.setValid(satellites >= 3);
-        position.set(Event.KEY_SATELLITES, satellites);
-
-        position.set(Event.KEY_EVENT, parser.next());
-        position.set(Event.KEY_BATTERY, parser.next());
-        position.set(Event.KEY_ODOMETER, parser.next());
-        position.set(Event.KEY_INPUT, parser.next());
-        position.set(Event.PREFIX_ADC + 1, parser.next());
-        position.set(Event.PREFIX_ADC + 2, parser.next());
-        position.set(Event.KEY_OUTPUT, parser.next());
-
-        return position;
+
     }
 
 }