MarcoBuster/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2025-02-24 08:21:15 +01:00
Code Releases Wiki Activity

changed json requests file handle

Browse Source
This commit is contained in:
dakhnod 2020-01-07 03:27:22 +01:00
parent 02fb7a0e43
commit 1ebf79e54a
6 changed files with 76 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because one or more lines are too long

5
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/buttons/ButtonConfigurationPutRequest.java
View File

@ -7,12 +7,13 @@ import org.json.JSONException;
import org.json.JSONObject;
import nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.adapter.fossil.FossilWatchAdapter;
import nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.adapter.fossil_hr.FossilHRWatchAdapter;
import nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil_hr.json.JsonPutRequest;
import nodomain.freeyourgadget.gadgetbridge.util.GB;
public class ButtonConfigurationPutRequest extends JsonPutRequest {
public ButtonConfigurationPutRequest(String[] menuItems, FossilWatchAdapter adapter) {
super((short) 0x0500, createObject(menuItems), adapter);
public ButtonConfigurationPutRequest(String[] menuItems, FossilHRWatchAdapter adapter) {
super(createObject(menuItems), adapter);
}
private static JSONObject createObject(String[] menuItems) {

5
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/image/ImagesSetRequest.java
View File

@ -5,11 +5,12 @@ import org.json.JSONException;
import org.json.JSONObject;
import nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.adapter.fossil.FossilWatchAdapter;
import nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.adapter.fossil_hr.FossilHRWatchAdapter;
import nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil_hr.json.JsonPutRequest;
public class ImagesSetRequest extends JsonPutRequest {
public ImagesSetRequest(AssetImage[] images, FossilWatchAdapter adapter) {
super((short) 0x0503, prepareObject(images), adapter);
public ImagesSetRequest(AssetImage[] images, FossilHRWatchAdapter adapter) {
super(prepareObject(images), adapter);
}
private static JSONObject prepareObject(AssetImage[] images){

5
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/json/JsonPutRequest.java
View File

@ -3,11 +3,12 @@ package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fo
import org.json.JSONObject;
import nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.adapter.fossil.FossilWatchAdapter;
import nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.adapter.fossil_hr.FossilHRWatchAdapter;
import nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil.file.FilePutRequest;
import nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil_hr.file.FilePutRawRequest;
public class JsonPutRequest extends FilePutRawRequest {
public JsonPutRequest(short handle, JSONObject object, FossilWatchAdapter adapter) {
super(handle, object.toString().getBytes(), adapter);
public JsonPutRequest(JSONObject object, FossilHRWatchAdapter adapter) {
super((short)(0x0500 | adapter.getJsonIndex()), object.toString().getBytes(), adapter);
}
}

5
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/menu/SetCommuteMenuMessage.java
View File

@ -4,11 +4,12 @@ import org.json.JSONException;
import org.json.JSONObject;
import nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.adapter.fossil.FossilWatchAdapter;
import nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.adapter.fossil_hr.FossilHRWatchAdapter;
import nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil_hr.json.JsonPutRequest;
public class SetCommuteMenuMessage extends JsonPutRequest {
public SetCommuteMenuMessage(String message, boolean finished, FossilWatchAdapter adapter) {
super((short) 0x0500, createObject(message, finished), adapter);
public SetCommuteMenuMessage(String message, boolean finished, FossilHRWatchAdapter adapter) {
super(createObject(message, finished), adapter);
}
private static JSONObject createObject(String message, boolean finished) {

5
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/widget/WidgetsPutRequest.java
View File

@ -5,12 +5,13 @@ import org.json.JSONException;
import org.json.JSONObject;
import nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.adapter.fossil.FossilWatchAdapter;
import nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.adapter.fossil_hr.FossilHRWatchAdapter;
import nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil_hr.file.FilePutRawRequest;
import nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil_hr.json.JsonPutRequest;
public class WidgetsPutRequest extends JsonPutRequest {
public WidgetsPutRequest(Widget[] widgets, FossilWatchAdapter adapter) {
super((short) 0x0501, prepareFile(widgets), adapter);
public WidgetsPutRequest(Widget[] widgets, FossilHRWatchAdapter adapter) {
super(prepareFile(widgets), adapter);
}
private static JSONObject prepareFile(Widget[] widgets){