#14 find array with value

entraeiendom · Aug 25, 2020 · 6c4b9af · 6c4b9af
1 parent 0e76c6c
commit 6c4b9af
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 0 deletions.
diff --git a/src/main/java/no/entra/bacnet/json/observation/ObservationParser.java b/src/main/java/no/entra/bacnet/json/observation/ObservationParser.java
@@ -181,6 +181,12 @@ public static ObservationList parseConfirmedCOVNotification(String changeOfValue
                     if (arraySize > -1) {
                         //exptect array
                         //array start = 2e, end i 2f
+                        String arrayContent = findArrayContent(covReader);
+                        OctetReader arrayReader = new OctetReader(arrayContent);
+                        if (arrayReader.next().toString().equals("44")) {
+                            String realValueString = arrayReader.next(4);
+
+                        }
                     }
                     Octet valueTagKey = covReader.next();
                     Octet propertyIdKey = covReader.next();

diff --git a/src/main/java/no/entra/bacnet/json/utils/HexUtils.java b/src/main/java/no/entra/bacnet/json/utils/HexUtils.java
@@ -60,6 +60,28 @@ public static int toInt(Octet[] octets) throws IllegalArgumentException {
         return toInt(octetsToString(octets));
     }
 
+    public static float toFloat(String hexString) throws IllegalArgumentException {
+        if (hexString == null || hexString.isEmpty()) {
+            throw new IllegalArgumentException("hexString may not be null.");
+        }
+        Long realLong = Long.parseLong(hexString, 16);
+        Float real = Float.intBitsToFloat(realLong.intValue());
+        return real;
+    }
+
+
+
+    public static long toLong(String hexString) {
+        if (hexString == null || hexString.isEmpty()) {
+            throw new IllegalArgumentException("hexString may not be null.");
+        }
+        if (hexString.length() == 16) {
+            return (toLong(hexString.substring(0, 1)) << 60)
+                    | toLong(hexString.substring(1));
+        }
+        return Long.parseLong(hexString, 16);
+    }
+
     public static String toBitString(char nibble) {
         String bitString = null;
         if (HexMatcher.isValidHexChar(nibble)) {

diff --git a/src/test/java/no/entra/bacnet/json/utils/HexUtilsTest.java b/src/test/java/no/entra/bacnet/json/utils/HexUtilsTest.java
@@ -95,4 +95,14 @@ void toIntTest() {
         assertThrows(IllegalArgumentException.class, () -> toInt(isnull));
         assertEquals(12, toInt("0c"));
     }
+
+    @Test
+    void toFloatTest() {
+        assertThrows(IllegalArgumentException.class, () -> toFloat(""));
+        String isnull = null;
+        assertThrows(IllegalArgumentException.class, () -> toFloat(isnull));
+        assertEquals(Float.valueOf("20.6"), toFloat("41a4cccd"));
+    }
+
+
 }