Added test csse & updated code for Xexun2ProtocolDecoder

2 files changed, 10 insertions, 4 deletions

diff --git a/src/main/java/org/traccar/protocol/Xexun2ProtocolDecoder.java b/src/main/java/org/traccar/protocol/Xexun2ProtocolDecoder.java
index 3f37d7cac..402095391 100644
--- a/src/main/java/org/traccar/protocol/Xexun2ProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/Xexun2ProtocolDecoder.java
@@ -178,22 +178,25 @@ public class Xexun2ProtocolDecoder extends BaseProtocolDecoder {
                         position.setLatitude(convertCoordinate(buf.readDouble()));
                     }
                     if (BitUtil.check(positionMask, 7)) {
-                        if (buf.readUnsignedShort() > 0) {
+                        int dataLength = buf.readUnsignedShort();
+                        if (dataLength > 0) {
                             if (buf.readByte() != 'G') {
-                                buf.skipBytes(buf.readUnsignedShort());
+                                buf.skipBytes(dataLength - 1);
                             } else {
                                 int gpsDataLen = buf.readUnsignedShort();
                                 if (gpsDataLen != 27) {
-                                    buf.skipBytes(gpsDataLen);
+                                    buf.skipBytes(dataLength - 3);
                                 } else {
+                                    position.setFixTime(position.getDeviceTime());
                                     position.setLongitude(convertCoordinate(buf.readDouble()));
                                     position.setLatitude(convertCoordinate(buf.readDouble()));
                                     position.setValid(buf.readUnsignedByte() > 0);
                                     position.set(Position.KEY_SATELLITES, buf.readUnsignedByte());
-                                    buf.readUnsignedByte(1); // satellite signal to noise ratio
+                                    buf.readUnsignedByte(); // satellite signal to noise ratio
                                     position.setSpeed(UnitsConverter.knotsFromKph(buf.readUnsignedShort() * 0.1));
                                     position.setCourse(buf.readUnsignedShort() * 0.1);
                                     position.setAltitude(buf.readFloat());
+                                    buf.skipBytes(dataLength - 30);
                                 }
                             }
                         }
diff --git a/src/test/java/org/traccar/protocol/Xexun2ProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/Xexun2ProtocolDecoderTest.java
index 840c38b52..215b90c66 100644
--- a/src/test/java/org/traccar/protocol/Xexun2ProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/Xexun2ProtocolDecoderTest.java
@@ -25,6 +25,9 @@ public class Xexun2ProtocolDecoderTest extends ProtocolTest {
         verifyPositions(decoder, binary(
                 "FAAF00140CF18626490454584530002BF2DD0200130013D360EFD7F514006402010D46322C4A450BA026D460EFD7FA14006402010D46322C4A450BA026FAAF"));
 
+        verifyPositions(decoder, binary(
+                "FAAF0014000C8622050512345670002DF3A001002A0062D9047400005E0280001E47001B400D4BA732DF505E40B4153AAF78FEF00109000000000042B36666FAAF"));
+
     }
 
 }