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

Bangle.js:actTrk:try at packet counting 

... might not be necessary. Since I got the fetching to work with
intervals on the the Bangle.js side it's been stable.

Didn't manage to make packet counting work yet.
This commit is contained in:
Ganblejs 2024-03-03 04:17:44 +01:00 committed by José Rebelo
parent ddc2d7a34a
commit 8338b03b3b
2 changed files with 32 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/banglejs/BangleJSActivityTrack.java
View File

@ -103,7 +103,28 @@ public class BangleJSActivityTrack extends BangleJSDeviceSupport {
return o;
}
public static JSONArray handleActTrk(JSONObject json, JSONArray tracksList, GBDevice device, Context context) throws JSONException {
private void stopFunc() {
}
public static JSONArray handleActTrk(JSONObject json, JSONArray tracksList, int prevPacketCount, GBDevice device, Context context) throws JSONException {
JSONArray returnArray;
JSONObject stopObj = new JSONObject().put("t","fetchRec").put("id","stop");
int currPacketCount;
if (json.has("cnt")) {
currPacketCount = json.getInt("cnt");
} else {
currPacketCount = 0;
}
if (false && currPacketCount != prevPacketCount+1) {
LOG.error("Activity Track Packets came out of order - aborting.");
returnArray = new JSONArray().put(stopObj).put(tracksList).put(prevPacketCount);
device.unsetBusyTask();
GB.updateTransferNotification(context.getString(R.string.busy_task_fetch_activity_data), "", false, 100, context);
return returnArray;
}
LOG.info("actTrk says hi!");
//GB.toast(context, "actTrk says hi!", Toast.LENGTH_LONG, GB.INFO);
String log = json.getString("log");
@ -112,7 +133,7 @@ public class BangleJSActivityTrack extends BangleJSDeviceSupport {
try {
dir = FileUtils.getExternalFilesDir();
} catch (IOException e) {
JSONArray returnArray = new JSONArray().put(null).put(tracksList);
returnArray = new JSONArray().put(null).put(tracksList).put(currPacketCount);
return returnArray;
}
String filename = "recorder.log" + log + ".csv";
@ -122,10 +143,12 @@ public class BangleJSActivityTrack extends BangleJSDeviceSupport {
if (tracksList.length()==0) {
device.unsetBusyTask();
GB.updateTransferNotification(context.getString(R.string.busy_task_fetch_activity_data), "", false, 100, context);
returnArray = new JSONArray().put(null).put(tracksList).put(-1);
return returnArray;
} else {
JSONObject requestTrackObj = BangleJSActivityTrack.compileTrackRequest(tracksList.getString(0), 1==tracksList.length());
tracksList.remove(0);
JSONArray returnArray = new JSONArray().put(requestTrackObj).put(tracksList);
returnArray = new JSONArray().put(requestTrackObj).put(tracksList).put(currPacketCount);
return returnArray;
}
} else { // We received a lines of the csv, now we append it to the file in storage.
@ -153,7 +176,7 @@ public class BangleJSActivityTrack extends BangleJSDeviceSupport {
}
}
JSONArray returnArray = new JSONArray().put(null).put(tracksList);
returnArray = new JSONArray().put(null).put(tracksList).put(currPacketCount);
return returnArray;
}

6
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/banglejs/BangleJSDeviceSupport.java
View File

@ -515,6 +515,7 @@ public class BangleJSDeviceSupport extends AbstractBTLEDeviceSupport {
}
JSONArray tracksList;
int packetCount;
private void handleUartRxJSON(JSONObject json) throws JSONException {
String packetType = json.getString("t");
switch (packetType) {
@ -570,12 +571,15 @@ public class BangleJSDeviceSupport extends AbstractBTLEDeviceSupport {
JSONObject requestTrackObj = BangleJSActivityTrack.compileTrackRequest(tracksList.getString(0), 1==tracksList.length());
uartTxJSON("requestActivityTrackLog", requestTrackObj);
tracksList.remove(0);
packetCount = -1;
}
break;
case "actTrk":
JSONArray returnArray = BangleJSActivityTrack.handleActTrk(json, tracksList, getDevice(), getContext());
JSONArray returnArray = BangleJSActivityTrack.handleActTrk(json, tracksList, packetCount, getDevice(), getContext());
if (!returnArray.isNull(0)) uartTxJSON("requestActivityTrackLog", returnArray.getJSONObject(0));
tracksList = returnArray.getJSONArray(1);
packetCount = returnArray.getInt(2);
break;
case "http":
handleHttp(json);