MarcoBuster/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2024-12-24 01:25:50 +01:00
Code Releases Wiki Activity

Zepp OS: Implement activity and sleep fetching

Browse Source
This commit is contained in:
José Rebelo 2022-09-10 14:22:46 +01:00 committed by Gitea
parent a919286496
commit 7f4bd16914
11 changed files with 344 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
GBDaoGenerator/src/nodomain/freeyourgadget/gadgetbridge/daogen/GBDaoGenerator.java
View File

@ -43,7 +43,7 @@ public class GBDaoGenerator {
public static void main(String[] args) throws Exception {
final Schema schema = new Schema(42, MAIN_PACKAGE + ".entities");
final Schema schema = new Schema(43, MAIN_PACKAGE + ".entities");
Entity userAttributes = addUserAttributes(schema);
Entity user = addUserInfo(schema, userAttributes);
@ -60,6 +60,7 @@ public class GBDaoGenerator {
addMakibesHR3ActivitySample(schema, user, device);
addMiBandActivitySample(schema, user, device);
addHuamiExtendedActivitySample(schema, user, device);
addPebbleHealthActivitySample(schema, user, device);
addPebbleHealthActivityKindOverlay(schema, user, device);
addPebbleMisfitActivitySample(schema, user, device);
@ -223,6 +224,20 @@ public class GBDaoGenerator {
return activitySample;
}
private static Entity addHuamiExtendedActivitySample(Schema schema, Entity user, Entity device) {
Entity activitySample = addEntity(schema, "HuamiExtendedActivitySample");
addCommonActivitySampleProperties("MiBandActivitySample", activitySample, user, device);
activitySample.addIntProperty(SAMPLE_RAW_INTENSITY).notNull().codeBeforeGetterAndSetter(OVERRIDE);
activitySample.addIntProperty(SAMPLE_STEPS).notNull().codeBeforeGetterAndSetter(OVERRIDE);
activitySample.addIntProperty(SAMPLE_RAW_KIND).notNull().codeBeforeGetterAndSetter(OVERRIDE);
addHeartRateProperties(activitySample);
activitySample.addIntProperty("unknown1");
activitySample.addIntProperty("sleep");
activitySample.addIntProperty("deepSleep");
activitySample.addIntProperty("remSleep");
return activitySample;
}
private static void addHeartRateProperties(Entity activitySample) {
activitySample.addIntProperty(SAMPLE_HEART_RATE).notNull().codeBeforeGetterAndSetter(OVERRIDE);
}

2
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBDeviceAdapterv2.java
View File

@ -367,7 +367,7 @@ public class GBDeviceAdapterv2 extends ListAdapter<GBDevice, GBDeviceAdapterv2.V
batteryStatusLabels[batteryIndex].setVisibility(View.VISIBLE);
}
}
holder.heartRateStatusBox.setVisibility((device.isInitialized() && coordinator.supportsRealtimeData() && coordinator.supportsHeartRateMeasurement(device)) ? View.VISIBLE : View.GONE);
holder.heartRateStatusBox.setVisibility((device.isInitialized() && coordinator.supportsRealtimeData() && coordinator.supportsManualHeartRateMeasurement(device)) ? View.VISIBLE : View.GONE);
if (parent.getContext() instanceof ControlCenterv2) {
ActivitySample sample = ((ControlCenterv2) parent.getContext()).getCurrentHRSample();
if (sample != null) {

5
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractDeviceCoordinator.java
View File

@ -272,6 +272,11 @@ public abstract class AbstractDeviceCoordinator implements DeviceCoordinator {
return false;
}
@Override
public boolean supportsManualHeartRateMeasurement(final GBDevice device) {
return supportsHeartRateMeasurement(device);
}
@Override
public boolean supportsRemSleep() {
return false;

5
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/DeviceCoordinator.java
View File

@ -273,6 +273,11 @@ public interface DeviceCoordinator {
*/
boolean supportsHeartRateMeasurement(GBDevice device);
/**
* Returns true if the device supports triggering manual one-shot heart rate measurements.
*/
boolean supportsManualHeartRateMeasurement(GBDevice device);
/**
* Returns the readable name of the manufacturer.
*/

48
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/Huami2021Coordinator.java
View File

@ -16,11 +16,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. */
package nodomain.freeyourgadget.gadgetbridge.devices.huami;
import android.content.Context;
import android.net.Uri;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import androidx.annotation.NonNull;
import java.util.Arrays;
import java.util.List;
@ -29,19 +25,24 @@ import nodomain.freeyourgadget.gadgetbridge.R;
import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSpecificSettingsCustomizer;
import nodomain.freeyourgadget.gadgetbridge.capabilities.HeartRateCapability;
import nodomain.freeyourgadget.gadgetbridge.capabilities.password.PasswordCapabilityImpl;
import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
import de.greenrobot.dao.query.QueryBuilder;
import nodomain.freeyourgadget.gadgetbridge.GBException;
import nodomain.freeyourgadget.gadgetbridge.devices.SampleProvider;
import nodomain.freeyourgadget.gadgetbridge.entities.AbstractActivitySample;
import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
import nodomain.freeyourgadget.gadgetbridge.entities.Device;
import nodomain.freeyourgadget.gadgetbridge.entities.HuamiExtendedActivitySampleDao;
import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
public abstract class Huami2021Coordinator extends HuamiCoordinator {
private static final Logger LOG = LoggerFactory.getLogger(Huami2021Coordinator.class);
@Override
public boolean supportsHeartRateMeasurement(final GBDevice device) {
// TODO: One-shot HR measures are not working, so let's disable this for now
return true;
}
@Override
public boolean supportsManualHeartRateMeasurement(final GBDevice device) {
// TODO: It should be supported, but not yet properly implemented
return false;
}
@ -61,15 +62,8 @@ public abstract class Huami2021Coordinator extends HuamiCoordinator {
}
@Override
public boolean supportsActivityTracking() {
// TODO: It's supported by the devices, but not yet implemented
return false;
}
@Override
public boolean supportsActivityDataFetching() {
// TODO: It's supported by the devices, but not yet implemented
return false;
public boolean supportsRemSleep() {
return true;
}
@Override
@ -94,10 +88,18 @@ public abstract class Huami2021Coordinator extends HuamiCoordinator {
return true;
}
@Override
protected void deleteDevice(@NonNull final GBDevice gbDevice,
@NonNull final Device device,
@NonNull final DaoSession session) throws GBException {
final Long deviceId = device.getId();
final QueryBuilder<?> qb = session.getHuamiExtendedActivitySampleDao().queryBuilder();
qb.where(HuamiExtendedActivitySampleDao.Properties.DeviceId.eq(deviceId)).buildDelete().executeDeleteWithoutDetachingEntities();
}
@Override
public SampleProvider<? extends AbstractActivitySample> getSampleProvider(final GBDevice device, final DaoSession session) {
// TODO: It's supported by the devices, but not yet implemented
return null;
return new HuamiExtendedSampleProvider(device, session);
}
@Override
@ -117,7 +119,7 @@ public abstract class Huami2021Coordinator extends HuamiCoordinator {
}
@Override
public String[] getSupportedLanguageSettings(GBDevice device) {
public String[] getSupportedLanguageSettings(final GBDevice device) {
return new String[]{
"auto",
"de_DE",
@ -148,7 +150,7 @@ public abstract class Huami2021Coordinator extends HuamiCoordinator {
}
@Override
public int[] getSupportedDeviceSpecificSettings(GBDevice device) {
public int[] getSupportedDeviceSpecificSettings(final GBDevice device) {
return new int[]{
R.xml.devicesettings_header_time,
//R.xml.devicesettings_timeformat,

144
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiExtendedSampleProvider.java Normal file
View File

@ -0,0 +1,144 @@
/* Copyright (C) 2022 José Rebelo
This file is part of Gadgetbridge.
Gadgetbridge is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published
by the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
Gadgetbridge is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
package nodomain.freeyourgadget.gadgetbridge.devices.huami;
import androidx.annotation.NonNull;
import java.util.List;
import de.greenrobot.dao.AbstractDao;
import de.greenrobot.dao.Property;
import nodomain.freeyourgadget.gadgetbridge.devices.AbstractSampleProvider;
import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
import nodomain.freeyourgadget.gadgetbridge.entities.HuamiExtendedActivitySample;
import nodomain.freeyourgadget.gadgetbridge.entities.HuamiExtendedActivitySampleDao;
import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
import nodomain.freeyourgadget.gadgetbridge.model.ActivityKind;
public class HuamiExtendedSampleProvider extends AbstractSampleProvider<HuamiExtendedActivitySample> {
public static final int TYPE_CUSTOM_UNSET = -1;
public static final int TYPE_OUTDOOR_RUNNING = 64;
public static final int TYPE_NOT_WORN = 115;
public static final int TYPE_CHARGING = 118;
public static final int TYPE_SLEEP = 120;
public static final int TYPE_CUSTOM_DEEP_SLEEP = TYPE_SLEEP + 1;
public static final int TYPE_CUSTOM_REM_SLEEP = TYPE_SLEEP + 2;
public HuamiExtendedSampleProvider(final GBDevice device, final DaoSession session) {
super(device, session);
}
@Override
public float normalizeIntensity(int rawIntensity) {
return rawIntensity / 256.0f;
}
@Override
public AbstractDao<HuamiExtendedActivitySample, ?> getSampleDao() {
return getSession().getHuamiExtendedActivitySampleDao();
}
@NonNull
@Override
protected Property getTimestampSampleProperty() {
return HuamiExtendedActivitySampleDao.Properties.Timestamp;
}
@NonNull
@Override
protected Property getDeviceIdentifierSampleProperty() {
return HuamiExtendedActivitySampleDao.Properties.DeviceId;
}
@Override
protected Property getRawKindSampleProperty() {
return HuamiExtendedActivitySampleDao.Properties.RawKind;
}
@Override
public HuamiExtendedActivitySample createActivitySample() {
return new HuamiExtendedActivitySample();
}
@Override
protected List<HuamiExtendedActivitySample> getGBActivitySamples(final int timestamp_from, final int timestamp_to, final int activityType) {
final List<HuamiExtendedActivitySample> samples = super.getGBActivitySamples(timestamp_from, timestamp_to, activityType);
postProcess(samples);
return samples;
}
private void postProcess(final List<HuamiExtendedActivitySample> samples) {
if (samples.isEmpty()) {
return;
}
for (final HuamiExtendedActivitySample sample : samples) {
if (sample.getRawKind() == TYPE_SLEEP) {
// Band reports type sleep regardless of sleep type, so we map it to custom raw types
// These thresholds are arbitrary, but seem to somewhat match the data that's displayed on the band
sample.setDeepSleep(sample.getDeepSleep() & 127);
sample.setRemSleep(sample.getRemSleep() & 127);
if (sample.getRemSleep() > 55) {
sample.setRawKind(TYPE_CUSTOM_REM_SLEEP);
sample.setRawIntensity(sample.getRemSleep());
} else if (sample.getDeepSleep() > 42) {
sample.setRawKind(TYPE_CUSTOM_DEEP_SLEEP);
sample.setRawIntensity(sample.getDeepSleep());
} else {
sample.setRawIntensity(sample.getSleep());
}
}
}
}
@Override
public int normalizeType(final int rawType) {
switch (rawType) {
case TYPE_OUTDOOR_RUNNING:
return ActivityKind.TYPE_RUNNING;
case TYPE_NOT_WORN:
case TYPE_CHARGING:
return ActivityKind.TYPE_NOT_WORN;
case TYPE_SLEEP:
return ActivityKind.TYPE_LIGHT_SLEEP;
case TYPE_CUSTOM_DEEP_SLEEP:
return ActivityKind.TYPE_DEEP_SLEEP;
case TYPE_CUSTOM_REM_SLEEP:
return ActivityKind.TYPE_REM_SLEEP;
}
return ActivityKind.TYPE_UNKNOWN;
}
@Override
public int toRawActivityKind(final int activityKind) {
switch (activityKind) {
case ActivityKind.TYPE_RUNNING:
return TYPE_OUTDOOR_RUNNING;
case ActivityKind.TYPE_NOT_WORN:
return TYPE_NOT_WORN;
case ActivityKind.TYPE_LIGHT_SLEEP:
case ActivityKind.TYPE_DEEP_SLEEP:
case ActivityKind.TYPE_REM_SLEEP:
return TYPE_SLEEP;
}
return TYPE_CUSTOM_UNSET;
}
}

5
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiService.java
View File

@ -115,7 +115,9 @@ public class HuamiService {
// maybe not really activity data, but steps?
public static final byte COMMAND_FETCH_DATA = 0x02;
public static final byte COMMAND_XXXX_ACTIVITY_DATA = 0x03; // maybe delete/drop activity data?
// maybe delete/drop activity data?
// on Huami it's just 03 / on Huami 2021 it's 03:09
public static final byte COMMAND_ACK_ACTIVITY_DATA = 0x03;
public static final byte[] COMMAND_SET_FITNESS_GOAL_START = new byte[] { 0x10, 0x0, 0x0 };
public static final byte[] COMMAND_SET_FITNESS_GOAL_END = new byte[] { 0, 0 };
@ -229,6 +231,7 @@ public class HuamiService {
public static final byte COMMAND_FIRMWARE_REBOOT = 0x05; // to UUID_CHARACTERISTIC_FIRMWARE
public static final byte[] RESPONSE_FINISH_SUCCESS = new byte[] {RESPONSE, 2, SUCCESS };
public static final byte[] RESPONSE_ACK_SUCCESS = new byte[] {RESPONSE, 3, SUCCESS };
public static final byte[] RESPONSE_FIRMWARE_DATA_SUCCESS = new byte[] {RESPONSE, COMMAND_FIRMWARE_START_DATA, SUCCESS };
/**
* Received in response to any dateformat configuration request (byte 0 in the byte[] value.

7
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/AbstractHuamiOperation.java
View File

@ -16,6 +16,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. */
package nodomain.freeyourgadget.gadgetbridge.service.devices.huami;
import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiService;
import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder;
import nodomain.freeyourgadget.gadgetbridge.service.devices.miband.operations.AbstractMiBandOperation;
@ -25,9 +26,13 @@ public abstract class AbstractHuamiOperation extends AbstractMiBandOperation<Hua
}
@Override
protected void enableOtherNotifications(TransactionBuilder builder, boolean enable) {
protected void enableOtherNotifications(final TransactionBuilder builder, final boolean enable) {
// TODO: check which notifications we should disable and re-enable here
// builder.notify(getCharacteristic(MiBandService.UUID_CHARACTERISTIC_REALTIME_STEPS), enable)
// .notify(getCharacteristic(MiBandService.UUID_CHARACTERISTIC_SENSOR_DATA), enable);
if (getSupport() instanceof Huami2021Support) {
// Disable 2021 chunked reads, otherwise firmware upgrades and activity sync get interrupted
builder.notify(getCharacteristic(HuamiService.UUID_CHARACTERISTIC_CHUNKEDTRANSFER_2021_READ), enable);
}
}
}

39
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/AbstractFetchOperation.java
View File

@ -45,6 +45,7 @@ import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder;
import nodomain.freeyourgadget.gadgetbridge.service.btle.actions.AbstractGattListenerWriteAction;
import nodomain.freeyourgadget.gadgetbridge.service.btle.actions.SetDeviceBusyAction;
import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.AbstractHuamiOperation;
import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.Huami2021Support;
import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.HuamiSupport;
import nodomain.freeyourgadget.gadgetbridge.util.ArrayUtils;
import nodomain.freeyourgadget.gadgetbridge.util.GB;
@ -62,6 +63,7 @@ public abstract class AbstractFetchOperation extends AbstractHuamiOperation {
protected BluetoothGattCharacteristic characteristicActivityData;
protected BluetoothGattCharacteristic characteristicFetch;
Calendar startTimestamp;
int expectedDataLength = 0;
public AbstractFetchOperation(HuamiSupport support) {
super(support);
@ -175,34 +177,53 @@ public abstract class AbstractFetchOperation extends AbstractHuamiOperation {
}
private void handleActivityMetadata(byte[] value) {
// TODO it's 16 on the MB7
if (value.length == 15) {
// it's 16 on the MB7, with a 0 at the end
if (value.length == 15 || (value.length == 16 && value[15] == 0x00)) {
// first two bytes are whether our request was accepted
if (ArrayUtils.equals(value, HuamiService.RESPONSE_ACTIVITY_DATA_START_DATE_SUCCESS, 0)) {
// the third byte (0x01 on success) = ?
// the 4th - 7th bytes epresent the number of bytes/packets to expect, excluding the counter bytes
//int expectedDataLength = BLETypeConversions.toUint32(Arrays.copyOfRange(value, 3, 7));
// the 4th - 7th bytes represent the number of bytes/packets to expect, excluding the counter bytes
expectedDataLength = BLETypeConversions.toUint32(Arrays.copyOfRange(value, 3, 7));
// last 8 bytes are the start date
Calendar startTimestamp = getSupport().fromTimeBytes(Arrays.copyOfRange(value, 7, value.length));
setStartTimestamp(startTimestamp);
LOG.info("Will transfer {} packets since {}", expectedDataLength, startTimestamp.getTime());
GB.updateTransferNotification(getContext().getString(R.string.busy_task_fetch_activity_data),
getContext().getString(R.string.FetchActivityOperation_about_to_transfer_since,
DateFormat.getDateTimeInstance().format(startTimestamp.getTime())), true, 0, getContext());
} else {
LOG.warn("Unexpected activity metadata: " + Logging.formatBytes(value));
LOG.warn("Unexpected activity metadata: {}", Logging.formatBytes(value));
handleActivityFetchFinish(false);
}
} else if (value.length == 3) {
if (Arrays.equals(HuamiService.RESPONSE_FINISH_SUCCESS, value)) {
} else if (ArrayUtils.startsWith(value, HuamiService.RESPONSE_FINISH_SUCCESS)) {
if (value.length == 3) {
// older Huami devices, just finish
handleActivityFetchFinish(true);
} else if (value.length == 7 && getSupport() instanceof Huami2021Support) {
// TODO: What do the extra 4 bytes mean?
try {
// not sure why we need to send this (it's acknowledging the data?) but it will get stuck otherwise
final TransactionBuilder builder = performInitialized(getName() + " end");
builder.write(characteristicFetch, new byte[]{HuamiService.COMMAND_ACK_ACTIVITY_DATA, 0x09});
builder.queue(getQueue());
} catch (final IOException e) {
LOG.error("Ending failed", e);
handleActivityFetchFinish(false);
return;
}
handleActivityFetchFinish(true);
} else {
LOG.warn("Unexpected activity metadata: " + Logging.formatBytes(value));
LOG.warn("Unexpected activity metadata finish success: {}", Logging.formatBytes(value));
handleActivityFetchFinish(false);
}
} else if (Arrays.equals(HuamiService.RESPONSE_ACK_SUCCESS, value) && getSupport() instanceof Huami2021Support) {
// ignore, this is just the reply to the COMMAND_ACK_ACTIVITY_DATA
LOG.info("Got reply to COMMAND_ACK_ACTIVITY_DATA");
} else {
LOG.warn("Unexpected activity metadata: " + Logging.formatBytes(value));
LOG.warn("Unexpected activity metadata: {}", Logging.formatBytes(value));
handleActivityFetchFinish(false);
}
}

105
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/FetchActivityOperation.java
View File

@ -24,24 +24,29 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
import java.util.GregorianCalendar;
import java.util.List;
import java.util.Locale;
import nodomain.freeyourgadget.gadgetbridge.GBApplication;
import nodomain.freeyourgadget.gadgetbridge.database.DBHandler;
import nodomain.freeyourgadget.gadgetbridge.database.DBHelper;
import nodomain.freeyourgadget.gadgetbridge.devices.DeviceCoordinator;
import nodomain.freeyourgadget.gadgetbridge.devices.SampleProvider;
import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiService;
import nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandSampleProvider;
import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
import nodomain.freeyourgadget.gadgetbridge.entities.Device;
import nodomain.freeyourgadget.gadgetbridge.entities.HuamiExtendedActivitySample;
import nodomain.freeyourgadget.gadgetbridge.entities.MiBandActivitySample;
import nodomain.freeyourgadget.gadgetbridge.entities.User;
import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder;
import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.HuamiSupport;
import nodomain.freeyourgadget.gadgetbridge.util.DateTimeUtils;
import nodomain.freeyourgadget.gadgetbridge.util.DeviceHelper;
import nodomain.freeyourgadget.gadgetbridge.util.GB;
import nodomain.freeyourgadget.gadgetbridge.util.StringUtils;
@ -69,20 +74,20 @@ public class FetchActivityOperation extends AbstractFetchOperation {
@Override
protected void startFetching(TransactionBuilder builder) {
final String taskName = StringUtils.ensureNotNull(builder.getTaskName());
GregorianCalendar sinceWhen = getLastSuccessfulSyncTime();
startFetching(builder, HuamiService.COMMAND_ACTIVITY_DATA_TYPE_ACTIVTY, sinceWhen);
}
protected void handleActivityFetchFinish(boolean success) {
LOG.info(getName() + " has finished round " + fetchCount);
LOG.info("{} has finished round {}", getName(), fetchCount);
GregorianCalendar lastSyncTimestamp = saveSamples();
if (lastSyncTimestamp != null && needsAnotherFetch(lastSyncTimestamp)) {
try {
startFetching();
return;
} catch (IOException ex) {
LOG.error("Error starting another round of " + getName(), ex);
LOG.error("Error starting another round of {}", getName(), ex);
}
}
@ -101,19 +106,27 @@ public class FetchActivityOperation extends AbstractFetchOperation {
return false;
}
if (lastSyncTimestamp.getTimeInMillis() > System.currentTimeMillis()) {
LOG.warn("Not doing another fetch since last synced timestamp is in the future: " + DateTimeUtils.formatDateTime(lastSyncTimestamp.getTime()));
LOG.warn("Not doing another fetch since last synced timestamp is in the future: {}", DateTimeUtils.formatDateTime(lastSyncTimestamp.getTime()));
return false;
}
LOG.info("Doing another fetch since last sync timestamp is still too old: " + DateTimeUtils.formatDateTime(lastSyncTimestamp.getTime()));
LOG.info("Doing another fetch since last sync timestamp is still too old: {}", DateTimeUtils.formatDateTime(lastSyncTimestamp.getTime()));
return true;
}
private GregorianCalendar saveSamples() {
if (samples.size() > 0) {
if (samples.isEmpty()) {
LOG.info("No samples to save");
return null;
}
LOG.info("Saving {} samples", samples.size());
// save all the samples that we got
try (DBHandler handler = GBApplication.acquireDB()) {
DaoSession session = handler.getDaoSession();
SampleProvider<MiBandActivitySample> sampleProvider = new MiBandSampleProvider(getDevice(), session);
DeviceCoordinator coordinator = DeviceHelper.getInstance().getCoordinator(getDevice());
SampleProvider sampleProvider = coordinator.getSampleProvider(getDevice(), session);
Device device = DBHelper.getDevice(getDevice(), session);
User user = DBHelper.getUser(session);
@ -124,26 +137,23 @@ public class FetchActivityOperation extends AbstractFetchOperation {
sample.setTimestamp((int) (timestamp.getTimeInMillis() / 1000));
sample.setProvider(sampleProvider);
if (LOG.isDebugEnabled()) {
// LOG.debug("sample: " + sample);
}
//LOG.debug(sampleToString(sample));
timestamp.add(Calendar.MINUTE, 1);
}
sampleProvider.addGBActivitySamples(samples.toArray(new MiBandActivitySample[0]));
saveLastSyncTimestamp(timestamp);
LOG.info("Mi2 activity data: last sample timestamp: " + DateTimeUtils.formatDateTime(timestamp.getTime()));
LOG.info("Huami activity data: last sample timestamp: {}", DateTimeUtils.formatDateTime(timestamp.getTime()));
return timestamp;
} catch (Exception ex) {
GB.toast(getContext(), "Error saving activity samples", Toast.LENGTH_LONG, GB.ERROR);
LOG.error("Error saving activity samples", ex);
return null;
} finally {
samples.clear();
}
}
return null;
}
/**
* Method to handle the incoming activity data.
@ -189,21 +199,74 @@ public class FetchActivityOperation extends AbstractFetchOperation {
}
for (int i = 1; i < len; i += sampleSize) {
MiBandActivitySample sample = createSample(value[i], value[i + 1], value[i + 2], value[i + 3]); // lgtm [java/index-out-of-bounds]
final MiBandActivitySample sample;
switch (sampleSize) {
case 4:
sample = createSample(value, i);
break;
case 8:
sample = createExtendedSample(value, i);
break;
default:
throw new IllegalStateException("Unsupported sample size " + sampleSize);
}
samples.add(sample);
}
}
private MiBandActivitySample createSample(byte category, byte intensity, byte steps, byte heartrate) {
private MiBandActivitySample createSample(byte[] value, int i) {
MiBandActivitySample sample = new MiBandActivitySample();
sample.setRawKind(category & 0xff);
sample.setRawIntensity(intensity & 0xff);
sample.setSteps(steps & 0xff);
sample.setHeartRate(heartrate & 0xff);
sample.setRawKind(value[i] & 0xff);
sample.setRawIntensity(value[i + 1] & 0xff);
sample.setSteps(value[i + 2] & 0xff);
sample.setHeartRate(value[i + 3] & 0xff);
return sample;
}
private MiBandActivitySample createExtendedSample(byte[] value, int i) {
final HuamiExtendedActivitySample huamiExtendedActivitySample = new HuamiExtendedActivitySample();
huamiExtendedActivitySample.setRawKind(value[i] & 0xff);
huamiExtendedActivitySample.setRawIntensity(value[i + 1] & 0xff);
huamiExtendedActivitySample.setSteps(value[i + 2] & 0xff);
huamiExtendedActivitySample.setHeartRate(value[i + 3] & 0xff);
huamiExtendedActivitySample.setUnknown1(value[i + 4] & 0xff);
huamiExtendedActivitySample.setSleep(value[i + 5] & 0xff);
huamiExtendedActivitySample.setDeepSleep(value[i + 6] & 0xff);
huamiExtendedActivitySample.setRemSleep(value[i + 7] & 0xff);
return huamiExtendedActivitySample;
}
private static final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ", Locale.ROOT);
public static String sampleToString(final MiBandActivitySample sample) {
final StringBuilder builder = new StringBuilder(160);
builder.append(sample.getClass().getSimpleName());
builder.append("{");
builder.append(sdf.format(new Date(sample.getTimestamp() * 1000L)));
builder.append(",rawKind=").append(sample.getRawKind());
builder.append(",rawIntensity=").append(sample.getRawIntensity());
builder.append(",steps=").append(sample.getSteps());
builder.append(",heartRate=").append(sample.getHeartRate());
if (sample instanceof HuamiExtendedActivitySample) {
final HuamiExtendedActivitySample huamiExtendedSample = (HuamiExtendedActivitySample) sample;
builder.append(",unknown1=").append(huamiExtendedSample.getUnknown1());
builder.append(",sleep=").append(huamiExtendedSample.getSleep());
builder.append(",deepSleep=").append(huamiExtendedSample.getDeepSleep());
builder.append(",remSleep=").append(huamiExtendedSample.getRemSleep());
}
builder.append("}");
return builder.toString();
}
@Override
protected String getLastSyncTimeKey() {
return "lastSyncTimeMillis";

6
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/UpdateFirmwareOperation2021.java
View File

@ -39,12 +39,6 @@ public class UpdateFirmwareOperation2021 extends UpdateFirmwareOperation2020 {
super(uri, support);
}
@Override
protected void enableOtherNotifications(final TransactionBuilder builder, final boolean enable) {
// Disable 2021 chunked reads, otherwise firmware upgrades get interrupted
builder.notify(getCharacteristic(HuamiService.UUID_CHARACTERISTIC_CHUNKEDTRANSFER_2021_READ), enable);
}
@Override
AbstractHuamiFirmwareInfo createFwInfo(final Uri uri, final Context context) throws IOException {
return super.createFwInfo(uri, context);