Decode Eview Pet configuration

2 files changed, 175 insertions, 1 deletions

diff --git a/src/main/java/org/traccar/helper/BufferUtil.java b/src/main/java/org/traccar/helper/BufferUtil.java
index 12c31ba9d..b453c437f 100644
--- a/src/main/java/org/traccar/helper/BufferUtil.java
+++ b/src/main/java/org/traccar/helper/BufferUtil.java
@@ -83,4 +83,8 @@ public final class BufferUtil {
         return printable;
     }
 
+    public static String readString(ByteBuf buf, int length) {
+        return buf.readCharSequence(length, StandardCharsets.US_ASCII).toString();
+    }
+
 }
diff --git a/src/main/java/org/traccar/protocol/Minifinder2ProtocolDecoder.java b/src/main/java/org/traccar/protocol/Minifinder2ProtocolDecoder.java
index 57ceab4c7..64373e344 100644
--- a/src/main/java/org/traccar/protocol/Minifinder2ProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/Minifinder2ProtocolDecoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 - 2023 Anton Tananaev (anton@traccar.org)
+ * Copyright 2019 - 2024 Anton Tananaev (anton@traccar.org)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@ import io.netty.buffer.ByteBufUtil;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.Channel;
 import org.traccar.BaseProtocolDecoder;
+import org.traccar.helper.BufferUtil;
 import org.traccar.session.DeviceSession;
 import org.traccar.NetworkMessage;
 import org.traccar.Protocol;
@@ -315,6 +316,10 @@ public class Minifinder2ProtocolDecoder extends BaseProtocolDecoder {
 
             return positions;
 
+        } else if (type == MSG_CONFIGURATION) {
+
+            return decodeConfiguration(channel, remoteAddress, buf);
+
         } else if (type == MSG_RESPONSE) {
 
             DeviceSession deviceSession = getDeviceSession(channel, remoteAddress);
@@ -337,4 +342,169 @@ public class Minifinder2ProtocolDecoder extends BaseProtocolDecoder {
         return null;
     }
 
+    private Position decodeConfiguration(Channel channel, SocketAddress remoteAddress, ByteBuf buf) {
+
+        DeviceSession deviceSession = getDeviceSession(channel, remoteAddress);
+        if (deviceSession == null) {
+            return null;
+        }
+
+        Position position = new Position(getProtocolName());
+        position.setDeviceId(deviceSession.getDeviceId());
+
+        getLastLocation(position, null);
+
+        while (buf.isReadable()) {
+            int length = buf.readUnsignedByte() - 1;
+            int endIndex = buf.readerIndex() + length + 1;
+            int key = buf.readUnsignedByte();
+
+            switch (key) {
+                case 0x01:
+                    position.set("moduleNumber", buf.readUnsignedInt());
+                    break;
+                case 0x02:
+                    position.set(Position.KEY_VERSION_FW, String.valueOf(buf.readUnsignedInt()));
+                    break;
+                case 0x03:
+                    position.set("imei", buf.readCharSequence(length, StandardCharsets.US_ASCII).toString());
+                    break;
+                case 0x04:
+                    position.set(Position.KEY_ICCID, BufferUtil.readString(buf, length));
+                    break;
+                case 0x05:
+                    position.set("bleMac", ByteBufUtil.hexDump(buf.readSlice(length)));
+                    break;
+                case 0x06:
+                    position.set("settingTime", buf.readUnsignedInt());
+                    break;
+                case 0x07:
+                    position.set("runTimes", buf.readUnsignedInt());
+                    break;
+                case 0x0A:
+                    position.set("interval", buf.readUnsignedMedium());
+                    position.set("petMode", buf.readUnsignedByte());
+                    break;
+                case 0x0D:
+                    position.set("passwordProtect", buf.readUnsignedInt());
+                    break;
+                case 0x0E:
+                    position.set("timeZone", (int) buf.readByte());
+                    break;
+                case 0x0F:
+                    position.set("enableControl", buf.readUnsignedInt());
+                    break;
+                case 0x13:
+                    position.set("deviceName", BufferUtil.readString(buf, length));
+                    break;
+                case 0x14:
+                    position.set(Position.KEY_BATTERY_LEVEL, buf.readUnsignedByte());
+                    position.set(Position.KEY_BATTERY, buf.readUnsignedShort() * 0.001);
+                    break;
+                case 0x15:
+                    position.set("bleLatitude", buf.readIntLE() * 0.0000001);
+                    position.set("bleLongitude", buf.readIntLE() * 0.0000001);
+                    position.set("bleLocation", BufferUtil.readString(buf, length - 8));
+                    break;
+                case 0x17:
+                    position.set("gpsUrl", BufferUtil.readString(buf, length));
+                    break;
+                case 0x18:
+                    position.set("lbsUrl", BufferUtil.readString(buf, length));
+                    break;
+                case 0x1A:
+                    position.set("firmware", BufferUtil.readString(buf, length));
+                    break;
+                case 0x1B:
+                    position.set("gsmModule", BufferUtil.readString(buf, length));
+                    break;
+                case 0x1D:
+                    position.set("agpsUpdate", buf.readUnsignedByte());
+                    position.set("agpsLatitude", buf.readIntLE() * 0.0000001);
+                    position.set("agpsLongitude", buf.readIntLE() * 0.0000001);
+                    break;
+                case 0x30:
+                    position.set("numberFlag", buf.readUnsignedByte());
+                    position.set("number", BufferUtil.readString(buf, length - 1));
+                    break;
+                case 0x31:
+                    position.set("prefixFlag", buf.readUnsignedByte());
+                    position.set("prefix", BufferUtil.readString(buf, length - 1));
+                    break;
+                case 0x33:
+                    position.set("phoneSwitches", buf.readUnsignedByte());
+                    break;
+                case 0x40:
+                    position.set("apn", BufferUtil.readString(buf, length));
+                    break;
+                case 0x41:
+                    position.set("apnUser", BufferUtil.readString(buf, length));
+                    break;
+                case 0x42:
+                    position.set("apnPassword", BufferUtil.readString(buf, length));
+                    break;
+                case 0x43:
+                    buf.readUnsignedByte(); // flag
+                    position.set("port", buf.readUnsignedShort());
+                    position.set("server", BufferUtil.readString(buf, length - 3));
+                    break;
+                case 0x44:
+                    position.set("heartbeatInterval", buf.readUnsignedInt());
+                    position.set("uploadInterval", buf.readUnsignedInt());
+                    position.set("uploadLazyInterval", buf.readUnsignedInt());
+                    break;
+                case 0x47:
+                    position.set("deviceId", BufferUtil.readString(buf, length));
+                    break;
+                case 0x4E:
+                    position.set("gsmBand", buf.readUnsignedByte());
+                    break;
+                case 0x50:
+                    position.set("powerAlert", buf.readUnsignedInt());
+                    break;
+                case 0x51:
+                    position.set("geoAlert", buf.readUnsignedInt());
+                    break;
+                case 0x53:
+                    position.set("motionAlert", buf.readUnsignedInt());
+                    break;
+                case 0x5C:
+                    position.set("barkLevel", buf.readUnsignedByte());
+                    position.set("barkInterval", buf.readUnsignedInt());
+                    break;
+                case 0x61:
+                    position.set("msisdn", BufferUtil.readString(buf, length));
+                    break;
+                case 0x62:
+                    position.set("wifiWhitelist", buf.readUnsignedByte());
+                    position.set("wifiWhitelistMac", ByteBufUtil.hexDump(buf.readSlice(6)));
+                    break;
+                case 0x64:
+                    position.set(Position.KEY_RSSI, buf.readUnsignedByte());
+                    position.set("networkBand", buf.readUnsignedInt());
+                    position.set(Position.KEY_OPERATOR, BufferUtil.readString(buf, length - 5));
+                    break;
+                case 0x65:
+                    position.set(Position.KEY_RSSI, buf.readUnsignedByte());
+                    position.set("networkStatus", buf.readUnsignedByte());
+                    position.set("serverStatus", buf.readUnsignedByte());
+                    position.set("networkPlmn", ByteBufUtil.hexDump(buf.readSlice(6)));
+                    position.set("homePlmn", ByteBufUtil.hexDump(buf.readSlice(6)));
+                    break;
+                case 0x66:
+                    position.set("imsi", BufferUtil.readString(buf, length));
+                    break;
+                case 0x75:
+                    position.set("extraEnableControl", buf.readUnsignedInt());
+                    break;
+                default:
+                    break;
+            }
+
+            buf.readerIndex(endIndex);
+        }
+
+        return position;
+    }
+
 }