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

Zepp OS: Set region on user info

Browse Source 
This affects available features (eg. Alexa). Defaults to the previous
value of "unknown" for now, and no UI. Alexa requires a region where it
is available, such as Germany ("de").
This commit is contained in:
José Rebelo 2023-04-30 17:03:05 +01:00
parent 6c0a276441
commit 483ef27a4f
4 changed files with 37 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -45,6 +45,7 @@ public class DeviceSettingsPreferenceConst {
public static final String PREF_LANGUAGE = "language";
public static final String PREF_LANGUAGE_AUTO = "auto";
public static final String PREF_DEVICE_REGION = "device_region";
public static final String PREF_DATEFORMAT = "dateformat";
public static final String PREF_TIMEFORMAT = "timeformat";
public static final String PREF_TIMEFORMAT_24H = "24h";

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

@ -256,4 +256,11 @@ public class Huami2021Service {
*/
public static final byte WEATHER_CMD_SET_DEFAULT_LOCATION = 0x09;
public static final byte WEATHER_CMD_DEFAULT_LOCATION_ACK = 0x0a;
/**
* User Info, for {@link Huami2021Service#CHUNKED2021_ENDPOINT_USER_INFO}.
*/
public static final byte USER_INFO_CMD_SET = 0x01;
public static final byte USER_INFO_CMD_SET_ACK = 0x02;
}

13
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/BLETypeConversions.java
View File

@ -212,6 +212,19 @@ public class BLETypeConversions {
};
}
public static byte[] fromUint64(long value) {
return new byte[] {
(byte) (value & 0xff),
(byte) ((value >> 8) & 0xff),
(byte) ((value >> 16) & 0xff),
(byte) ((value >> 24) & 0xff),
(byte) ((value >> 32) & 0xff),
(byte) ((value >> 40) & 0xff),
(byte) ((value >> 48) & 0xff),
(byte) ((value >> 56) & 0xff),
};
}
public static byte fromUint8(int value) {
return (byte) (value & 0xff);
}

22
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/Huami2021Support.java
View File

@ -517,6 +517,8 @@ public abstract class Huami2021Support extends HuamiSupport {
LOG.info("Attempting to set user info...");
final Prefs prefs = GBApplication.getPrefs();
final Prefs devicePrefs = getDevicePrefs();
final String alias = prefs.getString(PREF_USER_NAME, null);
final ActivityUser activityUser = new ActivityUser();
final int height = activityUser.getHeightCm();
@ -524,6 +526,7 @@ public abstract class Huami2021Support extends HuamiSupport {
final int birthYear = activityUser.getYearOfBirth();
final byte birthMonth = 7; // not in user attributes
final byte birthDay = 1; // not in user attributes
final String region = devicePrefs.getString(DeviceSettingsPreferenceConst.PREF_DEVICE_REGION, "unknown");
if (alias == null || weight == 0 || height == 0 || birthYear == 0) {
LOG.warn("Unable to set user info, make sure it is set up");
@ -543,16 +546,18 @@ public abstract class Huami2021Support extends HuamiSupport {
final ByteArrayOutputStream baos = new ByteArrayOutputStream();
try {
baos.write(new byte[]{0x01, 0x4f, 0x07, 0x00, 0x00});
baos.write(USER_INFO_CMD_SET);
baos.write(new byte[]{0x4f, 0x07, 0x00, 0x00});
baos.write(fromUint16(birthYear));
baos.write(birthMonth);
baos.write(birthDay);
baos.write(genderByte);
baos.write((byte) height);
baos.write((byte) 0); // TODO ?
baos.write(fromUint16(height));
baos.write(fromUint16(weight * 200));
baos.write(BLETypeConversions.fromUint32(userid));
baos.write(new byte[]{0x00, 0x00, 0x00, 0x00, 0x75, 0x6e, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x00, 0x09}); // TODO ?
baos.write(BLETypeConversions.fromUint64(userid));
baos.write(region.getBytes(StandardCharsets.UTF_8));
baos.write(0);
baos.write(0x09); // TODO ?
baos.write(alias.getBytes(StandardCharsets.UTF_8));
baos.write((byte) 0);
@ -2501,7 +2506,12 @@ public abstract class Huami2021Support extends HuamiSupport {
}
protected void handle2021UserInfo(final byte[] payload) {
// TODO handle2021UserInfo
switch (payload[0]) {
case USER_INFO_CMD_SET_ACK:
LOG.info("Got user info set ack, status = {}", payload[1]);
return;
}
LOG.warn("Unexpected user info payload byte {}", String.format("0x%02x", payload[0]));
}