@eohjsc/react-native-smart-city 0.3.75 → 0.3.76

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@eohjsc/react-native-smart-city",
   "title": "React Native Smart Home",
-  "version": "0.3.75",
+  "version": "0.3.76",
   "description": "TODO",
   "main": "index.js",
   "files": [

package/src/hooks/IoT/useBluetoothConnection.js

@@ -1,5 +1,7 @@
-import { useContext, useCallback, useRef, useEffect } from 'react';
+import { useContext, useCallback, useRef, useEffect, useMemo } from 'react';
 import { AppState, Platform } from 'react-native';
+import { getSystemVersion } from 'react-native-device-info';
+
 import { SCContext, useSCContextSelector } from '../../context';
 import { Action } from '../../context/actionType';
 import { scanBluetoothDevices } from '../../iot/RemoteControl/Bluetooth';
@@ -8,6 +10,7 @@ import { OpenSetting } from '../../utils/Permission/common';
 import { useTranslations } from '../Common/useTranslations';
 import { SCConfig } from '../../configs';
 
+// These permissions are only for android 12
 const permissions = [
   'android.permission.BLUETOOTH_CONNECT',
   'android.permission.BLUETOOTH_SCAN',
@@ -24,11 +27,13 @@ const useBluetoothConnection = (fnCallback) => {
   const permissionsRequested = useSCContextSelector(
     (state) => state.bluetooth.permissionsRequested
   );
-  const permissionsGranted =
-    Platform.OS === 'ios'
+
+  const permissionsGranted = useMemo(() => {
+    return Platform.OS === 'ios' || parseInt(getSystemVersion(), 10) < 12
       ? true
       : // eslint-disable-next-line react-hooks/rules-of-hooks
         useSCContextSelector((state) => state.bluetooth.permissionsGranted);
+  }, []);
 
   const onDeviceFound = useCallback(async (name, device) => {
     fnCallback && fnCallback({ name, device });
@@ -38,9 +43,9 @@ const useBluetoothConnection = (fnCallback) => {
 
   const bluetoothScanDevices = useCallback(
     (addresses) => {
-      permissionsGranted && scanBluetoothDevices(addresses, onDeviceFound);
+      scanBluetoothDevices(addresses, onDeviceFound);
     },
-    [permissionsGranted, onDeviceFound]
+    [onDeviceFound]
   );
 
   useEffect(() => {

package/src/iot/RemoteControl/Bluetooth.js

@@ -1,14 +1,17 @@
 /* eslint-disable promise/prefer-await-to-callbacks */
-import { BLE } from '../../configs';
-import t from '../../hooks/Common/useTranslations';
 import base64 from 'react-native-base64';
-import { BleManager } from 'react-native-ble-plx';
+import { BleManager, ScanMode } from 'react-native-ble-plx';
 import { ToastBottomHelper } from '../../utils/Utils';
 
+import { BLE } from '../../configs';
+import t from '../../hooks/Common/useTranslations';
+
 const bluetoothDevices = {};
 const needToScanDevices = [];
 const bleManager = new BleManager();
 
+let isScanning = false;
+
 export const SEND_COMMAND_OVER_BLUETOOTH_FAIL =
   'SEND_COMMAND_OVER_BLUETOOTH_FAIL';
 
@@ -36,44 +39,52 @@ export const realScanBluetoothDevices = async (onDeviceFound) => {
   if (!needToScanDevices.length) {
     return;
   }
+  if (!isScanning) {
+    isScanning = true;
+    bleManager.startDeviceScan(
+      null,
+      { scanMode: ScanMode?.Balanced },
+      (error, device) => {
+        if (error) {
+          return;
+        }
 
-  bleManager.startDeviceScan(null, null, (error, device) => {
-    if (error) {
-      return;
-    }
-
-    let name = null;
-    if (
-      needToScanDevices.includes(device.name) &&
-      !bluetoothDevices[device.name]
-    ) {
-      name = device.name;
-    } else if (
-      needToScanDevices.includes(device.localName) &&
-      !bluetoothDevices[device.localName]
-    ) {
-      name = device.localName;
-    } else {
-      return;
-    }
+        let name = null;
+        if (
+          needToScanDevices.includes(device.name) &&
+          !bluetoothDevices[device.name]
+        ) {
+          name = device.name;
+        } else if (
+          needToScanDevices.includes(device.localName) &&
+          !bluetoothDevices[device.localName]
+        ) {
+          name = device.localName;
+        } else {
+          return;
+        }
 
-    const index = needToScanDevices.indexOf(name);
-    needToScanDevices.splice(index, 1);
+        const index = needToScanDevices.indexOf(name);
+        needToScanDevices.splice(index, 1);
 
-    bluetoothDevices[name] = device;
-    onDeviceFound && onDeviceFound(name, device);
+        bluetoothDevices[name] = device;
+        onDeviceFound && onDeviceFound(name, device);
 
-    if (!needToScanDevices.length) {
-      try {
-        bleManager.stopDeviceScan();
-        // eslint-disable-next-line no-empty
-      } catch {}
-    }
-  });
+        if (!needToScanDevices.length) {
+          try {
+            bleManager.stopDeviceScan();
+            isScanning = false;
+            // eslint-disable-next-line no-empty
+          } catch {}
+        }
+      }
+    );
+  }
 
   const to = setTimeout(() => {
     try {
       bleManager.stopDeviceScan();
+      isScanning = false;
       clearTimeout(to);
       // eslint-disable-next-line no-empty
     } catch {}

package/src/iot/RemoteControl/__test__/Bluetooth.test.js

@@ -25,6 +25,36 @@ describe('Test IOT Bluetooth', () => {
     clearNeedToScanDevices();
   });
 
+  it('Send command over bluetooth via device success', async () => {
+    const device = {
+      name: '1234567',
+      cancelConnection: jest.fn(),
+      connect: async () => ({
+        discoverAllServicesAndCharacteristics: async () => ({
+          writeCharacteristicWithResponseForService: async () => ({}),
+          monitorCharacteristicForService: async () => ({}),
+        }),
+      }),
+    };
+    bleManager.startDeviceScan.mockImplementation(
+      (uuids, options, listener) => {
+        listener(null, device);
+      }
+    );
+    await scanBluetoothDevices([device.name], mockOnDeviceFound);
+
+    await sendCommandOverBluetooth(
+      {
+        remote_control_options: {
+          bluetooth: {
+            address: device.name,
+          },
+        },
+      },
+      {}
+    );
+  });
+
   test('Scan bluetooth device will init hardware scan', async () => {
     await scanBluetoothDevices(['123456'], mockOnDeviceFound);
     expect(bleManager.startDeviceScan).toBeCalled();
@@ -107,7 +137,7 @@ describe('Test IOT Bluetooth', () => {
       }
     );
     await scanBluetoothDevices([device.name], mockOnDeviceFound);
-    expect(bleManager.stopDeviceScan).toBeCalled();
+    expect(bleManager.stopDeviceScan).not.toBeCalled();
   });
 
   it('Scan same device again will not trigger hardware scan', async () => {
@@ -120,7 +150,7 @@ describe('Test IOT Bluetooth', () => {
       }
     );
     await scanBluetoothDevices([device.name], mockOnDeviceFound);
-    expect(bleManager.startDeviceScan).toBeCalled();
+    expect(bleManager.startDeviceScan).not.toBeCalled();
 
     bleManager.startDeviceScan.mockClear();
 
@@ -169,37 +199,7 @@ describe('Test IOT Bluetooth', () => {
           },
         },
       },
-      "Cannot read properties of null (reading 'cancelConnection')"
-    );
-  });
-
-  it('Send command over bluetooth via device success', async () => {
-    const device = {
-      name: '1234567',
-      cancelConnection: jest.fn(),
-      connect: async () => ({
-        discoverAllServicesAndCharacteristics: async () => ({
-          writeCharacteristicWithResponseForService: async () => ({}),
-          monitorCharacteristicForService: async () => ({}),
-        }),
-      }),
-    };
-    bleManager.startDeviceScan.mockImplementation(
-      (uuids, options, listener) => {
-        listener(null, device);
-      }
-    );
-    await scanBluetoothDevices([device.name], mockOnDeviceFound);
-
-    await sendCommandOverBluetooth(
-      {
-        remote_control_options: {
-          bluetooth: {
-            address: device.name,
-          },
-        },
-      },
-      {}
+      undefined
     );
   });
 });

package/src/screens/AddNewGateway/SelectDeviceSubUnit.js

@@ -26,7 +26,7 @@ const SelectDeviceSubUnit = ({ route }) => {
           });
           break;
         case DEVICE_TYPE.ZIGBEE:
-          navigation.navigate(Routes.ConnectRouterGuide, {
+          navigation.navigate(Routes.SelectZigbeeGateway, {
             unit,
             subUnit: chosenSubUnit,
           });