Fix GT06 protocol

2 files changed, 26 insertions, 14 deletions

diff --git a/test/org/traccar/protocol/Gps103ProtocolDecoderTest.java b/test/org/traccar/protocol/Gps103ProtocolDecoderTest.java
index 61585d3c1..0433e2e34 100644
--- a/test/org/traccar/protocol/Gps103ProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/Gps103ProtocolDecoderTest.java
@@ -8,12 +8,12 @@ public class Gps103ProtocolDecoderTest {
 
     @Test
     public void testDecode() throws Exception {
-        
+
         Gps103ProtocolDecoder decoder = new Gps103ProtocolDecoder(new TestDataManager());
 
         // Log on request
         //assertNull(decoder.decode(null, null, "##,imei:359586015829802,A"));
-        
+
         // Heartbeat package
         //assertNull(decoder.decode(null, null, "359586015829802"));
 
@@ -21,6 +21,12 @@ public class Gps103ProtocolDecoderTest {
         //assertNull(decoder.decode(null, null, "imei:359586015829802,tracker,000000000,13554900601,L,;"));
 
         assertNotNull(decoder.decode(null, null,
+                "imei:012497000208821,tracker,1301080525,,F,212511.000,A,2228.5279,S,06855.6328,W,18.62,268.98,"));
+
+        assertNotNull(decoder.decode(null, null,
+                "imei:012497000208821,tracker,1301072224,,F,142411.077,A,2227.0739,S,06855.2912,,0,0,"));
+
+        assertNotNull(decoder.decode(null, null,
                 "imei:012497000431811,tracker,1210260609,,F,220925.000,A,0845.5500,N,07024.7673,W,0.00,,"));
 
         assertNotNull(decoder.decode(null, null,
@@ -34,7 +40,7 @@ public class Gps103ProtocolDecoderTest {
 
         assertNotNull(decoder.decode(null, null,
                 "imei:359587010124900,tracker,0809231929,13554900601,F,112909.397,A,2234.4669,N,11354.3287,E,0.11,321.53,"));
-        
+
         assertNotNull(decoder.decode(null, null,
                 "imei:353451049926460,tracker,1208042043,123456 99008026,F,124336.000,A,3509.8668,N,03322.7636,E,0.00,,"));
 
@@ -57,13 +63,13 @@ public class Gps103ProtocolDecoderTest {
         // Over speed alarm
         assertNotNull(decoder.decode(null, null,
                 "imei:359586015829802,speed,0809231429,13554900601,F,062947.294,A,2234.4026,N,11354.3277,E,0.00,"));
-        
+
         assertNotNull(decoder.decode(null, null,
                 "imei:863070010423167,tracker,1211051840,,F,104000.000,A,2220.6483,N,11407.6377,,0,0,"));
-        
+
         assertNotNull(decoder.decode(null, null,
                 "imei:863070010423167,tracker,1211051951,63360926,F,115123.000,A,2220.6322,N,11407.5313,E,0.00,,"));
-        
+
         assertNotNull(decoder.decode(null, null,
                 "imei:863070010423167,tracker,1211060621,,F,062152.000,A,2220.6914,N,11407.5506,E,15.85,347.84,"));
     }
diff --git a/test/org/traccar/protocol/Gt06ProtocolDecoderTest.java b/test/org/traccar/protocol/Gt06ProtocolDecoderTest.java
index f20618061..ae4416435 100644
--- a/test/org/traccar/protocol/Gt06ProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/Gt06ProtocolDecoderTest.java
@@ -6,17 +6,23 @@ import static org.junit.Assert.assertNull;
 import org.junit.Test;
 
 public class Gt06ProtocolDecoderTest {
-    
+
     @Test
     public void testDecode() throws Exception {
-        
+
         Gt06ProtocolDecoder decoder = new Gt06ProtocolDecoder(new TestDataManager());
-        
-        byte[] buf1 = {0x78,0x78,0x1F,0x12,0x0B,0x08,0x1D,0x11,0x2E,0x10,(byte)0xCC,0x02,0x7A,(byte)0xC7,(byte)0xEB,0x0C,0x46,0x58,0x49,0x00,0x14,(byte)0x8F,0x01,(byte)0xCC,0x00,0x28,0x7D,0x00,0x1F,(byte)0xB8,0x00,0x03,(byte)0x80,(byte)0x81,0x0D,0x0A};
-        assertNotNull(decoder.decode(null, null, ChannelBuffers.wrappedBuffer(buf1)));
-        
-        byte[] buf2 = {0x78,0x78,0x0D,0x01,0x08,0x64,0x71,0x70,0x03,0x28,0x35,(byte)0x81,0x00,0x09,0x3F,0x04,0x0D,0x0A};
-        assertNull(decoder.decode(null, null, ChannelBuffers.wrappedBuffer(buf2)));
+
+        byte[] buf1 = {0x78,0x78,0x0d,0x01,0x03,0x53,0x41,(byte)0x90,0x36,0x06,0x60,0x61,0x00,0x03,(byte)0xc3,(byte)0xdf,0x0d,0x0a};
+        assertNull(decoder.decode(null, null, ChannelBuffers.wrappedBuffer(buf1)));
+
+        byte[] buf2 = {0x78,0x78,0x1F,0x12,0x0B,0x08,0x1D,0x11,0x2E,0x10,(byte)0xCC,0x02,0x7A,(byte)0xC7,(byte)0xEB,0x0C,0x46,0x58,0x49,0x00,0x14,(byte)0x8F,0x01,(byte)0xCC,0x00,0x28,0x7D,0x00,0x1F,(byte)0xB8,0x00,0x03,(byte)0x80,(byte)0x81,0x0D,0x0A};
+        assertNotNull(decoder.decode(null, null, ChannelBuffers.wrappedBuffer(buf2)));
+
+        byte[] buf3 = {0x78,0x78,0x0D,0x01,0x08,0x64,0x71,0x70,0x03,0x28,0x35,(byte)0x81,0x00,0x09,0x3F,0x04,0x0D,0x0A};
+        assertNull(decoder.decode(null, null, ChannelBuffers.wrappedBuffer(buf3)));
+
+        byte[] buf4 = {0x78,0x78,0x0D,0x01,0x01,0x23,0x45,0x67,(byte)0x89,0x01,0x23,0x45,0x00,0x01,(byte)0x8C,(byte)0xDD,0x0D,0x0A};
+        assertNull(decoder.decode(null, null, ChannelBuffers.wrappedBuffer(buf4)));
 
     }