@eohjsc/react-native-smart-city 0.3.8 → 0.3.9

package/README.md

@@ -1,19 +1,26 @@
 ## react-native-smart-city
 
 ## Getting started
+
 1. Install package dependencies:
-  - Using [Yarn](https://yarnpkg.com/): `yarn add react-native-reanimated@^1.10.1`
+
+- Using [Yarn](https://yarnpkg.com/): `yarn add react-native-reanimated@^1.10.1`
 
 2. Install:
-  - Using [npm](https://www.npmjs.com/#getting-started): `npm install @eohjsc/react-native-smart-city --save`
-  - Using [Yarn](https://yarnpkg.com/): `yarn add @eohjsc/react-native-smart-city`
+
+- Using [npm](https://www.npmjs.com/#getting-started): `npm install @eohjsc/react-native-smart-city --save`
+- Using [Yarn](https://yarnpkg.com/): `yarn add @eohjsc/react-native-smart-city`
 
 3. Compile application using react-native run-android
+
 ### Mostly automatic installation
+
 `$ react-native link @eohjsc/react-native-smart-city`
 
 ## Usage
+
 1. StackNavigator
+
 ```javascript
 import {
   UnitStack,
@@ -30,7 +37,7 @@ import {
 } from '@eohjsc/react-native-smart-city';
 import { createStackNavigator } from '@react-navigation/stack';
 
-// TODO: What to do with the module?   
+// TODO: What to do with the module?
 const Stack = createStackNavigator();
 
 const YourStack = () => {
@@ -84,7 +91,9 @@ const MainTab = () => {
   );
 };
 ```
+
 2. Use components
+
 ```javascript
 import React from 'react';
 import { View } from 'react-native';
@@ -93,13 +102,15 @@ import { MyPinnedSharedUnit, MyUnit } from '@eohjsc/react-native-smart-city';
 const MyScreen = () => {
   return (
     <View>
-        <MyUnit />
-        <MyPinnedSharedUnit />
+      <MyUnit />
+      <MyPinnedSharedUnit />
     </View>
   );
 };
 ```
+
 3. Trigger quick action
+
 ```javascript
 import React from 'react';
 import { View, Button } from 'react-native';
@@ -126,23 +137,33 @@ export const MyFunctionalComponent = () => {
     lg_actions: [],
     name: 'Garage Up',
   };
-  const handleQuickAction = async() => {
+  const handleQuickAction = async () => {
     const result = await sendRemoteCommand(sensor, action); // Action Garage Up
-    if (result){
-      console.log('Successful control')
-    }else {
-      console.log('Control failed')
+    if (result) {
+      console.log('Successful control');
+    } else {
+      console.log('Control failed');
     }
   };
   return (
     <View>
-      <Button onPress={handleQuickAction} title="Example trigger quick action control Garage Up" />
+      <Button
+        onPress={handleQuickAction}
+        title="Example trigger quick action control Garage Up"
+      />
     </View>
   );
 };
 ```
-- sendRemoteCommand user needs to `have permission to control the device`, you pass in the `sensor and action` to it and it will run after calling render.  
-- `sensor` is a device in your Unit and action is the `action` key of the device.. 
+
+- sendRemoteCommand user needs to `have permission to control the device`, you pass in the `sensor and action` to it and it will run after calling render.
+- `sensor` is a device in your Unit and action is the `action` key of the device..
 - You can take out the sensor and action from your Unit when calling the `API.UNIT.UNIT_DETAIL(unitId)` it will return all devices in 1 unit.
-- Or get sensor from `API.SENSOR.DISPLAY(sensor.id)` returns all actions of 1 device.
+- Or get sensor from `API.DEVICE.DISPLAY(sensor.id)` returns all actions of 1 device.
 - Refer YourProjectPath /node_modules/@eohjsc/react-native-smart-city/src/screens/Unit/Detail.js
+
+## Sync file to EoH source
+
+```
+  yarn install && yarn watch
+```

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@eohjsc/react-native-smart-city",
   "title": "React Native Smart Home",
-  "version": "0.3.08",
+  "version": "0.3.09",
   "description": "TODO",
   "main": "index.js",
   "files": [
@@ -18,7 +18,7 @@
     "ios": "react-native run-ios",
     "start": "react-native start",
     "test": "yarn run lint && yarn run jest",
-    "lint": "eslint .  --ext js --ext ts --ext tsx",
+    "lint": "eslint .  --ext js --ext ts --ext tsx --max-warnings 5",
     "lint-fix": "eslint . --fix",
     "type-check": "npx tsc",
     "pod": "cd ios && pod install",
@@ -74,6 +74,7 @@
     "@types/react": "^17.0.0",
     "@types/react-native": "^0.63.43",
     "@types/react-test-renderer": "^17.0.0",
+    "axios-mock-adapter": "^1.21.1",
     "babel-jest": "^26.6.3",
     "detox": "^18.3.1",
     "eslint": "7.14.0",
@@ -99,7 +100,7 @@
     "@ant-design/icons-react-native": "^2.2.1",
     "@ant-design/react-native": "^4.0.5",
     "@babel/helper-environment-visitor": "^7.16.7",
-    "@eohjsc/highcharts": "^1.0.8",
+    "@eohjsc/highcharts": "^1.0.9",
     "@eohjsc/react-native-keyboard-aware-scroll-view": "^0.9.5",
     "@formatjs/intl-getcanonicallocales": "^1.4.5",
     "@formatjs/intl-numberformat": "^5.6.2",
@@ -124,6 +125,7 @@
     "@react-navigation/stack": "^5.7.0",
     "@sentry/react-native": "^1.7.1",
     "@testing-library/react-hooks": "^6.0.0",
+    "apisauce": "^2.1.5",
     "axios": "^0.19.2",
     "dotenv": "^8.2.0",
     "google-libphonenumber": "^3.2.10",
@@ -144,6 +146,8 @@
     "react-hooks-global-state": "^1.0.1",
     "react-i18next": "^11.8.12",
     "react-native-alert-async": "^1.0.5",
+    "react-native-android-keyboard-adjust": "^1.2.0",
+    "react-native-android-location-enabler": "^1.2.2",
     "react-native-android-wifi": "^0.0.41",
     "react-native-appearance": "^0.3.4",
     "react-native-base64": "^0.1.0",
@@ -174,7 +178,7 @@
     "react-native-pager-view": "^5.4.1",
     "react-native-parallax-scroll-view": "^0.21.3",
     "react-native-parsed-text": "^0.0.22",
-    "react-native-permissions": "^2.1.5",
+    "react-native-permissions": "3.0.3",
     "react-native-popover-view": "^4.0.3",
     "react-native-progress": "^5.0.0",
     "react-native-reanimated": "1.10.1",
@@ -189,8 +193,8 @@
     "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-webview": "^10.9.3",
+    "react-native-vlc-media-player": "^1.0.41",
+    "react-native-webview": "11.17.2",
     "react-native-wheel-color-picker": "^1.2.0",
     "react-native-wheel-scrollview-picker": "^1.2.2",
     "react-native-wifi-reborn": "^4.5.0",

package/react-native-smart-city.podspec

@@ -22,6 +22,7 @@ Pod::Spec.new do |s|
   s.requires_arc = true
 
   s.dependency "React"
+  s.dependency "RNPermissions"
   # ...
   # s.dependency "..."
 end

package/src/commons/Action/ItemQuickAction.js

@@ -3,7 +3,7 @@ import { TouchableOpacity, View } from 'react-native';
 import { TESTID } from '../../configs/Constants';
 import { useSCContextSelector } from '../../context';
 import { watchMultiConfigs } from '../../iot/Monitor';
-import { sendRemoteCommand } from '../../iot/RemoteControl';
+import { useRemoteControl } from '../../hooks/IoT';
 import { useConfigGlobalState } from '../../iot/states';
 import IconComponent from '../IconComponent';
 
@@ -13,6 +13,8 @@ const ItemQuickAction = memo(({ sensor, wrapperStyle, setStatus, unit }) => {
   // eslint-disable-next-line no-unused-vars
   const [configValues, _] = useConfigGlobalState('configValues');
 
+  const sendRemoteCommand = useRemoteControl();
+
   const revertActionUpdate = useCallback(
     (value, on_action, on_status, off_action, off_status) => {
       setIsSendingCommand(false);
@@ -43,8 +45,9 @@ const ItemQuickAction = memo(({ sensor, wrapperStyle, setStatus, unit }) => {
   useEffect(() => {
     sensor.quick_action &&
       sensor.quick_action.config_id &&
+      sensor.device_type !== 'GOOGLE_HOME' &&
       watchMultiConfigs([sensor.quick_action.config_id]);
-  }, [sensor.quick_action]);
+  }, [sensor.quick_action, sensor?.device_type]);
 
   useEffect(() => {
     if (!sensor.quick_action) {
@@ -59,7 +62,9 @@ const ItemQuickAction = memo(({ sensor, wrapperStyle, setStatus, unit }) => {
   const userId = useSCContextSelector((state) => state?.auth.account.user.id);
   const onActionPress = useCallback(() => {
     sendRemoteCommand(sensor, action, null, userId);
-    sensor.quick_action && watchMultiConfigs([sensor.quick_action.config_id]);
+    sensor.quick_action &&
+      sensor.device_type !== 'GOOGLE_HOME' &&
+      watchMultiConfigs([sensor.quick_action.config_id]);
     setIsSendingCommand(true);
 
     if (!sensor.quick_action) {
@@ -78,7 +83,14 @@ const ItemQuickAction = memo(({ sensor, wrapperStyle, setStatus, unit }) => {
         statusCallback(action.id === sensor.quick_action.on_action.id);
       }, sensor.quick_action.interval);
     }
-  }, [sensor, action, userId, revertActionUpdate, statusCallback]);
+  }, [
+    sensor,
+    action,
+    userId,
+    revertActionUpdate,
+    statusCallback,
+    sendRemoteCommand,
+  ]);
 
   if (!action) {
     return <View />;

package/src/commons/Action/__test__/ItemQuickAction.test.js

@@ -5,7 +5,6 @@ import ItemQuickAction from '../ItemQuickAction';
 import { Colors } from '../../../configs';
 import { TESTID } from '../../../configs/Constants';
 import { factory } from 'factory-girl';
-import { sendRemoteCommand } from '../../../iot/RemoteControl';
 
 class Sensor {}
 
@@ -21,7 +20,13 @@ jest.mock('react', () => {
 
 useState.mockImplementation((init) => [init, mockSetState]);
 
-jest.mock('../../../iot/RemoteControl');
+const mockSendRemoteControl = jest.fn();
+jest.mock('../../../hooks/IoT', () => {
+  return {
+    ...jest.requireActual('../../../hooks/IoT'),
+    useRemoteControl: () => mockSendRemoteControl,
+  };
+});
 
 jest.mock('../../../iot/states', () => ({
   useConfigGlobalState: () => [{}, null],
@@ -83,9 +88,9 @@ describe('Test ItemQuickAction', () => {
   };
 
   test('render with no action', async () => {
-    const sensor = await factory.build('Sensor');
+    const newSensor = await factory.build('Sensor');
     act(() => {
-      tree = create(<ItemQuickAction sensor={sensor} />);
+      tree = create(<ItemQuickAction sensor={newSensor} />);
     });
     const instance = tree.root;
     const buttonOnActionPress = instance.findAll(
@@ -121,7 +126,7 @@ describe('Test ItemQuickAction', () => {
     act(() => {
       buttonOnActionPress.props.onPress();
     });
-    expect(sendRemoteCommand).toBeCalled();
+    expect(mockSendRemoteControl).toBeCalled();
     expect(mockSetState).toBeCalledTimes(1);
 
     jest.runAllTimers();
@@ -154,7 +159,7 @@ describe('Test ItemQuickAction', () => {
     act(() => {
       buttonOnActionPress.props.onPress();
     });
-    expect(sendRemoteCommand).toBeCalled();
+    expect(mockSendRemoteControl).toBeCalled();
     expect(mockSetState).toBeCalledTimes(1);
 
     jest.runAllTimers();

package/src/commons/ActionGroup/ColorPickerTemplate.js

@@ -1,54 +1,67 @@
-import React, { memo, useCallback, useState, useEffect, useMemo } from 'react';
+import React, { memo, useState, useEffect } from 'react';
 import { View } from 'react-native';
 import styles from './ColorPickerTemplateStyles';
 import ColorPicker from 'react-native-wheel-color-picker';
 import { watchMultiConfigs } from '../../iot/Monitor';
 import { useConfigGlobalState } from '../../iot/states';
 
+let isFirstTime = true;
+
+const WheelColorPicker = ({ valueColor, onChangeColor }) => {
+  return (
+    <ColorPicker
+      style={styles.colorPicker}
+      sliderHidden={true}
+      swatches={false}
+      color={valueColor}
+      onColorChangeComplete={onChangeColor}
+      thumbSize={16}
+    />
+  );
+};
+
 const ColorPickerTemplate = memo(({ actionGroup, doAction, sensor }) => {
   const { configuration } = actionGroup;
   const [valueColorComplete, setValueColorComplete] = useState('');
-  const [isFirstColor, setIsFirstColor] = useState(false);
   const [configValues] = useConfigGlobalState('configValues');
 
-  const onChangeColor = useCallback(
-    (color) => {
-      if (!isFirstColor) {
-        setIsFirstColor(true);
-        return;
-      }
+  const onChangeColor = (color) => {
+    const to = setTimeout(() => {
+      isFirstTime = false;
+      clearTimeout(to);
+    }, 1000);
+
+    !isFirstTime &&
       doAction(
         configuration?.action_color_data,
         JSON.stringify({ value: color })
       );
-    },
-    [configuration?.action_color_data, doAction, isFirstColor]
-  );
-  const valueColor = useMemo(() => {
-    return valueColorComplete || '';
-  }, [valueColorComplete]);
+  };
 
   useEffect(() => {
     const { config } = configuration;
     const configValue = configValues[config];
-    setValueColorComplete(configValue);
-  }, [configuration.config, configValues, configuration]);
+    if (configValue && isFirstTime) {
+      setValueColorComplete(`#${configValue?.toString(16)}`);
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [configValues]);
 
   useEffect(() => {
-    if (sensor?.is_managed_by_backend) {
+    if (sensor?.is_managed_by_backend && sensor.device_type !== 'GOOGLE_HOME') {
       watchMultiConfigs([configuration.config]);
     }
   }, [sensor, configuration.config]);
 
+  useEffect(() => {
+    return () => (isFirstTime = true);
+  }, []);
+
   return (
     <View style={styles.viewPickColor}>
-      <ColorPicker
-        style={styles.colorPicker}
-        sliderHidden={true}
-        swatches={false}
-        color={valueColor}
-        onColorChangeComplete={onChangeColor}
-        thumbSize={16}
+      <WheelColorPicker
+        valueColor={valueColorComplete}
+        onChangeColor={onChangeColor}
       />
     </View>
   );

package/src/commons/ActionGroup/CurtainButtonTemplate.js

@@ -17,6 +17,11 @@ const CurtainButtonTemplate = memo(({ actionGroup, doAction, sensor }) => {
     close_action_data,
     action_off_data,
     action_on_data,
+    is_display_lock,
+    text1,
+    text2,
+    text3,
+    text_door_lock,
   } = configuration || {};
   const [lock, setLock] = useState(false);
 
@@ -52,21 +57,21 @@ const CurtainButtonTemplate = memo(({ actionGroup, doAction, sensor }) => {
       {
         style: styles.buttonActionCurtain,
         icon: Images.buttonLeftCurtain,
-        text: configuration.text1,
+        text: text1,
         onPress: onButtonOpenPress,
         testID: TESTID.BUTTON_TEMPLATE_1,
       },
       {
         style: styles.buttonActionCurtainCenter,
         icon: Images.buttonPauseCurtain,
-        text: configuration.text2,
+        text: text2,
         onPress: onButtonStopPress,
         testID: TESTID.BUTTON_TEMPLATE_2,
       },
       {
         style: styles.buttonActionCurtain,
         icon: Images.buttonRightCurtain,
-        text: configuration.text3,
+        text: text3,
         onPress: onButtonClosePress,
         testID: TESTID.BUTTON_TEMPLATE_3,
       },
@@ -96,7 +101,7 @@ const CurtainButtonTemplate = memo(({ actionGroup, doAction, sensor }) => {
             style={styles.textLockDoor}
             testID={TESTID.TEXT_DOOR_LOOK_ON_OFF}
           >
-            {configuration.text_door_lock}{' '}
+            {text_door_lock}{' '}
           </Text>
         </View>
         <Switch
@@ -115,7 +120,7 @@ const CurtainButtonTemplate = memo(({ actionGroup, doAction, sensor }) => {
         <RenderThreeButtonActions />
       </View>
       <View style={styles.lockSwitch}>
-        {configuration.is_display_lock &&
+        {is_display_lock &&
           itemLock(
             lock ? 'lock' : 'unlock',
             lock ? Colors.Primary : Colors.Gray6

package/src/commons/ActionGroup/OnOffSmartLock/AutoLock/__test__/index.test.js

@@ -1,5 +1,6 @@
 import React from 'react';
 import { act, create } from 'react-test-renderer';
+import { Switch } from 'react-native';
 
 import AutoLock from '../index';
 import { mockSCStore } from '../../../../../context/mockStore';
@@ -38,6 +39,9 @@ describe('Test AutoLock', () => {
     });
 
     const instance = tree.root;
+    const switchs = instance.findByType(Switch);
+    await switchs.props.onValueChange();
+
     const { buttonEnable, buttonInstant, buttonRelockTiming } =
       getElement(instance);
 

package/src/commons/ActionGroup/OnOffSmartLock/PasscodeList/ItemPasscode.js

@@ -19,7 +19,7 @@ const ButtonWrapper = ({ item, textHeadline }) => {
 };
 
 const ItemPasscode = memo(({ route }) => {
-  const { item } = route.params;
+  const { item = {} } = route.params || {};
 
   return (
     <SafeAreaView style={styles.container}>

package/src/commons/ActionGroup/OnOffSmartLock/PasscodeList/__test__/ItemPasscode.test.js

@@ -0,0 +1,24 @@
+import React from 'react';
+import { TouchableOpacity } from 'react-native';
+import { act, create } from 'react-test-renderer';
+import { SCProvider } from '../../../../../context';
+import { mockSCStore } from '../../../../../context/mockStore';
+import ItemPasscode from '../ItemPasscode';
+
+const wrapComponent = (route = {}) => (
+  <SCProvider initState={mockSCStore({})}>
+    <ItemPasscode route={route} />
+  </SCProvider>
+);
+
+describe('Test ItemPasscode', () => {
+  let tree;
+  test('test render without params', async () => {
+    await act(async () => {
+      tree = await create(wrapComponent());
+    });
+    const instance = tree.root;
+    const TouchableOpacities = instance.findAllByType(TouchableOpacity);
+    expect(TouchableOpacities).toHaveLength(2);
+  });
+});

package/src/commons/ActionGroup/OnOffSmartLock/SetupGeneratePasscode/__test__/index.test.js

@@ -40,6 +40,7 @@ describe('Test SetupGeneratePasscode', () => {
     const changeDuration = instance.findAll(
       (item) => item.props.testID === TESTID.GENERATE_PASSCODE_SET_DURATION
     );
+
     return {
       changeName,
       changeTime,
@@ -58,5 +59,18 @@ describe('Test SetupGeneratePasscode', () => {
     expect(changeName[0]).toBeDefined();
     expect(changeTime[0]).toBeDefined();
     expect(changeDuration[0]).toBeDefined();
+
+    await changeDuration[0].props.onPressSetMinute();
+    await changeDuration[0].props.onPressSelectCircle();
+    await changeTime[0].props.onPressSetTime();
+
+    const wheelDateTimePicker = instance.findAll(
+      (item) =>
+        item.props.testID ===
+        `${TESTID.WHEEL_DATE_TIME_PICKER_BUTTON}${TESTID.VIEW_BUTTON_BOTTOM_RIGHT_BUTTON}`
+    );
+    await wheelDateTimePicker[5].props.onClick();
+    await wheelDateTimePicker[11].props.onClick();
+    await wheelDateTimePicker[17].props.onClick();
   });
 });

package/src/commons/ActionGroup/OnOffSmartLock/SetupGeneratePasscode/index.js

@@ -180,6 +180,7 @@ const SetupGeneratePasscode = memo(() => {
         showsVerticalScrollIndicator={false}
         showsHorizontalScrollIndicator={false}
         style={styles.scrollview}
+        scrollIndicatorInsets={{ right: 1 }}
       >
         <View style={styles.wrap}>
           <ButtonWrapper

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

@@ -5,15 +5,20 @@ import React, { memo } from 'react';
 import { TouchableOpacity, View } from 'react-native';
 import { Colors } from '../../../configs';
 import styles from './OnOffButtonTemplateStyle';
+import { TESTID } from '../../../configs/Constants';
 
 const OnOffButtonTemplate = memo(
   ({ isOn, triggerAction, actionGroup, isLight = false }) => {
-    const { configuration } = actionGroup;
+    const { configuration, id } = actionGroup;
 
     return (
       <>
         <View style={styles.barrierControlContainer}>
-          <TouchableOpacity style={styles.bigCircle} onPress={triggerAction}>
+          <TouchableOpacity
+            style={styles.bigCircle}
+            onPress={triggerAction}
+            testID={`${TESTID.ON_OFF_BUTTON}-${id}`}
+          >
             <View style={styles.smallCircle}>
               <Icon
                 name={isOn ? configuration.icon_on : configuration.icon_off}
@@ -25,6 +30,7 @@ const OnOffButtonTemplate = memo(
                   styles.textBig,
                   { color: isOn ? Colors.Gray8 : Colors.Gray6 },
                 ]}
+                testID={`${TESTID.SENSOR_STATUS}-${id}`}
               >
                 {isOn ? configuration.text_on : configuration.text_off}
               </Text>

package/src/commons/ActionGroup/SliderRangeTemplate.js

@@ -33,11 +33,15 @@ const SliderRangeTemplate = memo(({ actionGroup, doAction, sensor }) => {
   useEffect(() => {
     const { config } = configuration;
     const configValue = configValues[config];
-    setValueBrightness(configValue);
+    let valueTemp = configValue;
+    if (configValue > 0) {
+      valueTemp = Math.round((configValue / 254) * 100);
+    }
+    setValueBrightness(valueTemp);
   }, [configuration.config, configValues, configuration]);
 
   useEffect(() => {
-    if (sensor?.is_managed_by_backend) {
+    if (sensor?.is_managed_by_backend && sensor.device_type !== 'GOOGLE_HOME') {
       watchMultiConfigs([configuration.config]);
     }
   }, [sensor, configuration.config]);

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

@@ -1,5 +1,5 @@
 import React, { memo, useCallback } from 'react';
-import { View, ScrollView, Alert } from 'react-native';
+import { View, ScrollView } from 'react-native';
 
 import styles from './SmartTiviActionTemplateStyles';
 import Text from '../../Text';
@@ -22,6 +22,7 @@ import {
   Youtube,
   Netflix,
 } from './component/Icon';
+import { notImplemented } from '../../../utils/Utils';
 
 const SmartTiviActionTemplate = memo(
   ({ actionGroup, doAction, scrollEnabled = true }) => {
@@ -68,7 +69,7 @@ const SmartTiviActionTemplate = memo(
           case SMART_TIVI_BUTTON.HOME_BUTTON:
           case SMART_TIVI_BUTTON.BACK_BUTTON:
           case SMART_TIVI_BUTTON.CHANNEL_BUTTON:
-            return Alert.alert(t('feature_under_development'));
+            return notImplemented(t);
           default:
             return <></>;
         }
@@ -91,7 +92,10 @@ const SmartTiviActionTemplate = memo(
     }, []);
     return (
       <>
-        <ScrollView scrollEnabled={scrollEnabled}>
+        <ScrollView
+          scrollEnabled={scrollEnabled}
+          scrollIndicatorInsets={{ right: 1 }}
+        >
           <View style={styles.wrap}>
             <View style={styles.rowOnOff}>
               <CircleButton