From d6c53e951c5cdb4e03a30705f4f922b9b37fd7a6 Mon Sep 17 00:00:00 2001 From: Irving Gonzalez Date: Mon, 27 Jul 2015 21:57:00 -0600 Subject: Fixing totem commands support --- src/org/traccar/protocol/TotemFrameDecoder.java | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) (limited to 'src/org/traccar/protocol/TotemFrameDecoder.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; } -- cgit v1.2.3