Skip to content

R
rn-apple-healthkit
Commit 72c1cad3 authored by 王品堯's avatar 王品堯
Browse files
Options

時間格式換成timestamp

parent c85fc759
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 51 deletions
RCTAppleHealthKit/RCTAppleHealthKit+Queries.m
View file @ 72c1cad3
...@@ -79,8 +79,8 @@ ...@@ -79,8 +79,8 @@
HKQuantity *quantity = sample.quantity; HKQuantity *quantity = sample.quantity;
double value = [quantity doubleValueForUnit:unit]; double value = [quantity doubleValueForUnit:unit];
NSString *startDateString = [RCTAppleHealthKit buildISO8601StringFromDate:sample.startDate]; int startDateTimestamp = [RCTAppleHealthKit buildTimestampFromDate:sample.startDate];
NSString *endDateString = [RCTAppleHealthKit buildISO8601StringFromDate:sample.endDate]; int endDateTimestamp = [RCTAppleHealthKit buildTimestampFromDate:sample.endDate];
NSString *deviceName = sample.device.name ? sample.device.name : @""; NSString *deviceName = sample.device.name ? sample.device.name : @"";
NSString *deviceManufacturer = sample.device.manufacturer ? sample.device.manufacturer : @""; NSString *deviceManufacturer = sample.device.manufacturer ? sample.device.manufacturer : @"";
...@@ -98,8 +98,8 @@ ...@@ -98,8 +98,8 @@
NSDictionary *elem = @{ NSDictionary *elem = @{
@"value" : @(value), @"value" : @(value),
@"startDate" : startDateString, @"startDate" : @(startDateTimestamp),
@"endDate" : endDateString, @"endDate" : @(endDateTimestamp),
@"deviceName" : deviceName, @"deviceName" : deviceName,
@"deviceManufacturer" : deviceManufacturer, @"deviceManufacturer" : deviceManufacturer,
@"deviceHardware" : deviceHardwareVer, @"deviceHardware" : deviceHardwareVer,
...@@ -166,25 +166,10 @@ ...@@ -166,25 +166,10 @@
// HKCategoryType *catType = sample.categoryType; // HKCategoryType *catType = sample.categoryType;
NSInteger val = sample.value; NSInteger val = sample.value;
// HKQuantity *quantity = sample.quantity; int startDateTimestamp = [RCTAppleHealthKit buildTimestampFromDate:sample.startDate];
// double value = [quantity doubleValueForUnit:unit]; int endDateTimestamp = [RCTAppleHealthKit buildTimestampFromDate:sample.endDate];
NSString *startDateString = [RCTAppleHealthKit buildISO8601StringFromDate:sample.startDate];
NSString *endDateString = [RCTAppleHealthKit buildISO8601StringFromDate:sample.endDate];
NSString *valueString = [NSString stringWithFormat:@"%d", val]; NSString *valueString = [NSString stringWithFormat:@"%d", val];
// switch (val) {
// case HKCategoryValueSleepAnalysisInBed:
// valueString = @"INBED";
// break;
// case HKCategoryValueSleepAnalysisAsleep:
// valueString = @"ASLEEP";
// break;
// default:
// valueString = @"UNKNOWN";
// break;
// }
NSString *deviceName = sample.device.name ? sample.device.name : @""; NSString *deviceName = sample.device.name ? sample.device.name : @"";
NSString *deviceManufacturer = sample.device.manufacturer ? sample.device.manufacturer : @""; NSString *deviceManufacturer = sample.device.manufacturer ? sample.device.manufacturer : @"";
...@@ -202,8 +187,8 @@ ...@@ -202,8 +187,8 @@
NSDictionary *elem = @{ NSDictionary *elem = @{
@"value" : valueString, @"value" : valueString,
@"startDate" : startDateString, @"startDate" : @(startDateTimestamp),
@"endDate" : endDateString, @"endDate" : @(endDateTimestamp),
@"deviceName" : deviceName, @"deviceName" : deviceName,
@"deviceManufacturer" : deviceManufacturer, @"deviceManufacturer" : deviceManufacturer,
@"deviceHardware" : deviceHardwareVer, @"deviceHardware" : deviceHardwareVer,
...@@ -222,22 +207,9 @@ ...@@ -222,22 +207,9 @@
} }
}; };
// HKSampleQuery *query = [[HKSampleQuery alloc] initWithSampleType:quantityType
// predicate:predicate
// limit:lim
// sortDescriptors:@[timeSortDescriptor]
// resultsHandler:handlerBlock];
HKCategoryType *categoryType = HKCategoryType *categoryType =
[HKObjectType categoryTypeForIdentifier:HKCategoryTypeIdentifierSleepAnalysis]; [HKObjectType categoryTypeForIdentifier:HKCategoryTypeIdentifierSleepAnalysis];
// HKCategorySample *categorySample =
// [HKCategorySample categorySampleWithType:categoryType
// value:value
// startDate:startDate
// endDate:endDate];
HKSampleQuery *query = [[HKSampleQuery alloc] initWithSampleType:categoryType HKSampleQuery *query = [[HKSampleQuery alloc] initWithSampleType:categoryType
predicate:predicate predicate:predicate
limit:lim limit:lim
...@@ -249,17 +221,6 @@ ...@@ -249,17 +221,6 @@
} }
- (void)fetchCorrelationSamplesOfType:(HKQuantityType *)quantityType - (void)fetchCorrelationSamplesOfType:(HKQuantityType *)quantityType
unit:(HKUnit *)unit unit:(HKUnit *)unit
predicate:(NSPredicate *)predicate predicate:(NSPredicate *)predicate
...@@ -287,13 +248,13 @@ ...@@ -287,13 +248,13 @@
dispatch_async(dispatch_get_main_queue(), ^{ dispatch_async(dispatch_get_main_queue(), ^{
for (HKCorrelation *sample in results) { for (HKCorrelation *sample in results) {
NSString *startDateString = [RCTAppleHealthKit buildISO8601StringFromDate:sample.startDate]; int startDateTimestamp = [RCTAppleHealthKit buildTimestampFromDate:sample.startDate];
NSString *endDateString = [RCTAppleHealthKit buildISO8601StringFromDate:sample.endDate]; int endDateTimestamp = [RCTAppleHealthKit buildTimestampFromDate:sample.endDate];
NSDictionary *elem = @{ NSDictionary *elem = @{
@"correlation" : sample, @"correlation" : sample,
@"startDate" : startDateString, @"startDate" : @(startDateTimestamp),
@"endDate" : endDateString, @"endDate" : @(endDateTimestamp),
}; };
[data addObject:elem]; [data addObject:elem];
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment