@eohjsc/react-native-smart-city 0.3.61 → 0.3.63

package/index.js

@@ -19,8 +19,9 @@ import MyUnit from './src/commons/Dashboard/MyUnit';
 import SharedUnit from './src/commons/Unit/SharedUnit';
 import { Action } from './src/context/actionType';
 import { withRemoteControl } from './src/hoc';
-import DevModeStack from './src/navigations/Main';
+// import DevModeStack from './src/navigations/Main';
 import { SmartAccountStack } from './src/navigations/SmartAccountStack';
+import { AllGatewayStack } from './src/navigations/AllGatewayStack';
 
 export {
   AddSubUnitStack,
@@ -46,6 +47,7 @@ export {
   SCWrapper,
   Action,
   withRemoteControl,
-  DevModeStack,
+  // DevModeStack,
   SmartAccountStack,
+  AllGatewayStack,
 };

package/package.json

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

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

@@ -11,6 +11,8 @@ import { AccessibilityLabel } from '../../../configs/Constants';
 import { useTranslations } from '../../../hooks/Common/useTranslations';
 import SharedUnit from '../../Unit/SharedUnit';
 import { fetchWithCache } from '../../../utils/Apis/axios';
+import { preloadImagesFromUnits } from '../../../utils/Functions/preloadImages';
+import { STORAGE_KEY } from '../../../utils/Storage';
 
 const MyPinnedSharedUnit = ({ refreshing }) => {
   const t = useTranslations();
@@ -40,6 +42,14 @@ const MyPinnedSharedUnit = ({ refreshing }) => {
     }
   }, [fetchSharedUnitDashboard, isFocused, refreshing]);
 
+  useEffect(() => {
+    sharedUnits?.length &&
+      preloadImagesFromUnits(
+        sharedUnits,
+        STORAGE_KEY.IS_FIRST_TIME_LOAD_MY_SHARE_UNIT
+      );
+  }, [sharedUnits]);
+
   return (
     <>
       <Section>

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

@@ -30,6 +30,8 @@ import Carousel from 'react-native-snap-carousel';
 import { AccessibilityLabel, DEVICE_TYPE } from '../../../configs/Constants';
 import Routes from '../../../utils/Route';
 import MyUnitDevice from '../../../screens/Unit/components/MyUnitDevice';
+import { STORAGE_KEY } from '../../../utils/Storage';
+import { preloadImagesFromUnits } from '../../../utils/Functions/preloadImages';
 
 let screenWidth = Dimensions.get('window').width;
 
@@ -106,12 +108,11 @@ const MyUnit = ({ refreshing }) => {
   useWatchConfigs(configsNeedWatching);
 
   const goToDetail = useCallback(
-    (item) => {
+    (item) => () => {
       navigation.navigate(Routes.UnitStack, {
         screen: Routes.UnitDetail,
         params: {
           unitId: item.id,
-          unitData: item,
         },
       });
     },
@@ -130,7 +131,7 @@ const MyUnit = ({ refreshing }) => {
           }}
         >
           <TouchableOpacity
-            onPress={() => goToDetail(item)}
+            onPress={goToDetail(item)}
             style={styles.btnItem}
             activeOpacity={0.75}
             accessibilityLabel={`${AccessibilityLabel.MY_UNIT_GO_TO_DETAIL}-${index}`}
@@ -153,6 +154,11 @@ const MyUnit = ({ refreshing }) => {
     [myUnits, goToDetail]
   );
 
+  useEffect(() => {
+    myUnits?.length &&
+      preloadImagesFromUnits(myUnits, STORAGE_KEY.IS_FIRST_TIME_LOAD_MY_UNITS);
+  }, [myUnits]);
+
   return (
     <>
       <Section style={styles.boxTxtMyUnit}>

package/src/commons/Device/HorizontalBarChart.js

@@ -105,7 +105,7 @@ const HorizontalBarChart = memo(({ datas, config }) => {
   });
 
   const heightChart = useMemo(() => {
-    const dataX = datas[0].data.map((item) => item.x);
+    const dataX = (datas[0]?.data || []).map((item) => item.x);
     return dataX.length > 1
       ? dataX.length === 2
         ? dataX.length * 55 + 30
@@ -114,13 +114,13 @@ const HorizontalBarChart = memo(({ datas, config }) => {
   }, [datas]);
 
   useEffect(() => {
-    const dataY = datas[0].data.map((item, index) => {
+    const dataY = (datas[0]?.data || []).map((item, index) => {
       return {
         color: index % 2 === 0 ? Colors.Primary + '20' : Colors.Primary + '16',
         y: item.y,
       };
     });
-    const dataX = datas[0].data.map((item) => item.x);
+    const dataX = (datas[0].data || []).map((item) => item.x);
     const maxY = getMaxValueIndex(dataY);
     if (!isEmpty(maxY.max)) {
       dataY.splice(maxY._index, 1, { ...maxY.max, color: Colors.Primary });

package/src/commons/Device/PMSensor/PMSensorIndicatior.js

@@ -3,6 +3,7 @@ import { View } from 'react-native';
 import { FlatList } from 'react-native';
 import QualityIndicatorItem from '../WaterQualitySensor/QualityIndicatorsItem';
 import styles from './PMSensorIndicatorStyles';
+import { roundNumber } from '../../../utils/Utils';
 
 //using for PM2.5-10, CO, UV, Rainflow Sensor
 const keyExtractor = (item) => item.id.toString();
@@ -11,7 +12,7 @@ const PMSensorIndicatior = memo(({ data = [], style }) => {
     ({ item }) => {
       const getValue = ['', null, undefined, NaN].includes(item?.value)
         ? '--'
-        : item?.value;
+        : roundNumber(item?.value);
       return (
         <QualityIndicatorItem
           key={item.id.toString()}

package/src/commons/Header/HeaderCustom.js

@@ -28,6 +28,7 @@ const HeaderCustom = ({
   isCanBack = true,
   customTitle = false,
   buttonBackStyles,
+  headerStyles,
 }) => {
   const t = useTranslations();
   const { goBack } = useNavigation();
@@ -46,7 +47,9 @@ const HeaderCustom = ({
   }, []);
 
   return (
-    <View style={[styles.wrap, isShowSeparator && styles.separator]}>
+    <View
+      style={[styles.wrap, isShowSeparator && styles.separator, headerStyles]}
+    >
       {isCanBack && (
         <TouchableOpacity
           style={[styles.buttonBack, buttonBackStyles]}

package/src/configs/API.js

@@ -219,6 +219,20 @@ const API = {
       DETAIL: (id) => `/chip_manager/developer_mode_chips/${id}/`,
       REBOOT: (id) => `/chip_manager/developer_mode_chips/${id}/reboot_chip/`,
     },
+    ARDUINO: {
+      DEVICE: (gatewayId) =>
+        `/iot/modules/arduino/gateways/${gatewayId}/devices/`,
+      DEVICE_DETAIL: (gatewayId, deviceId) =>
+        `/iot/modules/arduino/gateways/${gatewayId}/devices/${deviceId}/`,
+      CONFIG_PINS: (gatewayId, deviceId) =>
+        `/iot/modules/arduino/gateways/${gatewayId}/devices/${deviceId}/pins/`,
+      CONFIG_PIN_DETAIL: (gatewayId, deviceId, configPinId) =>
+        `/iot/modules/arduino/gateways/${gatewayId}/devices/${deviceId}/pins/${configPinId}/`,
+      ACTION: (gatewayId, deviceId) =>
+        `/iot/modules/arduino/gateways/${gatewayId}/devices/${deviceId}/actions/`,
+      ACTION_DETAIL: (gatewayId, deviceId, actionId) =>
+        `/iot/modules/arduino/gateways/${gatewayId}/devices/${deviceId}/actions/${actionId}/`,
+    },
     ZIGBEE: {
       SEARCH_DEVICE: (id) => `/iot/modules/zigbee/chips/${id}/search_device/`,
       DEVICE_CONFIGURATION: (id, deviceId) =>

package/src/configs/Constants.js

@@ -83,6 +83,7 @@ export const DEVICE_TYPE = {
   GOOGLE_HOME: 'GOOGLE_HOME',
   WIFI_DEVICE: 'WIFI_DEVICE',
   MODBUS: 'MODBUS',
+  INTERNAL: 'INTERNAL',
 };
 export const PERMISSION_TYPE = {
   ACTION: 'ACTION',

package/src/context/actionType.ts

@@ -37,6 +37,7 @@ export const Action = {
   SET_WIDGET_DRAGGING: 'SET_WIDGET_DRAGGING',
   SET_IS_EDITING_TEMPLATE: 'SET_IS_EDITING_TEMPLATE',
   SET_IS_IN_EDIT_TEMPLATE_SCREEN: 'SET_IS_IN_EDIT_TEMPLATE_SCREEN',
+  LOGOUT: 'LOGOUT',
 };
 
 export type AuthData = {

package/src/context/reducer.ts

@@ -15,6 +15,7 @@ import {
   BluetoothType,
 } from './actionType';
 import { uniq, reduce } from 'lodash';
+import { STORAGE_KEY, removeMultiple } from '../utils/Storage.js';
 
 export type ContextData = {
   auth: AuthData;
@@ -481,6 +482,15 @@ export const reducer = (currentState: ContextData, action: Action) => {
         },
       };
 
+    case Action.LOGOUT:
+      removeMultiple([
+        STORAGE_KEY.IS_FIRST_TIME_LOAD_MY_UNITS,
+        STORAGE_KEY.IS_FIRST_TIME_LOAD_MY_SHARE_UNIT,
+      ]);
+      return {
+        ...currentState,
+      };
+
     default:
       return currentState;
   }

package/src/navigations/AllGatewayStack.js

@@ -0,0 +1,68 @@
+import React, { memo } from 'react';
+import { createStackNavigator } from '@react-navigation/stack';
+
+import GatewayDetail from '../screens/AllGateway/GatewayDetail';
+import GatewayInfo from '../screens/AllGateway/GatewayInfo';
+import GatewayConnectionMethods from '../screens/AllGateway/GatewayConnectionMethods';
+import DeviceZigbeeDetail from '../screens/AllGateway/DeviceZigbeeDetail';
+import DeviceInternalDetail from '../screens/AllGateway/DeviceInternalDetail';
+import DeviceGatewayInfo from '../screens/AllGateway/DeviceGatewayInfo';
+import DetailConfigActionZigbee from '../screens/AllGateway/DetailConfigActionZigbee';
+import DeviceModbusDetail from '../screens/AllGateway/DeviceModbusDetail';
+import DetailConfigActionModbus from '../screens/AllGateway/DetailConfigActionModbus';
+import DetailChildConfigActionModbus from '../screens/AllGateway/DetailConfigActionModbus';
+import DetailConfigActionInterval from '../screens/AllGateway/DetailConfigActionInternal';
+import Route from '../utils/Route'; // utils/Route
+import { screenOptions } from './utils';
+
+const Stack = createStackNavigator();
+
+export const AllGatewayStack = memo(() => {
+  return (
+    <Stack.Navigator
+      screenOptions={{
+        ...screenOptions,
+        headerShown: false,
+      }}
+    >
+      <Stack.Screen component={GatewayDetail} name={Route.GatewayDetail} />
+      <Stack.Screen component={GatewayInfo} name={Route.GatewayInfo} />
+      <Stack.Screen
+        component={DeviceGatewayInfo}
+        name={Route.DeviceGatewayInfo}
+      />
+      <Stack.Screen
+        component={GatewayConnectionMethods}
+        name={Route.GatewayConnectionMethods}
+      />
+      <Stack.Screen
+        component={DeviceInternalDetail}
+        name={Route.DeviceInternalDetail}
+      />
+      <Stack.Screen
+        component={DeviceZigbeeDetail}
+        name={Route.DeviceZigbeeDetail}
+      />
+      <Stack.Screen
+        component={DeviceModbusDetail}
+        name={Route.DeviceModbusDetail}
+      />
+      <Stack.Screen
+        component={DetailConfigActionZigbee}
+        name={Route.DetailConfigActionZigbee}
+      />
+      <Stack.Screen
+        component={DetailConfigActionInterval}
+        name={Route.DetailConfigActionInterval}
+      />
+      <Stack.Screen
+        component={DetailConfigActionModbus}
+        name={Route.DetailConfigActionModbus}
+      />
+      <Stack.Screen
+        component={DetailChildConfigActionModbus}
+        name={Route.DetailChildConfigActionModbus}
+      />
+    </Stack.Navigator>
+  );
+});