From d6c53e951c5cdb4e03a30705f4f922b9b37fd7a6 Mon Sep 17 00:00:00 2001
From: Irving Gonzalez <ialexis93@gmail.com>
Date: Mon, 27 Jul 2015 21:57:00 -0600
Subject: Fixing totem commands support

---
 src/org/traccar/protocol/TotemFrameDecoder.java    | 20 +++++++----
 src/org/traccar/protocol/TotemProtocol.java        |  2 ++
 .../traccar/protocol/TotemProtocolEncoderTest.java | 41 ++++++++++++++++++++++
 3 files changed, 57 insertions(+), 6 deletions(-)
 create mode 100644 test/org/traccar/protocol/TotemProtocolEncoderTest.java

diff --git a/src/org/traccar/protocol/TotemFrameDecoder.java b/src/org/traccar/protocol/TotemFrameDecoder.java
index 5ac3064e6..00eb5ec82 100644
--- a/src/org/traccar/protocol/TotemFrameDecoder.java
+++ b/src/org/traccar/protocol/TotemFrameDecoder.java
@@ -20,6 +20,7 @@ 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.traccar.helper.Log;
 
 public class TotemFrameDecoder extends FrameDecoder {
 
@@ -38,13 +39,20 @@ 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);
+        
+        try{
+            // Read message
+            int length = Integer.parseInt(buf.toString(buf.readerIndex() + 2, 2, Charset.defaultCharset()), 16);
+            if (length <= buf.readableBytes()) {
+                return buf.readBytes(length);
+            }
+        }catch(Exception e){
+            //TODO: notify to user the GPS response
+            
+            Log.debug("GPS Response: " + buf.toString(buf.readerIndex(), buf.readableBytes(), Charset.defaultCharset()));
+            //return buf.readBytes(buf.readableBytes());
         }
-
+        
         return null;
     }
 
diff --git a/src/org/traccar/protocol/TotemProtocol.java b/src/org/traccar/protocol/TotemProtocol.java
index 1c0d21380..8445f04b6 100644
--- a/src/org/traccar/protocol/TotemProtocol.java
+++ b/src/org/traccar/protocol/TotemProtocol.java
@@ -22,6 +22,7 @@ import org.traccar.BaseProtocol;
 import org.traccar.TrackerServer;
 
 import java.util.List;
+import org.jboss.netty.handler.codec.string.StringEncoder;
 import org.traccar.model.Command;
 
 public class TotemProtocol extends BaseProtocol {
@@ -39,6 +40,7 @@ public class TotemProtocol extends BaseProtocol {
             protected void addSpecificHandlers(ChannelPipeline pipeline) {
                 pipeline.addLast("frameDecoder", new TotemFrameDecoder());
                 pipeline.addLast("stringDecoder", new StringDecoder());
+                pipeline.addLast("stringEncoder", new StringEncoder());
                 pipeline.addLast("objectDecoder", new TotemProtocolDecoder(TotemProtocol.this));
                 pipeline.addLast("objectEncoder", new TotemProtocolEncoder());
             }
diff --git a/test/org/traccar/protocol/TotemProtocolEncoderTest.java b/test/org/traccar/protocol/TotemProtocolEncoderTest.java
new file mode 100644
index 000000000..13c5b944f
--- /dev/null
+++ b/test/org/traccar/protocol/TotemProtocolEncoderTest.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2015 alexis.
+ *
+ * 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 java.util.HashMap;
+import java.util.Map;
+import org.junit.Assert;
+import org.junit.Test;
+import org.traccar.model.Command;
+
+/**
+ *
+ * @author alexis
+ */
+public class TotemProtocolEncoderTest {
+    @Test
+    public void testDecode() throws Exception {
+
+        TotemProtocolEncoder encoder = new TotemProtocolEncoder();
+        
+        Command command = new Command();
+        command.setDeviceId(2);
+        command.setType(Command.TYPE_IMEI);
+        
+        Assert.assertEquals("*000000,801#", encoder.encodeCommand(command));
+
+    }
+}
-- 
cgit v1.2.3