2 files changed, 45 insertions, 17 deletions
diff --git a/src/main/java/org/traccar/protocol/TzoneProtocolDecoder.java b/src/main/java/org/traccar/protocol/TzoneProtocolDecoder.java
index 87b44a4b2..4f6854098 100644
--- a/src/main/java/org/traccar/protocol/TzoneProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/TzoneProtocolDecoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2018 Anton Tananaev (anton@traccar.org)
+ * Copyright 2015 - 2019 Anton Tananaev (anton@traccar.org)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +23,7 @@ import org.traccar.DeviceSession;
 import org.traccar.Protocol;
 import org.traccar.helper.BitUtil;
 import org.traccar.helper.DateBuilder;
+import org.traccar.helper.UnitsConverter;
 import org.traccar.model.CellTower;
 import org.traccar.model.Network;
 import org.traccar.model.Position;
@@ -67,7 +68,17 @@ public class TzoneProtocolDecoder extends BaseProtocolDecoder {
             return false;
         }
 
-        position.set(Position.KEY_SATELLITES, buf.readUnsignedByte());
+        if (hardware == 0x413) {
+            buf.readUnsignedByte(); // status
+        } else {
+            position.set(Position.KEY_SATELLITES, buf.readUnsignedByte());
+        }
+
+        if (hardware == 0x413) {
+            position.setFixTime(new DateBuilder()
+                    .setDate(buf.readUnsignedByte(), buf.readUnsignedByte(), buf.readUnsignedByte())
+                    .setTime(buf.readUnsignedByte(), buf.readUnsignedByte(), buf.readUnsignedByte()).getDate());
+        }
 
         double lat;
         double lon;
@@ -80,25 +91,39 @@ public class TzoneProtocolDecoder extends BaseProtocolDecoder {
             lon = buf.readUnsignedInt() / 100000.0 / 60.0;
         }
 
-        position.setFixTime(new DateBuilder()
-                .setDate(buf.readUnsignedByte(), buf.readUnsignedByte(), buf.readUnsignedByte())
-                .setTime(buf.readUnsignedByte(), buf.readUnsignedByte(), buf.readUnsignedByte()).getDate());
+        if (hardware == 0x413) {
 
-        position.setSpeed(buf.readUnsignedShort() * 0.01);
+            position.set(Position.KEY_HDOP, buf.readUnsignedShort() * 0.1);
 
-        position.set(Position.KEY_ODOMETER, buf.readUnsignedMedium());
+            position.setAltitude(buf.readUnsignedShort());
+            position.setCourse(buf.readUnsignedShort());
+            position.setSpeed(UnitsConverter.knotsFromKph(buf.readUnsignedShort() * 0.1));
+
+            position.set(Position.KEY_SATELLITES, buf.readUnsignedByte());
+
+        } else {
+
+            position.setFixTime(new DateBuilder()
+                    .setDate(buf.readUnsignedByte(), buf.readUnsignedByte(), buf.readUnsignedByte())
+                    .setTime(buf.readUnsignedByte(), buf.readUnsignedByte(), buf.readUnsignedByte()).getDate());
+
+            position.setSpeed(buf.readUnsignedShort() * 0.01);
+
+            position.set(Position.KEY_ODOMETER, buf.readUnsignedMedium());
+
+            int flags = buf.readUnsignedShort();
+            position.setCourse(BitUtil.to(flags, 9));
+            if (!BitUtil.check(flags, 10)) {
+                lat = -lat;
+            }
+            position.setLatitude(lat);
+            if (BitUtil.check(flags, 9)) {
+                lon = -lon;
+            }
+            position.setLongitude(lon);
+            position.setValid(BitUtil.check(flags, 11));
 
-        int flags = buf.readUnsignedShort();
-        position.setCourse(BitUtil.to(flags, 9));
-        if (!BitUtil.check(flags, 10)) {
-            lat = -lat;
-        }
-        position.setLatitude(lat);
-        if (BitUtil.check(flags, 9)) {
-            lon = -lon;
         }
-        position.setLongitude(lon);
-        position.setValid(BitUtil.check(flags, 11));
 
         buf.readerIndex(blockEnd);
 
diff --git a/src/test/java/org/traccar/protocol/TzoneProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/TzoneProtocolDecoderTest.java
index bd1fc71f4..f90497292 100644
--- a/src/test/java/org/traccar/protocol/TzoneProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/TzoneProtocolDecoderTest.java
@@ -11,6 +11,9 @@ public class TzoneProtocolDecoderTest extends ProtocolTest {
         TzoneProtocolDecoder decoder = new TzoneProtocolDecoder(null);
 
         verifyAttributes(decoder, binary(
+                "545A004B2424041302000000086706003324776413030C0A1A2900180513030C0A1A25080F7E1028CAC830000A000F0000000005000AA53201633D05046000010009AA201737019408973B0032B0260D0A"));
+
+        verifyAttributes(decoder, binary(
                 "545a005b24240406010800000866050033819630120911071824000472bd8e5b0008aac01b07019b04bb002f00040b06161154000e100132ff2006161152000e080096ff4606161151000e1e0101ff1406161156000db6405bff490024469e0d0a"));
 
         verifyAttributes(decoder, binary(