Support new functions to set a sensing interval and an accuracy parameter into the location sensor

Author: tetujin

AWAREFramework.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'AWAREFramework'
-  s.version          = '1.14.16'
+  s.version          = '1.14.17'
   s.summary          = 'AWARE: An Open-source Context Instrumentation Framework'
 
 # This description is used to generate tags and improve search results.

AWAREFramework/Classes/Core/Storage/AWAREStorage.h

@@ -61,6 +61,7 @@ typedef void (^LimitedDataFetchHandler)(NSString * _Nonnull name, NSArray * _Nul
 - (void) unlock;
 
 - (void) resetMark;
+- (void) resetCancelState;
 
 - (BOOL) isStore;
 - (void) setStore:(BOOL) state;

AWAREFramework/Classes/Core/Storage/AWAREStorage.m

@@ -303,6 +303,10 @@ - (void)resetMark{
 
 }
 
+- (void) resetCancelState {
+    
+}
+
 - (bool)isSyncing {
     return NO;
 }

AWAREFramework/Classes/Core/Storage/SQLite/SQLiteSeparatedStorage.m

@@ -676,5 +676,8 @@ - (NSUInteger)countStoredData:(NSString *)entityName
     return count;
 }
 
+-(void)resetCancelState {
+    isCanceled = NO;
+}
 
 @end

AWAREFramework/Classes/Core/Storage/SQLite/SQLiteStorage.m

@@ -770,6 +770,10 @@ - (NSUInteger)countStoredDataFrom:(NSNumber * _Nullable)from context:(NSManagedO
     return [context countForFetchRequest:request error:&error];
 }
 
+-(void)resetCancelState {
+    isCanceled = NO;
+}
+
 @end
 
 

AWAREFramework/Classes/Plugins/IOSActivityRecognition/IOSActivityRecognition.m

@@ -86,7 +86,7 @@ - (instancetype)initWithAwareStudy:(AWAREStudy *)study dbType:(AwareDBType)dbTyp
         _sensingInterval = 180; // 3min
         disposableCount  = 0;
         preperiodDays    = 0;
-        _sensingMode = IOSActivityRecognitionModeLive;
+        _sensingMode = IOSActivityRecognitionModeHistory;
         _confidenceFilter = CMMotionActivityConfidenceLow;
     }
     return self;
@@ -138,7 +138,7 @@ -(void)setParameters:(NSArray *)parameters{
 }
 
 - (BOOL)startSensor{
-    return [self startSensorWithConfidenceFilter:_confidenceFilter mode:IOSActivityRecognitionModeHistory interval:_sensingInterval disposableLimit:0];
+    return [self startSensorWithConfidenceFilter:_confidenceFilter mode:_sensingMode interval:_sensingInterval disposableLimit:0];
 }
 
 - (BOOL) startSensorAsLiveModeWithFilterLevel:(CMMotionActivityConfidence) filterLevel {

AWAREFramework/Classes/Sensors/Location/Locations.h

@@ -28,6 +28,10 @@ extern NSString * _Nonnull const AWARE_PREFERENCES_MIN_GPS_ACCURACY;
 - (BOOL) startSensorWithAccuracy:(double)accuracyMeter;
 - (BOOL) startSensorWithInterval:(double)interval accuracy:(double)accuracyMeter;
 
+- (BOOL) setSensingInterval:(double)interval;
+- (BOOL) setSensingAccuracy:(double)accuracyMeter;
+- (BOOL) setSensingInterval:(double)interval accuracy:(double)accuracyMeter;
+
 // - (void) saveLocation:(CLLocation *)location;
 // - (void) saveAuthorizationStatus:(CLAuthorizationStatus)status;
 

AWAREFramework/Classes/Sensors/Location/Locations.m

@@ -252,6 +252,22 @@ - (void) saveAuthorizationStatus:(CLAuthorizationStatus ) status {
                                         @"event":@"saveAuthorizationStatus",@"status":@(status)}];
 }
 
+- (BOOL)setSensingAccuracy:(double)accuracyMeter {
+    self->accuracy = accuracyMeter;
+    return YES;
+}
+
+- (BOOL)setSensingInterval:(double)interval {
+    self->interval = interval;
+    return YES;
+}
+
+- (BOOL)setSensingInterval:(double)interval accuracy:(double)accuracyMeter {
+    self->interval = interval;
+    self->accuracy = accuracyMeter;
+    return YES;
+}
+
 
 #pragma mark - Location
 

Example/AWARE-SensingApp/AppDelegate.swift

@@ -33,7 +33,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
             study.setCleanOldDataType(cleanOldDataTypeDaily)
             study.setDebug(true)
-            study.setStudyURL("https://xxx")
+            study.setStudyURL("https://")
 
 
             print(study.getCleanOldDataType())
@@ -71,7 +71,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
             let headphone = HeadphoneMotion(awareStudy: study)
             headphone.setSensingIntervalWithHz(100)
             headphone.setSavingIntervalWithSecond(1)
-            (headphone.storage as! SQLiteSeparatedStorage).fetchSizeAdjuster.setMaxFetchSize(2);
+//            (headphone.storage as! SQLiteSeparatedStorage).fetchSizeAdjuster.setMaxFetchSize(30);
             headphone.storage?.setDebug(true)
             (headphone.storage as! SQLiteSeparatedStorage).useCompactDataSyncFormat = true