Read overall statistics from received OpenTracks dashboard API URIs
This commit is contained in:
Arjan Schrijver
parent
d2408f77cd
commit
5224304b6c
|
|
@ -668,5 +668,10 @@
|
|||
<data android:mimeType="*/*" />
|
||||
</intent-filter>
|
||||
</activity>
|
||||
|
||||
<activity
|
||||
android:name=".externalevents.OpenTracksController"
|
||||
android:label="OpenTracks controller and intent receiver"
|
||||
android:exported="true"/>
|
||||
</application>
|
||||
</manifest>
|
||||
|
|
|
|||
|
|
@ -67,6 +67,7 @@ import nodomain.freeyourgadget.gadgetbridge.entities.DaoMaster;
|
|||
import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
|
||||
import nodomain.freeyourgadget.gadgetbridge.entities.Device;
|
||||
import nodomain.freeyourgadget.gadgetbridge.externalevents.BluetoothStateChangeReceiver;
|
||||
import nodomain.freeyourgadget.gadgetbridge.externalevents.OpenTracksContentObserver;
|
||||
import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
|
||||
import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceService;
|
||||
import nodomain.freeyourgadget.gadgetbridge.model.ActivityUser;
|
||||
|
|
@ -143,6 +144,8 @@ public class GBApplication extends Application {
|
|||
private DeviceManager deviceManager;
|
||||
private BluetoothStateChangeReceiver bluetoothStateChangeReceiver;
|
||||
|
||||
private OpenTracksContentObserver openTracksObserver;
|
||||
|
||||
public static void quit() {
|
||||
GB.log("Quitting Gadgetbridge...", GB.INFO, null);
|
||||
Intent quitIntent = new Intent(GBApplication.ACTION_QUIT);
|
||||
|
|
@ -1090,4 +1093,12 @@ public class GBApplication extends Application {
|
|||
return "Gadgetbridge";
|
||||
}
|
||||
}
|
||||
|
||||
public void setOpenTracksObserver(OpenTracksContentObserver openTracksObserver) {
|
||||
this.openTracksObserver = openTracksObserver;
|
||||
}
|
||||
|
||||
public OpenTracksContentObserver getOpenTracksObserver() {
|
||||
return openTracksObserver;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,393 @@
|
|||
/* Copyright (C) 2022 Arjan Schrijver
|
||||
|
||||
This file is part of Gadgetbridge.
|
||||
|
||||
Gadgetbridge is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU Affero General Public License as published
|
||||
by the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
Gadgetbridge is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU Affero General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Affero General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
||||
|
||||
package nodomain.freeyourgadget.gadgetbridge.externalevents;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.content.ContentResolver;
|
||||
import android.content.Context;
|
||||
import android.database.ContentObserver;
|
||||
import android.database.Cursor;
|
||||
import android.net.Uri;
|
||||
import android.os.Handler;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
|
||||
public class OpenTracksContentObserver extends ContentObserver {
|
||||
private Context mContext;
|
||||
private Uri tracksUri;
|
||||
private int protocolVersion;
|
||||
private int totalTimeMillis;
|
||||
private float totalDistanceMeter;
|
||||
|
||||
private long previousTimeMillis = 0;
|
||||
private float previousDistanceMeter = 0;
|
||||
|
||||
public int getTotalTimeMillis() {
|
||||
return totalTimeMillis;
|
||||
}
|
||||
public float getTotalDistanceMeter() {
|
||||
return totalDistanceMeter;
|
||||
}
|
||||
|
||||
public long getTimeMillisChange() {
|
||||
/**
|
||||
* We don't use the timeMillis received from OpenTracks here, because those updates do not
|
||||
* come in very regularly when GPS reception is bad
|
||||
*/
|
||||
long timeMillisDelta = System.currentTimeMillis() - previousTimeMillis;
|
||||
previousTimeMillis = System.currentTimeMillis();
|
||||
return timeMillisDelta;
|
||||
}
|
||||
|
||||
public float getDistanceMeterChange() {
|
||||
float distanceMeterDelta = totalDistanceMeter - previousDistanceMeter;
|
||||
previousDistanceMeter = totalDistanceMeter;
|
||||
return distanceMeterDelta;
|
||||
}
|
||||
|
||||
|
||||
public OpenTracksContentObserver(Context context, final Uri tracksUri, final int protocolVersion) {
|
||||
super(new Handler());
|
||||
this.mContext = context;
|
||||
this.tracksUri = tracksUri;
|
||||
this.protocolVersion = protocolVersion;
|
||||
this.previousTimeMillis = System.currentTimeMillis();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onChange(final boolean selfChange, final Uri uri) {
|
||||
if (uri == null) {
|
||||
return; // nothing can be done without an uri
|
||||
}
|
||||
if (tracksUri.toString().startsWith(uri.toString())) {
|
||||
final List<Track> tracks = Track.readTracks(mContext.getContentResolver(), tracksUri, protocolVersion);
|
||||
if (!tracks.isEmpty()) {
|
||||
final TrackStatistics statistics = new TrackStatistics(tracks);
|
||||
totalTimeMillis = statistics.getTotalTimeMillis();
|
||||
totalDistanceMeter = statistics.getTotalDistanceMeter();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void unregister() {
|
||||
if (mContext != null) {
|
||||
mContext.getContentResolver().unregisterContentObserver(this);
|
||||
}
|
||||
}
|
||||
|
||||
public void finish() {
|
||||
unregister();
|
||||
if (mContext != null) {
|
||||
((Activity) mContext).finish();
|
||||
mContext = null;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
class Track {
|
||||
/**
|
||||
* This class was copied and modified from
|
||||
* https://github.com/OpenTracksApp/OSMDashboard/blob/main/src/main/java/de/storchp/opentracks/osmplugin/dashboardapi/Track.java
|
||||
*/
|
||||
private static final Logger LOG = LoggerFactory.getLogger(Track.class);
|
||||
|
||||
private static final String TAG = Track.class.getSimpleName();
|
||||
|
||||
public static final String _ID = "_id";
|
||||
public static final String NAME = "name"; // track name
|
||||
public static final String DESCRIPTION = "description"; // track description
|
||||
public static final String CATEGORY = "category"; // track activity type
|
||||
public static final String STARTTIME = "starttime"; // track start time
|
||||
public static final String STOPTIME = "stoptime"; // track stop time
|
||||
public static final String TOTALDISTANCE = "totaldistance"; // total distance
|
||||
public static final String TOTALTIME = "totaltime"; // total time
|
||||
public static final String MOVINGTIME = "movingtime"; // moving time
|
||||
public static final String AVGSPEED = "avgspeed"; // average speed
|
||||
public static final String AVGMOVINGSPEED = "avgmovingspeed"; // average moving speed
|
||||
public static final String MAXSPEED = "maxspeed"; // maximum speed
|
||||
public static final String MINELEVATION = "minelevation"; // minimum elevation
|
||||
public static final String MAXELEVATION = "maxelevation"; // maximum elevation
|
||||
public static final String ELEVATIONGAIN = "elevationgain"; // elevation gain
|
||||
|
||||
public static final String[] PROJECTION = {
|
||||
_ID,
|
||||
NAME,
|
||||
DESCRIPTION,
|
||||
CATEGORY,
|
||||
STARTTIME,
|
||||
STOPTIME,
|
||||
TOTALDISTANCE,
|
||||
TOTALTIME,
|
||||
MOVINGTIME,
|
||||
AVGSPEED,
|
||||
AVGMOVINGSPEED,
|
||||
MAXSPEED,
|
||||
MINELEVATION,
|
||||
MAXELEVATION,
|
||||
ELEVATIONGAIN
|
||||
};
|
||||
|
||||
private final long id;
|
||||
private final String trackname;
|
||||
private final String description;
|
||||
private final String category;
|
||||
private final int startTimeEpochMillis;
|
||||
private final int stopTimeEpochMillis;
|
||||
private final float totalDistanceMeter;
|
||||
private final int totalTimeMillis;
|
||||
private final int movingTimeMillis;
|
||||
private final float avgSpeedMeterPerSecond;
|
||||
private final float avgMovingSpeedMeterPerSecond;
|
||||
private final float maxSpeedMeterPerSecond;
|
||||
private final float minElevationMeter;
|
||||
private final float maxElevationMeter;
|
||||
private final float elevationGainMeter;
|
||||
|
||||
public Track(final long id, final String trackname, final String description, final String category, final int startTimeEpochMillis, final int stopTimeEpochMillis, final float totalDistanceMeter, final int totalTimeMillis, final int movingTimeMillis, final float avgSpeedMeterPerSecond, final float avgMovingSpeedMeterPerSecond, final float maxSpeedMeterPerSecond, final float minElevationMeter, final float maxElevationMeter, final float elevationGainMeter) {
|
||||
this.id = id;
|
||||
this.trackname = trackname;
|
||||
this.description = description;
|
||||
this.category = category;
|
||||
this.startTimeEpochMillis = startTimeEpochMillis;
|
||||
this.stopTimeEpochMillis = stopTimeEpochMillis;
|
||||
this.totalDistanceMeter = totalDistanceMeter;
|
||||
this.totalTimeMillis = totalTimeMillis;
|
||||
this.movingTimeMillis = movingTimeMillis;
|
||||
this.avgSpeedMeterPerSecond = avgSpeedMeterPerSecond;
|
||||
this.avgMovingSpeedMeterPerSecond = avgMovingSpeedMeterPerSecond;
|
||||
this.maxSpeedMeterPerSecond = maxSpeedMeterPerSecond;
|
||||
this.minElevationMeter = minElevationMeter;
|
||||
this.maxElevationMeter = maxElevationMeter;
|
||||
this.elevationGainMeter = elevationGainMeter;
|
||||
}
|
||||
|
||||
/**
|
||||
* Reads the Tracks from the Content Uri
|
||||
*/
|
||||
public static List<Track> readTracks(final ContentResolver resolver, final Uri data, final int protocolVersion) {
|
||||
LOG.info("Loading track(s) from " + data);
|
||||
|
||||
final ArrayList<Track> tracks = new ArrayList<Track>();
|
||||
try (final Cursor cursor = resolver.query(data, Track.PROJECTION, null, null, null)) {
|
||||
while (cursor.moveToNext()) {
|
||||
final long id = cursor.getLong(cursor.getColumnIndexOrThrow(Track._ID));
|
||||
final String trackname = cursor.getString(cursor.getColumnIndexOrThrow(Track.NAME));
|
||||
final String description = cursor.getString(cursor.getColumnIndexOrThrow(Track.DESCRIPTION));
|
||||
final String category = cursor.getString(cursor.getColumnIndexOrThrow(Track.CATEGORY));
|
||||
final int startTimeEpochMillis = cursor.getInt(cursor.getColumnIndexOrThrow(Track.STARTTIME));
|
||||
final int stopTimeEpochMillis = cursor.getInt(cursor.getColumnIndexOrThrow(Track.STOPTIME));
|
||||
final float totalDistanceMeter = cursor.getFloat(cursor.getColumnIndexOrThrow(Track.TOTALDISTANCE));
|
||||
final int totalTimeMillis = cursor.getInt(cursor.getColumnIndexOrThrow(Track.TOTALTIME));
|
||||
final int movingTimeMillis = cursor.getInt(cursor.getColumnIndexOrThrow(Track.MOVINGTIME));
|
||||
final float avgSpeedMeterPerSecond = cursor.getFloat(cursor.getColumnIndexOrThrow(Track.AVGSPEED));
|
||||
final float avgMovingSpeedMeterPerSecond = cursor.getFloat(cursor.getColumnIndexOrThrow(Track.AVGMOVINGSPEED));
|
||||
final float maxSpeedMeterPerSecond = cursor.getFloat(cursor.getColumnIndexOrThrow(Track.MAXSPEED));
|
||||
final float minElevationMeter = cursor.getFloat(cursor.getColumnIndexOrThrow(Track.MINELEVATION));
|
||||
final float maxElevationMeter = cursor.getFloat(cursor.getColumnIndexOrThrow(Track.MAXELEVATION));
|
||||
final float elevationGainMeter = cursor.getFloat(cursor.getColumnIndexOrThrow(Track.ELEVATIONGAIN));
|
||||
|
||||
LOG.info("New Track data received: distance=" + totalDistanceMeter + " time=" + totalTimeMillis);
|
||||
|
||||
tracks.add(new Track(id, trackname, description, category, startTimeEpochMillis, stopTimeEpochMillis,
|
||||
totalDistanceMeter, totalTimeMillis, movingTimeMillis, avgSpeedMeterPerSecond, avgMovingSpeedMeterPerSecond, maxSpeedMeterPerSecond,
|
||||
minElevationMeter, maxElevationMeter, elevationGainMeter));
|
||||
}
|
||||
} catch (final SecurityException e) {
|
||||
LOG.warn("No permission to read track", e);
|
||||
} catch (final Exception e) {
|
||||
LOG.warn("Reading track failed", e);
|
||||
}
|
||||
return tracks;
|
||||
}
|
||||
|
||||
public float getElevationGainMeter() {
|
||||
return elevationGainMeter;
|
||||
}
|
||||
|
||||
public float getMaxElevationMeter() {
|
||||
return maxElevationMeter;
|
||||
}
|
||||
|
||||
public float getMinElevationMeter() {
|
||||
return minElevationMeter;
|
||||
}
|
||||
|
||||
public float getMaxSpeedMeterPerSecond() {
|
||||
return maxSpeedMeterPerSecond;
|
||||
}
|
||||
|
||||
public float getAvgMovingSpeedMeterPerSecond() {
|
||||
return avgMovingSpeedMeterPerSecond;
|
||||
}
|
||||
|
||||
public float getAvgSpeedMeterPerSecond() {
|
||||
return avgSpeedMeterPerSecond;
|
||||
}
|
||||
|
||||
public int getMovingTimeMillis() {
|
||||
return movingTimeMillis;
|
||||
}
|
||||
|
||||
public int getTotalTimeMillis() {
|
||||
return totalTimeMillis;
|
||||
}
|
||||
|
||||
public float getTotalDistanceMeter() {
|
||||
return totalDistanceMeter;
|
||||
}
|
||||
|
||||
public int getStopTimeEpochMillis() {
|
||||
return stopTimeEpochMillis;
|
||||
}
|
||||
|
||||
public int getStartTimeEpochMillis() {
|
||||
return startTimeEpochMillis;
|
||||
}
|
||||
|
||||
public String getCategory() {
|
||||
return category;
|
||||
}
|
||||
|
||||
public String getDescription() {
|
||||
return description;
|
||||
}
|
||||
|
||||
public String getTrackname() {
|
||||
return trackname;
|
||||
}
|
||||
|
||||
public long getId() {
|
||||
return id;
|
||||
}
|
||||
}
|
||||
|
||||
class TrackStatistics {
|
||||
/**
|
||||
* This class was copied and modified from
|
||||
* https://github.com/OpenTracksApp/OSMDashboard/blob/main/src/main/java/de/storchp/opentracks/osmplugin/utils/TrackStatistics.java
|
||||
*/
|
||||
|
||||
private String category = "unknown";
|
||||
private int startTimeEpochMillis;
|
||||
private int stopTimeEpochMillis;
|
||||
private float totalDistanceMeter;
|
||||
private int totalTimeMillis;
|
||||
private int movingTimeMillis;
|
||||
private float avgSpeedMeterPerSecond;
|
||||
private float avgMovingSpeedMeterPerSecond;
|
||||
private float maxSpeedMeterPerSecond;
|
||||
private float minElevationMeter;
|
||||
private float maxElevationMeter;
|
||||
private float elevationGainMeter;
|
||||
|
||||
public TrackStatistics(final List<Track> tracks) {
|
||||
if (tracks.isEmpty()) {
|
||||
return;
|
||||
}
|
||||
final Track first = tracks.get(0);
|
||||
category = first.getCategory();
|
||||
startTimeEpochMillis = first.getStartTimeEpochMillis();
|
||||
stopTimeEpochMillis = first.getStopTimeEpochMillis();
|
||||
totalDistanceMeter = first.getTotalDistanceMeter();
|
||||
totalTimeMillis = first.getTotalTimeMillis();
|
||||
movingTimeMillis = first.getMovingTimeMillis();
|
||||
avgSpeedMeterPerSecond = first.getAvgSpeedMeterPerSecond();
|
||||
avgMovingSpeedMeterPerSecond = first.getAvgMovingSpeedMeterPerSecond();
|
||||
maxSpeedMeterPerSecond = first.getMaxSpeedMeterPerSecond();
|
||||
minElevationMeter = first.getMinElevationMeter();
|
||||
maxElevationMeter = first.getMaxElevationMeter();
|
||||
elevationGainMeter = first.getElevationGainMeter();
|
||||
|
||||
if (tracks.size() > 1) {
|
||||
float totalAvgSpeedMeterPerSecond = avgSpeedMeterPerSecond;
|
||||
float totalAvgMovingSpeedMeterPerSecond = avgMovingSpeedMeterPerSecond;
|
||||
for (final Track track : tracks.subList(1, tracks.size())) {
|
||||
if (!category.equals(track.getCategory())) {
|
||||
category = "mixed";
|
||||
}
|
||||
startTimeEpochMillis = Math.min(startTimeEpochMillis, track.getStartTimeEpochMillis());
|
||||
stopTimeEpochMillis = Math.max(stopTimeEpochMillis, track.getStopTimeEpochMillis());
|
||||
totalDistanceMeter += track.getTotalDistanceMeter();
|
||||
totalTimeMillis += track.getTotalTimeMillis();
|
||||
movingTimeMillis += track.getMovingTimeMillis();
|
||||
totalAvgSpeedMeterPerSecond += track.getAvgSpeedMeterPerSecond();
|
||||
totalAvgMovingSpeedMeterPerSecond += track.getAvgMovingSpeedMeterPerSecond();
|
||||
maxSpeedMeterPerSecond = Math.max(maxSpeedMeterPerSecond, track.getMaxSpeedMeterPerSecond());
|
||||
minElevationMeter = Math.min(minElevationMeter, track.getMinElevationMeter());
|
||||
maxElevationMeter = Math.max(maxElevationMeter, track.getMaxElevationMeter());
|
||||
elevationGainMeter += track.getElevationGainMeter();
|
||||
}
|
||||
|
||||
avgSpeedMeterPerSecond = totalAvgSpeedMeterPerSecond / tracks.size();
|
||||
avgMovingSpeedMeterPerSecond = totalAvgMovingSpeedMeterPerSecond / tracks.size();
|
||||
}
|
||||
}
|
||||
|
||||
public String getCategory() {
|
||||
return category;
|
||||
}
|
||||
|
||||
public int getStartTimeEpochMillis() {
|
||||
return startTimeEpochMillis;
|
||||
}
|
||||
|
||||
public int getStopTimeEpochMillis() {
|
||||
return stopTimeEpochMillis;
|
||||
}
|
||||
|
||||
public float getTotalDistanceMeter() {
|
||||
return totalDistanceMeter;
|
||||
}
|
||||
|
||||
public int getTotalTimeMillis() {
|
||||
return totalTimeMillis;
|
||||
}
|
||||
|
||||
public int getMovingTimeMillis() {
|
||||
return movingTimeMillis;
|
||||
}
|
||||
|
||||
public float getAvgSpeedMeterPerSecond() {
|
||||
return avgSpeedMeterPerSecond;
|
||||
}
|
||||
|
||||
public float getAvgMovingSpeedMeterPerSecond() {
|
||||
return avgMovingSpeedMeterPerSecond;
|
||||
}
|
||||
|
||||
public float getMaxSpeedMeterPerSecond() {
|
||||
return maxSpeedMeterPerSecond;
|
||||
}
|
||||
|
||||
public float getMinElevationMeter() {
|
||||
return minElevationMeter;
|
||||
}
|
||||
|
||||
public float getMaxElevationMeter() {
|
||||
return maxElevationMeter;
|
||||
}
|
||||
|
||||
public float getElevationGainMeter() {
|
||||
return elevationGainMeter;
|
||||
}
|
||||
}
|
||||
|
|
@ -17,24 +17,49 @@
|
|||
|
||||
package nodomain.freeyourgadget.gadgetbridge.externalevents;
|
||||
|
||||
import android.content.BroadcastReceiver;
|
||||
import android.app.Activity;
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.net.Uri;
|
||||
import android.os.Bundle;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
import nodomain.freeyourgadget.gadgetbridge.GBApplication;
|
||||
import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
|
||||
|
||||
public class OpenTracksController extends BroadcastReceiver {
|
||||
public class OpenTracksController extends Activity {
|
||||
private static final String EXTRAS_PROTOCOL_VERSION = "PROTOCOL_VERSION";
|
||||
private static final String ACTION_DASHBOARD = "Intent.OpenTracks-Dashboard";
|
||||
private static final String ACTION_DASHBOARD_PAYLOAD = ACTION_DASHBOARD + ".Payload";
|
||||
|
||||
private final Logger LOG = LoggerFactory.getLogger(OpenTracksController.class);
|
||||
|
||||
@Override
|
||||
public void onReceive(Context context, Intent intent) {
|
||||
if (intent != null) {
|
||||
Bundle bundle = intent.getExtras();
|
||||
if (bundle != null) {
|
||||
// Handle received OpenTracks Dashboard API intent
|
||||
public void onCreate(Bundle bundle) {
|
||||
super.onCreate(bundle);
|
||||
GBApplication gbApp = GBApplication.app();
|
||||
Intent intent = getIntent();
|
||||
int protocolVersion = intent.getIntExtra(EXTRAS_PROTOCOL_VERSION, 1);
|
||||
final ArrayList<Uri> uris = intent.getParcelableArrayListExtra(ACTION_DASHBOARD_PAYLOAD);
|
||||
if (uris != null) {
|
||||
if (gbApp.getOpenTracksObserver() != null) {
|
||||
LOG.info("Unregistering old OpenTracksContentObserver");
|
||||
gbApp.getOpenTracksObserver().unregister();
|
||||
}
|
||||
Uri tracksUri = uris.get(0);
|
||||
LOG.info("Registering OpenTracksContentObserver with tracks URI: " + tracksUri);
|
||||
gbApp.setOpenTracksObserver(new OpenTracksContentObserver(this, tracksUri, protocolVersion));
|
||||
try {
|
||||
getContentResolver().registerContentObserver(tracksUri, false, gbApp.getOpenTracksObserver());
|
||||
} catch (final SecurityException se) {
|
||||
LOG.error("Error registering OpenTracksContentObserver", se);
|
||||
}
|
||||
}
|
||||
moveTaskToBack(true);
|
||||
}
|
||||
|
||||
public static void sendIntent(Context context, String className) {
|
||||
|
|
@ -43,6 +68,8 @@ public class OpenTracksController extends BroadcastReceiver {
|
|||
Intent intent = new Intent();
|
||||
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
|
||||
intent.setClassName(packageName, className);
|
||||
intent.putExtra("STATS_TARGET_PACKAGE", context.getPackageName());
|
||||
intent.putExtra("STATS_TARGET_CLASS", "nodomain.freeyourgadget.gadgetbridge.externalevents.OpenTracksController");
|
||||
context.startActivity(intent);
|
||||
}
|
||||
|
||||
|
|
@ -52,5 +79,6 @@ public class OpenTracksController extends BroadcastReceiver {
|
|||
|
||||
public static void stopRecording(Context context) {
|
||||
sendIntent(context, "de.dennisguse.opentracks.publicapi.StopRecording");
|
||||
GBApplication.app().getOpenTracksObserver().finish();
|
||||
}
|
||||
}
|
||||
|
|
@ -24,12 +24,13 @@ import org.json.JSONObject;
|
|||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import nodomain.freeyourgadget.gadgetbridge.GBApplication;
|
||||
import nodomain.freeyourgadget.gadgetbridge.externalevents.OpenTracksController;
|
||||
|
||||
public class WorkoutRequestHandler {
|
||||
public static void addStateResponse(JSONObject workoutResponse, String type) throws JSONException {
|
||||
public static void addStateResponse(JSONObject workoutResponse, String type, String msg) throws JSONException {
|
||||
workoutResponse.put("workoutApp._.config.response", new JSONObject()
|
||||
.put("message", "")
|
||||
.put("message", msg)
|
||||
.put("type", type)
|
||||
);
|
||||
}
|
||||
|
|
@ -41,36 +42,38 @@ public class WorkoutRequestHandler {
|
|||
if (workoutRequest.optString("state").equals("started") && workoutRequest.optString("gps").equals("on")) {
|
||||
int activityType = workoutRequest.optInt("activity", -1);
|
||||
LOG.info("Workout started, activity type is " + activityType);
|
||||
addStateResponse(workoutResponse, "success");
|
||||
addStateResponse(workoutResponse, "success", "");
|
||||
OpenTracksController.startRecording(context);
|
||||
}
|
||||
if (workoutRequest.optString("type").equals("req_distance")) {
|
||||
} else if (workoutRequest.optString("type").equals("req_distance")) {
|
||||
long timeSecs = GBApplication.app().getOpenTracksObserver().getTimeMillisChange() / 1000;
|
||||
float distanceCM = GBApplication.app().getOpenTracksObserver().getDistanceMeterChange() * 100;
|
||||
LOG.info("Workout distance requested, returning " + distanceCM + " cm, " + timeSecs + " sec");
|
||||
workoutResponse.put("workoutApp._.config.gps", new JSONObject()
|
||||
.put("distance", -2)
|
||||
.put("duration", 10)
|
||||
.put("distance", distanceCM)
|
||||
.put("duration", timeSecs)
|
||||
);
|
||||
}
|
||||
if (workoutRequest.optString("state").equals("paused")) {
|
||||
} else if (workoutRequest.optString("state").equals("paused")) {
|
||||
LOG.info("Workout paused");
|
||||
addStateResponse(workoutResponse, "success");
|
||||
addStateResponse(workoutResponse, "success", "");
|
||||
// Pause OpenTracks recording?
|
||||
}
|
||||
if (workoutRequest.optString("state").equals("resumed")) {
|
||||
} else if (workoutRequest.optString("state").equals("resumed")) {
|
||||
LOG.info("Workout resumed");
|
||||
addStateResponse(workoutResponse, "success");
|
||||
addStateResponse(workoutResponse, "success", "");
|
||||
// Resume OpenTracks recording?
|
||||
}
|
||||
if (workoutRequest.optString("state").equals("end")) {
|
||||
} else if (workoutRequest.optString("state").equals("end")) {
|
||||
LOG.info("Workout stopped");
|
||||
addStateResponse(workoutResponse, "success");
|
||||
addStateResponse(workoutResponse, "success", "");
|
||||
OpenTracksController.stopRecording(context);
|
||||
}
|
||||
if (workoutRequest.optString("type").equals("req_route")) {
|
||||
} else if (workoutRequest.optString("type").equals("req_route")) {
|
||||
LOG.info("Workout route image requested, returning error");
|
||||
addStateResponse(workoutResponse, "error", "");
|
||||
// Send the traveled route as an RLE encoded image (example name: 58270405)
|
||||
// Send back a JSON packet, example:
|
||||
// {"res":{"id":21,"set":{"workoutApp._.config.images":{"session_id":1213693133,"route":{"name":"58270405"},"layout_type":"vertical"}}}}
|
||||
// or
|
||||
// {"res":{"id":34,"set":{"workoutApp._.config.images":{"session_id":504875,"route":{"name":"211631088"},"layout_type":"horizontal"}}}}
|
||||
} else {
|
||||
LOG.info("Request not recognized: " + workoutRequest);
|
||||
}
|
||||
return workoutResponse;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1516,4 +1516,6 @@
|
|||
<string name="menuitem_menu">Menu</string>
|
||||
<string name="fossil_hr_button_config_info">Some buttons cannot be configured because their functions are hard-coded in the watch firmware.\n\nWarning: long-pressing the upper button when a watchface from the official Fossil app is installed will also toggle between showing/hiding widgets.</string>
|
||||
<string name="watchface_dialog_widget_width">Width:</string>
|
||||
<string name="pref_title_opentracks_packagename">OpenTracks package name</string>
|
||||
<string name="pref_summary_opentracks_packagename">Used for starting/stopping GPS track recording from certain wearables that don\'t have built-in GPS</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -145,8 +145,8 @@
|
|||
android:inputType="text"
|
||||
android:key="opentracks_packagename"
|
||||
android:defaultValue="de.dennisguse.opentracks"
|
||||
android:title="OpenTracks package name"
|
||||
android:summary="Used for starting/stopping GPS track recording from certain wearables that don't have built-in GPS" />
|
||||
android:title="@string/pref_title_opentracks_packagename"
|
||||
android:summary="@string/pref_summary_opentracks_packagename" />
|
||||
</PreferenceCategory>
|
||||
<PreferenceCategory android:title="@string/preferences_category_device_specific_settings">
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue