diff options
| -rw-r--r-- | src/org/traccar/DefaultDataHandler.java | 2 | ||||
| -rw-r--r-- | src/org/traccar/protocol/Gt06ProtocolEncoder.java | 3 | ||||
| -rw-r--r-- | test/org/traccar/protocol/Gt06ProtocolEncoderTest.java | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/org/traccar/DefaultDataHandler.java b/src/org/traccar/DefaultDataHandler.java index cb35baceb..594961389 100644 --- a/src/org/traccar/DefaultDataHandler.java +++ b/src/org/traccar/DefaultDataHandler.java @@ -26,7 +26,7 @@ public class DefaultDataHandler extends BaseDataHandler { try { Context.getDataManager().addPosition(position); Position lastPosition = Context.getConnectionManager().getLastPosition(position.getDeviceId()); - if (position.getFixTime().compareTo(lastPosition.getFixTime()) > 0) { + if (lastPosition == null || position.getFixTime().compareTo(lastPosition.getFixTime()) > 0) { Context.getDataManager().updateLatestPosition(position); } } catch (Exception error) { diff --git a/src/org/traccar/protocol/Gt06ProtocolEncoder.java b/src/org/traccar/protocol/Gt06ProtocolEncoder.java index 09773cc45..22d62e9e5 100644 --- a/src/org/traccar/protocol/Gt06ProtocolEncoder.java +++ b/src/org/traccar/protocol/Gt06ProtocolEncoder.java @@ -18,6 +18,7 @@ package org.traccar.protocol; import org.jboss.netty.buffer.ChannelBuffer; import org.jboss.netty.buffer.ChannelBuffers; import org.traccar.BaseProtocolEncoder; +import org.traccar.Context; import org.traccar.helper.Crc; import org.traccar.model.Command; @@ -34,7 +35,7 @@ public class Gt06ProtocolEncoder extends BaseProtocolEncoder { buf.writeByte(0x80); // message type - buf.writeByte(content.length()); // command length + buf.writeByte(4 + content.length()); // command length buf.writeInt(0); buf.writeBytes(content.getBytes()); // command diff --git a/test/org/traccar/protocol/Gt06ProtocolEncoderTest.java b/test/org/traccar/protocol/Gt06ProtocolEncoderTest.java index b4cee7789..586fb0859 100644 --- a/test/org/traccar/protocol/Gt06ProtocolEncoderTest.java +++ b/test/org/traccar/protocol/Gt06ProtocolEncoderTest.java @@ -18,7 +18,7 @@ public class Gt06ProtocolEncoderTest { command.setType(Command.TYPE_ENGINE_STOP); Assert.assertEquals(encoder.encodeCommand(command), ChannelBuffers.wrappedBuffer(ChannelBufferTools.convertHexString( - "78780e80040000000044594423000190b10d0a"))); + "78780e800800000000445944230001d09e0d0a"))); } |