Merge pull request #1317 from al3x1s/master

Implement Totem commands support

1 files changed, 11 insertions, 7 deletions

diff --git a/src/org/traccar/protocol/TotemFrameDecoder.java b/src/org/traccar/protocol/TotemFrameDecoder.java
index 5ac3064e6..6f7c3a37c 100644
--- a/src/org/traccar/protocol/TotemFrameDecoder.java
+++ b/src/org/traccar/protocol/TotemFrameDecoder.java
@@ -19,7 +19,7 @@ import java.nio.charset.Charset;
 import org.jboss.netty.buffer.ChannelBuffer;
 import org.jboss.netty.channel.Channel;
 import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.handler.codec.frame.FrameDecoder;
+import org.jboss.netty.handler.codec.frame.FrameDecoder; 
 
 public class TotemFrameDecoder extends FrameDecoder {
 
@@ -38,13 +38,17 @@ public class TotemFrameDecoder extends FrameDecoder {
         if (buf.getUnsignedShort(buf.readerIndex()) == 0x0d0a) {
             buf.skipBytes(2);
         }
-
-        // Read message
-        int length = Integer.parseInt(buf.toString(buf.readerIndex() + 2, 2, Charset.defaultCharset()), 16);
-        if (length <= buf.readableBytes()) {
-            return buf.readBytes(length);
+        
+        if(buf.toString(buf.readerIndex(), 2, Charset.defaultCharset()).equals("$$")){
+            int length = Integer.parseInt(buf.toString(buf.readerIndex() + 2, 2, Charset.defaultCharset()), 16);
+            if (length <= buf.readableBytes()) {
+                return buf.readBytes(length);
+            }
+        }else{
+            //TODO: notify to user the GPS response
+            return buf.readBytes(buf.readableBytes());
         }
-
+        
         return null;
     }