agrawal-git · Dec 9, 2019 · Dec 9, 2019 · Dec 9, 2019 · Dec 9, 2019 · Dec 9, 2019
diff --git a/README.md b/README.md
@@ -1,7 +1,16 @@
 [![npm](https://img.shields.io/npm/l/@hkpuits/react-native-beacons-manager.svg)](https://github.com/benlui/react-native-beacons-manager)
 [![npm](https://img.shields.io/npm/v/@hkpuits/react-native-beacons-manager.svg)](https://www.npmjs.com/package/@hkpuits/react-native-beacons-manager)
 
-# @hkpuits/react-native-beacons-manager
+# fork of @hkpuits/react-native-beacons-manager
+
+---
+eddystone (kontakt io) support
+---
+fork descreption:original plugin was unable to handle kontakt io (eddystone) beacons. 
+for ios:added 6 byte instance id to eddystone uuid to be able to recognize kontaktio frames 100ms (by default recognizes only 1000ms ibeacon and recognizes eddystone without instance id) use EDDY_STONE_REGION_ID to start scan
+
+for android: added instanceId key to beacon array to recognize eddystone unique ids. use Beacons.addEddystoneUIDDetection();
+
 
 ![logo](./images/RN-iBeacon.png)
 
@@ -232,4 +241,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.
diff --git a/android/build.gradle b/android/build.gradle
@@ -32,7 +32,7 @@ repositories {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.facebook.react:react-native:+'
+    implementation 'com.facebook.react:react-native:0.61.+'
     implementation 'org.altbeacon:android-beacon-library:2.15.2'
     implementation "com.android.support:appcompat-v7:27.1.1"
     implementation "com.android.support:support-v4:27.1.1"

diff --git a/android/src/main/java/com/mackentoch/beaconsandroid/BeaconsAndroidModule.java b/android/src/main/java/com/mackentoch/beaconsandroid/BeaconsAndroidModule.java
@@ -456,7 +456,12 @@ private WritableMap createRangingResponse(Collection<Beacon> beacons, Region reg
         for (Beacon beacon : beacons) {
             WritableMap b = new WritableNativeMap();
             b.putString("uuid", beacon.getId1().toString());
-            if (beacon.getIdentifiers().size() > 2) {
+            if (beacon.getServiceUuid() == 0xfeaa && beacon.getBeaconTypeCode() == 0x00) {
+                // This is a Eddystone-UID frame
+                b.putString("namespaceId", beacon.getId1().toString());
+                b.putString("instanceId", beacon.getId2().toString());
+            }
+            else if (beacon.getIdentifiers().size() > 2) {
                 b.putInt("major", beacon.getId2().toInt());
                 b.putInt("minor", beacon.getId3().toInt());
             }

diff --git a/ios/RNiBeacon/RNiBeacon/ESSBeaconScanner.m b/ios/RNiBeacon/RNiBeacon/ESSBeaconScanner.m
@@ -69,6 +69,7 @@ - (instancetype)init {
 }
 
 - (void)startScanning {
+  NSLog(@"Startscan");
   dispatch_async(_beaconOperationsQueue, ^{
     if (_centralManager.state != CBCentralManagerStatePoweredOn) {
       NSLog(@"CBCentralManager state is %ld, cannot start or stop scanning",
@@ -108,14 +109,28 @@ - (void)centralManager:(CBCentralManager *)central
                      RSSI:(NSNumber *)RSSI {
   NSDictionary *serviceData = advertisementData[CBAdvertisementDataServiceDataKey];
   NSData *beaconServiceData = serviceData[[ESSBeaconInfo eddystoneServiceID]];
+
+
+  //NSString* localName = advertisementData[CBAdvertisementDataLocalNameKey];
+  //NSLog(@"Name: (%s)", localName);
+  /*
+  NSMutableDictionary* advertisement = [NSMutableDictionary dictionary];
+  [advertisement setValue:[advertisementData valueForKey:CBAdvertisementDataLocalNameKey] forKey:@"localName"];
+  NSData* data = [advertisementData valueForKey:CBAdvertisementDataManufacturerDataKey];
+  NSString* dataString = [data base64EncodedStringWithOptions:0];
+  [advertisement setValue:dataString forKey:@"manufacturerData"];
+  */
 
   ESSFrameType frameType = [ESSBeaconInfo frameTypeForFrame:beaconServiceData];
-
   // If it's a telemetry (TLM) frame, then save it into our cache so that the next time we get a
   // UID frame (i.e. an Eddystone "sighting"), we can include the telemetry with it.
   if (frameType == kESSEddystoneTelemetryFrameType) {
+    //NSLog(@"Frame type telemetry (%d).", (int)frameType);
     _tlmCache[peripheral.identifier] = beaconServiceData;
+    //NSLog(@"Telemetry frame type (%d) detected.", (int)frameType);
+    //[self notifyDidRangeBeacon:_eddystoneBeaconsCache];
   } else if (frameType == kESSEddystoneURLFrameType) {
+    //NSLog(@"Frame type kESSEddystoneURLFrameType (%d).", (int)frameType);
     NSURL *url = [ESSBeaconInfo parseURLFromFrameData:beaconServiceData];
 
     // Report the sighted URL frame.
@@ -124,6 +139,7 @@ - (void)centralManager:(CBCentralManager *)central
     }
   } else if (frameType == kESSEddystoneUIDFrameType
              || frameType == kESSEddystoneEIDFrameType) {
+    //NSLog(@"rssi (%f).", RSSI);
     CBUUID *eddystoneServiceUUID = [ESSBeaconInfo eddystoneServiceID];
     NSData *eddystoneServiceData = serviceData[eddystoneServiceUUID];
 
@@ -166,16 +182,21 @@ - (void)centralManager:(CBCentralManager *)central
 
         _eddystoneBeaconsCache[beaconInfo.beaconID] = @{
             kSeenCacheBeaconInfo: beaconInfo,
-            kSeenCacheOnLostTimer: onLostTimer,
+            //kSeenCacheOnLostTimer: onLostTimer,
         };
         [self notifyDidRangeBeacon:_eddystoneBeaconsCache];
       } else {
         // Reset the onLost timer.
-        [_eddystoneBeaconsCache[beaconInfo.beaconID][kSeenCacheOnLostTimer] reschedule];
+         _eddystoneBeaconsCache[beaconInfo.beaconID] = @{
+            kSeenCacheBeaconInfo: beaconInfo,
+            //kSeenCacheOnLostTimer: onLostTimer,
+        };
+        //[_eddystoneBeaconsCache[beaconInfo.beaconID][kSeenCacheOnLostTimer] reschedule];
         [self notifyDidRangeBeacon:_eddystoneBeaconsCache];
       }
     }
   } else {
+    //[self notifyDidRangeBeacon:_eddystoneBeaconsCache];
     NSLog(@"Unsupported frame type (%d) detected. Ignorning.", (int)frameType);
   }
 }

diff --git a/ios/RNiBeacon/RNiBeacon/RNiBeacon.m b/ios/RNiBeacon/RNiBeacon/RNiBeacon.m
@@ -406,7 +406,7 @@ -(void) locationManager:(CLLocationManager *)manager didRangeBeacons:(NSArray *)
   }
 
   if (self.dropEmptyRanges && beacons.count == 0) {
-    return;
+    //return;
   }
   NSMutableArray *beaconArray = [[NSMutableArray alloc] init];
 
@@ -431,7 +431,7 @@ -(void) locationManager:(CLLocationManager *)manager didRangeBeacons:(NSArray *)
                           @"beacons": beaconArray
                           };
 
-    NSLog(@"[Beacon][Native] beaconsDidRange %lu", [beaconArray count]);
+    NSLog(@"[Beacon][Native] ..beaconsDidRange %lu", [beaconArray count]);
 
     [self sendEventWithName:@"beaconsDidRange" body:event];
 }
@@ -543,7 +543,7 @@ - (NSNumber*)calculateDistance:(NSNumber*)txPower rssi:(NSNumber*) rssi {
 
 - (NSString *)getEddyStoneUUID:(NSData*)data {
     const unsigned char *dataBuffer = (const unsigned char *)[data bytes];
-    const int EDDYSTONE_UUID_LENGTH = 10;
+    const int EDDYSTONE_UUID_LENGTH = 16;
     if (!dataBuffer) {
         return [NSString string];
     }

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hkpuits/react-native-beacons-manager",
-  "version": "1.2.5",
+  "version": "1.2.6",
   "description": "React-Native library for detecting beacons (iOS and Android)",
   "keywords": [
     "react-native",
@@ -18,7 +18,7 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/benlui/react-native-beacons-manager.git"
+    "url": "https://github.com/levepic/react-native-beacons-manager.git"
   },
   "typescript": {
     "definition": "typings/react-native-beacons-manager.d.ts"