Fix Uineye lasers 2023

platypii · Jun 19, 2023 · f8b23e7 · f8b23e7
1 parent c2bf6fa
commit f8b23e7
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 22 deletions.
diff --git a/app/src/main/java/com/platypii/baseline/lasers/rangefinder/RangefinderService.java b/app/src/main/java/com/platypii/baseline/lasers/rangefinder/RangefinderService.java
@@ -1,6 +1,7 @@
 package com.platypii.baseline.lasers.rangefinder;
 
 import com.platypii.baseline.Intents;
+import com.platypii.baseline.bluetooth.BleProtocol;
 import com.platypii.baseline.bluetooth.BleService;
 import com.platypii.baseline.bluetooth.BluetoothState;
 import com.platypii.baseline.util.Exceptions;
@@ -25,6 +26,12 @@ public class RangefinderService {
     private BluetoothAdapter bluetoothAdapter;
     @Nullable
     private BleService bluetoothHandler;
+    @NonNull
+    private final BleProtocol protocols[] = {
+            new ATNProtocol(),
+            new SigSauerProtocol(),
+            new UineyeProtocol()
+    };
 
     public void start(@NonNull Activity activity) {
         if (BluetoothState.started(getState())) {
@@ -35,7 +42,7 @@ public void start(@NonNull Activity activity) {
         bluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
         if (bluetoothAdapter != null) {
             if (bluetoothAdapter.isEnabled()) {
-                bluetoothHandler = new BleService();
+                bluetoothHandler = new BleService(protocols);
                 bluetoothHandler.start(activity);
             } else {
                 // Turn on bluetooth
@@ -55,11 +62,7 @@ public void bluetoothStarted(@NonNull Activity activity) {
         Log.i(TAG, "Bluetooth started late");
         if (bluetoothAdapter != null && bluetoothAdapter.isEnabled()) {
             if (bluetoothHandler == null) {
-                bluetoothHandler = new BleService(
-                        new UineyeProtocol(),
-                        new ATNProtocol(),
-                        new SigSauerProtocol()
-                );
+                bluetoothHandler = new BleService(protocols);
                 bluetoothHandler.start(activity);
             }
         } else {

diff --git a/app/src/main/java/com/platypii/baseline/lasers/rangefinder/UineyeProtocol.java b/app/src/main/java/com/platypii/baseline/lasers/rangefinder/UineyeProtocol.java
@@ -3,17 +3,17 @@
 import com.platypii.baseline.bluetooth.BleProtocol;
 import com.platypii.baseline.lasers.LaserMeasurement;
 import com.platypii.baseline.util.Exceptions;
-import com.platypii.baseline.views.laser.LaserActivity;
 
 import android.bluetooth.le.ScanRecord;
-import android.os.Bundle;
+import android.os.ParcelUuid;
 import android.util.Log;
 import android.util.SparseArray;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import com.welie.blessed.BluetoothPeripheral;
 import com.welie.blessed.WriteType;
 import java.util.Arrays;
+import java.util.List;
 import java.util.UUID;
 import org.greenrobot.eventbus.EventBus;
 
@@ -36,6 +36,12 @@ class UineyeProtocol extends BleProtocol {
     private static final int manufacturerId3 = 42841;
     private static final byte[] manufacturerData3 = {-120, -96, -54, -42, 67, 72, -111, 32};
 
+    private static final int manufacturerId4 = 42841;
+    private static final byte[] manufacturerData4 = {-120, -96, 63, -117, 103, 69, 35, 1};
+
+    private static final int manufacturerId5 = 42841;
+    private static final byte[] manufacturerData5 = {-120, -96, -25, -118, 103, 69, 35, 1};
+
     // Rangefinder service
     private static final UUID rangefinderService = UUID.fromString("0000ffe0-0000-1000-8000-00805f9b34fb");
     // Rangefinder characteristic
@@ -148,24 +154,45 @@ public boolean canParse(@NonNull BluetoothPeripheral peripheral, @Nullable ScanR
             return true; // Manufacturer match (hartman's laser)
         } else if (record != null && Arrays.equals(record.getManufacturerSpecificData(manufacturerId3), manufacturerData3)) {
             return true; // Manufacturer match 2022 version
-        } else if (deviceName.endsWith("BT05") || deviceName.startsWith("Rangefinder") || deviceName.startsWith("Uineye")) {
-            // Device name match
-            if (record != null) {
-                // Send manufacturer data to firebase
-                final Bundle bundle = new Bundle();
-                bundle.putString("rf_device_name", deviceName);
-                final SparseArray<byte[]> mfg = record.getManufacturerSpecificData();
-                for (int i = 0; i < mfg.size(); i++) {
-                    final String key = "mfg_" + mfg.keyAt(i);
-                    final String hex = byteArrayToHex(mfg.valueAt(i));
-                    bundle.putString(key, hex);
-                }
-                LaserActivity.firebaseAnalytics.logEvent("manufacturer_data", bundle);
-            }
+        } else if (record != null && Arrays.equals(record.getManufacturerSpecificData(manufacturerId4), manufacturerData4)) {
+            return true; // Manufacturer match 2023 version
+        } else if (record != null && Arrays.equals(record.getManufacturerSpecificData(manufacturerId5), manufacturerData5)) {
+            return true; // Manufacturer match 2023 version
+        } else if (
+                (record != null && hasRangefinderService(record))
+                        || deviceName.endsWith("BT05")
+                        || deviceName.startsWith("Rangefinder")
+                        || deviceName.startsWith("Uineye")) {
+            // Send manufacturer data to firebase
+            final String mfg = toManufacturerString(record);
+            Exceptions.report(new Exception("Uineye laser unknown mfg data: " + deviceName + " " + mfg));
             return true;
         } else {
             return false;
         }
     }
 
+    private boolean hasRangefinderService(@NonNull ScanRecord record) {
+        final List<ParcelUuid> uuids = record.getServiceUuids();
+        return uuids != null && uuids.contains(new ParcelUuid(rangefinderService));
+    }
+
+    private String toManufacturerString(@Nullable ScanRecord record) {
+        if (record != null) {
+            final StringBuilder sb = new StringBuilder();
+            final SparseArray<byte[]> mfg = record.getManufacturerSpecificData();
+            for (int i = 0; i < mfg.size(); i++) {
+                final String key = mfg.keyAt(i);
+                final String hex = byteArrayToHex(mfg.valueAt(i));
+                sb.append(key);
+                sb.append('=');
+                sb.append(hex);
+                sb.append(';');
+            }
+            return sb.toString();
+        } else {
+            return null;
+        }
+    }
+
 }