Implement Aplicom H protocol

2 files changed, 86 insertions, 3 deletions

diff --git a/src/org/traccar/protocol/AplicomProtocolDecoder.java b/src/org/traccar/protocol/AplicomProtocolDecoder.java
index abd30ee45..fa512d8b1 100644
--- a/src/org/traccar/protocol/AplicomProtocolDecoder.java
+++ b/src/org/traccar/protocol/AplicomProtocolDecoder.java
@@ -348,6 +348,84 @@ public class AplicomProtocolDecoder extends BaseProtocolDecoder {
         }
     }
 
+    private void decodeH(Position position, ChannelBuffer buf, int selector) {
+
+        if ((selector & 0x0004) != 0) {
+            getLastLocation(position, new Date(buf.readUnsignedInt() * 1000));
+        } else {
+            getLastLocation(position, null);
+        }
+
+        if ((selector & 0x0040) != 0) {
+            buf.readUnsignedInt(); // reset time
+        }
+
+        if ((selector & 0x2000) != 0) {
+            buf.readUnsignedShort(); // snapshot counter
+        }
+
+        int index = 1;
+        while (buf.readableBytes() > 0) {
+
+            position.set("h" + index + "Index", buf.readUnsignedByte());
+
+            buf.readUnsignedShort(); // length
+
+            int n = buf.readUnsignedByte();
+            int m = buf.readUnsignedByte();
+
+            position.set("h" + index + "XLength", n);
+            position.set("h" + index + "YLength", m);
+
+            if ((selector & 0x0008) != 0) {
+                position.set("h" + index + "XType", buf.readUnsignedByte());
+                position.set("h" + index + "YType", buf.readUnsignedByte());
+                position.set("h" + index + "Parameters", buf.readUnsignedByte());
+            }
+
+            boolean percentageFormat = (selector & 0x0020) != 0;
+
+            StringBuilder data = new StringBuilder();
+            for (int i = 0; i < n * m; i++) {
+                if (percentageFormat) {
+                    data.append(buf.readUnsignedByte() * 0.5).append("%").append(" ");
+                } else {
+                    data.append(buf.readUnsignedShort()).append(" ");
+                }
+            }
+
+            position.set("h" + index + "Data", data.toString().trim());
+
+            position.set("h" + index + "Total", buf.readUnsignedInt());
+
+            if ((selector & 0x0010) != 0) {
+                int k = buf.readUnsignedByte();
+
+                data = new StringBuilder();
+                for (int i = 1; i < n; i++) {
+                    if (k == 1) {
+                        data.append(buf.readByte()).append(" ");
+                    } else if (k == 2) {
+                        data.append(buf.readShort()).append(" ");
+                    }
+                }
+                position.set("h" + index + "XLimits", data.toString().trim());
+
+                data = new StringBuilder();
+                for (int i = 1; i < m; i++) {
+                    if (k == 1) {
+                        data.append(buf.readByte()).append(" ");
+                    } else if (k == 2) {
+                        data.append(buf.readShort()).append(" ");
+                    }
+                }
+                position.set("h" + index + "YLimits", data.toString().trim());
+            }
+
+            index += 1;
+        }
+    }
+
     @Override
     protected Object decode(Channel channel, SocketAddress remoteAddress, Object msg) throws Exception {
 
@@ -389,6 +467,8 @@ public class AplicomProtocolDecoder extends BaseProtocolDecoder {
             decodeD(position, buf, selector, event);
         } else if (protocol == 'E') {
             decodeE(position, buf, selector);
+        } else if (protocol == 'H') {
+            decodeH(position, buf, selector);
         } else {
             return null;
         }
diff --git a/test/org/traccar/protocol/AplicomProtocolDecoderTest.java b/test/org/traccar/protocol/AplicomProtocolDecoderTest.java
index d6a29c6dd..cb39b5d2e 100644
--- a/test/org/traccar/protocol/AplicomProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/AplicomProtocolDecoderTest.java
@@ -11,6 +11,12 @@ public class AplicomProtocolDecoderTest extends ProtocolTest {
         AplicomProtocolDecoder decoder = new AplicomProtocolDecoder(new AplicomProtocol());

 

         verifyAttributes(decoder, binary(

+                "48C1014143B4493145004900203F6D014B5557C20003000015060110FF00C800000000000000003D01141E283C500100260404010200000000000000000000000000C8000000000000010200110019001E0064019003E8"));

+

+        verifyAttributes(decoder, binary(

+                "48c10144b9de54e6b2008700205f710a57d23ec957d23b8d00000000300d0106ff00000000000000000000000000000000000000000000000000000000000000010a141e28323c46505a646e7801000f020104ff000000000000000000010102000f020104ff000000000000000000010103000f020104ff000000000000000000010105000f020104ff0000000000000000000101"));

+

+        verifyAttributes(decoder, binary(

                 "45c20145931876ffb2007100ffff6d00000057c6dd1970230d087b1f7d7f0000d0c1000000003580000035801f40ffff5001574442393036363035533132333435363700014142432d333435202020202020000000000000000000000000000000000000000000000001123130343632343639373030303030303100000000"));

 

         verifyAttributes(decoder, binary(

@@ -19,9 +25,6 @@ public class AplicomProtocolDecoderTest extends ProtocolTest {
         verifyAttributes(decoder, binary(

                 "45c20145931876ffb2007100ffff6d00000057c6de0970270d087b1f7d7f0000d0c1000000003580000035801f40ffff5001574442393036363035533132333435363700014142432d333435202020202020000000000000000000000000000000000000000000000001123130343632343639373030303030303100000000"));

 

-        verifyNothing(decoder, binary(

-                "48c10144b9de54e6b2008700205f710a57d23ec957d23b8d00000000300d0106ff00000000000000000000000000000000000000000000000000000000000000010a141e28323c46505a646e7801000f020104ff000000000000000000010102000f020104ff000000000000000000010103000f020104ff000000000000000000010105000f020104ff0000000000000000000101"));

-

         verifyAttributes(decoder, binary(

                 "44c3014645e8ecff3c00ea03ffffbc00f457d68a6557d68a6303bb55fa018843da1100009881000000000000000000000000000000000000000000000000000000000000000000000000000000ff0056007600000000000000014542016d0001010095070e14014645e8ecff3c57d68a6403bb55fa018843dac0010d14ff050102030405060708090a0b0c0d0e0f10112a01010730343f3c1ff5cf01020700007d007d23010103022f2e01060c67452301efcdab8967452301010b10000000007d007d007d7dffffffffffff010a2400000000000000010000000000000000ffffffffffffffff00010001ffff00000000ffff010c02fec6"));