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

Update calorie when activity recognition api sets the track category

Browse Source
This commit is contained in:
Jimmy Shih
2013-11-19 14:19:11 -08:00
parent 2571247829
commit 5ecb41adc2
1 changed files with 48 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingService.java
+48 -31
View File
@@ -763,35 +763,44 @@ public class TrackRecordingService extends Service {
// Update database
Track track = myTracksProviderUtils.getTrack(trackId);
if (track != null && !paused) {
insertLocation(track, lastLocation, getLastValidTrackPointInCurrentSegment(trackId));
if (track != null) {
int activityRecognitionType = PreferencesUtils.getInt(this,
R.string.activity_recognition_type_key,
PreferencesUtils.ACTIVITY_RECOGNITION_TYPE_DEFAULT);
if (activityRecognitionType != PreferencesUtils.ACTIVITY_RECOGNITION_TYPE_DEFAULT) {
String iconValue = null;
switch (activityRecognitionType) {
case DetectedActivity.IN_VEHICLE:
iconValue = TrackIconUtils.DRIVE;
break;
case DetectedActivity.ON_BICYCLE:
iconValue = TrackIconUtils.BIKE;
break;
case DetectedActivity.ON_FOOT:
iconValue = TrackIconUtils.WALK;
break;
default:
break;
// If not paused, add the last location
if (!paused) {
insertLocation(track, lastLocation, getLastValidTrackPointInCurrentSegment(trackId));
}
// Update the recording track time
updateRecordingTrack(track, myTracksProviderUtils.getLastTrackPointId(trackId), false);
if (track.getCategory().equals(PreferencesUtils.DEFAULT_ACTIVITY_DEFAULT)) {
int activityRecognitionType = PreferencesUtils.getInt(this,
R.string.activity_recognition_type_key,
PreferencesUtils.ACTIVITY_RECOGNITION_TYPE_DEFAULT);
if (activityRecognitionType != PreferencesUtils.ACTIVITY_RECOGNITION_TYPE_DEFAULT) {
String iconValue = null;
switch (activityRecognitionType) {
case DetectedActivity.IN_VEHICLE:
iconValue = TrackIconUtils.DRIVE;
break;
case DetectedActivity.ON_BICYCLE:
iconValue = TrackIconUtils.BIKE;
break;
case DetectedActivity.ON_FOOT:
iconValue = TrackIconUtils.WALK;
break;
default:
break;
}
if (iconValue != null) {
track.setIcon(iconValue);
track.setCategory(getString(TrackIconUtils.getIconActivityType(iconValue)));
myTracksProviderUtils.updateTrack(track);
CalorieUtils.updateTrackCalorie(context, track);
}
}
if (iconValue != null) {
track.setIcon(iconValue);
track.setCategory(getString(TrackIconUtils.getIconActivityType(iconValue)));
}
}
updateRecordingTrack(track, myTracksProviderUtils.getLastTrackPointId(trackId), false);
}
}
endRecording(true, trackId);
}
@@ -1031,15 +1040,23 @@ public class TrackRecordingService extends Service {
sendTrackBroadcast(R.string.track_update_broadcast_action, track.getId());
}
/**
* Updates the recording track time. Also updates the startId and the stopId.
* Increase the number of points if it is a new and valid track point.
*
* @param track the track
* @param lastTrackPointId the last track point id
* @param increaseNumberOfPoints true to increase the number of points
*/
private void updateRecordingTrack(
Track track, long trackPointId, boolean isTrackPointNewAndValid) {
if (trackPointId >= 0) {
Track track, long lastTrackPointId, boolean increaseNumberOfPoints) {
if (lastTrackPointId >= 0) {
if (track.getStartId() < 0) {
track.setStartId(trackPointId);
track.setStartId(lastTrackPointId);
}
track.setStopId(trackPointId);
track.setStopId(lastTrackPointId);
}
if (isTrackPointNewAndValid) {
if (increaseNumberOfPoints) {
track.setNumberOfPoints(track.getNumberOfPoints() + 1);
}