Decode additional data

2 files changed, 178 insertions, 17 deletions

diff --git a/src/main/java/org/traccar/protocol/NavisetProtocolDecoder.java b/src/main/java/org/traccar/protocol/NavisetProtocolDecoder.java
index 36a060176..d67fae78c 100644
--- a/src/main/java/org/traccar/protocol/NavisetProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/NavisetProtocolDecoder.java
@@ -29,6 +29,8 @@ import org.traccar.model.Position;
 import java.net.SocketAddress;
 import java.nio.charset.StandardCharsets;
 import java.util.Date;
+import java.util.LinkedList;
+import java.util.List;
 
 public class NavisetProtocolDecoder extends BaseProtocolDecoder {
 
@@ -55,7 +57,6 @@ public class NavisetProtocolDecoder extends BaseProtocolDecoder {
         }
 
         int length = buf.readUnsignedShortLE();
-        BitUtil.between(length, 12, 14); // version
         int type = BitUtil.between(length, 14, 16);
         buf.readUnsignedShortLE(); // device number
 
@@ -65,27 +66,181 @@ public class NavisetProtocolDecoder extends BaseProtocolDecoder {
 
         } else if (type == MSG_DATA) {
 
+            List<Position> positions = new LinkedList<>();
             DeviceSession deviceSession = getDeviceSession(channel, remoteAddress);
             if (deviceSession == null) {
                 return null;
             }
 
-            Position position = new Position(getProtocolName());
-            position.setDeviceId(deviceSession.getDeviceId());
-
-            buf.readUnsignedByte(); // mask
-            position.set(Position.KEY_INDEX, buf.readUnsignedShortLE());
-            position.set(Position.KEY_STATUS, buf.readUnsignedByte());
-
-            position.setValid(true);
-            position.setTime(new Date(buf.readUnsignedIntLE() * 1000));
-            position.setLatitude(buf.readUnsignedIntLE() * 0.000001);
-            position.setLongitude(buf.readUnsignedIntLE() * 0.000001);
-            position.setSpeed(UnitsConverter.knotsFromKph(buf.readUnsignedShortLE() * 0.1));
-
-            // additional data
+            while (buf.readableBytes() > 2) {
+
+                Position position = new Position(getProtocolName());
+                position.setDeviceId(deviceSession.getDeviceId());
+                int blockMask = buf.readUnsignedByte();
+
+                position.set(Position.KEY_INDEX, buf.readUnsignedShortLE());
+                position.set(Position.KEY_STATUS, buf.readUnsignedByte());
+
+                position.setValid(true);
+                position.setTime(new Date(buf.readUnsignedIntLE() * 1000));
+                position.setLatitude(buf.readUnsignedIntLE() * 0.000001);
+                position.setLongitude(buf.readUnsignedIntLE() * 0.000001);
+                position.setSpeed(UnitsConverter.knotsFromKph(buf.readUnsignedShortLE() * 0.1));
+
+                if (BitUtil.check(blockMask, 0)) {
+                    int dataMask = buf.readUnsignedByte();
+                    if (BitUtil.check(dataMask, 0)) {
+                        int satellites = buf.readUnsignedByte();
+                        position.setValid(BitUtil.check(satellites, 7));
+                        position.set(Position.KEY_SATELLITES, BitUtil.to(satellites, 7));
+                    }
+                    if (BitUtil.check(dataMask, 1)) {
+                        position.setCourse(buf.readUnsignedShortLE() * 0.1);
+                    }
+                    if (BitUtil.check(dataMask, 2)) {
+                        position.setAltitude(buf.readShortLE());
+                    }
+                    if (BitUtil.check(dataMask, 3)) {
+                        position.set(Position.KEY_HDOP, buf.readUnsignedByte() * 0.1);
+                    }
+                    if (BitUtil.check(dataMask, 4)) {
+                        position.set(Position.KEY_POWER, buf.readUnsignedShortLE() * 0.001);
+                        position.set(Position.KEY_BATTERY, buf.readUnsignedShortLE() * 0.001);
+                    }
+                    if (BitUtil.check(dataMask, 5)) {
+                        position.set(Position.KEY_INPUT, buf.readUnsignedByte());
+                        position.set(Position.KEY_OUTPUT, buf.readUnsignedByte());
+                    }
+                    if (BitUtil.check(dataMask, 6)) {
+                        position.set(Position.KEY_ODOMETER, buf.readUnsignedIntLE());
+                    }
+                    if (BitUtil.check(dataMask, 7)) {
+                        buf.skipBytes(6); // accelerometer
+                    }
+                }
+
+                if (BitUtil.check(blockMask, 1)) {
+                    int dataMask = buf.readUnsignedByte();
+                    for (int i = 0; i < 8; i++) {
+                        if (BitUtil.check(dataMask, i)) {
+                            position.set(Position.PREFIX_ADC + (i + 1), buf.readUnsignedShortLE());
+                        }
+                    }
+                }
+
+                if (BitUtil.check(blockMask, 2)) {
+                    int dataMask = buf.readUnsignedByte();
+                    if (BitUtil.check(dataMask, 0)) {
+                        position.set(Position.KEY_DEVICE_TEMP, (int) buf.readByte());
+                    }
+                    if (BitUtil.check(dataMask, 1)) {
+                        buf.skipBytes(6); // key code
+                    }
+                    if (BitUtil.check(dataMask, 2)) {
+                        position.set(Position.PREFIX_TEMP + 1, (int) buf.readByte());
+                        position.set(Position.PREFIX_TEMP + 2, (int) buf.readByte());
+                    }
+                    if (BitUtil.check(dataMask, 3)) {
+                        position.set(Position.PREFIX_TEMP + 3, (int) buf.readByte());
+                        position.set(Position.PREFIX_TEMP + 4, (int) buf.readByte());
+                    }
+                    if (BitUtil.check(dataMask, 4)) {
+                        position.set(Position.PREFIX_TEMP + 5, (int) buf.readByte());
+                        position.set(Position.PREFIX_TEMP + 6, (int) buf.readByte());
+                        position.set(Position.PREFIX_TEMP + 7, (int) buf.readByte());
+                        position.set(Position.PREFIX_TEMP + 8, (int) buf.readByte());
+                    }
+                    if (BitUtil.check(dataMask, 5)) {
+                        position.set(Position.KEY_HOURS, buf.readUnsignedShortLE() / 60.0);
+                    }
+                    if (BitUtil.check(dataMask, 6)) {
+                        buf.readUnsignedByte(); // extra status
+                    }
+                    if (BitUtil.check(dataMask, 7)) {
+                        buf.readUnsignedByte(); // geofence
+                    }
+                }
+
+                if (BitUtil.check(blockMask, 3)) {
+                    int dataMask = buf.readUnsignedByte();
+                    if (BitUtil.check(dataMask, 0)) {
+                        position.set("fuel1", buf.readUnsignedShortLE());
+                    }
+                    if (BitUtil.check(dataMask, 1)) {
+                        position.set("fuel2", buf.readUnsignedShortLE());
+                    }
+                    if (BitUtil.check(dataMask, 2)) {
+                        position.set(Position.KEY_FUEL_LEVEL, buf.readUnsignedShortLE());
+                    }
+                    if (BitUtil.check(dataMask, 3)) {
+                        buf.skipBytes(18);
+                    }
+                    if (BitUtil.check(dataMask, 4)) {
+                        buf.readUnsignedByte(); // fuel 1 temperature
+                    }
+                    if (BitUtil.check(dataMask, 5)) {
+                        buf.readUnsignedByte(); // fuel 2 temperature
+                    }
+                    if (BitUtil.check(dataMask, 6)) {
+                        buf.readUnsignedShortLE(); // fuel 1 frequency
+                    }
+                    if (BitUtil.check(dataMask, 7)) {
+                        buf.readUnsignedShortLE(); // fuel 2 frequency
+                    }
+                }
+
+                if (BitUtil.check(blockMask, 4)) {
+                    int dataMask = buf.readUnsignedByte();
+                    if (BitUtil.check(dataMask, 0)) {
+                        buf.readUnsignedByte(); // fuel level (percentage)
+                        position.set(Position.KEY_RPM, buf.readUnsignedShortLE());
+                        position.set(Position.KEY_COOLANT_TEMP, (int) buf.readByte());
+                    }
+                    if (BitUtil.check(dataMask, 1)) {
+                        buf.readUnsignedIntLE(); // fuel consumption
+                    }
+                    if (BitUtil.check(dataMask, 2)) {
+                        position.set(Position.KEY_ODOMETER, buf.readUnsignedIntLE());
+                    }
+                    for (int i = 3; i < 8; i++) {
+                        if (BitUtil.check(dataMask, i)) {
+                            buf.readUnsignedShortLE(); // axle weight
+                        }
+                    }
+                }
+
+                if (BitUtil.check(blockMask, 4)) {
+                    int dataMask = buf.readUnsignedByte();
+                    if (BitUtil.check(dataMask, 0)) {
+                        buf.readUnsignedByte(); // speed
+                    }
+                    if (BitUtil.check(dataMask, 1)) {
+                        buf.readUnsignedMediumLE(); // prefix S
+                    }
+                    if (BitUtil.check(dataMask, 2)) {
+                        buf.readUnsignedIntLE(); // prefix P
+                    }
+                    if (BitUtil.check(dataMask, 3)) {
+                        buf.readUnsignedIntLE(); // prefix A or B
+                    }
+                    if (BitUtil.check(dataMask, 4)) {
+                        buf.readUnsignedShortLE(); // prefix R
+                    }
+                    if (BitUtil.check(dataMask, 5)) {
+                        buf.skipBytes(26);
+                    }
+                    if (BitUtil.check(dataMask, 6)) {
+                        buf.readUnsignedIntLE(); // reserved
+                    }
+                    if (BitUtil.check(dataMask, 7)) {
+                        buf.readUnsignedIntLE(); // reserved
+                    }
+                }
+
+                positions.add(position);
+            }
 
-            return position;
+            return positions;
         }
 
         return null;
diff --git a/src/test/java/org/traccar/protocol/NavisetProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/NavisetProtocolDecoderTest.java
index 5ef7dc529..c4b0ca73a 100644
--- a/src/test/java/org/traccar/protocol/NavisetProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/NavisetProtocolDecoderTest.java
@@ -13,7 +13,13 @@ public class NavisetProtocolDecoderTest extends ProtocolTest {
         verifyNull(decoder, binary(
                 "1310e4073836383230343030353935383436362a060716"));
 
-        verifyPosition(decoder, binary(
+        verifyPositions(decoder, binary(
+                "b7501a203fab0d0bffcf4b5df0a82503a02cf6030000ff0c4200ba0007462a3a10000098280000f0f610fc4042ff00000000000000000000000000000000ff26000000000000808080808080808000000000ff000000000000000000000000000000000000000000000000000000000000ff00000000000000000000000000000000000000000000ff0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008bff"));
+
+        verifyPositions(decoder, binary(
+                "b7501a203fda0d097fdc4b5d70aa2503c42cf6030000ff0fb40dea0006b12a3a100000b228000080f210044041ff00000000000000000000000000000000ff25000000000000808080808080808000000000ff1201000000000000000000000000000000000000000000001a0000000000ff00000000000000000000000000000000000000000000ff000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000b603"));
+
+        verifyPositions(decoder, binary(
                 "14501a2000a50c0955a64b5db8a92503fc2cf603000084ab"));
 
     }