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

package/package.json

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

package/src/hooks/IoT/__test__/useRemoteControl.test.js

@@ -109,7 +109,7 @@ describe('Test useRemoteControl', () => {
       data,
       'bluetooth'
     );
-    expect(sendCommandOverInternet).toBeCalledTimes(1);
+    expect(sendCommandOverInternet).toBeCalledTimes(6);
     expect(sendCommandOverHomeAssistant).not.toBeCalled();
   });
 
@@ -176,7 +176,7 @@ describe('Test useRemoteControl', () => {
       data,
       userId
     );
-    expect(sendCommandOverInternet).not.toBeCalled();
+    expect(sendCommandOverInternet).toBeCalled();
     expect(sendCommandOverHomeAssistant).not.toBeCalled();
   });
 

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/hooks/IoT/useRemoteControl.js

@@ -1,3 +1,4 @@
+/* eslint-disable promise/prefer-await-to-callbacks */
 import { useCallback } from 'react';
 import { useSCContextSelector } from '../../context';
 import { sendCommandOverHomeAssistant } from '../../iot/RemoteControl/HomeAssistant';
@@ -10,6 +11,15 @@ import { ToastBottomHelper } from '../../utils/Utils';
 import { t } from 'i18n-js';
 import NetInfo from '@react-native-community/netinfo';
 
+let count = 0;
+
+const onRetry = (callback) => {
+  const to = setTimeout(() => {
+    callback;
+    clearTimeout(to);
+  }, 200);
+};
+
 const useRemoteControl = () => {
   const homeAssistantConnections = useSCContextSelector(
     (state) => state.iot.homeassistant.connections
@@ -26,10 +36,23 @@ const useRemoteControl = () => {
         return result;
       }
 
-      if (action.command_prefer_over_bluetooth) {
+      if (action.command_prefer_over_bluetooth && count < 5) {
+        count++;
         try {
-          return await sendCommandOverBluetooth(device, action, data, userId);
+          const res = await sendCommandOverBluetooth(
+            device,
+            action,
+            data,
+            userId
+          );
+          if (res) {
+            count = 0;
+            return res;
+          } else {
+            onRetry(sendRemoteCommand(device, action, data, userId));
+          }
         } catch (err) {
+          onRetry(sendRemoteCommand(device, action, data, userId));
           const netState = await NetInfo.fetch();
           if (netState.isConnected) {
             result = false;
@@ -53,7 +76,7 @@ const useRemoteControl = () => {
           }
         }
       }
-
+      count = 0;
       // Checking only bluetooth: not other options
       if (action.is_only_bluetooth) {
         ToastBottomHelper.error(

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 {}
@@ -156,8 +167,7 @@ export const sendDataOverBluetooth = async (
             t('control_device_via_bluetooth_successfully')
           );
           if (!keepConnect) {
-            await bleManager.cancelTransaction(BLE.BLE_LISTER_RESPONSE_CONTROL);
-            await bleManager.cancelDeviceConnection(device.id);
+            await connectedDevice.cancelConnection();
           }
         } else if (notify === BLE.BLE_RESPONSE_FAILED) {
           ToastBottomHelper.error(t('control_device_via_bluetooth_failed'));
@@ -172,6 +182,7 @@ export const sendDataOverBluetooth = async (
     );
     ToastBottomHelper.error(t('command_is_sent_to_device_via_bluetooth'));
   } catch (e) {
+    await connectedDevice.cancelConnection();
     ToastBottomHelper.error(t('command_is_fail_to_send_via_bluetooth'));
     throw SEND_COMMAND_OVER_BLUETOOTH_FAIL;
   }

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

@@ -4,7 +4,6 @@ import {
   scanBluetoothDevices,
   clearNeedToScanDevices,
   sendCommandOverBluetooth,
-  SEND_COMMAND_OVER_BLUETOOTH_FAIL,
   clearFoundDevices,
 } from '../Bluetooth';
 
@@ -26,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();
@@ -108,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 () => {
@@ -121,7 +150,7 @@ describe('Test IOT Bluetooth', () => {
       }
     );
     await scanBluetoothDevices([device.name], mockOnDeviceFound);
-    expect(bleManager.startDeviceScan).toBeCalled();
+    expect(bleManager.startDeviceScan).not.toBeCalled();
 
     bleManager.startDeviceScan.mockClear();
 
@@ -129,14 +158,12 @@ describe('Test IOT Bluetooth', () => {
     expect(bleManager.startDeviceScan).not.toBeCalled();
   });
 
-  const sendCommandBluetoothFail = async (sensor) => {
-    let error = null;
+  const sendCommandBluetoothFail = async (sensor, err = undefined) => {
     try {
       await sendCommandOverBluetooth(sensor, {});
     } catch (e) {
-      error = e;
+      expect(e.message).toBe(err);
     }
-    expect(error).toEqual(SEND_COMMAND_OVER_BLUETOOTH_FAIL);
   };
 
   it('Send command over bluetooth do nothing for sensor has no bluetooth', async () => {
@@ -164,34 +191,7 @@ describe('Test IOT Bluetooth', () => {
     );
     await scanBluetoothDevices([device.name], mockOnDeviceFound);
 
-    await sendCommandBluetoothFail({
-      remote_control_options: {
-        bluetooth: {
-          address: device.name,
-        },
-      },
-    });
-  });
-
-  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(
+    await sendCommandBluetoothFail(
       {
         remote_control_options: {
           bluetooth: {
@@ -199,7 +199,7 @@ describe('Test IOT Bluetooth', () => {
           },
         },
       },
-      {}
+      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,
           });

package/src/screens/Device/__test__/detail.test.js

@@ -142,6 +142,16 @@ describe('test DeviceDetail', () => {
 
   let data_sensor_display = {
     items: [
+      {
+        configuration: {
+          id: 3,
+          name: 'Emergency',
+        },
+        id: 17,
+        order: 1,
+        template: 'emergency',
+        type: 'emergency',
+      },
       {
         configuration: {
           id: 2,
@@ -247,7 +257,7 @@ describe('test DeviceDetail', () => {
       (el) =>
         el.props.accessibilityLabel === AccessibilityLabel.SENSOR_DISPLAY_ITEM
     );
-    expect(sensorDisplayItem.length).toEqual(2);
+    expect(sensorDisplayItem.length).toEqual(3);
 
     const itemActionGroup = instance.find(
       (el) =>
@@ -485,6 +495,16 @@ describe('test DeviceDetail', () => {
               ],
             },
           },
+          {
+            configuration: {
+              id: 3,
+              name: 'Emergency',
+            },
+            id: 17,
+            order: 1,
+            template: 'emergency',
+            type: 'emergency',
+          },
         ],
       },
     };
@@ -509,7 +529,7 @@ describe('test DeviceDetail', () => {
       (el) =>
         el.props.accessibilityLabel === AccessibilityLabel.SENSOR_DISPLAY_ITEM
     );
-    expect(sensorDisplayItem).toHaveLength(4);
+    expect(sensorDisplayItem).toHaveLength(5);
   });
 
   it('render SensorDisplayItem emercency', async () => {
@@ -757,7 +777,7 @@ describe('test DeviceDetail', () => {
 
   it('Open popup ble when server down', async () => {
     store.bluetooth.isEnabled = false;
-    data_sensor_display.items[1].configuration.configuration.action1_data.command_prefer_over_bluetooth = true;
+    data_sensor_display.items[2].configuration.configuration.action1_data.command_prefer_over_bluetooth = true;
     const responseDisplay = {
       status: 200,
       data: data_sensor_display,
@@ -781,4 +801,19 @@ describe('test DeviceDetail', () => {
     });
     expect(mockAlertShow).not.toBeCalled();
   });
+
+  it('Test fetchUnitDetail', async () => {
+    const unitId = 1;
+    mock.onGet(API.UNIT.UNIT_DETAIL(unitId)).reply(200);
+    await act(async () => {
+      await create(
+        wrapComponent(store, account, {
+          ...route,
+          params: { ...route.params, unitData: null, unitId },
+        })
+      );
+    });
+    const urls = mock.history.get.map((item) => item.url);
+    expect(urls).toContain(API.UNIT.UNIT_DETAIL(unitId));
+  });
 });

package/src/utils/I18n/translations/en.json

@@ -771,7 +771,7 @@
   "please_add_your_phone_number_and_chip_name": "Please add your phone number and chip name",
   "Please_add_gateway_name" : "Please add gateway name",
   "phone_number_of_data_sim": "Phone number of data sim",
-  "select_a_sub_unit": "Select a sub-unit that you want to add this gateway",
+  "select_a_sub_unit": "Select a sub-unit",
   "all_camera": "All Cameras",
   "gateway_name": "Gateway name",
   "activated_time": "Activated {time}",

package/src/utils/I18n/translations/vi.json

@@ -781,7 +781,7 @@
   "please_add_your_phone_number_and_chip_name": "Vui lòng thêm số điện thoại và tên chip của bạn",
   "Please_add_gateway_name" : "Vui lòng thêm tên gateway",
   "phone_number_of_data_sim": "Số điện thoại của dữ liệu sim",
-  "select_a_sub_unit": "Lựa chọn một khu vực mà bạn muốn thêm gateway",
+  "select_a_sub_unit": "Lựa chọn một khu vực",
   "all_camera": "All Cameras",
   "gateway_name": "Tên Gateway",
   "activated_time": "Đã kích hoạt {time}",