nixo
/
GadgetBridge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Pebble: use dynamic appkeys for TrekVolle handler

This commit is contained in:
Andreas Shimokawa 2017-01-24 11:07:49 +01:00
parent 8027b8ac96
commit 746eeda777
2 changed files with 48 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandler.java
View File

@ -21,7 +21,7 @@ import nodomain.freeyourgadget.gadgetbridge.util.FileUtils;
class AppMessageHandler { class AppMessageHandler {
final PebbleProtocol mPebbleProtocol; final PebbleProtocol mPebbleProtocol;
final UUID mUUID; final UUID mUUID;
protected Map<String, Integer> messageKeys; Map<String, Integer> messageKeys;
AppMessageHandler(UUID uuid, PebbleProtocol pebbleProtocol) { AppMessageHandler(UUID uuid, PebbleProtocol pebbleProtocol) {
mUUID = uuid; mUUID = uuid;
@ -55,7 +55,7 @@ class AppMessageHandler {
return mPebbleProtocol.getDevice(); return mPebbleProtocol.getDevice();
} }
protected JSONObject getAppKeys() throws IOException, JSONException { JSONObject getAppKeys() throws IOException, JSONException {
File destDir = new File(FileUtils.getExternalFilesDir() + "/pbw-cache"); File destDir = new File(FileUtils.getExternalFilesDir() + "/pbw-cache");
File configurationFile = new File(destDir, mUUID.toString() + ".json"); File configurationFile = new File(destDir, mUUID.toString() + ".json");
if (configurationFile.exists()) { if (configurationFile.exists()) {

52
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerTrekVolle.java
View File

@ -1,25 +1,65 @@
package nodomain.freeyourgadget.gadgetbridge.service.devices.pebble; package nodomain.freeyourgadget.gadgetbridge.service.devices.pebble;
import android.util.Pair; import android.util.Pair;
import android.widget.Toast;
import org.json.JSONException;
import org.json.JSONObject;
import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.UUID; import java.util.UUID;
import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEvent; import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEvent;
import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventSendBytes; import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventSendBytes;
import nodomain.freeyourgadget.gadgetbridge.model.Weather; import nodomain.freeyourgadget.gadgetbridge.model.Weather;
import nodomain.freeyourgadget.gadgetbridge.model.WeatherSpec; import nodomain.freeyourgadget.gadgetbridge.model.WeatherSpec;
import nodomain.freeyourgadget.gadgetbridge.util.GB;
class AppMessageHandlerTrekVolle extends AppMessageHandler { class AppMessageHandlerTrekVolle extends AppMessageHandler {
private static final int MESSAGE_KEY_WEATHER_TEMPERATURE = 10000; private Integer MESSAGE_KEY_WEATHER_TEMPERATURE;
private static final int MESSAGE_KEY_WEATHER_CONDITIONS = 10001; private Integer MESSAGE_KEY_WEATHER_CONDITIONS;
private static final int MESSAGE_KEY_WEATHER_ICON = 10002; private Integer MESSAGE_KEY_WEATHER_ICON;
private static final int MESSAGE_KEY_WEATHER_TEMPERATURE_MIN = 10024; private Integer MESSAGE_KEY_WEATHER_TEMPERATURE_MIN;
private static final int MESSAGE_KEY_WEATHER_TEMPERATURE_MAX = 10025; private Integer MESSAGE_KEY_WEATHER_TEMPERATURE_MAX;
private static final int MESSAGE_KEY_WEATHER_LOCATION = 10030; private Integer MESSAGE_KEY_WEATHER_LOCATION;
AppMessageHandlerTrekVolle(UUID uuid, PebbleProtocol pebbleProtocol) { AppMessageHandlerTrekVolle(UUID uuid, PebbleProtocol pebbleProtocol) {
super(uuid, pebbleProtocol); super(uuid, pebbleProtocol);
messageKeys = new HashMap<>();
try {
JSONObject appKeys = getAppKeys();
Iterator<String> appKeysIterator = appKeys.keys();
while (appKeysIterator.hasNext()) {
String current = appKeysIterator.next();
int appKey = appKeys.getInt(current);
switch (current) {
case "WEATHER_TEMPERATURE":
MESSAGE_KEY_WEATHER_TEMPERATURE = appKey;
break;
case "WEATHER_CONDITIONS":
MESSAGE_KEY_WEATHER_CONDITIONS = appKey;
break;
case "WEATHER_ICON":
MESSAGE_KEY_WEATHER_ICON = appKey;
break;
case "WEATHER_TEMPERATURE_MIN":
MESSAGE_KEY_WEATHER_TEMPERATURE_MIN = appKey;
break;
case "WEATHER_TEMPERATURE_MAX":
MESSAGE_KEY_WEATHER_TEMPERATURE_MAX = appKey;
break;
case "WEATHER_LOCATION":
MESSAGE_KEY_WEATHER_LOCATION = appKey;
break;
}
}
} catch (IOException | JSONException e) {
GB.toast("There was an error accessing the watchface configuration.", Toast.LENGTH_LONG, GB.ERROR);
}
} }
private int getIconForConditionCode(int conditionCode, boolean isNight) { private int getIconForConditionCode(int conditionCode, boolean isNight) {