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

Blocked ui activity load #78

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Blocked ui activity load #78

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fc271e5
Issue #65 - Exported GPX distance, average speed and elevation gain a…
robsonj Apr 29, 2015
43eb550
Revert "Issue #65 - Exported GPX distance, average speed and elevatio…
robsonj May 1, 2015
c2de26c
Loading Events in ActivityLogPage should not lock up the UI #19
robsonj Apr 30, 2015
811e024
Revert "Loading Events in ActivityLogPage should not lock up the UI #19"
robsonj May 1, 2015
e7ee4f1
Loading Events in ActivityLogPage should not lock up the UI #19
robsonj Apr 30, 2015
682b438
Clear the events list before repopulating
robsonj May 2, 2015
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
91 changes: 54 additions & 37 deletions src/unBand/CloudHelpers/BandCloudManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,56 +114,73 @@ void _cloud_AuthenticationCompleted()
/// <returns>Nothing. DataBind against Events.</returns>
public async Task LoadEvents(int? topCount = null, DateTime? startDate = null, DateTime? endDate = null)
{
List<BandEventBase> userDailyActivities = null;
var events = await LoadEventsAsync(topCount, startDate, endDate);

// using topCount for dailyEvents makes no sense, since it seems to return (topCount)hours since the Band started
// reporting data, which is somewhat useless. So if the dates weren't provided, let's just load up the max range (7 days)
// Note: there seems to be a bug in the Health cloud service that lets you pull of the data in one swoop, but I don't
// want to be naughty (and at some point that will be a ton of data for one request)
if (startDate == null && endDate == null)
Events.Clear();
foreach (var evnt in events)
{
var end = DateTime.UtcNow;
var start = end.AddDays(-7);
userDailyActivities = await _cloud.GetUserActivity(0, start, end);
Events.Add(evnt);
}
}

if (userDailyActivities != null)
private async Task<IEnumerable<BandEventViewModel>> LoadEventsAsync(int? topCount = null, DateTime? startDate = null, DateTime? endDate = null)
{
return await Task.Run<IEnumerable<BandEventViewModel>>(async () =>
{
// userDailyActivities will be a sorted list from earliest to last, but the other activities (below)
// are retrieved in reverse order, so reverse the list.
userDailyActivities.Reverse();
}
List<BandEventBase> userDailyActivities = null;
var bandEvents = new List<BandEventViewModel>();

// using topCount for dailyEvents makes no sense, since it seems to return (topCount)hours since the Band started
// reporting data, which is somewhat useless. So if the dates weren't provided, let's just load up the max range (7 days)
// Note: there seems to be a bug in the Health cloud service that lets you pull of the data in one swoop, but I don't
// want to be naughty (and at some point that will be a ton of data for one request)
if (startDate == null && endDate == null)
{
var end = DateTime.UtcNow;
var start = end.AddDays(-7);
userDailyActivities = await _cloud.GetUserActivity(0, start, end);
}

// for now, don't limit the request limit, since we're hitting requests that don't care
// topCount = (topCount > MAX_TOP_REQUEST ? MAX_TOP_REQUEST : topCount);
if (userDailyActivities != null)
{
// userDailyActivities will be a sorted list from earliest to last, but the other activities (below)
// are retrieved in reverse order, so reverse the list.
userDailyActivities.Reverse();
}

var events = await _cloud.GetEvents(topCount, startDate, endDate);
// for now, don't limit the request limit, since we're hitting requests that don't care
// topCount = (topCount > MAX_TOP_REQUEST ? MAX_TOP_REQUEST : topCount);

var curDailyActivity = (userDailyActivities == null ? -1 : 0);
var events = await _cloud.GetEvents(topCount, startDate, endDate);

foreach (var cloudEvent in events)
{
// make sure to intersperse daily activities in the proper location with regular activities
// essentially if we hit a curDailyActivity that is more recent (or the same) as the current activity
// then dump it to the list. This guarantees that the daily counts are topmost in the list for a given date
// and that if you have a bunch of Daily Activity logs with nothing in between (no sleep, exercise etc) then
// they will be dumped in one after another
while (curDailyActivity > -1 && curDailyActivity < userDailyActivities.Count && userDailyActivities[curDailyActivity].StartTime.Date >= cloudEvent.StartTime.Date)
{
Events.Add(new BandEventViewModel(_cloud, userDailyActivities[curDailyActivity]));
var curDailyActivity = (userDailyActivities == null ? -1 : 0);

curDailyActivity++;
foreach (var cloudEvent in events)
{
// make sure to intersperse daily activities in the proper location with regular activities
// essentially if we hit a curDailyActivity that is more recent (or the same) as the current activity
// then dump it to the list. This guarantees that the daily counts are topmost in the list for a given date
// and that if you have a bunch of Daily Activity logs with nothing in between (no sleep, exercise etc) then
// they will be dumped in one after another
while (curDailyActivity > -1 && curDailyActivity < userDailyActivities.Count &&
userDailyActivities[curDailyActivity].StartTime.Date >= cloudEvent.StartTime.Date)
{
bandEvents.Add(new BandEventViewModel(_cloud, userDailyActivities[curDailyActivity]));

curDailyActivity++;
}

bandEvents.Add(new BandEventViewModel(_cloud, cloudEvent));
}

Events.Add(new BandEventViewModel(_cloud, cloudEvent));
}

// if we have left over daily activities, dump them now
for (; curDailyActivity < userDailyActivities.Count; curDailyActivity++)
{
Events.Add(new BandEventViewModel(_cloud, userDailyActivities[curDailyActivity]));
}
// if we have left over daily activities, dump them now
for (; curDailyActivity < userDailyActivities.Count; curDailyActivity++)
{
bandEvents.Add(new BandEventViewModel(_cloud, userDailyActivities[curDailyActivity]));
}

return bandEvents;
});
}

public async Task ExportEventsSummaryToCSV(int? count, CloudDataExporterSettings settings, string fileName, IProgress<BandCloudExportProgress> progress)
Expand Down