karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

After user edit the track. Update recorded track statistics immediately and update recording track statistics in track recording service.

Browse Source 
Change some code style.
This commit is contained in:
youtaol
2013-10-23 17:14:45 +08:00
parent d64b1c74f4
commit c68ec5ed9a
8 changed files with 83 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/src/com/google/android/apps/mytracks/util/CalorieUtils.java
+16 -57
View File
@@ -18,8 +18,6 @@ package com.google.android.apps.mytracks.util;
import com.google.android.apps.mytracks.content.MyTracksProviderUtils;
import com.google.android.apps.mytracks.content.MyTracksProviderUtils.LocationIterator;
import com.google.android.apps.mytracks.content.Track;
import com.google.android.apps.mytracks.services.TrackRecordingService;
import com.google.android.apps.mytracks.stats.DoubleBuffer;
import com.google.android.apps.mytracks.stats.TripStatisticsUpdater;
import com.google.android.maps.mytracks.R;
import com.google.common.annotations.VisibleForTesting;
@@ -280,69 +278,30 @@ public class CalorieUtils {
* @param context the context
* @param track the track to calculate
* @param category the category of track
* @return a double array of calorie value and the size of this array is 2.
* The first value is the calorie of entire track and the second value
* is the calorie of current segment
* @return the TripStatisticsUpdater of track
*/
public static double[] calculateTrackCalorie(Context context, Track track, String category) {
double[] calories = {0.0, 0.0};
ActivityType activityType = getActivityType(context, category);
if (activityType == ActivityType.INVALID) {
return calories;
}
public static TripStatisticsUpdater updateTrackStatistics(Context context, Track track) {
ActivityType activityType = getActivityType(context, track.getCategory());
double calorieTotal = 0.0;
double calorieCurrentSegment = 0.0;
MyTracksProviderUtils providerUtils = MyTracksProviderUtils.Factory.get(context);
long trackId = track.getId();
LocationIterator points = providerUtils.getTrackPointLocationIterator(trackId, -1, false,
MyTracksProviderUtils.DEFAULT_LOCATION_FACTORY);
DoubleBuffer gradeBuffer = new DoubleBuffer(TripStatisticsUpdater.GRADE_SMOOTHING_FACTOR);
if (points.hasNext()) {
Location start = points.next();
while (points.hasNext()) {
Location stop = points.next();
if (stop.getLatitude() == TrackRecordingService.PAUSE_LATITUDE
|| stop.getLatitude() == TrackRecordingService.RESUME_LATITUDE) {
calorieCurrentSegment = 0.0;
continue;
}
double grade = updateGrade(gradeBuffer, stop.distanceTo(start),
stop.getAltitude() - start.getAltitude());
double calorieAdded = getCalorie(start, stop, grade, PreferencesUtils.getInt(context,
R.string.stats_weight_key, PreferencesUtils.STATS_WEIGHT_DEFAULT), activityType);
calorieTotal += calorieAdded;
calorieCurrentSegment += calorieAdded;
start = stop;
TripStatisticsUpdater tripStatisticsUpdater = new TripStatisticsUpdater(track
.getTripStatistics().getStartTime());
while (points.hasNext()) {
if (activityType == ActivityType.INVALID) {
tripStatisticsUpdater.addLocation(points.next(), PreferencesUtils.getInt(context,
R.string.recording_distance_interval_key,
PreferencesUtils.RECORDING_DISTANCE_INTERVAL_DEFAULT), context);
} else {
tripStatisticsUpdater.addLocationCalorie(points.next(), PreferencesUtils.getInt(context,
R.string.recording_distance_interval_key,
PreferencesUtils.RECORDING_DISTANCE_INTERVAL_DEFAULT), activityType, context);
}
}
calories[0] = calorieTotal;
calories[1] = calorieCurrentSegment;
return calories;
track.setTripStatistics(tripStatisticsUpdater.getTripStatistics());
return tripStatisticsUpdater;
}
/**
* Updates a grade reading.
*
* @param gradeBuffer
* @param distance
* @param rise
* @return
*/
private static double updateGrade(DoubleBuffer gradeBuffer, float distance, Double rise) {
double grade = 0;
if (rise > 0 && distance > 0) {
gradeBuffer.setNext(rise / distance);
grade = gradeBuffer.getAverage();
} else {
gradeBuffer.setNext(0);
}
return grade;
}
}
MyTracks/src/com/google/android/apps/mytracks/util/TrackRecordingServiceConnectionUtils.java
+5 -8
View File
@@ -17,6 +17,7 @@
package com.google.android.apps.mytracks.util;
import com.google.android.apps.mytracks.TrackEditActivity;
import com.google.android.apps.mytracks.content.Track;
import com.google.android.apps.mytracks.content.WaypointCreationRequest;
import com.google.android.apps.mytracks.services.ITrackRecordingService;
import com.google.android.apps.mytracks.services.TrackRecordingService;
@@ -197,21 +198,17 @@ public class TrackRecordingServiceConnectionUtils {
/**
* Updates the calorie of current recording track.
*
* @param trackRecordingServiceConnection the TrackRecordingServiceConnection
* instance
* @param calories a double array of calorie value and the size of this array
* is 2. The first value is the calorie of entire track and the
* second value is the calorie of current segment
* @param trackRecordingServiceConnection
* @param track the current recording track
*/
public static void updateCalorie(TrackRecordingServiceConnection trackRecordingServiceConnection,
double[] calories) {
public static void updateCalorie(TrackRecordingServiceConnection trackRecordingServiceConnection, Track track) {
ITrackRecordingService trackRecordingService = trackRecordingServiceConnection
.getServiceIfBound();
if (trackRecordingService == null) {
Log.d(TAG, "Unable to update calorie, no track recording service");
} else {
try {
trackRecordingService.updateCalorie(calories[0], calories[1]);
trackRecordingService.updateTripStatistics(track);
} catch (RemoteException e) {
Log.e(TAG, "Unable to update calorie", e);
} catch (IllegalStateException e) {