HA-79 Anchor 不需使用 predicate

RCTAppleHealthKit/RCTAppleHealthKit+Methods_Fitness.m

@@ -87,20 +87,12 @@
     HKUnit *unit = [RCTAppleHealthKit hkUnitFromOptions:input key:@"unit" withDefault:[HKUnit countUnit]];
     NSUInteger limit = [RCTAppleHealthKit uintFromOptions:input key:@"limit" withDefault:HKObjectQueryNoLimit];
     BOOL ascending = [RCTAppleHealthKit boolFromOptions:input key:@"ascending" withDefault:false];
-    NSDate *startDate = [RCTAppleHealthKit dateFromOptions:input key:@"startDate" withDefault:nil];
-    NSDate *endDate = [RCTAppleHealthKit dateFromOptions:input key:@"endDate" withDefault:[NSDate date]];
-    if(startDate == nil){
-        callback(@[RCTMakeError(@"startDate is required in options", nil, nil)]);
-        return;
-    }
     
     HKQuantityType *stepCountType = [HKObjectType quantityTypeForIdentifier:HKQuantityTypeIdentifierStepCount];
     
-    NSPredicate * predicate = [RCTAppleHealthKit predicateForSamplesBetweenDates:startDate endDate:endDate];
-    
     [self fetchQuantitySamplesOfTypeByAnchor:stepCountType
                                 unit:unit
-                           predicate:predicate
+                           predicate:nil
                            ascending:ascending
                                limit:limit
                           completion:^(NSDictionary *results, NSError *error) {

RCTAppleHealthKit/RCTAppleHealthKit+Methods_Sleep.m

@@ -45,17 +45,9 @@
 
 - (void)sleep_getSleepSamplesByAnchor:(NSDictionary *)input callback:(RCTResponseSenderBlock)callback
 {
-    NSDate *startDate = [RCTAppleHealthKit dateFromOptions:input key:@"startDate" withDefault:nil];
-    NSDate *endDate = [RCTAppleHealthKit dateFromOptions:input key:@"endDate" withDefault:[NSDate date]];
-    if(startDate == nil){
-        callback(@[RCTMakeError(@"startDate is required in options", nil, nil)]);
-        return;
-    }
-    
-    NSPredicate *predicate = [RCTAppleHealthKit predicateForSamplesBetweenDates:startDate endDate:endDate];
     NSUInteger limit = [RCTAppleHealthKit uintFromOptions:input key:@"limit" withDefault:HKObjectQueryNoLimit];
     
-    [self fetchSleepCategorySamplesForPredicateByAnchor:predicate
+    [self fetchSleepCategorySamplesForPredicateByAnchor:nil
                                                   limit:limit
                                              completion:^(NSDictionary *results, NSError *error) {
                                                  if(results){

RCTAppleHealthKit/RCTAppleHealthKit+Methods_Vitals.m

@@ -50,17 +50,10 @@
     HKUnit *unit = [RCTAppleHealthKit hkUnitFromOptions:input key:@"unit" withDefault:[count unitDividedByUnit:minute]];
     NSUInteger limit = [RCTAppleHealthKit uintFromOptions:input key:@"limit" withDefault:HKObjectQueryNoLimit];
     BOOL ascending = [RCTAppleHealthKit boolFromOptions:input key:@"ascending" withDefault:false];
-    NSDate *startDate = [RCTAppleHealthKit dateFromOptions:input key:@"startDate" withDefault:nil];
-    NSDate *endDate = [RCTAppleHealthKit dateFromOptions:input key:@"endDate" withDefault:[NSDate date]];
-    if(startDate == nil){
-        callback(@[RCTMakeError(@"startDate is required in options", nil, nil)]);
-        return;
-    }
-    NSPredicate * predicate = [RCTAppleHealthKit predicateForSamplesBetweenDates:startDate endDate:endDate];
     
     [self fetchQuantitySamplesOfTypeByAnchor:heartRateType
                                         unit:unit
-                                   predicate:predicate
+                                   predicate:nil
                                    ascending:ascending
                                        limit:limit
                                   completion:^(NSDictionary *results, NSError *error) {
@@ -193,17 +186,10 @@
     HKUnit *unit = [RCTAppleHealthKit hkUnitFromOptions:input key:@"unit" withDefault:[HKUnit millimeterOfMercuryUnit]];
     NSUInteger limit = [RCTAppleHealthKit uintFromOptions:input key:@"limit" withDefault:HKObjectQueryNoLimit];
     BOOL ascending = [RCTAppleHealthKit boolFromOptions:input key:@"ascending" withDefault:false];
-    NSDate *startDate = [RCTAppleHealthKit dateFromOptions:input key:@"startDate" withDefault:nil];
-    NSDate *endDate = [RCTAppleHealthKit dateFromOptions:input key:@"endDate" withDefault:[NSDate date]];
-    if(startDate == nil){
-        callback(@[RCTMakeError(@"startDate is required in options", nil, nil)]);
-        return;
-    }
-    NSPredicate * predicate = [RCTAppleHealthKit predicateForSamplesBetweenDates:startDate endDate:endDate];
     
     [self fetchCorrelationSamplesOfTypeByAnchor:bloodPressureCorrelationType
                                    unit:unit
-                              predicate:predicate
+                              predicate:nil
                               ascending:ascending
                                   limit:limit
                              completion:^(NSDictionary *results, NSError *error) {

RCTAppleHealthKit/RCTAppleHealthKit+Queries.m

@@ -568,7 +568,7 @@
     HKQueryAnchor *anchor = [NSKeyedUnarchiver unarchiveObjectWithData:data];
     
     HKAnchoredObjectQuery *anchorQuery = [[HKAnchoredObjectQuery alloc] initWithType:quantityType
-                                                                           predicate:predicate
+                                                                           predicate:nil
                                                                               anchor:anchor
                                                                                limit:lim
                                                                       resultsHandler:anchorHandlerBlock];
@@ -630,7 +630,7 @@
     HKQueryAnchor *anchor = [NSKeyedUnarchiver unarchiveObjectWithData:data];
     
     HKAnchoredObjectQuery *anchorQuery = [[HKAnchoredObjectQuery alloc] initWithType:quantityType
-                                                                           predicate:predicate
+                                                                           predicate:nil
                                                                               anchor:anchor
                                                                                limit:lim
                                                                       resultsHandler:anchorHandlerBlock];