@eohjsc/react-native-smart-city 0.4.82 → 0.4.84

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@eohjsc/react-native-smart-city",
   "title": "React Native Smart Home",
-  "version": "0.4.82",
+  "version": "0.4.84",
   "description": "TODO",
   "main": "index.js",
   "files": [

package/src/commons/Dashboard/MyUnit/index.js

@@ -15,7 +15,7 @@ import {
 } from '@react-navigation/native';
 import NetInfo from '@react-native-community/netinfo';
 import { BleManager } from 'react-native-ble-plx';
-import { API, Colors, Images } from '../../../configs';
+import { API, Colors, Images, SCConfig } from '../../../configs';
 import Text from '../../Text';
 import { axiosGet, fetchWithCache } from '../../../utils/Apis/axios';
 
@@ -160,7 +160,7 @@ const MyUnit = ({ refreshing }) => {
               source={
                 item?.background
                   ? { uri: item.background }
-                  : Images.unitDefaultBackground
+                  : SCConfig.appUnitDefaultBackground
               }
               defaultSource={Images.BgUnit}
               resizeMode="cover"

package/src/commons/UnitSummary/ConfigHistoryChart/index.js

@@ -36,7 +36,10 @@ export const useFetchConfigHistory = (configs, setChartData) => {
         'date_from',
         startDate.subtract(7, 'hours').format('YYYY-MM-DDTHH:mm:ss')
       );
-      params.append('date_to', endDate.format('YYYY-MM-DDTHH:mm:ss'));
+      params.append(
+        'date_to',
+        endDate.subtract(7, 'hours').format('YYYY-MM-DDTHH:mm:ss')
+      );
 
       const { success, data } = await axiosGet(
         API.CONFIG.DISPLAY_HISTORY_V3(),

package/src/commons/WrapParallaxScrollView/index.js

@@ -2,7 +2,7 @@ import React, { useCallback } from 'react';
 import { StatusBar, View, StyleSheet } from 'react-native';
 import LinearGradient from 'react-native-linear-gradient';
 
-import { Colors, Device, Images } from '../../configs';
+import { Colors, Device, Images, SCConfig } from '../../configs';
 import Text from '../Text';
 import HeaderUnit from '../Unit/HeaderUnit';
 import { AccessibilityLabel } from '../../configs/Constants';
@@ -65,7 +65,7 @@ const WrapParallaxScrollView = ({
       <View style={styles.image}>
         <FImage
           style={styles.image}
-          source={uriImg ? { uri: uriImg } : Images.unitDefaultBackground}
+          source={uriImg ? { uri: uriImg } : SCConfig.appUnitDefaultBackground}
           defaultSource={Images.BgUnit}
           resizeMode="cover"
         />

package/src/configs/SCConfig.js

@@ -1,6 +1,7 @@
 /* istanbul ignore file */
 import { LocaleConfig } from 'react-native-calendars';
 import api from '../utils/Apis/axios';
+import Images from './Images';
 
 LocaleConfig.locales.vi = {
   monthNames: [
@@ -100,6 +101,8 @@ const SCDefaultConfig = {
   intervalWatchConfigTime: 30000,
   setCurrentSensorDisplay: () => {},
   appName: 'E-Ra',
+  appLogo: Images.logo,
+  appUnitDefaultBackground: Images.unitDefaultBackground,
 };
 
 export class SCConfig {
@@ -117,6 +120,8 @@ export class SCConfig {
   static intervalWatchConfigTime = SCDefaultConfig.intervalWatchConfigTime;
   static setCurrentSensorDisplay = SCDefaultConfig.setCurrentSensorDisplay;
   static appName = SCDefaultConfig.appName;
+  static appLogo = SCDefaultConfig.appLogo;
+  static appUnitDefaultBackground = SCDefaultConfig.appUnitDefaultBackground;
 }
 
 export const initSCConfig = (config) => {
@@ -148,4 +153,7 @@ export const initSCConfig = (config) => {
   SCConfig.setCurrentSensorDisplay =
     config.setCurrentSensorDisplay ?? SCDefaultConfig.setCurrentSensorDisplay;
   SCConfig.appName = config.appName ?? SCDefaultConfig.appName;
+  SCConfig.appLogo = config.appLogo ?? SCDefaultConfig.appLogo;
+  SCConfig.appUnitDefaultBackground =
+    config.appUnitDefaultBackground ?? SCDefaultConfig.appUnitDefaultBackground;
 };

package/src/hooks/IoT/useBluetoothDeviceConnected.js

@@ -7,10 +7,8 @@ const useBluetoothDeviceConnected = (device) => {
   const isBluetoothEnabled = useSCContextSelector((state) => {
     return state.bluetooth.isEnabled;
   });
-
-  const isConnected =
-    isBluetoothEnabled &&
-    !!connectedDevices[device?.remote_control_options?.bluetooth?.address];
+  const address = device?.remote_control_options?.bluetooth?.address;
+  const isConnected = isBluetoothEnabled && !!connectedDevices[address];
 
   return { isConnected };
 };

package/src/iot/RemoteControl/Bluetooth.js

@@ -30,7 +30,7 @@ export const clearFoundDevices = () => {
 
 export const scanBluetoothDevices = async (names, onDeviceFound) => {
   names.map((name) => {
-    if (bluetoothDevices[name]) {
+    if (needToScanDevices.includes(name)) {
       return;
     }
     needToScanDevices.push(name);
@@ -163,20 +163,26 @@ export const sendDataOverBluetooth = async (
   let fullDataDevice = null;
   let result = true;
   let hasResponse = false;
-
   try {
-    connectedDevice = await device.connect();
+    connectedDevice = await device.connect({ timeout: 5000 });
   } catch (e) {
     const BLE_ERROR = {
       DEVICE_IS_NOT_ALREADY_CONNECTED: 201,
       DEVICE_WAS_DISCONNECTED: 203,
+      DEVICE_CONNECTION_TIMEOUT: 3,
+      PHONE_HAS_BLUETOOTH_TURNED_OFF: 102,
     };
-    if (
-      e?.errorCode === BLE_ERROR.DEVICE_IS_NOT_ALREADY_CONNECTED ||
-      BLE_ERROR.DEVICE_WAS_DISCONNECTED
-    ) {
-      await bleManager.cancelDeviceConnection(device.id);
-      return BLUETOOOH_DEVICE_UNSTABLE;
+    switch (e?.errorCode) {
+      case BLE_ERROR.DEVICE_IS_NOT_ALREADY_CONNECTED:
+      case BLE_ERROR.DEVICE_WAS_DISCONNECTED:
+        await bleManager.cancelDeviceConnection(device.id);
+        return BLUETOOOH_DEVICE_UNSTABLE;
+      case BLE_ERROR.DEVICE_CONNECTION_TIMEOUT:
+      case BLE_ERROR.PHONE_HAS_BLUETOOTH_TURNED_OFF:
+        delete bluetoothDevices[device.address];
+        return SEND_COMMAND_OVER_BLUETOOTH_FAIL;
+      default:
+        return SEND_COMMAND_OVER_BLUETOOTH_FAIL;
     }
   }
   try {

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

@@ -39,22 +39,22 @@ export const SensorConnectStatusViewHeader = ({
           </>
         );
       }
-      if (connectedViaNetwork) {
+      if (connectedViaBle) {
         return (
           <>
             <ConnectedViewHeader
               lastUpdated={lastUpdated}
+              type={'Bluetooth'}
               isDisplayTime={isDisplayTime}
               showWindDirection={showWindDirection}
             />
           </>
         );
-      } else if (connectedViaBle) {
+      } else if (connectedViaNetwork) {
         return (
           <>
             <ConnectedViewHeader
               lastUpdated={lastUpdated}
-              type={'Bluetooth'}
               isDisplayTime={isDisplayTime}
               showWindDirection={showWindDirection}
             />

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

@@ -107,10 +107,16 @@ const styles = StyleSheet.create({
   },
   titleHistory: {
     flexDirection: 'row',
-    alignItems: 'center',
     justifyContent: 'space-between',
     paddingHorizontal: 16,
   },
+  aggregationView: {
+    flexDirection: 'row',
+    justifyContent: 'space-between',
+    paddingHorizontal: 16,
+    paddingTop: 8,
+    alignSelf: 'flex-end',
+  },
   webviewStyle: {
     flex: 1,
     minHeight: 200,
@@ -123,11 +129,6 @@ const styles = StyleSheet.create({
     width: 300,
     height: 250,
   },
-  titleView: {
-    flexDirection: 'row',
-    flex: 1,
-    lineHeight: 24,
-  },
 });
 
 const chartOptions = {
@@ -291,11 +292,11 @@ const VisualChart = ({ item, isDemo = false, isWidgetOrder }) => {
   return (
     <View style={styles.container}>
       <View style={styles.titleHistory}>
-        <View style={styles.titleView}>
-          <Text size={20} semibold color={Colors.Gray9}>
-            {item.label}
-          </Text>
-        </View>
+        <Text type="H3" semibold color={Colors.Gray9}>
+          {item.label}
+        </Text>
+      </View>
+      <View style={styles.aggregationView}>
         {canChooseGroup && (
           <ChartAggregationOption
             groupBy={groupBy}

package/src/screens/Device/detail.js

@@ -190,6 +190,13 @@ const DeviceDetail = ({ route }) => {
     }
   }, [unitId]);
 
+  const checkScanDevicesBLE = useCallback(async () => {
+    const bluetooth = controlOptions?.bluetooth;
+    if (isBluetoothEnabled && bluetooth) {
+      bluetoothScanDevices([bluetooth.address]);
+    }
+  }, [bluetoothScanDevices, controlOptions?.bluetooth, isBluetoothEnabled]);
+
   useEffect(() => {
     if (unitId && !unitData) {
       fetchUnitDetail();
@@ -222,10 +229,7 @@ const DeviceDetail = ({ route }) => {
   }, [unit, isNetworkConnected]);
 
   useEffect(() => {
-    if (isBluetoothEnabled && controlOptions?.bluetooth) {
-      const bluetooth = controlOptions.bluetooth;
-      bluetoothScanDevices([bluetooth.address]);
-    }
+    checkScanDevicesBLE();
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [isBluetoothEnabled, bluetoothPermGranted, controlOptions, unit]);
 
@@ -296,7 +300,9 @@ const DeviceDetail = ({ route }) => {
 
     success &&
       data.items.length &&
-      data.items.some((item) => (item?.template || item?.type) === 'action') &&
+      data.items.some(
+        (item) => item.template.toLowerCase().search('action') !== -1
+      ) &&
       (await fetchRemoteControlOptions());
   }, [token, sensor, setDeviceId, fetchRemoteControlOptions]);
 
@@ -489,6 +495,7 @@ const DeviceDetail = ({ route }) => {
         await connectHomeAssistant(unit.remote_control_options.googlehome);
       })();
     }
+    checkScanDevicesBLE();
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [sensor, unit, isNetworkConnected, fetchDataDeviceDetail]);
 

package/src/screens/Drawer/index.js

@@ -1,23 +1,23 @@
+import { IconOutline } from '@ant-design/icons-react-native';
+import { Icon } from '@ant-design/react-native';
 import React, { useCallback, useContext } from 'react';
 import {
-  View,
   Image,
-  TouchableOpacity,
   ScrollView,
   StyleSheet,
+  TouchableOpacity,
+  View,
 } from 'react-native';
-import { IconOutline } from '@ant-design/icons-react-native';
-import { Icon } from '@ant-design/react-native';
 import { getStatusBarHeight } from 'react-native-iphone-x-helper';
 
-import t from '../../hooks/Common/useTranslations';
-import { Images, Colors } from '../../configs';
+import { CommonActions, useNavigation } from '@react-navigation/native';
 import Text from '../../commons/Text';
-import Routes from '../../utils/Route';
+import { Colors, SCConfig } from '../../configs';
 import { AccessibilityLabel } from '../../configs/Constants';
 import { SCContext, useSCContextSelector } from '../../context';
-import { CommonActions, useNavigation } from '@react-navigation/native';
 import { Action } from '../../context/actionType';
+import t from '../../hooks/Common/useTranslations';
+import Routes from '../../utils/Route';
 
 const DrawerContainer = () => {
   const user = useSCContextSelector((state) => state.auth.account.user);
@@ -43,7 +43,7 @@ const DrawerContainer = () => {
       <ScrollView contentContainerStyle={styles.scrollView}>
         <View style={[styles.row, styles.logoWrap]}>
           <Image
-            source={Images.logo}
+            source={SCConfig.appLogo}
             style={styles.logo}
             accessibilityLabel={AccessibilityLabel.SIDE_MENU_LOGO}
           />

package/src/screens/Notification/components/NotificationItem.js

@@ -1,18 +1,21 @@
-import React, { memo, useCallback, useState } from 'react';
-import { View, TouchableOpacity, Image } from 'react-native';
-import moment from 'moment';
 import { useNavigation } from '@react-navigation/native';
+import moment from 'moment';
+import React, { memo, useCallback, useState } from 'react';
+import { Image, TouchableOpacity, View } from 'react-native';
 
-import styles from '../styles/NotificationItemStyles';
-import Text from '../../../commons/Text';
-import { Colors, API, Images } from '../../../configs';
 import IconComponent from '../../../commons/IconComponent';
-import { NOTIFICATION_TYPES, EMERGENCY_TYPE } from '../../../configs/Constants';
+import Text from '../../../commons/Text';
+import { API, Colors, SCConfig } from '../../../configs';
+import {
+  AccessibilityLabel,
+  EMERGENCY_TYPE,
+  NOTIFICATION_TYPES,
+} from '../../../configs/Constants';
+import { useSCContextSelector } from '../../../context';
 import { useTranslations } from '../../../hooks/Common/useTranslations';
 import { axiosPost } from '../../../utils/Apis/axios';
 import Routes from '../../../utils/Route';
-import { AccessibilityLabel } from '../../../configs/Constants';
-import { useSCContextSelector } from '../../../context';
+import styles from '../styles/NotificationItemStyles';
 
 const NotificationItem = memo(({ item }) => {
   const t = useTranslations();
@@ -38,6 +41,8 @@ const NotificationItem = memo(({ item }) => {
     [params]
   );
 
+  const logo = SCConfig.appLogo;
+
   const renderItem = useCallback(() => {
     const unitId = params?.unit_id;
     const sensorId = params?.sensor_id;
@@ -76,7 +81,7 @@ const NotificationItem = memo(({ item }) => {
                 unitId,
               },
             }),
-          iconContent: <Image source={Images.logo} style={styles.logo} />,
+          iconContent: <Image source={logo} style={styles.logo} />,
         };
       case NOTIFICATION_TYPES.TURBIDITY:
         return {
@@ -91,7 +96,7 @@ const NotificationItem = memo(({ item }) => {
                 unitId,
               },
             }),
-          iconContent: <Image source={Images.logo} style={styles.logo} />,
+          iconContent: <Image source={logo} style={styles.logo} />,
         };
       case NOTIFICATION_TYPES.PH:
         return {
@@ -106,7 +111,7 @@ const NotificationItem = memo(({ item }) => {
                 unitId,
               },
             }),
-          iconContent: <Image source={Images.logo} style={styles.logo} />,
+          iconContent: <Image source={logo} style={styles.logo} />,
         };
       case NOTIFICATION_TYPES.CLO:
         return {
@@ -119,7 +124,7 @@ const NotificationItem = memo(({ item }) => {
                 unitId,
               },
             }),
-          iconContent: <Image source={Images.logo} style={styles.logo} />,
+          iconContent: <Image source={logo} style={styles.logo} />,
         };
       case NOTIFICATION_TYPES.UV:
         return {
@@ -134,7 +139,7 @@ const NotificationItem = memo(({ item }) => {
                 unitId,
               },
             }),
-          iconContent: <Image source={Images.logo} style={styles.logo} />,
+          iconContent: <Image source={logo} style={styles.logo} />,
         };
       case NOTIFICATION_TYPES.SMOKE:
         return {
@@ -147,7 +152,7 @@ const NotificationItem = memo(({ item }) => {
                 sensorId,
               },
             }),
-          iconContent: <Image source={Images.logo} style={styles.logo} />,
+          iconContent: <Image source={logo} style={styles.logo} />,
         };
       case NOTIFICATION_TYPES.FIRE:
         return {
@@ -160,7 +165,7 @@ const NotificationItem = memo(({ item }) => {
                 sensorId,
               },
             }),
-          iconContent: <Image source={Images.logo} style={styles.logo} />,
+          iconContent: <Image source={logo} style={styles.logo} />,
         };
       case NOTIFICATION_TYPES.SOS:
         return {
@@ -173,7 +178,7 @@ const NotificationItem = memo(({ item }) => {
                 sensorId,
               },
             }),
-          iconContent: <Image source={Images.logo} style={styles.logo} />,
+          iconContent: <Image source={logo} style={styles.logo} />,
         };
       case NOTIFICATION_TYPES.FILTER_WATER:
         return {
@@ -188,7 +193,7 @@ const NotificationItem = memo(({ item }) => {
                 sensorId,
               },
             }),
-          iconContent: <Image source={Images.logo} style={styles.logo} />,
+          iconContent: <Image source={logo} style={styles.logo} />,
         };
       case NOTIFICATION_TYPES.LOW_BATTERY:
         return {
@@ -345,7 +350,7 @@ const NotificationItem = memo(({ item }) => {
                     sensorId,
                   },
                 }),
-              iconContent: <Image source={Images.logo} style={styles.logo} />,
+              iconContent: <Image source={logo} style={styles.logo} />,
             };
           case EMERGENCY_TYPE.RESOLVE:
             return {
@@ -360,7 +365,7 @@ const NotificationItem = memo(({ item }) => {
                     sensorId,
                   },
                 }),
-              iconContent: <Image source={Images.logo} style={styles.logo} />,
+              iconContent: <Image source={logo} style={styles.logo} />,
             };
           default:
             return null;
@@ -371,7 +376,7 @@ const NotificationItem = memo(({ item }) => {
             t('text_notification_content_change_unit_for_old_owner')
           ),
           redirect: () => null,
-          iconContent: <Image source={Images.logo} style={styles.logo} />,
+          iconContent: <Image source={logo} style={styles.logo} />,
         };
       case NOTIFICATION_TYPES.NOTIFY_CHANGE_UNIT_NEW_OWNER:
         return {
@@ -386,7 +391,7 @@ const NotificationItem = memo(({ item }) => {
               },
             });
           },
-          iconContent: <Image source={Images.logo} style={styles.logo} />,
+          iconContent: <Image source={logo} style={styles.logo} />,
         };
       case NOTIFICATION_TYPES.TRIAL_WILL_END: // to do Canh remove later
         return {
@@ -394,7 +399,7 @@ const NotificationItem = memo(({ item }) => {
             t('text_notification_content_when_trial_will_end')
           ),
           redirect: () => null,
-          iconContent: <Image source={Images.logo} style={styles.logo} />,
+          iconContent: <Image source={logo} style={styles.logo} />,
         };
       case NOTIFICATION_TYPES.FREE_TRIAL_SUBSCRIPTION:
         return {
@@ -406,7 +411,7 @@ const NotificationItem = memo(({ item }) => {
         return {
           content: params?.message[language],
           redirect: () => null,
-          iconContent: <Image source={Images.logo} style={styles.logo} />,
+          iconContent: <Image source={logo} style={styles.logo} />,
         };
       case NOTIFICATION_TYPES.SUBSCRIBE_SUCCESS:
         return {
@@ -414,12 +419,21 @@ const NotificationItem = memo(({ item }) => {
             t('text_notification_content_subscribe_success')
           ),
           redirect: () => null,
-          iconContent: <Image source={Images.logo} style={styles.logo} />,
+          iconContent: <Image source={logo} style={styles.logo} />,
         };
       default:
         return null;
     }
-  }, [content_code, customColorText, icon, navigation, params, t, language]);
+  }, [
+    content_code,
+    customColorText,
+    icon,
+    navigation,
+    params,
+    t,
+    language,
+    logo,
+  ]);
 
   const { content, redirect, iconContent } = renderItem() || {};
 

package/src/screens/Unit/ManageUnit.js

@@ -1,21 +1,21 @@
-import React, { useState, useCallback, useEffect, useMemo } from 'react';
-import { View, TouchableOpacity, Image } from 'react-native';
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import { Image, TouchableOpacity, View } from 'react-native';
 
-import { useTranslations } from '../../hooks/Common/useTranslations';
-import { Colors, API, Images } from '../../configs';
-import Routes from '../../utils/Route';
-import { ToastBottomHelper } from '../../utils/Utils';
-import { createFormData, axiosPatch } from '../../utils/Apis/axios';
-import useBoolean from '../../hooks/Common/useBoolean';
-import useKeyboardAnimated from '../../hooks/Explore/useKeyboardAnimated';
+import { useNavigation } from '@react-navigation/native';
 import { AlertAction, ImagePicker } from '../../commons';
-import Text from '../../commons/Text';
 import _TextInput from '../../commons/Form/TextInput';
 import WrapHeaderScrollable from '../../commons/Sharing/WrapHeaderScrollable';
-import { useIsOwnerOfUnit } from '../../hooks/Common';
+import Text from '../../commons/Text';
+import { API, Colors, Images, SCConfig } from '../../configs';
 import { AccessibilityLabel } from '../../configs/Constants';
+import { useIsOwnerOfUnit } from '../../hooks/Common';
+import useBoolean from '../../hooks/Common/useBoolean';
+import { useTranslations } from '../../hooks/Common/useTranslations';
+import useKeyboardAnimated from '../../hooks/Explore/useKeyboardAnimated';
+import { axiosPatch, createFormData } from '../../utils/Apis/axios';
+import Routes from '../../utils/Route';
+import { ToastBottomHelper } from '../../utils/Utils';
 import styles from './ManageUnitStyles';
-import { useNavigation } from '@react-navigation/native';
 import ButtonWrapper from './components/ButtonWrapper';
 
 const ManageUnit = ({ route }) => {
@@ -212,7 +212,7 @@ const ManageUnit = ({ route }) => {
                         ? {
                             uri: unitData.background,
                           }
-                        : Images.unitDefaultBackground
+                        : SCConfig.appUnitDefaultBackground
                     }
                     borderRadius={10}
                     style={styles.image}