demus/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge.git synced 2025-01-25 16:15:55 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

Fossil HR: added graphic settings handler

Browse Source
This commit is contained in:
Daniel Dakhno 2020-04-12 03:57:13 +02:00
parent c24814f9c2
commit 19534cbae8
3 changed files with 56 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java
View File

@ -30,4 +30,7 @@ public class DeviceSettingsPreferenceConst {
public static final String PREF_BUTTON_3_FUNCTION = "button_3_function";
public static final String PREF_VIBRATION_STRENGH_PERCENTAGE = "vibration_strength";
public static final String PREF_RELAX_FIRMWARE_CHECKS = "relax_firmware_checks";
public static final String PREF_HYBRID_HR_FORCE_WHITE_COLOR = "force_white_color_scheme";
public static final String PREF_HYBRID_HR_DRAW_WIDGET_CIRCLES = "widget_draw_circles";
}

5
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java
View File

@ -43,6 +43,8 @@ import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.Dev
import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_BUTTON_2_FUNCTION;
import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_BUTTON_3_FUNCTION;
import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_DATEFORMAT;
import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_HYBRID_HR_DRAW_WIDGET_CIRCLES;
import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_HYBRID_HR_FORCE_WHITE_COLOR;
import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_SCREEN_ORIENTATION;
import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_TIMEFORMAT;
import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_VIBRATION_STRENGH_PERCENTAGE;
@ -322,6 +324,9 @@ public class DeviceSpecificSettingsFragment extends PreferenceFragmentCompat {
addPreferenceHandlerFor(PREF_BUTTON_3_FUNCTION);
addPreferenceHandlerFor(PREF_VIBRATION_STRENGH_PERCENTAGE);
addPreferenceHandlerFor(PREF_HYBRID_HR_DRAW_WIDGET_CIRCLES);
addPreferenceHandlerFor(PREF_HYBRID_HR_FORCE_WHITE_COLOR);
String displayOnLiftState = prefs.getString(PREF_ACTIVATE_DISPLAY_ON_LIFT, PREF_DO_NOT_DISTURB_OFF);
boolean displayOnLiftScheduled = displayOnLiftState.equals(PREF_DO_NOT_DISTURB_SCHEDULED);

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

@ -148,22 +148,23 @@ public class FossilHRWatchAdapter extends FossilWatchAdapter {
queueWrite(new ConfigurationPutRequest(new nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil.configuration.ConfigurationPutRequest.VibrationStrengthConfigItem((byte) strength), this));
}
private void loadNotificationConfigurations(){
private void loadNotificationConfigurations() {
this.notificationConfigurations = new NotificationHRConfiguration[]{
new NotificationHRConfiguration("generic", 0),
new NotificationHRConfiguration("call", new byte[]{(byte)0x80, (byte) 0x00, (byte) 0x59, (byte) 0xB7}, 0)
new NotificationHRConfiguration("call", new byte[]{(byte) 0x80, (byte) 0x00, (byte) 0x59, (byte) 0xB7}, 0)
};
}
private File getBackgroundFile(){
private File getBackgroundFile() {
return new File(getContext().getExternalFilesDir(null), "hr_background.bin");
}
private void loadBackground(){
private void loadBackground() {
this.backGroundImage = null;
try {
FileInputStream fis = new FileInputStream(getBackgroundFile());
int count = fis.available();
if(count != 14400){
if (count != 14400) {
throw new RuntimeException("wrong background file length");
}
byte[] file = new byte[14400];
@ -191,10 +192,10 @@ public class FossilHRWatchAdapter extends FossilWatchAdapter {
@Override
public void setBackgroundImage(byte[] pixels) {
if(pixels == null){
if (pixels == null) {
getBackgroundFile().delete();
this.backGroundImage = null;
}else{
} else {
this.backGroundImage = AssetImageFactory.createAssetImage(pixels, 0, 0, 0);
try {
FileOutputStream fos = new FileOutputStream(getBackgroundFile(), false);
@ -227,21 +228,22 @@ public class FossilHRWatchAdapter extends FossilWatchAdapter {
positionMap.put("bottom", 180);
positionMap.put("left", 270);
while(keyIterator.hasNext()){
while (keyIterator.hasNext()) {
String position = keyIterator.next();
String identifier = widgetConfig.getString(position);
Widget.WidgetType type = Widget.WidgetType.fromJsonIdentifier(identifier);
Widget widget = null;
if(type != null) {
if (type != null) {
widget = new Widget(type, positionMap.get(position), 63, fontColor);
}else{
} else {
identifier = identifier.substring(7);
for(int i = 0; i < customWidgets.length(); i++){
for (int i = 0; i < customWidgets.length(); i++) {
JSONObject customWidget = customWidgets.getJSONObject(i);
if(customWidget.getString("name").equals(identifier)){
if (customWidget.getString("name").equals(identifier)) {
boolean drawCircle = false;
if(customWidget.has("drawCircle")) drawCircle = customWidget.getBoolean("drawCircle");
if (customWidget.has("drawCircle"))
drawCircle = customWidget.getBoolean("drawCircle");
CustomWidget newWidget = new CustomWidget(
customWidget.getString("name"),
positionMap.get(position),
@ -271,7 +273,7 @@ public class FossilHRWatchAdapter extends FossilWatchAdapter {
}
}
if(widget == null) continue;
if (widget == null) continue;
this.widgets.add(widget);
}
} catch (JSONException e) {
@ -281,11 +283,11 @@ public class FossilHRWatchAdapter extends FossilWatchAdapter {
uploadWidgets();
}
private void uploadWidgets(){
private void uploadWidgets() {
negotiateSymmetricKey();
ArrayList<Widget> systemWidgets = new ArrayList<>(widgets.size());
for(Widget widget : this.widgets){
if(!(widget instanceof CustomWidget)) systemWidgets.add(widget);
for (Widget widget : this.widgets) {
if (!(widget instanceof CustomWidget)) systemWidgets.add(widget);
}
queueWrite(new WidgetsPutRequest(systemWidgets.toArray(new Widget[0]), this));
}
@ -296,7 +298,7 @@ public class FossilHRWatchAdapter extends FossilWatchAdapter {
boolean drawCircles = prefs.getBoolean("widget_draw_circles", false);
Bitmap circleBitmap = null;
if(drawCircles) {
if (drawCircles) {
circleBitmap = Bitmap.createBitmap(76, 76, Bitmap.Config.ARGB_8888);
Canvas circleCanvas = new Canvas(circleBitmap);
Paint circlePaint = new Paint();
@ -315,15 +317,15 @@ public class FossilHRWatchAdapter extends FossilWatchAdapter {
try {
ArrayList<AssetImage> widgetImages = new ArrayList<>();
if(this.backGroundImage != null){
if (this.backGroundImage != null) {
widgetImages.add(this.backGroundImage);
}
for (int i = 0; i < this.widgets.size(); i++) {
Widget w = widgets.get(i);
if(!(w instanceof CustomWidget)){
if(drawCircles) {
if (!(w instanceof CustomWidget)) {
if (drawCircles) {
widgetImages.add(AssetImageFactory.createAssetImage(
circleBitmap,
true,
@ -333,14 +335,15 @@ public class FossilHRWatchAdapter extends FossilWatchAdapter {
));
}
continue;
};
}
;
CustomWidget widget = (CustomWidget) w;
Bitmap widgetBitmap = Bitmap.createBitmap(76, 76, Bitmap.Config.ARGB_8888);
Canvas widgetCanvas = new Canvas(widgetBitmap);
if(drawCircles){
if (drawCircles) {
widgetCanvas.drawBitmap(circleBitmap, 0, 0, null);
}
@ -348,12 +351,12 @@ public class FossilHRWatchAdapter extends FossilWatchAdapter {
if (element.getWidgetElementType() == CustomWidgetElement.WidgetElementType.TYPE_BACKGROUND) {
File imageFile = new File(element.getValue());
if(!imageFile.exists() || !imageFile.isFile()){
if (!imageFile.exists() || !imageFile.isFile()) {
logger.debug("Image file " + element.getValue() + " not found");
continue;
}
Bitmap imageBitmap = BitmapFactory.decodeFile(element.getValue());
if(imageBitmap == null){
if (imageBitmap == null) {
logger.debug("image file " + element.getValue() + " could not be decoded");
continue;
}
@ -378,7 +381,7 @@ public class FossilHRWatchAdapter extends FossilWatchAdapter {
textPaint.setTextAlign(Paint.Align.CENTER);
widgetCanvas.drawText(element.getValue(), element.getX(), element.getY() - (textPaint.descent() + textPaint.ascent()) / 2f, textPaint);
}else if(element.getWidgetElementType() == CustomWidgetElement.WidgetElementType.TYPE_IMAGE) {
} else if (element.getWidgetElementType() == CustomWidgetElement.WidgetElementType.TYPE_IMAGE) {
Bitmap imageBitmap = BitmapFactory.decodeFile(element.getValue());
widgetCanvas.drawBitmap(imageBitmap, element.getX() - imageBitmap.getWidth() / 2f, element.getY() - imageBitmap.getHeight() / 2f, null);
@ -415,8 +418,8 @@ public class FossilHRWatchAdapter extends FossilWatchAdapter {
public void setWidgetContent(String widgetID, String content, boolean renderOnWatch) {
boolean update = false;
for (Widget widget : this.widgets) {
if(!(widget instanceof CustomWidget)) continue;
if(((CustomWidget) widget).updateElementValue(widgetID, content)) update = true;
if (!(widget instanceof CustomWidget)) continue;
if (((CustomWidget) widget).updateElementValue(widgetID, content)) update = true;
}
if (renderOnWatch && update) renderWidgets();
@ -463,7 +466,7 @@ public class FossilHRWatchAdapter extends FossilWatchAdapter {
musicSpec.track,
this
));
}catch (BufferOverflowException e){
} catch (BufferOverflowException e) {
GB.log("musicInfo: " + musicSpec, GB.ERROR, e);
}
}
@ -503,14 +506,14 @@ public class FossilHRWatchAdapter extends FossilWatchAdapter {
String senderOrTitle = StringUtils.getFirstOf(notificationSpec.sender, notificationSpec.title);
try {
for (NotificationHRConfiguration configuration : this.notificationConfigurations){
if(configuration.getPackageName().equals(notificationSpec.sourceAppId)){
for (NotificationHRConfiguration configuration : this.notificationConfigurations) {
if (configuration.getPackageName().equals(notificationSpec.sourceAppId)) {
queueWrite(new PlayTextNotificationRequest(notificationSpec.sourceAppId, senderOrTitle, notificationSpec.body, this));
return true;
}
}
queueWrite(new PlayTextNotificationRequest("generic", senderOrTitle, notificationSpec.body, this));
}catch (Exception e){
} catch (Exception e) {
e.printStackTrace();
}
return true;
@ -518,14 +521,14 @@ public class FossilHRWatchAdapter extends FossilWatchAdapter {
@Override
public void onFindDevice(boolean start) {
if(start){
if (start) {
new TransactionBuilder("vibrate find")
.write(
getDeviceSupport().getCharacteristic(UUID.fromString("3dda0005-957f-7d4a-34a6-74696673696d")),
new byte[]{(byte) 0x01, (byte) 0x04, (byte) 0x30, (byte) 0x75, (byte) 0x00, (byte) 0x00}
)
)
.queue(getDeviceSupport().getQueue());
}else{
} else {
new TransactionBuilder("vibrate find")
.write(
getDeviceSupport().getCharacteristic(UUID.fromString("3dda0005-957f-7d4a-34a6-74696673696d")),
@ -785,6 +788,14 @@ public class FossilHRWatchAdapter extends FossilWatchAdapter {
break;
case DeviceSettingsPreferenceConst.PREF_VIBRATION_STRENGH_PERCENTAGE:
setVibrationStrength();
break;
case "force_white_color_scheme":
loadBackground();
// not break here
case "widget_draw_circles": {
renderWidgets();
break;
}
}
}
@ -807,9 +818,9 @@ public class FossilHRWatchAdapter extends FossilWatchAdapter {
byte requestType = value[1];
if(requestType == (byte) 0x04){
if (requestType == (byte) 0x04) {
handleCallRequest(value);
}else if (requestType == (byte) 0x05) {
} else if (requestType == (byte) 0x05) {
handleMusicRequest(value);
} else if (requestType == (byte) 0x01) {
int eventId = value[2];