@eohjsc/react-native-smart-city 0.3.26 → 0.3.29

package/index.js

@@ -19,6 +19,7 @@ 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';
 
 export {
   AddSubUnitStack,
@@ -44,4 +45,5 @@ export {
   SCWrapper,
   Action,
   withRemoteControl,
+  DevModeStack,
 };

package/package.json

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

package/src/commons/ActionGroup/CurtainButtonTemplate.js

@@ -16,7 +16,6 @@ const CurtainButtonTemplate = memo(({ actionGroup, doAction, sensor }) => {
     action_on_data,
     is_display_lock,
     text1,
-    text2,
     text3,
     text_door_lock,
   } = configuration || {};
@@ -56,7 +55,7 @@ const CurtainButtonTemplate = memo(({ actionGroup, doAction, sensor }) => {
       {
         style: styles.buttonActionCurtainCenter,
         icon: Images.buttonPauseCurtain,
-        text: text2,
+        text: '',
         onPress: onButtonStopPress,
         testID: TESTID.BUTTON_TEMPLATE_2,
       },

package/src/commons/ActionGroup/OnOffTemplate/OnOffButtonTemplate.js

@@ -18,6 +18,7 @@ const OnOffButtonTemplate = memo(
             style={styles.bigCircle}
             onPress={triggerAction}
             testID={`${TESTID.ON_OFF_BUTTON}-${id}`}
+            accessibilityLabel={`${TESTID.ON_OFF_BUTTON}-${id}`}
           >
             <View style={styles.smallCircle}>
               <Icon
@@ -31,6 +32,7 @@ const OnOffButtonTemplate = memo(
                   { color: isOn ? Colors.Gray8 : Colors.Gray6 },
                 ]}
                 testID={`${TESTID.SENSOR_STATUS}-${id}`}
+                accessibilityLabel={`${TESTID.SENSOR_STATUS}-${id}`}
               >
                 {isOn ? configuration.text_on : configuration.text_off}
               </Text>

package/src/commons/ActionTemplate/CurtainAction.js

@@ -0,0 +1,60 @@
+import React, { memo, useCallback } from 'react';
+import { TouchableOpacity } from 'react-native';
+import Text from '../Text';
+import styles from './CurtainActionStyles';
+
+const CurtainAction = ({ configuration, onPress, template }) => {
+  const { open_action, close_action, stop_action, text1, text2, text3 } =
+    configuration || {};
+
+  const onPressActionClose = useCallback(() => {
+    onPress &&
+      onPress({
+        name: text1,
+        action: close_action,
+        template,
+      });
+  }, [onPress, text1, close_action, template]);
+
+  const onPressActionStop = useCallback(() => {
+    onPress &&
+      onPress({
+        name: text2,
+        action: stop_action,
+        template,
+      });
+  }, [onPress, text2, stop_action, template]);
+
+  const onPressActionOpen = useCallback(() => {
+    onPress &&
+      onPress({
+        name: text3,
+        action: open_action,
+        template,
+      });
+  }, [onPress, text3, open_action, template]);
+
+  return (
+    <>
+      <TouchableOpacity onPress={onPressActionClose}>
+        <Text type="H4" style={styles.textwithline}>
+          {text1}
+        </Text>
+      </TouchableOpacity>
+
+      <TouchableOpacity onPress={onPressActionStop}>
+        <Text type="H4" style={styles.textwithline}>
+          {text2}
+        </Text>
+      </TouchableOpacity>
+
+      <TouchableOpacity onPress={onPressActionOpen}>
+        <Text type="H4" style={styles.textwithline}>
+          {text3}
+        </Text>
+      </TouchableOpacity>
+    </>
+  );
+};
+
+export default memo(CurtainAction);

package/src/commons/ActionTemplate/CurtainActionStyles.js

@@ -0,0 +1,11 @@
+import { StyleSheet } from 'react-native';
+import { Colors } from '../../configs';
+
+export default StyleSheet.create({
+  textwithline: {
+    paddingBottom: 16,
+    paddingTop: 16,
+    borderBottomWidth: 1,
+    borderColor: Colors.Gray4,
+  },
+});

package/src/commons/ActionTemplate/OnOffSmartLockAction.js

@@ -0,0 +1,44 @@
+import React, { memo, useCallback } from 'react';
+import { TouchableOpacity } from 'react-native';
+import Text from '../Text';
+import styles from './OnOffSmartLockActionStyles';
+
+const OnOffSmartLockAction = ({ configuration, onPress, template }) => {
+  const { action_off, action_on, text_off, text_on } = configuration || {};
+
+  const onPressActionClose = useCallback(() => {
+    onPress &&
+      onPress({
+        name: text_off,
+        action: action_off,
+        template,
+      });
+  }, [onPress, text_off, action_off, template]);
+
+  const onPressActionOpen = useCallback(() => {
+    onPress &&
+      onPress({
+        name: text_on,
+        action: action_on,
+        template,
+      });
+  }, [onPress, text_on, action_on, template]);
+
+  return (
+    <>
+      <TouchableOpacity onPress={onPressActionClose}>
+        <Text type="H4" style={styles.textwithline}>
+          {text_off}
+        </Text>
+      </TouchableOpacity>
+
+      <TouchableOpacity onPress={onPressActionOpen}>
+        <Text type="H4" style={styles.textwithline}>
+          {text_on}
+        </Text>
+      </TouchableOpacity>
+    </>
+  );
+};
+
+export default memo(OnOffSmartLockAction);

package/src/commons/ActionTemplate/OnOffSmartLockActionStyles.js

@@ -0,0 +1,11 @@
+import { StyleSheet } from 'react-native';
+import { Colors } from '../../configs';
+
+export default StyleSheet.create({
+  textwithline: {
+    paddingBottom: 16,
+    paddingTop: 16,
+    borderBottomWidth: 1,
+    borderColor: Colors.Gray4,
+  },
+});

package/src/commons/ActionTemplate/index.js

@@ -9,6 +9,8 @@ import ThreeButtonAction from './ThreeButtonAction';
 import OnOffSimpleAction from './OnOffSimpleAction';
 import SelectActionCard from '../SelectActionCard';
 import { ModalCustom } from '../Modal';
+import CurtainAction from './CurtainAction';
+import OnOffSmartLockAction from './OnOffSmartLockAction';
 
 const ActionTemplate = memo(({ data, onSelectAction }) => {
   const t = useTranslations();
@@ -66,6 +68,22 @@ const ActionTemplate = memo(({ data, onSelectAction }) => {
               key={index}
             />
           );
+        case 'curtain_action_template':
+          return (
+            <CurtainAction
+              {...item}
+              onPress={onPressSelectAction}
+              key={index}
+            />
+          );
+        case 'OnOffSmartLockActionTemplate':
+          return (
+            <OnOffSmartLockAction
+              {...item}
+              onPress={onPressSelectAction}
+              key={index}
+            />
+          );
       }
     });
   }, [data, onPressSelectAction]);

package/src/commons/CameraDevice/index.js

@@ -17,7 +17,7 @@ const { standardizeWidth, standardizeHeight } = standardizeCameraScreenSize(
   Device.screenWidth - 32
 );
 
-const CameraDevice = ({ station, handleFullScreen, goToPlayBack }) => {
+const CameraDevice = ({ station, goToPlayBack }) => {
   const t = useTranslations();
   const { navigate } = useNavigation();
   const { setAction } = useContext(SCContext);
@@ -62,7 +62,6 @@ const CameraDevice = ({ station, handleFullScreen, goToPlayBack }) => {
             }}
             key={`camera-device-${device.id}`}
             cameraName={device.configuration.name}
-            handleFullScreen={handleFullScreen}
             goToPlayBack={goToPlayBack(device, { uri: station?.background })}
             width={standardizeWidth}
             height={standardizeHeight}

package/src/commons/ConnectingProcess/DeviceItem/DeviceItem.js

@@ -3,18 +3,26 @@ import { View } from 'react-native';
 import styles from './DeviceItemStyles';
 import FImage from '../../FImage';
 import _TextInput from '../../Form/TextInput';
+import Images from '../../../configs/Images';
 
-const DeviceItem = memo(({ icon, name, setNewName }) => {
-  return (
-    <View style={styles.container}>
-      {!!icon && <FImage source={{ uri: icon }} style={styles.iconSensor} />}
-      <_TextInput
-        value={name}
-        textInputStyle={styles.textItem}
-        onChange={setNewName}
-      />
-    </View>
-  );
-});
+const DeviceItem = memo(
+  ({ icon, name, setNewName, handleSelectionChange, isSelection }) => {
+    return (
+      <View style={styles.container}>
+        <FImage
+          source={icon ? { uri: icon } : Images.deviceIcon}
+          style={styles.iconSensor}
+        />
+        <_TextInput
+          value={name}
+          textInputStyle={styles.textItem}
+          onChange={setNewName}
+          selection={isSelection && { start: 0, end: 0 }}
+          onSelectionChange={handleSelectionChange}
+        />
+      </View>
+    );
+  }
+);
 
 export default DeviceItem;

package/src/commons/ConnectingProcess/DeviceItem/DeviceItemStyles.js

@@ -20,6 +20,8 @@ export default StyleSheet.create({
     elevation: 6,
     paddingLeft: 30,
     paddingRight: 30,
+    display: 'flex',
+    alignItems: 'center',
   },
   iconSensor: {
     width: 32,

package/src/commons/ConnectingProcess/__test__/DeviceItem.test.js

@@ -13,7 +13,7 @@ describe('Test DeviceItem button', () => {
     const instance = tree.root;
     const image = instance.findAllByType(FImage);
     const text = instance.findAllByType(_TextInput);
-    expect(image).toHaveLength(0);
+    expect(image).toHaveLength(1);
     expect(text).toHaveLength(1);
   });
 });

package/src/commons/ConnectingProcess/index.js

@@ -20,6 +20,8 @@ const ConnectingSuccess = ({
   unit_name,
   newName,
   setNewName,
+  isSelection,
+  handleSelectionChange,
 }) => {
   const t = useTranslations();
   return (
@@ -37,6 +39,8 @@ const ConnectingSuccess = ({
         icon={sensor?.icon_kit}
         name={newName}
         setNewName={setNewName}
+        handleSelectionChange={handleSelectionChange}
+        isSelection={isSelection}
       />
     </View>
   );
@@ -61,6 +65,7 @@ const ConnectingProcess = ({ route }) => {
   const [sensor, setSensor] = useState(null);
   const user = useSCContextSelector((state) => state?.auth?.account?.user);
   const [newName, setNewName] = useState('');
+  const [isSelection, setIsSelection] = useState(true);
 
   const connectingDevice = useCallback(async () => {
     setIsLoading(true);
@@ -166,6 +171,10 @@ const ConnectingProcess = ({ route }) => {
     unit_id,
   ]);
 
+  const handleSelectionChange = useCallback(() => {
+    setIsSelection(false);
+  }, []);
+
   useEffect(() => {
     connectingDevice();
   }, [connectingDevice]);
@@ -185,6 +194,8 @@ const ConnectingProcess = ({ route }) => {
             unit_name={unit_name}
             newName={newName}
             setNewName={setNewName}
+            isSelection={isSelection}
+            handleSelectionChange={handleSelectionChange}
           />
         )}
       </View>

package/src/commons/Dashboard/MyUnit/__test__/MyUnit.test.js

@@ -1,12 +1,17 @@
 import React from 'react';
 import renderer, { act } from 'react-test-renderer';
+import MockAdapter from 'axios-mock-adapter';
 import MyUnit from '..';
+import MyUnitDevice from '../../../../screens/Unit/components/MyUnitDevice';
 import { TESTID } from '../../../../configs/Constants';
 import { SCProvider } from '../../../../context';
 import { mockSCStore } from '../../../../context/mockStore';
+import api from '../../../../utils/Apis/axios';
+import { API } from '../../../../configs';
+
+const mock = new MockAdapter(api.axiosInstance);
 
 const mockedNavigate = jest.fn();
-const mockUseIsFocused = jest.fn();
 const mockedDispatch = jest.fn();
 
 jest.mock('@react-navigation/native', () => {
@@ -15,9 +20,8 @@ jest.mock('@react-navigation/native', () => {
     useNavigation: () => ({
       navigate: mockedNavigate,
     }),
-    useIsFocused: () => ({
-      isFocused: mockUseIsFocused,
-    }),
+    useIsFocused: () => true,
+    useFocusEffect: jest.fn(),
   };
 });
 
@@ -34,6 +38,42 @@ const wrapComponent = () => (
 
 describe('Test MyUnit', () => {
   let tree;
+  let data = [
+    {
+      id: 1,
+      name: 'name',
+      background: 'background',
+      abstract_devices: [
+        {
+          id: 1,
+          name: 'device',
+          is_managed_by_backend: true,
+          device_type: 'GOOGLE_HOME',
+          station_name: 'name',
+        },
+        {
+          id: 2,
+          name: 'device',
+          is_managed_by_backend: true,
+          device_type: '',
+          station_name: 'name',
+          quick_action: {
+            config_id: 1,
+          },
+        },
+      ],
+    },
+    {
+      id: 2,
+      name: 'name2',
+      background: 'background',
+    },
+  ];
+
+  beforeEach(() => {
+    mock.resetHistory();
+  });
+
   const getElement = (instance) => {
     const goToDetail = instance.findAll(
       (item) => item.props.testID === TESTID.MY_UNIT_GO_TO_DETAIL
@@ -44,7 +84,7 @@ describe('Test MyUnit', () => {
     return { goToDetail, textNoUnit };
   };
 
-  test('create MyUnit no Unit', async () => {
+  test('MyUnit no Unit', async () => {
     await act(async () => {
       tree = await renderer.create(wrapComponent());
     });
@@ -52,4 +92,14 @@ describe('Test MyUnit', () => {
     const { textNoUnit } = getElement(instance);
     expect(textNoUnit[0]).toBeDefined();
   });
+
+  test('MyUnit with unit', async () => {
+    mock.onGet(API.UNIT.MY_UNITS()).replyOnce(200, data);
+    await act(async () => {
+      tree = await renderer.create(wrapComponent());
+    });
+    const instance = tree.root;
+    const devices = instance.findAllByType(MyUnitDevice);
+    expect(devices).toHaveLength(2);
+  });
 });

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

@@ -1,5 +1,18 @@
-import React, { memo, useCallback, useEffect, useState } from 'react';
+import React, {
+  memo,
+  useCallback,
+  useEffect,
+  useState,
+  useContext,
+  useMemo,
+} from 'react';
 import { View, Image, TouchableOpacity, Dimensions } from 'react-native';
+import {
+  useNavigation,
+  useIsFocused,
+  useFocusEffect,
+} from '@react-navigation/native';
+import NetInfo from '@react-native-community/netinfo';
 import { API, Colors, Images } from '../../../configs';
 import Text from '../../Text';
 import { fetchWithCache } from '../../../utils/Apis/axios';
@@ -7,10 +20,13 @@ import { fetchWithCache } from '../../../utils/Apis/axios';
 import styles from './styles';
 import { Section } from '../../Section';
 import { useTranslations } from '../../../hooks/Common/useTranslations';
-import { useNavigation, useIsFocused } from '@react-navigation/native';
+import { useUnitConnectRemoteDevices } from '../../../screens/Unit/hook/useUnitConnectRemoteDevices';
+import { useWatchConfigs } from '../../../hooks/IoT';
+import { SCContext } from '../../../context';
+import { Action } from '../../../context/actionType';
 
 import Carousel from 'react-native-snap-carousel';
-import { TESTID } from '../../../configs/Constants';
+import { TESTID, DEVICE_TYPE } from '../../../configs/Constants';
 import Routes from '../../../utils/Route';
 import MyUnitDevice from '../../../screens/Unit/components/MyUnitDevice';
 
@@ -20,21 +36,49 @@ const MyUnit = () => {
   const isFocused = useIsFocused();
   const navigation = useNavigation();
   const [myUnits, setMyUnits] = useState([]);
+  const [slideIndex, setSlideIndex] = useState(0);
+  const { setAction } = useContext(SCContext);
 
   const fetchMyUnitDashboard = useCallback(async () => {
     await fetchWithCache(API.UNIT.MY_UNITS(), {}, (response) => {
       const { success, data } = response;
-      if (success) {
-        setMyUnits(data);
-      }
+      success && setMyUnits(data);
     });
   }, [setMyUnits]);
 
   useEffect(() => {
-    if (isFocused) {
-      fetchMyUnitDashboard();
-    }
+    isFocused && fetchMyUnitDashboard();
   }, [fetchMyUnitDashboard, isFocused]);
+
+  useFocusEffect(
+    useCallback(() => {
+      const unsubscribe = NetInfo.addEventListener((state) => {
+        setAction(Action.SET_NETWORK_CONNECTED, state.isConnected);
+      });
+      return () => unsubscribe();
+      // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [])
+  );
+
+  useUnitConnectRemoteDevices(myUnits[slideIndex]);
+
+  const configsNeedWatching = useMemo(() => {
+    const configIds = [];
+    myUnits.forEach((unit) => {
+      (unit?.abstract_devices || []).forEach((device) => {
+        if (
+          device?.quick_action?.config_id &&
+          device?.device_type !== DEVICE_TYPE.GOOGLE_HOME
+        ) {
+          configIds.push(device.quick_action.config_id);
+        }
+      });
+    });
+    return configIds;
+  }, [myUnits]);
+
+  useWatchConfigs(configsNeedWatching);
+
   const goToDetail = useCallback(
     (item) => {
       navigation.navigate(Routes.UnitStack, {
@@ -47,6 +91,7 @@ const MyUnit = () => {
     },
     [navigation]
   );
+
   const _renderItem = useCallback(
     ({ item, index }) => {
       const paddingLeft = index === 0 ? 0 : 8;
@@ -73,14 +118,15 @@ const MyUnit = () => {
             />
             <Text style={styles.title}>{item.name}</Text>
           </TouchableOpacity>
-          {item.abstract_sensors.map((sensor, indexSensor) => (
-            <MyUnitDevice key={indexSensor} sensor={sensor} unit={item} />
+          {(item?.abstract_devices || []).map((device, indexDevice) => (
+            <MyUnitDevice key={indexDevice} device={device} unit={item} />
           ))}
         </View>
       );
     },
-    [myUnits.length, goToDetail]
+    [myUnits, goToDetail]
   );
+
   return (
     <>
       <Section style={styles.boxTxtMyUnit}>
@@ -96,6 +142,7 @@ const MyUnit = () => {
               itemWidth={screenWidth - 32}
               renderItem={_renderItem}
               inactiveSlideScale={1}
+              onSnapToItem={setSlideIndex}
             />
           ) : (
             <View>

package/src/commons/DevMode/Label.js

@@ -0,0 +1,10 @@
+import React from 'react';
+import { memo } from 'react';
+import Text from '../Text';
+import styles from './Styles/LabelStyles';
+
+const Label = ({ name = '', style }) => {
+  return <Text style={[styles.label, style]}>{name}</Text>;
+};
+
+export default memo(Label);

package/src/commons/DevMode/Search.js

@@ -0,0 +1,20 @@
+import React, { memo } from 'react';
+import { View, Image, TextInput } from 'react-native';
+import { Images } from '../../configs';
+import t from '../../hooks/Common/useTranslations';
+import styles from './Styles/SearchStyles';
+
+const Search = ({ onSearch }) => {
+  return (
+    <View style={styles.wrap}>
+      <Image source={Images.search} style={styles.icon} />
+      <TextInput
+        style={styles.textInput}
+        placeholder={t('what_are_you_looking_for')}
+        onChangeText={onSearch}
+      />
+    </View>
+  );
+};
+
+export default memo(Search);

package/src/commons/DevMode/Styles/LabelStyles.js

@@ -0,0 +1,8 @@
+import { StyleSheet } from 'react-native';
+
+export default StyleSheet.create({
+  label: {
+    fontSize: 28,
+    fontWeight: 'bold',
+  },
+});

package/src/commons/DevMode/Styles/SearchStyles.js

@@ -0,0 +1,21 @@
+import { StyleSheet } from 'react-native';
+import { Colors } from '../../../configs';
+
+export default StyleSheet.create({
+  wrap: {
+    borderRadius: 6,
+    borderWidth: 1,
+    borderColor: Colors.Neutral.Neutral3,
+    width: '100%',
+    flexDirection: 'row',
+    alignItems: 'center',
+    paddingHorizontal: 10,
+    marginVertical: 16,
+  },
+  icon: {},
+  textInput: {
+    flex: 1,
+    height: 36,
+    marginLeft: 5,
+  },
+});