@eohjsc/react-native-smart-city 0.4.85 → 0.4.87

package/assets/images/Notify.svg

@@ -0,0 +1,9 @@
+<svg width="28" height="33" viewBox="0 0 28 33" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M14.0003 32.6666C15.8337 32.6666 17.3337 31.1666 17.3337 29.3333H10.667C10.667 31.1666 12.1503 32.6666 14.0003 32.6666ZM24.0003 22.6666V14.3333C24.0003 9.21663 21.267 4.93329 16.5003 3.79996V2.66663C16.5003 1.28329 15.3837 0.166626 14.0003 0.166626C12.617 0.166626 11.5003 1.28329 11.5003 2.66663V3.79996C6.71699 4.93329 4.00033 9.19996 4.00033 14.3333V22.6666L0.666992 26V27.6666H27.3337V26L24.0003 22.6666Z" fill="url(#paint0_linear_2168_1847)"/>
+<defs>
+<linearGradient id="paint0_linear_2168_1847" x1="0.666992" y1="0.166626" x2="32.5129" y2="26.3255" gradientUnits="userSpaceOnUse">
+<stop stop-color="#2B6B9F"/>
+<stop offset="1" stop-color="#D5FFCB"/>
+</linearGradient>
+</defs>
+</svg>

package/package.json

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

package/src/commons/Action/ItemQuickAction.js

@@ -1,144 +1,125 @@
 import React, { memo, useCallback, useEffect, useState } from 'react';
-import { TouchableOpacity, View } from 'react-native';
+import { Platform, TouchableOpacity, View } from 'react-native';
 import { AccessibilityLabel } from '../../configs/Constants';
 import { useSCContextSelector } from '../../context';
 import { useRemoteControl } from '../../hooks/IoT';
 import { useConfigGlobalState } from '../../iot/states';
 import IconComponent from '../IconComponent';
-import { Colors } from '../../configs';
 
-const ItemQuickAction = memo(
-  ({ sensor, wrapperStyle, setStatus, iconSize = 30 }) => {
-    const { quick_action } = sensor || {};
-    const {
-      config_id,
-      off_action,
-      on_status,
-      on_action,
-      off_status,
-      interval,
-      will_auto_update_status,
-      on_state_values,
-    } = quick_action || {};
-    const [action, setAction] = useState(sensor?.action);
-    // eslint-disable-next-line no-unused-vars
-    const [configValues, _] = useConfigGlobalState('configValues');
-    const currentValue = configValues[config_id]?.value || 0;
-    const isFault = currentValue === 2; // phukhaco fault value
-    const [isOn, setIsOn] = useState(currentValue);
+const ItemQuickAction = memo(({ sensor, wrapperStyle, setStatus }) => {
+  const { quick_action } = sensor || {};
+  const {
+    config_id,
+    off_action,
+    on_status,
+    on_action,
+    off_status,
+    interval,
+    will_auto_update_status,
+    on_state_values,
+  } = quick_action || {};
+  const [action, setAction] = useState(sensor?.action);
+  // eslint-disable-next-line no-unused-vars
+  const [configValues, _] = useConfigGlobalState('configValues');
+  const currentValue = configValues[config_id]?.value || 0;
+  const [isOn, setIsOn] = useState(currentValue);
 
-    const sendRemoteCommand = useRemoteControl();
-    const [processing, setProcessing] = useState(false);
+  const sendRemoteCommand = useRemoteControl();
+  const [processing, setProcessing] = useState(false);
 
-    const getIsOnValue = useCallback(() => {
-      if (on_state_values && on_state_values.length > 0) {
-        return on_state_values.includes(currentValue);
-      }
-      return !!currentValue;
-    }, [currentValue, on_state_values]);
-
-    useEffect(() => {
-      setIsOn(getIsOnValue());
-    }, [getIsOnValue]);
+  const getIsOnValue = useCallback(() => {
+    if (on_state_values && on_state_values.length > 0) {
+      return on_state_values.includes(currentValue);
+    }
+    return !!currentValue;
+  }, [currentValue, on_state_values]);
 
-    useEffect(() => {
-      if (!quick_action) {
-        return;
-      }
+  useEffect(() => {
+    setIsOn(getIsOnValue());
+  }, [getIsOnValue]);
 
-      if (isOn) {
-        setAction(off_action);
-        setStatus && setStatus(on_status);
-      } else {
-        setAction(on_action);
-        setStatus && setStatus(off_status);
-      }
-    }, [
-      isOn,
-      setStatus,
-      quick_action,
-      off_action,
-      on_status,
-      on_action,
-      off_status,
-    ]);
+  useEffect(() => {
+    if (!quick_action) {
+      return;
+    }
 
-    const userId = useSCContextSelector((state) => state?.auth.account.user.id);
-    const onActionPress = useCallback(async () => {
-      if (isFault) {
-        /* istanbul ignore next */
-        return;
-      }
-      if (processing || !action) {
-        /* istanbul ignore next */
-        return;
-      }
-      setProcessing(true);
-      let data = null;
-      if (action?.allow_config_store_value_id === config_id) {
-        if (action?.name?.toLowerCase().includes('off')) {
-          data = {
-            config_id: action?.allow_config_store_value_id,
-            config_value: 0,
-          };
-        } else {
-          data = {
-            config_id: action?.allow_config_store_value_id,
-            config_value: 1,
-          };
-        }
-        data = JSON.stringify(data);
-      }
-      await sendRemoteCommand(sensor, action, data, userId);
+    if (isOn) {
+      setAction(off_action);
+      setStatus && setStatus(on_status);
+    } else {
+      setAction(on_action);
+      setStatus && setStatus(off_status);
+    }
+  }, [
+    isOn,
+    setStatus,
+    quick_action,
+    off_action,
+    on_status,
+    on_action,
+    off_status,
+  ]);
 
-      if (!will_auto_update_status) {
-        setTimeout(() => {
-          setIsOn(action.id === on_action.id);
-        }, interval);
+  const userId = useSCContextSelector((state) => state?.auth.account.user.id);
+  const onActionPress = useCallback(async () => {
+    if (processing || !action) {
+      /* istanbul ignore next */
+      return;
+    }
+    setProcessing(true);
+    let data = null;
+    if (action?.allow_config_store_value_id === config_id) {
+      if (action?.name?.toLowerCase().includes('off')) {
+        data = {
+          config_id: action?.allow_config_store_value_id,
+          config_value: 0,
+        };
+      } else {
+        data = {
+          config_id: action?.allow_config_store_value_id,
+          config_value: 1,
+        };
       }
-      setProcessing(false);
-    }, [
-      isFault,
-      processing,
-      action,
-      config_id,
-      sendRemoteCommand,
-      sensor,
-      userId,
-      will_auto_update_status,
-      interval,
-      on_action?.id,
-    ]);
+      data = JSON.stringify(data);
+    }
+    await sendRemoteCommand(sensor, action, data, userId);
 
-    if (!config_id) {
-      return <View />;
+    if (!will_auto_update_status) {
+      setTimeout(() => {
+        setIsOn(action.id === on_action.id);
+      }, interval);
     }
+    setProcessing(false);
+  }, [
+    processing,
+    action,
+    config_id,
+    sendRemoteCommand,
+    sensor,
+    userId,
+    will_auto_update_status,
+    interval,
+    on_action?.id,
+  ]);
 
-    return (
-      <TouchableOpacity
-        accessibilityLabel={`${AccessibilityLabel.ITEM_QUICK_ACTION_PRESS}-${sensor?.id}`}
-        onPress={onActionPress}
-      >
-        <View style={wrapperStyle}>
-          {isFault ? (
-            <IconComponent
-              icon={'WarningOutlined'}
-              color={Colors.Red}
-              iconSize={iconSize}
-              size={iconSize}
-            />
-          ) : (
-            <IconComponent
-              icon={action?.icon_kit || action?.icon || 'PoweroffOutlined'}
-              isOn={isOn}
-              iconSize={iconSize}
-              size={iconSize}
-            />
-          )}
-        </View>
-      </TouchableOpacity>
-    );
+  if (!config_id) {
+    return <View />;
   }
-);
+
+  return (
+    <TouchableOpacity
+      accessibilityLabel={`${AccessibilityLabel.ITEM_QUICK_ACTION_PRESS}-${sensor?.id}`}
+      onPress={onActionPress}
+    >
+      <View style={wrapperStyle}>
+        <IconComponent
+          icon={action?.icon_kit || action?.icon || 'PoweroffOutlined'}
+          isOn={isOn}
+          size={Platform.OS === 'ios' ? 20 : 30}
+        />
+      </View>
+    </TouchableOpacity>
+  );
+});
 
 export default ItemQuickAction;

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

@@ -35,7 +35,7 @@ const OnOffButtonTemplate = memo(
             <View style={styles.smallCircle}>
               <IconComponent
                 icon={icon}
-                iconSize={30}
+                size={30}
                 isOn={isOn}
                 colorInActive={Colors.Gray6}
                 color={Colors.Green7}

package/src/commons/ActionGroup/OptionsDropdownActionTemplate.js

@@ -118,7 +118,6 @@ const OptionsDropdownActionTemplate = ({
         {!checkIcon && (
           <IconComponent
             icon={iconKit || icon}
-            iconSize={27}
             size={27}
             style={styles.marginRight}
           />

package/src/commons/ActionGroup/ThreeButtonTemplate/components/ThreeButtonDefault.js

@@ -22,7 +22,7 @@ const ThreeButtonDefault = memo(
       return icon2 === 'stop' ? (
         <View style={styles.squareStop} />
       ) : (
-        <IconComponent icon={icon2} iconSize={30} />
+        <IconComponent icon={icon2} size={30} />
       );
     };
 
@@ -87,7 +87,7 @@ const ThreeButtonDefault = memo(
                 {item?.id === 2 ? (
                   <Icon2CT />
                 ) : (
-                  <IconComponent icon={item?.icon} iconSize={30} />
+                  <IconComponent icon={item?.icon} size={30} />
                 )}
               </View>
               <Text style={styles.text}>{item?.text}</Text>

package/src/commons/ActionGroup/ThreeButtonTemplate/index.js

@@ -60,7 +60,7 @@ const ThreeButtonTemplate = memo(({ item, doAction, isWidgetOrder }) => {
         <View style={styles.lockDoor}>
           <IconComponent
             icon={icon}
-            iconSize={15}
+            size={15}
             color={color}
             style={styles.iconLock}
           />

package/src/commons/Automate/ItemAutomate.js

@@ -15,6 +15,7 @@ const ItemAutomate = ({
   index,
   setSelectedIndex,
   onPress,
+  enableScript = true,
 }) => {
   const t = useTranslations();
   const item = AUTOMATES[automate?.type];
@@ -57,7 +58,11 @@ const ItemAutomate = ({
       <View style={styles.row}>
         <View style={styles.wrapIcon}>{!!Icon && <Icon />}</View>
         <View style={styles.wrapTitle}>
-          <Text type="H4" bold>
+          <Text
+            type="H4"
+            bold
+            color={enableScript ? Colors.Black : Colors.Gray7}
+          >
             {t(item?.title)}
           </Text>
           <Text type="Label" color={Colors.Gray8} numberOfLines={1}>

package/src/commons/Device/RainningSensor/CurrentRainSensor.js

@@ -41,11 +41,7 @@ const CurrentRainSensor = memo(
             end={{ x: 1, y: 1 }}
           />
           {icon_kit_data?.icon || icon ? (
-            <IconComponent
-              size={iconSize}
-              iconSize={iconSize}
-              icon={icon_kit_data?.icon || icon}
-            />
+            <IconComponent size={iconSize} icon={icon_kit_data?.icon || icon} />
           ) : (
             <FImage
               source={images.activeCurrentSensor}

package/src/commons/IconComponent/index.js

@@ -10,7 +10,6 @@ const IconComponent = memo(
     icon,
     isOn = false,
     size = 30,
-    iconSize = 30,
     style,
     antIconStyle,
     color,
@@ -66,7 +65,7 @@ const IconComponent = memo(
         <IconFill
           name={displayIcon}
           color={colorIcon}
-          size={iconSize}
+          size={size}
           style={[extraStyle, antIconStyle || style]}
         />
       );
@@ -80,7 +79,7 @@ const IconComponent = memo(
         <IconOutline
           name={iconCT}
           color={colorIcon}
-          size={iconSize}
+          size={size}
           style={[extraStyle, antIconStyle || style]}
         />
       );

package/src/commons/MenuActionAddnew/index.js

@@ -6,6 +6,7 @@ import { Colors } from '../../configs';
 import Text from '../Text';
 import ImageButton from '../ImageButton';
 import { ModalCustom } from '../Modal';
+import packageJson from '../../../package.json';
 
 const keyExtractor = (item) => item.id.toString();
 const MenuActionAddnew = memo(
@@ -61,6 +62,11 @@ const MenuActionAddnew = memo(
               renderItem={renderItem}
               scrollIndicatorInsets={{ right: 1 }}
             />
+            <View style={styles.modalHeader}>
+              <Text
+                style={styles.modalHeaderText}
+              >{`v ${packageJson.version}`}</Text>
+            </View>
           </View>
         </View>
       </ModalCustom>

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

@@ -22,6 +22,7 @@ import { AccessibilityLabel, AUTOMATE_TYPE } from '../../../configs/Constants';
 const ItemOneTap = memo(({ automate = {}, wrapSyles, onPressItem }) => {
   const { navigate } = useNavigation();
   const { id, type, script, activate_at, author = '' } = automate;
+  const { enable } = script;
   const t = useTranslations();
 
   const goToDetail = useCallback(() => {
@@ -69,7 +70,7 @@ const ItemOneTap = memo(({ automate = {}, wrapSyles, onPressItem }) => {
       <View style={[styles.container, wrapSyles]}>
         <View style={styles.boxIcon}>
           {displayIcon()}
-          {type === AUTOMATE_TYPE.ONE_TAP && (
+          {type === AUTOMATE_TYPE.ONE_TAP && enable && (
             <TouchableOpacity
               accessibilityLabel={AccessibilityLabel.AUTOMATE_SCRIPT_ACTION}
               onPress={handleScriptAction}
@@ -86,7 +87,7 @@ const ItemOneTap = memo(({ automate = {}, wrapSyles, onPressItem }) => {
             numberOfLines={1}
             semibold
             size={14}
-            color={Colors.Gray9}
+            color={enable ? Colors.Gray9 : Colors.Gray}
             type="Body"
             style={styles.name}
             accessibilityLabel={AccessibilityLabel.TEXT_AUTOMATE_NAME}
@@ -101,7 +102,7 @@ const ItemOneTap = memo(({ automate = {}, wrapSyles, onPressItem }) => {
               numberOfLines={1}
               semibold
               size={12}
-              color={Colors.Gray8}
+              color={enable ? Colors.Gray8 : Colors.Gray}
               type="Label"
             >
               {activateAt && t('activated_time', { time: activateAt })}

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

@@ -49,6 +49,19 @@ describe('test Item', () => {
                 name: 'Joshua Ray',
                 icon: '',
                 icon_kit: '',
+                enable: true,
+              },
+            },
+            {
+              id: 2,
+              user: 6,
+              type: 'one_tap',
+              activate_at: '2021-09-17T05:30:00Z',
+              script: {
+                name: 'Test',
+                icon: '',
+                icon_kit: '',
+                enable: false,
               },
             },
           ],
@@ -89,7 +102,7 @@ describe('test Item', () => {
         el.props.accessibilityLabel === AccessibilityLabel.GO_DETAIL &&
         el.type === TouchableOpacity
     );
-    expect(goDetail).toHaveLength(1);
+    expect(goDetail).toHaveLength(2);
     await act(async () => {
       await goDetail[0].props.onPress();
     });

package/src/configs/API.js

@@ -87,16 +87,26 @@ const API = {
   AUTOMATE: {
     ACTION_ONE_TAP: (id) => `/property_manager/automate/${id}/action_one_tap/`,
     SCRIPT: (id) => `/property_manager/automate/${id}/script/`,
+    SCRIPT_ITEMS: (id) => `/property_manager/automate/${id}/script_items/`,
     ORDER_SCRIPT_ACTION: (id) =>
       `/property_manager/automate/${id}/order_script_action/`,
+    ORDER_SCRIPT_ITEMS: (id) =>
+      `/property_manager/automate/${id}/order_script_items/`,
     DELETE_SCRIPT_ACTION: (automateId, actionId) =>
       `/property_manager/automate/${automateId}/script_action/${actionId}/`,
+    DELETE_SCRIPT_ITEM: (automateId, itemId) =>
+      `/property_manager/automate/${automateId}/script_item/${itemId}/`,
     ADD_SCRIPT_ACTION: (id) =>
       `/property_manager/automate/${id}/add_script_action/`,
+    ADD_SCRIPT_NOTIFY: (id) =>
+      `/property_manager/automate/${id}/add_script_notify/`,
+
     FETCH_AUTOMATE: (automateId) => `/property_manager/automate/${automateId}/`,
     CREATE_AUTOMATE: () => '/property_manager/automate/',
     UPDATE_AUTOMATE: (automateId) =>
       `/property_manager/automate/${automateId}/`,
+    ENABLE_SCRIPT: (automateId) =>
+      `/property_manager/automate/${automateId}/enable_script/`,
     STAR_SCRIPT: (id) => `/property_manager/automate/${id}/star_script/`,
     UNSTAR_SCRIPT: (id) => `/property_manager/automate/${id}/unstar_script/`,
     GET_SMART: () => '/property_manager/automate/smart/',

package/src/configs/AccessibilityLabel.js

@@ -241,6 +241,9 @@ export default {
   ICON_MORE: 'ICON_MORE',
   ICON_ARROW_RIGHT: 'ICON_ARROW_RIGHT',
   TEXT_AUTOMATE_NAME: 'TEXT_AUTOMATE_NAME',
+  AUTOMATE_LIST_SCRIPT_ACTION: 'AUTOMATE_LIST_SCRIPT_ACTION',
+  AUTOMATE_TITLE_NOTIFY: 'AUTOMATE_TITLE_NOTIFY',
+  AUTOMATE_MESSAGE_NOTIFY: 'AUTOMATE_MESSAGE_NOTIFY',
 
   // Parking input maunaly spot
   PARKING_SPOT_INFO_BUTTON: 'PARKING_SPOT_INFO_BUTTON',

package/src/configs/Constants.js

@@ -233,6 +233,7 @@ export const NOTIFICATION_TYPES = {
   LOW_BATTERY: 'LOW_BATTERY',
   BROADCAST_NOTIFICATION: 'BROADCAST_NOTIFICATION',
   SUBSCRIBE_SUCCESS: 'SUBSCRIBE_SUCCESS',
+  TRIGGER_SCRIPT_NOTIFY: 'TRIGGER_SCRIPT_NOTIFY',
 };
 
 export const ACTIVITY_LOG_TYPES = {

package/src/navigations/UnitStack.js

@@ -19,7 +19,7 @@ import { Action } from '../context/actionType';
 import AQIGuide from '../screens/AQIGuide';
 import DeviceDetail from '../screens/Device/detail';
 import ChangePosition from '../screens/ChangePosition';
-import SharingMemberList from '../screens/Sharing/MemberList';
+import UnitMemberList from '../screens/Sharing/UnitMemberList';
 import ManageSubUnit from '../screens/SubUnit/ManageSubUnit';
 import SelectAddress from '../screens/Unit/SelectAddress';
 import ChooseLocation from '../screens/Unit/ChooseLocation';
@@ -66,6 +66,7 @@ import ChooseAction from '../screens/Automate/AddNewAction/ChooseAction';
 import ScenarioName from '../screens/Automate/Scenario/ScenarioName';
 import ValueChangeName from '../screens/Automate/ValueChange/ValueChangeName';
 import AddAutomationTypeSmart from '../screens/Automate/AddNewAutoSmart/AddAutomationTypeSmart';
+import SetupScriptNotify from '../screens/Automate/AddNewAction/SetupScriptNotify';
 
 const Stack = createStackNavigator();
 
@@ -331,7 +332,7 @@ export const UnitStack = memo((props) => {
       />
       <Stack.Screen
         name={Route.UnitMemberList}
-        component={SharingMemberList}
+        component={UnitMemberList}
         options={{
           headerShown: false,
         }}
@@ -406,6 +407,13 @@ export const UnitStack = memo((props) => {
           headerShown: false,
         }}
       />
+      <Stack.Screen
+        name={Route.SetupScriptNotify}
+        component={SetupScriptNotify}
+        options={{
+          headerShown: false,
+        }}
+      />
       <Stack.Screen
         name={Route.AddAutomationTypeSmart}
         component={AddAutomationTypeSmart}

package/src/screens/Automate/AddNewAction/SetupScriptNotify.js

@@ -0,0 +1,92 @@
+import React, { useCallback, useMemo, useState } from 'react';
+import { View } from 'react-native';
+import { useNavigation } from '@react-navigation/native';
+import styles from './Styles/SetupScriptNotifyStyles';
+import { HeaderCustom } from '../../../commons';
+import { useTranslations } from '../../../hooks/Common/useTranslations';
+
+import _TextInput from '../../../commons/Form/TextInput';
+import AccessibilityLabel from '../../../configs/AccessibilityLabel';
+import BottomButtonView from '../../../commons/BottomButtonView';
+import { axiosPost } from '../../../utils/Apis/axios';
+import { API } from '../../../configs';
+import { ToastBottomHelper } from '../../../utils/Utils';
+import Routes from '../../../utils/Route';
+import moment from 'moment';
+
+const SetupScriptNotify = ({ route }) => {
+  const t = useTranslations();
+  const { goBack, navigate } = useNavigation();
+  const { automate = {}, unitId } = route?.params || {};
+  const { id: automateId } = automate;
+  const [notify, setNotify] = useState({ unit: unitId });
+
+  const onChangeTitle = (value) => {
+    setNotify((state) => ({
+      ...state,
+      title: value,
+    }));
+  };
+  const onChangeMessage = (value) => {
+    setNotify((state) => ({
+      ...state,
+      message: value,
+    }));
+  };
+
+  const onNext = useCallback(async () => {
+    const { success } = await axiosPost(
+      API.AUTOMATE.ADD_SCRIPT_NOTIFY(automateId),
+      notify
+    );
+    if (success) {
+      ToastBottomHelper.success(t('text_done'));
+      navigate({
+        name: Routes.ScriptDetail,
+        merge: true,
+        params: { saveAt: moment().valueOf() },
+      });
+    } else {
+      ToastBottomHelper.error(t('text_done'));
+    }
+  }, [automateId, navigate, notify, t]);
+
+  const canSave = useMemo(() => {
+    const { title, message } = notify || {};
+    return !!title && !!message;
+  }, [notify]);
+
+  return (
+    <View style={styles.wrap}>
+      <HeaderCustom isShowClose onClose={goBack} title={t('notification')} />
+      <View style={styles.container}>
+        <_TextInput
+          placeholder={t('title_notification')}
+          onChange={onChangeTitle}
+          textInputStyle={styles.textTitle}
+          value={notify?.title}
+          accessibilityLabel={AccessibilityLabel.AUTOMATE_TITLE_NOTIFY}
+          autoFocus
+        />
+        <_TextInput
+          placeholder={t('message_notification')}
+          onChange={onChangeMessage}
+          textInputStyle={styles.textMessage}
+          value={notify?.message}
+          accessibilityLabel={AccessibilityLabel.AUTOMATE_MESSAGE_NOTIFY}
+          multiline={true}
+          maxLength={255}
+        />
+
+        <BottomButtonView
+          style={styles.bottomButtonView}
+          mainTitle={t('save')}
+          onPressMain={onNext}
+          typeMain={canSave ? 'primary' : 'disabled'}
+        />
+      </View>
+    </View>
+  );
+};
+
+export default SetupScriptNotify;