Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

aggregate query added distance and calories when no bucket #95

Merged
merged 1 commit into from
Jan 15, 2018
Merged

aggregate query added distance and calories when no bucket #95

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
109 changes: 56 additions & 53 deletions src/android/HealthPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1314,8 +1314,10 @@ private void queryAggregated(final JSONArray args, final CallbackContext callbac
} else if (datatype.equalsIgnoreCase("calories")) {
retBucket.put("unit", "kcal");
} else if (datatype.equalsIgnoreCase("activity")) {
retBucket.put("value", new JSONObject());
retBucket.put("unit", "activitySummary");
// query per bucket time to get distance and calories per activity
JSONObject actobj = getAggregatedActivityDistanceCalories (st, et);
retBucket.put("value", actobj);
} else if (datatype.equalsIgnoreCase("nutrition.water")) {
retBucket.put("unit", "ml");
} else if (datatype.equalsIgnoreCase("nutrition")) {
Expand Down Expand Up @@ -1356,8 +1358,10 @@ private void queryAggregated(final JSONArray args, final CallbackContext callbac
} else if (datatype.equalsIgnoreCase("calories")) {
retBucket.put("unit", "kcal");
} else if (datatype.equalsIgnoreCase("activity")) {
retBucket.put("value", new JSONObject());
retBucket.put("unit", "activitySummary");
// query per bucket time to get distance and calories per activity
JSONObject actobj = getAggregatedActivityDistanceCalories (bucket.getStartTime(TimeUnit.MILLISECONDS), bucket.getEndTime(TimeUnit.MILLISECONDS));
retBucket.put("value", actobj);
} else if (datatype.equalsIgnoreCase("nutrition.water")) {
retBucket.put("unit", "ml");
} else if (datatype.equalsIgnoreCase("nutrition")) {
Expand All @@ -1370,57 +1374,6 @@ private void queryAggregated(final JSONArray args, final CallbackContext callbac
}
}
}

// query per bucket time to get distance and calories per activity
if (datatype.equalsIgnoreCase("activity")) {

DataReadRequest readActivityDistCalRequest = new DataReadRequest.Builder()
.aggregate(DataType.TYPE_DISTANCE_DELTA, DataType.AGGREGATE_DISTANCE_DELTA)
.aggregate(DataType.TYPE_CALORIES_EXPENDED, DataType.AGGREGATE_CALORIES_EXPENDED)
.bucketByActivityType(1, TimeUnit.SECONDS)
.setTimeRange(bucket.getStartTime(TimeUnit.MILLISECONDS), bucket.getEndTime(TimeUnit.MILLISECONDS), TimeUnit.MILLISECONDS)
.build();

DataReadResult dataActivityDistCalReadResult = Fitness.HistoryApi.readData(mClient, readActivityDistCalRequest).await();



if (dataActivityDistCalReadResult.getStatus().isSuccess()) {
for (Bucket activityBucket : dataActivityDistCalReadResult.getBuckets()) {
//each bucket is an activity
float distance = 0;
float calories = 0;
String activity = activityBucket.getActivity();

DataSet distanceDataSet = activityBucket.getDataSet(DataType.AGGREGATE_DISTANCE_DELTA);
for (DataPoint datapoint : distanceDataSet.getDataPoints()) {
distance += datapoint.getValue(Field.FIELD_DISTANCE).asFloat();
}

DataSet caloriesDataSet = activityBucket.getDataSet(DataType.AGGREGATE_CALORIES_EXPENDED);
for (DataPoint datapoint : caloriesDataSet.getDataPoints()) {
calories += datapoint.getValue(Field.FIELD_CALORIES).asFloat();
}

JSONObject actobj = retBucket.getJSONObject("value");
JSONObject summary;
if (actobj.has(activity)) {
summary = actobj.getJSONObject(activity);
double existingdistance = summary.getDouble("distance");
summary.put("distance", distance + existingdistance);
double existingcalories = summary.getDouble("calories");
summary.put("calories", calories + existingcalories);
} else {
summary = new JSONObject();
summary.put("duration", 0); // sum onto this whilst aggregating over bucket below.
summary.put("distance", distance);
summary.put("calories", calories);
}
actobj.put(activity, summary);
retBucket.put("value", actobj);
}
}
}
}

// aggregate data points over the bucket
Expand Down Expand Up @@ -1503,6 +1456,56 @@ private void queryAggregated(final JSONArray args, final CallbackContext callbac
}
}

private JSONObject getAggregatedActivityDistanceCalories (long st, long et) throws JSONException {
JSONObject actobj = new JSONObject();

DataReadRequest readActivityDistCalRequest = new DataReadRequest.Builder()
.aggregate(DataType.TYPE_DISTANCE_DELTA, DataType.AGGREGATE_DISTANCE_DELTA)
.aggregate(DataType.TYPE_CALORIES_EXPENDED, DataType.AGGREGATE_CALORIES_EXPENDED)
.bucketByActivityType(1, TimeUnit.SECONDS)
.setTimeRange(st, et, TimeUnit.MILLISECONDS)
.build();

DataReadResult dataActivityDistCalReadResult = Fitness.HistoryApi.readData(mClient, readActivityDistCalRequest).await();

if (dataActivityDistCalReadResult.getStatus().isSuccess()) {
for (Bucket activityBucket : dataActivityDistCalReadResult.getBuckets()) {
//each bucket is an activity
float distance = 0;
float calories = 0;
String activity = activityBucket.getActivity();

DataSet distanceDataSet = activityBucket.getDataSet(DataType.AGGREGATE_DISTANCE_DELTA);
for (DataPoint datapoint : distanceDataSet.getDataPoints()) {
distance += datapoint.getValue(Field.FIELD_DISTANCE).asFloat();
}

DataSet caloriesDataSet = activityBucket.getDataSet(DataType.AGGREGATE_CALORIES_EXPENDED);
for (DataPoint datapoint : caloriesDataSet.getDataPoints()) {
calories += datapoint.getValue(Field.FIELD_CALORIES).asFloat();
}

JSONObject summary;
if (actobj.has(activity)) {
summary = actobj.getJSONObject(activity);
double existingdistance = summary.getDouble("distance");
summary.put("distance", distance + existingdistance);
double existingcalories = summary.getDouble("calories");
summary.put("calories", calories + existingcalories);
} else {
summary = new JSONObject();
summary.put("duration", 0); // sum onto this whilst aggregating over buckets.
summary.put("distance", distance);
summary.put("calories", calories);
}

actobj.put(activity, summary);
}
}
return actobj;
}


// utility function that gets the basal metabolic rate averaged over a week
private float getBasalAVG(long _et) throws Exception {
float basalAVG = 0;
Expand Down