Update iOS to SDK v 0.5.0. Include missing beacon properties rssi and…

… accuracy in iOS
bluecats · Mar 8, 2015 · 41453c5 · 41453c5
1 parent b483225
commit 41453c5
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 5 deletions.
diff --git a/src/ios/BlueCatsSDK/BCBeacon.h b/src/ios/BlueCatsSDK/BCBeacon.h
@@ -42,12 +42,13 @@ typedef enum {
 
 typedef enum {
     BCBlockDataEncodingNone = 0,
-    BCBlockDataEncodingUTF8
+    BCBlockDataEncodingUTF8,
+    BCBlockDataEncodingJSON
 } BCBlockDataEncoding;
 
 typedef enum {
     BCBlockDataTypeCustom = 0,
-    BCBlockDataTypeTempInCelcius
+    BCBlockDataTypeTempInCelcius,
 } BCBlockDataType;
 
 
@@ -110,6 +111,7 @@ typedef enum {
 @property (nonatomic, copy) NSDate *verifiedAt;
 @property (nonatomic, assign) BCVerificationStatus verificationStatus;
 
+- (NSNumber *)averageAdsPerMinuteForAdDataType:(NSString *)adDataTypeKey;
 - (void)removeAllAdData;
 - (void)removeAdDataForAdDataTypeKey:(NSString *)adDataTypeKey;
 - (void)setAdData:(NSDictionary *)adData forAdDataTypeKey:(NSString *)adDataTypeKey;
@@ -140,6 +142,10 @@ extern NSString * const BCFirmwareVersion011;
 extern NSString * const BCFirmwareVersion020;
 extern NSString * const BCFirmwareVersion030;
 extern NSString * const BCFirmwareVersion031;
+extern NSString * const BCFirmwareVersion040;
+extern NSString * const BCFirmwareVersion041;
+extern NSString * const BCFirmwareVersion050;
+extern NSString * const BCFirmwareVersion051;
 
 extern NSString * const BCAdDataTypeKey;
 
@@ -164,6 +170,10 @@ extern NSString * const BCBlueCatsAdDataMeasuredPowerAt1MeterKey;
 extern NSString * const BCBlueCatsAdDataBeaconLoudnessLevelKey;
 extern NSString * const BCBlueCatsAdDataTargetSpeedInMillisecondsKey;
 extern NSString * const BCBlueCatsAdDataSequenceNumberKey;
+extern NSString * const BCBlueCatsAdDataTimestampKey;
+extern NSString * const BCBlueCatsAdDataFirstRecievedAtKey;
+extern NSString * const BCBlueCatsAdDataRecievedCountKey;
+extern NSString * const BCBlueCatsAdDataCountPerMinuteKey;
 
 extern NSString * const BCBlueCatsBlockDataIdentifierKey;
 extern NSString * const BCBlueCatsBlockDataTypeKey;
@@ -173,9 +183,14 @@ extern NSString * const BCBlueCatsBlockDataIndexKey;
 extern NSString * const BCBlueCatsBlockDataLengthKey;
 extern NSString * const BCBlueCatsBlockDataKey;
 extern NSString * const BCBlueCatsIndexedBlockDataKey;
+extern NSString * const BCBlueCatsBlockDataTimestampKey;
 
 extern NSString * const BCAppleIBeaconAdDataProximityUUIDStringKey;
 extern NSString * const BCAppleIBeaconAdDataMajorKey;
 extern NSString * const BCAppleIBeaconAdDataMinorKey;
 extern NSString * const BCAppleIBeaconAdDataMeasuredPowerAt1MeterKey;
+extern NSString * const BCAppleIBeaconAdDataTimestampKey;
+extern NSString * const BCAppleIBeaconAdDataFirstRecievedAtKey;
+extern NSString * const BCAppleIBeaconAdDataRecievedCountKey;
+extern NSString * const BCAppleIBeaconAdDataCountPerMinuteKey;
 
diff --git a/src/ios/BlueCatsSDK/BCBeaconVisit.h b/src/ios/BlueCatsSDK/BCBeaconVisit.h
@@ -49,6 +49,8 @@
 @property (nonatomic, assign) NSInteger beaconModeID;
 @property (nonatomic, strong) BCManagedBeaconVisit *managedBeaconVisit;
 
+@property (nonatomic, assign, getter=isCurrentlyVisiting) BOOL currentlyVisiting;
+
 - (void)setLocation:(CLLocation *)location;
 
 + (BCBeaconVisit *)beaconVisitWithManagedBeaconVisit:(BCManagedBeaconVisit *)managedbeaconVisit;

diff --git a/src/ios/BlueCatsSDK/BCEventFilter.h b/src/ios/BlueCatsSDK/BCEventFilter.h
@@ -49,6 +49,8 @@
 +(id<BCEventFilter>)filterByAccuracyRangeFrom:(double)fromAccuracy to:(double)toAccuracy;
 +(id<BCEventFilter>)filterByCategoriesNamed:(NSArray *)categoryNames;
 +(id<BCEventFilter>)filterByCategoriesWithIDs:(NSArray *)categoryIDs;
++(id<BCEventFilter>)filterByCustomValuesWithKeys:(NSArray *)customValueKeys;
++(id<BCEventFilter>)filterByCategoriesWithCustomValueKeys:(NSArray *)keys;
 +(id<BCEventFilter>)filterBySitesNamed:(NSArray *)siteNames;
 +(id<BCEventFilter>)filterBySitesWithIDs:(NSArray *)siteIDs;
 +(id<BCEventFilter>)filterBySitesWithPredicate:(NSPredicate*)sitePredicate;
@@ -65,7 +67,7 @@
 +(id<BCEventFilter>)filterByExitedAllBeaconsAfterTimeInterval:(NSTimeInterval)minTimeIntervalUnmatched;
 
 +(id<BCEventFilter>)filterByReassembledBlockDataWithDataType:(BCBlockDataType)dataType;
-
++(id<BCEventFilter>)filterByNeverEnteredBeacon;
 @end
 
 
diff --git a/src/ios/BlueCatsSDK/BCMicroLocation.h b/src/ios/BlueCatsSDK/BCMicroLocation.h
@@ -7,11 +7,10 @@
 //
 
 #import "BCBeacon.h"
-#import "BCJSONModel.h"
 
 @class BCSite, BCMapPoint;
 
-@interface BCMicroLocation : BCJSONModel <NSCopying>
+@interface BCMicroLocation : NSObject <NSCopying>
 
 @property (nonatomic, copy) NSArray *sites;
 @property (nonatomic, copy) NSDictionary *beaconsForSiteID;

diff --git a/src/ios/BlueCatsSDK/BCMicroLocationManager.h b/src/ios/BlueCatsSDK/BCMicroLocationManager.h
@@ -104,6 +104,10 @@ rangingBeaconsDidFailForSite:(BCSite *)site
 
 - (void)microLocationManager:(BCMicroLocationManager *)microLocationManager didUpdateMicroLocationServicesAvailibility:(BOOL)available;
 
+- (void)microLocationManager:(BCMicroLocationManager *)microLocationManager didBeginVisitForBeaconsWithSerialNumbers:(NSArray *)serialNumbers;
+
+- (void)microLocationManager:(BCMicroLocationManager *)microLocationManager didEndVisitForBeaconsWithSerialNumbers:(NSArray *)serialNumbers;
+
 @end
 
 extern NSString * const BCMicroLocationManagerDidEnterSite;

diff --git a/src/ios/BlueCatsSDK/BlueCatsSDK.h b/src/ios/BlueCatsSDK/BlueCatsSDK.h
@@ -56,6 +56,7 @@ extern NSString * const BCOptionTrackBeaconVisits;
 extern NSString * const BCOptionMonitorBlueCatsRegionOnStartup;
 extern NSString * const BCOptionMonitorAllAvailableRegionsOnStartup;
 extern NSString * const BCOptionUseEnergySaverScanStrategy;
+extern NSString * const BCOptionScanInBackground;
 extern NSString * const BCOptionCrowdSourceBeaconUpdates;
 extern NSString * const BCOptionUseLocalStorage;
 extern NSString * const BCOptionCacheAllBeaconsForApp;

diff --git a/src/ios/BlueCatsSDK/libBlueCatsSDK.a b/src/ios/BlueCatsSDK/libBlueCatsSDK.a
diff --git a/src/ios/BlueCatsSDKCDVPlugin.m b/src/ios/BlueCatsSDKCDVPlugin.m
@@ -212,6 +212,13 @@ -(void)eventManager:(BCEventManager *)eventManager triggeredEvent:(BCTriggeredEv
         for (BCBeacon* beacon in triggeredEvent.filteredMicroLocation.beacons) {
             NSMutableDictionary* beaconDictionary = [[NSMutableDictionary alloc] initWithDictionary:[beacon toDictionary]];
             [beaconDictionary setObject:[self proximityToString:beacon.proximity] forKey:@"proximity"];
+            [beaconDictionary setObject:[NSNumber numberWithDouble:beacon.accuracy] forKey:@"accuracy"];
+            if (beacon.siteName != nil) {
+                [beaconDictionary setObject:beacon.siteName forKey:@"siteName"];
+            }
+            if (beacon.rssi != nil) {
+                [beaconDictionary setObject:beacon.rssi forKey:@"rssi"];
+            }
             [beacons addObject:beaconDictionary];
         }
         for (BCSite* site in triggeredEvent.filteredMicroLocation.sites) {