@eohjsc/react-native-smart-city 0.3.21 → 0.3.24

package/src/navigations/UnitStack.js

@@ -4,10 +4,12 @@ import { IconOutline } from '@ant-design/icons-react-native';
 import { createStackNavigator } from '@react-navigation/stack';
 import { BleManager } from 'react-native-ble-plx';
 import NetInfo from '@react-native-community/netinfo';
+import { AppState } from 'react-native';
 import { get } from 'lodash';
 
 import Text from '../commons/Text';
 import { useTranslations } from '../hooks/Common/useTranslations';
+import { unwatchAllConfigs } from '../iot/Monitor';
 import { Colors, Device } from '../configs';
 import Route from '../utils/Route';
 import ActivityLogScreen from '../screens/ActivityLog';
@@ -51,7 +53,7 @@ import EmergencySetting from '../screens/EmergencySetting';
 import ConfirmUnitDeletion from '../screens/ConfirmUnitDeletion';
 import InfoMemberUnit from '../screens/Sharing/InfoMemberUnit';
 import EnterPassword from '../screens/EnterPassword';
-import SelectFavoritesDevices from '../screens/Unit/SelectFavoritesDevices';
+import SelectAddToFavorites from '../screens/Unit/SelectAddToFavorites';
 import { HanetCameraStack } from './HanetCameraStack';
 import { axiosGet } from '../utils/Apis/axios';
 import { API } from '../configs';
@@ -107,6 +109,28 @@ export const UnitStack = memo((props) => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
+  useEffect(() => {
+    const subscription = AppState.addEventListener('change', (nextAppState) => {
+      if (nextAppState === 'background') {
+        unwatchAllConfigs();
+      }
+    });
+    return () => {
+      subscription?.remove();
+    };
+  }, []);
+
+  useEffect(() => {
+    return () => {
+      const id = unitId || unitData?.id;
+      if (!id) {
+        return;
+      }
+      setAction(Action.NEED_UPDATE_VALUE_EVALUATIONS, id);
+    };
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
   return (
     <Stack.Navigator
       screenOptions={{
@@ -402,8 +426,8 @@ export const UnitStack = memo((props) => {
         }}
       />
       <Stack.Screen
-        name={Route.SelectFavoritesDevices}
-        component={SelectFavoritesDevices}
+        name={Route.SelectAddToFavorites}
+        component={SelectAddToFavorites}
         options={{
           headerShown: false,
         }}

package/src/screens/AddNewAction/SelectAction.js

@@ -349,7 +349,7 @@ const SelectAction = memo(({ route }) => {
             <LoadingSelectAction style={styles.container} />
           ) : (
             sensorData.map((item) => {
-              const isHasValue = !!item?.value || item?.value === 0;
+              const isHasValue = !!item?.value;
               return (
                 <View style={styles.wrapItem} key={item?.id}>
                   <TitleCheckBox

package/src/screens/AddNewAction/SetupSensor.js

@@ -149,6 +149,10 @@ const SetUpSensor = () => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [minimum, maximum, value]);
 
+  useEffect(() => {
+    !isNumberValue && setValue(1);
+  }, [isNumberValue]);
+
   useEffect(() => {
     if (!isHasLimit && maximum - 150 <= value * 10) {
       setMaximum(maximum + 200);

package/src/screens/AddNewGateway/PlugAndPlay/ConnectWifiWarning.js

@@ -28,14 +28,9 @@ import { Action } from '../../../context/actionType';
 import { TESTID } from '../../../configs/Constants';
 import Connecting from '../../../commons/Connecting';
 
-const isIos = Platform.OS === 'ios';
 const isAndroid = Platform.OS === 'android';
-
-let socket = null;
-if (isIos) {
-  socket = dgram.createSocket({ type: 'udp4' });
-  socket.bind(54321);
-}
+let socket,
+  intervalSend = null;
 
 const ConnectWifiWarning = memo(({ route }) => {
   const {
@@ -83,77 +78,44 @@ const ConnectWifiWarning = memo(({ route }) => {
   }, [getPermissionWifiAndroid]);
 
   const handleSend = async () => {
-    let intervalSend = null;
-    if (isIos) {
-      await setIsPercentConnect(1);
-      await socket.on('message', (msg, rinfo) => {
-        clearInterval(intervalSend);
-        const data = JSON.parse(msg.toString());
-        if (Object.prototype.hasOwnProperty.call(data, 'wifi')) {
-          navigate(Routes.GatewayWifiList, {
-            list_wifi: data.wifi,
-            unit_id: unit_id,
-            chip_id: chip_id,
-            scan_sensor_data: { ...body },
-            wifi_ssid: wifi_ssid,
-            wifi_pass: wifi_pass,
-            unit_name: unit_name,
-            devicePrefixName: devicePrefixName,
-            socket: socket,
-          });
-        }
-      });
-      intervalSend = setInterval(() => {
-        socket.send(
-          JSON.stringify({ type: 'scan', data: { wifi: '' } }),
-          undefined,
-          undefined,
-          54321,
-          '192.168.27.1',
-          undefined
-        );
-      }, 1000);
-      socket.on('error', () => {
-        ToastBottomHelper.error(t('server_error'));
-        setAction(Action.IS_CONNECT_WIFI_GATEWAY, false);
-        goBack();
-      });
-    } else {
-      const dgSocket = dgram.createSocket({ type: 'udp4' });
-      await setIsPercentConnect(1);
-      await dgSocket.bind(54321);
-      await dgSocket.on('message', (msg, rinfo) => {
-        const data = JSON.parse(msg.toString());
-        if (Object.prototype.hasOwnProperty.call(data, 'wifi')) {
-          navigate(Routes.GatewayWifiList, {
-            list_wifi: data.wifi,
-            unit_id: unit_id,
-            chip_id: chip_id,
-            scan_sensor_data: { ...body },
-            wifi_ssid: wifi_ssid,
-            wifi_pass: wifi_pass,
-            unit_name: unit_name,
-            devicePrefixName: devicePrefixName,
-            socket: dgSocket,
-          });
-        }
-      });
-      await dgSocket.once('listening', async () => {
-        await dgSocket.send(
-          JSON.stringify({ type: 'scan', data: { wifi: '' } }),
-          undefined,
-          undefined,
-          54321,
-          '192.168.27.1',
-          undefined
-        );
-      });
-      dgSocket.on('error', () => {
-        ToastBottomHelper.error(t('server_error'));
-        setAction(Action.IS_CONNECT_WIFI_GATEWAY, false);
-        goBack();
-      });
-    }
+    socket = dgram.createSocket({ type: 'udp4' });
+    socket.bind(54321);
+    setIsPercentConnect(1);
+
+    socket.on('message', (msg, rinfo) => {
+      clearInterval(intervalSend);
+      const data = JSON.parse(msg.toString());
+      if (Object.prototype.hasOwnProperty.call(data, 'wifi')) {
+        navigate(Routes.GatewayWifiList, {
+          list_wifi: data.wifi,
+          unit_id: unit_id,
+          chip_id: chip_id,
+          scan_sensor_data: { ...body },
+          wifi_ssid: wifi_ssid,
+          wifi_pass: wifi_pass,
+          unit_name: unit_name,
+          devicePrefixName: devicePrefixName,
+          socket: socket,
+        });
+      }
+    });
+
+    socket.on('error', () => {
+      ToastBottomHelper.error(t('server_error'));
+      setAction(Action.IS_CONNECT_WIFI_GATEWAY, false);
+      goBack();
+    });
+
+    intervalSend = setInterval(() => {
+      socket.send(
+        JSON.stringify({ type: 'scan', data: { wifi: '' } }),
+        undefined,
+        undefined,
+        54321,
+        '192.168.27.1',
+        undefined
+      );
+    }, 5000); // workaround, todo Bang continue research
   };
 
   const handleConnectWifiGateway = async () => {
@@ -171,6 +133,10 @@ const ConnectWifiWarning = memo(({ route }) => {
     );
   };
 
+  useEffect(() => {
+    return () => intervalSend && clearInterval(intervalSend);
+  }, []);
+
   return (
     <View style={styles.screen}>
       {!isLoading ? (

package/src/screens/AddNewGateway/PlugAndPlay/GatewayWifiList.js

@@ -11,7 +11,6 @@ import {
   TouchableOpacity,
   ScrollView,
   ActivityIndicator,
-  Platform,
 } from 'react-native';
 import { HeaderCustom } from '../../../commons/Header';
 import { Colors } from '../../../configs';
@@ -128,11 +127,8 @@ const GatewayWifiList = memo(({ route }) => {
 
   const sendConnect = useCallback(
     (i) => {
-      setTimeout(async () => {
+      const timeoutSendConnect = setTimeout(async () => {
         i++;
-        await socket.on('message', (msg, rinfo) => {
-          handleSocketOnMsg(msg);
-        });
         socket.send(
           JSON.stringify({
             type: 'connect',
@@ -146,48 +142,32 @@ const GatewayWifiList = memo(({ route }) => {
         );
         if (i < 3) {
           sendConnect(i);
+          clearTimeout(timeoutSendConnect);
         }
       }, 1000);
     },
-    [handleSocketOnMsg, password, selectedWifi, socket]
+    [password, selectedWifi, socket]
   );
 
   const connectWifi = useCallback(async () => {
     if (!isConnectWifiGateway) {
-      if (Platform.OS === 'ios') {
-        sendConnect(0);
-        setAction(Action.IS_CONNECT_WIFI_GATEWAY, true);
-        setIsSendWifi(true);
-      } else {
-        socket.on('message', (msg, rinfo) => {
-          handleSocketOnMsg(msg);
-        });
-        socket.send(
-          JSON.stringify({
-            type: 'connect',
-            data: { wifi: { ssid: selectedWifi, pass: password } },
-          }),
-          undefined,
-          undefined,
-          54321,
-          '192.168.27.1',
-          undefined
-        );
-        socket.on('error', () => {
-          ToastBottomHelper.error(t('server_error'));
-          setAction(Action.IS_CONNECT_WIFI_GATEWAY, false);
-          goBack();
-        });
-        setAction(Action.IS_CONNECT_WIFI_GATEWAY, true);
-        setIsSendWifi(true);
-      }
+      socket.on('message', (msg, rinfo) => {
+        handleSocketOnMsg(msg);
+      });
+      socket.on('error', () => {
+        ToastBottomHelper.error(t('server_error'));
+        setAction(Action.IS_CONNECT_WIFI_GATEWAY, false);
+        goBack();
+      });
+
+      sendConnect(0);
+      setAction(Action.IS_CONNECT_WIFI_GATEWAY, true);
+      setIsSendWifi(true);
     }
   }, [
     goBack,
     handleSocketOnMsg,
     isConnectWifiGateway,
-    password,
-    selectedWifi,
     sendConnect,
     setAction,
     socket,

package/src/screens/AddNewGateway/PlugAndPlay/__test__/GatewayWifiList.test.js

@@ -97,6 +97,8 @@ describe('Test GatewayWifiList', () => {
       await ButtonPopup.props.onPressMain();
     });
     expect(socket.on).toBeCalled();
+    expect(socket.on.mock.calls[0][0]).toEqual('message');
+    jest.runOnlyPendingTimers();
     expect(socket.send).toBeCalled();
 
     const mockWifiThen = jest.fn();

package/src/screens/AllCamera/__test__/index.test.js

@@ -90,7 +90,7 @@ describe('Test AllCamera screen', () => {
     });
     const instance = tree.root;
     const TouchableOpacities = instance.findAllByType(TouchableOpacity);
-    expect(TouchableOpacities).toHaveLength(11);
+    expect(TouchableOpacities).toHaveLength(9);
     const ModalFullVideos = instance.findAllByType(ModalFullVideo);
     expect(ModalFullVideos).toHaveLength(1);
     act(() => {

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

@@ -12,7 +12,6 @@ import { TESTID } from '../../../configs/Constants';
 import Text from '../../../commons/Text';
 import { IconFill } from '@ant-design/icons-react-native';
 import CurrentRainSensor from '../../../commons/Device/RainningSensor/CurrentRainSensor';
-import { ConnectedViewHeader } from '../../../commons/Device';
 import { getTranslate } from '../../../utils/I18n';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
@@ -30,6 +29,7 @@ jest.mock('@react-navigation/native', () => {
     useNavigation: () => ({
       navigate: mockedNavigate,
     }),
+    useFocusEffect: jest.fn(),
   };
 });
 
@@ -609,59 +609,6 @@ describe('test DeviceDetail', () => {
     expect(sensorDisplayItem).toHaveLength(0);
   });
 
-  test('render CurrentRainSensor but is other device', async () => {
-    route.params.sensorData.is_other_device = true;
-    route.params.isGGHomeConnected = true;
-
-    const responseDisplay = {
-      status: 200,
-      data: {
-        items: [
-          {
-            id: 170,
-            order: 1,
-            template: 'value',
-            type: 'value',
-            configuration: {
-              type: 'circle',
-              configs: [
-                {
-                  id: 428,
-                  color: 'red',
-                  standard: 'Temperature',
-                  measure: '°C',
-                },
-              ],
-            },
-          },
-        ],
-      },
-    };
-
-    const responseDisplayValueV2 = {
-      status: 200,
-      data: {
-        configs: [{ id: 428 }],
-        is_connected: true,
-        last_updated: '2021-01-24T12:00:00.000Z',
-      },
-    };
-
-    mockAxios(responseDisplay, responseDisplayValueV2);
-
-    await act(async () => {
-      tree = await create(wrapComponent(store, account, route));
-    });
-
-    const instance = tree.root;
-    const sensorDisplayItem = instance.findAll(
-      (el) => el.props.testID === TESTID.SENSOR_DISPLAY_ITEM
-    );
-    expect(sensorDisplayItem).toHaveLength(1);
-    const connectedViewHeader = instance.findByType(ConnectedViewHeader);
-    expect(connectedViewHeader.props.type).toEqual('GoogleHome');
-  });
-
   test('HeaderDevice button more onClick', async () => {
     await act(async () => {
       tree = await create(wrapComponent(store, account, route));

package/src/screens/Device/components/SensorConnectStatusViewHeader.js

@@ -14,18 +14,25 @@ export const SensorConnectStatusViewHeader = ({
   showWindDirection,
   children,
 }) => {
-  const isConnecting =
-    !!sensor &&
-    sensor?.is_other_device &&
-    sensor?.device_type !== DEVICE_TYPE.LG_THINQ
-      ? isGGHomeConnecting
-      : false;
+  const isConnecting = (() => {
+    if (!!sensor && sensor?.is_managed_by_backend) {
+      return false;
+    } else {
+      if (sensor?.device_type === DEVICE_TYPE.LG_THINQ) {
+        return false;
+      } else if (sensor?.device_type === DEVICE_TYPE.GOOGLE_HOME) {
+        return isGGHomeConnecting;
+      } else {
+        return false;
+      }
+    }
+  })();
 
   if (isConnecting) {
     return <></>;
   }
 
-  if (!!sensor && !sensor?.is_other_device) {
+  if (!!sensor && sensor?.is_managed_by_backend) {
     if (connectedViaNetwork) {
       return (
         <>
@@ -55,6 +62,7 @@ export const SensorConnectStatusViewHeader = ({
       );
     }
   } else {
+    // not managed by backend
     if (sensor?.device_type === DEVICE_TYPE.LG_THINQ) {
       return (
         <>
@@ -62,7 +70,7 @@ export const SensorConnectStatusViewHeader = ({
           {children}
         </>
       );
-    } else {
+    } else if (sensor?.device_type === DEVICE_TYPE.GOOGLE_HOME) {
       if (connectedViaGGHome) {
         return (
           <>
@@ -83,6 +91,8 @@ export const SensorConnectStatusViewHeader = ({
           />
         );
       }
+    } else {
+      return <DisconnectedView sensor={sensor} />;
     }
   }
 };

package/src/screens/Device/components/SensorDisplayItem.js

@@ -44,8 +44,8 @@ export const SensorDisplayItem = ({
   const sendRemoteCommand = useRemoteControl();
 
   const doAction = useCallback(
-    (action, data, actionName) => {
-      sendRemoteCommand(sensor, action, data, userId, actionName);
+    (action, data) => {
+      sendRemoteCommand(sensor, action, data, userId);
     },
     [sensor, userId, sendRemoteCommand]
   );

package/src/screens/Device/detail.js

@@ -33,7 +33,7 @@ import { useFavoriteDevice } from './hooks/useFavoriteDevice';
 import BottomButtonView from '../../commons/BottomButtonView';
 import Text from '../../commons/Text';
 import { AlertAction, ButtonPopup, MenuActionMore } from '../../commons';
-import { TESTID } from '../../configs/Constants';
+import { DEVICE_TYPE, TESTID } from '../../configs/Constants';
 
 import { usePopover } from '../../hooks/Common';
 import { useConfigGlobalState } from '../../iot/states';
@@ -51,6 +51,7 @@ import { EmergencyCountdown } from './components/EmergencyCountdown';
 import { SensorConnectStatusViewHeader } from './components/SensorConnectStatusViewHeader';
 import { useDisconnectedDevice } from './hooks/useDisconnectedDevice';
 import { useEvaluateValue } from './hooks/useEvaluateValue';
+import { useDeviceWatchConfigControl } from './hooks/useDeviceWatchConfigControl';
 import { Card } from '../../commons/CardShadow';
 import PreventAccess from '../../commons/PreventAccess';
 import { notImplemented } from '../../utils/Utils';
@@ -122,6 +123,8 @@ const DeviceDetail = ({ route }) => {
 
   useDisconnectedDevice(sensorName, isDeviceHasBle, serverDown);
 
+  useDeviceWatchConfigControl(sensor, display);
+
   const isShowSetupEmergencyContact = useMemo(
     () =>
       display.items.filter(
@@ -148,7 +151,7 @@ const DeviceDetail = ({ route }) => {
   );
 
   const canManageSubUnit = useMemo(() => {
-    return currentUserId === unit?.user_id;
+    return Number(currentUserId) === Number(unit?.user_id);
   }, [currentUserId, unit]);
 
   const fetchUnitDetail = useCallback(async () => {
@@ -360,13 +363,6 @@ const DeviceDetail = ({ route }) => {
         text: t('auto_lock'),
       });
     }
-    menuItems.push({
-      route: Routes.SmartLockStack,
-      data: {
-        screen: Routes.SetupGeneratePasscode,
-      },
-      text: t('setup_generate_passcode'),
-    });
     if (isOwner && isShowSetUpSmartLock) {
       menuItems.push({
         route: Routes.SmartLockStack,
@@ -448,20 +444,24 @@ const DeviceDetail = ({ route }) => {
       if (!item.configuration) {
         return;
       }
+
       const data = item.configuration.configs.map((config) => {
-        const configValue = configValues[config.id];
+        const configValue = configValues[config.id]?.value;
         const displayValue = displayValues.find((k) => k.id === config.id);
-        if (!configValue && !displayValue) {
+        if (
+          (configValue === null || configValue === undefined) &&
+          !displayValue
+        ) {
           return;
         }
-        const value = configValue
-          ? {
-              id: config.id,
-              value: configValue,
-              evaluate: evaluateValue(config.id, configValue),
-            }
-          : displayValue;
-
+        const value =
+          configValue !== null && configValue !== undefined
+            ? {
+                id: config.id,
+                value: configValue,
+                evaluate: evaluateValue(config.id, configValue),
+              }
+            : displayValue;
         return { ...config, ...value };
       });
       return data.filter((value) => value);
@@ -513,7 +513,10 @@ const DeviceDetail = ({ route }) => {
       }
       setLoading((preState) => ({ ...preState, isConnected: false }));
     };
-    if (sensor?.is_managed_by_backend && !sensor?.is_other_device) {
+    if (
+      sensor?.is_managed_by_backend &&
+      sensor?.device_type !== DEVICE_TYPE.LG_THINQ
+    ) {
       const updateInterval = setInterval(() => fetchValues(), 5000);
       fetchValues();
       return () => clearInterval(updateInterval);
@@ -721,16 +724,19 @@ const DeviceDetail = ({ route }) => {
             isNetworkConnected !== null &&
             renderSensorConnected()}
         </View>
-        {isShowSetupEmergencyContact && canManageSubUnit && (
-          <BottomButtonView
-            style={styles.bottomButtonEmergencyContact}
-            mainIcon={<Icon name="plus" size={16} color={Colors.Primary} />}
-            mainTitle={t('setup_my_emergency_contact')}
-            onPressMain={onSetupContacts}
-            typeMain="primaryBorder"
-            semiboldMain={false}
-          />
-        )}
+        {isNetworkConnected &&
+          isConnected &&
+          isShowSetupEmergencyContact &&
+          canManageSubUnit && (
+            <BottomButtonView
+              style={styles.bottomButtonEmergencyContact}
+              mainIcon={<Icon name="plus" size={16} color={Colors.Primary} />}
+              mainTitle={t('setup_my_emergency_contact')}
+              onPressMain={onSetupContacts}
+              typeMain="primaryBorder"
+              semiboldMain={false}
+            />
+          )}
         <AlertSendConfirm
           showAlertConfirm={showAlertConfirm && !lockShowing}
           countDown={countDown}