@eohjsc/react-native-smart-city 0.2.84 → 0.2.87

package/src/commons/SubUnit/__test__/ShortDetail.test.js

@@ -1,21 +1,27 @@
 import React from 'react';
-import { Image, View, TouchableWithoutFeedback } from 'react-native';
+import { Image, View } from 'react-native';
 import { act, create } from 'react-test-renderer';
 import { TESTID } from '../../../configs/Constants';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
+import ShortDetailSubUnit from '../ShortDetail';
+import ItemAddNew from '../../Device/ItemAddNew';
 import Routes from '../../../utils/Route';
 
-const wrapComponent = (unit, station) => (
+const wrapComponent = (props) => (
   <SCProvider initState={mockSCStore({})}>
-    <ShortDetailSubUnit unit={unit} station={station} />
+    <ShortDetailSubUnit {...props} />
   </SCProvider>
 );
 
-import ShortDetailSubUnit from '../ShortDetail';
+jest.mock('react', () => {
+  return {
+    ...jest.requireActual('react'),
+    memo: (x) => x,
+  };
+});
 
 const mockedNavigate = jest.fn();
-
 jest.mock('@react-navigation/native', () => {
   return {
     ...jest.requireActual('@react-navigation/native'),
@@ -27,43 +33,46 @@ jest.mock('@react-navigation/native', () => {
 });
 
 describe('test ShortDetail Subunit', () => {
-  let tree, unit, station;
+  let tree, props;
   beforeEach(() => {
-    unit = {
-      address: null,
-      background:
-        'https://cdn-staging.eoh.io/image-90a42c0a-96ad-42e5-b736-b2b8a2e7fb20.jpg',
-      can_add: true,
-      icon: 'https://cdn-staging.eoh.io/baelen.jpg',
-      id: 21,
-      main_config_count: 0,
-      name: 'Gia Cat Unit',
-      remote_control_options: { bluetooth: [], googlehome: [] },
-      stations: [
-        {
-          background:
-            'https://cdn-staging.eoh.io/image-cc9ea441-e113-46b5-bff3-23d924723733.jpg',
-          camera: null,
-          id: 71,
-          name: 'Station 1',
-          sensors: [],
-        },
-      ],
-      user_id: 64,
-    };
-
-    station = {
-      background:
-        'https://cdn-staging.eoh.io/image-cc9ea441-e113-46b5-bff3-23d924723733.jpg',
-      camera: null,
-      id: 71,
-      name: 'Station 1',
+    props = {
+      unit: {
+        address: null,
+        background:
+          'https://cdn-staging.eoh.io/image-90a42c0a-96ad-42e5-b736-b2b8a2e7fb20.jpg',
+        can_add: true,
+        icon: 'https://cdn-staging.eoh.io/baelen.jpg',
+        id: 21,
+        main_config_count: 0,
+        name: 'Gia Cat Unit',
+        remote_control_options: { bluetooth: [], googlehome: [] },
+        stations: [
+          {
+            background:
+              'https://cdn-staging.eoh.io/image-cc9ea441-e113-46b5-bff3-23d924723733.jpg',
+            camera: null,
+            id: 71,
+            name: 'Station 1',
+            sensors: [],
+          },
+        ],
+        user_id: 64,
+      },
+      station: {
+        background:
+          'https://cdn-staging.eoh.io/image-cc9ea441-e113-46b5-bff3-23d924723733.jpg',
+        camera: null,
+        id: 71,
+        name: 'Station 1',
+      },
+      isNetworkConnected: true,
+      isGGHomeConnected: true,
     };
   });
 
   test('render ShortDetail', () => {
     act(() => {
-      tree = create(wrapComponent(unit, station));
+      tree = create(wrapComponent(props));
     });
     const instance = tree.root;
     const image = instance.findAllByType(Image);
@@ -74,9 +83,9 @@ describe('test ShortDetail Subunit', () => {
   });
 
   test('render ShortDetail without background', () => {
-    station.background = '';
+    props.station.background = '';
     act(() => {
-      tree = create(wrapComponent(unit, station));
+      tree = create(wrapComponent(props));
     });
     const instance = tree.root;
     const image = instance.findAllByType(Image);
@@ -87,7 +96,7 @@ describe('test ShortDetail Subunit', () => {
   });
 
   test('render ShortDetail with camera', () => {
-    station.camera = {
+    props.station.camera = {
       id: 2,
       name: 'EoH Gate',
       preview_uri: '',
@@ -95,7 +104,7 @@ describe('test ShortDetail Subunit', () => {
     };
 
     act(() => {
-      tree = create(wrapComponent(unit, station));
+      tree = create(wrapComponent(props));
     });
     const instance = tree.root;
     const view = instance.findAllByType(View);
@@ -106,7 +115,7 @@ describe('test ShortDetail Subunit', () => {
   });
 
   test('render ShortDetail with device', () => {
-    station.sensors = [
+    props.station.sensors = [
       {
         action: {
           color: '#00979D',
@@ -129,7 +138,7 @@ describe('test ShortDetail Subunit', () => {
     ];
 
     act(() => {
-      tree = create(wrapComponent(unit, station));
+      tree = create(wrapComponent(props));
     });
     const instance = tree.root;
     const itemDevice = instance.findAll(
@@ -141,19 +150,19 @@ describe('test ShortDetail Subunit', () => {
 
   test('render ShortDetail add new device', () => {
     act(() => {
-      tree = create(wrapComponent(unit, station));
+      tree = create(wrapComponent(props));
     });
     const instance = tree.root;
-    const buttonAddNew = instance.findAllByType(TouchableWithoutFeedback);
+    const buttonAddNew = instance.findByType(ItemAddNew);
     act(() => {
-      buttonAddNew[0].props.onPress();
+      buttonAddNew.props.onAddNew();
     });
     expect(mockedNavigate).toHaveBeenCalledWith(Routes.AddDeviceStack, {
       screen: Routes.ScanSensorQR,
       params: {
-        station_id: station.id,
-        unit_id: unit.id,
-        unit_name: unit.name,
+        station_id: props.station.id,
+        unit_id: props.unit.id,
+        unit_name: props.unit.name,
       },
     });
   });

package/src/commons/WheelDateTimePicker/index.js

@@ -92,10 +92,14 @@ const WheelDateTimePicker = ({
   }, [dateSelected, hourSelected, minuteSelected, onCancel, onPicked]);
 
   const title = useMemo(() => {
-    if (mode === 'time') {
-      return t('set_time');
+    switch (mode) {
+      case 'time':
+        return t('set_time');
+      case 'datetime':
+        return t('set_date_time');
+      default:
+        return t('minutes');
     }
-    return t('set_date_time');
   }, [t, mode]);
 
   return (
@@ -125,7 +129,7 @@ const WheelDateTimePicker = ({
             style={styles.picker}
           />
         </View>
-      ) : (
+      ) : mode === 'datetime' ? (
         <View style={styles.container}>
           <Picker
             dataSource={dateData}
@@ -153,6 +157,16 @@ const WheelDateTimePicker = ({
             style={styles.picker}
           />
         </View>
+      ) : (
+        <View style={styles.container}>
+          <Picker
+            dataSource={minuteData}
+            selectedIndex={indexInitialMinute}
+            onValueChange={onValueMinuteChange}
+            keyPrefix="minute"
+            style={styles.picker}
+          />
+        </View>
       )}
       <ViewButtonBottom
         leftTitle={t('cancel')}

package/src/configs/API.js

@@ -53,6 +53,8 @@ const API = {
   CHIP: {
     CHECK_FINALIZED: () =>
       SCConfig.apiRoot + '/property_manager/stations/check_chip_finalized/',
+    GET_CHIPS_FROM_UNIT: (id) =>
+      SCConfig.apiRoot + `/property_manager/get_chips/?unit_id=${id}`,
   },
   SENSOR: {
     SENSOR_DETAIL: (id) =>
@@ -180,9 +182,9 @@ const API = {
         `/connection_manager/lg_thinq/device_status/${sensorId}/`,
     },
     VCONNEX: {
-      AUTHORIZE: (client_id, redirect_uri, user_id, station_id) =>
+      AUTHORIZE: (client_id, redirect_uri, user_id, unit_id, station_id) =>
         // eslint-disable-next-line max-len
-        `https://partner-api-stg.vconnex.vn/oauth/authorize?client_id=${client_id}&redirect_uri=${redirect_uri}&response_type=code&scope=SYNCH&scope=CONTROL&scope=QUERY&state=${user_id}@${station_id}`,
+        `https://partner-api.vconnex.vn/oauth/authorize?client_id=${client_id}&redirect_uri=${redirect_uri}&response_type=code&scope=SYNCH&scope=CONTROL&scope=QUERY&state=${user_id}@${unit_id}@${station_id}`,
     },
   },
   NOTIFICATION: {

package/src/configs/Colors.js

@@ -110,6 +110,7 @@ export const Colors = {
   Blue10: '#1890FF',
   Blue11: '#096DD9',
   Blue12: '#0050B3',
+  Blue13: '#E2F0F8',
 
   //Range Volcano:
   Volcano3: '#FFBB96',

package/src/configs/Constants.js

@@ -487,6 +487,12 @@ export const TESTID = {
   TOUCH_SHARED_UNIT: 'TOUCH_SHARED_UNIT',
   SHARED_UNIT_OWN_BY: 'SHARED_UNIT_OWN_BY',
 
+  // Select subunit
+
+  SELECT_SUBUNIT_NAME: 'SELECT_SUBUNIT_NAME',
+  SELECT_SUBUNIT_RADIO_BUTTON: 'SELECT_SUBUNIT_RADIO_BUTTON',
+  SELECT_SUBUNIT_SELECT: 'SELECT_SUBUNIT_SELECT',
+
   // Select unit
   SELECT_UNIT_NAME: 'SELECT_UNIT_NAME',
   SELECT_UNIT_RADIO_BUTTON: 'SELECT_UNIT_RADIO_BUTTON',
@@ -561,6 +567,12 @@ export const TESTID = {
   ADD_NEW_GATEWAY_THEN_SELECT: 'ADD_NEW_GATEWAY_THEN_SELECT',
   ADD_NEW_GATEWAY_TEXT_IMEI: 'ADD_NEW_GATEWAY_TEXT_IMEI',
 
+  // Select Gateway
+
+  SELECT_GATEWAY_NAME: 'SELECT_GATEWAY_NAME',
+  SELECT_GATEWAY_RADIO_BUTTON: 'SELECT_GATEWAY_RADIO_BUTTON',
+  SELECT_GATEWAY_SELECT: 'SELECT_GATEWAY_SELECT',
+
   // Header
   HEADER_ANI_TITLE: 'HEADER_ANI_TITLE',
 
@@ -624,6 +636,16 @@ export const TESTID = {
 
   // MoveToAnotherSubUnit
   ROW_SUB_UNIT: 'ROW_SUB_UNIT',
+
+  //SetupGeneratePasscode
+  GENERATE_PASSCODE_CHOOSE_USER: 'GENERATE_PASSCODE_CHOOSE_USER',
+  GENERATE_PASSCODE_SET_TIME: 'GENERATE_PASSCODE_SET_TIME',
+  GENERATE_PASSCODE_SET_DURATION: 'GENERATE_PASSCODE_SET_DURATION',
+
+  //AutoLock
+  AUTO_LOCK_BUTTON_ENABLE: 'AUTO_LOCK_BUTTON_ENABLE',
+  AUTO_LOCK_BUTTON_INSTANT: 'AUTO_LOCK_BUTTON_INSTANT',
+  AUTO_LOCK_BUTTON_RELOCK_TIMING: 'AUTO_LOCK_BUTTON_RELOCK_TIMING',
 };
 
 export const NOTIFICATION_TYPES = {
@@ -648,6 +670,11 @@ export const NOTIFICATION_TYPES = {
   NOTIFY_REMOVE_MEMBER: 'NOTIFY_REMOVE_MEMBER',
   NOTIFY_MEMBER_LEAVE_UNIT: 'NOTIFY_MEMBER_LEAVE_UNIT',
   NOTIFY_RENAME_UNIT: 'NOTIFY_RENAME_UNIT',
+  NOTIFY_DEVICE_DISCONNECT: 'NOTIFY_DEVICE_DISCONNECT',
+  NOTIFY_RENAME_SUB_UNIT: 'NOTIFY_RENAME_SUB_UNIT',
+  NOTIFY_UPDATE_ADDRESS: 'NOTIFY_UPDATE_ADDRESS',
+  NOTIFY_REMOVE_SUB_UNIT: 'NOTIFY_REMOVE_SUB_UNIT',
+  NOTIFY_REMOVE_DEVICE: 'NOTIFY_REMOVE_DEVICE',
 };
 
 export const ACTIVITY_LOG_TYPES = {
@@ -655,3 +682,15 @@ export const ACTIVITY_LOG_TYPES = {
   ACTIVATED_BY: 'ACTIVATED_BY',
   SCRIPT_UPDATED_BY: 'SCRIPT_UPDATED_BY',
 };
+
+export const SENSOR_TYPE = {
+  AIR_QUALITY: 'air_quality',
+  TURBIDITY: 'turbidity',
+  PH: 'ph',
+  CLO: 'clo',
+  UV: 'uv',
+  SMOKE: 'smoke',
+  FIRE: 'fire',
+  SOS: 'sos',
+  FILTER_WATER: 'filter_water',
+};

package/src/configs/Images.js

@@ -11,4 +11,6 @@ export default {
   buttonLeftCurtain: require('../Images/Common/buttonLeftCurtain.png'),
   buttonRightCurtain: require('../Images/Common/buttonRightCurtain.png'),
   shadowButton: require('../Images/Common/shadowButton.png'),
+  eye: require('../Images/Common/eye.png'),
+  eyeClosed: require('../Images/Common/eye-closed.png'),
 };

package/src/context/actionType.ts

@@ -6,6 +6,7 @@ export const Action = {
   LIST_ACTION: 'LIST_ACTION',
   IS_FIRST_OPEN_CAMERA: 'IS_FIRST_OPEN_CAMERA',
   IS_LAVIDA_SOURCE: 'IS_LAVIDA_SOURCE',
+  IS_CONNECT_WIFI_GATEWAY: 'IS_CONNECT_WIFI_GATEWAY',
 };
 
 export type AuthData = {
@@ -50,4 +51,5 @@ export type ActionDataMap = {
 export type AppType = {
   isFirstOpenCamera: boolean;
   isLavidaSource: boolean;
+  isConnectWifiGateway: boolean;
 };

package/src/context/mockStore.ts

@@ -49,6 +49,7 @@ export const mockSCStore = (data: ContextData): ContextData => {
     listAction: [...mockDataStore.listAction, ...(data?.listAction || [])],
     app: {
       isFirstOpenCamera: true,
+      isConnectWifiGateway: false,
     },
   };
 };

package/src/context/reducer.ts

@@ -40,6 +40,7 @@ export const initialState = {
   app: {
     isFirstOpenCamera: true,
     isLavidaSource: false,
+    isConnectWifiGateway: false,
   },
 };
 
@@ -107,6 +108,15 @@ export const reducer = (currentState: ContextData, action: Action) => {
         },
       };
     }
+    case Action.IS_CONNECT_WIFI_GATEWAY: {
+      return {
+        ...currentState,
+        app: {
+          ...currentState.app,
+          isConnectWifiGateway: payload,
+        },
+      };
+    }
     default:
       return currentState;
   }

package/src/hooks/Common/useBlockBackAndroid.js

@@ -2,10 +2,12 @@ import { useIsFocused } from '@react-navigation/native';
 import { useCallback, useEffect } from 'react';
 import { BackHandler } from 'react-native';
 
-export const useBlockBackAndroid = () => {
+export const useBlockBackAndroid = (actionBack) => {
   const focused = useIsFocused();
   const blockBack = useCallback(() => {
+    actionBack && actionBack();
     return true;
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
   useEffect(() => {
     if (focused) {

package/src/iot/RemoteControl/Bluetooth.js

@@ -185,9 +185,9 @@ export const sendDataOverBluetooth = async (
     return result;
   }
 
-  // eslint-disable-next-line no-shadow
-  setTimeout(async (device) => {
-    await device.cancelConnection();
+  const timeout = setTimeout(() => {
+    device.cancelConnection();
+    clearTimeout(timeout);
   }, responseTime);
   return result;
 };

package/src/navigations/AddDeviceStack.js

@@ -3,9 +3,11 @@ import React, { memo } from 'react';
 
 import AddCommonSelectUnit from '../screens/AddCommon/SelectUnit';
 import AddCommonSelectSubUnit from '../screens/AddCommon/SelectSubUnit';
+import AddGatewaySelectGateway from '../screens/AddNewGateway/SelectGateway';
 import AddNewDevice from '../screens/AddNewDevice';
 import ConnectDevices from '../screens/AddNewDevice/ConnectDevices';
 import ConnectingDevices from '../screens/AddNewDevice/ConnectingDevices';
+import ConnectingProcess from '../commons/ConnectingProcess';
 import ScanSensorQR from '../screens/ScanSensorQR';
 import Route from '../utils/Route';
 import { screenOptions } from './utils';
@@ -28,6 +30,14 @@ export const AddDeviceStack = memo(() => {
         name={Route.AddCommonSelectSubUnit}
         component={AddCommonSelectSubUnit}
       />
+      <Stack.Screen
+        name={Route.AddGatewaySelectGateway}
+        component={AddGatewaySelectGateway}
+      />
+      <Stack.Screen
+        name={Route.ConnectingProcess}
+        component={ConnectingProcess}
+      />
       <Stack.Screen name={Route.AddNewDevice} component={AddNewDevice} />
       <Stack.Screen name={Route.ScanSensorQR} component={ScanSensorQR} />
       <Stack.Screen

package/src/navigations/SmartIrStack.js

@@ -0,0 +1,31 @@
+import { createStackNavigator } from '@react-navigation/stack';
+import React, { memo } from 'react';
+
+import SelectDeviceType from '../screens/SmartIr/components/SelectDeviceType';
+import SelectBrand from '../screens/SmartIr/components/SelectBrand';
+import GroupButtonByType from '../screens/SmartIr/components/GroupButtonByType/GroupButtonByType';
+import Route from '../utils/Route';
+import { screenOptions } from './utils';
+
+const Stack = createStackNavigator();
+
+export const SmartIrStack = memo(() => {
+  return (
+    <Stack.Navigator
+      screenOptions={{
+        ...screenOptions,
+        headerShown: false,
+      }}
+    >
+      <Stack.Screen
+        name={Route.SelectDeviceType}
+        component={SelectDeviceType}
+      />
+      <Stack.Screen name={Route.SelectBrand} component={SelectBrand} />
+      <Stack.Screen
+        name={Route.GroupButtonByType}
+        component={GroupButtonByType}
+      />
+    </Stack.Navigator>
+  );
+});

package/src/navigations/SmartLockStack.js

@@ -0,0 +1,51 @@
+import { createStackNavigator } from '@react-navigation/stack';
+import React, { memo } from 'react';
+
+import Route from '../utils/Route';
+import { screenOptions } from './utils';
+import SetupGeneratePasscode from '../commons/ActionGroup/OnOffSmartLock/SetupGeneratePasscode/index';
+import AutoLock from '../commons/ActionGroup/OnOffSmartLock/AutoLock/index';
+import PasscodeList from '../commons/ActionGroup/OnOffSmartLock/PasscodeList/index';
+import ItemPasscode from '../commons/ActionGroup/OnOffSmartLock/PasscodeList/ItemPasscode';
+
+const Stack = createStackNavigator();
+
+export const SmartLockStack = memo(() => {
+  return (
+    <Stack.Navigator
+      screenOptions={{
+        ...screenOptions,
+        headerShown: false,
+      }}
+    >
+      <Stack.Screen
+        name={Route.SetupGeneratePasscode}
+        component={SetupGeneratePasscode}
+        options={{
+          headerShown: false,
+        }}
+      />
+      <Stack.Screen
+        name={Route.AutoLock}
+        component={AutoLock}
+        options={{
+          headerShown: false,
+        }}
+      />
+      <Stack.Screen
+        name={Route.PasscodeList}
+        component={PasscodeList}
+        options={{
+          headerShown: false,
+        }}
+      />
+      <Stack.Screen
+        name={Route.ItemPasscode}
+        component={ItemPasscode}
+        options={{
+          headerShown: false,
+        }}
+      />
+    </Stack.Navigator>
+  );
+});

package/src/navigations/UnitStack.js

@@ -117,12 +117,16 @@ export const UnitStack = memo((props) => {
         component={ChooseLocation}
         options={{
           headerShown: true,
+          headerTitleStyle: {
+            ...styles.headerLocation,
+          },
           headerTitle: () => (
-            <View style={styles.alignCenter}>
+            <View style={styles.headerLocation}>
               <Text type="H3" color={Colors.Gray9} bold>
                 {t('choose_on_map')}
               </Text>
-              <Text type="H4" color={Colors.Gray8}>
+
+              <Text type="H4" color={Colors.Gray8} style={styles.headerContent}>
                 {t('plan_and_zoom_to_adjust')}
               </Text>
             </View>
@@ -323,7 +327,12 @@ const styles = StyleSheet.create({
   icLeft: {
     marginLeft: Device.isIOS ? 8 : 0,
   },
-  alignCenter: {
+  headerLocation: {
     alignItems: 'center',
+    justifyContent: 'center',
+  },
+  headerContent: {
+    textAlign: 'center',
+    paddingBottom: 8,
   },
 });

package/src/screens/ActivityLog/hooks/index.js

@@ -37,6 +37,7 @@ String.prototype.capitalize = function () {
   return this.charAt(0).toUpperCase() + this.slice(1);
 };
 
+let onEndReachedCalledDuringMomentum = false;
 let dataTemp = [];
 
 export default ({ id, type, share, filterEnabled }) => {
@@ -59,7 +60,7 @@ export default ({ id, type, share, filterEnabled }) => {
     if (page === 1) {
       setIsRefreshing(true);
     } else {
-      if (!isCanLoadMore || isLoading) {
+      if (!isCanLoadMore) {
         return;
       }
       setIsLoading(true);
@@ -81,6 +82,7 @@ export default ({ id, type, share, filterEnabled }) => {
       params.append(key, value);
     }
     params.append('page', page);
+
     const { success, data } = await axiosGet(api.url(id), {
       params: params,
     });
@@ -91,9 +93,9 @@ export default ({ id, type, share, filterEnabled }) => {
         setData(api.standardizeData(results));
       } else {
         dataTemp = dataTemp.concat(results);
+        setIsCanLoadMore(page < Math.ceil(data.count / 20));
         setData(api.standardizeData(dataTemp));
       }
-      setIsCanLoadMore(page < Math.ceil(data.count / 20));
     }
     page === 1 ? setIsRefreshing(false) : setIsLoading(false);
   };
@@ -110,9 +112,20 @@ export default ({ id, type, share, filterEnabled }) => {
     }
   };
 
-  const onRefresh = () => fetchData({ ...filters, page: 1 });
+  const onRefresh = () => {
+    setIsCanLoadMore(true);
+    fetchData({ ...filters, page: 1 });
+  };
+
+  const onLoadMore = () => {
+    if (!onEndReachedCalledDuringMomentum) {
+      onEndReachedCalledDuringMomentum = true;
+      fetchData({ ...filters, page: page + 1 });
+    }
+  };
 
-  const onLoadMore = () => fetchData({ ...filters, page: page + 1 });
+  const onMomentumScrollBegin = () =>
+    (onEndReachedCalledDuringMomentum = false);
 
   return {
     data,
@@ -124,5 +137,6 @@ export default ({ id, type, share, filterEnabled }) => {
     fetchMembers,
     filters,
     setFilters,
+    onMomentumScrollBegin,
   };
 };

package/src/screens/ActivityLog/index.js

@@ -34,7 +34,9 @@ const ActivityLogScreen = ({ route }) => {
     fetchMembers,
     filters,
     setFilters,
+    onMomentumScrollBegin,
   } = useActivityLog({ id, type, share, filterEnabled });
+
   const [showFilterPopup, setShowFilterPopup, setHideFilterPopup] =
     useBoolean();
 
@@ -113,6 +115,7 @@ const ActivityLogScreen = ({ route }) => {
           removeClippedSubviews={true}
           maxToRenderPerBatch={20}
           contentContainerStyle={styles.contentContainerStyle}
+          onMomentumScrollBegin={onMomentumScrollBegin}
         />
       </View>
       {(filterEnabled.user || filterEnabled.date) && (