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

Update LogManager warning message and set BT_STATUS on disconnect

Browse Source
This commit is contained in:
oliexdev
2025-08-20 11:39:08 +02:00
parent 5d8d8165fc
commit 561b8e886a
1 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
android_app/app/src/main/java/com/health/openscale/core/bluetooth/scalesJava/BluetoothCommunication.java
View File

@@ -135,7 +135,7 @@ public abstract class BluetoothCommunication {
protected int getUniqueNumber() { protected int getUniqueNumber() {
if (uniqueBase == -1) { if (uniqueBase == -1) {
LogManager.w(TAG, "(Unique number base not set! Call setUniqueNumber() first.", null); LogManager.w(TAG, "Unique number base not set! Call setUniqueNumber() first.", null);
uniqueBase = 99; uniqueBase = 99;
} }
int userId = getSelectedScaleUser().getId(); int userId = getSelectedScaleUser().getId();
@@ -588,6 +588,7 @@ public abstract class BluetoothCommunication {
@Override @Override
public void onDisconnectedPeripheral(final BluetoothPeripheral peripheral, HciStatus status) { public void onDisconnectedPeripheral(final BluetoothPeripheral peripheral, HciStatus status) {
LogManager.d("BluetoothCommunication",String.format("disconnected '%s' with status %d", peripheral.getName(), status.value)); LogManager.d("BluetoothCommunication",String.format("disconnected '%s' with status %d", peripheral.getName(), status.value));
setBluetoothStatus(BT_STATUS.CONNECTION_DISCONNECT);
} }
@Override @Override
@@ -625,11 +626,22 @@ public abstract class BluetoothCommunication {
} }
// Pre-scan improves connect reliability on some devices/scales // Pre-scan improves connect reliability on some devices/scales
// Running an LE scan during connect improves connectivity on some phones
// (e.g. Sony Xperia Z5 compact, Android 7.1.1). For some scales (e.g. Medisana BS444)
// it seems to be a requirement that the scale is discovered before connecting to it.
// Otherwise the connection almost never succeeds.
if (canScan) { if (canScan) {
LogManager.d("BluetoothCommunication", LogManager.d("BluetoothCommunication",
"API≥31: Do LE scan before connecting (no location needed)"); "API≥31: Do LE scan before connecting (no location needed)");
central.scanForPeripheralsWithAddresses(new String[]{macAddress}); central.scanForPeripheralsWithAddresses(new String[]{macAddress});
stopMachineState(); // wait for onDiscoveredPeripheral → connect new Handler(Looper.getMainLooper()).postDelayed(() -> { // wait for onDiscoveredPeripheral → connect
if (btPeripheral == null || btPeripheral.getState() == ConnectionState.DISCONNECTED) {
try { central.stopScan(); } catch (Exception ignore) {}
setBluetoothStatus(BT_STATUS.NO_DEVICE_FOUND);
sendMessage(R.string.info_bluetooth_connection_error_scale_offline, 0);
resumeMachineState();
}
}, 10_000);
return; return;
} else { } else {
LogManager.w("BluetoothCommunication", LogManager.w("BluetoothCommunication",
@@ -652,17 +664,10 @@ public abstract class BluetoothCommunication {
private void connectToDevice(BluetoothPeripheral peripheral) { private void connectToDevice(BluetoothPeripheral peripheral) {
new Handler(Looper.getMainLooper()).postDelayed(() -> {
Handler handler = new Handler();
handler.postDelayed(new Runnable() {
@Override
public void run() {
LogManager.d("BluetoothCommunication","Try to connect to BLE device " + peripheral.getAddress()); LogManager.d("BluetoothCommunication","Try to connect to BLE device " + peripheral.getAddress());
stepNr = 0; stepNr = 0;
central.connectPeripheral(peripheral, peripheralCallback); central.connectPeripheral(peripheral, peripheralCallback);
}
}, 1000); }, 1000);
} }