@eohjsc/react-native-smart-city 0.2.67 → 0.2.71

package/src/commons/SubUnit/OneTap/index.js

@@ -1,16 +1,13 @@
 import React, { useCallback, useEffect, useRef, useState } from 'react';
 import { TouchableOpacity, View } from 'react-native';
-import { Icon } from '@ant-design/react-native';
 
-import { MenuActionMore, Section } from '../..';
+import { Section } from '../..';
 import ItemAddNew from '../../Device/ItemAddNew';
 import ItemOneTap from './ItemOneTap';
 import { useTranslations } from '../../../hooks/Common/useTranslations';
 import { useNavigation } from '@react-navigation/native';
 import Routes from '../../../utils/Route/index.js';
 import { AUTOMATE_TYPE, TESTID } from '../../../configs/Constants';
-import { Colors } from '../../../configs/Colors.js';
-import usePopover from '../../../hooks/Common/usePopover.js';
 import Text from '../../Text/index.js';
 
 import styles from './OneTapStyles.js';
@@ -33,11 +30,8 @@ const SubUnitAutomate = ({ isOwner, listAutomate, unit, wrapItemStyle }) => {
         break;
     }
   };
-  const { childRef, showingPopover, showPopoverWithRef, hidePopover } =
-    usePopover();
 
   const refMenuAction = useRef();
-  const handleShowMenuAction = () => showPopoverWithRef(refMenuAction);
 
   const onItemClick = useCallback((item, index) => {
     setAutomates(item);
@@ -50,23 +44,30 @@ const SubUnitAutomate = ({ isOwner, listAutomate, unit, wrapItemStyle }) => {
 
   return (
     <Section style={styles.noShadow}>
-      <TouchableOpacity
-        style={styles.dropDown}
-        onPress={handleShowMenuAction}
-        ref={refMenuAction}
-        testID={TESTID.SUB_UNIT_SELECT_AUTOMATE_TYPE}
-      >
-        <View style={styles.boxDropDown}>
-          <Text
-            testID={TESTID.SUB_UNIT_TEXT_DROPDOWN}
-            style={styles.textDropDown}
-            semibold
+      <View style={styles.boxScenario}>
+        {listAutomate.map((item, index) => (
+          <TouchableOpacity
+            style={
+              indexAutomate === index
+                ? styles.borderSelection
+                : styles.notShowBorder
+            }
+            onPress={() => onItemClick(item, index)}
+            ref={refMenuAction}
+            testID={TESTID.SUB_UNIT_SELECT_AUTOMATE_TYPE}
           >
-            {automates?.text}
-          </Text>
-          <Icon name={'caret-down'} size={14} style={{ color: Colors.Gray8 }} />
-        </View>
-      </TouchableOpacity>
+            <View style={styles.boxTextScenarito}>
+              <Text
+                testID={TESTID.SUB_UNIT_TEXT_DROPDOWN}
+                style={styles.textSelection}
+                semibold
+              >
+                {item?.text}
+              </Text>
+            </View>
+          </TouchableOpacity>
+        ))}
+      </View>
       <View style={styles.boxDevices}>
         {automates?.data &&
           automates.data.map((item) => (
@@ -78,16 +79,6 @@ const SubUnitAutomate = ({ isOwner, listAutomate, unit, wrapItemStyle }) => {
           wrapStyle={wrapItemStyle}
         />
       </View>
-      <MenuActionMore
-        isVisible={showingPopover}
-        hideMore={hidePopover}
-        listMenuItem={listAutomate}
-        childRef={childRef}
-        onItemClick={onItemClick}
-        isTextCenter={false}
-        testID={TESTID.NAVBAR_MENU_ACTION_MORE}
-        wrapStyle={styles.wrapStyle}
-      />
     </Section>
   );
 };

package/src/commons/UnitSummary/ConfigHistoryChart/__test__/ConfigHistoryChart.test.js

@@ -0,0 +1,29 @@
+import React from 'react';
+import { act, create } from 'react-test-renderer';
+import ConfigHistoryChart from '../';
+import { SCProvider } from '../../../../context';
+import { mockSCStore } from '../../../../context/mockStore';
+import HistoryChart from '../../../../commons/Device/HistoryChart';
+
+const wrapComponent = (configs = []) => (
+  <SCProvider initState={mockSCStore({})}>
+    <ConfigHistoryChart configs={configs} />
+  </SCProvider>
+);
+
+describe('Test HistoryChart', () => {
+  let tree;
+
+  beforeAll(() => {
+    jest.useFakeTimers();
+  });
+
+  it('Test render', async () => {
+    await act(() => {
+      tree = create(wrapComponent());
+    });
+    const instance = tree.root;
+    const HistoryCharts = instance.findAllByType(HistoryChart);
+    expect(HistoryCharts).toHaveLength(0);
+  });
+});

package/src/commons/UnitSummary/ConfigHistoryChart.js

@@ -13,10 +13,8 @@ export const dateTimeType = {
 
 const ConfigHistoryChart = memo(({ configs }) => {
   const [chartData, setChartData] = useState(configs);
-  const [startDate, setStartDate] = useState(
-    moment().subtract(1, 'days').valueOf()
-  );
-  const [endDate, setEndDate] = useState(moment().valueOf());
+  const [startDate, setStartDate] = useState(moment().subtract(1, 'days'));
+  const [endDate, setEndDate] = useState(moment());
 
   useEffect(() => {
     const fetchData = async () => {
@@ -25,8 +23,8 @@ const ConfigHistoryChart = memo(({ configs }) => {
       configuration.map((item) => {
         params.append('config', item.id);
       });
-      params.append('date_from', startDate / 1000);
-      params.append('date_to', endDate / 1000);
+      params.append('date_from', startDate.valueOf() / 1000);
+      params.append('date_to', endDate.valueOf() / 1000);
       const { success, data } = await axiosGet(API.CONFIG.DISPLAY_HISTORY(), {
         params,
       });

package/src/commons/ViewButtonBottom/index.js

@@ -16,6 +16,8 @@ const ViewButtonBottom = ({
   styleButton,
   styleButtonLeftText,
   styleButtonRightText,
+  styleButtonLeft,
+  styleButtonRight,
   testIDPrefix = '',
 }) => {
   const useTwoButton = leftTitle && rightTitle;
@@ -27,6 +29,7 @@ const ViewButtonBottom = ({
           style={[
             styles.button,
             styleButton,
+            styleButtonLeft,
             useTwoButton && styles.buttonMarginRight,
           ]}
           onPress={onLeftClick}
@@ -48,6 +51,7 @@ const ViewButtonBottom = ({
           style={[
             styles.button,
             styleButton,
+            styleButtonRight,
             useTwoButton && styles.buttonMarginLeft,
           ]}
           onPress={onRightClick}

package/src/configs/API.js

@@ -33,6 +33,8 @@ const API = {
       SCConfig.apiRoot + `/property_manager/units/${id}/device_control/`,
     DEVICE_SENSOR: (id) =>
       SCConfig.apiRoot + `/property_manager/units/${id}/device_sensor/`,
+    ADD_GATEWAY: (id) =>
+      SCConfig.apiRoot + `/property_manager/units/${id}/add_gateway/`,
   },
   SUB_UNIT: {
     REMOVE_SUB_UNIT: (unitId, id) =>

package/src/configs/BLE.js

@@ -3,4 +3,7 @@ export default {
   BLE_REMOTE_CHARACTERISTIC_UUID: 'b32f3620-2846-4d1c-88aa-5dd06c0ad15e',
   BLE_REMOTE_CHARACTERISTIC_UUID_TX: 'fba737c2-9f19-4779-9ef2-9446c29d0bf5',
   BLE_REMOTE_CHARACTERISTIC_UUID_RX: '54173c1f-3a6a-4812-90fb-9a222f445f0c',
+  BLE_RESPONSE_OK: 'OK',
+  BLE_RESPONSE_FAILED: 'FAILED',
+  BLE_LISTER_RESPONSE_CONTROL: 'LISTER_RESPONSE_CONTROL',
 };

package/src/configs/Constants.js

@@ -610,6 +610,8 @@ export const NOTIFICATION_TYPES = {
   PARKING_COMPLETED_DUE_TO_CAR_LEAVE: 'PARKING_COMPLETED_DUE_TO_CAR_LEAVE',
   NOTIFY_INVITE_MEMBER: 'NOTIFY_INVITE_MEMBER',
   REMINDER: 'REMINDER',
+  NOTIFY_REMOVE_UNIT: 'NOTIFY_REMOVE_UNIT',
+  NOTIFY_REMOVE_MEMBER: 'NOTIFY_REMOVE_MEMBER',
 };
 
 export const ACTIVITY_LOG_TYPES = {

package/src/configs/Images.js

@@ -7,7 +7,7 @@ export default {
   file: require('../Images/Common/file.png'),
   activeButton: require('../Images/Common/ActiveButton.png'),
   logo: require('../Images/Common/logo.png'),
-  buttonPauseCurtain: require('../Images/Common/buttonPause-center-curtain.png'),
+  buttonPauseCurtain: require('../Images/Common/buttonPauseCurtain.png'),
   buttonLeftCurtain: require('../Images/Common/buttonLeftCurtain.png'),
   buttonRightCurtain: require('../Images/Common/buttonRightCurtain.png'),
 };

package/src/context/SCContext.tsx

@@ -9,6 +9,7 @@ import {
 } from './actionType';
 import { initialState, Action, ContextData, reducer } from './reducer';
 import { setConfigGlobalState } from '../iot/states.js';
+import { setAxiosDefaultLanguage } from '../utils/Utils';
 
 type SCContextType = {
   stateData: ContextData;
@@ -46,6 +47,7 @@ export const SCProvider = ({ children, initState = initialState }) => {
   const setLocale = (language: Language) => {
     setConfigGlobalState('lang', language);
     setAction('UPDATE_LANGUAGE', language);
+    setAxiosDefaultLanguage(language);
   };
 
   const setAction = <T extends ActionType>(

package/src/iot/RemoteControl/Bluetooth.js

@@ -87,7 +87,12 @@ const realScanBluetoothDevices = () => {
   }, 15000);
 };
 
-export const sendCommandOverBluetooth = async (sensor, action, data) => {
+export const sendCommandOverBluetooth = async (
+  sensor,
+  action,
+  data,
+  userID
+) => {
   const bluetooth = sensor.remote_control_options.bluetooth;
   let device = null;
   if (bluetooth) {
@@ -99,6 +104,7 @@ export const sendCommandOverBluetooth = async (sensor, action, data) => {
     command: action.key,
     password: bluetooth ? bluetooth.password : '',
     data,
+    user: userID,
   });
   return result;
 };
@@ -139,20 +145,39 @@ export const sendDataOverBluetooth = async (
 
   let connectedDevice = null;
   let fullDataDevice = null;
-  let result = false;
+  let result = true;
+  const responseTime = 2000;
   try {
     connectedDevice = await device.connect();
     fullDataDevice =
       await connectedDevice.discoverAllServicesAndCharacteristics();
+    await fullDataDevice.monitorCharacteristicForService(
+      BLE.BLE_REMOTE_SERVICE_UUID,
+      BLE.BLE_REMOTE_CHARACTERISTIC_UUID_TX,
+      (error, characteristic) => {
+        const notify = error ? '' : base64.decode(characteristic.value);
+        if (notify === BLE.BLE_RESPONSE_OK) {
+          ToastBottomHelper.success(
+            t('control_device_via_bluetooth_successfully')
+          );
+          if (!keepConnect) {
+            bleManager.cancelTransaction(BLE.BLE_LISTER_RESPONSE_CONTROL);
+            device.cancelConnection();
+          }
+        } else if (notify === BLE.BLE_RESPONSE_FAILED) {
+          ToastBottomHelper.error(t('control_device_via_bluetooth_failed'));
+        }
+      },
+      BLE.BLE_LISTER_RESPONSE_CONTROL
+    );
     await fullDataDevice.writeCharacteristicWithResponseForService(
       BLE.BLE_REMOTE_SERVICE_UUID,
       BLE.BLE_REMOTE_CHARACTERISTIC_UUID,
       base64.encode(JSON.stringify(data))
     );
-    ToastBottomHelper.success(t('Command is sent to device via bluetooth'));
-    result = true;
+    ToastBottomHelper.error(t('command_is_sent_to_device_via_bluetooth'));
   } catch (e) {
-    ToastBottomHelper.error(t('Command is fail to send via bluetooth'));
+    ToastBottomHelper.error(t('command_is_fail_to_send_via_bluetooth'));
     throw SEND_COMMAND_OVER_BLUETOOTH_FAIL;
   }
 
@@ -160,7 +185,10 @@ export const sendDataOverBluetooth = async (
     return result;
   }
 
-  await device.cancelConnection();
+  // eslint-disable-next-line no-shadow
+  setTimeout(async (device) => {
+    await device.cancelConnection();
+  }, responseTime);
   return result;
 };
 

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

@@ -221,6 +221,7 @@ describe('Test IOT Bluetooth', () => {
       connect: async () => ({
         discoverAllServicesAndCharacteristics: async () => ({
           writeCharacteristicWithResponseForService: async () => ({}),
+          monitorCharacteristicForService: async () => ({}),
         }),
       }),
     };

package/src/iot/RemoteControl/__test__/index.mock.js

@@ -1,4 +1,5 @@
 /* global jest */
+/* istanbul ignore file */
 export const mockSendCommandOverBluetooth = jest.fn();
 export const mockSendCommandOverInternet = jest.fn();
 export const mockSendCommandOverGoogleHome = jest.fn();

package/src/iot/RemoteControl/index.js

@@ -8,7 +8,12 @@ import { ToastBottomHelper } from '../../utils/Utils';
 import t from '../../hooks/Common/useTranslations';
 import { sendCommandOverLGThinq } from './LG';
 
-export const sendRemoteCommand = async (sensor, action, data) => {
+export const sendRemoteCommand = async (
+  sensor,
+  action,
+  data,
+  userId = null
+) => {
   // No action, raise not authorized
   let result = false;
   if (!action) {
@@ -19,7 +24,7 @@ export const sendRemoteCommand = async (sensor, action, data) => {
   }
   if (action.command_prefer_over_bluetooth) {
     try {
-      result = await sendCommandOverBluetooth(sensor, action, data);
+      result = await sendCommandOverBluetooth(sensor, action, data, userId);
     } catch (err) {
       if (err === SEND_COMMAND_OVER_BLUETOOTH_FAIL) {
         result = await sendCommandOverInternet(

package/src/navigations/AddDeviceStack.js

@@ -8,6 +8,7 @@ import ConnectDevices from '../screens/AddNewDevice/ConnectDevices';
 import ConnectingDevices from '../screens/AddNewDevice/ConnectingDevices';
 import ScanSensorQR from '../screens/ScanSensorQR';
 import Route from '../utils/Route';
+import { screenOptions } from './utils';
 
 const Stack = createStackNavigator();
 
@@ -15,6 +16,7 @@ export const AddDeviceStack = memo(() => {
   return (
     <Stack.Navigator
       screenOptions={{
+        ...screenOptions,
         headerShown: false,
       }}
     >

package/src/navigations/AddGatewayStack.js

@@ -8,6 +8,10 @@ import ConnectedGateway from '../screens/AddNewGateway/ConnectedGateway';
 import ConnectingGateway from '../screens/AddNewGateway/ConnectingGateway';
 import SetupGatewayWifi from '../screens/AddNewGateway/SetupGatewayWifi';
 import AddCommonSelectSubUnit from '../screens/AddCommon/SelectSubUnit';
+import FirstWarning from '../screens/AddNewGateway/PlugAndPlay/FirstWarning';
+import ConnectWifiWarning from '../screens/AddNewGateway/PlugAndPlay/ConnectWifiWarning';
+import GatewayWifiList from '../screens/AddNewGateway/PlugAndPlay/GatewayWifiList';
+import { screenOptions } from './utils';
 
 const Stack = createStackNavigator();
 
@@ -15,6 +19,7 @@ export const AddGatewayStack = memo(() => {
   return (
     <Stack.Navigator
       screenOptions={{
+        ...screenOptions,
         headerShown: false,
       }}
     >
@@ -36,6 +41,12 @@ export const AddGatewayStack = memo(() => {
         name={Route.ConnectedGateway}
         component={ConnectedGateway}
       />
+      <Stack.Screen name={Route.FirstWarning} component={FirstWarning} />
+      <Stack.Screen
+        name={Route.ConnectWifiWarning}
+        component={ConnectWifiWarning}
+      />
+      <Stack.Screen name={Route.GatewayWifiList} component={GatewayWifiList} />
     </Stack.Navigator>
   );
 });

package/src/navigations/AddLGDeviceStack.js

@@ -4,6 +4,7 @@ import React, { memo } from 'react';
 import AddCommonSelectUnit from '../screens/AddCommon/SelectUnit';
 import AddLGDevice from '../screens/SyncLGDevice/AddLGDevice';
 import Routes from '../utils/Route';
+import { screenOptions } from './utils';
 
 const Stack = createStackNavigator();
 
@@ -11,6 +12,7 @@ export const AddLGDeviceStack = memo(() => {
   return (
     <Stack.Navigator
       screenOptions={{
+        ...screenOptions,
         headerShown: false,
       }}
     >

package/src/navigations/AddMemberStack.js

@@ -5,6 +5,7 @@ import AddCommonSelectUnit from '../screens/AddCommon/SelectUnit';
 import SharingSelectPermission from '../screens/Sharing/SelectPermission';
 import SharingInviteMembers from '../screens/Sharing/SelectUser';
 import Route from '../utils/Route';
+import { screenOptions } from './utils';
 
 const Stack = createStackNavigator();
 
@@ -12,6 +13,7 @@ export const AddMemberStack = memo(() => {
   return (
     <Stack.Navigator
       screenOptions={{
+        ...screenOptions,
         headerShown: false,
       }}
     >

package/src/navigations/AddSubUnitStack.js

@@ -4,6 +4,7 @@ import React, { memo } from 'react';
 import AddCommonSelectUnit from '../screens/AddCommon/SelectUnit';
 import AddSubUnit from '../screens/SubUnit/AddSubUnit';
 import Route from '../utils/Route';
+import { screenOptions } from './utils';
 
 const Stack = createStackNavigator();
 
@@ -11,6 +12,7 @@ export const AddSubUnitStack = memo(() => {
   return (
     <Stack.Navigator
       screenOptions={{
+        ...screenOptions,
         headerShown: false,
       }}
     >

package/src/navigations/AddUnitStack.js

@@ -4,6 +4,7 @@ import React, { memo } from 'react';
 import AddLocationMaps from '../screens/AddLocationMaps'; //containers/AddLocationMaps
 import AddSubUnit from '../screens/SubUnit/AddSubUnit';
 import Route from '../utils/Route'; // utils/Route
+import { screenOptions } from './utils';
 
 const Stack = createStackNavigator();
 
@@ -11,6 +12,7 @@ export const AddUnitStack = memo(() => {
   return (
     <Stack.Navigator
       screenOptions={{
+        ...screenOptions,
         headerShown: false,
       }}
     >

package/src/navigations/EmergencyContactsStack.js

@@ -8,6 +8,7 @@ import { EmergencyContactsAddNew } from '../screens/EmergencyContacts/EmergencyC
 import { EmergencyContactsList } from '../screens/EmergencyContacts/EmergencyContactsList';
 import { EmergencyContactsSelectContacts } from '../screens/EmergencyContacts/EmergencyContactsSelectContacts';
 import Route from '../utils/Route';
+import { screenOptions } from './utils';
 
 const Stack = createStackNavigator();
 
@@ -15,6 +16,7 @@ export const EmergencyContactsStack = memo(() => {
   return (
     <Stack.Navigator
       screenOptions={{
+        ...screenOptions,
         headerTitleAlign: 'center',
         headerBackImage: () => (
           <IconOutline

package/src/navigations/SharedStack.js

@@ -8,6 +8,7 @@ import { useTranslations } from '../hooks/Common/useTranslations';
 import Shared from '../screens/SharedUnit';
 import { Colors } from '../configs';
 import Routes from '../utils/Route';
+import { screenOptions } from './utils';
 
 const Stack = createStackNavigator();
 const SharedStack = memo(() => {
@@ -20,6 +21,7 @@ const SharedStack = memo(() => {
         name={Routes.Shared}
         component={Shared}
         options={{
+          ...screenOptions,
           title: t('text_shared_with_me'),
           headerLeft: () => (
             <TouchableOpacity

package/src/navigations/UnitStack.js

@@ -9,6 +9,7 @@ import { useTranslations } from '../hooks/Common/useTranslations';
 import { Colors, Device } from '../configs';
 import Route from '../utils/Route';
 import ActivityLogScreen from '../screens/ActivityLog';
+import { screenOptions } from './utils';
 
 import AQIGuide from '../screens/AQIGuide';
 import DeviceDetail from '../screens/Device/detail';
@@ -52,6 +53,7 @@ export const UnitStack = memo((props) => {
   return (
     <Stack.Navigator
       screenOptions={{
+        ...screenOptions,
         headerTitleAlign: 'center',
         headerBackImage: () => (
           <IconOutline

package/src/navigations/utils.js

@@ -19,6 +19,9 @@ export const screenOptions = {
 
 export const popAction = (value) => StackActions.pop(value);
 
+export const replace = (routeName, params) =>
+  StackActions.replace(routeName, params);
+
 export default {
   navigate,
   goBack,

package/src/screens/AddCommon/SelectSubUnit.js

@@ -17,8 +17,14 @@ const AddCommonSelectSubUnit = ({ route }) => {
   const t = useTranslations();
   const navigation = useNavigation();
   const isFocused = useIsFocused();
-  const { addType, unit_id, sensor_data, listSelectDevice, smart_account_id } =
-    route.params;
+  const {
+    addType,
+    unit_id,
+    sensor_data,
+    listSelectDevice,
+    smart_account_id,
+    smart_account_id_from_backend,
+  } = route.params;
   const [selectedIndex, setSelectedIndex] = useState(-1);
   const [unit, setUnit] = useState([]);
   const [title, setTitle] = useState('');
@@ -78,6 +84,8 @@ const AddCommonSelectSubUnit = ({ route }) => {
           sensor_data: sensor_data,
           listSelectDevice: listSelectDevice,
           smart_account_id: smart_account_id,
+          unit_id: unit_id,
+          smart_account_id_from_backend: smart_account_id_from_backend,
         });
         break;
       case 'AddVconnexDevice':
@@ -105,6 +113,8 @@ const AddCommonSelectSubUnit = ({ route }) => {
     sensor_data,
     listSelectDevice,
     smart_account_id,
+    unit_id,
+    smart_account_id_from_backend,
   ]);
 
   const handleSelectIndex = (index) => {