@eohjsc/react-native-smart-city 0.2.42 → 0.2.46

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@eohjsc/react-native-smart-city",
   "title": "React Native Smart Home",
-  "version": "0.2.42",
+  "version": "0.2.46",
   "description": "TODO",
   "main": "index.js",
   "files": [
@@ -39,7 +39,12 @@
     "reset-cache": "react-native start --reset-cache",
     "merge_conflict": "yarn jest && yarn update_coverage_result && yarn check_coverage_config",
     "jest": "jest --detectOpenHandles",
-    "postinstall": "patch-package"
+    "postinstall": "patch-package",
+    "example": "yarn --cwd example",
+    "pods": "cd example && pod-install --quiet",
+    "bootstrap": "yarn example && yarn && yarn pods",
+    "build": "sync-files ./src ../EohMobile/node_modules/@eohjsc/react-native-smart-city/src",
+    "watch": "sync-files --watch ./src ../EohMobile/node_modules/@eohjsc/react-native-smart-city/src"
   },
   "repository": {
     "type": "git",
@@ -49,6 +54,9 @@
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
   },
+  "resolutions": {
+    "graceful-fs": "^4.2.4"
+  },
   "keywords": [
     "react-native"
   ],
@@ -187,6 +195,7 @@
     "redux-persist": "^6.0.0",
     "redux-saga": "^1.1.3",
     "string-format": "^2.0.0",
+    "sync-files": "^1.0.3",
     "timezone-mock": "^1.1.3",
     "uuid-by-string": "^3.0.2",
     "validator": "^13.1.1",

package/src/commons/Device/ConnectedViewHeader.js

@@ -21,27 +21,30 @@ const DisplayTextConnected = memo(({ type }) => {
   return <Text style={styles.greenStatus}>{text}</Text>;
 });
 
-const ConnectedViewHeader = memo(({ lastUpdated, type, isDisplayTime }) => {
-  const t = useTranslations();
-  const lastUpdatedStr = lastUpdated
-    ? timeDifference(new Date(), lastUpdated)
-    : null;
-  return (
-    <View style={styles.statusContainer}>
-      <View style={styles.connectStatus}>
-        <IconOutline name={'wifi'} color={Colors.Green6} size={16} />
-        <DisplayTextConnected type={type} />
-      </View>
-      {lastUpdatedStr && isDisplayTime && (
-        <View>
-          <Text color={Colors.Gray7} size={12} style={styles.txtLastUpdate}>
-            {`${t('last_updated')} ${lastUpdatedStr}`}
-          </Text>
+const ConnectedViewHeader = memo(
+  ({ lastUpdated, type, isDisplayTime, showWindDirection }) => {
+    const t = useTranslations();
+    const lastUpdatedStr = lastUpdated
+      ? timeDifference(new Date(), lastUpdated)
+      : null;
+    return (
+      <View style={styles.statusContainer}>
+        <View style={styles.connectStatus}>
+          <IconOutline name={'wifi'} color={Colors.Green6} size={16} />
+          <DisplayTextConnected type={type} />
         </View>
-      )}
-    </View>
-  );
-});
+        {lastUpdatedStr && isDisplayTime && (
+          <View style={styles.showWindDirection}>
+            {showWindDirection && <Text>{t('current_wind_direction')} </Text>}
+            <Text color={Colors.Gray7} size={12} style={styles.txtLastUpdate}>
+              {`${t('last_updated')} ${lastUpdatedStr}`}
+            </Text>
+          </View>
+        )}
+      </View>
+    );
+  }
+);
 
 const styles = StyleSheet.create({
   statusContainer: {
@@ -52,7 +55,7 @@ const styles = StyleSheet.create({
   connectStatus: {
     flexDirection: 'row',
     alignItems: 'center',
-    paddingVertical: 20,
+    paddingVertical: 16,
   },
   greenStatus: {
     marginLeft: 10,
@@ -62,6 +65,13 @@ const styles = StyleSheet.create({
   txtLastUpdate: {
     marginLeft: 8,
     lineHeight: 20,
+    marginTop: 8,
+  },
+  showWindDirection: {
+    flexDirection: 'column',
+    justifyContent: 'center',
+    alignItems: 'center',
+    marginBottom: 50,
   },
 });
 

package/src/commons/SubUnit/OneTap/ItemOneTap.js

@@ -20,7 +20,7 @@ import { useGetIdUser } from '../../../hooks/Common';
 import { AUTOMATE_TYPE, TESTID } from '../../../configs/Constants';
 
 const ItemOneTap = memo(
-  ({ isOwner, automate, unit, wrapSyles, onPressItem }) => {
+  ({ isOwner, automate = {}, unit, wrapSyles, onPressItem }) => {
     const { navigate } = useNavigation();
     const {
       id,
@@ -54,6 +54,7 @@ const ItemOneTap = memo(
     const goToDetail = useCallback(() => {
       navigate(Routes.ScriptDetail, {
         id,
+        automate,
         name: script?.name,
         type: type,
         havePermission: isOwner || user === idUser,
@@ -61,6 +62,7 @@ const ItemOneTap = memo(
         textCondition,
       });
     }, [
+      automate,
       isOwner,
       user,
       idUser,

package/src/commons/SubUnit/OneTap/__test__/SubUnitAutomate.test.js

@@ -100,6 +100,7 @@ describe('test Item', () => {
       type: 'one_tap',
       unit: undefined,
       textCondition: null,
+      automate: data.automates[0],
     });
 
     const handleScriptAction = instance.findAll(
@@ -196,6 +197,7 @@ describe('test Item', () => {
       type: 'value_change',
       unit: undefined,
       textCondition: 'Temperature higher than 29',
+      automate: data.automates[0],
     });
   });
   test('render SubUnitAutomate script schedule', async () => {

package/src/commons/SubUnit/ShortDetail.js

@@ -80,7 +80,7 @@ const ShortDetailSubUnit = ({ unit, station, isGGHomeConnected }) => {
       ? 'add_to_favorites'
       : station?.name === SubUnitName.scenario
       ? 'add_script'
-      : 'add_new_device'
+      : 'add_new'
   );
 
   return (

package/src/commons/UnitSummary/AirQuality/SegmentedRoundDisplay/index.js

@@ -208,7 +208,7 @@ const SegmentedRoundDisplay = ({
             ...styles.boxTitle,
           }}
         >
-          <TextCustom size={14} color={Colors.White}>
+          <TextCustom size={14} color={Colors.White} style={styles.textTitle}>
             {title}
           </TextCustom>
         </View>
@@ -269,4 +269,7 @@ const styles = StyleSheet.create({
     paddingVertical: 2,
     borderRadius: 100,
   },
+  textTitle: {
+    lineHeight: 18,
+  },
 });

package/src/configs/Constants.js

@@ -100,6 +100,12 @@ export const AUTOMATE_SELECT = {
   SELECT_SENSOR: 'select_sensor',
 };
 
+export const CONDITION_TYPES = {
+  IS: 'IS',
+  IS_BELOW: 'IS_BELOW',
+  IS_ABOVE: 'IS_ABOVE',
+};
+
 export const AUTOMATES = {
   one_tap: {
     value: AUTOMATE_TYPE.ONE_TAP,
@@ -580,4 +586,5 @@ export const NOTIFICATION_TYPES = {
   STOP_VIOLATION_FREE_PARKING_ZONE: 'STOP_VIOLATION_FREE_PARKING_ZONE',
   PARKING_COMPLETED_DUE_TO_CAR_LEAVE: 'PARKING_COMPLETED_DUE_TO_CAR_LEAVE',
   NOTIFY_INVITE_MEMBER: 'NOTIFY_INVITE_MEMBER',
+  REMINDER: 'REMINDER',
 };

package/src/configs/Images.js

@@ -6,4 +6,5 @@ export default {
   fullscreen: require('../Images/Common/fullscreen.png'),
   file: require('../Images/Common/file.png'),
   activeButton: require('../Images/Common/ActiveButton.png'),
+  logo: require('../Images/Common/logo.png'),
 };

package/src/navigations/UnitStack.js

@@ -127,7 +127,10 @@ export const UnitStack = memo((props) => {
       <Stack.Screen
         name={Route.DeviceDetail}
         component={DeviceDetail}
-        options={{ headerShown: false }}
+        options={{
+          headerShown: false,
+          animationEnabled: false,
+        }}
       />
       <Stack.Screen
         name={Route.UVIndexGuide}

package/src/screens/AQIGuide/index.js

@@ -91,13 +91,17 @@ const AQIGuide = memo(() => {
               <Text
                 testID={TESTID.AQI_GUIDE_MAIN_TITLE}
                 semibold
-                size={20}
+                type="H3"
                 color={Colors.Gray9}
                 style={styles.titles}
               >
                 {title}
               </Text>
-              <Text size={14} color={Colors.Gray8} style={styles.des}>
+              <Text
+                type="Body"
+                color={Colors.Gray8}
+                style={[styles.des, styles.lineHeight]}
+              >
                 {des}
               </Text>
             </View>
@@ -119,12 +123,16 @@ const AQIGuide = memo(() => {
                 <Text
                   testID={TESTID.AQI_GUIDE_UVINDEX_TITLE}
                   semibold
-                  size={16}
+                  type="H4"
                   color={color}
                 >
                   {title}
                 </Text>
-                <Text size={14} color={Colors.Gray8}>
+                <Text
+                  type="Body"
+                  color={Colors.Gray8}
+                  style={styles.lineHeight}
+                >
                   {des}
                 </Text>
               </View>
@@ -152,6 +160,9 @@ const styles = StyleSheet.create({
   des: {
     marginHorizontal: 16,
   },
+  lineHeight: {
+    lineHeight: 26,
+  },
   containerUV: {
     flexDirection: 'row',
     marginTop: 16,

package/src/screens/AddNewAction/SelectAction.js

@@ -12,7 +12,7 @@ import OptionsDropdownActionTemplate from '../../commons/OneTapTemplate/OptionsD
 import StatesGridActionTemplate from '../../commons/OneTapTemplate/StatesGridActionTemplate';
 import { axiosGet, axiosPost } from '../../utils/Apis/axios';
 import { API, Images } from '../../configs';
-import { TESTID } from '../../configs/Constants';
+import { CONDITION_TYPES, TESTID } from '../../configs/Constants';
 import Routes from '../../utils/Route';
 import styles from './Styles/SelectActionStyles';
 import moment from 'moment';
@@ -30,6 +30,7 @@ const SelectAction = memo(({ route }) => {
     unit,
     device,
     automateId,
+    automate = {},
     scriptName,
     isSelectSensor = false,
     type,
@@ -42,9 +43,11 @@ const SelectAction = memo(({ route }) => {
   const [sensorData, setSensorData] = useState([]);
   const [checkedItem, setCheckedItem] = useState({});
   const [isLoading, setIsLoading] = useState(false);
+  const [isfetched, setIsfetched] = useState(true);
 
   const fetchData = useCallback(async () => {
     isSelectSensor && setIsLoading(true);
+    setIsfetched(true);
     const { success, data } = await axiosGet(
       isSelectSensor
         ? API.AUTOMATE.GET_SENSOR_CONFIG(device.id)
@@ -53,13 +56,51 @@ const SelectAction = memo(({ route }) => {
       isSelectSensor && true
     );
     if (success) {
-      isSelectSensor ? setSensorData(data) : setData(data);
+      if (isSelectSensor) {
+        if (automate?.config_id) {
+          const conditionType = [
+            {
+              title: `${t('is_below')} (<)`,
+              type: CONDITION_TYPES.IS_BELOW,
+              conditionValue: '<',
+            },
+            {
+              title: `${t('is')} (=)`,
+              type: CONDITION_TYPES.IS,
+              conditionValue: '=',
+            },
+            {
+              title: `${t('is_above')} (>)`,
+              type: CONDITION_TYPES.IS_ABOVE,
+              conditionValue: '>',
+            },
+          ];
+          const condition = conditionType.find((item) => {
+            return item.conditionValue === automate.condition;
+          });
+          const updateSensorData = data.map((obj) =>
+            obj.id === automate.config_id
+              ? { ...obj, value: automate.value, ...condition }
+              : obj
+          );
+          let selectSensor = data.find((config) => {
+            return config.id === automate.config_id;
+          });
+          setSensorData(updateSensorData);
+          setCheckedItem(selectSensor);
+        } else {
+          setSensorData(data);
+        }
+      } else {
+        setData(data);
+      }
     }
+    setIsfetched(false);
     const to = setTimeout(() => {
       setIsLoading(false);
       clearTimeout(to);
     }, 1000);
-  }, [device.id, isSelectSensor]);
+  }, [automate, device.id, isSelectSensor, t]);
 
   const checkConditionToContinue = useCallback(() => {
     const itemTemp = sensorData?.find((i) => i.id === checkedItem?.id);
@@ -76,6 +117,13 @@ const SelectAction = memo(({ route }) => {
         isSelectSensor,
         isMultiUnits,
         automateId,
+        automate: {
+          ...automate,
+          condition: itemTemp?.conditionValue || '<',
+          value: itemTemp?.value,
+          config_id: itemTemp?.id,
+          config_name: itemTemp?.name,
+        },
         scriptName,
       });
     } else {
@@ -302,7 +350,7 @@ const SelectAction = memo(({ route }) => {
             testID={TESTID.ACTION_ITEM}
           />
         )}
-        {data?.length === 0 && (
+        {data?.length === 0 && sensorData?.length === 0 && !isfetched && (
           <View style={styles.noneData}>
             <Text center>
               {t('you_do_not_have_the_device_or_have_share_control_device')}

package/src/screens/AddNewAction/SelectSensorDevices.js

@@ -21,6 +21,7 @@ const SelectSensorDevices = memo(({ route }) => {
   const {
     unit,
     automateId,
+    automate = {},
     title = AUTOMATE_SELECT.SELECT_DEVICE,
     type,
     scriptName,
@@ -59,13 +60,29 @@ const SelectSensorDevices = memo(({ route }) => {
             station: item,
             index: index,
           }));
+          if (isSelectSensor) {
+            if (automate.sensor_id) {
+              let selectSensor = {};
+              data.map((item) => {
+                item.sensors.map((sensor) => {
+                  if (sensor.id === automate.sensor_id) {
+                    selectSensor = sensor;
+                    return;
+                  } else if (selectSensor) {
+                    return;
+                  }
+                });
+              });
+              setSelectedDevice(selectSensor);
+            }
+          }
           setStation(data);
           setListMenuItem(listMenu);
           setListStation(listMenu.concat([{ text: '' }]));
         }
       }
     );
-  }, [isSelectSensor, unit.id]);
+  }, [automate.sensor_id, isSelectSensor, unit]);
 
   useEffect(() => {
     fetchDetails();
@@ -84,6 +101,10 @@ const SelectSensorDevices = memo(({ route }) => {
       unit,
       device: selectedDevice,
       automateId: automateId,
+      automate: {
+        ...automate,
+        sensor_id: selectedDevice?.id ? selectedDevice.id : automate.sensor_id,
+      },
       stationName: station[indexStation]?.name,
       isSelectSensor,
       type,
@@ -93,18 +114,19 @@ const SelectSensorDevices = memo(({ route }) => {
       isMultiUnits,
     });
   }, [
+    navigate,
+    unit,
     selectedDevice,
     automateId,
+    automate,
     station,
     indexStation,
-    navigate,
-    unit,
-    type,
     isSelectSensor,
+    type,
     scriptName,
-    isMultiUnits,
     isAutomateTab,
     isCreateNewAction,
+    isMultiUnits,
   ]);
 
   const onPressClose = useCallback(() => {

package/src/screens/AddNewAction/SetupSensor.js

@@ -13,12 +13,7 @@ import BottomButtonView from '../../commons/BottomButtonView';
 import { HorizontalPicker } from '../../commons';
 import { popAction } from '../../navigations/utils';
 import { useStatusBarPreview } from '../../hooks/Common/useStatusBar';
-
-const CONDITION_TYPES = {
-  IS: 'IS',
-  IS_BELOW: 'IS_BELOW',
-  IS_ABOVE: 'IS_ABOVE',
-};
+import { CONDITION_TYPES } from '../../configs/Constants';
 
 const SetUpSensor = () => {
   const t = useTranslations();

package/src/screens/AddNewAutoSmart/__test__/AddNewAutoSmart.test.js

@@ -39,6 +39,10 @@ describe('test AddNewAutoSmart', () => {
     },
   };
 
+  beforeEach(() => {
+    mockNavigate.mockClear();
+  });
+
   test('AddNewAutoSmart select sensor device', async () => {
     await act(async () => {
       tree = await create(wrapComponent(route));
@@ -62,8 +66,11 @@ describe('test AddNewAutoSmart', () => {
     });
 
     expect(mockNavigate).toBeCalledWith(Routes.SelectSensorDevices, {
+      automate: {},
+      automateId: undefined,
       title: 'select_sensor',
       type: 'value_change',
+      scriptName: undefined,
       unit: { id: 1 },
       isAutomateTab: undefined,
       isMultiUnits: undefined,
@@ -92,11 +99,14 @@ describe('test AddNewAutoSmart', () => {
       await bottomButton.props.onPress();
     });
     expect(mockNavigate).toHaveBeenCalledWith(Routes.SetSchedule, {
+      automate: {},
+      automateId: undefined,
       type: 'schedule',
+      routeName: 'SetSchedule',
+      scriptName: undefined,
       unit: route.params.unit,
       isAutomateTab: undefined,
       isMultiUnits: undefined,
-      routeName: 'SetSchedule',
     });
   });
 });

package/src/screens/AddNewAutoSmart/index.js

@@ -17,8 +17,14 @@ import Routes from '../../utils/Route';
 const AddNewAutoSmart = memo(({ route }) => {
   const t = useTranslations();
   const { navigate, goBack } = useNavigation();
-  const { type, unit, isAutomateTab, isMultiUnits, automateId, scriptName } =
-    route.params;
+  const {
+    type,
+    unit,
+    isAutomateTab,
+    isMultiUnits,
+    automate = {},
+    scriptName,
+  } = route.params;
   const typeAutoSmart = {
     [AUTOMATE_TYPE.AUTOMATE]: [
       {
@@ -57,26 +63,31 @@ const AddNewAutoSmart = memo(({ route }) => {
       },
     ],
   };
-  const [data] = useState(typeAutoSmart[type]);
-  const [selectedIndex, setSelectedIndex] = useState(-1);
+  const [data] = useState(
+    automate?.id ? typeAutoSmart[AUTOMATE_TYPE.AUTOMATE] : typeAutoSmart[type]
+  );
+  const [selectedIndex, setSelectedIndex] = useState(
+    automate?.id ? data.findIndex((obj) => obj.type === type) : -1
+  );
 
   const handleOnContinue = useCallback(() => {
-    const automate = data[selectedIndex];
+    const dataAutomate = data[selectedIndex];
     const params = {
-      type: automate?.type,
+      type: dataAutomate?.type,
       unit: unit,
-      ...(automate?.data || {}),
+      ...(dataAutomate?.data || {}),
       isAutomateTab,
       isMultiUnits,
-      routeName: automate?.route,
-      automateId,
+      automateId: automate?.id,
+      routeName: dataAutomate?.route,
+      automate,
       scriptName,
     };
 
-    if (automate.type === AUTOMATE_TYPE.VALUE_CHANGE && isMultiUnits) {
+    if (dataAutomate.type === AUTOMATE_TYPE.VALUE_CHANGE && isMultiUnits) {
       navigate(Routes.SelectUnit, params);
     } else {
-      navigate(automate.route, params);
+      navigate(dataAutomate.route, params);
     }
   }, [
     navigate,
@@ -85,7 +96,7 @@ const AddNewAutoSmart = memo(({ route }) => {
     unit,
     isAutomateTab,
     isMultiUnits,
-    automateId,
+    automate,
     scriptName,
   ]);
 
@@ -107,7 +118,7 @@ const AddNewAutoSmart = memo(({ route }) => {
       <HeaderCustom isShowClose onClose={onClose} />
       <View style={styles.container}>
         <Text semibold type={'H2'} style={styles.titleCreate}>
-          {automateId ? t('update_smart') : t('create_smart')}
+          {automate?.id ? t('update_smart') : t('create_smart')}
         </Text>
         <Text type={'Body'} style={styles.titleChoose}>
           {t('choose_the_automation_method_you_want')}

package/src/screens/AddNewGateway/SetupGatewayWifi.js

@@ -107,11 +107,11 @@ const SetupGatewayWifi = memo(({ route }) => {
     setDisplayLoadingConnect(true);
 
     const timeoutId = setTimeout(async () => {
-      subcription.remove();
-      await device.cancelConnection();
       setDisplayLoadingConnect(false);
       setDisplayConnectFail(true);
-    }, parseInt(7000, 10));
+      subcription.remove();
+      await device.cancelConnection();
+    }, 7000);
     setTimeoutSubcribtion(timeoutId);
   }, [navigate, unit_id, wifiName, wifiPass]);
 
@@ -172,7 +172,7 @@ const SetupGatewayWifi = memo(({ route }) => {
       </ScrollView>
 
       <DisplayChecking
-        isOpacityLayout
+        isOpacityLayout={false} // conflict with AlertAction Modal
         visible={displayLoadingConnect}
         onClose={onHideDisplayLoading}
         message={t('push_and_wait_chip_response')}