@eohjsc/react-native-smart-city 0.2.86 → 0.2.87

package/src/commons/ActionGroup/SmartTiviActionTemplate/SmartTiviActionTemplate.js

@@ -22,193 +22,195 @@ import {
   Netflix,
 } from './component/Icon';
 
-const SmartTiviActionTemplate = memo(({ actionGroup, doAction }) => {
-  const t = useTranslations();
-  const FakeDataChannel = [
-    {
-      id: 1,
-      icon: 'disney',
-      link: '...',
-    },
-    {
-      id: 2,
-      icon: 'youtube',
-      link: '...',
-    },
-    {
-      id: 3,
-      icon: 'netflix',
-      link: '...',
-    },
-    {
-      id: 4,
-      icon: 'spotify',
-      link: '...',
-    },
-  ];
-  const onPressOnOff = useCallback(() => {
-    return Alert.alert(t('feature_under_development'));
-  }, [t]);
-  const onPressExit = useCallback(() => {
-    return Alert.alert(t('feature_under_development'));
-  }, [t]);
-  const onPressVolumeUp = useCallback(() => {
-    return Alert.alert(t('feature_under_development'));
-  }, [t]);
-  const onPressVolumeDown = useCallback(() => {
-    return Alert.alert(t('feature_under_development'));
-  }, [t]);
-  const onPressChUp = useCallback(() => {
-    return Alert.alert(t('feature_under_development'));
-  }, [t]);
-  const onPressChDown = useCallback(() => {
-    return Alert.alert(t('feature_under_development'));
-  }, [t]);
-  const onPressUp = useCallback(() => {
-    return Alert.alert(t('feature_under_development'));
-  }, [t]);
-  const onPressDown = useCallback(() => {
-    return Alert.alert(t('feature_under_development'));
-  }, [t]);
-  const onPressLeft = useCallback(() => {
-    return Alert.alert(t('feature_under_development'));
-  }, [t]);
-  const onPressRight = useCallback(() => {
-    return Alert.alert(t('feature_under_development'));
-  }, [t]);
-  const onPressOk = useCallback(() => {
-    return Alert.alert(t('feature_under_development'));
-  }, [t]);
-  const onPressPrev = useCallback(() => {
-    return Alert.alert(t('feature_under_development'));
-  }, [t]);
-  const onPressStop = useCallback(() => {
-    return Alert.alert(t('feature_under_development'));
-  }, [t]);
-  const onPressNext = useCallback(() => {
-    return Alert.alert(t('feature_under_development'));
-  }, [t]);
-  const onPressHome = useCallback(() => {
-    return Alert.alert(t('feature_under_development'));
-  }, [t]);
-  const onPressBack = useCallback(() => {
-    return Alert.alert(t('feature_under_development'));
-  }, [t]);
-  const onPressChannel = useCallback(
-    (item) => {
-      return Alert.alert(t('feature_under_development'));
-    },
-    [t]
-  );
-  const iconChannels = useCallback((item) => {
-    switch (item.icon) {
-      case 'disney':
-        return <Disney style={styles.iconChannel} />;
-      case 'youtube':
-        return <Youtube style={styles.iconChannel} />;
-      case 'netflix':
-        return <Netflix style={styles.iconChannel} />;
-      case 'spotify':
-        return <Spotify style={styles.iconChannel} />;
-      default:
-        return <></>;
-    }
-  }, []);
-  return (
-    <>
-      <ScrollView>
-        <View style={styles.wrap}>
-          <View style={styles.rowOnOff}>
-            <CircleButton
-              type="small"
-              icon={
-                <IconOutline
-                  name="poweroff"
-                  size={20}
-                  color={Colors.Gray6}
-                  style={styles.iconButton}
-                />
-              }
-              onPress={onPressOnOff}
-              testID={TESTID.SMART_TIVI_TEMPLATE.ONOFF_BUTTON}
-            />
-            <CircleButton
-              type="small"
-              icon={<SvgInput size={20} style={styles.iconButtonExit} />}
-              onPress={onPressExit}
-              testID={TESTID.SMART_TIVI_TEMPLATE.EXIT_BUTTON}
-            />
-          </View>
-          <View style={styles.controlDevice}>
-            <RectangleButton
-              type="column"
-              icon={<VolumeUp width={20} height={20} />}
-              onPressUp={onPressVolumeUp}
-              onPressDown={onPressVolumeDown}
-              testID={TESTID.SMART_TIVI_TEMPLATE.VOLUME_BUTTON}
-            />
-            <CircleButton
-              type="big"
-              wrapStyle={styles.circleBigButton}
-              onPressUp={onPressUp}
-              onPressDown={onPressDown}
-              onPressLeft={onPressLeft}
-              onPressRight={onPressRight}
-              onPressOk={onPressOk}
-              testID={TESTID.SMART_TIVI_TEMPLATE.BIG_BUTTON}
-            />
-            <RectangleButton
-              type="column"
-              icon={
-                <Text type="H4" color={Colors.Gray9} bold>
-                  CH
-                </Text>
-              }
-              onPressUp={onPressChUp}
-              onPressDown={onPressChDown}
-              testID={TESTID.SMART_TIVI_TEMPLATE.CH_BUTTON}
-            />
-          </View>
-          <View style={styles.controlPlay}>
-            <ControlPlay
-              onPressPrev={onPressPrev}
-              onPressStop={onPressStop}
-              onPressNext={onPressNext}
-              testID={TESTID.SMART_TIVI_TEMPLATE.CONTROL_BUTTON}
-            />
-          </View>
-          <View style={styles.controlHome}>
-            <RectangleButton
-              type="row"
-              onPress={onPressHome}
-              icon={<Home />}
-              testID={TESTID.SMART_TIVI_TEMPLATE.HOME_BUTTON}
-            />
-            <RectangleButton
-              type="row"
-              onPress={onPressBack}
-              icon={<KeyboardReturn />}
-              testID={TESTID.SMART_TIVI_TEMPLATE.BACK_BUTTON}
-            />
-          </View>
-          <View style={styles.channelTV}>
-            {!!FakeDataChannel &&
-              FakeDataChannel.map((item, index) => {
-                return (
-                  <RectangleButton
-                    type="row"
-                    onPress={() => onPressChannel(item)}
-                    icon={iconChannels(item)}
-                    wrapStyle={styles.buttonChannel}
-                    index={index}
+const SmartTiviActionTemplate = memo(
+  ({ actionGroup, doAction, scrollEnabled = true }) => {
+    const t = useTranslations();
+    const FakeDataChannel = [
+      {
+        id: 1,
+        icon: 'disney',
+        link: '...',
+      },
+      {
+        id: 2,
+        icon: 'youtube',
+        link: '...',
+      },
+      {
+        id: 3,
+        icon: 'netflix',
+        link: '...',
+      },
+      {
+        id: 4,
+        icon: 'spotify',
+        link: '...',
+      },
+    ];
+    const onPressOnOff = useCallback(() => {
+      return Alert.alert(t('feature_under_development'));
+    }, [t]);
+    const onPressExit = useCallback(() => {
+      return Alert.alert(t('feature_under_development'));
+    }, [t]);
+    const onPressVolumeUp = useCallback(() => {
+      return Alert.alert(t('feature_under_development'));
+    }, [t]);
+    const onPressVolumeDown = useCallback(() => {
+      return Alert.alert(t('feature_under_development'));
+    }, [t]);
+    const onPressChUp = useCallback(() => {
+      return Alert.alert(t('feature_under_development'));
+    }, [t]);
+    const onPressChDown = useCallback(() => {
+      return Alert.alert(t('feature_under_development'));
+    }, [t]);
+    const onPressUp = useCallback(() => {
+      return Alert.alert(t('feature_under_development'));
+    }, [t]);
+    const onPressDown = useCallback(() => {
+      return Alert.alert(t('feature_under_development'));
+    }, [t]);
+    const onPressLeft = useCallback(() => {
+      return Alert.alert(t('feature_under_development'));
+    }, [t]);
+    const onPressRight = useCallback(() => {
+      return Alert.alert(t('feature_under_development'));
+    }, [t]);
+    const onPressOk = useCallback(() => {
+      return Alert.alert(t('feature_under_development'));
+    }, [t]);
+    const onPressPrev = useCallback(() => {
+      return Alert.alert(t('feature_under_development'));
+    }, [t]);
+    const onPressStop = useCallback(() => {
+      return Alert.alert(t('feature_under_development'));
+    }, [t]);
+    const onPressNext = useCallback(() => {
+      return Alert.alert(t('feature_under_development'));
+    }, [t]);
+    const onPressHome = useCallback(() => {
+      return Alert.alert(t('feature_under_development'));
+    }, [t]);
+    const onPressBack = useCallback(() => {
+      return Alert.alert(t('feature_under_development'));
+    }, [t]);
+    const onPressChannel = useCallback(
+      (item) => {
+        return Alert.alert(t('feature_under_development'));
+      },
+      [t]
+    );
+    const iconChannels = useCallback((item) => {
+      switch (item.icon) {
+        case 'disney':
+          return <Disney style={styles.iconChannel} />;
+        case 'youtube':
+          return <Youtube style={styles.iconChannel} />;
+        case 'netflix':
+          return <Netflix style={styles.iconChannel} />;
+        case 'spotify':
+          return <Spotify style={styles.iconChannel} />;
+        default:
+          return <></>;
+      }
+    }, []);
+    return (
+      <>
+        <ScrollView scrollEnabled={scrollEnabled}>
+          <View style={styles.wrap}>
+            <View style={styles.rowOnOff}>
+              <CircleButton
+                type="small"
+                icon={
+                  <IconOutline
+                    name="poweroff"
+                    size={20}
+                    color={Colors.Gray6}
+                    style={styles.iconButton}
                   />
-                );
-              })}
+                }
+                onPress={onPressOnOff}
+                testID={TESTID.SMART_TIVI_TEMPLATE.ONOFF_BUTTON}
+              />
+              <CircleButton
+                type="small"
+                icon={<SvgInput size={20} style={styles.iconButtonExit} />}
+                onPress={onPressExit}
+                testID={TESTID.SMART_TIVI_TEMPLATE.EXIT_BUTTON}
+              />
+            </View>
+            <View style={styles.controlDevice}>
+              <RectangleButton
+                type="column"
+                icon={<VolumeUp width={20} height={20} />}
+                onPressUp={onPressVolumeUp}
+                onPressDown={onPressVolumeDown}
+                testID={TESTID.SMART_TIVI_TEMPLATE.VOLUME_BUTTON}
+              />
+              <CircleButton
+                type="big"
+                wrapStyle={styles.circleBigButton}
+                onPressUp={onPressUp}
+                onPressDown={onPressDown}
+                onPressLeft={onPressLeft}
+                onPressRight={onPressRight}
+                onPressOk={onPressOk}
+                testID={TESTID.SMART_TIVI_TEMPLATE.BIG_BUTTON}
+              />
+              <RectangleButton
+                type="column"
+                icon={
+                  <Text type="H4" color={Colors.Gray9} bold>
+                    CH
+                  </Text>
+                }
+                onPressUp={onPressChUp}
+                onPressDown={onPressChDown}
+                testID={TESTID.SMART_TIVI_TEMPLATE.CH_BUTTON}
+              />
+            </View>
+            <View style={styles.controlPlay}>
+              <ControlPlay
+                onPressPrev={onPressPrev}
+                onPressStop={onPressStop}
+                onPressNext={onPressNext}
+                testID={TESTID.SMART_TIVI_TEMPLATE.CONTROL_BUTTON}
+              />
+            </View>
+            <View style={styles.controlHome}>
+              <RectangleButton
+                type="row"
+                onPress={onPressHome}
+                icon={<Home />}
+                testID={TESTID.SMART_TIVI_TEMPLATE.HOME_BUTTON}
+              />
+              <RectangleButton
+                type="row"
+                onPress={onPressBack}
+                icon={<KeyboardReturn />}
+                testID={TESTID.SMART_TIVI_TEMPLATE.BACK_BUTTON}
+              />
+            </View>
+            <View style={styles.channelTV}>
+              {!!FakeDataChannel &&
+                FakeDataChannel.map((item, index) => {
+                  return (
+                    <RectangleButton
+                      type="row"
+                      onPress={() => onPressChannel(item)}
+                      icon={iconChannels(item)}
+                      wrapStyle={styles.buttonChannel}
+                      index={index}
+                    />
+                  );
+                })}
+            </View>
           </View>
-        </View>
-      </ScrollView>
-    </>
-  );
-});
+        </ScrollView>
+      </>
+    );
+  }
+);
 
 export default SmartTiviActionTemplate;

package/src/commons/ActionGroup/StatesGridActionTemplate.js

@@ -49,9 +49,10 @@ const GridItem = ({ item, index, length, doAction, sensor, title }) => {
 
   const doActionAndWatchConfig = useCallback(
     (actionData) => {
-      const actionName = `${
+      let actionName = `${
         sensor?.name
       } ${title?.toLowerCase()} ${text?.toLowerCase()}`;
+      actionName = actionName.replace(/\s+/g, ' ').trim();
       doAction(actionData, null, actionName);
       if (sensor?.is_managed_by_backend) {
         config && watchMultiConfigs([config]);

package/src/commons/ActionGroup/index.js

@@ -11,7 +11,7 @@ import TimerActionTemplate from './TimerActionTemplate';
 import CurtainButtonTemplate from './CurtainButtonTemplate';
 import SmartTiviActionTemplate from './SmartTiviActionTemplate/SmartTiviActionTemplate';
 import LightActionTemplate from './LightActionTemplate';
-import OnOffSmartLock from './OnOffSmartLock';
+import OnOffSmartLock from './OnOffSmartLock/OnOffSmartLock';
 
 export const getActionComponent = (template) => {
   switch (template) {

package/src/commons/Device/DisconnectedView.js

@@ -42,7 +42,7 @@ const DisplayTextDisconnected = memo(({ type }) => {
   return <Text style={styles.redStatus}>{text}</Text>;
 });
 
-const DisconnectedView = memo(({ sensor, type }) => {
+const DisconnectedView = memo(({ sensor, type, isDeviceHasBle }) => {
   const t = useTranslations();
   return (
     <View style={styles.statusContainer}>
@@ -74,6 +74,12 @@ const DisconnectedView = memo(({ sensor, type }) => {
           <CircleView size={6} backgroundColor={Colors.Gray8} />
           <Text style={styles.noticeText}>{t('check_the_wifi')}</Text>
         </View>
+        {isDeviceHasBle && (
+          <View style={styles.infoRow}>
+            <CircleView size={6} backgroundColor={Colors.Gray8} />
+            <Text style={styles.noticeText}>{t('check_the_ble')}</Text>
+          </View>
+        )}
       </View>
     </View>
   );

package/src/commons/Device/LinearChart.js

@@ -47,46 +47,9 @@ const chartOptions = {
       text: '',
     },
     labels: {
-      formatter: function (value) {
-        const time = new Date(this.value || value);
-        let date = ('0' + time.getDate()).slice(-2);
-        let month = ('0' + (time.getMonth() + 1)).slice(-2);
-        return `${date}.${month}`;
-      },
-    },
-    minRange: 3600 * 24 * 1000,
-    tickInterval: 24 * 3600 * 1000,
-  },
-  plotOptions: {
-    series: {
-      events: {
-        legendItemClick: function () {
-          const { index, visible, chart } = this;
-          const { series } = chart;
-          series.forEach((serie, i) => {
-            if (i !== index) {
-              serie.visible ? serie.show() : serie.hide();
-            }
-          });
-          const isHiding = (serie, i) => {
-            if (i === index) {
-              return visible;
-            }
-            return !serie.visible;
-          };
-          if (this.chart.series.every(isHiding)) {
-            this.chart.yAxis[0].update({
-              min: 0,
-              max: 100,
-            });
-          } else {
-            this.chart.yAxis[0].update({
-              min: undefined,
-              max: undefined,
-            });
-          }
-        },
-      },
+      align: 'center',
+      padding: 70,
+      format: '{value:%d.%m %H:%M}',
     },
   },
 };

package/src/commons/Device/__test__/DisconnectedView.test.js

@@ -5,9 +5,9 @@ import renderer, { act } from 'react-test-renderer';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
 
-const wrapComponent = (sensor) => (
+const wrapComponent = (sensor, isDeviceHasBle) => (
   <SCProvider initState={mockSCStore({})}>
-    <DisconnectedView sensor={sensor} />
+    <DisconnectedView sensor={sensor} isDeviceHasBle={isDeviceHasBle} />
   </SCProvider>
 );
 
@@ -63,4 +63,15 @@ describe('Test DisconnectedView', () => {
     const Views = instance.findAllByType(View);
     expect(Views).toHaveLength(15);
   });
+
+  test('render DisconnectedView text check bluetooth', () => {
+    const isDeviceHasBle = true;
+    const sensor = { icon: 'test' };
+    act(() => {
+      tree = renderer.create(wrapComponent(sensor, isDeviceHasBle));
+    });
+    const instance = tree.root;
+    const Views = instance.findAllByType(View);
+    expect(Views).toHaveLength(17);
+  });
 });

package/src/commons/RowItem/index.js

@@ -21,7 +21,8 @@ export const RowItem = memo(
     type, //primary | disable | undefined
     leftIcon,
     text,
-    subtext,
+    isShowSubText = true,
+    subtext = '',
     subtextColor = Colors.Gray6,
     rightComponent,
     onPress,
@@ -40,14 +41,18 @@ export const RowItem = memo(
         <View style={styles.wrapItem}>
           <TouchableOpacity onPress={onPress} disabled={type === 'disable'}>
             <View style={styles.Border}>
-              <View style={styles.paddingLeft16}>
-                <CircleView size={40} backgroundColor={circleColor} center>
-                  {leftIcon}
-                </CircleView>
-              </View>
+              {!!leftIcon && (
+                <View style={styles.paddingLeft16}>
+                  <CircleView size={40} backgroundColor={circleColor} center>
+                    {leftIcon}
+                  </CircleView>
+                </View>
+              )}
               <View style={styles.columeFlex}>
                 <Text style={styles.titleName}> {text}</Text>
-                <Text style={styles.status}> {subtext}</Text>
+                {!!isShowSubText && (
+                  <Text style={styles.status}> {subtext}</Text>
+                )}
               </View>
               {!!rightComponent && (
                 <View style={styles.endFlex}>{rightComponent}</View>

package/src/commons/WheelDateTimePicker/index.js

@@ -92,10 +92,14 @@ const WheelDateTimePicker = ({
   }, [dateSelected, hourSelected, minuteSelected, onCancel, onPicked]);
 
   const title = useMemo(() => {
-    if (mode === 'time') {
-      return t('set_time');
+    switch (mode) {
+      case 'time':
+        return t('set_time');
+      case 'datetime':
+        return t('set_date_time');
+      default:
+        return t('minutes');
     }
-    return t('set_date_time');
   }, [t, mode]);
 
   return (
@@ -125,7 +129,7 @@ const WheelDateTimePicker = ({
             style={styles.picker}
           />
         </View>
-      ) : (
+      ) : mode === 'datetime' ? (
         <View style={styles.container}>
           <Picker
             dataSource={dateData}
@@ -153,6 +157,16 @@ const WheelDateTimePicker = ({
             style={styles.picker}
           />
         </View>
+      ) : (
+        <View style={styles.container}>
+          <Picker
+            dataSource={minuteData}
+            selectedIndex={indexInitialMinute}
+            onValueChange={onValueMinuteChange}
+            keyPrefix="minute"
+            style={styles.picker}
+          />
+        </View>
       )}
       <ViewButtonBottom
         leftTitle={t('cancel')}

package/src/configs/API.js

@@ -184,7 +184,7 @@ const API = {
     VCONNEX: {
       AUTHORIZE: (client_id, redirect_uri, user_id, unit_id, station_id) =>
         // eslint-disable-next-line max-len
-        `https://partner-api-stg.vconnex.vn/oauth/authorize?client_id=${client_id}&redirect_uri=${redirect_uri}&response_type=code&scope=SYNCH&scope=CONTROL&scope=QUERY&state=${user_id}@${unit_id}@${station_id}`,
+        `https://partner-api.vconnex.vn/oauth/authorize?client_id=${client_id}&redirect_uri=${redirect_uri}&response_type=code&scope=SYNCH&scope=CONTROL&scope=QUERY&state=${user_id}@${unit_id}@${station_id}`,
     },
   },
   NOTIFICATION: {

package/src/configs/Colors.js

@@ -110,6 +110,7 @@ export const Colors = {
   Blue10: '#1890FF',
   Blue11: '#096DD9',
   Blue12: '#0050B3',
+  Blue13: '#E2F0F8',
 
   //Range Volcano:
   Volcano3: '#FFBB96',

package/src/configs/Constants.js

@@ -636,6 +636,16 @@ export const TESTID = {
 
   // MoveToAnotherSubUnit
   ROW_SUB_UNIT: 'ROW_SUB_UNIT',
+
+  //SetupGeneratePasscode
+  GENERATE_PASSCODE_CHOOSE_USER: 'GENERATE_PASSCODE_CHOOSE_USER',
+  GENERATE_PASSCODE_SET_TIME: 'GENERATE_PASSCODE_SET_TIME',
+  GENERATE_PASSCODE_SET_DURATION: 'GENERATE_PASSCODE_SET_DURATION',
+
+  //AutoLock
+  AUTO_LOCK_BUTTON_ENABLE: 'AUTO_LOCK_BUTTON_ENABLE',
+  AUTO_LOCK_BUTTON_INSTANT: 'AUTO_LOCK_BUTTON_INSTANT',
+  AUTO_LOCK_BUTTON_RELOCK_TIMING: 'AUTO_LOCK_BUTTON_RELOCK_TIMING',
 };
 
 export const NOTIFICATION_TYPES = {
@@ -682,4 +692,5 @@ export const SENSOR_TYPE = {
   SMOKE: 'smoke',
   FIRE: 'fire',
   SOS: 'sos',
+  FILTER_WATER: 'filter_water',
 };

package/src/context/mockStore.ts

@@ -49,6 +49,7 @@ export const mockSCStore = (data: ContextData): ContextData => {
     listAction: [...mockDataStore.listAction, ...(data?.listAction || [])],
     app: {
       isFirstOpenCamera: true,
+      isConnectWifiGateway: false,
     },
   };
 };

package/src/iot/RemoteControl/Bluetooth.js

@@ -185,9 +185,9 @@ export const sendDataOverBluetooth = async (
     return result;
   }
 
-  // eslint-disable-next-line no-shadow
-  setTimeout(async (device) => {
-    await device.cancelConnection();
+  const timeout = setTimeout(() => {
+    device.cancelConnection();
+    clearTimeout(timeout);
   }, responseTime);
   return result;
 };