mirror of
https://codeberg.org/Freeyourgadget/Gadgetbridge
synced 2024-10-02 19:27:08 +02:00
* WatchX(Plus) - Add sleep and activity analysis
* WatchX(Plus) - Improve data presentation in Activity charts * WatchX(Plus) - Fix some bugs in LongSitReminder * Remove/replace duplicate strings for inactivity reminder
This commit is contained in:
mamutcho
parent
4061e1c66c
commit
0177bdd171
@ -52,7 +52,7 @@ public final class WatchXPlusConstants extends LenovoWatchConstants {
|
||||
|
||||
public static final String PREF_LONGSIT_START = "pref_longsit_start";
|
||||
public static final String PREF_LONGSIT_END = "pref_longsit_end";
|
||||
|
||||
public static final String PREF_SHOW_RAW_GRAPH = "show_raw_graph";
|
||||
// moved to gear icon (per device settings)
|
||||
public static final String PREF_LANGUAGE = "language";
|
||||
|
||||
|
||||
@ -258,8 +258,8 @@ public class WatchXPlusDeviceCoordinator extends AbstractDeviceCoordinator {
|
||||
LOG.info(" Long sit reminder is disabled ");
|
||||
return false;
|
||||
} else {
|
||||
String end = prefs.getString(WatchXPlusConstants.PREF_LONGSIT_START, "06:00");
|
||||
String start = prefs.getString(WatchXPlusConstants.PREF_LONGSIT_END, "23:00");
|
||||
String start = prefs.getString(WatchXPlusConstants.PREF_LONGSIT_START, "06:00");
|
||||
String end = prefs.getString(WatchXPlusConstants.PREF_LONGSIT_END, "23:00");
|
||||
|
||||
DateFormat df = new SimpleDateFormat("HH:mm");
|
||||
|
||||
|
||||
@ -3,18 +3,31 @@ package nodomain.freeyourgadget.gadgetbridge.devices.lenovo.watchxplus;
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.annotation.Nullable;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import de.greenrobot.dao.AbstractDao;
|
||||
import de.greenrobot.dao.Property;
|
||||
import nodomain.freeyourgadget.gadgetbridge.GBApplication;
|
||||
import nodomain.freeyourgadget.gadgetbridge.devices.AbstractSampleProvider;
|
||||
import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
|
||||
import nodomain.freeyourgadget.gadgetbridge.entities.WatchXPlusActivitySample;
|
||||
import nodomain.freeyourgadget.gadgetbridge.entities.WatchXPlusActivitySampleDao;
|
||||
import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
|
||||
import nodomain.freeyourgadget.gadgetbridge.model.ActivityKind;
|
||||
import nodomain.freeyourgadget.gadgetbridge.model.ActivitySample;
|
||||
|
||||
public class WatchXPlusSampleProvider extends AbstractSampleProvider<WatchXPlusActivitySample> {
|
||||
private GBDevice mDevice;
|
||||
private DaoSession mSession;
|
||||
|
||||
private final float movementDivisor = 1500.0f;
|
||||
|
||||
private static final Logger LOG = LoggerFactory.getLogger(WatchXPlusSampleProvider.class);
|
||||
|
||||
public WatchXPlusSampleProvider(GBDevice device, DaoSession session) {
|
||||
super(device, session);
|
||||
mSession = session;
|
||||
@ -28,12 +41,22 @@ public class WatchXPlusSampleProvider extends AbstractSampleProvider<WatchXPlusA
|
||||
|
||||
@Override
|
||||
public int toRawActivityKind(int activityKind) {
|
||||
LOG.info(" toRawActivityKind: " + activityKind);
|
||||
return activityKind;
|
||||
}
|
||||
|
||||
@Override
|
||||
public float normalizeIntensity(int rawIntensity) {
|
||||
return rawIntensity;
|
||||
float newIntensity = 0;
|
||||
if (rawIntensity <= 0) {
|
||||
//newIntensity = (rawIntensity * 0.5f) + 0.7f;
|
||||
newIntensity = rawIntensity;
|
||||
} else {
|
||||
newIntensity = rawIntensity / movementDivisor;
|
||||
}
|
||||
//LOG.info(" normalizeIntensity: " + rawIntensity + " to " + newIntensity);
|
||||
return newIntensity;
|
||||
//return rawIntensity;
|
||||
}
|
||||
|
||||
@Override
|
||||
@ -63,4 +86,339 @@ public class WatchXPlusSampleProvider extends AbstractSampleProvider<WatchXPlusA
|
||||
protected Property getDeviceIdentifierSampleProperty() {
|
||||
return WatchXPlusActivitySampleDao.Properties.DeviceId;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<WatchXPlusActivitySample> getAllActivitySamples(int timestamp_from, int timestamp_to) {
|
||||
boolean showRawData = GBApplication.getDeviceSpecificSharedPrefs(mDevice.getAddress()).getBoolean(WatchXPlusConstants.PREF_SHOW_RAW_GRAPH, false);
|
||||
if (showRawData) {
|
||||
return getGBActivitySamples(timestamp_from, timestamp_to, ActivityKind.TYPE_ALL);
|
||||
}
|
||||
List<WatchXPlusActivitySample> samples = getGBActivitySamples(timestamp_from, timestamp_to, ActivityKind.TYPE_ALL);
|
||||
int numEntries = samples.size();
|
||||
|
||||
// LOG.info(" testing: ts_from:" + timestamp_from + " ts_to: " + timestamp_to);
|
||||
|
||||
/*
|
||||
LOG.info(" testing: samples: ");
|
||||
for (int i = 0; i < numEntries; i++) {
|
||||
LOG.info(" s: " + i + " : " + samples.get(i).toString());
|
||||
}
|
||||
*/
|
||||
List<WatchXPlusActivitySample> resultList = new ArrayList<>(numEntries);
|
||||
|
||||
// how many elements to scan for sleep sate before and after sleep block
|
||||
int seekAhead = 10;
|
||||
boolean secondBlock = false;
|
||||
|
||||
// find sleep start and sleep stop index based on ActivityKind.TYPE_DEEP_SLEEP BLOCK 1
|
||||
int sleepStartIndex_1 = 0;
|
||||
int sleepStopIndex_1 = numEntries;
|
||||
int countNextSleepStart_1 = 0;
|
||||
int countNextSleepStop_1 = 0;
|
||||
|
||||
for (int i = 0; i < numEntries; i++) {
|
||||
if (samples.get(i).getRawKind() == ActivityKind.TYPE_DEEP_SLEEP) {
|
||||
// normalize RawIntensity
|
||||
samples.get(i).setRawIntensity(1000);
|
||||
// find sleep start index
|
||||
if (sleepStartIndex_1 == 0) {
|
||||
sleepStartIndex_1 = i;
|
||||
sleepStopIndex_1 = sleepStartIndex_1;
|
||||
countNextSleepStop_1 = sleepStopIndex_1;
|
||||
} else {
|
||||
if (countNextSleepStart_1 == 0) {
|
||||
countNextSleepStart_1 = i;
|
||||
// reset start index if next index is far ahead
|
||||
if ((countNextSleepStart_1 - sleepStartIndex_1) > seekAhead * 2) {
|
||||
sleepStartIndex_1 = countNextSleepStart_1;
|
||||
sleepStopIndex_1 = sleepStartIndex_1;
|
||||
countNextSleepStop_1 = sleepStopIndex_1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if ((i - sleepStopIndex_1) < (seekAhead * 3)) {
|
||||
sleepStopIndex_1 = i;
|
||||
}
|
||||
countNextSleepStop_1 = i;
|
||||
}
|
||||
}
|
||||
|
||||
// find sleep start and sleep stop index based on ActivityKind.TYPE_DEEP_SLEEP BLOCK 2
|
||||
int sleepStartIndex_2 = 0;
|
||||
int sleepStopIndex_2 = numEntries;
|
||||
int countNextSleepStart_2 = 0;
|
||||
int countNextSleepStop_2 = 0;
|
||||
int next_block = numEntries;
|
||||
|
||||
for (int i = sleepStopIndex_1 + 1; i < numEntries; i++) {
|
||||
if (samples.get(i).getRawKind() == ActivityKind.TYPE_DEEP_SLEEP) {
|
||||
// normalize RawIntensity
|
||||
samples.get(i).setRawIntensity(1000);
|
||||
// find sleep start index
|
||||
if (sleepStartIndex_2 == 0) {
|
||||
sleepStartIndex_2 = i;
|
||||
sleepStopIndex_2 = sleepStartIndex_2;
|
||||
countNextSleepStop_2 = sleepStopIndex_2;
|
||||
} else {
|
||||
if (countNextSleepStart_2 == 0) {
|
||||
countNextSleepStart_2 = i;
|
||||
// reset start index if next index is far ahead
|
||||
if ((countNextSleepStart_2 - sleepStartIndex_2) > seekAhead * 2) {
|
||||
sleepStartIndex_2 = countNextSleepStart_2;
|
||||
sleepStopIndex_2 = sleepStartIndex_2;
|
||||
countNextSleepStop_2 = sleepStopIndex_2;
|
||||
}
|
||||
}
|
||||
}
|
||||
if ((i - sleepStopIndex_2) < (seekAhead * 3)) {
|
||||
sleepStopIndex_2 = i;
|
||||
}
|
||||
countNextSleepStop_2 = i;
|
||||
}
|
||||
}
|
||||
if (sleepStartIndex_2 != 0) {
|
||||
secondBlock = true;
|
||||
LOG.info(" second block ");
|
||||
}
|
||||
|
||||
LOG.info(" sleep_1 begin index:" + sleepStartIndex_1 + " next index: " + countNextSleepStart_1 + " sleep end index: " + sleepStopIndex_1 + " sleep end: " + countNextSleepStop_1);
|
||||
if (secondBlock) {
|
||||
LOG.info(" sleep_2 begin index:" + sleepStartIndex_2 + " next index: " + countNextSleepStart_2 + " sleep end index: " + sleepStopIndex_2 + " sleep end: " + countNextSleepStop_2);
|
||||
}
|
||||
|
||||
// SLEEP BLOCK 1
|
||||
// add all activity before sleep start
|
||||
if (secondBlock) {
|
||||
next_block = sleepStartIndex_2;
|
||||
}
|
||||
int newSleepStartIndex_1 = 0;
|
||||
if (sleepStartIndex_1 >= seekAhead) {
|
||||
newSleepStartIndex_1 = sleepStartIndex_1 - seekAhead;
|
||||
} else {
|
||||
newSleepStartIndex_1 = 0;
|
||||
}
|
||||
for (int i = 0; i < newSleepStartIndex_1; i++) {
|
||||
if (samples.get(i).getRawKind() == ActivityKind.TYPE_LIGHT_SLEEP) {
|
||||
if (samples.get(i).getRawIntensity() <= 300) {
|
||||
samples.get(i).setRawIntensity(200);
|
||||
} else if ((samples.get(i).getRawIntensity() <= 1000) && (samples.get(i).getRawIntensity() > 100)) {
|
||||
samples.get(i).setRawIntensity(400);
|
||||
} if (samples.get(i).getRawIntensity() > 1000) {
|
||||
samples.get(i).setRawIntensity(600);
|
||||
}
|
||||
samples.get(i).setRawKind(1);
|
||||
resultList.add(samples.get(i));
|
||||
} else {
|
||||
if (samples.get(i).getRawKind() == ActivityKind.TYPE_ACTIVITY) {
|
||||
if (i < (newSleepStartIndex_1 - 3)) {
|
||||
if ((samples.get(i + 1).getRawKind() == ActivityKind.TYPE_LIGHT_SLEEP) || (samples.get(i + 2).getRawKind() == ActivityKind.TYPE_LIGHT_SLEEP) || (samples.get(i + 3).getRawKind() == ActivityKind.TYPE_LIGHT_SLEEP)) {
|
||||
samples.get(i).setRawKind(1);
|
||||
//samples.get(i).setRawIntensity(700);
|
||||
} else {
|
||||
samples.get(i).setRawIntensity(1000);
|
||||
}
|
||||
}
|
||||
//samples.get(i).setRawIntensity(1000);
|
||||
} else {
|
||||
samples.get(i).setRawIntensity(1000);
|
||||
}
|
||||
resultList.add(samples.get(i));
|
||||
}
|
||||
}
|
||||
|
||||
// add sleep activity
|
||||
int newSleepStopIndex_1;
|
||||
|
||||
if ((sleepStopIndex_1 + seekAhead) < next_block) {
|
||||
newSleepStopIndex_1 = sleepStopIndex_1 + seekAhead * 2;
|
||||
} else {
|
||||
newSleepStopIndex_1 = next_block;
|
||||
}
|
||||
|
||||
boolean replaceActivity_1 = false;
|
||||
for (int i = newSleepStartIndex_1; i < newSleepStopIndex_1; i++) {
|
||||
ActivitySample sample = samples.get(i);
|
||||
if (i < sleepStartIndex_1) {
|
||||
if (samples.get(i).getRawKind() == ActivityKind.TYPE_LIGHT_SLEEP) {
|
||||
replaceActivity_1 = true;
|
||||
samples.get(i).setRawIntensity(500);
|
||||
resultList.add(samples.get(i));
|
||||
} else {
|
||||
if (replaceActivity_1) {
|
||||
samples.get(i).setRawKind(2);
|
||||
samples.get(i).setRawIntensity(500);
|
||||
resultList.add(samples.get(i));
|
||||
} else {
|
||||
samples.get(i).setRawIntensity(500);
|
||||
resultList.add(samples.get(i));
|
||||
}
|
||||
}
|
||||
}
|
||||
if ((samples.get(i).getRawKind() == ActivityKind.TYPE_DEEP_SLEEP) || (samples.get(i).getRawKind() == ActivityKind.TYPE_LIGHT_SLEEP)) {
|
||||
if (samples.get(i).getRawKind() == ActivityKind.TYPE_LIGHT_SLEEP) {
|
||||
if (i > 0) {
|
||||
if (samples.get(i - 1).getHeartRate() > 0) {
|
||||
samples.get(i).setHeartRate(samples.get(i - 1).getHeartRate());
|
||||
}
|
||||
} else {
|
||||
if (samples.get(i + 1).getHeartRate() > 0) {
|
||||
samples.get(i).setHeartRate(samples.get(i + 1).getHeartRate());
|
||||
}
|
||||
}
|
||||
samples.get(i).setRawIntensity(500);
|
||||
resultList.add(samples.get(i));
|
||||
} else {
|
||||
samples.get(i).setRawIntensity(1000);
|
||||
resultList.add(samples.get(i));
|
||||
}
|
||||
}
|
||||
|
||||
if ((samples.get(i).getRawKind() == ActivityKind.TYPE_LIGHT_SLEEP) && (i > sleepStopIndex_1)) {
|
||||
samples.get(i).setRawIntensity(500);
|
||||
resultList.add(samples.get(i));
|
||||
}
|
||||
}
|
||||
|
||||
// add remaining activity
|
||||
if (newSleepStopIndex_1 < next_block) {
|
||||
for (int i = newSleepStopIndex_1; i < (next_block-1); i++) {
|
||||
if (samples.get(i).getRawKind() == ActivityKind.TYPE_LIGHT_SLEEP) {
|
||||
if (samples.get(i).getRawIntensity() <= 300) {
|
||||
samples.get(i).setRawIntensity(200);
|
||||
} else if ((samples.get(i).getRawIntensity() <= 1000) && (samples.get(i).getRawIntensity() > 100)) {
|
||||
samples.get(i).setRawIntensity(400);
|
||||
} if (samples.get(i).getRawIntensity() > 1000) {
|
||||
samples.get(i).setRawIntensity(600);
|
||||
}
|
||||
samples.get(i).setRawKind(1);
|
||||
resultList.add(samples.get(i));
|
||||
} else {
|
||||
if (samples.get(i).getRawKind() == ActivityKind.TYPE_ACTIVITY) {
|
||||
if (i < (next_block - 3)) {
|
||||
if ((samples.get(i + 1).getRawKind() == ActivityKind.TYPE_LIGHT_SLEEP) || (samples.get(i + 2).getRawKind() == ActivityKind.TYPE_LIGHT_SLEEP) || (samples.get(i + 3).getRawKind() == ActivityKind.TYPE_LIGHT_SLEEP)) {
|
||||
samples.get(i).setRawKind(1);
|
||||
//samples.get(i).setRawIntensity(700);
|
||||
} else {
|
||||
samples.get(i).setRawIntensity(1000);
|
||||
}
|
||||
}
|
||||
//samples.get(i).setRawIntensity(1000);
|
||||
} else {
|
||||
samples.get(i).setRawIntensity(1000);
|
||||
}
|
||||
resultList.add(samples.get(i));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (!secondBlock) {
|
||||
samples.get(next_block-1).setRawIntensity(100);
|
||||
samples.get(next_block-1).setRawKind(-1);
|
||||
resultList.add(samples.get(next_block-1));
|
||||
return resultList;
|
||||
}
|
||||
|
||||
// SLEEP BLOCK 2
|
||||
// add sleep activity
|
||||
int newSleepStopIndex_2;
|
||||
int newSleepStartIndex_2 = 0;
|
||||
boolean replaceActivity_2 = false;
|
||||
if (sleepStartIndex_2 >= next_block + seekAhead) {
|
||||
newSleepStartIndex_2 = sleepStartIndex_2 - seekAhead;
|
||||
} else {
|
||||
newSleepStartIndex_2 = next_block;
|
||||
}
|
||||
if ((sleepStopIndex_2 + seekAhead) < numEntries) {
|
||||
newSleepStopIndex_2 = sleepStopIndex_2 + seekAhead;
|
||||
} else {
|
||||
newSleepStopIndex_2 = numEntries;
|
||||
}
|
||||
for (int i = newSleepStartIndex_2; i < newSleepStopIndex_2; i++) {
|
||||
ActivitySample sample = samples.get(i);
|
||||
/*
|
||||
if ((samples.get(i).getRawKind() == ActivityKind.TYPE_LIGHT_SLEEP) && (i < sleepStartIndex_2)) {
|
||||
samples.get(i).setRawIntensity(500);
|
||||
resultList.add(samples.get(i));
|
||||
}
|
||||
*/
|
||||
if (i < sleepStartIndex_2) {
|
||||
if (samples.get(i).getRawKind() == ActivityKind.TYPE_LIGHT_SLEEP) {
|
||||
replaceActivity_2 = true;
|
||||
samples.get(i).setRawIntensity(500);
|
||||
resultList.add(samples.get(i));
|
||||
} else {
|
||||
if (replaceActivity_2) {
|
||||
samples.get(i).setRawKind(2);
|
||||
samples.get(i).setRawIntensity(500);
|
||||
resultList.add(samples.get(i));
|
||||
} else {
|
||||
samples.get(i).setRawIntensity(500);
|
||||
resultList.add(samples.get(i));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if ((samples.get(i).getRawKind() == ActivityKind.TYPE_DEEP_SLEEP) || (samples.get(i).getRawKind() == ActivityKind.TYPE_LIGHT_SLEEP)) {
|
||||
if (samples.get(i).getRawKind() == ActivityKind.TYPE_LIGHT_SLEEP) {
|
||||
if (i > 0) {
|
||||
if (samples.get(i - 1).getHeartRate() > 0) {
|
||||
samples.get(i).setHeartRate(samples.get(i - 1).getHeartRate());
|
||||
}
|
||||
} else {
|
||||
if (samples.get(i + 1).getHeartRate() > 0) {
|
||||
samples.get(i).setHeartRate(samples.get(i + 1).getHeartRate());
|
||||
}
|
||||
}
|
||||
samples.get(i).setRawIntensity(500);
|
||||
resultList.add(samples.get(i));
|
||||
} else {
|
||||
samples.get(i).setRawIntensity(1000);
|
||||
resultList.add(samples.get(i));
|
||||
}
|
||||
}
|
||||
if ((samples.get(i).getRawKind() == ActivityKind.TYPE_LIGHT_SLEEP) && (i > sleepStopIndex_2)) {
|
||||
samples.get(i).setRawIntensity(500);
|
||||
resultList.add(samples.get(i));
|
||||
}
|
||||
}
|
||||
|
||||
// add remaining activity
|
||||
if (newSleepStopIndex_2 < numEntries) {
|
||||
for (int i = newSleepStopIndex_2; i < (numEntries-1); i++) {
|
||||
if (samples.get(i).getRawKind() == ActivityKind.TYPE_LIGHT_SLEEP) {
|
||||
if (samples.get(i).getRawIntensity() <= 300) {
|
||||
samples.get(i).setRawIntensity(200);
|
||||
} else if ((samples.get(i).getRawIntensity() <= 1000) && (samples.get(i).getRawIntensity() > 100)) {
|
||||
samples.get(i).setRawIntensity(400);
|
||||
} if (samples.get(i).getRawIntensity() > 1000) {
|
||||
samples.get(i).setRawIntensity(600);
|
||||
}
|
||||
samples.get(i).setRawKind(1);
|
||||
resultList.add(samples.get(i));
|
||||
} else {
|
||||
if (samples.get(i).getRawKind() == ActivityKind.TYPE_ACTIVITY) {
|
||||
if (i < (numEntries - 3)) {
|
||||
if ((samples.get(i + 1).getRawKind() == ActivityKind.TYPE_LIGHT_SLEEP) || (samples.get(i + 2).getRawKind() == ActivityKind.TYPE_LIGHT_SLEEP) || (samples.get(i + 3).getRawKind() == ActivityKind.TYPE_LIGHT_SLEEP)) {
|
||||
samples.get(i).setRawKind(1);
|
||||
//samples.get(i).setRawIntensity(700);
|
||||
} else {
|
||||
samples.get(i).setRawIntensity(1000);
|
||||
}
|
||||
}
|
||||
//samples.get(i).setRawIntensity(1000);
|
||||
} else {
|
||||
samples.get(i).setRawIntensity(1000);
|
||||
}
|
||||
resultList.add(samples.get(i));
|
||||
}
|
||||
}
|
||||
}
|
||||
samples.get(numEntries-1).setRawIntensity(-1);
|
||||
samples.get(numEntries-1).setRawKind(-1);
|
||||
resultList.add(samples.get(numEntries-1));
|
||||
return resultList;
|
||||
}
|
||||
}
|
||||
|
||||
@ -90,9 +90,6 @@ import nodomain.freeyourgadget.gadgetbridge.util.GB;
|
||||
import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
|
||||
import nodomain.freeyourgadget.gadgetbridge.util.StringUtils;
|
||||
|
||||
import static nodomain.freeyourgadget.gadgetbridge.GBApplication.getContext;
|
||||
import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_LANGUAGE;
|
||||
|
||||
public class WatchXPlusDeviceSupport extends AbstractBTLEDeviceSupport {
|
||||
private static final Prefs prefs = GBApplication.getPrefs();
|
||||
|
||||
@ -1018,15 +1015,17 @@ public class WatchXPlusDeviceSupport extends AbstractBTLEDeviceSupport {
|
||||
*/
|
||||
private void setLongSitHours(TransactionBuilder builder, boolean enable, int hourStart, int minuteStart, int hourEnd, int minuteEnd, int period) {
|
||||
LOG.info(" Setting Long sit reminder... Enabled:"+enable+" Period:"+period);
|
||||
LOG.info(" Setting Long sit time... Hs:"+hourEnd+" Ms:"+minuteEnd+" He:"+hourStart+" Me:"+minuteStart);
|
||||
LOG.info(" Setting Long sit time... Hs:"+hourStart+" Ms:"+minuteStart+" He:"+hourEnd+" Me:"+minuteEnd);
|
||||
// set Long Sit reminder time
|
||||
byte[] command = WatchXPlusConstants.CMD_INACTIVITY_REMINDER_SET;
|
||||
|
||||
byte[] bArr = new byte[10];
|
||||
// do not remind
|
||||
bArr[0] = (byte) hourEnd; // byte[08]
|
||||
bArr[1] = (byte) minuteEnd; // byte[09]
|
||||
bArr[2] = (byte) hourStart; // byte[10]
|
||||
bArr[3] = (byte) minuteStart; // byte[11]
|
||||
// remind
|
||||
bArr[4] = (byte) hourStart; // byte[12]
|
||||
bArr[5] = (byte) minuteStart; // byte[13]
|
||||
bArr[6] = (byte) hourEnd; // byte[14]
|
||||
@ -1506,13 +1505,13 @@ public class WatchXPlusDeviceSupport extends AbstractBTLEDeviceSupport {
|
||||
} else if (ArrayUtils.equals(value, WatchXPlusConstants.RESP_DAY_STEPS_INDICATOR, 5)) {
|
||||
handleStepsInfo(value);
|
||||
} else if (ArrayUtils.equals(value, WatchXPlusConstants.RESP_DATA_COUNT, 5)) {
|
||||
LOG.info(" Received data count ");
|
||||
LOG.info(" Received data count: " + value);
|
||||
handleDataCount(value);
|
||||
} else if (ArrayUtils.equals(value, WatchXPlusConstants.RESP_DATA_DETAILS, 5)) {
|
||||
LOG.info(" Received data details ");
|
||||
LOG.info(" Received data details: " + value);
|
||||
handleDataDetails(value);
|
||||
} else if (ArrayUtils.equals(value, WatchXPlusConstants.RESP_DATA_CONTENT, 5)) {
|
||||
LOG.info(" Received data content ");
|
||||
LOG.info(" Received data content: " + value);
|
||||
handleDataContentAck(value);
|
||||
} else if (ArrayUtils.equals(value, WatchXPlusConstants.RESP_BP_MEASURE_STARTED, 5)) {
|
||||
handleBpMeasureResult(value);
|
||||
@ -1707,7 +1706,7 @@ public class WatchXPlusDeviceSupport extends AbstractBTLEDeviceSupport {
|
||||
}
|
||||
|
||||
int tsWithOffset = requestedDataTimestamp + (((((chunkNo * 16) / 2) + ((i - 4) / 2)) *5) * 60) - timezoneOffset;
|
||||
LOG.debug(" requested timestamp " + requestedDataTimestamp + " chunkNo " + chunkNo + " Got data: " + new Date((long) tsWithOffset * 1000) + ", value: " + val);
|
||||
LOG.debug(" SLEEP requested timestamp " + requestedDataTimestamp + " chunkNo " + chunkNo + " Got data: " + new Date((long) tsWithOffset * 1000) + ", rawIntensity: " + val);
|
||||
WatchXPlusActivitySample sample = createSample(dbHandler, tsWithOffset);
|
||||
sample.setTimestamp(tsWithOffset);
|
||||
sample.setProvider(provider);
|
||||
@ -1729,7 +1728,7 @@ public class WatchXPlusDeviceSupport extends AbstractBTLEDeviceSupport {
|
||||
break;
|
||||
}
|
||||
int tsWithOffset = requestedDataTimestamp + (((((chunkNo * 16) + i) - 4) * 2) * 60) - timezoneOffset;
|
||||
// LOG.debug(" requested timestamp " + requestedDataTimestamp + " chunkNo " + chunkNo + " Got data: " + new Date((long) tsWithOffset * 1000) + ", value: " + val);
|
||||
LOG.debug(" HEART RATE requested timestamp " + requestedDataTimestamp + " chunkNo " + chunkNo + " Got data: " + new Date((long) tsWithOffset * 1000) + ", value: " + val);
|
||||
WatchXPlusActivitySample sample = createSample(dbHandler, tsWithOffset);
|
||||
sample.setTimestamp(tsWithOffset);
|
||||
sample.setHeartRate(val);
|
||||
@ -1742,6 +1741,16 @@ public class WatchXPlusDeviceSupport extends AbstractBTLEDeviceSupport {
|
||||
handleEndOfDataChunks(chunkNo, type);
|
||||
} else {
|
||||
LOG.warn(" Got unsupported data package type: " + type);
|
||||
|
||||
for (int i = 4; i < value.length; i++) {
|
||||
int val = Conversion.fromByteArr16(value[i], value[i+1]);
|
||||
if (65535 == val) {
|
||||
break;
|
||||
}
|
||||
int tsWithOffset = requestedDataTimestamp + (((((chunkNo * 16) / 2) + ((i - 4) / 2)) *5) * 60) - timezoneOffset;
|
||||
LOG.debug(" UNSUPPORTED requested timestamp for type: " + type + " " + requestedDataTimestamp + " chunkNo " + chunkNo + " Got data: " + new Date((long) tsWithOffset * 1000) + ", rawIntensity: " + val);
|
||||
}
|
||||
|
||||
}
|
||||
} catch (Exception ex) {
|
||||
LOG.warn((ex.getMessage()));
|
||||
|
||||
@ -302,6 +302,7 @@
|
||||
<string name="pref_header_device_spec_settings">Настройки на устройството</string>
|
||||
<string name="pref_title_device_spec_settings_force_time">Принудително синхронизирай часа</string>
|
||||
<string name="pref_summary_device_spec_settings_title_force_time">Принудително синхронизирай дата и час при свързване. Стрелките може да показват грешно време.</string>
|
||||
<string name="pref_title_device_spec_settings_show_raw_graph">Покажи графика в суров вид</string>
|
||||
<!-- Device Settings - Calibration - Used in devicesettings_watchxplus.xml -->
|
||||
<string name="pref_header_sensors_calibration">Калибриране на сензорите</string>
|
||||
<string name="pref_title_sensors_altitude">Калибриране на височината</string>
|
||||
@ -310,10 +311,6 @@
|
||||
<string name="pref_sensors_bp_calibration_high">Кръвно налягане SYSTOLIC (висока)</string>
|
||||
<string name="prefs_sensors_button_bp_calibration">Калибриране</string>
|
||||
<string name="prefs_sensors_button_bp_calibration_sum">Натисни тук за калибриране</string>
|
||||
<!-- Device Settings - Long Sit Reminder -->
|
||||
<string name="pref_summary_longsit">Напомни ако няма активност за повече от X минути</string>
|
||||
<string name="prefs_longsit_switch">Напомняне за бездействие</string>
|
||||
<string name="pref_title_longsit">Период на неактивност (минути)</string>
|
||||
<!-- Device Settings - Power Mode -->
|
||||
<string name="power_mode_title">Режим на часовника</string>
|
||||
<string name="power_mode_normal">Нормален</string>
|
||||
@ -556,6 +553,9 @@
|
||||
<string name="mi2_prefs_do_not_disturb_end">Край</string>
|
||||
<string name="mi2_prefs_do_not_disturb_start">Начало</string>
|
||||
<string name="mi2_prefs_do_not_disturb">Не безпокой</string>
|
||||
<string name="mi2_prefs_inactivity_warnings">Предупреждение за бездействие</string>
|
||||
<string name="mi2_prefs_inactivity_warnings_summary">Устройството ще вибрира ако бездействате за известно време</string>
|
||||
<string name="mi2_prefs_inactivity_warnings_threshold">Период на бездействие (в минути)</string>
|
||||
<string name="you_slept">Вие спахте от %1$s до %2$s</string>
|
||||
<string name="widget_steps_label">Стъпки: %1$02d</string>
|
||||
<string name="widget_sleep_label">Сън: %1$s</string>
|
||||
|
||||
@ -216,6 +216,7 @@
|
||||
<string name="pref_header_device_spec_settings">Device settings</string>
|
||||
<string name="pref_title_device_spec_settings_force_time">Force synchronize time</string>
|
||||
<string name="pref_summary_device_spec_settings_title_force_time">Force auto synchronize time on reconnect. Analog hands may show incorrect time!</string>
|
||||
<string name="pref_title_device_spec_settings_show_raw_graph">Show RAW data on activity graph</string>
|
||||
<!-- Device Settings - Calibration - Used in devicesettings_watchxplus.xml -->
|
||||
<string name="pref_header_sensors_calibration">Sensors Calibration</string>
|
||||
<string name="pref_title_sensors_altitude">Altitude calibration</string>
|
||||
@ -224,10 +225,6 @@
|
||||
<string name="pref_sensors_bp_calibration_high">Blood Pressure SYSTOLIC (high)</string>
|
||||
<string name="prefs_sensors_button_bp_calibration">Calibration</string>
|
||||
<string name="prefs_sensors_button_bp_calibration_sum">Press here to begin calibration</string>
|
||||
<!-- Device Settings - Long Sit Reminder -->
|
||||
<string name="pref_summary_longsit">Remind if there are inactivity for X minutes</string>
|
||||
<string name="prefs_longsit_switch">Inactivity reminder</string>
|
||||
<string name="pref_title_longsit">Inactivity period (minutes)</string>
|
||||
<!-- Device Settings - Power Mode -->
|
||||
<string name="power_mode_title">Watch power mode</string>
|
||||
<string name="power_mode_normal">Normal</string>
|
||||
|
||||
@ -4,21 +4,21 @@
|
||||
android:icon="@drawable/ic_activity_sleep"
|
||||
android:key="screen_longsit"
|
||||
android:persistent="false"
|
||||
android:summary="@string/pref_summary_longsit"
|
||||
android:title="@string/prefs_longsit_switch">
|
||||
android:summary="@string/mi2_prefs_inactivity_warnings_summary"
|
||||
android:title="@string/mi2_prefs_inactivity_warnings">
|
||||
|
||||
<!-- workaround for missing toolbar -->
|
||||
<PreferenceCategory android:title="@string/pref_summary_longsit" />
|
||||
<PreferenceCategory android:title="@string/mi2_prefs_inactivity_warnings_summary" />
|
||||
|
||||
<SwitchPreference
|
||||
android:defaultValue="false"
|
||||
android:key="pref_longsit_switch"
|
||||
android:title="@string/prefs_longsit_switch" />
|
||||
android:title="@string/mi2_prefs_inactivity_warnings" />
|
||||
<EditTextPreference
|
||||
android:defaultValue="60"
|
||||
android:key="pref_longsit_period"
|
||||
android:summary="@string/pref_summary_longsit"
|
||||
android:title="@string/pref_title_longsit"/>
|
||||
android:summary="@string/mi2_prefs_inactivity_warnings_summary"
|
||||
android:title="@string/mi2_prefs_inactivity_warnings_threshold"/>
|
||||
<nodomain.freeyourgadget.gadgetbridge.util.XTimePreference
|
||||
android:defaultValue="06:00"
|
||||
android:key="pref_longsit_start"
|
||||
|
||||
@ -65,6 +65,10 @@
|
||||
android:key="pref_device_spec_settings_force_time"
|
||||
android:summary="@string/pref_summary_device_spec_settings_title_force_time"
|
||||
android:title="@string/pref_title_device_spec_settings_force_time" />
|
||||
<SwitchPreference
|
||||
android:defaultValue="false"
|
||||
android:key="show_raw_graph"
|
||||
android:title="@string/pref_title_device_spec_settings_show_raw_graph" />
|
||||
</PreferenceScreen>
|
||||
<PreferenceScreen
|
||||
android:icon="@drawable/ic_activity_unknown"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user