1 files changed, 21 insertions, 4 deletions
diff --git a/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java b/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java
index c5e8809e3..6d49be0ce 100644
--- a/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java
@@ -295,7 +295,7 @@ public class Gt06ProtocolDecoder extends BaseProtocolDecoder {
         return true;
     }
 
-    private boolean decodeStatus(Position position, ByteBuf buf) {
+    private boolean decodeStatus(Position position, ByteBuf buf, boolean batteryLevel) {
 
         int status = buf.readUnsignedByte();
 
@@ -324,7 +324,11 @@ public class Gt06ProtocolDecoder extends BaseProtocolDecoder {
                 break;
         }
 
-        position.set(Position.KEY_BATTERY_LEVEL, buf.readUnsignedByte() * 100 / 6);
+        if (batteryLevel) {
+            position.set(Position.KEY_BATTERY_LEVEL, buf.readUnsignedByte() * 100 / 6);
+        } else {
+            position.set(Position.KEY_POWER, buf.readUnsignedShort() * 0.01);
+        }
         position.set(Position.KEY_RSSI, buf.readUnsignedByte());
         position.set(Position.KEY_ALARM, decodeAlarm(buf.readUnsignedByte()));
 
@@ -838,7 +842,9 @@ public class Gt06ProtocolDecoder extends BaseProtocolDecoder {
         buf.readUnsignedShort(); // satellites
         buf.readUnsignedByte(); // alarm
         buf.readUnsignedByte(); // language
-        buf.readUnsignedByte(); // battery
+
+        position.set(Position.KEY_BATTERY_LEVEL, buf.readUnsignedByte());
+
         buf.readUnsignedByte(); // working mode
         buf.readUnsignedShort(); // working voltage
         buf.readUnsignedByte(); // reserved
@@ -864,7 +870,7 @@ public class Gt06ProtocolDecoder extends BaseProtocolDecoder {
         }
 
         if (hasStatus(type)) {
-            decodeStatus(position, buf);
+            decodeStatus(position, buf, true);
         }
 
         if (type == MSG_GPS_LBS_1 && buf.readableBytes() > 75 + 6) {
@@ -875,6 +881,17 @@ public class Gt06ProtocolDecoder extends BaseProtocolDecoder {
             position.set("driverLicense", data.trim());
         }
 
+        if (type == MSG_GPS_LBS_1 && buf.readableBytes() == 18) {
+            decodeStatus(position, buf, false);
+            position.set("oil", buf.readUnsignedShort());
+            int temperature = buf.readUnsignedByte();
+            if (BitUtil.check(temperature, 7)) {
+                temperature = -BitUtil.to(temperature, 7);
+            }
+            position.set(Position.PREFIX_TEMP + 1, temperature);
+            position.set(Position.KEY_ODOMETER, buf.readUnsignedInt() * 10);
+        }
+
         if (type == MSG_GPS_LBS_1 && buf.readableBytes() == 2 + 6) {
             int mask = buf.readUnsignedShort();
             position.set(Position.KEY_IGNITION, BitUtil.check(mask, 8 + 7));