Decode more Huabao attributes

2 files changed, 21 insertions, 5 deletions

diff --git a/src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java b/src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java
index fceefa73a..94a6670ec 100644
--- a/src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java
@@ -98,6 +98,9 @@ public class HuabaoProtocolDecoder extends BaseProtocolDecoder {
         if (BitUtil.check(value, 20)) {
             return Position.ALARM_GEOFENCE;
         }
+        if (BitUtil.check(value, 28)) {
+            return Position.ALARM_MOVEMENT;
+        }
         if (BitUtil.check(value, 29)) {
             return Position.ALARM_ACCIDENT;
         }
@@ -160,22 +163,23 @@ public class HuabaoProtocolDecoder extends BaseProtocolDecoder {
 
         position.set(Position.KEY_ALARM, decodeAlarm(buf.readUnsignedInt()));
 
-        int flags = buf.readInt();
+        int status = buf.readInt();
 
-        position.set(Position.KEY_IGNITION, BitUtil.check(flags, 0));
+        position.set(Position.KEY_IGNITION, BitUtil.check(status, 0));
+        position.set(Position.KEY_BLOCKED, BitUtil.check(status, 10));
 
-        position.setValid(BitUtil.check(flags, 1));
+        position.setValid(BitUtil.check(status, 1));
 
         double lat = buf.readUnsignedInt() * 0.000001;
         double lon = buf.readUnsignedInt() * 0.000001;
 
-        if (BitUtil.check(flags, 2)) {
+        if (BitUtil.check(status, 2)) {
             position.setLatitude(-lat);
         } else {
             position.setLatitude(lat);
         }
 
-        if (BitUtil.check(flags, 3)) {
+        if (BitUtil.check(status, 3)) {
             position.setLongitude(-lon);
         } else {
             position.setLongitude(lon);
@@ -231,6 +235,15 @@ public class HuabaoProtocolDecoder extends BaseProtocolDecoder {
                                 Position.KEY_VIN, buf.readCharSequence(length, StandardCharsets.US_ASCII).toString());
                     }
                     break;
+                case 0xD0:
+                    long userStatus = buf.readUnsignedInt();
+                    if (BitUtil.check(userStatus, 3)) {
+                        position.set(Position.KEY_ALARM, Position.ALARM_VIBRATION);
+                    }
+                    break;
+                case 0xD3:
+                    position.set(Position.KEY_POWER, buf.readUnsignedShort() * 0.1);
+                    break;
                 default:
                     break;
             }
diff --git a/src/test/java/org/traccar/protocol/HuabaoProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/HuabaoProtocolDecoderTest.java
index d4ae3b50c..321a422f4 100644
--- a/src/test/java/org/traccar/protocol/HuabaoProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/HuabaoProtocolDecoderTest.java
@@ -14,6 +14,9 @@ public class HuabaoProtocolDecoderTest extends ProtocolTest {
                 "7E01000021013345678906000F002C012F373031313142534A2D4D3742203030303030303001D4C1423838383838B47E"));
 
         verifyPosition(decoder, binary(
+                "7e0200004e08026300003006480000000000000007021477d90841920700000000005019110515194001040000167130011631010cd00400000400d3020027d4013fd6143839363130313832303030343833363532383330da0104897e"));
+
+        verifyPosition(decoder, binary(
                 "7e020000400303000002280042000000000000000301618ab406c31ec800000000000518092116145701040000047830011031010aeb16000c00b28986011780108622216500060089ffffffffc37e"));
 
         verifyPosition(decoder, binary(