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

package/package.json

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

package/src/configs/Constants.js

@@ -858,3 +858,7 @@ export const PROBLEM_CODE = {
   UNKNOWN_ERROR: 'UNKNOWN_ERROR',
   CANCEL_ERROR: 'CANCEL_ERROR',
 };
+
+export const DATE_TIME_FORMAT = {
+  YMD: 'YYYY-MM-DD',
+};

package/src/screens/PlayBackCamera/Timer.js

@@ -25,6 +25,7 @@ const Timer = ({
   normalHeight = 20,
   value,
   selected,
+  onScrollEndDrag,
 }) => {
   const scrollViewRef = useRef();
   const [scrollX] = useState(new Animated.Value(0));
@@ -113,6 +114,8 @@ const Timer = ({
           ],
           { useNativeDriver: true }
         )}
+        onScrollEndDrag={onScrollEndDrag}
+        onMomentumScrollEnd={onScrollEndDrag}
       >
         {renderTime}
       </Animated.ScrollView>

package/src/screens/PlayBackCamera/__test__/index.test.js

@@ -1,6 +1,8 @@
 import moment from 'moment';
 import React from 'react';
 import { Animated, TouchableOpacity } from 'react-native';
+import { Calendar } from 'react-native-calendars';
+
 import { act, create } from 'react-test-renderer';
 import PlayBackCamera from '..';
 import { ModalCustom } from '../../../commons/Modal';
@@ -58,6 +60,11 @@ describe('Test PlayBackCamera', () => {
     await textOpenModal[0].props.onPress();
     expect(mockSetState).toBeCalledWith(true);
 
+    const Calendars = instance.findAllByType(Calendar);
+    expect(Calendars).toHaveLength(1);
+    await Calendars[0].props.onDayPress({ dateString: '2022-07-01' });
+    expect(mockSetState).toBeCalledWith('2022-07-01');
+
     mockSetState.mockClear();
     const buttonCancel = instance.findAll(
       (el) =>
@@ -83,7 +90,7 @@ describe('Test PlayBackCamera', () => {
         el.type === TouchableOpacity
     );
     await buttonAddDate[0].props.onPress();
-    expect(mockSetState).not.toBeCalled();
+    expect(mockSetState).toBeCalled();
 
     mockSetState.mockClear();
     const buttonSubDate = instance.findAll(

package/src/screens/PlayBackCamera/index.js

@@ -13,13 +13,13 @@ import Text from '../../commons/Text';
 import Timer from './Timer';
 import { useStatusBarPreview } from '../../hooks/Common/useStatusBar';
 import MediaPlayerFull from '../../commons/MediaPlayerDetail/MediaPlayerFull';
-import { TESTID } from '../../configs/Constants';
+import { DATE_TIME_FORMAT, TESTID } from '../../configs/Constants';
 
-let dateTemp = moment().format('YYYY-MM-DD');
+let dateTemp = moment().format(DATE_TIME_FORMAT.YMD);
 let isFirstTime = true;
 
 const PlayBackCamera = () => {
-  const now = useMemo(() => moment().format('YYYY-MM-DD'), []);
+  const now = useMemo(() => moment().format(DATE_TIME_FORMAT.YMD), []);
   const hourTemp = useMemo(() => moment().format('HH:mm:ss'), []);
   const arrHourTemp = useMemo(() => hourTemp.split(':'), [hourTemp]);
   const t = useTranslations();
@@ -33,7 +33,8 @@ const PlayBackCamera = () => {
     s: arrHourTemp[2],
   });
   const [uri, setUri] = useState(item?.configuration?.uri);
-  const [paused, setPaused] = useState(true);
+  const [mainURI, setMainURI] = useState(uri);
+  const [paused, setPaused] = useState(false);
   const onOpenDateModal = useCallback(() => {
     setIsShowDate(true);
   }, []);
@@ -49,15 +50,19 @@ const PlayBackCamera = () => {
   }, [selected]);
 
   const onAddDate = useCallback(() => {
+    setPaused(true);
     if (selected !== now) {
-      const date = moment(selected).add(1, 'days').format('YYYY-MM-DD');
+      const date = moment(selected).add(1, 'days').format(DATE_TIME_FORMAT.YMD);
       setSelected(date);
       dateTemp = date;
     }
   }, [selected, now]);
 
   const onSubtractDate = useCallback(() => {
-    const date = moment(selected).subtract(1, 'days').format('YYYY-MM-DD');
+    setPaused(true);
+    const date = moment(selected)
+      .subtract(1, 'days')
+      .format(DATE_TIME_FORMAT.YMD);
     setSelected(date);
     dateTemp = date;
   }, [selected]);
@@ -72,6 +77,25 @@ const PlayBackCamera = () => {
     [item?.configuration?.time_zone]
   );
 
+  const onScrollEndDrag = useCallback(() => {
+    setMainURI(uri);
+    setPaused(false);
+  }, [uri]);
+
+  const onDayPress = useCallback((day) => {
+    setPaused(true);
+    setSelected(day.dateString);
+  }, []);
+
+  const onPressArrowLeft = useCallback((subtractMonth) => {
+    setPaused(true);
+    subtractMonth && subtractMonth();
+  }, []);
+
+  const onPressArrowRight = useCallback((addMonth) => {
+    addMonth && addMonth();
+  }, []);
+
   const onChangeValue = useCallback(
     (value, selectedTime) => {
       if (!isFirstTime) {
@@ -100,10 +124,6 @@ const PlayBackCamera = () => {
             }T${getHourWithTimeZone(h)}${m}${s}Z`
           );
         }
-        const to = setTimeout(() => {
-          setPaused(false);
-          clearTimeout(to);
-        }, 100);
       }
     },
     [
@@ -115,27 +135,37 @@ const PlayBackCamera = () => {
     ]
   );
 
+  const renderArrow = useCallback((direction) => {
+    return (
+      <Image
+        source={Images.arrowLeft}
+        style={[direction !== 'left' && styles.arrowRight]}
+      />
+    );
+  }, []);
+
   useEffect(() => {
-    setPaused(true);
-    const date = selected.split('-');
-    const playback = item?.configuration?.playback || '';
-    if (
-      selected === now &&
-      parseInt(moment().format('HH:mm:ss'), 10) <=
-        parseInt(`${hour.h}:${hour.m}:${hour.s}`, 10)
-    ) {
-      setUri(item?.configuration?.uri);
-    } else {
-      setUri(
-        `${playback.split('=')[0]}=${date[0]}${date[1]}${
-          date[2]
-        }T${getHourWithTimeZone(hour.h)}${hour.m}${hour.s}Z`
-      );
+    if (!isFirstTime) {
+      const date = selected.split('-');
+      const playback = item?.configuration?.playback || '';
+      if (
+        selected === now &&
+        parseInt(moment().format('HH:mm:ss'), 10) <=
+          parseInt(`${hour.h}:${hour.m}:${hour.s}`, 10)
+      ) {
+        setMainURI(item?.configuration?.uri);
+      } else {
+        setMainURI(
+          `${playback.split('=')[0]}=${date[0]}${date[1]}${
+            date[2]
+          }T${getHourWithTimeZone(hour.h)}${hour.m}${hour.s}Z`
+        );
+      }
+      const to = setTimeout(() => {
+        setPaused(false);
+        clearTimeout(to);
+      }, 100);
     }
-    const to = setTimeout(() => {
-      setPaused(false);
-      clearTimeout(to);
-    }, 100);
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [selected, getHourWithTimeZone]);
 
@@ -152,7 +182,7 @@ const PlayBackCamera = () => {
       clearTimeout(to);
     }, 2000);
     return () => {
-      dateTemp = moment().format('YYYY-MM-DD');
+      dateTemp = moment().format(DATE_TIME_FORMAT.YMD);
       isFirstTime = true;
     };
   }, []);
@@ -161,7 +191,7 @@ const PlayBackCamera = () => {
     <View style={styles.wrap}>
       <HeaderCustom title={t('video_detail')} />
       <MediaPlayerFull
-        uri={uri}
+        uri={mainURI}
         isPaused={paused}
         thumbnail={thumbnail}
         isShowFullScreenIcon
@@ -223,6 +253,7 @@ const PlayBackCamera = () => {
             indicatorHeight={40}
             onChangeValue={onChangeValue}
             selected={selected}
+            onScrollEndDrag={onScrollEndDrag}
           />
         </View>
       </View>
@@ -230,13 +261,10 @@ const PlayBackCamera = () => {
       <ModalCustom isVisible={isShowDate} style={styles.modal}>
         <View style={styles.wrapDate}>
           <Calendar
-            onDayPress={(day) => {
-              setSelected(day.dateString);
-            }}
-            maxDate={moment().format('YYYY-MM-DD')}
-            onMonthChange={(month) => {}}
-            onPressArrowLeft={(subtractMonth) => subtractMonth()}
-            onPressArrowRight={(addMonth) => addMonth()}
+            onDayPress={onDayPress}
+            maxDate={moment().format(DATE_TIME_FORMAT.YMD)}
+            onPressArrowLeft={onPressArrowLeft}
+            onPressArrowRight={onPressArrowRight}
             markedDates={{
               [selected]: {
                 selected: true,
@@ -246,14 +274,7 @@ const PlayBackCamera = () => {
               },
             }}
             enableSwipeMonths={true}
-            renderArrow={(direction) => {
-              if (direction === 'left') {
-                return <Image source={Images.arrowLeft} />;
-              }
-              return (
-                <Image source={Images.arrowLeft} style={styles.arrowRight} />
-              );
-            }}
+            renderArrow={renderArrow}
             headerStyle={styles.headerStyle}
           />
           <View style={styles.viewSeparated} />

package/src/screens/Unit/Detail.js

@@ -291,6 +291,21 @@ const UnitDetail = ({ route }) => {
     navigate(isLavidaSource ? Routes.SmartHomeDashboard : Routes.Dashboard);
   }, [isLavidaSource, navigate]);
 
+  const renderCamera = useMemo(() => {
+    return (
+      isFirstOpenCamera &&
+      isIOS && (
+        <MediaPlayerDetail
+          uri={Constants.URL_STREAM_CAMERA_DEMO}
+          isPaused={false}
+          width={1}
+          height={1}
+          style={styles.fakeCamera}
+        />
+      )
+    );
+  }, [isFirstOpenCamera, isIOS]);
+
   useEffect(() => {
     watchNotificationData(user, onRefresh);
     return () => unwatchNotificationData(user);
@@ -319,16 +334,7 @@ const UnitDetail = ({ route }) => {
       hideRightPlus={!isOwner}
       onBack={(isSuccessfullyConnected && Dashboard) || (routeName && onBack)}
     >
-      {/* NOTE: This is a trick to fix camera not full screen on first open app */}
-      {isFirstOpenCamera && isIOS && (
-        <MediaPlayerDetail
-          uri={Constants.URL_STREAM_CAMERA_DEMO}
-          isPaused={false}
-          width={1}
-          height={1}
-          style={styles.fakeCamera}
-        />
-      )}
+      {renderCamera}
 
       <View style={styles.container}>
         <Summaries unit={unit} />

package/src/screens/Unit/components/__test__/AutomateScript.test.js

@@ -0,0 +1,116 @@
+import React from 'react';
+import { TouchableWithoutFeedback, View } from 'react-native';
+import { act, create } from 'react-test-renderer';
+import { AUTOMATE_TYPE } from '../../../../configs/Constants';
+import { SCProvider } from '../../../../context';
+import { mockSCStore } from '../../../../context/mockStore';
+import AutomateScript from '../AutomateScript';
+
+const mockOnPress = jest.fn();
+
+const wrapComponent = (isSelected, automate = 'automate') => (
+  <SCProvider initState={mockSCStore({})}>
+    <AutomateScript
+      automate={automate}
+      onPress={mockOnPress}
+      isSelected={isSelected}
+    />
+  </SCProvider>
+);
+
+describe('test AutomateScript screen', () => {
+  let tree,
+    automate = { type: '' };
+  it('Test isSelected=false', async () => {
+    await act(async () => {
+      tree = await create(wrapComponent(false, automate));
+    });
+    const instance = tree.root;
+    const TouchableWithoutFeedbacks = instance.findAllByType(
+      TouchableWithoutFeedback
+    );
+    await TouchableWithoutFeedbacks[0].props.onPress();
+    expect(mockOnPress).toBeCalledWith(automate);
+  });
+
+  it('Test isSelected=true', async () => {
+    await act(async () => {
+      tree = await create(wrapComponent(true));
+    });
+    const instance = tree.root;
+    const Views = instance.findAllByType(View);
+    expect(Views[0].props.style).toEqual([
+      {
+        padding: 12,
+        borderRadius: 10,
+        shadowColor: '#303133',
+        shadowOffset: {
+          height: 2,
+          width: 0,
+        },
+        shadowOpacity: 0.1,
+        shadowRadius: 3,
+        elevation: 4,
+        width: 353,
+        height: 204.144578313253,
+        backgroundColor: '#FFFFFF',
+        justifyContent: 'space-between',
+        marginBottom: 8,
+      },
+      {
+        borderColor: '#00979D',
+        borderWidth: 2,
+      },
+    ]);
+  });
+
+  it('Test render VALUE_CHANGE', async () => {
+    automate = { ...automate, type: AUTOMATE_TYPE.VALUE_CHANGE };
+    await act(async () => {
+      tree = await create(wrapComponent(true, automate));
+    });
+    const instance = tree.root;
+    const Views = instance.findAllByType(View);
+    expect(Views).toHaveLength(9);
+  });
+
+  it('Test render ONE_TAP', async () => {
+    automate = { ...automate, type: AUTOMATE_TYPE.ONE_TAP };
+    await act(async () => {
+      tree = await create(wrapComponent(true, automate));
+    });
+    const instance = tree.root;
+    const Views = instance.findAllByType(View);
+    expect(Views).toHaveLength(9);
+  });
+
+  it('Test render EVENT', async () => {
+    automate = { ...automate, type: AUTOMATE_TYPE.EVENT };
+    await act(async () => {
+      tree = await create(wrapComponent(true, automate));
+    });
+    const instance = tree.root;
+    const Views = instance.findAllByType(View);
+    expect(Views).toHaveLength(9);
+  });
+
+  it('Test render SCHEDULE', async () => {
+    automate = { ...automate, type: AUTOMATE_TYPE.SCHEDULE };
+    await act(async () => {
+      tree = await create(wrapComponent(true, automate));
+    });
+    const instance = tree.root;
+    const Views = instance.findAllByType(View);
+    expect(Views).toHaveLength(9);
+  });
+
+  it('Test render with iconKit', async () => {
+    automate = { ...automate, script: { icon_kit: 'iconKit' } };
+    await act(async () => {
+      tree = await create(wrapComponent(true, automate));
+    });
+    const instance = tree.root;
+    const Views = instance.findAllByType(View);
+    expect(Views).toHaveLength(10);
+  });
+});