From b9cc31bf3ab278df45fa90f6481f929e325326f0 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton@traccar.org>
Date: Tue, 20 Dec 2022 16:25:24 -0800
Subject: Improve MD500S decoding

---
 .../org/traccar/protocol/MeitrackProtocolDecoder.java   | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'src/main/java/org')

diff --git a/src/main/java/org/traccar/protocol/MeitrackProtocolDecoder.java b/src/main/java/org/traccar/protocol/MeitrackProtocolDecoder.java
index 1935b2c2a..82c8f0087 100644
--- a/src/main/java/org/traccar/protocol/MeitrackProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/MeitrackProtocolDecoder.java
@@ -524,12 +524,19 @@ public class MeitrackProtocolDecoder extends BaseProtocolDecoder {
 
             paramCount = buf.readUnsignedByte();
             for (int j = 0; j < paramCount; j++) {
-                if (buf.getUnsignedByte(buf.readerIndex()) == 0xFE) {
-                    buf.readUnsignedShort(); // extension id
-                } else {
-                    buf.readUnsignedByte(); // id
+                boolean extension = buf.getUnsignedByte(buf.readerIndex()) == 0xFE;
+                int id = extension ? buf.readUnsignedShort() : buf.readUnsignedByte();
+                int length = buf.readUnsignedByte();
+                switch (id) {
+                    case 0xFE31:
+                        buf.readUnsignedByte(); // alarm protocol
+                        buf.readUnsignedByte(); // alarm type
+                        buf.skipBytes(length - 2);
+                        break;
+                    default:
+                        buf.skipBytes(length);
+                        break;
                 }
-                buf.skipBytes(buf.readUnsignedByte()); // value
             }
 
             positions.add(position);
-- 
cgit v1.2.3