Commit 1ff4dea2 authored by 王品堯's avatar 王品堯

起迄時間回傳timestamp

parent 84423f99
...@@ -527,8 +527,8 @@ ...@@ -527,8 +527,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 : @"";
...@@ -552,8 +552,8 @@ ...@@ -552,8 +552,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,
...@@ -619,13 +619,13 @@ ...@@ -619,13 +619,13 @@
dispatch_async(dispatch_get_main_queue(), ^{ dispatch_async(dispatch_get_main_queue(), ^{
for (HKCorrelation *sample in sampleObjects) { for (HKCorrelation *sample in sampleObjects) {
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];
} }
...@@ -683,8 +683,8 @@ ...@@ -683,8 +683,8 @@
for (HKCategorySample *sample in sampleObjects) { for (HKCategorySample *sample in sampleObjects) {
NSInteger val = sample.value; NSInteger val = sample.value;
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 *valueString = [NSString stringWithFormat:@"%d", val]; NSString *valueString = [NSString stringWithFormat:@"%d", val];
...@@ -710,8 +710,8 @@ ...@@ -710,8 +710,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,
......
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
+ (NSDate *)parseISO8601DateFromString:(NSString *)date; + (NSDate *)parseISO8601DateFromString:(NSString *)date;
+ (NSString *)buildISO8601StringFromDate:(NSDate *)date; + (NSString *)buildISO8601StringFromDate:(NSDate *)date;
+ (int)buildTimestampFromDate:(NSDate *)date;
+ (NSPredicate *)predicateForSamplesToday; + (NSPredicate *)predicateForSamplesToday;
+ (NSPredicate *)predicateForSamplesOnDay:(NSDate *)date; + (NSPredicate *)predicateForSamplesOnDay:(NSDate *)date;
+ (NSPredicate *)predicateForSamplesBetweenDates:(NSDate *)startDate endDate:(NSDate *)endDate; + (NSPredicate *)predicateForSamplesBetweenDates:(NSDate *)startDate endDate:(NSDate *)endDate;
......
...@@ -33,6 +33,14 @@ ...@@ -33,6 +33,14 @@
} }
+ (int)buildTimestampFromDate:(NSDate *)date
{
NSTimeInterval interval = [date timeIntervalSince1970];
NSNumber *timeStampObj = [NSNumber numberWithDouble: interval];
return [timeStampObj intValue];
}
+ (NSPredicate *)predicateForSamplesToday { + (NSPredicate *)predicateForSamplesToday {
NSDate *now = [NSDate date]; NSDate *now = [NSDate date];
return [RCTAppleHealthKit predicateForSamplesOnDay:now]; return [RCTAppleHealthKit predicateForSamplesOnDay:now];
......
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