Merge pull request #46 from ashemah/master

Send events through NativeEventEmitter rather than the bridge on iOS.

Author: MacKentoch

ReactNativeBeaconsManager.podspec

@@ -0,0 +1,11 @@
+Pod::Spec.new do |s|
+  s.name         = "ReactNativeBeaconsManager"
+  s.version      = "1.0.8"
+  s.summary      = "React-Native library for detecting beacons (iOS and Android)"
+  s.homepage     = "https://github.com/MacKentoch/react-native-beacons-manager#readme"
+  s.license      = { :type => "MIT" }
+  s.authors      = { "" => "" }
+  s.platform     = :ios, "8.0"
+  s.source       = { :path => "." }
+  s.source_files = "ios", "ios/**/*.{h,m}"
+end

examples/samples/ranging.ios.js

@@ -1,4 +1,5 @@
 
+import { NativeEventEmitter } from 'react-native'
 import Beacons  from 'react-native-beacons-manager';
 import moment   from 'moment';
 
@@ -8,6 +9,10 @@ class beaconRangingOnly extends Component {
  constructor(props) {
    super(props);
 
+   this.beaconsEmitter = new NativeEventEmitter(Beacons);
+   this.beaconsDidRangeEvent = null;
+   this.authStateDidRangeEvent = null;
+
    this.state = {
      // region information
      uuid: '7b44b47b-52a1-5381-90c2-f09b6838c5d4',
@@ -24,7 +29,7 @@ class beaconRangingOnly extends Component {
    //
 
    // OPTIONAL: listen to authorization change
-   DeviceEventEmitter.addListener(
+   this.authStateDidRangeEvent = this.beaconsEmitter.addListener(
      'authorizationStatusDidChange',
      (info) => console.log('authorizationStatusDidChange: ', info)
    );
@@ -47,7 +52,7 @@ class beaconRangingOnly extends Component {
    //
 
    // Ranging: Listen for beacon changes
-   DeviceEventEmitter.addListener(
+   this.beaconsDidRangeEvent = this.beaconsEmitter.addListener(
      'beaconsDidRange',
      (data) => {
       //  console.log('beaconsDidRange data: ', data);
@@ -62,7 +67,8 @@ class beaconRangingOnly extends Component {
    // stop ranging beacons:
    Beacons.stopRangingBeaconsInRegion(region);
    // remove beacons event we registered at componentDidMount
-   DeviceEventEmitter.removeListener('beaconsDidRange');
+   this.beaconsDidRangeEvent.remove();
+   this.authStateDidRangeEvent.remove();
  }
 
  render() {

ios/RNiBeacon/RNiBeacon/RNiBeacon.h

@@ -7,8 +7,10 @@
 //
 
 #import <Foundation/Foundation.h>
+
 #import <React/RCTBridgeModule.h>
+#import <React/RCTEventEmitter.h>
 
-@interface RNiBeacon : NSObject <RCTBridgeModule>
+@interface RNiBeacon : RCTEventEmitter <RCTBridgeModule>
 
 @end

ios/RNiBeacon/RNiBeacon/RNiBeacon.m

@@ -25,8 +25,6 @@ @implementation RNiBeacon
 
 RCT_EXPORT_MODULE()
 
-@synthesize bridge = _bridge;
-
 #pragma mark Initialization
 
 - (instancetype)init
@@ -42,6 +40,17 @@ - (instancetype)init
   return self;
 }
 
+- (NSArray<NSString *> *)supportedEvents
+{
+    return @[
+             @"authorizationStatusDidChange",
+             @"beaconsDidRange",
+             @"regionDidEnter",
+             @"regionDidExit",
+             @"didDetermineState"
+             ];
+}
+
 #pragma mark
 
 -(CLBeaconRegion *) createBeaconRegion: (NSString *) identifier
@@ -207,8 +216,8 @@ -(NSString *)nameForAuthorizationStatus:(CLAuthorizationStatus)authorizationStat
 
 -(void)locationManager:(CLLocationManager *)manager didChangeAuthorizationStatus:(CLAuthorizationStatus)status
 {
-  NSString *statusName = [self nameForAuthorizationStatus:status];
-  [self.bridge.eventDispatcher sendDeviceEventWithName:@"authorizationStatusDidChange" body:statusName];
+    NSString *statusName = [self nameForAuthorizationStatus:status];
+    [self sendEventWithName:@"authorizationStatusDidChange" body:statusName];
 }
 
 -(void)locationManager:(CLLocationManager *)manager rangingBeaconsDidFailForRegion:(CLBeaconRegion *)region withError:(NSError *)error
@@ -224,6 +233,25 @@ -(void)locationManager:(CLLocationManager *)manager didFailWithError:(NSError *)
   NSLog(@"Location manager failed: %@", error);
 }
 
+-(NSString *)stringForState:(CLRegionState)state {
+  switch (state) {
+    case CLRegionStateInside:   return @"inside";
+    case CLRegionStateOutside:  return @"outside";
+    case CLRegionStateUnknown:  return @"unknown";
+    default:                    return @"unknown";
+  }
+}
+
+- (void) locationManager:(CLLocationManager *)manager didDetermineState:(CLRegionState)state forRegion:(CLRegion *)region
+{
+    NSDictionary *event = @{
+                          @"state":   [self stringForState:state],
+                          @"identifier":  region.identifier,
+                          };
+  
+    [self sendEventWithName:@"didDetermineState" body:event];  
+}
+
 -(void) locationManager:(CLLocationManager *)manager didRangeBeacons:
 (NSArray *)beacons inRegion:(CLBeaconRegion *)region
 {
@@ -252,7 +280,7 @@ -(void) locationManager:(CLLocationManager *)manager didRangeBeacons:
                           @"beacons": beaconArray
                           };
 
-  [self.bridge.eventDispatcher sendDeviceEventWithName:@"beaconsDidRange" body:event];
+    [self sendEventWithName:@"beaconsDidRange" body:event];
 }
 
 -(void)locationManager:(CLLocationManager *)manager
@@ -262,7 +290,7 @@ -(void)locationManager:(CLLocationManager *)manager
                           @"uuid": [region.proximityUUID UUIDString],
                           };
 
-  [self.bridge.eventDispatcher sendDeviceEventWithName:@"regionDidEnter" body:event];
+    [self sendEventWithName:@"regionDidEnter" body:event];
 }
 
 -(void)locationManager:(CLLocationManager *)manager
@@ -272,7 +300,7 @@ -(void)locationManager:(CLLocationManager *)manager
                           @"uuid": [region.proximityUUID UUIDString],
                           };
 
-  [self.bridge.eventDispatcher sendDeviceEventWithName:@"regionDidExit" body:event];
+    [self sendEventWithName:@"regionDidExit" body:event];
 }