From 6abfc41bddb5d3786503be87c6c3a7ee2bc29a25 Mon Sep 17 00:00:00 2001 From: Krisjans Blukis Date: Thu, 29 Jul 2021 14:22:54 +0300 Subject: [PATCH] BluetoothFactory: treat BF950 like SBF77; --- .../health/openscale/core/bluetooth/BluetoothFactory.java | 6 +++--- .../health/openscale/core/bluetooth/BluetoothSwpSBF77.java | 6 ++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothFactory.java b/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothFactory.java index 528eef83..df55a182 100644 --- a/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothFactory.java +++ b/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothFactory.java @@ -125,11 +125,11 @@ public class BluetoothFactory { if (deviceName.equals("BF105")) { return new BluetoothBeurerBF105(context); } - if (deviceName.equals("BF600") || deviceName.equals("BF850") || deviceName.equals("BF950")) { + if (deviceName.equals("BF600") || deviceName.equals("BF850")) { return new BluetoothBeurerBF600(context, deviceName); } - if (deviceName.equals("SBF77")) { - return new BluetoothSwpSBF77(context); + if (deviceName.equals("SBF77") || deviceName.equals("BF950")) { + return new BluetoothSwpSBF77(context, deviceName); } return null; } diff --git a/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothSwpSBF77.java b/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothSwpSBF77.java index 1b2bb995..69c4bff5 100644 --- a/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothSwpSBF77.java +++ b/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothSwpSBF77.java @@ -48,16 +48,18 @@ public class BluetoothSwpSBF77 extends BluetoothStandardWeightProfile { ScaleMeasurement scaleMeasurement; private Vector scaleUserList; static final int SBF77_MAX_USERS = 8; + String deviceName; - public BluetoothSwpSBF77(Context context) { + public BluetoothSwpSBF77(Context context, String name) { super(context); scaleMeasurement = new ScaleMeasurement(); scaleUserList = new Vector(); + deviceName = name; } @Override public String driverName() { - return "SBF77"; + return deviceName; } @Override