Skip to content

R
rn-apple-healthkit
Commit ed6e32f5 authored by Greg Wilson's avatar Greg Wilson
Browse files
Options

added fitness_getDistanceWalkingRunningOnDay method and exported RCT getDistanceWalkingRunning

parent 97de548b
Hide whitespace changes
Inline Side-by-side
Showing with 76 additions and 34 deletions
RCTAppleHealthKit/RCTAppleHealthKit+Methods_Fitness.h
View file @ ed6e32f5
...@@ -17,4 +17,6 @@ ...@@ -17,4 +17,6 @@
- (void)fitness_getDailyStepSamples:(NSDictionary *)input callback:(RCTResponseSenderBlock)callback; - (void)fitness_getDailyStepSamples:(NSDictionary *)input callback:(RCTResponseSenderBlock)callback;
- (void)fitness_getDistanceWalkingRunningOnDay:(NSDictionary *)input callback:(RCTResponseSenderBlock)callback;
@end @end
RCTAppleHealthKit/RCTAppleHealthKit+Methods_Fitness.m
View file @ ed6e32f5
...@@ -91,19 +91,46 @@ ...@@ -91,19 +91,46 @@
return; return;
} }
HKQuantityType *stepCountType = [HKObjectType quantityTypeForIdentifier:HKQuantityTypeIdentifierStepCount];
[self fetchCumulativeSumStatisticsCollection:stepCountType unit:unit startDate:startDate endDate:endDate ascending:ascending limit:limit completion:^(NSArray *arr, NSError *err){
if (err != nil) {
NSLog(@"error with fetchCumulativeSumStatisticsCollection: %@", err);
callback(@[RCTMakeError(@"error with fetchCumulativeSumStatisticsCollection", err, nil)]);
return;
}
callback(@[[NSNull null], arr]);
}];
}
// NSDate *startDate = [RCTAppleHealthKit startDateFromOptions:input];
// NSDate *endDate = [RCTAppleHealthKit endDateFromOptionsDefaultNow:input];
// if(startDate == nil) { - (void)fitness_getDistanceWalkingRunningOnDay:(NSDictionary *)input callback:(RCTResponseSenderBlock)callback
// callback(@[RCTMakeError(@"could not parse required startDate from options.startDate", nil, nil)]); {
HKUnit *unit = [RCTAppleHealthKit hkUnitFromOptions:input key:@"unit" withDefault:[HKUnit meterUnit]];
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]];
NSDate *date = [RCTAppleHealthKit dateFromOptions:input key:@"date" withDefault:[NSDate date]];
// if(startDate == nil){
// callback(@[RCTMakeError(@"startDate is required in options", nil, nil)]);
// return; // return;
// } // }
HKQuantityType *stepCountType = [HKObjectType quantityTypeForIdentifier:HKQuantityTypeIdentifierStepCount]; HKQuantityType *quantityType = [HKObjectType quantityTypeForIdentifier:HKQuantityTypeIdentifierDistanceWalkingRunning];
// HKUnit *stepsUnit = [HKUnit countUnit];
[self fetchSumOfSamplesOnDayForType:quantityType unit:unit day:date completion:^(double distance, NSError *error) {
if (!distance) {
NSLog(@"ERROR getting DistanceWalkingRunning: %@", error);
callback(@[RCTMakeError(@"ERROR getting DistanceWalkingRunning", error, nil)]);
return;
}
callback(@[[NSNull null], @(distance)]);
}];
// [self fetchCumulativeSumStatisticsCollection:stepCountType unit:stepsUnit startDate:startDate endDate:endDate completion:^(NSArray *arr, NSError *err){ //
// [self fetchCumulativeSumStatisticsCollection:quantityType unit:unit startDate:date endDate:date ascending:ascending limit:limit completion:^(NSArray *arr, NSError *err){
// if (err != nil) { // if (err != nil) {
// NSLog(@"error with fetchCumulativeSumStatisticsCollection: %@", err); // NSLog(@"error with fetchCumulativeSumStatisticsCollection: %@", err);
// callback(@[RCTMakeError(@"error with fetchCumulativeSumStatisticsCollection", err, nil)]); // callback(@[RCTMakeError(@"error with fetchCumulativeSumStatisticsCollection", err, nil)]);
...@@ -111,17 +138,10 @@ ...@@ -111,17 +138,10 @@
// } // }
// callback(@[[NSNull null], arr]); // callback(@[[NSNull null], arr]);
// }]; // }];
}
[self fetchCumulativeSumStatisticsCollection:stepCountType unit:unit startDate:startDate endDate:endDate ascending:ascending limit:limit completion:^(NSArray *arr, NSError *err){
if (err != nil) {
NSLog(@"error with fetchCumulativeSumStatisticsCollection: %@", err);
callback(@[RCTMakeError(@"error with fetchCumulativeSumStatisticsCollection", err, nil)]);
return;
}
callback(@[[NSNull null], arr]);
}];
}
......
RCTAppleHealthKit/RCTAppleHealthKit+Utils.m
View file @ ed6e32f5
...@@ -126,8 +126,9 @@ ...@@ -126,8 +126,9 @@
return date; return date;
} }
// ==========
// DEPRECATED
// ==========
+ (HKUnit *)hkUnitFromOptions:(NSDictionary *)options { + (HKUnit *)hkUnitFromOptions:(NSDictionary *)options {
NSString *unitString = [options objectForKey:@"unit"]; NSString *unitString = [options objectForKey:@"unit"];
HKUnit *theUnit; HKUnit *theUnit;
...@@ -141,6 +142,9 @@ ...@@ -141,6 +142,9 @@
if([unitString isEqualToString:@"meter"]){ if([unitString isEqualToString:@"meter"]){
theUnit = [HKUnit meterUnit]; theUnit = [HKUnit meterUnit];
} }
if([unitString isEqualToString:@"mile"]){
theUnit = [HKUnit mileUnit];
}
if([unitString isEqualToString:@"inch"]){ if([unitString isEqualToString:@"inch"]){
theUnit = [HKUnit inchUnit]; theUnit = [HKUnit inchUnit];
} }
...@@ -191,6 +195,9 @@ ...@@ -191,6 +195,9 @@
if([unitString isEqualToString:@"inch"]){ if([unitString isEqualToString:@"inch"]){
theUnit = [HKUnit inchUnit]; theUnit = [HKUnit inchUnit];
} }
if([unitString isEqualToString:@"mile"]){
theUnit = [HKUnit mileUnit];
}
if([unitString isEqualToString:@"foot"]){ if([unitString isEqualToString:@"foot"]){
theUnit = [HKUnit footUnit]; theUnit = [HKUnit footUnit];
} }
......
RCTAppleHealthKit/RCTAppleHealthKit.m
View file @ ed6e32f5
...@@ -114,6 +114,11 @@ RCT_EXPORT_METHOD(getDailyStepSamples:(NSDictionary *)input callback:(RCTRespons ...@@ -114,6 +114,11 @@ RCT_EXPORT_METHOD(getDailyStepSamples:(NSDictionary *)input callback:(RCTRespons
[self fitness_getDailyStepSamples:input callback:callback]; [self fitness_getDailyStepSamples:input callback:callback];
} }
RCT_EXPORT_METHOD(getDistanceWalkingRunning:(NSDictionary *)input callback:(RCTResponseSenderBlock)callback)
{
[self fitness_getDistanceWalkingRunningOnDay:input callback:callback];
}
RCT_EXPORT_METHOD(getInfo:(NSDictionary *)input callback:(RCTResponseSenderBlock)callback) RCT_EXPORT_METHOD(getInfo:(NSDictionary *)input callback:(RCTResponseSenderBlock)callback)
......
examples/StepsDemo/app/components/home/index.js
View file @ ed6e32f5
...@@ -20,12 +20,12 @@ import AppleHealthKit from 'react-native-apple-healthkit'; ...@@ -20,12 +20,12 @@ import AppleHealthKit from 'react-native-apple-healthkit';
import History from './history'; import History from './history';
const WPERMS = AppleHealthKit.CONSTANTS.PERMISSIONS.WRITE; const WPERMS = AppleHealthKit.Constants.Permissions.WRITE;
const RPERMS = AppleHealthKit.CONSTANTS.PERMISSIONS.READ; const RPERMS = AppleHealthKit.Constants.Permissions.READ;
const HKOPTIONS = { const HKOPTIONS = {
permissions: { permissions: {
read: [RPERMS.StepCount], read: [RPERMS.StepCount, RPERMS.DistanceWalkingRunning],
write: [WPERMS.StepCount], write: [WPERMS.StepCount],
} }
}; };
...@@ -43,7 +43,7 @@ class Home extends Component { ...@@ -43,7 +43,7 @@ class Home extends Component {
componentDidMount() { componentDidMount() {
console.log('CONSTANTS: ', AppleHealthKit.CONSTANTS); console.log('CONSTANTS: ', AppleHealthKit.Constants);
//console.log('balls: ', ahk); //console.log('balls: ', ahk);
AppleHealthKit.isAvailable((err,available) => { AppleHealthKit.isAvailable((err,available) => {
...@@ -82,6 +82,14 @@ class Home extends Component { ...@@ -82,6 +82,14 @@ class Home extends Component {
} }
this.setState({stepHistory: res}); this.setState({stepHistory: res});
}); });
AppleHealthKit.getDistanceWalkingRunning(null, (err, res) => {
if(this._handleHKError(err, 'getDistanceWalkingRunning')){
return;
}
console.log('getDistanceWalkingRunning -res-> ', res);
});
} }
_onPressItem(key) { _onPressItem(key) {
......
examples/StepsDemo/ios/StepsDemo.xcodeproj/project.pbxproj
View file @ ed6e32f5
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
140ED2AC1D01E1AD002B40FF /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 146834041AC3E56700842450 /* libReact.a */; }; 140ED2AC1D01E1AD002B40FF /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 146834041AC3E56700842450 /* libReact.a */; };
146834051AC3E58100842450 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 146834041AC3E56700842450 /* libReact.a */; }; 146834051AC3E58100842450 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 146834041AC3E56700842450 /* libReact.a */; };
378616B61D257B040027C300 /* HealthKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 378616B51D257B040027C300 /* HealthKit.framework */; }; 378616B61D257B040027C300 /* HealthKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 378616B51D257B040027C300 /* HealthKit.framework */; };
3787CCA91D25E10E0080733E /* libRCTAppleHealthKit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3787CCA81D25E10A0080733E /* libRCTAppleHealthKit.a */; }; 3787CCB01D25ED040080733E /* libRCTAppleHealthKit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3787CCAF1D25ED010080733E /* libRCTAppleHealthKit.a */; };
832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; }; 832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; };
/* End PBXBuildFile section */ /* End PBXBuildFile section */
...@@ -91,9 +91,9 @@ ...@@ -91,9 +91,9 @@
remoteGlobalIDString = 83CBBA2E1A601D0E00E9B192; remoteGlobalIDString = 83CBBA2E1A601D0E00E9B192;
remoteInfo = React; remoteInfo = React;
}; };
3787CCA71D25E10A0080733E /* PBXContainerItemProxy */ = { 3787CCAE1D25ED010080733E /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy; isa = PBXContainerItemProxy;
containerPortal = 3787CCA31D25E10A0080733E /* RCTAppleHealthKit.xcodeproj */; containerPortal = 3787CCAA1D25ED010080733E /* RCTAppleHealthKit.xcodeproj */;
proxyType = 2; proxyType = 2;
remoteGlobalIDString = 3774C88D1D2092F20000B3F3; remoteGlobalIDString = 3774C88D1D2092F20000B3F3;
remoteInfo = RCTAppleHealthKit; remoteInfo = RCTAppleHealthKit;
...@@ -136,7 +136,7 @@ ...@@ -136,7 +136,7 @@
146833FF1AC3E56700842450 /* React.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = React.xcodeproj; path = "../node_modules/react-native/React/React.xcodeproj"; sourceTree = "<group>"; }; 146833FF1AC3E56700842450 /* React.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = React.xcodeproj; path = "../node_modules/react-native/React/React.xcodeproj"; sourceTree = "<group>"; };
378616B51D257B040027C300 /* HealthKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = HealthKit.framework; path = System/Library/Frameworks/HealthKit.framework; sourceTree = SDKROOT; }; 378616B51D257B040027C300 /* HealthKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = HealthKit.framework; path = System/Library/Frameworks/HealthKit.framework; sourceTree = SDKROOT; };
378616B71D257B040027C300 /* StepsDemo.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.xml; name = StepsDemo.entitlements; path = StepsDemo/StepsDemo.entitlements; sourceTree = "<group>"; }; 378616B71D257B040027C300 /* StepsDemo.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.xml; name = StepsDemo.entitlements; path = StepsDemo/StepsDemo.entitlements; sourceTree = "<group>"; };
3787CCA31D25E10A0080733E /* RCTAppleHealthKit.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTAppleHealthKit.xcodeproj; path = "../node_modules/react-native-apple-healthkit/RCTAppleHealthKit.xcodeproj"; sourceTree = "<group>"; }; 3787CCAA1D25ED010080733E /* RCTAppleHealthKit.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTAppleHealthKit.xcodeproj; path = "../node_modules/react-native-apple-healthkit/RCTAppleHealthKit.xcodeproj"; sourceTree = "<group>"; };
78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = "../node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj"; sourceTree = "<group>"; }; 78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = "../node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj"; sourceTree = "<group>"; };
832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = "../node_modules/react-native/Libraries/Text/RCTText.xcodeproj"; sourceTree = "<group>"; }; 832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = "../node_modules/react-native/Libraries/Text/RCTText.xcodeproj"; sourceTree = "<group>"; };
/* End PBXFileReference section */ /* End PBXFileReference section */
...@@ -154,7 +154,7 @@ ...@@ -154,7 +154,7 @@
isa = PBXFrameworksBuildPhase; isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
3787CCA91D25E10E0080733E /* libRCTAppleHealthKit.a in Frameworks */, 3787CCB01D25ED040080733E /* libRCTAppleHealthKit.a in Frameworks */,
146834051AC3E58100842450 /* libReact.a in Frameworks */, 146834051AC3E58100842450 /* libReact.a in Frameworks */,
00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */, 00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */,
378616B61D257B040027C300 /* HealthKit.framework in Frameworks */, 378616B61D257B040027C300 /* HealthKit.framework in Frameworks */,
...@@ -268,10 +268,10 @@ ...@@ -268,10 +268,10 @@
name = Products; name = Products;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
3787CCA41D25E10A0080733E /* Products */ = { 3787CCAB1D25ED010080733E /* Products */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
3787CCA81D25E10A0080733E /* libRCTAppleHealthKit.a */, 3787CCAF1D25ED010080733E /* libRCTAppleHealthKit.a */,
); );
name = Products; name = Products;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -287,7 +287,7 @@ ...@@ -287,7 +287,7 @@
832341AE1AAA6A7D00B99B32 /* Libraries */ = { 832341AE1AAA6A7D00B99B32 /* Libraries */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
3787CCA31D25E10A0080733E /* RCTAppleHealthKit.xcodeproj */, 3787CCAA1D25ED010080733E /* RCTAppleHealthKit.xcodeproj */,
146833FF1AC3E56700842450 /* React.xcodeproj */, 146833FF1AC3E56700842450 /* React.xcodeproj */,
00C302A71ABCB8CE00DB3ED1 /* RCTActionSheet.xcodeproj */, 00C302A71ABCB8CE00DB3ED1 /* RCTActionSheet.xcodeproj */,
00C302B51ABCB90400DB3ED1 /* RCTGeolocation.xcodeproj */, 00C302B51ABCB90400DB3ED1 /* RCTGeolocation.xcodeproj */,
...@@ -411,8 +411,8 @@ ...@@ -411,8 +411,8 @@
ProjectRef = 00C302A71ABCB8CE00DB3ED1 /* RCTActionSheet.xcodeproj */; ProjectRef = 00C302A71ABCB8CE00DB3ED1 /* RCTActionSheet.xcodeproj */;
}, },
{ {
ProductGroup = 3787CCA41D25E10A0080733E /* Products */; ProductGroup = 3787CCAB1D25ED010080733E /* Products */;
ProjectRef = 3787CCA31D25E10A0080733E /* RCTAppleHealthKit.xcodeproj */; ProjectRef = 3787CCAA1D25ED010080733E /* RCTAppleHealthKit.xcodeproj */;
}, },
{ {
ProductGroup = 00C302B61ABCB90400DB3ED1 /* Products */; ProductGroup = 00C302B61ABCB90400DB3ED1 /* Products */;
...@@ -516,11 +516,11 @@ ...@@ -516,11 +516,11 @@
remoteRef = 146834031AC3E56700842450 /* PBXContainerItemProxy */; remoteRef = 146834031AC3E56700842450 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR; sourceTree = BUILT_PRODUCTS_DIR;
}; };
3787CCA81D25E10A0080733E /* libRCTAppleHealthKit.a */ = { 3787CCAF1D25ED010080733E /* libRCTAppleHealthKit.a */ = {
isa = PBXReferenceProxy; isa = PBXReferenceProxy;
fileType = archive.ar; fileType = archive.ar;
path = libRCTAppleHealthKit.a; path = libRCTAppleHealthKit.a;
remoteRef = 3787CCA71D25E10A0080733E /* PBXContainerItemProxy */; remoteRef = 3787CCAE1D25ED010080733E /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR; sourceTree = BUILT_PRODUCTS_DIR;
}; };
78C398B91ACF4ADC00677621 /* libRCTLinking.a */ = { 78C398B91ACF4ADC00677621 /* libRCTLinking.a */ = {
......
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