demus/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge.git synced 2026-07-31 07:44:24 +02:00
Code Issues 1 Packages Projects Releases Wiki Activity

Huawei: Configuration of goal reminders

Browse Source
This commit is contained in:
Me7c7
2025-05-02 15:00:55 +03:00
parent b6dadcb84f
commit 01e7f31522
7 changed files with 194 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiConstants.java
+8 -5
View File
@@ -100,11 +100,14 @@ public final class HuaweiConstants {
public static final String PREF_HUAWEI_CONTINUOUS_SKIN_TEMPERATURE_MEASUREMENT = "continuous_skin_temperature_measurement";
public static final String PREF_HUAWEI_HEART_RATE_REALTIME_MODE = "pref_huawei_heart_rate_realtime_mode";
public static final String PREF_HUAWEI_HEART_RATE_LOW_ALERT = "pref_huawei_heart_rate_low_alert";
public static final String PREF_HUAWEI_HEART_RATE_HIGH_ALERT= "pref_huawei_heart_rate_high_alert";
public static final String PREF_HUAWEI_SPO_LOW_ALERT= "pref_huawei_spo_low_alert";
public static final String PREF_HUAWEI_STRESS_SWITCH= "pref_huawei_stress_switch";
public static final String PREF_HUAWEI_STRESS_CALIBRATE= "pref_huawei_stress_calibrate";
public static final String PREF_HUAWEI_STRESS_LAST_DATA= "huawei_stress_last_data";
public static final String PREF_HUAWEI_HEART_RATE_HIGH_ALERT = "pref_huawei_heart_rate_high_alert";
public static final String PREF_HUAWEI_SPO_LOW_ALERT = "pref_huawei_spo_low_alert";
public static final String PREF_HUAWEI_STRESS_SWITCH = "pref_huawei_stress_switch";
public static final String PREF_HUAWEI_STRESS_CALIBRATE = "pref_huawei_stress_calibrate";
public static final String PREF_HUAWEI_STRESS_LAST_DATA = "huawei_stress_last_data";
public static final String PREF_HUAWEI_ACTIVITY_REMINDER_STAND = "pref_huawei_activity_reminder_stand";
public static final String PREF_HUAWEI_ACTIVITY_REMINDER_PROGRESS = "pref_huawei_activity_reminder_progress";
public static final String PREF_HUAWEI_ACTIVITY_REMINDER_GOAL_REACHED = "pref_huawei_activity_reminder_goal_reached";
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiCoordinator.java
+3 -2
View File
@@ -305,10 +305,12 @@ public class HuaweiCoordinator {
if(supportsTemperature()) {
deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.HEALTH, R.xml.devicesettings_temperature_automatic_enable);
}
if(supportsAutoStress()) {
deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.HEALTH, R.xml.devicesettings_huawei_stress);
}
if(supportsThreeCircle() || supportsThreeCircleLite()) {
deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.HEALTH, R.xml.devicesettings_huawei_activity_reminders);
}
// Notifications
final List<Integer> notifications = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.NOTIFICATIONS);
@@ -327,7 +329,6 @@ public class HuaweiCoordinator {
notifications.add(R.xml.devicesettings_upload_notifications_app_icon);
}
// Workout
if (supportsSendingGps())
deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.WORKOUT, R.xml.devicesettings_workout_send_gps_to_band);
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiSettingsCustomizer.java
+7
View File
@@ -39,6 +39,9 @@ import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
import nodomain.freeyourgadget.gadgetbridge.util.XTimePreference;
import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.*;
import static nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiConstants.PREF_HUAWEI_ACTIVITY_REMINDER_GOAL_REACHED;
import static nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiConstants.PREF_HUAWEI_ACTIVITY_REMINDER_PROGRESS;
import static nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiConstants.PREF_HUAWEI_ACTIVITY_REMINDER_STAND;
import static nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiConstants.PREF_HUAWEI_DEBUG_REQUEST;
import static nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiConstants.PREF_HUAWEI_CONTINUOUS_SKIN_TEMPERATURE_MEASUREMENT;
import static nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiConstants.PREF_HUAWEI_HEART_RATE_HIGH_ALERT;
@@ -121,6 +124,10 @@ public class HuaweiSettingsCustomizer implements DeviceSpecificSettingsCustomize
handler.addPreferenceHandlerFor(PREF_HUAWEI_STRESS_SWITCH);
handler.addPreferenceHandlerFor(PREF_HUAWEI_STRESS_CALIBRATE);
handler.addPreferenceHandlerFor(PREF_HUAWEI_ACTIVITY_REMINDER_STAND);
handler.addPreferenceHandlerFor(PREF_HUAWEI_ACTIVITY_REMINDER_PROGRESS);
handler.addPreferenceHandlerFor(PREF_HUAWEI_ACTIVITY_REMINDER_GOAL_REACHED);
final Preference forceOptions = handler.findPreference(PREF_FORCE_OPTIONS);
if (forceOptions != null) {
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/HuaweiSupportProvider.java
+54 -10
View File
@@ -16,6 +16,9 @@
along with this program. If not, see <https://www.gnu.org/licenses/>. */
package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei;
import static nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiConstants.PREF_HUAWEI_ACTIVITY_REMINDER_GOAL_REACHED;
import static nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiConstants.PREF_HUAWEI_ACTIVITY_REMINDER_PROGRESS;
import static nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiConstants.PREF_HUAWEI_ACTIVITY_REMINDER_STAND;
import static nodomain.freeyourgadget.gadgetbridge.model.ActivityUser.PREF_USER_GOAL_STANDING_TIME_HOURS;
import android.bluetooth.BluetoothGattCharacteristic;
@@ -1185,6 +1188,15 @@ public class HuaweiSupportProvider {
case ActivityUser.PREF_USER_GOAL_STANDING_TIME_HOURS:
setStandingTime();
break;
case PREF_HUAWEI_ACTIVITY_REMINDER_STAND:
setActivityReminderStand();
break;
case PREF_HUAWEI_ACTIVITY_REMINDER_PROGRESS:
setActivityReminderProgress();
break;
case PREF_HUAWEI_ACTIVITY_REMINDER_GOAL_REACHED:
setActivityReminderGoalReached();
break;
case DeviceSettingsPreferenceConst.PREF_CAMERA_REMOTE:
if (GBApplication.getDeviceSpecificSharedPrefs(gbDevice.getAddress()).getBoolean(DeviceSettingsPreferenceConst.PREF_CAMERA_REMOTE, false)) {
SendCameraRemoteSetupEvent sendCameraRemoteSetupEvent = new SendCameraRemoteSetupEvent(this, CameraRemote.CameraRemoteSetup.Request.Event.ENABLE_CAMERA);
@@ -1229,7 +1241,9 @@ public class HuaweiSupportProvider {
public void setStepsGoal() {
if(huaweiDataSyncTreeCircleGoals != null) {
int stepGoal = GBApplication.getPrefs().getInt(ActivityUser.PREF_USER_STEPS_GOAL, ActivityUser.defaultUserStepsGoal);
huaweiDataSyncTreeCircleGoals.sendStepsGoal(stepGoal);
if(! huaweiDataSyncTreeCircleGoals.sendStepsGoal(stepGoal)) {
LOG.error("Error to set stand goal");
}
} else {
try {
new SendFitnessGoalRequest(this).doPerform();
@@ -1242,7 +1256,9 @@ public class HuaweiSupportProvider {
public void setCaloriesBurntGoal() {
if(huaweiDataSyncTreeCircleGoals != null) {
int caloriesBurntGoal = GBApplication.getPrefs().getInt(ActivityUser.PREF_USER_CALORIES_BURNT, ActivityUser.defaultUserCaloriesBurntGoal);
huaweiDataSyncTreeCircleGoals.sendCaloriesBurntGoal(caloriesBurntGoal);
if(!huaweiDataSyncTreeCircleGoals.sendCaloriesBurntGoal(caloriesBurntGoal)) {
LOG.error("Error to set calories burnt goal");
}
} else {
try {
new SendFitnessGoalRequest(this).doPerform();
@@ -1255,7 +1271,9 @@ public class HuaweiSupportProvider {
public void setFatBurnTime() {
if(huaweiDataSyncTreeCircleGoals != null) {
int fatBurnTimeGoal = GBApplication.getPrefs().getInt(ActivityUser.PREF_USER_GOAL_FAT_BURN_TIME_MINUTES, ActivityUser.defaultUserFatBurnTimeMinutes);
huaweiDataSyncTreeCircleGoals.sendExerciseGoal(fatBurnTimeGoal);
if(!huaweiDataSyncTreeCircleGoals.sendExerciseGoal(fatBurnTimeGoal)) {
LOG.error("Error to set exercise goal");
}
} else {
try {
new SendFitnessGoalRequest(this).doPerform();
@@ -1268,7 +1286,9 @@ public class HuaweiSupportProvider {
public void setStandingTime() {
if(huaweiDataSyncTreeCircleGoals != null) {
int standingTimeGoal = GBApplication.getPrefs().getInt(PREF_USER_GOAL_STANDING_TIME_HOURS, ActivityUser.defaultUserGoalStandingTimeHours);
huaweiDataSyncTreeCircleGoals.sendStandGoal(standingTimeGoal);
if(!huaweiDataSyncTreeCircleGoals.sendStandGoal(standingTimeGoal)) {
LOG.error("Error to set stand goal");
}
} else {
try {
new SendFitnessGoalRequest(this).doPerform();
@@ -1278,6 +1298,33 @@ public class HuaweiSupportProvider {
}
}
public void setActivityReminderStand() {
if(huaweiDataSyncTreeCircleGoals != null) {
boolean state = GBApplication.getDeviceSpecificSharedPrefs(gbDevice.getAddress()).getBoolean(PREF_HUAWEI_ACTIVITY_REMINDER_STAND, true);
if(!huaweiDataSyncTreeCircleGoals.sendRemindersStand(state)) {
LOG.error("Error to set stand reminder");
}
}
}
public void setActivityReminderProgress() {
if(huaweiDataSyncTreeCircleGoals != null) {
boolean state = GBApplication.getDeviceSpecificSharedPrefs(gbDevice.getAddress()).getBoolean(PREF_HUAWEI_ACTIVITY_REMINDER_PROGRESS, true);
if(!huaweiDataSyncTreeCircleGoals.sendRemindersProgress(state)) {
LOG.error("Error to set progress reminder");
}
}
}
public void setActivityReminderGoalReached() {
if(huaweiDataSyncTreeCircleGoals != null) {
boolean state = GBApplication.getDeviceSpecificSharedPrefs(gbDevice.getAddress()).getBoolean(PREF_HUAWEI_ACTIVITY_REMINDER_GOAL_REACHED, true);
if(!huaweiDataSyncTreeCircleGoals.sendRemindersGoalReached(state)) {
LOG.error("Error to set goal reached reminder");
}
}
}
public void startUploadNotificationsAppIcons() {
SharedPreferences prefs = GBApplication.getDeviceSpecificSharedPrefs(gbDevice.getAddress());
HashSet<String> iconsToUpload = (HashSet<String>) prefs.getStringSet(DeviceSettingsPreferenceConst.PREF_UPLOAD_NOTIFICATIONS_APP_ICON, null);
@@ -1451,12 +1498,9 @@ public class HuaweiSupportProvider {
List<Integer> list = P2PSyncService.checkSupported(this.getHuaweiCoordinator(), Arrays.asList(HuaweiDictTypes.SKIN_TEMPERATURE_CLASS, HuaweiDictTypes.BLOOD_PRESSURE_CLASS));
if(!list.isEmpty()) {
syncState.setP2pSync(true);
P2PSyncService.startSync(list, new HuaweiP2PDataDictionarySyncService.DictionarySyncCallback() {
@Override
public void onComplete(boolean complete) {
LOG.info("Sync P2P Data complete");
syncState.setP2pSync(false);
}
P2PSyncService.startSync(list, complete -> {
LOG.info("Sync P2P Data complete");
syncState.setP2pSync(false);
});
}
}
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/datasync/HuaweiDataSyncGoals.java
+87 -34
View File
@@ -25,6 +25,7 @@ import java.util.ArrayList;
import java.util.List;
import nodomain.freeyourgadget.gadgetbridge.GBApplication;
import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiConstants;
import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiTLV;
import nodomain.freeyourgadget.gadgetbridge.model.ActivityUser;
@@ -40,6 +41,10 @@ public class HuaweiDataSyncGoals implements HuaweiDataSyncCommon.DataCallback {
public static final int EXERCISES_GOAL = 900200008;
public static final int STAND_GOAL = 900200009;
public static final int REMINDER_STAND = 900200004;
public static final int REMINDER_PROGRESS = 900200010;
public static final int REMINDER_GOAL_REACHED = 900200011;
public static final String SRC_PKG_NAME = "hw.sport.config";
public static final String PKG_NAME = "in.huawei.motion";
@@ -48,7 +53,7 @@ public class HuaweiDataSyncGoals implements HuaweiDataSyncCommon.DataCallback {
this.support.getHuaweiDataSyncManager().registerCallback(PKG_NAME, this);
}
private boolean sendCommonGoal(int configId, int goal) {
private boolean sendCommonData(int configId, int goal) {
int time = (int) (System.currentTimeMillis() / 1000);
HuaweiTLV tlv = new HuaweiTLV().put(0x01, time).put(0x02, goal);
HuaweiDataSyncCommon.ConfigCommandData data = new HuaweiDataSyncCommon.ConfigCommandData();
@@ -62,6 +67,14 @@ public class HuaweiDataSyncGoals implements HuaweiDataSyncCommon.DataCallback {
return this.support.getHuaweiDataSyncManager().sendConfigCommand(SRC_PKG_NAME, PKG_NAME, data);
}
private boolean sendCommonGoal(int configId, int goal) {
return sendCommonData(configId, goal);
}
private boolean sendCommonReminder(int configId, boolean state) {
return sendCommonData(configId, state ? 1 : 0);
}
public boolean sendStepsGoal(int stepsGoal) {
return sendCommonGoal(STEPS_GOAL, stepsGoal);
}
@@ -78,52 +91,92 @@ public class HuaweiDataSyncGoals implements HuaweiDataSyncCommon.DataCallback {
return sendCommonGoal(STAND_GOAL, standGoal);
}
public boolean sendRemindersStand(boolean state) {
return sendCommonReminder(REMINDER_STAND, state);
}
public boolean sendRemindersProgress(boolean state) {
return sendCommonReminder(REMINDER_PROGRESS, state);
}
public boolean sendRemindersGoalReached(boolean state) {
return sendCommonReminder(REMINDER_GOAL_REACHED, state);
}
@Override
public void onConfigCommand(HuaweiDataSyncCommon.ConfigCommandData data) {
if(data.getCode() != HuaweiDataSyncCommon.REPLY_OK) {
if (data.getCode() != HuaweiDataSyncCommon.REPLY_OK) {
return;
}
List<HuaweiDataSyncCommon.ConfigData> list = data.getConfigDataList();
if(list.isEmpty()) {
if (list.isEmpty()) {
return;
}
HuaweiDataSyncCommon.ConfigData config = list.get(0);
HuaweiTLV tlv = new HuaweiTLV();
tlv.parse(config.configData);
if(!tlv.contains(0x02)) {
if (!tlv.contains(0x02)) {
return;
}
try {
switch(config.configId) {
case STEPS_GOAL: {
int goal = tlv.getInteger(0x02);
SharedPreferences prefs = GBApplication.getPrefs().getPreferences();
SharedPreferences.Editor editor = prefs.edit();
editor.putString(ActivityUser.PREF_USER_STEPS_GOAL, String.valueOf(goal));
editor.apply();
} break;
case CALORIES_GOAL: {
int goal = tlv.getInteger(0x02);
SharedPreferences prefs = GBApplication.getPrefs().getPreferences();
SharedPreferences.Editor editor = prefs.edit();
editor.putString(ActivityUser.PREF_USER_CALORIES_BURNT, String.valueOf(goal / 1000));
editor.apply();
} break;
case EXERCISES_GOAL: {
int goal = tlv.getInteger(0x02);
SharedPreferences prefs = GBApplication.getPrefs().getPreferences();
SharedPreferences.Editor editor = prefs.edit();
editor.putString(ActivityUser.PREF_USER_GOAL_FAT_BURN_TIME_MINUTES, String.valueOf(goal));
editor.apply();
} break;
case STAND_GOAL: {
int goal = tlv.getInteger(0x02);
SharedPreferences prefs = GBApplication.getPrefs().getPreferences();
SharedPreferences.Editor editor = prefs.edit();
editor.putString(ActivityUser.PREF_USER_GOAL_STANDING_TIME_HOURS, String.valueOf(goal));
editor.apply();
} break;
}
switch (config.configId) {
case STEPS_GOAL: {
int goal = tlv.getInteger(0x02);
SharedPreferences prefs = GBApplication.getPrefs().getPreferences();
SharedPreferences.Editor editor = prefs.edit();
editor.putString(ActivityUser.PREF_USER_STEPS_GOAL, String.valueOf(goal));
editor.apply();
}
break;
case CALORIES_GOAL: {
int goal = tlv.getInteger(0x02);
SharedPreferences prefs = GBApplication.getPrefs().getPreferences();
SharedPreferences.Editor editor = prefs.edit();
editor.putString(ActivityUser.PREF_USER_CALORIES_BURNT, String.valueOf(goal / 1000));
editor.apply();
}
break;
case EXERCISES_GOAL: {
int goal = tlv.getInteger(0x02);
SharedPreferences prefs = GBApplication.getPrefs().getPreferences();
SharedPreferences.Editor editor = prefs.edit();
editor.putString(ActivityUser.PREF_USER_GOAL_FAT_BURN_TIME_MINUTES, String.valueOf(goal));
editor.apply();
}
break;
case STAND_GOAL: {
int goal = tlv.getInteger(0x02);
SharedPreferences prefs = GBApplication.getPrefs().getPreferences();
SharedPreferences.Editor editor = prefs.edit();
editor.putString(ActivityUser.PREF_USER_GOAL_STANDING_TIME_HOURS, String.valueOf(goal));
editor.apply();
}
break;
case REMINDER_STAND: {
int state = tlv.getInteger(0x02);
SharedPreferences prefs = GBApplication.getDeviceSpecificSharedPrefs(support.getDevice().getAddress());
SharedPreferences.Editor editor = prefs.edit();
editor.putBoolean(HuaweiConstants.PREF_HUAWEI_ACTIVITY_REMINDER_STAND, state != 0);
editor.apply();
}
break;
case REMINDER_PROGRESS: {
int state = tlv.getInteger(0x02);
SharedPreferences prefs = GBApplication.getDeviceSpecificSharedPrefs(support.getDevice().getAddress());
SharedPreferences.Editor editor = prefs.edit();
editor.putBoolean(HuaweiConstants.PREF_HUAWEI_ACTIVITY_REMINDER_PROGRESS, state != 0);
editor.apply();
}
break;
case REMINDER_GOAL_REACHED: {
int state = tlv.getInteger(0x02);
SharedPreferences prefs = GBApplication.getDeviceSpecificSharedPrefs(support.getDevice().getAddress());
SharedPreferences.Editor editor = prefs.edit();
editor.putBoolean(HuaweiConstants.PREF_HUAWEI_ACTIVITY_REMINDER_GOAL_REACHED, state != 0);
editor.apply();
}
break;
}
} catch (HuaweiPacket.MissingTagException e) {
LOG.error("Failed to handle data sync goals config command", e);
}
app/src/main/res/values/strings.xml
+7
View File
@@ -3930,4 +3930,11 @@
<string name="notifications_app_icon_uploading_confirm_description">Are you sure you want to upload %1$d app icons?</string>
<string name="pref_notifications_app_icon_upload_title">Upload notification app icons</string>
<string name="pref_notifications_app_icon_upload_summary">Upload notification app icons to device</string>
<string name="pref_huawei_activity_reminders">Activity reminders</string>
<string name="pref_huawei_activity_reminder_stand_title">Stand</string>
<string name="pref_huawei_activity_reminder_stand_summary">Get a reminder to get up if you haven\'t gotten up in 1 hour</string>
<string name="pref_huawei_activity_reminder_progress_title">Progress</string>
<string name="pref_huawei_activity_reminder_progress_summary">Get reminders about Activity Ring progress</string>
<string name="pref_huawei_activity_reminder_goal_reached_title">Goal Reached</string>
<string name="pref_huawei_activity_reminder_goal_reached_summary">Get a reminder when you complete rings</string>
</resources>
app/src/main/res/xml/devicesettings_huawei_activity_reminders.xml
+28
View File
@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<PreferenceScreen
android:icon="@drawable/ic_device_set_reminders"
android:key="screen_huawei_activity_reminders"
android:persistent="false"
android:title="@string/pref_huawei_activity_reminders">
<SwitchPreferenceCompat
android:defaultValue="true"
android:key="pref_huawei_activity_reminder_stand"
android:layout="@layout/preference_checkbox"
android:title="@string/pref_huawei_activity_reminder_stand_title"
android:summary="@string/pref_huawei_activity_reminder_stand_summary" />
<SwitchPreferenceCompat
android:defaultValue="true"
android:key="pref_huawei_activity_reminder_progress"
android:layout="@layout/preference_checkbox"
android:title="@string/pref_huawei_activity_reminder_progress_title"
android:summary="@string/pref_huawei_activity_reminder_progress_summary" />
<SwitchPreferenceCompat
android:defaultValue="true"
android:key="pref_huawei_activity_reminder_goal_reached"
android:layout="@layout/preference_checkbox"
android:title="@string/pref_huawei_activity_reminder_goal_reached_title"
android:summary="@string/pref_huawei_activity_reminder_goal_reached_summary" />
</PreferenceScreen>
</androidx.preference.PreferenceScreen>