update code for Exingtech Y1 scale

wolkenschieber · Dec 3, 2017 · c9a8c1a · c9a8c1a
1 parent 6762166
commit c9a8c1a
Showing 1 changed file with 22 additions and 25 deletions.
diff --git a/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothExingtechY1.java b/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothExingtechY1.java
@@ -31,9 +31,8 @@
 
 public class BluetoothExingtechY1 extends BluetoothCommunication {
     private final UUID WEIGHT_MEASUREMENT_SERVICE = UUID.fromString("f433bd80-75b8-11e2-97d9-0002a5d5c51b");
-    private final UUID WEIGHT_MEASUREMENT_CHARACTERISTIC = UUID.fromString("1A2EA400-75B9-11E2-BE05-0002A5D5C51B"); // read, notify
-    private final UUID WEIGHT_CUSTOM0_CHARACTERISTIC = UUID.fromString("23B4FEC0-75B9-11E2-972A-0002A5D5C51B"); // read, notify
-    private final UUID CMD_MEASUREMENT_CHARACTERISTIC = UUID.fromString("29F11080-75B9-11E2-8BF6-0002A5D5C51B"); // write only
+    private final UUID WEIGHT_MEASUREMENT_CHARACTERISTIC = UUID.fromString("1a2ea400-75b9-11e2-be05-0002a5d5c51b"); // read, notify
+    private final UUID CMD_MEASUREMENT_CHARACTERISTIC = UUID.fromString("29f11080-75b9-11e2-8bf6-0002a5d5c51b"); // write only
     private final UUID WEIGHT_MEASUREMENT_CONFIG = UUID.fromString("00002902-0000-1000-8000-00805f9b34fb");
 
     public BluetoothExingtechY1(Context context) {
@@ -57,22 +56,7 @@ boolean nextInitCmd(int stateNr) {
                 setNotificationOn(WEIGHT_MEASUREMENT_SERVICE, WEIGHT_MEASUREMENT_CHARACTERISTIC, WEIGHT_MEASUREMENT_CONFIG);
                 break;
             case 1:
-                setNotificationOn(WEIGHT_MEASUREMENT_SERVICE, WEIGHT_CUSTOM0_CHARACTERISTIC, WEIGHT_MEASUREMENT_CONFIG);
-                break;
-            case 2:
-                final ScaleUser selectedUser = OpenScale.getInstance(context).getSelectedScaleUser();
-
-                byte gender = selectedUser.isMale() ? (byte)0x00 : (byte)0x01; // 00 - male; 01 - female
-                byte height = (byte)(selectedUser.body_height & 0xff); // cm
-                byte age = (byte)(selectedUser.getAge(new Date()) & 0xff);
-
-                SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-                int userId = prefs.getInt("selectedUserId", -1);
-
-                byte cmdByte[] = {(byte)0x10, (byte)userId, gender, age, height};
-
-                writeBytes(WEIGHT_MEASUREMENT_SERVICE, CMD_MEASUREMENT_CHARACTERISTIC, cmdByte);
-
+                sendUserData();
                 break;
             default:
                 return false;
@@ -96,27 +80,25 @@ public void onBluetoothDataChange(BluetoothGatt bluetoothGatt, BluetoothGattChar
         final byte[] data = gattCharacteristic.getValue();
 
         if (data != null && data.length > 0) {
-
             // if data is body scale type
-            if (data.length == 19) {
+            if (data.length == 20) {
                 parseBytes(data);
             }
         }
     }
 
     private void parseBytes(byte[] weightBytes) {
-        int scaleType = (int)(weightBytes[0] & 0xF0) >> 4; // 0x00 fat scale; 0x01 weight scale format
         int userId = (int)(weightBytes[0] & 0x0F);
         int gender = (int)(weightBytes[1]); // 0x00 male; 0x01 female
         int age = (int)(weightBytes[2]); // 10 ~ 99
         int height = (int)(weightBytes[3]); // 0 ~ 255
         float weight = (float) (((weightBytes[4] & 0xFF) << 8) | (weightBytes[5] & 0xFF)) / 10.0f; // kg
         float fat = (float)(((weightBytes[6] & 0xFF) << 8) | (weightBytes[7] & 0xFF)) / 10.0f; // %
         float water = (float)(((weightBytes[8] & 0xFF) << 8) | (weightBytes[9] & 0xFF)) / 10.0f; // %
-        float bone = (float)(((weightBytes[10] & 0xFF) << 8) | (weightBytes[11] & 0xFF)) / 10.0f; // kg
+        float bone = (float)(((weightBytes[10] & 0xFF) << 8) | (weightBytes[11] & 0xFF)) / weight * 10.0f; // kg
         float muscle = (float)(((weightBytes[12] & 0xFF) << 8) | (weightBytes[13] & 0xFF)) / 10.0f; // %
-        float visc_muscle = (float)(weightBytes[14] & 0xFF) / 10.0f; // %
-        float calorie = (float)(((weightBytes[15] & 0xFF) << 8) | (weightBytes[16] & 0xFF)) / 10.0f;
+        float visc_muscle = (float)(weightBytes[14] & 0xFF); // %
+        float calorie = (float)(((weightBytes[15] & 0xFF) << 8) | (weightBytes[16] & 0xFF));
         float bmi = (float)(((weightBytes[17] & 0xFF) << 8) | (weightBytes[18] & 0xFF)) / 10.0f;
 
         ScaleData scaleBtData = new ScaleData();
@@ -132,4 +114,19 @@ private void parseBytes(byte[] weightBytes) {
 
         addScaleData(scaleBtData);
     }
+
+    private void sendUserData() {
+        final ScaleUser selectedUser = OpenScale.getInstance(context).getSelectedScaleUser();
+
+        byte gender = selectedUser.isMale() ? (byte)0x00 : (byte)0x01; // 00 - male; 01 - female
+        byte height = (byte)(selectedUser.body_height & 0xff); // cm
+        byte age = (byte)(selectedUser.getAge(new Date()) & 0xff);
+
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+        int userId = prefs.getInt("selectedUserId", -1);
+
+        byte cmdByte[] = {(byte)0x10, (byte)userId, gender, age, height};
+
+        writeBytes(WEIGHT_MEASUREMENT_SERVICE, CMD_MEASUREMENT_CHARACTERISTIC, cmdByte);
+    }
 }