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

package/src/commons/ConnectingProcess/index.js

@@ -12,7 +12,6 @@ import styles from './styles';
 import DeviceItem from './DeviceItem/DeviceItem';
 import Connecting from '../Connecting';
 import { useSCContextSelector } from '../../context';
-import { ToastBottomHelper } from '../../utils/Utils';
 
 const ConnectingSuccess = ({
   unit,
@@ -76,7 +75,6 @@ const ConnectingProcess = ({ route }) => {
           setSensor(data);
           setNewName(data?.name);
         } else {
-          ToastBottomHelper.error(JSON.stringify(data));
           goBack();
         }
 
@@ -96,7 +94,6 @@ const ConnectingProcess = ({ route }) => {
           setSensor(data);
           setNewName(data?.name);
         } else {
-          ToastBottomHelper.error(JSON.stringify(data));
           goBack();
         }
         break;
@@ -113,7 +110,6 @@ const ConnectingProcess = ({ route }) => {
           setSensor(data);
           setNewName(data?.name || gateway?.model);
         } else {
-          ToastBottomHelper.error(JSON.stringify(data));
           goBack();
         }
         break;
@@ -136,36 +132,21 @@ const ConnectingProcess = ({ route }) => {
   ]);
 
   const handleDone = useCallback(async () => {
-    let result, message;
     switch (devicePrefixName) {
       case 'SENSOR': {
-        const { success, data } = await axiosPatch(
-          API.SENSOR.SENSOR_DETAIL(sensor?.id),
-          {
-            name: newName,
-          }
-        );
-        result = success;
-        message = data;
+        await axiosPatch(API.SENSOR.SENSOR_DETAIL(sensor?.id), {
+          name: newName,
+        });
         break;
       }
       case 'ROBOT':
       case 'LITE': {
-        const { success, data } = await axiosPatch(
-          API.CHIP.CHIP_DETAIL(sensor?.id),
-          {
-            name: newName,
-          }
-        );
-        result = success;
-        message = data;
+        await axiosPatch(API.CHIP.CHIP_DETAIL(sensor?.id), {
+          name: newName,
+        });
         break;
       }
     }
-
-    if (!result) {
-      ToastBottomHelper.error(JSON.stringify(message));
-    }
     navigate(Routes.UnitStack, {
       screen: Routes.UnitDetail,
       params: {

package/src/commons/Device/HistoryChart.js

@@ -76,7 +76,7 @@ const HistoryChart = memo(
             return {
               ...state,
               showModalStart: false,
-              startTime: moment(date),
+              startTime: date ? moment(date) : moment().valueOf(),
             };
           } else {
             setStartDate(moment(date));
@@ -84,8 +84,8 @@ const HistoryChart = memo(
             return {
               ...state,
               showModalStart: false,
-              startTime: moment(date),
-              endTime: moment(date).add(1, 'day'),
+              startTime: date ? moment(date) : moment().valueOf(),
+              endTime: date ? moment(date).add(1, 'day') : moment().valueOf(),
             };
           }
         });
@@ -105,7 +105,7 @@ const HistoryChart = memo(
             return {
               ...state,
               showModalEnd: false,
-              endTime: moment(date),
+              endTime: date ? moment(date) : moment().valueOf(),
             };
           } else {
             setStartDate(moment(date).add(-1, 'day'));
@@ -113,8 +113,10 @@ const HistoryChart = memo(
             return {
               ...state,
               showModalEnd: false,
-              startTime: moment(date).add(-1, 'day'),
-              endTime: moment(date),
+              startTime: date
+                ? moment(date).add(-1, 'day')
+                : moment().valueOf(),
+              endTime: date ? moment(date) : moment().valueOf(),
             };
           }
         });

package/src/commons/Device/ItemDevice.js

@@ -20,17 +20,7 @@ import { TESTID, DEVICE_TYPE, DEVICE_SIZE } from '../../configs/Constants';
 import IconComponent from '../IconComponent';
 
 const ItemDevice = memo(
-  ({
-    svgMain,
-    description,
-    title,
-    sensor,
-    unit,
-    station,
-    serverDown,
-    status,
-    wrapStyle,
-  }) => {
+  ({ svgMain, description, title, sensor, unit, station, wrapStyle }) => {
     const t = useTranslations();
     const navigation = useNavigation();
     const isBluetoothEnabled = useSCContextSelector(
@@ -39,6 +29,9 @@ const ItemDevice = memo(
     const isNetworkConnected = useSCContextSelector(
       (state) => state.app.isNetworkConnected
     );
+    const statuses = useSCContextSelector(
+      (state) => state.iot.internet.statuses
+    );
     const { isConnected: isGGHomeConnected, isConnecting: isGGHomeConnecting } =
       useGGHomeDeviceConnected(sensor);
 
@@ -52,9 +45,13 @@ const ItemDevice = memo(
     }, [navigation, sensor, station, title, unit]);
 
     const isConnectedViaInternet =
-      status === undefined
-        ? !serverDown && isNetworkConnected && sensor.is_connected
-        : !serverDown && isNetworkConnected && status.is_connected;
+      isNetworkConnected &&
+      !!sensor &&
+      sensor.id in statuses &&
+      statuses[sensor.id]?.isConnected;
+
+    const isFetchingStatus =
+      isNetworkConnected && !!sensor && !(sensor.id in statuses);
 
     const isConnectedViaBLE =
       isBluetoothEnabled &&
@@ -62,28 +59,73 @@ const ItemDevice = memo(
         sensor?.remote_control_options?.bluetooth?.address
       );
 
-    const isConnected =
-      !!sensor && sensor?.is_other_device
-        ? sensor?.device_type === DEVICE_TYPE.LG_THINQ
-          ? true
-          : isGGHomeConnected
-        : isConnectedViaInternet || isConnectedViaBLE;
-
-    const isConnecting =
-      !!sensor &&
-      sensor?.is_other_device &&
-      sensor?.device_type !== DEVICE_TYPE.LG_THINQ
-        ? isGGHomeConnecting
-        : false;
+    const borderColor = (() => {
+      if (!!sensor && sensor?.is_managed_by_backend) {
+        if (isConnectedViaBLE) {
+          return Colors.Gray4;
+        }
+        if (isFetchingStatus || isConnectedViaInternet) {
+          return Colors.Gray4;
+        }
+      }
+      // not managed by backend
+      if (sensor?.device_type === DEVICE_TYPE.LG_THINQ) {
+        return Colors.Gray4;
+      }
+      if (sensor?.device_type === DEVICE_TYPE.GOOGLE_HOME) {
+        if (isGGHomeConnecting || isGGHomeConnected) {
+          return Colors.Gray4;
+        }
+      }
+      return Colors.Red6;
+    })();
 
-    const borderColor =
-      isConnected || isConnecting ? Colors.Gray4 : Colors.Red6;
+    const textConnected = (() => {
+      if (!!sensor && sensor?.is_managed_by_backend) {
+        if (isConnectedViaBLE) {
+          return t('connected');
+        }
+        if (isFetchingStatus) {
+          return '';
+        }
+        if (isConnectedViaInternet) {
+          return t('connected');
+        }
+      }
+      // not managed by backend
+      if (sensor?.device_type === DEVICE_TYPE.LG_THINQ) {
+        return t('connected');
+      }
+      if (sensor?.device_type === DEVICE_TYPE.GOOGLE_HOME) {
+        if (isGGHomeConnecting) {
+          return t('connecting');
+        }
+        if (isGGHomeConnected) {
+          return t('connected');
+        }
+      }
+      return t('disconnected');
+    })();
 
-    const textConnected = isConnected
-      ? t('connected')
-      : isConnecting
-      ? t('connecting')
-      : t('disconnected');
+    const canRenderQuickAction = (() => {
+      if (!!sensor && sensor?.is_managed_by_backend) {
+        if (isConnectedViaBLE) {
+          return true;
+        }
+        if (isFetchingStatus) {
+          return false;
+        }
+        return true;
+      }
+      // not managed by backend
+      if (sensor?.device_type === DEVICE_TYPE.LG_THINQ) {
+        return true;
+      }
+      if (sensor?.device_type === DEVICE_TYPE.GOOGLE_HOME) {
+        return !isGGHomeConnecting;
+      }
+      return true;
+    })();
 
     return (
       <TouchableWithoutFeedback
@@ -98,7 +140,9 @@ const ItemDevice = memo(
             <TouchableOpacity onPress={goToSensorDisplay}>
               <IconComponent icon={sensor.icon} iconKit={sensor.icon_kit} />
             </TouchableOpacity>
-            {!isConnecting && <ItemQuickAction sensor={sensor} unit={unit} />}
+            {canRenderQuickAction && (
+              <ItemQuickAction sensor={sensor} unit={unit} />
+            )}
           </View>
           <TouchableOpacity onPress={goToSensorDisplay}>
             <Text

package/src/commons/MediaPlayerDetail/index.js

@@ -149,6 +149,11 @@ const MediaPlayerDetail = ({
   }, [JSON.stringify(camera_opened), id]);
 
   const source = !thumbnail || !thumbnail.uri ? Images.BgDevice : thumbnail;
+
+  if (!uri) {
+    return <></>;
+  }
+
   return (
     <View style={[styles.wrap, wrapStyles]}>
       <View style={[styles.loadingWrap]}>

package/src/commons/RowItem/index.js

@@ -49,9 +49,13 @@ export const RowItem = memo(
                 </View>
               )}
               <View style={styles.columeFlex}>
-                <Text style={styles.titleName}> {text}</Text>
+                <Text numberOfLines={1} style={styles.titleName}>
+                  {text}
+                </Text>
                 {!!isShowSubText && (
-                  <Text style={styles.status}> {subtext}</Text>
+                  <Text numberOfLines={1} style={styles.status}>
+                    {subtext}
+                  </Text>
                 )}
               </View>
               {!!rightComponent && (

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

@@ -1,8 +1,9 @@
-import React from 'react';
+import React, { useMemo } from 'react';
 import { View } from 'react-native';
 import { useNavigation } from '@react-navigation/native';
 import { useTranslations } from '../../../hooks/Common/useTranslations';
-import { useSensorsStatus } from '../../../hooks/Common';
+import { useDevicesStatus } from '../../../hooks/Common';
+import { useWatchConfigs } from '../../../hooks/IoT';
 
 import { Section } from '../../Section';
 import ItemDevice from '../../Device/ItemDevice';
@@ -10,6 +11,7 @@ import ItemOneTap from '../OneTap/ItemOneTap';
 import ItemAddNew from '../../Device/ItemAddNew';
 import styles from './styles';
 import Routes from '../../../utils/Route';
+import { DEVICE_TYPE } from '../../../configs/Constants';
 
 const SubUnitFavorites = ({
   isOwner,
@@ -21,10 +23,27 @@ const SubUnitFavorites = ({
   const t = useTranslations();
   const { navigate } = useNavigation();
 
-  const { getStatus, serverDown } = useSensorsStatus(unit, favoriteDevices);
+  useDevicesStatus(unit, favoriteDevices);
+
+  const configsNeedWatching = useMemo(() => {
+    const configIds = [];
+    favoriteDevices.forEach((device) => {
+      if (
+        device?.quick_action?.config_id &&
+        ![DEVICE_TYPE.GOOGLE_HOME, DEVICE_TYPE.LG_THINQ].includes(
+          device?.device_type
+        )
+      ) {
+        configIds.push(device.quick_action.config_id);
+      }
+    });
+    return configIds;
+  }, [favoriteDevices]);
+
+  useWatchConfigs(configsNeedWatching);
 
   const handleOnAddNew = () => {
-    navigate(Routes.SelectFavoritesDevices, {
+    navigate(Routes.SelectAddToFavorites, {
       unitId: unit.id,
     });
   };
@@ -46,8 +65,6 @@ const SubUnitFavorites = ({
               sensor={sensor}
               unit={unit}
               station={sensor.station}
-              serverDown={serverDown}
-              status={getStatus(sensor)}
               wrapStyle={wrapItemStyle}
             />
           ))}
@@ -58,6 +75,7 @@ const SubUnitFavorites = ({
               isOwner={isOwner}
               automate={automate}
               unit={unit}
+              wrapStyle={wrapItemStyle}
             />
           ))}
         <ItemAddNew

package/src/commons/SubUnit/ShortDetail.js

@@ -1,8 +1,9 @@
-import React from 'react';
+import React, { useCallback, useMemo } from 'react';
 import { StyleSheet, View } from 'react-native';
 import { useNavigation } from '@react-navigation/native';
 import { useTranslations } from '../../hooks/Common/useTranslations';
-import { useSensorsStatus } from '../../hooks/Common';
+import { useDevicesStatus } from '../../hooks/Common';
+import { useWatchConfigs } from '../../hooks/IoT';
 
 import { Images, Device } from '../../configs';
 import { DEVICE_TYPE, TESTID } from '../../configs/Constants';
@@ -30,7 +31,33 @@ const ShortDetailSubUnit = ({ unit, station }) => {
   const t = useTranslations();
   const { navigate } = useNavigation();
 
-  const { getStatus, serverDown } = useSensorsStatus(unit, station?.sensors);
+  useDevicesStatus(unit, station?.sensors);
+
+  const configsNeedWatching = useMemo(() => {
+    const configIds = [];
+    (station?.sensors || []).forEach((device) => {
+      if (
+        device?.quick_action?.config_id &&
+        device?.device_type !== DEVICE_TYPE.GOOGLE_HOME
+      ) {
+        configIds.push(device.quick_action.config_id);
+      }
+    });
+    return configIds;
+  }, [station]);
+
+  useWatchConfigs(configsNeedWatching);
+
+  const goToPlayBack = useCallback(() => {
+    navigate(Routes.PlaybackCamera, {
+      item: {
+        configuration: station?.camera,
+        thumbnail: {
+          uri: station?.background,
+        },
+      },
+    });
+  }, [navigate, station?.background, station?.camera]);
 
   const renderCamera = () => {
     if (station?.camera) {
@@ -54,6 +81,7 @@ const ShortDetailSubUnit = ({ unit, station }) => {
             cameraName={station?.camera?.name}
             width={standardizeWidth}
             height={standardizeHeight}
+            goToPlayBack={goToPlayBack}
           />
         </View>
       );
@@ -139,8 +167,6 @@ const ShortDetailSubUnit = ({ unit, station }) => {
                     sensor={sensor}
                     unit={unit}
                     station={station}
-                    serverDown={serverDown}
-                    status={getStatus(sensor)}
                   />
                 );
             }

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

@@ -28,6 +28,7 @@ jest.mock('@react-navigation/native', () => {
       navigate: mockNavigate,
     }),
     useIsFocused: () => true,
+    useFocusEffect: jest.fn(),
   };
 });
 

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

@@ -35,6 +35,7 @@ jest.mock('@react-navigation/native', () => {
       navigate: mockedNavigate,
     }),
     useIsFocused: () => true,
+    useFocusEffect: jest.fn(),
   };
 });
 

package/src/configs/API.js

@@ -29,9 +29,14 @@ const API = {
     CHANGE_OWNER: (id) => `/property_manager/units/${id}/change_owner/`,
     FAVOURITE_DEVICES: (id) =>
       `/property_manager/units/${id}/favourite_devices/`,
-    DEVICES: (id) => `/property_manager/units/${id}/devices/`,
+    DEVICES_NOT_FAVORITES: (id) =>
+      `/property_manager/units/${id}/devices_not_favourites/`,
     ADD_DEVICES_TO_FAVORITES: (id) =>
       `/property_manager/units/${id}/add_devices_to_favourites/`,
+    AUTOMATE_SCRIPTS_NOT_STARRED: (id) =>
+      `/property_manager/units/${id}/automate_scripts_not_starred/`,
+    STAR_AUTOMATE_SCRIPTS: (id) =>
+      `/property_manager/units/${id}/star_automate_scripts/`,
   },
   SUB_UNIT: {
     REMOVE_SUB_UNIT: (unitId, id) =>
@@ -53,7 +58,7 @@ const API = {
     SENSOR_DETAIL: (id) => `/property_manager/sensors/${id}/`,
     DISPLAY: (id) => `/property_manager/sensors/${id}/display/`,
     SIDE_MENU_DETAIL: (id, side_menu_id) =>
-      `/property_manager/sensors/${id}/display/side_menu/${side_menu_id}/`,
+      `/property_manager/devices/${id}/display/side_menu/${side_menu_id}/`,
     DISPLAY_VALUES_V2: (id) =>
       `/property_manager/sensors/${id}/display_values_v2/`,
     DISPLAY_HISTORY: (id, hId) =>
@@ -137,8 +142,8 @@ const API = {
   },
   IOT: {
     CHIP_MANAGER: {
-      WATCH_CONFIGS: () => '/chip_manager/watch_configs/',
-      PUSHER_AUTH: () => '/chip_manager/pusher/auth/',
+      WATCH_CONFIGS: () => '/chip_manager/watch_configs_v2/',
+      PUSHER_AUTH: () => '/chip_manager/pusher/auth_v2/',
     },
     LG: {
       GET_TOKEN: (client_id, code, redirect_uri, backend_url) =>

package/src/configs/Constants.js

@@ -161,8 +161,8 @@ export const STATE_VALUE_SENSOR_TYPES = [
     stateValue: ['not_activated', 'activated'],
   },
   {
-    type: 'filter_water',
-    stateValue: ['not_detected', 'detected'],
+    type: 'door',
+    stateValue: ['close', 'open'],
   },
 ];
 
@@ -823,6 +823,7 @@ export const NOTIFICATION_TYPES = {
   NOTIFY_UPDATE_ADDRESS: 'NOTIFY_UPDATE_ADDRESS',
   NOTIFY_REMOVE_SUB_UNIT: 'NOTIFY_REMOVE_SUB_UNIT',
   NOTIFY_REMOVE_DEVICE: 'NOTIFY_REMOVE_DEVICE',
+  NOTIFY_EMERGENCY: 'NOTIFY_EMERGENCY',
 };
 
 export const ACTIVITY_LOG_TYPES = {
@@ -843,6 +844,11 @@ export const SENSOR_TYPE = {
   FILTER_WATER: 'filter_water',
 };
 
+export const EMERGENCY_TYPE = {
+  CREATED: 'emergency',
+  RESOLVE: 'resolved_emergency',
+};
+
 export const PROBLEM_CODE = {
   CLIENT_ERROR: 'CLIENT_ERROR',
   SERVER_ERROR: 'SERVER_ERROR',

package/src/configs/SCConfig.js

@@ -95,6 +95,7 @@ const SCDefaultConfig = {
   VCONNEX_REDIRECT_URI_APP: '',
   pusherAppKey: '8557fcc63959f564f1aa',
   pusherAppCluster: 'ap1',
+  intervalWatchConfigTime: 30000,
 };
 
 export class SCConfig {
@@ -108,6 +109,7 @@ export class SCConfig {
   static pusherAppKey = SCDefaultConfig.pusherAppKey;
   static pusherAppCluste = SCDefaultConfig.pusherAppCluster;
   static language = 'en';
+  static intervalWatchConfigTime = SCDefaultConfig.intervalWatchConfigTime;
 }
 
 export const initSCConfig = (config) => {
@@ -128,4 +130,6 @@ export const initSCConfig = (config) => {
   SCConfig.pusherAppKey = config.pusherAppKey ?? SCDefaultConfig.pusherAppKey;
   SCConfig.pusherAppCluster =
     config.pusherAppCluster ?? SCDefaultConfig.pusherAppCluster;
+  SCConfig.intervalWatchConfigTime =
+    config.intervalWatchConfigTime ?? SCDefaultConfig.intervalWatchConfigTime;
 };

package/src/context/actionType.ts

@@ -15,13 +15,14 @@ export const Action = {
   ADD_DEVICES_TO_FAVORITES: 'ADD_DEVICE_TO_FAVORITES',
   REMOVE_DEVICES_FROM_FAVORITES: 'REMOVE_DEVICE_FROM_FAVORITES',
   SET_STARRED_SCRIPTS: 'SET_STARRED_SCRIPTS',
-  STAR_SCRIPT: 'STAR_SCRIPT',
-  UNSTAR_SCRIPT: 'UNSTAR_SCRIPT',
-  CONNECTING_GOOGLE_HOME: 'CONNECTING_GOOGLE_HOME',
+  STAR_SCRIPTS: 'STAR_SCRIPTS',
+  UNSTAR_SCRIPTS: 'UNSTAR_SCRIPTS',
   SET_GOOGLE_HOME_CONNECTIONS: 'SET_GOOGLE_HOME_CONNECTIONS',
   CHANGE_GOOGLE_HOME_CONN_STATE: 'CHANGE_GOOGLE_HOME_CONN_STATE',
   UPDATE_VALUE_EVALUATIONS: 'UPDATE_VALUE_EVALUATIONS',
+  NEED_UPDATE_VALUE_EVALUATIONS: 'NEED_UPDATE_VALUE_EVALUATIONS',
   ON_RECEIVE_NOTIFICATION: 'ON_RECEIVE_NOTIFICATION',
+  SET_DEVICES_STATUS: 'SET_DEVICES_STATUS',
 };
 
 export type AuthData = {
@@ -83,8 +84,9 @@ export type AppType = {
 
 export type IoTType = {
   googlehome: {
-    isFirstTimeConnect: boolean;
-    isConnecting: boolean;
     connections: {};
   };
+  internet: {
+    statuses: {};
+  };
 };

package/src/context/mockStore.ts

@@ -41,10 +41,11 @@ export const mockDataStore: ContextData = {
   },
   iot: {
     googlehome: {
-      isFirstTimeConnect: true,
-      isConnecting: false,
       connections: {},
     },
+    internet: {
+      statuses: {},
+    },
   },
   valueEvaluations: {},
   fetchedValueEvaluationUnits: [],
@@ -94,8 +95,14 @@ export const mockSCStore = (data: ContextData): ContextData => {
         ...mockDataStore.iot.googlehome,
         connections: {},
       },
+      internet: {
+        statuses: {},
+      },
+    },
+    valueEvaluations: {
+      ...mockDataStore.valueEvaluations,
+      ...data.valueEvaluations,
     },
-    valueEvaluations: {},
     fetchedValueEvaluationUnits: [],
   };
 };