demus/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge.git synced 2025-01-11 09:31:59 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

adjusted find my phone

Browse Source
This commit is contained in:
Daniel Dakhno 2020-02-14 23:51:59 +01:00
parent b41495c2b8
commit 17ade7e591
1 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/adapter/fossil_hr/FossilHRWatchAdapter.java
View File

@ -51,6 +51,7 @@ import nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fos
import nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil_hr.image.AssetImage; import nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil_hr.image.AssetImage;
import nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil_hr.image.AssetImageFactory; import nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil_hr.image.AssetImageFactory;
import nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil_hr.image.ImagesSetRequest; import nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil_hr.image.ImagesSetRequest;
import nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil_hr.json.JsonPutRequest;
import nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil_hr.menu.SetCommuteMenuMessage; import nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil_hr.menu.SetCommuteMenuMessage;
import nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil_hr.music.MusicControlRequest; import nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil_hr.music.MusicControlRequest;
import nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil_hr.music.MusicInfoSetRequest; import nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil_hr.music.MusicInfoSetRequest;
@ -429,10 +430,6 @@ public class FossilHRWatchAdapter extends FossilWatchAdapter {
renderWidgets(); renderWidgets();
} }
private void setBackgroundImages(AssetImage background, AssetImage[] complications) {
queueWrite(new ImagesSetRequest(new AssetImage[]{background}, this));
}
@Override @Override
public void onFetchActivityData() { public void onFetchActivityData() {
syncSettings(); syncSettings();
@ -552,20 +549,42 @@ public class FossilHRWatchAdapter extends FossilWatchAdapter {
logger.info(jsonString); logger.info(jsonString);
JSONObject requestJson = new JSONObject(jsonString); JSONObject requestJson = new JSONObject(jsonString);
int requestId = requestJson.getJSONObject("req").getInt("id");
if (requestJson.getJSONObject("req").has("ringMyPhone")) { if (requestJson.getJSONObject("req").has("ringMyPhone")) {
String action = requestJson.getJSONObject("req").getJSONObject("ringMyPhone").getString("action"); String action = requestJson.getJSONObject("req").getJSONObject("ringMyPhone").getString("action");
logger.info("got ringMyPhone request; " + action); logger.info("got ringMyPhone request; " + action);
GBDeviceEventFindPhone findPhoneEvent = new GBDeviceEventFindPhone(); GBDeviceEventFindPhone findPhoneEvent = new GBDeviceEventFindPhone();
JSONObject responseObject = new JSONObject()
.put("res", new JSONObject()
.put("id", requestId)
.put("set", new JSONObject()
.put("ringMyPhone", new JSONObject()
)
)
);
if ("on".equals(action)) { if ("on".equals(action)) {
findPhoneEvent.event = GBDeviceEventFindPhone.Event.START; findPhoneEvent.event = GBDeviceEventFindPhone.Event.START;
getDeviceSupport().evaluateGBDeviceEvent(findPhoneEvent); getDeviceSupport().evaluateGBDeviceEvent(findPhoneEvent);
} responseObject
else if ("off".equals(action)) { .getJSONObject("res")
.getJSONObject("set")
.getJSONObject("ringMyPhone")
.put("result", "on");
queueWrite(new JsonPutRequest(responseObject, this));
} else if ("off".equals(action)) {
findPhoneEvent.event = GBDeviceEventFindPhone.Event.STOP; findPhoneEvent.event = GBDeviceEventFindPhone.Event.STOP;
getDeviceSupport().evaluateGBDeviceEvent(findPhoneEvent); getDeviceSupport().evaluateGBDeviceEvent(findPhoneEvent);
responseObject
.getJSONObject("res")
.getJSONObject("set")
.getJSONObject("ringMyPhone")
.put("result", "off");
queueWrite(new JsonPutRequest(responseObject, this));
} }
} } else {
else {
String action = requestJson.getJSONObject("req").getJSONObject("commuteApp._.config.commute_info") String action = requestJson.getJSONObject("req").getJSONObject("commuteApp._.config.commute_info")
.getString("dest"); .getString("dest");