mirror/openscale
1
0
Fork 0
mirror of https://github.com/oliexdev/openScale.git synced 2025-09-03 13:23:24 +02:00
Code Issues Releases Wiki Activity

BluetoothStandardWeightProfile: Refactor onBluetoothNotify(): move handling of User Control Point to separate function;

Browse Source
This commit is contained in:
Krisjans Blukis
2021-07-27 15:06:16 +03:00
parent d38f4cf3d2
commit 626b05bae9
1 changed files with 38 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothStandardWeightProfile.java
View File

@@ -224,45 +224,49 @@ public class BluetoothStandardWeightProfile extends BluetoothCommunication {
Timber.d(String.format("Received modelnumber: %s", modelNumber));
}
else if(characteristic.equals(BluetoothGattUuid.CHARACTERISTIC_USER_CONTROL_POINT)) {
if(value[0]==UDS_CP_RESPONSE) {
switch (value[1]) {
case UDS_CP_REGISTER_NEW_USER:
if (value[2] == UDS_CP_RESP_VALUE_SUCCESS) {
int userIndex = value[3];
int userId = this.selectedUser.getId();
Timber.d(String.format("Created user with ID %d and Index %d", userId, userIndex));
storeUserScaleIndex(userId, userIndex);
resumeMachineState();
} else {
Timber.e("ERROR: could not register new user");
}
break;
case UDS_CP_CONSENT:
if (registerNewUser) {
resumeMachineState();
break;
}
if (value[2] == UDS_CP_RESP_VALUE_SUCCESS) {
Timber.d("Success user consent");
resumeMachineState();
} else if (value[2] == UDS_CP_RESP_USER_NOT_AUTHORIZED) {
Timber.e("Not authorized");
enterScaleUserConsentUi(this.selectedUser.getId(), getUserScaleIndex(this.selectedUser.getId()));
}
else {
Timber.e("UDS_CP_CONSENT: unhandled, code: " + value[2]);
}
break;
default:
Timber.e("Unhandled response");
break;
}
}
handleUserControlPointNotify(value);
} else {
Timber.d(String.format("Got data: <%s>", byteInHex(value)));
}
}
protected void handleUserControlPointNotify(byte[] value) {
if(value[0]==UDS_CP_RESPONSE) {
switch (value[1]) {
case UDS_CP_REGISTER_NEW_USER:
if (value[2] == UDS_CP_RESP_VALUE_SUCCESS) {
int userIndex = value[3];
int userId = this.selectedUser.getId();
Timber.d(String.format("Created user with ID %d and Index %d", userId, userIndex));
storeUserScaleIndex(userId, userIndex);
resumeMachineState();
} else {
Timber.e("ERROR: could not register new user");
}
break;
case UDS_CP_CONSENT:
if (registerNewUser) {
resumeMachineState();
break;
}
if (value[2] == UDS_CP_RESP_VALUE_SUCCESS) {
Timber.d("Success user consent");
resumeMachineState();
} else if (value[2] == UDS_CP_RESP_USER_NOT_AUTHORIZED) {
Timber.e("Not authorized");
enterScaleUserConsentUi(this.selectedUser.getId(), getUserScaleIndex(this.selectedUser.getId()));
}
else {
Timber.e("UDS_CP_CONSENT: unhandled, code: " + value[2]);
}
break;
default:
Timber.e("Unhandled response");
break;
}
}
}
protected ScaleMeasurement weightMeasurementToScaleMeasurement(byte[] value) {
BluetoothBytesParser parser = new BluetoothBytesParser(value);
final int flags = parser.getIntValue(BluetoothBytesParser.FORMAT_UINT8);