Fix a minor issue regarding HealthKit

tetujin · Dec 10, 2019 · c2a3ebf · c2a3ebf
1 parent eb540bc
commit c2a3ebf
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 18 deletions.
diff --git a/AWAREFramework.podspec b/AWAREFramework.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'AWAREFramework'
-  s.version          = '1.8'
+  s.version          = '1.8.1'
   s.summary          = 'AWARE: An Open-source Context Instrumentation Framework'
 
 # This description is used to generate tags and improve search results.

diff --git a/AWAREFramework/Classes/Core/Sensor/AWARESensorManager.m b/AWAREFramework/Classes/Core/Sensor/AWARESensorManager.m
@@ -347,7 +347,8 @@ - (void) stopAndRemoveAllSensors {
             // message = [NSString stringWithFormat:@"[%@] Stop %@ sensor",[sensor getSensorName], [sensor getSensorName]];
             // NSLog(@"%@", message);
             bool state = [sensor stopSensor];
-            [sensor.storage cancelSyncStorage];
+            // [sensor.storage cancelSyncStorage];
+            [sensor stopSyncDB];
             [AWAREEventLogger.shared logEvent:@{@"class":@"AWARESensorManager",
                                                 @"event":@"stop and remove sensor",
                                                 @"sensor":sensor.getSensorName,

diff --git a/AWAREFramework/Classes/Core/Storage/AWAREStorage.m b/AWAREFramework/Classes/Core/Storage/AWAREStorage.m
@@ -272,16 +272,16 @@ - (void)createDBTableOnServerWithQuery:(NSString *)query tableName:(NSString *)t
 //////////////////////////////////////////
 
 - (void)startSyncStorage {
-    NSLog(@"Please orverwrite -startSyncStorage");
+    NSLog(@"[%@] Please orverwrite -startSyncStorage", sensorName);
 }
 
 - (void)startSyncStorageWithCallBack:(SyncProcessCallBack)callback{
     syncProcessCallBack = callback;
-    NSLog(@"Please orverwrite -startSyncStorageWithCallBack");
+    NSLog(@"[%@] Please orverwrite -startSyncStorageWithCallBack", sensorName);
 }
 
 - (void)cancelSyncStorage {
-    NSLog(@"Please overwirte -cancelSyncStorage");
+    NSLog(@"[%@] Please overwirte -cancelSyncStorage", sensorName);
 }
 
 - (BOOL)saveDataWithArray:(NSArray * _Nullable)dataArray buffer:(BOOL)isRequiredBuffer saveInMainThread:(BOOL)saveInMainThread {

diff --git a/AWAREFramework/Classes/Core/Storage/CSV/CSVStorage.m b/AWAREFramework/Classes/Core/Storage/CSV/CSVStorage.m
@@ -161,8 +161,8 @@ - (void)startSyncStorage {
     }
 }
 
-- (void)cancelSyncStorage {
-    NSLog(@"Please overwirte -cancelSyncStorage");
+- (void) cancelSyncStorage {
+    if (self.isDebug) NSLog(@"Please overwirte -cancelSyncStorage");
 }
 
 

diff --git a/AWAREFramework/Classes/Core/Storage/JSON/JSONStorage.m b/AWAREFramework/Classes/Core/Storage/JSON/JSONStorage.m
@@ -167,7 +167,7 @@ - (void) dataSyncIsFinishedCorrectly {
 }
 
 - (void)cancelSyncStorage {
-    NSLog(@"Please overwirte -cancelSyncStorage");
+    if (self.isDebug) NSLog(@"Please overwirte -cancelSyncStorage");
 }
 
 

diff --git a/AWAREFramework/Classes/Core/Storage/SQLite/SQLiteSeparatedStorage.m b/AWAREFramework/Classes/Core/Storage/SQLite/SQLiteSeparatedStorage.m
@@ -436,9 +436,9 @@ - (void) deleteSyncedData {
         [self->_mainQueueManagedObjectContext performBlock:^{
             NSError * error = nil;
             if([self->_mainQueueManagedObjectContext save:&error]){
-                NSLog(@"[%@] merged all changes on the temp-DB into the main DB", self.sensorName);
+                if (self.isDebug) NSLog(@"[%@] merged all changes on the temp-DB into the main DB", self.sensorName);
             }else{
-                NSLog(@"[%@] %@", self.sensorName, error.debugDescription);
+                if (self.isDebug) NSLog(@"[%@] %@", self.sensorName, error.debugDescription);
             }
         }];
     }];

diff --git a/AWAREFramework/Classes/Plugins/HealthKit/AWAREHealthKit.m b/AWAREFramework/Classes/Plugins/HealthKit/AWAREHealthKit.m
@@ -30,7 +30,7 @@ @implementation AWAREHealthKit{
 }
 
 - (instancetype)initWithAwareStudy:(AWAREStudy *)study dbType:(AwareDBType)dbType{
-    AWAREStorage * storage = [[AWAREStorage alloc] initWithStudy:study sensorName:SENSOR_HEALTH_KIT];
+    JSONStorage * storage = [[JSONStorage alloc] initWithStudy:study sensorName:SENSOR_HEALTH_KIT];
     self = [super initWithAwareStudy:study sensorName:SENSOR_HEALTH_KIT storage:storage];
     if( self != nil ){
         healthStore      = [[HKHealthStore alloc] init];
@@ -144,21 +144,20 @@ - (void)startSyncDB{
     [_awareHKWorkout  startSyncDB];
     [_awareHKCategory startSyncDB];
     [_awareHKQuantity startSyncDB];
-
     [_awareHKHeartRate.storage setSyncProcessCallBack:self.storage.syncProcessCallBack];
     [_awareHKHeartRate startSyncDB];
     [_awareHKSleep     startSyncDB];
-    // [super startSyncDB];
+    [super startSyncDB];
 }
 
 - (void)stopSyncDB{
     [_awareHKWorkout   stopSyncDB];
     [_awareHKCategory  stopSyncDB];
     [_awareHKQuantity  stopSyncDB];
 
-    [_awareHKHeartRate startSyncDB];
-    [_awareHKSleep     startSyncDB];
-    // [super stopSyncDB];
+    [_awareHKHeartRate stopSyncDB];
+    [_awareHKSleep     stopSyncDB];
+    [super stopSyncDB];
 }
 
 - (NSDate * _Nullable) getLastRecordTimeWithHKDataType:(NSString * _Nonnull)type{

diff --git a/AWAREFramework/Classes/Sensors/FusedLocations/FusedLocations.m b/AWAREFramework/Classes/Sensors/FusedLocations/FusedLocations.m
@@ -145,13 +145,13 @@ - (BOOL)stopSensor{
 - (void) startSyncDB{
     [_visitLocationSensor startSyncDB];
     [_locationSensor startSyncDB];
-    [super startSyncDB];
+    // [super startSyncDB];
 }
 
 - (void)stopSyncDB{
     [_visitLocationSensor stopSyncDB];
     [_locationSensor stopSyncDB];
-    [super stopSyncDB];
+    // [super stopSyncDB];
 }
 
 - (void) getGpsData: (NSTimer *) theTimer {
-Original file line number
+Diff line change
@@ Expand Up / @@ -167,7 +167,7 @@ - (void) dataSyncIsFinishedCorrectly { @@
     }
     - (void)cancelSyncStorage {
-        NSLog(@"Please overwirte -cancelSyncStorage");
+        if (self.isDebug) NSLog(@"Please overwirte -cancelSyncStorage");
     }
@@ Expand Down @@