@eohjsc/react-native-smart-city 0.2.79 → 0.2.83

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@eohjsc/react-native-smart-city",
   "title": "React Native Smart Home",
-  "version": "0.2.79",
+  "version": "0.2.83",
   "description": "TODO",
   "main": "index.js",
   "files": [
@@ -97,10 +97,10 @@
   "dependencies": {
     "@ant-design/icons-react-native": "^2.2.1",
     "@ant-design/react-native": "^4.0.5",
+    "@eohjsc/highcharts": "^1.0.3",
     "@formatjs/intl-getcanonicallocales": "^1.4.5",
     "@formatjs/intl-numberformat": "^5.6.2",
     "@formatjs/intl-pluralrules": "^3.4.7",
-    "@highcharts/highcharts-react-native": "https://github.com/hinh-eoh/highcharts",
     "@invertase/react-native-apple-authentication": "^1.1.2",
     "@messageformat/core": "^3.0.0",
     "@react-native-community/async-storage": "^1.12.1",
@@ -161,7 +161,7 @@
     "react-native-image-resizer": "^1.4.5",
     "react-native-input-credit-card": "^0.5.5",
     "react-native-iphone-x-helper": "^1.2.1",
-    "react-native-keyboard-aware-scroll-view": "^0.9.2",
+    "react-native-keyboard-aware-scroll-view": "https://github.com/hinh-eoh/react-native-keyboard-aware-scroll-view.git",
     "react-native-linear-gradient": "^2.5.6",
     "react-native-localize": "^1.4.1",
     "react-native-maps": "0.27.1",
@@ -186,7 +186,7 @@
     "react-native-udp": "^4.1.3",
     "react-native-unimodules": "^0.11.0",
     "react-native-version-check": "^3.4.2",
-    "react-native-vlc-media-player": "^1.0.39",
+    "react-native-vlc-media-player": "https://github.com/razorRun/react-native-vlc-media-player.git",
     "react-native-webview": "^10.9.3",
     "react-native-wheel-scrollview-picker": "^1.2.2",
     "react-native-wifi-reborn": "^4.5.0",

package/src/commons/ActionGroup/CurtainButtonTemplate.js

@@ -6,35 +6,46 @@ import Text from '../Text';
 import { TESTID } from '../../configs/Constants';
 import { Colors, Images } from '../../configs';
 
-const CurtainButtonTemplate = memo(({ actionGroup, doAction }) => {
+const CurtainButtonTemplate = memo(({ actionGroup, doAction, sensor }) => {
   const { configuration } = actionGroup;
+  const {
+    text_open,
+    open_action_data,
+    text_stop,
+    stop_action_data,
+    text_close,
+    close_action_data,
+    action_off_data,
+    action_on_data,
+  } = configuration || {};
   const [lock, setLock] = useState(false);
-  const onButtonOpenPress = useCallback(
-    () => doAction(configuration.open_action_data),
-    [configuration.open_action_data, doAction]
-  );
-  const onButtonStopPress = useCallback(
-    () => doAction(configuration.stop_action_data),
-    [configuration.stop_action_data, doAction]
-  );
-  const onButtonClosePress = useCallback(
-    () => doAction(configuration.close_action_data),
-    [configuration.close_action_data, doAction]
-  );
+
+  const onButtonOpenPress = useCallback(() => {
+    const actionName = `${sensor?.name} ${text_open?.toLowerCase()}`;
+    doAction(open_action_data, null, actionName);
+  }, [open_action_data, text_open, doAction, sensor?.name]);
+
+  const onButtonStopPress = useCallback(() => {
+    const actionName = `${sensor?.name} ${text_stop?.toLowerCase()}`;
+    doAction(stop_action_data, null, actionName);
+  }, [stop_action_data, text_stop, doAction, sensor?.name]);
+
+  const onButtonClosePress = useCallback(() => {
+    const actionName = `${sensor?.name} ${text_close?.toLowerCase()}`;
+    doAction(close_action_data, null, actionName);
+  }, [close_action_data, text_close, doAction, sensor?.name]);
+
   const onChangeSwitch = useCallback(() => {
     if (lock) {
+      const actionName = `${sensor?.name} unlock`;
       setLock(false);
-      doAction(configuration.action_off_data);
+      doAction(action_off_data, null, actionName);
       return;
     }
-    doAction(configuration.action_on_data);
+    const actionName = `${sensor?.name} lock`;
+    doAction(action_on_data, null, actionName);
     setLock(true);
-  }, [
-    configuration.action_off_data,
-    configuration.action_on_data,
-    doAction,
-    lock,
-  ]);
+  }, [action_off_data, action_on_data, doAction, lock, sensor?.name]);
 
   const RenderThreeButtonActions = () => {
     const buttons = [

package/src/commons/ActionGroup/NumberUpDownActionTemplate.js

@@ -38,8 +38,8 @@ const NumberUpDownActionTemplate = ({ actionGroup, doAction, sensor }) => {
   }, [configValues, config, keep_track_config]);
 
   const doActionAndWatchConfig = useCallback(
-    (actionData, actionValue) => {
-      doAction(actionData, actionValue);
+    (actionData, actionValue, actionName) => {
+      doAction(actionData, actionValue, actionName);
       if (!sensor?.is_managed_by_backend) {
         return;
       }
@@ -56,16 +56,18 @@ const NumberUpDownActionTemplate = ({ actionGroup, doAction, sensor }) => {
   );
 
   const doActionUp = useCallback(async () => {
+    const actionName = `${sensor?.name} temp up`;
     const newValue = checkMinMax(value + 1);
-    doActionAndWatchConfig(action_data, newValue);
+    doActionAndWatchConfig(action_data, newValue, actionName);
     setValue(newValue);
-  }, [checkMinMax, value, doActionAndWatchConfig, action_data]);
+  }, [sensor?.name, checkMinMax, value, doActionAndWatchConfig, action_data]);
 
   const doActionDown = useCallback(async () => {
+    const actionName = `${sensor?.name} temp down`;
     const newValue = checkMinMax(value - 1);
-    doActionAndWatchConfig(action_data, newValue);
+    doActionAndWatchConfig(action_data, newValue, actionName);
     setValue(newValue);
-  }, [checkMinMax, value, doActionAndWatchConfig, action_data]);
+  }, [sensor?.name, checkMinMax, value, doActionAndWatchConfig, action_data]);
 
   const checkMinMax = useCallback(
     (tempValue) => {

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

@@ -34,22 +34,30 @@ const OnOffTemplate = memo(({ actionGroup, doAction, sensor }) => {
     }
     if (action_on_data && action_off_data) {
       if (isOn) {
-        doAction(action_off_data);
+        const actionName = `${
+          sensor?.name
+        } ${actionGroup?.title?.toLowerCase()} off`;
+        doAction(action_off_data, null, actionName);
       } else {
-        doAction(action_on_data);
+        const actionName = `${
+          sensor?.name
+        } ${actionGroup?.title?.toLowerCase()} on`;
+        doAction(action_on_data, null, actionName);
       }
     }
     if (sensor?.is_managed_by_backend) {
       configuration.config && watchMultiConfigs([configuration.config]);
     }
   }, [
+    actionGroup?.title,
     action_data,
     action_off_data,
     action_on_data,
     configuration.config,
     doAction,
     isOn,
-    sensor,
+    sensor?.is_managed_by_backend,
+    sensor?.name,
   ]);
 
   useEffect(() => {

package/src/commons/ActionGroup/OneBigButtonTemplate.js

@@ -1,4 +1,4 @@
-import React, { memo } from 'react';
+import React, { memo, useCallback } from 'react';
 import { TouchableOpacity, View } from 'react-native';
 import { Icon } from '@ant-design/react-native';
 import Text from '../Text';
@@ -6,19 +6,22 @@ import Text from '../Text';
 import { Colors } from '../../configs';
 import styles from './OneBigButtonTemplateStyle';
 
-const OneBigButtonTemplate = memo(({ actionGroup, doAction }) => {
+const OneBigButtonTemplate = memo(({ actionGroup, doAction, sensor }) => {
   const { configuration } = actionGroup;
+  const { text, action_data } = configuration || {};
+
+  const onPressDoAction = useCallback(() => {
+    const actionName = `${sensor?.name} ${text?.toLowerCase()}`;
+    doAction(action_data, null, actionName);
+  }, [action_data, text, doAction, sensor?.name]);
 
   return (
     <>
       <View style={styles.barrierControlContainer}>
-        <TouchableOpacity
-          style={styles.bigCircle}
-          onPress={() => doAction(configuration.action_data)}
-        >
+        <TouchableOpacity style={styles.bigCircle} onPress={onPressDoAction}>
           <View style={styles.smallCircle}>
             <Icon name={configuration.icon} size={44} color={Colors.Green7} />
-            <Text style={styles.textBig}>{configuration.text}</Text>
+            <Text style={styles.textBig}>{text}</Text>
           </View>
         </TouchableOpacity>
       </View>

package/src/commons/ActionGroup/OptionsDropdownActionTemplate.js

@@ -56,7 +56,8 @@ const OptionsDropdownActionTemplate = ({ actionGroup, doAction, sensor }) => {
   const onDone = useCallback(() => {
     const newOption = options[selectedIndex];
     const value = getOptionValue(newOption);
-    doAction(action_data, value);
+    const actionName = `${sensor?.name} ${title?.toLowerCase()} ${value}`;
+    doAction(action_data, value, actionName);
     if (sensor?.is_managed_by_backend) {
       configuration.config && watchMultiConfigs([configuration.config]);
     }
@@ -68,7 +69,9 @@ const OptionsDropdownActionTemplate = ({ actionGroup, doAction, sensor }) => {
     hideAlertAction,
     options,
     selectedIndex,
-    sensor.is_managed_by_backend,
+    sensor?.is_managed_by_backend,
+    sensor?.name,
+    title,
   ]);
 
   const iconKit = !!icon_kit_data && icon_kit_data.icon;

package/src/commons/ActionGroup/StatesGridActionTemplate.js

@@ -20,7 +20,7 @@ const buttonStyle = {
   },
 };
 
-const GridItem = ({ item, index, length, doAction, sensor }) => {
+const GridItem = ({ item, index, length, doAction, sensor, title }) => {
   const isFirst = index === 0;
   const isLast = index === length - 1;
   const isNextLine = index % 4 === 0;
@@ -49,12 +49,15 @@ const GridItem = ({ item, index, length, doAction, sensor }) => {
 
   const doActionAndWatchConfig = useCallback(
     (actionData) => {
-      doAction(actionData);
+      const actionName = `${
+        sensor?.name
+      } ${title?.toLowerCase()} ${text?.toLowerCase()}`;
+      doAction(actionData, null, actionName);
       if (sensor?.is_managed_by_backend) {
         config && watchMultiConfigs([config]);
       }
     },
-    [config, doAction, sensor.is_managed_by_backend]
+    [config, doAction, sensor?.is_managed_by_backend, sensor?.name, text, title]
   );
 
   const iconKit = !!icon_kit_data && icon_kit_data.icon;
@@ -121,6 +124,7 @@ const StatesGridActionTemplate = ({ actionGroup, doAction, sensor }) => {
               length={options.length}
               doAction={doAction}
               sensor={sensor}
+              title={title}
             />
           ))}
         </View>

package/src/commons/ActionGroup/ThreeButtonTemplate.js

@@ -8,9 +8,19 @@ import { TESTID } from '../../configs/Constants';
 import { Colors } from '../../configs';
 import { Card } from '../../commons/CardShadow';
 
-const ThreeButtonTemplate = memo(({ actionGroup, doAction }) => {
+const ThreeButtonTemplate = memo(({ actionGroup, doAction, sensor }) => {
   const t = useTranslations();
   const { configuration } = actionGroup;
+  const {
+    text1,
+    action1_data,
+    text2,
+    action2_data,
+    text3,
+    action3_data,
+    action_off_data,
+    action_on_data,
+  } = configuration;
   const [lock, setLock] = useState(false);
   const iconCustom = (icon) => {
     return icon === 'stop' ? (
@@ -19,32 +29,31 @@ const ThreeButtonTemplate = memo(({ actionGroup, doAction }) => {
       <Icon name={icon} size={30} color={Colors.Primary} />
     );
   };
-  const onButton1Press = useCallback(
-    () => doAction(configuration.action1_data),
-    [configuration.action1_data, doAction]
-  );
-  const onButton2Press = useCallback(
-    () => doAction(configuration.action2_data),
-    [configuration.action2_data, doAction]
-  );
-  const onButton3Press = useCallback(
-    () => doAction(configuration.action3_data),
-    [configuration.action3_data, doAction]
-  );
+  const onButton1Press = useCallback(() => {
+    const actionName = `${sensor?.name} ${text1?.toLowerCase()}`;
+    doAction(action1_data, null, actionName);
+  }, [action1_data, text1, doAction, sensor?.name]);
+
+  const onButton2Press = useCallback(() => {
+    const actionName = `${sensor?.name} ${text2?.toLowerCase()}`;
+    doAction(action2_data, null, actionName);
+  }, [action2_data, text2, doAction, sensor?.name]);
+
+  const onButton3Press = useCallback(() => {
+    const actionName = `${sensor?.name} ${text3?.toLowerCase()}`;
+    doAction(action3_data, null, actionName);
+  }, [action3_data, text3, doAction, sensor?.name]);
+
   const onChangeSwitch = useCallback(() => {
     if (lock) {
       setLock(false);
-      doAction(configuration.action_off_data);
+      doAction(action_off_data);
       return;
     }
-    doAction(configuration.action_on_data);
+    doAction(action_on_data);
     setLock(true);
-  }, [
-    configuration.action_off_data,
-    configuration.action_on_data,
-    doAction,
-    lock,
-  ]);
+  }, [action_off_data, action_on_data, doAction, lock]);
+
   const itemLock = (icon, color) => {
     return (
       <>
@@ -84,7 +93,7 @@ const ThreeButtonTemplate = memo(({ actionGroup, doAction }) => {
                 color={Colors.Primary}
               />
             </View>
-            <Text style={styles.text}>{configuration.text1}</Text>
+            <Text style={styles.text}>{text1}</Text>
           </TouchableOpacity>
 
           <TouchableOpacity
@@ -96,7 +105,7 @@ const ThreeButtonTemplate = memo(({ actionGroup, doAction }) => {
             <View style={styles.imageButton}>
               {iconCustom(configuration.icon2)}
             </View>
-            <Text style={styles.text}>{configuration.text2}</Text>
+            <Text style={styles.text}>{text2}</Text>
           </TouchableOpacity>
 
           <TouchableOpacity
@@ -112,7 +121,7 @@ const ThreeButtonTemplate = memo(({ actionGroup, doAction }) => {
                 color={Colors.Primary}
               />
             </View>
-            <Text style={styles.text}>{configuration.text3}</Text>
+            <Text style={styles.text}>{text3}</Text>
           </TouchableOpacity>
         </View>
         <View style={styles.lockSwitch}>

package/src/commons/ActionGroup/__test__/OnOffTemplate.test.js

@@ -146,7 +146,7 @@ describe('Test OnOffTemplate', () => {
         <OnOffTemplate
           actionGroup={actionGroup}
           doAction={mockDoAction}
-          sensor={{}}
+          sensor={{ name: 'Sensor name' }}
         />
       );
     });
@@ -157,7 +157,11 @@ describe('Test OnOffTemplate', () => {
     await act(async () => {
       await template.props.triggerAction();
     });
-    expect(mockDoAction).toHaveBeenCalledWith(action_off_data);
+    expect(mockDoAction).toHaveBeenCalledWith(
+      action_off_data,
+      null,
+      'Sensor name turn on / off off'
+    );
     expect(watchMultiConfigs).toBeCalledTimes(0);
   });
 
@@ -169,7 +173,7 @@ describe('Test OnOffTemplate', () => {
         <OnOffTemplate
           actionGroup={actionGroup}
           doAction={mockDoAction}
-          sensor={{}}
+          sensor={{ name: 'Sensor name' }}
         />
       );
     });
@@ -180,7 +184,11 @@ describe('Test OnOffTemplate', () => {
     await act(async () => {
       await template.props.triggerAction();
     });
-    expect(mockDoAction).toHaveBeenCalledWith(action_on_data);
+    expect(mockDoAction).toHaveBeenCalledWith(
+      action_on_data,
+      null,
+      'Sensor name turn on / off on'
+    );
   });
 
   test('template OnOffSimpleActionTemplate doAction with is_on_value and is_managed_by_backend', async () => {
@@ -190,7 +198,7 @@ describe('Test OnOffTemplate', () => {
         <OnOffTemplate
           actionGroup={actionGroup}
           doAction={mockDoAction}
-          sensor={{ is_managed_by_backend: true }}
+          sensor={{ name: 'Sensor name', is_managed_by_backend: true }}
         />
       );
     });
@@ -201,7 +209,11 @@ describe('Test OnOffTemplate', () => {
     await act(async () => {
       await template.props.triggerAction();
     });
-    expect(mockDoAction).toHaveBeenCalledWith(action_off_data);
+    expect(mockDoAction).toHaveBeenCalledWith(
+      action_off_data,
+      null,
+      'Sensor name turn on / off off'
+    );
     expect(watchMultiConfigs).toBeCalledTimes(2);
   });
 

package/src/commons/ActionGroup/__test__/OneBigButtonTemplate.test.js

@@ -23,6 +23,9 @@ describe('Test OneBigButtonTemplate', () => {
       text: 'UP',
     },
   };
+  const sensor = {
+    name: 'Sensor name',
+  };
   let wrapper;
 
   test('render OneBigButtonTemplate', () => {
@@ -32,6 +35,7 @@ describe('Test OneBigButtonTemplate', () => {
         <OneBigButtonTemplate
           actionGroup={actionGroup}
           doAction={mockDoAction}
+          sensor={sensor}
         />
       );
     });
@@ -45,6 +49,10 @@ describe('Test OneBigButtonTemplate', () => {
     });
 
     expect(mockDoAction).toHaveBeenCalledTimes(1);
-    expect(mockDoAction).toHaveBeenCalledWith(action_data);
+    expect(mockDoAction).toHaveBeenCalledWith(
+      action_data,
+      null,
+      'Sensor name up'
+    );
   });
 });

package/src/commons/ActionGroup/__test__/OptionsDropdownTemplate.test.js

@@ -10,16 +10,12 @@ import { getTranslate } from '../../../utils/I18n';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
 
-const wrapComponent = (
-  actionGroup,
-  mockDoAction,
-  is_managed_by_backend = false
-) => (
+const wrapComponent = (actionGroup, mockDoAction, sensor) => (
   <SCProvider initState={mockSCStore({})}>
     <OptionsDropdownActionTemplate
       actionGroup={actionGroup}
       doAction={mockDoAction}
-      sensor={{ is_managed_by_backend }}
+      sensor={sensor}
     />
   </SCProvider>
 );
@@ -43,6 +39,7 @@ describe('Test OptionsDropdownActionTemplate', () => {
   };
 
   let actionGroup;
+  let sensor;
   let wrapper;
 
   beforeEach(() => {
@@ -68,12 +65,17 @@ describe('Test OptionsDropdownActionTemplate', () => {
         icon: 'slack',
       },
     };
+    sensor = {
+      name: 'Sensor name',
+      is_managed_by_backend: false,
+    };
   });
 
   test('render template', async () => {
     const mockDoAction = jest.fn();
+    sensor.is_managed_by_backend = true;
     await act(async () => {
-      wrapper = await create(wrapComponent(actionGroup, mockDoAction, true));
+      wrapper = await create(wrapComponent(actionGroup, mockDoAction, sensor));
     });
     const instance = wrapper.root;
 
@@ -88,9 +90,10 @@ describe('Test OptionsDropdownActionTemplate', () => {
 
   test('render template without selectedOption match, get first one', async () => {
     actionGroup.configuration.options[1].value_int = 3;
+    sensor.is_managed_by_backend = true;
     const mockDoAction = jest.fn();
     await act(async () => {
-      wrapper = await create(wrapComponent(actionGroup, mockDoAction, true));
+      wrapper = await create(wrapComponent(actionGroup, mockDoAction, sensor));
     });
     const instance = wrapper.root;
 
@@ -102,7 +105,7 @@ describe('Test OptionsDropdownActionTemplate', () => {
   const assertUpdateSelectedOption = async (is_managed_by_backend) => {
     const mockDoAction = jest.fn();
     await act(async () => {
-      wrapper = await create(wrapComponent(actionGroup, mockDoAction));
+      wrapper = await create(wrapComponent(actionGroup, mockDoAction, sensor));
     });
     const instance = wrapper.root;
 
@@ -147,7 +150,11 @@ describe('Test OptionsDropdownActionTemplate', () => {
     });
     expect(alertAction.props.visible).toBeFalsy();
 
-    expect(mockDoAction).toHaveBeenCalledWith(action_data, 1);
+    expect(mockDoAction).toHaveBeenCalledWith(
+      action_data,
+      1,
+      'Sensor name fan speed 1'
+    );
     is_managed_by_backend
       ? expect(watchMultiConfigs).not.toBeCalled()
       : expect(watchMultiConfigs).not.toBeCalled();
@@ -167,7 +174,7 @@ describe('Test OptionsDropdownActionTemplate', () => {
     actionGroup.configuration.options[0].value_text = 'level-1';
     const mockDoAction = jest.fn();
     await act(async () => {
-      wrapper = await create(wrapComponent(actionGroup, mockDoAction));
+      wrapper = await create(wrapComponent(actionGroup, mockDoAction, sensor));
     });
     const instance = wrapper.root;
 
@@ -212,17 +219,22 @@ describe('Test OptionsDropdownActionTemplate', () => {
     });
     expect(alertAction.props.visible).toBeFalsy();
 
-    expect(mockDoAction).toHaveBeenCalledWith(action_data, 'level-1'); // doAction with text instead of int
+    expect(mockDoAction).toHaveBeenCalledWith(
+      action_data,
+      'level-1',
+      'Sensor name fan speed level-1'
+    ); // doAction with text instead of int
 
     expect(texts[1].props.children).toEqual('Level2');
   });
 
   test('render template without read config', async () => {
     delete actionGroup.configuration.config;
+    sensor.is_managed_by_backend = true;
 
     const mockDoAction = jest.fn();
     await act(async () => {
-      wrapper = await create(wrapComponent(actionGroup, mockDoAction, true));
+      wrapper = await create(wrapComponent(actionGroup, mockDoAction, sensor));
     });
     const instance = wrapper.root;
     const textDisplaySelected = instance.find(