@eohjsc/react-native-smart-city 0.3.52 → 0.3.53

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@eohjsc/react-native-smart-city",
   "title": "React Native Smart Home",
-  "version": "0.3.52",
+  "version": "0.3.53",
   "description": "TODO",
   "main": "index.js",
   "files": [
@@ -116,7 +116,7 @@
     "@react-native-community/datetimepicker": "https://github.com/hinh-eoh/datepicker",
     "@react-native-community/geolocation": "^2.0.2",
     "@react-native-community/masked-view": "^0.1.10",
-    "@react-native-community/netinfo": "^6.0.0",
+    "@react-native-community/netinfo": "^9.3.4",
     "@react-native-community/segmented-control": "^2.1.1",
     "@react-native-community/slider": "^3.0.3",
     "@react-native-community/toolbar-android": "^0.1.0-rc.2",

package/src/commons/Device/ItemDevice.js

@@ -117,7 +117,7 @@ const ItemDevice = memo(
       }
       // not managed by backend
       if (sensor?.device_type === DEVICE_TYPE.GOOGLE_HOME) {
-        return !isHomeAssistantConnecting;
+        return isHomeAssistantConnected;
       }
       return true;
     })();

package/src/hooks/IoT/useBluetoothConnection.js

@@ -13,7 +13,8 @@ const permissions = [
   'android.permission.BLUETOOTH_ADVERTISE',
 ];
 
-const useBluetoothConnection = () => {
+// NOTE: fnCallback is used for Lavida when found device
+const useBluetoothConnection = (fnCallback) => {
   const t = useTranslations();
   const appState = useRef(AppState.currentState);
 
@@ -29,6 +30,7 @@ const useBluetoothConnection = () => {
         useSCContextSelector((state) => state.bluetooth.permissionsGranted);
 
   const onDeviceFound = useCallback(async (name, device) => {
+    fnCallback && fnCallback({ name, device });
     setAction(Action.SET_BLUETOOTH_CONNECTED_DEVICE, { name, device });
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);

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

@@ -2,6 +2,7 @@ import React from 'react';
 import { Alert, ScrollView } from 'react-native';
 import { act, create } from 'react-test-renderer';
 import MockAdapter from 'axios-mock-adapter';
+import { NavigationContext } from '@react-navigation/native';
 
 import DeviceDetail from '../detail';
 import { API } from '../../../configs';
@@ -29,7 +30,6 @@ jest.mock('@react-navigation/native', () => {
     useNavigation: () => ({
       navigate: mockedNavigate,
     }),
-    useFocusEffect: jest.fn(),
   };
 });
 
@@ -73,9 +73,20 @@ const mockAxios = (
 
 let store = mockSCStore({});
 
+const navContextValue = {
+  isFocused: () => false,
+  addListener: jest.fn(() => jest.fn()),
+};
 const wrapComponent = (state, account, route) => (
   <SCProvider initState={state}>
-    <DeviceDetail account={account} route={route} />
+    <NavigationContext.Provider
+      value={{
+        ...navContextValue,
+        isFocused: () => true,
+      }}
+    >
+      <DeviceDetail account={account} route={route} />
+    </NavigationContext.Provider>
   </SCProvider>
 );
 

package/src/screens/Device/detail.js

@@ -7,7 +7,7 @@ import React, {
   useContext,
 } from 'react';
 import { View, TouchableOpacity, Platform } from 'react-native';
-import { useNavigation } from '@react-navigation/native';
+import { useNavigation, useFocusEffect } from '@react-navigation/native';
 import { useSelector } from 'react-redux';
 import { IconFill, IconOutline } from '@ant-design/icons-react-native';
 import { Icon } from '@ant-design/react-native';
@@ -118,7 +118,7 @@ const DeviceDetail = ({ route }) => {
 
   const isDeviceHasBle = useMemo(() => {
     if (display.items.length === 0) {
-      return undefined;
+      return false;
     }
     const action = display.items.filter((item) => item.type === 'action');
     if (action.length === 0) {
@@ -501,77 +501,79 @@ const DeviceDetail = ({ route }) => {
     [configValues, displayValuesData, evaluateValue]
   );
 
-  useEffect(() => {
-    let params = new URLSearchParams();
-    const configIds = [];
+  useFocusEffect(
+    useCallback(() => {
+      let params = new URLSearchParams();
+      const configIds = [];
 
-    display.items.map((item) => {
-      if (item.type !== 'value') {
-        return;
-      }
-
-      if (!item.configuration) {
-        return;
-      }
+      display.items.map((item) => {
+        if (item.type !== 'value') {
+          return;
+        }
 
-      item.configuration.configs.map((config) => {
-        if (!configIds.includes(config.id)) {
-          configIds.push(config.id);
+        if (!item.configuration) {
+          return;
         }
+
+        item.configuration.configs.map((config) => {
+          if (!configIds.includes(config.id)) {
+            configIds.push(config.id);
+          }
+        });
       });
-    });
 
-    configIds.map((id) => {
-      params.append('config', id);
-    });
+      configIds.map((id) => {
+        params.append('config', id);
+      });
 
-    const fetchValues = async () => {
-      const { success, data, resp_status } = await axiosGet(
-        API.DEVICE.DISPLAY_VALUES_V2(sensor?.id),
-        {
-          params: params,
+      const fetchValues = async () => {
+        const { success, data, resp_status } = await axiosGet(
+          API.DEVICE.DISPLAY_VALUES_V2(sensor?.id),
+          {
+            params: params,
+          }
+        );
+        if (success) {
+          data.isConnected = data.is_connected;
+          data.lastUpdated = data.last_updated
+            ? moment(data.last_updated)
+            : data.last_updated;
+          setDisplayValuesData((prevState) => {
+            if (prevState.isConnected !== data.isConnected) {
+              setAction(Action.SET_DEVICES_STATUS, [
+                { id: sensor?.id, is_connected: data.is_connected },
+              ]);
+            }
+            return data;
+          });
+        } else if (resp_status >= 500) {
+          setServerDown(true);
         }
-      );
-      if (success) {
-        data.isConnected = data.is_connected;
-        data.lastUpdated = data.last_updated
-          ? moment(data.last_updated)
-          : data.last_updated;
-        setDisplayValuesData((prevState) => {
-          if (prevState.isConnected !== data.isConnected) {
-            setAction(Action.SET_DEVICES_STATUS, [
-              { id: sensor?.id, is_connected: data.is_connected },
-            ]);
+        setLoading((preState) => {
+          if (preState.isConnected) {
+            return {
+              ...preState,
+              isConnected: false,
+            };
           }
-          return data;
+          return preState;
         });
-      } else if (resp_status >= 500) {
-        setServerDown(true);
+      };
+      if (
+        isNetworkConnected &&
+        sensor?.is_managed_by_backend &&
+        sensor?.device_type !== DEVICE_TYPE.LG_THINQ
+      ) {
+        const updateInterval = setInterval(() => fetchValues(), 5000);
+        fetchValues();
+        return () => clearInterval(updateInterval);
+      } else {
+        Object.keys(sensor).length > 1 &&
+          setLoading((preState) => ({ ...preState, isConnected: false }));
       }
-      setLoading((preState) => {
-        if (preState.isConnected) {
-          return {
-            ...preState,
-            isConnected: false,
-          };
-        }
-        return preState;
-      });
-    };
-    if (
-      isNetworkConnected &&
-      sensor?.is_managed_by_backend &&
-      sensor?.device_type !== DEVICE_TYPE.LG_THINQ
-    ) {
-      const updateInterval = setInterval(() => fetchValues(), 5000);
-      fetchValues();
-      return () => clearInterval(updateInterval);
-    } else {
-      Object.keys(sensor).length > 1 &&
-        setLoading((preState) => ({ ...preState, isConnected: false }));
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [sensor, display, isNetworkConnected]);
+      // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [sensor, display, isNetworkConnected])
+  );
 
   const isShowEmergencyResolve =
     display.items.filter(

package/src/screens/Device/hooks/useDisconnectedDevice.js

@@ -67,7 +67,7 @@ export const useDisconnectedDevice = (
 
   const checkNetworkConnect = useCallback(
     async () => {
-      if (isDeviceHasBle === false) {
+      if (!isDeviceHasBle) {
         return;
       }
       if (isNetworkConnected === false || serverDown) {

package/src/screens/PlayBackCamera/index.js

@@ -72,7 +72,10 @@ const PlayBackCamera = () => {
     (hour) => {
       const hourWithTimezone =
         parseInt(hour, 10) + parseInt(item?.configuration?.time_zone || 0, 10);
-      return hourWithTimezone < 10 ? '0' + hourWithTimezone : hourWithTimezone;
+      if (hourWithTimezone < 0 || hourWithTimezone > 9) {
+        return hourWithTimezone;
+      }
+      return '0' + hourWithTimezone;
     },
     [item?.configuration?.time_zone]
   );

package/src/screens/Sharing/SelectPermission.js

@@ -267,8 +267,8 @@ const SelectPermission = ({ route }) => {
         arrIdReadTemp.length &&
           read_permissions.push({ id: item.id, values: arrIdReadTemp });
 
-        !arrIdControlTemp &&
-          !arrIdReadTemp &&
+        !arrIdControlTemp.length &&
+          !arrIdReadTemp.length &&
           item.isChecked &&
           read_permissions.push({ id: item.id, values: [] });
       }