Merge pull request #358 from AltBeacon/uribeacon

Add support for pre-Eddystone UriBeacon layout
AltBeacon · Mar 29, 2016 · 12b9731 · 12b9731
2 parents 4b56086 + 0751b89
commit 12b9731
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 0 deletions.
diff --git a/src/main/java/org/altbeacon/beacon/BeaconParser.java b/src/main/java/org/altbeacon/beacon/BeaconParser.java
@@ -42,6 +42,7 @@ public class BeaconParser {
     public static final String EDDYSTONE_TLM_LAYOUT = "x,s:0-1=feaa,m:2-2=20,d:3-3,d:4-5,d:6-7,d:8-11,d:12-15";
     public static final String EDDYSTONE_UID_LAYOUT = "s:0-1=feaa,m:2-2=00,p:3-3:-41,i:4-13,i:14-19";
     public static final String EDDYSTONE_URL_LAYOUT = "s:0-1=feaa,m:2-2=10,p:3-3:-41,i:4-20v";
+    public static final String URI_BEACON_LAYOUT = "s:0-1=fed8,m:2-2=00,p:3-3:-41,i:4-21v";
     private static final Pattern I_PATTERN = Pattern.compile("i\\:(\\d+)\\-(\\d+)([blv]*)?");
     private static final Pattern M_PATTERN = Pattern.compile("m\\:(\\d+)-(\\d+)\\=([0-9A-Fa-f]+)");
     private static final Pattern S_PATTERN = Pattern.compile("s\\:(\\d+)-(\\d+)\\=([0-9A-Fa-f]+)");

diff --git a/src/test/java/org/altbeacon/beacon/GattBeaconTest.java b/src/test/java/org/altbeacon/beacon/GattBeaconTest.java
@@ -4,6 +4,7 @@
 
 import org.altbeacon.beacon.logging.LogManager;
 import org.altbeacon.beacon.logging.Loggers;
+import org.altbeacon.beacon.utils.UrlBeaconUrlCompressor;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
@@ -137,6 +138,27 @@ public void testBeaconAdvertisingBytes() {
         assertEquals("Advertisement bytes should be as expected", "00 25 C5 45 44 52 E2 97 35 32 3D 81 C0 06 05 04 03 02 01 ", byteString);
     }
 
+    @Test
+    public void testDetectsUriBeacon() {
+        org.robolectric.shadows.ShadowLog.stream = System.err;
+        LogManager.setLogger(Loggers.verboseLogger());
+        LogManager.setVerboseLoggingEnabled(true);
+        //"https://goo.gl/hqBXE1"
+        byte[] bytes = {2, 1, 4, 3, 3, (byte) 216, (byte) 254, 19, 22, (byte) 216, (byte) 254, 0, (byte) 242, 3, 103, 111, 111, 46, 103, 108, 47, 104, 113, 66, 88, 69, 49, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+        BeaconParser parser = new BeaconParser().setBeaconLayout("s:0-1=fed8,m:2-2=00,p:3-3:-41,i:4-21v");
+        LogManager.d("xxx", "------");
+        Beacon uriBeacon = parser.fromScanData(bytes, -55, null);
+        assertNotNull("UriBeacon should be not null if parsed successfully", uriBeacon);
+        assertEquals("UriBeacon identifier length should be correct",
+                14,
+                uriBeacon.getId1().toByteArray().length);
+        String urlString = UrlBeaconUrlCompressor.uncompress(uriBeacon.getId1().toByteArray());
+        assertEquals("URL should be decompressed successfully", "https://goo.gl/hqBXE1", urlString);
+    }
+
+
+
+
 
     public static byte[] hexStringToByteArray(String s) {
         int len = s.length();