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

Use the activity type of current track to calculate calorie.

Browse Source
This commit is contained in:
youtaol
2013-09-05 14:33:37 +08:00
parent e0375050d2
commit 7233137e93
14 changed files with 124 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/src/com/google/android/apps/mytracks/fragments/ChartFragment.java
+1 -2
View File
@@ -451,8 +451,7 @@ public class ChartFragment extends Fragment implements TrackDataListener {
double power = Double.NaN;
if (tripStatisticsUpdater != null) {
tripStatisticsUpdater.addLocation(location, recordingDistanceInterval, PreferencesUtils
.getInt(getActivity(), R.string.stats_weight_key, PreferencesUtils.STATS_WEIGHT_DEFAULT));
tripStatisticsUpdater.addLocation(location, recordingDistanceInterval, getActivity());
TripStatistics tripStatistics = tripStatisticsUpdater.getTripStatistics();
if (chartByDistance) {
double distance = tripStatistics.getTotalDistance() * UnitConversions.M_TO_KM;
MyTracks/src/com/google/android/apps/mytracks/fragments/MarkerDetailFragment.java
+2 -1
View File
@@ -192,7 +192,8 @@ public class MarkerDetailFragment extends Fragment {
TextView name = (TextView) getView().findViewById(R.id.marker_detail_statistics_name);
name.setText(getString(R.string.generic_name_line, waypoint.getName()));
StatsUtils.setTripStatisticsValues(getActivity(), waypoint.getTripStatistics());
StatsUtils.setTripStatisticsValues(getActivity(), waypoint.getTripStatistics(),
waypoint.getTrackId());
StatsUtils.setLocationValues(getActivity(), waypoint.getLocation(), false);
}
}
MyTracks/src/com/google/android/apps/mytracks/fragments/StatsFragment.java
+5 -1
View File
@@ -259,7 +259,11 @@ public class StatsFragment extends Fragment implements TrackDataListener {
* Updates the UI.
*/
private void updateUi(FragmentActivity activity) {
StatsUtils.setTripStatisticsValues(activity, lastTripStatistics);
StatsUtils.setTripStatisticsValues(
activity,
lastTripStatistics,
trackDataHub == null ? PreferencesUtils.RECORDING_TRACK_ID_DEFAULT : trackDataHub
.getSelectedTrackId());
StatsUtils.setLocationValues(activity, lastLocation, isSelectedTrackRecording());
}
}