MarcoBuster
/
Gadgetbridge
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge
1
0
Fork 0
Code Releases Wiki Activity

Activity Summary: Draw fit file if available

This commit is contained in:
José Rebelo 2024-05-01 22:21:34 +01:00
parent 525b395c01
commit 972a2e8b30
2 changed files with 54 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ActivitySummariesGpsFragment.java
View File

@ -34,12 +34,17 @@ import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import nodomain.freeyourgadget.gadgetbridge.GBApplication; import nodomain.freeyourgadget.gadgetbridge.GBApplication;
import nodomain.freeyourgadget.gadgetbridge.R; import nodomain.freeyourgadget.gadgetbridge.R;
import nodomain.freeyourgadget.gadgetbridge.model.GPSCoordinate; import nodomain.freeyourgadget.gadgetbridge.model.GPSCoordinate;
import nodomain.freeyourgadget.gadgetbridge.service.devices.garmin.fit.FitFile;
import nodomain.freeyourgadget.gadgetbridge.service.devices.garmin.fit.FitImporter;
import nodomain.freeyourgadget.gadgetbridge.service.devices.garmin.fit.RecordData;
import nodomain.freeyourgadget.gadgetbridge.service.devices.garmin.fit.messages.FitRecord;
import nodomain.freeyourgadget.gadgetbridge.util.gpx.GpxParseException; import nodomain.freeyourgadget.gadgetbridge.util.gpx.GpxParseException;
import nodomain.freeyourgadget.gadgetbridge.util.gpx.GpxParser; import nodomain.freeyourgadget.gadgetbridge.util.gpx.GpxParser;
import nodomain.freeyourgadget.gadgetbridge.util.gpx.model.GpxFile; import nodomain.freeyourgadget.gadgetbridge.util.gpx.model.GpxFile;
@ -76,21 +81,40 @@ public class ActivitySummariesGpsFragment extends AbstractGBFragment {
new Thread(new Runnable() { new Thread(new Runnable() {
@Override @Override
public void run() { public void run() {
final GpxFile gpxFile; final List<GPSCoordinate> points = new ArrayList<>();
if (inputFile.getName().endsWith(".gpx")) {
try (FileInputStream inputStream = new FileInputStream(inputFile)) { try (FileInputStream inputStream = new FileInputStream(inputFile)) {
final GpxParser gpxParser = new GpxParser(inputStream); final GpxParser gpxParser = new GpxParser(inputStream);
gpxFile = gpxParser.getGpxFile(); points.addAll(gpxParser.getGpxFile().getPoints());
} catch (final IOException e) { } catch (final IOException e) {
LOG.error("Failed to open {}", inputFile, e); LOG.error("Failed to open {}", inputFile, e);
return; return;
} catch (final GpxParseException e) { } catch (final GpxParseException e) {
LOG.error("Failed to parse gpx file", e); LOG.error("Failed to parse gpx file", e);
return;
}
} else if (inputFile.getName().endsWith(".fit")) {
try {
FitFile fitFile = FitFile.parseIncoming(inputFile);
for (final RecordData record : fitFile.getRecords()) {
if (record instanceof FitRecord) {
points.add(((FitRecord) record).toActivityPoint().getLocation());
}
}
} catch (final IOException e) {
LOG.error("Failed to open {}", inputFile, e);
return;
} catch (final Exception e) {
LOG.error("Failed to parse fit file", e);
return;
}
} else {
LOG.warn("Unknown file type {}", inputFile.getName());
return; return;
} }
if (!gpxFile.getPoints().isEmpty()) { if (!points.isEmpty()) {
drawTrack(canvas, gpxFile.getPoints()); drawTrack(canvas, points);
} }
} }
}).start(); }).start();

27
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ActivitySummaryDetail.java
View File

@ -183,9 +183,9 @@ public class ActivitySummaryDetail extends AbstractGBActivity {
makeSummaryHeader(newItem); makeSummaryHeader(newItem);
makeSummaryContent(newItem); makeSummaryContent(newItem);
activitySummariesChartFragment.setDateAndGetData(getGBDevice(currentItem.getDevice()), currentItem.getStartTime().getTime() / 1000, currentItem.getEndTime().getTime() / 1000); activitySummariesChartFragment.setDateAndGetData(getGBDevice(currentItem.getDevice()), currentItem.getStartTime().getTime() / 1000, currentItem.getEndTime().getTime() / 1000);
if (get_gpx_file() != null) { if (getTrackFile() != null) {
showCanvas(); showCanvas();
activitySummariesGpsFragment.set_data(get_gpx_file()); activitySummariesGpsFragment.set_data(getTrackFile());
} else { } else {
hideCanvas(); hideCanvas();
} }
@ -205,9 +205,9 @@ public class ActivitySummaryDetail extends AbstractGBActivity {
makeSummaryHeader(newItem); makeSummaryHeader(newItem);
makeSummaryContent(newItem); makeSummaryContent(newItem);
activitySummariesChartFragment.setDateAndGetData(getGBDevice(currentItem.getDevice()), currentItem.getStartTime().getTime() / 1000, currentItem.getEndTime().getTime() / 1000); activitySummariesChartFragment.setDateAndGetData(getGBDevice(currentItem.getDevice()), currentItem.getStartTime().getTime() / 1000, currentItem.getEndTime().getTime() / 1000);
if (get_gpx_file() != null) { if (getTrackFile() != null) {
showCanvas(); showCanvas();
activitySummariesGpsFragment.set_data(get_gpx_file()); activitySummariesGpsFragment.set_data(getTrackFile());
} else { } else {
hideCanvas(); hideCanvas();
} }
@ -226,9 +226,9 @@ public class ActivitySummaryDetail extends AbstractGBActivity {
makeSummaryHeader(currentItem); makeSummaryHeader(currentItem);
makeSummaryContent(currentItem); makeSummaryContent(currentItem);
activitySummariesChartFragment.setDateAndGetData(getGBDevice(currentItem.getDevice()), currentItem.getStartTime().getTime() / 1000, currentItem.getEndTime().getTime() / 1000); activitySummariesChartFragment.setDateAndGetData(getGBDevice(currentItem.getDevice()), currentItem.getStartTime().getTime() / 1000, currentItem.getEndTime().getTime() / 1000);
if (get_gpx_file() != null) { if (getTrackFile() != null) {
showCanvas(); showCanvas();
activitySummariesGpsFragment.set_data(get_gpx_file()); activitySummariesGpsFragment.set_data(getTrackFile());
} else { } else {
hideCanvas(); hideCanvas();
} }
@ -319,9 +319,9 @@ public class ActivitySummaryDetail extends AbstractGBActivity {
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
currentItem.setGpxTrack(selectedGpxFile); currentItem.setGpxTrack(selectedGpxFile);
currentItem.update(); currentItem.update();
if (get_gpx_file() != null) { if (getTrackFile() != null) {
showCanvas(); showCanvas();
activitySummariesGpsFragment.set_data(get_gpx_file()); activitySummariesGpsFragment.set_data(getTrackFile());
} else { } else {
hideCanvas(); hideCanvas();
} }
@ -703,7 +703,7 @@ public class ActivitySummaryDetail extends AbstractGBActivity {
gpsView.setLayoutParams(params); gpsView.setLayoutParams(params);
} }
private File get_gpx_file() { private File getTrackFile() {
final String gpxTrack = currentItem.getGpxTrack(); final String gpxTrack = currentItem.getGpxTrack();
if (gpxTrack != null) { if (gpxTrack != null) {
File file = new File(gpxTrack); File file = new File(gpxTrack);
@ -713,6 +713,15 @@ public class ActivitySummaryDetail extends AbstractGBActivity {
return null; return null;
} }
} }
final String rawDetails = currentItem.getRawDetailsPath();
if (rawDetails != null && rawDetails.endsWith(".fit")) {
File file = new File(rawDetails);
if (file.exists()) {
return file;
} else {
return null;
}
}
return null; return null;
} }