@eohjsc/react-native-smart-city 0.7.3 → 0.7.5

package/src/configs/AccessibilityLabel.js

@@ -239,6 +239,7 @@ export default {
   BUTTON_ADD_SCRIPT_ACTION: 'BUTTON_ADD_SCRIPT_ACTION',
   ICON_CLOSE: 'ICON_CLOSE',
   ICON_MORE: 'ICON_MORE',
+  ICON_MENU_POPUP: 'ICON_MENU_POPUP',
   ICON_ARROW_RIGHT: 'ICON_ARROW_RIGHT',
   TEXT_AUTOMATE_NAME: 'TEXT_AUTOMATE_NAME',
   AUTOMATE_LIST_SCRIPT_ACTION: 'AUTOMATE_LIST_SCRIPT_ACTION',
@@ -698,6 +699,7 @@ export default {
     'GATEWAY_INFO_BUTTON_GOTO_CONNECTION_METHODS',
   GATEWAY_INFO_BUTTON_DELETE_GATEWAY: 'GATEWAY_INFO_BUTTON_DELETE_GATEWAY',
   MENU_POPPER_MORE: 'MENU_POPPER_MORE',
+  MENU_POPPER_MORE_2: 'MENU_POPPER_MORE_2',
   GATEWAY_CONNECTION_METHODS_TEXT: 'GATEWAY_CONNECTION_METHODS_TEXT',
   //Notification
   CUSTOM_TEXT: 'CUSTOM_TEXT',

package/src/configs/Constants.js

@@ -1,9 +1,9 @@
 export { default as AccessibilityLabel } from './AccessibilityLabel';
 import { Platform, Dimensions, StatusBar } from 'react-native';
 import { RFValue } from 'react-native-responsive-fontsize';
-import OneTap from '../../assets/images/OneTap.svg';
-import ValueChange from '../../assets/images/ValueChange.svg';
-import Schedule from '../../assets/images/Schedule.svg';
+import OneTap from '../../assets/images/Scenario-filled.svg';
+import ValueChange from '../../assets/images/Automation-fill.svg';
+import Schedule from '../../assets/images/schedule-fill.svg';
 import Event from '../../assets/images/Event.svg';
 
 const X_WIDTH = 375;

package/src/configs/Theme.js

@@ -86,7 +86,7 @@ export default StyleSheet.create({
     alignItems: 'center',
   },
   menuIcon: {
-    paddingLeft: 16,
+    paddingRight: 10,
     height: '100%',
     justifyContent: 'center',
   },

package/src/hooks/Common/__test__/useAndroidTranslucentStatusBar.test.js

@@ -1,10 +1,10 @@
+import { useNavigation } from '@react-navigation/native';
+import { renderHook } from '@testing-library/react-hooks';
 import React from 'react';
 import { Platform } from 'react-native';
-import { renderHook } from '@testing-library/react-hooks';
-import { useAndroidTranslucentStatusBar } from '../index';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
-import { useNavigation } from '@react-navigation/native';
+import { useAndroidTranslucentStatusBar } from '../index';
 
 const mockedSetAction = jest.fn();
 
@@ -28,7 +28,7 @@ describe('test useAndroidTranslucentStatusBar', () => {
         wrapper,
       }
     );
-    expect(addListener).not.toBeCalled();
+    expect(addListener).not.toHaveBeenCalled();
   });
 
   it('test useAndroidTranslucentStatusBar ios', async () => {
@@ -39,6 +39,6 @@ describe('test useAndroidTranslucentStatusBar', () => {
         wrapper,
       }
     );
-    expect(addListener).not.toBeCalled();
+    expect(addListener).not.toHaveBeenCalled();
   });
 });

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

@@ -1,13 +1,13 @@
-import React from 'react';
 import { act, renderHook } from '@testing-library/react-hooks';
-import { createConnection, getStates } from 'home-assistant-js-websocket';
 import MockAdapter from 'axios-mock-adapter';
-import api from '../../../utils/Apis/axios';
-import { useHomeAssistantConnection } from '../index';
+import { createConnection, getStates } from 'home-assistant-js-websocket';
+import React from 'react';
+import { API } from '../../../configs';
 import { SCProvider } from '../../../context';
-import { mockSCStore } from '../../../context/mockStore';
 import { Action } from '../../../context/actionType';
-import { API } from '../../../configs';
+import { mockSCStore } from '../../../context/mockStore';
+import api from '../../../utils/Apis/axios';
+import { useHomeAssistantConnection } from '../index';
 
 const mock = new MockAdapter(api.axiosInstance);
 
@@ -124,7 +124,7 @@ describe('Test useHomeAssistantConnection', () => {
     await act(async () => {
       await result.current.connectHomeAssistant(options);
     });
-    expect(mockedSetAction).toBeCalledWith(
+    expect(mockedSetAction).toHaveBeenCalledWith(
       Action.SET_HOME_ASSISTANT_CONNECTIONS,
       conns
     );
@@ -145,7 +145,7 @@ describe('Test useHomeAssistantConnection', () => {
     await act(async () => {
       await result.current.connectHomeAssistant(options);
     });
-    expect(mockedSetAction).toBeCalledWith(
+    expect(mockedSetAction).toHaveBeenCalledWith(
       Action.SET_HOME_ASSISTANT_CONNECTIONS,
       conns
     );
@@ -167,12 +167,12 @@ describe('Test useHomeAssistantConnection', () => {
     await act(async () => {
       await result.current.connectHomeAssistant(options);
     });
-    expect(mockedSetAction).toBeCalledTimes(2);
-    expect(mockedSetAction).toBeCalledWith(
+    expect(mockedSetAction).toHaveBeenCalledTimes(2);
+    expect(mockedSetAction).toHaveBeenCalledWith(
       Action.SET_HOME_ASSISTANT_CONNECTIONS,
       conns
     );
-    expect(mockedSetAction).toBeCalledWith(Action.LIST_DEVICE_TYPES, {
+    expect(mockedSetAction).toHaveBeenCalledWith(Action.LIST_DEVICE_TYPES, {
       chipId: options[0].chip_id,
       sentEmail: true,
     });
@@ -190,7 +190,7 @@ describe('Test useHomeAssistantConnection', () => {
     await act(async () => {
       await result.current.disconnectHomeAssistant(conns, options);
     });
-    expect(mockedSetAction).toBeCalledWith(
+    expect(mockedSetAction).toHaveBeenCalledWith(
       Action.SET_HOME_ASSISTANT_CONNECTIONS,
       {}
     );

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

@@ -81,7 +81,8 @@ describe('Test useRemoteControl', () => {
       sensor,
       action,
       data,
-      userId
+      userId,
+      false
     );
     expect(sendCommandOverInternet).not.toBeCalled();
     expect(sendCommandOverHomeAssistant).not.toBeCalled();
@@ -106,13 +107,15 @@ describe('Test useRemoteControl', () => {
       sensor,
       action,
       data,
-      userId
+      userId,
+      false
     );
     expect(sendCommandOverInternet).toBeCalledWith(
       sensor,
       action,
       data,
-      'bluetooth'
+      'bluetooth',
+      false
     );
     expect(sendCommandOverInternet).toBeCalledTimes(1);
     expect(sendCommandOverHomeAssistant).not.toBeCalled();
@@ -143,7 +146,8 @@ describe('Test useRemoteControl', () => {
       sensor,
       action,
       data,
-      userId
+      userId,
+      false
     );
     expect(sendCommandOverInternet).not.toBeCalled();
     expect(sendCommandOverHomeAssistant).not.toBeCalled();
@@ -181,7 +185,8 @@ describe('Test useRemoteControl', () => {
       sensor,
       action,
       data,
-      userId
+      userId,
+      false
     );
     expect(sendCommandOverHomeAssistant).not.toBeCalled();
   });
@@ -202,7 +207,8 @@ describe('Test useRemoteControl', () => {
       sensor,
       action,
       data,
-      'internet'
+      'internet',
+      false
     );
     expect(sendCommandOverInternet).toBeCalledTimes(1);
     expect(sendCommandOverBluetooth).not.toBeCalled();
@@ -303,7 +309,8 @@ describe('Test useRemoteControl', () => {
       sensor,
       action,
       data,
-      'bluetooth'
+      'bluetooth',
+      false
     );
     expect(sendCommandOverBluetooth).toBeCalledTimes(6);
     expect(sendCommandOverInternet).toBeCalledTimes(1);

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

@@ -1,9 +1,9 @@
-import React, { useContext } from 'react';
 import { renderHook } from '@testing-library/react-hooks';
+import React, { useContext } from 'react';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
+import { unwatchMultiConfigs, watchMultiConfigs } from '../../../iot/Monitor';
 import { useWatchConfigs } from '../index';
-import { watchMultiConfigs, unwatchMultiConfigs } from '../../../iot/Monitor';
 
 const mockedSetAction = jest.fn();
 
@@ -27,6 +27,6 @@ describe('Test useWatchConfigs', () => {
       wrapper,
     });
     jest.runOnlyPendingTimers();
-    expect(watchMultiConfigs).toBeCalledWith([1]);
+    expect(watchMultiConfigs).toHaveBeenCalledWith([1]);
   });
 });

package/src/hooks/IoT/useRemoteControl.js

@@ -1,15 +1,15 @@
+import NetInfo from '@react-native-community/netinfo';
+import { t } from 'i18n-js';
 import { useCallback } from 'react';
 import { useSCContextSelector } from '../../context';
-import { sendCommandOverHomeAssistant } from '../../iot/RemoteControl/HomeAssistant';
-import { sendCommandOverInternet } from '../../iot/RemoteControl/Internet';
 import {
-  sendCommandOverBluetooth,
-  SEND_COMMAND_OVER_BLUETOOTH_FAIL,
   BLUETOOOH_DEVICE_UNSTABLE,
+  SEND_COMMAND_OVER_BLUETOOTH_FAIL,
+  sendCommandOverBluetooth,
 } from '../../iot/RemoteControl/Bluetooth';
+import { sendCommandOverHomeAssistant } from '../../iot/RemoteControl/HomeAssistant';
+import { sendCommandOverInternet } from '../../iot/RemoteControl/Internet';
 import { ToastBottomHelper } from '../../utils/Utils';
-import { t } from 'i18n-js';
-import NetInfo from '@react-native-community/netinfo';
 
 const handleReconnectionDeviceBle = async (device, action, data, userId) => {
   for (let i = 0; i < 5; i++) {
@@ -26,13 +26,13 @@ const handleReconnectionDeviceBle = async (device, action, data, userId) => {
   return SEND_COMMAND_OVER_BLUETOOTH_FAIL;
 };
 
-const useRemoteControl = () => {
+const useRemoteControl = (bluetoothDevice) => {
   const homeAssistantConnections = useSCContextSelector(
     (state) => state.iot.homeassistant.connections
   );
 
   const sendRemoteCommand = useCallback(
-    async (device, action, data, userId) => {
+    async (device, action, data, userId, silent = false) => {
       // No action, raise not authorized
       let result = false;
       if (!action) {
@@ -41,9 +41,18 @@ const useRemoteControl = () => {
         );
         return result;
       }
-
       if (action.command_prefer_over_bluetooth) {
-        let res = await sendCommandOverBluetooth(device, action, data, userId);
+        // custom control for i/o pin over bluetooth
+        if (bluetoothDevice?.isConnected && action.arduino_action) {
+          return bluetoothDevice.control(action, data, silent);
+        }
+        let res = await sendCommandOverBluetooth(
+          device,
+          action,
+          data,
+          userId,
+          silent
+        );
         if (res === BLUETOOOH_DEVICE_UNSTABLE) {
           res = await handleReconnectionDeviceBle(device, action, data, userId);
         }
@@ -57,7 +66,8 @@ const useRemoteControl = () => {
                 device,
                 action,
                 data,
-                'bluetooth'
+                'bluetooth',
+                silent
               );
             }
             return result;
@@ -80,7 +90,8 @@ const useRemoteControl = () => {
           device,
           action,
           data,
-          action.command_prefer_over_bluetooth ? 'bluetooth' : 'internet'
+          action.command_prefer_over_bluetooth ? 'bluetooth' : 'internet',
+          silent
         );
       }
 
@@ -95,7 +106,7 @@ const useRemoteControl = () => {
 
       return await sendCommandOverInternet(device, action, data, 'internet');
     },
-    [homeAssistantConnections]
+    [bluetoothDevice, homeAssistantConnections]
   );
 
   return sendRemoteCommand;

package/src/hooks/useMqtt.js

@@ -1,9 +1,9 @@
 import mqtt from 'precompiled-mqtt/dist/mqtt.browser';
-import { useState, useEffect, useMemo, useRef } from 'react';
+import { useEffect, useMemo, useRef, useState } from 'react';
 
 import API from '../configs/API';
-import { axiosGet } from '../utils/Apis/axios';
 import { handleMqttMessage } from '../iot/mqtt';
+import { axiosGet } from '../utils/Apis/axios';
 
 const useChipJsonConfiguration = (dashboardId) => {
   const [chips, setChips] = useState([]);

package/src/iot/RemoteControl/Bluetooth.js

@@ -1,15 +1,15 @@
 /* eslint-disable promise/prefer-await-to-callbacks */
 import base64 from 'react-native-base64';
-import { BleManager, ScanMode } from 'react-native-ble-plx';
+import { ScanMode } from 'react-native-ble-plx';
 import CryptoAesCbc from 'react-native-crypto-aes-cbc';
 
 import { base64ToHex, ToastBottomHelper } from '../../utils/Utils';
 import { BLE } from '../../configs';
 import t from '../../hooks/Common/useTranslations';
+import { bleManager } from '../../utils/bluetooth';
 
 const bluetoothDevices = {};
 const needToScanDevices = [];
-const bleManager = new BleManager();
 
 let isScanning = false;
 
@@ -98,7 +98,8 @@ export const sendCommandOverBluetooth = async (
   sensor,
   action,
   data,
-  userID
+  userID,
+  silent
 ) => {
   const bluetooth = sensor?.remote_control_options?.bluetooth;
   let device = null;
@@ -115,7 +116,8 @@ export const sendCommandOverBluetooth = async (
       user: userID,
     },
     false,
-    bluetooth?.is_use_secret_key
+    bluetooth?.is_use_secret_key,
+    silent
   );
   return result;
 };
@@ -124,18 +126,6 @@ export const getDeviceByName = (name) => {
   return bluetoothDevices[name];
 };
 
-export const isDeviceConnected = (deviceName) => {
-  return !!bluetoothDevices[deviceName];
-};
-
-export const subcribeCharacteristicNotify = async (device, onListener) => {
-  return await device.monitorCharacteristicForService(
-    BLE.BLE_REMOTE_SERVICE_UUID,
-    BLE.BLE_REMOTE_CHARACTERISTIC_UUID_TX,
-    onListener
-  );
-};
-
 export const readCharacteristic = async (
   device,
   serviceUUID = BLE.BLE_REMOTE_SERVICE_UUID,
@@ -151,13 +141,16 @@ export const sendDataOverBluetooth = async (
   device = null,
   data,
   keepConnect = false,
-  isUseSecretKey = false
+  isUseSecretKey = false,
+  silent
 ) => {
   if (!device) {
     return SEND_COMMAND_OVER_BLUETOOTH_FAIL;
   }
 
-  ToastBottomHelper.error(t('Sending command via bluetooth'));
+  if (!silent) {
+    ToastBottomHelper.info(t('Sending command via bluetooth'));
+  }
 
   let connectedDevice = null;
   let fullDataDevice = null;
@@ -196,9 +189,11 @@ export const sendDataOverBluetooth = async (
         hasResponse = true;
         const notify = error ? '' : base64.decode(characteristic.value);
         if (notify === BLE.BLE_RESPONSE_OK) {
-          ToastBottomHelper.success(
-            t('control_device_via_bluetooth_successfully')
-          );
+          if (!silent) {
+            ToastBottomHelper.success(
+              t('control_device_via_bluetooth_successfully')
+            );
+          }
           if (!keepConnect) {
             await connectedDevice.cancelConnection();
           }
@@ -234,7 +229,9 @@ export const sendDataOverBluetooth = async (
         base64.encode(JSON.stringify(data))
       );
     }
-    ToastBottomHelper.error(t('command_is_sent_to_device_via_bluetooth'));
+    if (!silent) {
+      ToastBottomHelper.info(t('command_is_sent_to_device_via_bluetooth'));
+    }
   } catch (e) {
     await connectedDevice.cancelConnection();
     ToastBottomHelper.error(t('command_is_fail_to_send_via_bluetooth'));

package/src/iot/RemoteControl/Internet.js

@@ -1,10 +1,16 @@
 import t from '../../hooks/Common/useTranslations';
 
-import { ToastBottomHelper } from '../../utils/Utils';
-import { axiosPost } from '../../utils/Apis/axios';
 import { API } from '../../configs';
+import { axiosPost } from '../../utils/Apis/axios';
+import { ToastBottomHelper } from '../../utils/Utils';
 
-export const sendCommandOverInternet = async (sensor, action, data, source) => {
+export const sendCommandOverInternet = async (
+  sensor,
+  action,
+  data,
+  source,
+  silent
+) => {
   if (data !== null) {
     if (Number.isInteger(data)) {
       data = data.toString(16).toUpperCase();
@@ -13,13 +19,15 @@ export const sendCommandOverInternet = async (sensor, action, data, source) => {
   if (typeof data === 'object') {
     data = JSON.stringify(data);
   }
-  ToastBottomHelper.success(t('Sending command via internet'));
+  if (!silent) {
+    ToastBottomHelper.info(t('Sending command via internet'));
+  }
   const { success } = await axiosPost(API.DEVICE.TRIGGER_ACTION(sensor.id), {
     key: action.key,
     data,
     source,
   });
-  if (success) {
+  if (success && !silent) {
     ToastBottomHelper.success(t('Command is sent to device via internet'));
   }
   return success;

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

@@ -1,8 +1,8 @@
-import Toast from 'react-native-toast-message';
 import MockAdapter from 'axios-mock-adapter';
-import { sendCommandOverInternet } from '../Internet';
-import api from '../../../utils/Apis/axios';
+import Toast from 'react-native-toast-message';
 import { API } from '../../../configs';
+import api from '../../../utils/Apis/axios';
+import { sendCommandOverInternet } from '../Internet';
 
 const mock = new MockAdapter(api.axiosInstance);
 
@@ -14,24 +14,24 @@ describe('Test IOT Remote Control Internet', () => {
   it('Trigger action via request POST', async () => {
     mock.onPost(API.DEVICE.TRIGGER_ACTION()).reply(200);
     await sendCommandOverInternet({}, {}, 'internet');
-    expect(Toast.show).toBeCalledTimes(2);
+    expect(Toast.show).toHaveBeenCalledTimes(2);
   });
 
   it('Trigger action via request POST with data isInteger', async () => {
     mock.onPost(API.DEVICE.TRIGGER_ACTION()).reply(200);
     await sendCommandOverInternet({}, {}, 1);
-    expect(Toast.show).toBeCalledTimes(2);
+    expect(Toast.show).toHaveBeenCalledTimes(2);
   });
 
   it('Trigger action via request POST with data is null', async () => {
     mock.onPost(API.DEVICE.TRIGGER_ACTION()).reply(200);
     await sendCommandOverInternet({}, {}, null);
-    expect(Toast.show).toBeCalledTimes(2);
+    expect(Toast.show).toHaveBeenCalledTimes(2);
   });
 
   it('Trigger action fail show error', async () => {
     mock.onPost(API.DEVICE.TRIGGER_ACTION()).reply(400);
     await sendCommandOverInternet({}, {}, 'internet');
-    expect(Toast.show).toBeCalled();
+    expect(Toast.show).toHaveBeenCalled();
   });
 });

package/src/navigations/EmergencyContactsStack.js

@@ -1,4 +1,4 @@
-import AntDesign from 'react-native-vector-icons/AntDesign';
+import { IconOutline } from '@ant-design/icons-react-native';
 import { createNativeStackNavigator } from '@react-navigation/native-stack';
 import React, { memo } from 'react';
 import { StyleSheet } from 'react-native';
@@ -19,7 +19,7 @@ export const EmergencyContactsStack = memo(() => {
         ...screenOptions,
         headerTitleAlign: 'center',
         headerBackImage: () => (
-          <AntDesign
+          <IconOutline
             name="left"
             size={27}
             color={Colors.Black}
@@ -32,7 +32,8 @@ export const EmergencyContactsStack = memo(() => {
           borderBottomWidth: Device.isIOS === 'android' ? 1 : 0,
           borderColor: Colors.Gray4,
         },
-        headerBackTitle: true,
+        headerTintColor: Colors.Black,
+        headerBackTitleVisible: false,
       }}
     >
       <Stack.Screen

package/src/navigations/SharedStack.js

@@ -50,6 +50,8 @@ export default SharedStack;
 
 const styles = StyleSheet.create({
   btnMenu: {
+    paddingLeft: 0,
+    paddingRight: 10,
     paddingHorizontal: 16,
     height: '100%',
     justifyContent: 'center',