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

package/package.json

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

package/src/commons/MediaPlayerDetail/index.js

@@ -96,6 +96,9 @@ const MediaPlayerDetail = ({
   }, [amount]);
 
   const renderCamera = useMemo(() => {
+    if (!uri) {
+      return null;
+    }
     return (
       <VLCPlayer
         autoAspectRatio={true}

package/src/commons/UnitSummary/ConfigHistoryChart/__test__/ConfigHistoryChart.test.js

@@ -4,8 +4,13 @@ import ConfigHistoryChart from '../';
 import { SCProvider } from '../../../../context';
 import { mockSCStore } from '../../../../context/mockStore';
 import HistoryChart from '../../../../commons/Device/HistoryChart';
+import MockAdapter from 'axios-mock-adapter';
+import { API } from '../../../../configs';
+import api from '../../../../utils/Apis/axios';
 
-const wrapComponent = (configs = []) => (
+const mock = new MockAdapter(api.axiosInstance);
+
+const wrapComponent = (configs = [1]) => (
   <SCProvider initState={mockSCStore({})}>
     <ConfigHistoryChart configs={configs} />
   </SCProvider>
@@ -16,6 +21,28 @@ describe('Test HistoryChart', () => {
 
   beforeAll(() => {
     jest.useFakeTimers();
+    mock.onGet(API.CONFIG.DISPLAY_HISTORY()).reply(200, [
+      {
+        config: 1,
+        data: [
+          {
+            url: 'https://valuelog-history/test',
+          },
+          {
+            x: '2022-06-16T00:00:00Z',
+            y: 5.0,
+          },
+        ],
+      },
+    ]);
+    mock.onGet('https://valuelog-history/test').reply(200, [
+      {
+        config_id: 1,
+        start_time: '2022-07-04T02:00:06.151765Z',
+        value_log: 0.0,
+        converted_value_log: 0.0,
+      },
+    ]);
   });
 
   it('Test render', async () => {

package/src/commons/UnitSummary/ConfigHistoryChart.js

@@ -11,45 +11,78 @@ export const dateTimeType = {
   dateTime: 'datetime',
 };
 
-export const updateConfigChart = (
-  success,
-  data,
-  configuration,
-  setChartData
-) => {
-  if (success) {
-    for (let i = 0; i < data.length; i++) {
-      for (let j = 0; j < data[i].data.length; j++) {
-        data[i].data[j].x = moment(data[i].data[j].x).toDate();
-      }
-    }
-    setChartData(
-      configuration.map((config) => {
-        config.data = data.find((k) => k.config === config.id).data;
-        return config;
-      })
-    );
-  }
-};
-
 const ConfigHistoryChart = memo(({ configs }) => {
   const [chartData, setChartData] = useState(configs);
   const [startDate, setStartDate] = useState(moment().subtract(1, 'days'));
   const [endDate, setEndDate] = useState(moment());
 
   useEffect(() => {
+    const fetchDataS3 = (url) => {
+      return (
+        axiosGet(url, {
+          transformRequest: (rq, headers) => {
+            delete headers.Authorization;
+            return rq;
+          },
+        })
+          // eslint-disable-next-line promise/prefer-await-to-then
+          .then((response) => {
+            return response.data;
+          })
+          // eslint-disable-next-line promise/prefer-await-to-callbacks
+          .catch((error) => {})
+      );
+    };
+
     const fetchData = async () => {
       let params = new URLSearchParams();
       let configuration = configs.filter((item) => item.id);
       configuration.map((item) => {
         params.append('config', item.id);
       });
-      params.append('date_from', startDate.valueOf() / 1000);
-      params.append('date_to', endDate.valueOf() / 1000);
+      params.append('date_from', startDate.unix());
+      params.append('date_to', endDate.unix());
+
       const { success, data } = await axiosGet(API.CONFIG.DISPLAY_HISTORY(), {
         params,
       });
-      updateConfigChart(success, data, configuration, setChartData);
+      if (success) {
+        let urls = [];
+        data.forEach((config) => {
+          config.data.forEach((value_log) => {
+            if (value_log.url) {
+              urls.push(value_log.url);
+            } else {
+              value_log.x = moment(value_log.x).toDate();
+            }
+          });
+        });
+
+        // eslint-disable-next-line promise/prefer-await-to-then
+        Promise.all(urls.map(fetchDataS3)).then((result) => {
+          let s3_data = [].concat.apply(
+            [],
+            result.filter((r) => r.length > 0)
+          );
+          s3_data.forEach((value_log) => {
+            value_log.x = moment(value_log.start_time).toDate();
+            value_log.y = value_log.converted_value_log;
+          });
+          setChartData(
+            configuration.map((config) => {
+              let s3_config_data = [].concat.apply(
+                [],
+                s3_data.filter((x) => x.config_id === config.id)
+              );
+              let config_data = data.find((k) => k.config === config.id).data;
+              config_data = config_data.filter((k) => !('url' in k));
+              config.data = [...s3_config_data, ...config_data];
+              config.data = config.data.sort((a, b) => a.x > b.x);
+              return config;
+            })
+          );
+        });
+      }
     };
     fetchData();
     // eslint-disable-next-line react-hooks/exhaustive-deps

package/src/configs/API.js

@@ -77,7 +77,7 @@ const API = {
     ACCESS: (id) => `/property_manager/shared_sensors/${id}/access/`,
   },
   CONFIG: {
-    DISPLAY_HISTORY: () => '/property_manager/configs/display_history/',
+    DISPLAY_HISTORY: () => '/property_manager/configs/display_history_v2/',
   },
   AUTOMATE: {
     ACTION_ONE_TAP: (id) => `/property_manager/automate/${id}/action_one_tap/`,

package/src/configs/Constants.js

@@ -60,6 +60,9 @@ export const DEEP_LINK = {
   NOTIFICATION_SCREEN: 'app://eoh/notifications',
 };
 
+const URL_STREAM_CAMERA_DEMO =
+  'http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4';
+
 export const Constants = {
   paddingTop: getStatusBarHeight(),
   width: Dimensions.get('window').width,
@@ -69,7 +72,7 @@ export const Constants = {
   FONT_PREFIX,
   isIphoneX,
   DEEP_LINK,
-  URL_STREAM_BALCONY_CAMERA,
+  URL_STREAM_CAMERA_DEMO,
 };
 
 export const DEVICE_TYPE = {
@@ -144,6 +147,25 @@ export const CONDITION_TYPES = {
   IS_ABOVE: 'IS_ABOVE',
 };
 
+export const STATE_VALUE_SENSOR_TYPES = [
+  {
+    type: 'smoke',
+    stateValue: ['not_detected', 'detected'],
+  },
+  {
+    type: 'fire',
+    stateValue: ['not_detected', 'detected'],
+  },
+  {
+    type: 'sos',
+    stateValue: ['not_activated', 'activated'],
+  },
+  {
+    type: 'filter_water',
+    stateValue: ['not_detected', 'detected'],
+  },
+];
+
 export const AUTOMATES = {
   one_tap: {
     value: AUTOMATE_TYPE.ONE_TAP,
@@ -830,6 +852,3 @@ export const PROBLEM_CODE = {
   UNKNOWN_ERROR: 'UNKNOWN_ERROR',
   CANCEL_ERROR: 'CANCEL_ERROR',
 };
-
-const URL_STREAM_BALCONY_CAMERA =
-  'rtsp://admin:Eoh@2020@101.99.33.220:30554/main';

package/src/context/actionType.ts

@@ -80,6 +80,7 @@ export type AppType = {
 
 export type IoTType = {
   googlehome: {
+    isFirstTimeConnect: boolean;
     isConnecting: boolean;
     connections: {};
   };

package/src/context/mockStore.ts

@@ -32,6 +32,7 @@ export const mockDataStore: ContextData = {
     starredScriptIds: [],
   },
   iot: {
+    isFirstTimeConnect: true,
     isConnecting: false,
     googlehome: {},
   },

package/src/context/reducer.ts

@@ -60,6 +60,8 @@ export const initialState = {
   },
   iot: {
     googlehome: {
+      isFirstTimeConnect: true,
+      isConnecting: false,
       connections: {},
     },
   },
@@ -256,6 +258,7 @@ export const reducer = (currentState: ContextData, action: Action) => {
           ...currentState.iot,
           googlehome: {
             ...currentState.iot.googlehome,
+            isFirstTimeConnect: false,
             isConnecting: false,
             connections: payload,
           },
@@ -268,6 +271,7 @@ export const reducer = (currentState: ContextData, action: Action) => {
           ...currentState.iot,
           googlehome: {
             ...currentState.iot.googlehome,
+            isFirstTimeConnect: false,
             isConnecting: false,
             connections: {
               ...currentState.iot.googlehome.connections,
@@ -283,7 +287,9 @@ export const reducer = (currentState: ContextData, action: Action) => {
           ...currentState.iot,
           googlehome: {
             ...currentState.iot.googlehome,
-            isConnecting: true,
+            isConnecting: currentState.iot.googlehome.isFirstTimeConnect
+              ? true
+              : false,
           },
         },
       };

package/src/hooks/useReceiveNotifications.js

@@ -1,7 +1,7 @@
 import { useEffect, useState, useCallback } from 'react';
 import OneSignal from 'react-native-onesignal';
 
-const useReceiveNotifications = () => {
+const useReceiveNotifications = (callBack) => {
   const [dataNofitication, setDataNofitication] = useState(null);
 
   const onReceived = useCallback((data) => {
@@ -15,9 +15,10 @@ const useReceiveNotifications = () => {
         let notif = notifReceivedEvent.getNotification();
         setTimeout(() => notifReceivedEvent.complete(notif), 0);
         onReceived(notif);
+        callBack && callBack();
       }
     );
-  }, [onReceived]);
+  }, [callBack, onReceived]);
 
   return { dataNofitication };
 };

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

@@ -0,0 +1,265 @@
+import React from 'react';
+import { Alert } from 'react-native';
+import { act, create } from 'react-test-renderer';
+import MockAdapter from 'axios-mock-adapter';
+import RNP from 'react-native-permissions';
+import RNAndroidLocationEnabler from 'react-native-android-location-enabler';
+
+import { SCProvider } from '../../../context';
+import { mockSCStore } from '../../../context/mockStore';
+import AddLocationMaps from '../index';
+import { API } from '../../../configs';
+import { TESTID } from '../../../configs/Constants';
+import api from '../../../utils/Apis/axios';
+import {
+  GEOLOCATION_ERROR,
+  OpenSetting,
+} from '../../../utils/Permission/common';
+import { RESULTS } from 'react-native-permissions';
+
+const wrapComponent = (route) => (
+  <SCProvider initState={mockSCStore({})}>
+    <AddLocationMaps route={route} />
+  </SCProvider>
+);
+
+const mock = new MockAdapter(api.axiosInstance);
+
+const mockNavigate = jest.fn();
+const mockGoBack = jest.fn();
+jest.mock('@react-navigation/native', () => {
+  return {
+    ...jest.requireActual('@react-navigation/native'),
+    useNavigation: () => ({
+      navigate: mockNavigate,
+      goBack: mockGoBack,
+    }),
+  };
+});
+
+jest.mock('react', () => {
+  return {
+    ...jest.requireActual('react'),
+    memo: (x) => x,
+  };
+});
+
+jest.mock('react-native-maps', () => {
+  const { forwardRef } = require('react');
+  const { View } = require('react-native');
+  const MockMapView = forwardRef((props, ref) => (
+    <View refs={ref}>{props.children}</View>
+  ));
+  const MockMarker = (props) => <View>{props.children}</View>;
+  const MockCircle = (props) => <View>{props.children}</View>;
+  return {
+    __esModule: true,
+    default: MockMapView,
+    Marker: MockMarker,
+    Circle: MockCircle,
+    PROVIDER_GOOGLE: 'google',
+  };
+});
+
+jest.mock('react-native-android-location-enabler', () => {
+  return {
+    ...jest.requireActual('react-native-android-location-enabler'),
+    promptForEnableLocationIfNeeded: jest.fn(),
+  };
+});
+
+jest.mock('../../../utils/Permission/common');
+
+const position = {
+  coords: {
+    latitude: 100,
+    longitude: 100,
+  },
+};
+const mockGeolocation = {
+  getCurrentPosition: (onSuccess, onError, options) => {
+    onSuccess(position);
+  },
+};
+global.navigator.geolocation = mockGeolocation;
+
+jest.mock('react-native-permissions', () => {
+  return require('react-native-permissions/mock');
+});
+
+describe('Test SelectAddress', () => {
+  let tree, route, Platform;
+  const mockUpdateLocation = jest.fn();
+
+  beforeAll(() => {
+    Platform = require('react-native').Platform;
+    RNAndroidLocationEnabler.promptForEnableLocationIfNeeded.mockClear();
+    RNP.check.mockClear();
+    route = {
+      params: {
+        updateLocation: mockUpdateLocation,
+      },
+    };
+  });
+
+  test('test get current location success', async () => {
+    await act(async () => {
+      tree = await create(wrapComponent(route));
+    });
+    const instance = tree.root;
+    const button = instance.find(
+      (el) => el.props.testID === TESTID.BUTTON_YOUR_LOCATION
+    );
+
+    const response = {
+      status: 200,
+      data: {
+        results: [
+          {
+            formatted_address: 'address',
+            geometry: {
+              location: {
+                lat: 10,
+                lng: 10,
+              },
+            },
+          },
+        ],
+      },
+    };
+    mock
+      .onGet(API.EXTERNAL.GOOGLE_MAP.GET_LOCATION_FROM_LAT_LNG)
+      .reply(200, response.data);
+    await act(async () => {
+      await button.props.onPress();
+    });
+  });
+
+  test('test get current location failed permission denied', async () => {
+    await act(async () => {
+      tree = await create(wrapComponent(route));
+    });
+    const instance = tree.root;
+    const button = instance.find(
+      (el) => el.props.testID === TESTID.BUTTON_YOUR_LOCATION
+    );
+
+    global.navigator.geolocation = {
+      getCurrentPosition: (onSuccess, onError, options) => {
+        onError({ code: GEOLOCATION_ERROR.PERMISSION_DENIED });
+      },
+    };
+    RNP.check.mockImplementationOnce(() => RESULTS.BLOCKED);
+    OpenSetting.mockImplementationOnce(() => {});
+
+    await act(async () => {
+      await button.props.onPress();
+    });
+    OpenSetting.mockClear();
+  });
+
+  test('test get current location failed location not enabled android', async () => {
+    Platform.OS = 'android';
+    await act(async () => {
+      tree = await create(wrapComponent(route));
+    });
+    const instance = tree.root;
+    const button = instance.find(
+      (el) => el.props.testID === TESTID.BUTTON_YOUR_LOCATION
+    );
+
+    global.navigator.geolocation = {
+      getCurrentPosition: (onSuccess, onError, options) => {
+        onError({ code: GEOLOCATION_ERROR.POSITION_UNAVAILABLE });
+      },
+    };
+
+    // cancel
+    RNAndroidLocationEnabler.promptForEnableLocationIfNeeded.mockImplementationOnce(
+      async () => {
+        throw new Error();
+      }
+    );
+    await act(async () => {
+      await button.props.onPress();
+    });
+    expect(
+      RNAndroidLocationEnabler.promptForEnableLocationIfNeeded
+    ).toBeCalled();
+
+    RNAndroidLocationEnabler.promptForEnableLocationIfNeeded.mockClear();
+
+    // enabled
+    RNAndroidLocationEnabler.promptForEnableLocationIfNeeded.mockImplementationOnce(
+      async () => true
+    );
+    await act(async () => {
+      await button.props.onPress();
+    });
+    expect(
+      RNAndroidLocationEnabler.promptForEnableLocationIfNeeded
+    ).toBeCalled();
+  });
+
+  test('test get current location failed location not enabled ios', async () => {
+    Platform.OS = 'ios';
+    jest.spyOn(Alert, 'alert');
+
+    await act(async () => {
+      tree = await create(wrapComponent(route));
+    });
+    const instance = tree.root;
+    const button = instance.find(
+      (el) => el.props.testID === TESTID.BUTTON_YOUR_LOCATION
+    );
+
+    global.navigator.geolocation = {
+      getCurrentPosition: (onSuccess, onError, options) => {
+        onError({ code: GEOLOCATION_ERROR.POSITION_UNAVAILABLE });
+      },
+    };
+
+    await act(async () => {
+      await button.props.onPress();
+    });
+    // expect AlertAsync is called
+  });
+
+  test('test get current location failed error not handle', async () => {
+    await act(async () => {
+      tree = await create(wrapComponent(route));
+    });
+    const instance = tree.root;
+    const button = instance.find(
+      (el) => el.props.testID === TESTID.BUTTON_YOUR_LOCATION
+    );
+
+    global.navigator.geolocation = {
+      getCurrentPosition: (onSuccess, onError, options) => {
+        onError({ code: GEOLOCATION_ERROR.TIMEOUT });
+      },
+    };
+    RNP.check.mockImplementationOnce(() => RESULTS.DENIED);
+    OpenSetting.mockImplementationOnce(() => {});
+
+    await act(async () => {
+      await button.props.onPress();
+    });
+    expect(OpenSetting).toBeCalledTimes(0);
+    OpenSetting.mockClear();
+  });
+
+  test('test choose on map', async () => {
+    await act(async () => {
+      tree = await create(wrapComponent(route));
+    });
+    const instance = tree.root;
+    const button = instance.find(
+      (el) => el.props.testID === TESTID.BUTTON_CHOOSE_ON_MAP
+    );
+    await act(async () => {
+      await button.props.onPress();
+    });
+    expect(mockNavigate).toBeCalled();
+  });
+});

package/src/screens/AddLocationMaps/index.js

@@ -3,26 +3,30 @@ import { View, ScrollView, TouchableOpacity } from 'react-native';
 import MapView, { Marker, Circle, PROVIDER_GOOGLE } from 'react-native-maps';
 import { useNavigation } from '@react-navigation/native';
 import { IconOutline, IconFill } from '@ant-design/icons-react-native';
+import { check, RESULTS } from 'react-native-permissions';
 import { useTranslations } from '../../hooks/Common/useTranslations';
 
 import Text from '../../commons/Text';
-import { ViewButtonBottom } from '../../commons';
+import { ViewButtonBottom, FullLoading } from '../../commons';
 import SearchBarLocation from '../../commons/SearchLocation';
 import RowLocation from '../../commons/SearchLocation/RowLocation';
 import { axiosGet } from '../../utils/Apis/axios';
 import { API, Colors, SCConfig } from '../../configs';
-import { TESTID } from '../../configs/Constants';
+import {
+  TESTID,
+  MAP_INITIAL_REGION,
+  EOH_LOCATION,
+} from '../../configs/Constants';
 import styles from './indexStyle';
 import Routes from '../../utils/Route';
+import {
+  GEOLOCATION_ERROR,
+  keyPermission,
+  OpenSetting,
+} from '../../utils/Permission/common';
+import { openPromptEnableLocation } from '../../utils/Setting/Location';
 
 export const initialRadius = 250;
-const initialRegion = {
-  latitudeDelta: 0.0090222,
-  longitudeDelta: 0.009221,
-};
-
-const DEFAULT_LATITUDE = 10.7974046; // EoH center
-const DEFAULT_LONGITUDE = 106.7035663;
 
 navigator.geolocation = require('@react-native-community/geolocation');
 
@@ -32,7 +36,7 @@ const AddLocationMaps = memo(() => {
   const [input, setInput] = useState('');
   const [searchData, setSearchData] = useState([]);
   const [searchedLocation, setSearchedLocation] = useState(null);
-
+  const [loading, setLoading] = useState(false);
   const mapRef = useRef(null);
 
   const onDone = useCallback(() => {
@@ -83,7 +87,8 @@ const AddLocationMaps = memo(() => {
       {
         latitude: lat,
         longitude: lng,
-        ...initialRegion,
+        latitudeDelta: MAP_INITIAL_REGION.LAT,
+        longitudeDelta: MAP_INITIAL_REGION.LNG,
       },
       600
     );
@@ -118,6 +123,7 @@ const AddLocationMaps = memo(() => {
       async (position) => {
         const currentLatitude = JSON.stringify(position.coords.latitude);
         const currentLongitude = JSON.stringify(position.coords.longitude);
+        setLoading(true);
         const { success, data } = await axiosGet(
           API.EXTERNAL.GOOGLE_MAP.GET_LOCATION_FROM_LAT_LNG,
           {
@@ -136,11 +142,26 @@ const AddLocationMaps = memo(() => {
             longitude: result.geometry.location.lng,
           });
         }
+        setLoading(false);
+      },
+      async (error) => {
+        if (error.code === GEOLOCATION_ERROR.PERMISSION_DENIED) {
+          const permissionResult = await check(keyPermission.LOCATION);
+          permissionResult === RESULTS.BLOCKED &&
+            OpenSetting(
+              t('location_rationale_title'),
+              t('location_require_message')
+            );
+        } else if (error.code === GEOLOCATION_ERROR.POSITION_UNAVAILABLE) {
+          const locationEnabaled = await openPromptEnableLocation();
+          process.env.NODE_ENV !== 'test' &&
+            locationEnabaled &&
+            getCurrentPosition();
+        }
       },
-      (error) => {},
       {}
     );
-  }, []);
+  }, [t]);
 
   const chooseOnMap = useCallback(() => {
     navigate(Routes.UnitStack, {
@@ -224,9 +245,10 @@ const AddLocationMaps = memo(() => {
             provider={PROVIDER_GOOGLE}
             style={styles.mapView}
             initialRegion={{
-              ...initialRegion,
-              latitude: DEFAULT_LATITUDE,
-              longitude: DEFAULT_LONGITUDE,
+              latitude: EOH_LOCATION.LAT,
+              longitude: EOH_LOCATION.LNG,
+              latitudeDelta: MAP_INITIAL_REGION.LAT,
+              longitudeDelta: MAP_INITIAL_REGION.LNG,
             }}
             followUserLocation={true}
           >
@@ -266,6 +288,7 @@ const AddLocationMaps = memo(() => {
         onRightClick={onDone}
         rightDisabled={!input}
       />
+      {loading && <FullLoading />}
     </View>
   );
 });

package/src/screens/AddNewAction/SelectAction.js

@@ -12,7 +12,11 @@ import OptionsDropdownActionTemplate from '../../commons/OneTapTemplate/OptionsD
 import StatesGridActionTemplate from '../../commons/OneTapTemplate/StatesGridActionTemplate';
 import { axiosGet, axiosPost } from '../../utils/Apis/axios';
 import { API, Images } from '../../configs';
-import { CONDITION_TYPES, TESTID } from '../../configs/Constants';
+import {
+  CONDITION_TYPES,
+  STATE_VALUE_SENSOR_TYPES,
+  TESTID,
+} from '../../configs/Constants';
 import Routes from '../../utils/Route';
 import styles from './Styles/SelectActionStyles';
 import moment from 'moment';
@@ -286,6 +290,23 @@ const SelectAction = memo(({ route }) => {
     });
   };
 
+  const RenderCondition = useCallback(
+    (item) => {
+      const stateConditionData = STATE_VALUE_SENSOR_TYPES.find(
+        (i) => i.type === item?.sensor_type
+      );
+      const isNumberValue = !stateConditionData;
+
+      if (isNumberValue) {
+        return `${item?.name} ${
+          item?.title ? item.title : t('is_below') + ' (<)'
+        }{' '}${item?.value} ${item?.unit}`;
+      }
+      return t(stateConditionData?.stateValue[item?.value === 1 ? 1 : 0]);
+    },
+    [t]
+  );
+
   const rightComponent = useMemo(
     () => (
       <TouchableOpacity style={styles.closeButton} onPress={handleClose}>
@@ -326,7 +347,7 @@ const SelectAction = memo(({ route }) => {
             <LoadingSelectAction style={styles.container} />
           ) : (
             sensorData.map((item) => {
-              const isHasValue = !!item?.value;
+              const isHasValue = !!item?.value || item?.value === 0;
               return (
                 <View style={styles.wrapItem} key={item?.id}>
                   <TitleCheckBox
@@ -351,9 +372,7 @@ const SelectAction = memo(({ route }) => {
                       style={styles.description}
                     >
                       {isHasValue
-                        ? `${item?.name} ${
-                            item?.title ? item.title : t('is_below') + ' (<)'
-                          } ${item.value} ${item?.unit}`
+                        ? RenderCondition(item)
                         : `${t('no')} ${t('condition')}`}
                     </Text>
                     {isHasValue && (

package/src/screens/AddNewAction/SetupSensor.js

@@ -13,11 +13,15 @@ import BottomButtonView from '../../commons/BottomButtonView';
 import { HorizontalPicker } from '../../commons';
 import { popAction } from '../../navigations/utils';
 import { useStatusBarPreview } from '../../hooks/Common/useStatusBar';
-import { CONDITION_TYPES } from '../../configs/Constants';
+import {
+  CONDITION_TYPES,
+  STATE_VALUE_SENSOR_TYPES,
+} from '../../configs/Constants';
 
 const SetUpSensor = () => {
   const t = useTranslations();
-  const modalData = useMemo(
+
+  const modalNumberConditionData = useMemo(
     () => [
       {
         title: `${t('is_below')} (<)`,
@@ -41,9 +45,19 @@ const SetUpSensor = () => {
   const { goBack, dispatch } = useNavigation();
   const { params = {} } = useRoute();
   const { item, sensorData, setSensorData, isAutomateTab } = params;
+
+  const modalStateConditionData = useMemo(() => {
+    return STATE_VALUE_SENSOR_TYPES.find((i) => i.type === item?.sensor_type);
+  }, [item?.sensor_type]);
+
   const isHasLimit = useMemo(() => !!item?.range_max, [item]);
   const [isShowModal, setIsShowModal] = useState(false);
-  const [itemActiveModal, setItemActiveModal] = useState(modalData[0]);
+  const [itemActiveModal, setItemActiveModal] = useState(
+    modalNumberConditionData[0]
+  );
+  const [itemActiveStateModal, setItemActiveStateModal] = useState(
+    modalStateConditionData?.stateValue[0]
+  );
   const [value, setValue] = useState(parseFloat(item?.value || 0));
   const [minimum] = useState(isHasLimit ? parseInt(item?.range_min, 10) : 0);
   const [maximum, setMaximum] = useState(
@@ -54,6 +68,10 @@ const SetUpSensor = () => {
       : (parseInt(item?.value, 10) + 20 - minimum) * 10 + minimum
   );
 
+  const isNumberValue = useMemo(() => {
+    return !(modalStateConditionData?.type === item?.sensor_type);
+  }, [item?.sensor_type, modalStateConditionData?.type]);
+
   const onOpenModal = useCallback(() => {
     setIsShowModal(true);
   }, []);
@@ -63,7 +81,13 @@ const SetUpSensor = () => {
   }, []);
 
   const onChooseCondition = (selectedItem) => () => {
-    setItemActiveModal(selectedItem);
+    if (isNumberValue) {
+      setItemActiveModal(selectedItem);
+    } else {
+      setItemActiveStateModal(selectedItem);
+      setItemActiveModal(modalNumberConditionData[1]);
+      setValue(modalStateConditionData?.stateValue[0] === selectedItem ? 0 : 1);
+    }
     onCloseModal();
   };
 
@@ -134,7 +158,9 @@ const SetUpSensor = () => {
 
   useEffect(() => {
     if (item?.title) {
-      const itemTemp = modalData.find((i) => i.title === item.title);
+      const itemTemp = modalNumberConditionData.find(
+        (i) => i.title === item.title
+      );
       itemTemp && setItemActiveModal(itemTemp);
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -161,26 +187,30 @@ const SetUpSensor = () => {
           <Text type="Body" color={Colors.Gray7}>
             {t('condition')}
           </Text>
-          <Text
-            type="H4"
-            semibold
-            style={styles.desciption}
-          >{`${item?.name} ${itemActiveModal.title}`}</Text>
+          <Text type="H4" semibold style={styles.desciption}>
+            {isNumberValue
+              ? `${item?.name} ${itemActiveModal.title}`
+              : t(itemActiveStateModal)}
+          </Text>
           <Image source={Images.arrowBack} style={styles.arrowRight} />
         </TouchableOpacity>
-        <Text type="Body" color={Colors.Gray7} style={styles.setANumber}>
-          {t('set_a_number')}
-        </Text>
-        <View style={[styles.flexRow, styles.center]}>
-          <View>
-            <Text style={styles.value}>{value}</Text>
-            <View style={styles.underline} />
-          </View>
-          <Text type="H2" style={styles.unit}>
-            {item?.unit}
-          </Text>
-        </View>
-        {renderScroll}
+        {isNumberValue && (
+          <>
+            <Text type="Body" color={Colors.Gray7} style={styles.setANumber}>
+              {t('set_a_number')}
+            </Text>
+            <View style={[styles.flexRow, styles.center]}>
+              <View>
+                <Text style={styles.value}>{value}</Text>
+                <View style={styles.underline} />
+              </View>
+              <Text type="H2" style={styles.unit}>
+                {item?.unit}
+              </Text>
+            </View>
+            {renderScroll}
+          </>
+        )}
       </WrapHeaderScrollable>
       <BottomButtonView
         style={styles.bottomButtonView}
@@ -194,16 +224,21 @@ const SetUpSensor = () => {
         style={styles.modal}
       >
         <View style={styles.modalContent}>
-          {modalData.map((i, index) => (
+          {(isNumberValue
+            ? modalNumberConditionData
+            : modalStateConditionData?.stateValue
+          ).map((i, index) => (
             <>
               <TouchableOpacity
                 onPress={onChooseCondition(i)}
                 key={index}
                 style={styles.itemModal}
               >
-                <Text type="H4">{`${item?.name} ${i.title}`}</Text>
+                <Text type="H4">
+                  {isNumberValue ? `${item?.name} ${i.title}` : t(i)}
+                </Text>
               </TouchableOpacity>
-              {index !== modalData.length - 1 && (
+              {index !== modalNumberConditionData.length - 1 && (
                 <View style={styles.separated} />
               )}
             </>

package/src/screens/AddNewAction/__test__/SetupSensor.test.js

@@ -56,6 +56,7 @@ describe('Test SetUpSensor', () => {
           range_max: 100,
           decimal_behind: 2,
           title: 'is below (<)',
+          sensor_type: 'air_quality',
         },
         sensorData: [],
         setSensorData: () => mockSetSensorData,
@@ -104,6 +105,7 @@ describe('Test SetUpSensor', () => {
           range_min: 0,
           decimal_behind: 2,
           title: 'is below (<)',
+          sensor_type: 'air_quality',
         },
         sensorData: [],
         setSensorData: () => mockSetSensorData,

package/src/screens/Notification/__test__/Notification.test.js

@@ -25,6 +25,23 @@ jest.mock('react', () => {
   };
 });
 
+jest.mock('react-native-onesignal', () => {
+  return {
+    disablePush: jest.fn(),
+    init: jest.fn(),
+    inFocusDisplaying: jest.fn(),
+    addEventListener: jest.fn(),
+    setNotificationWillShowInForegroundHandler: jest.fn(),
+  };
+});
+
+jest.mock('../../../hooks', () => {
+  return {
+    ...jest.requireActual('../../../hooks'),
+    useReceiveNotifications: jest.fn(() => ({ dataNotification: null })),
+  };
+});
+
 describe('test Notification', () => {
   let tree;
 

package/src/screens/Notification/index.js

@@ -14,6 +14,7 @@ import {
 } from '../../utils/Monitor';
 import { useSCContextSelector } from '../../context';
 import { notImplemented } from '../../utils/Utils';
+import { useReceiveNotifications } from '../../hooks';
 
 let page = 1;
 
@@ -22,6 +23,7 @@ const Notification = memo(() => {
   const user = useSCContextSelector((state) => state?.auth?.account?.user);
   const [notifications, setNotifications] = useState([]);
   const [maxPageNotification, setMaxPageNotification] = useState(1);
+
   const rightComponent = useMemo(
     () => (
       <View style={styles.rightComponent}>
@@ -79,6 +81,8 @@ const Notification = memo(() => {
     }
   }, []);
 
+  useReceiveNotifications(onRefresh);
+
   useEffect(() => {
     watchNotificationData(user, onRefresh);
     return () => unwatchNotificationData(user);

package/src/screens/Sharing/SelectPermission.js

@@ -66,7 +66,9 @@ const SelectPermission = ({ route }) => {
       setDataStations(data);
     } else {
       const data = [...dataStationTemp];
+
       const index = data.findIndex((item) => item.id === idGroup);
+      // Remove sensors when end_devices deloy production
       data[index] = {
         ...data[index],
         isChecked,
@@ -76,12 +78,29 @@ const SelectPermission = ({ route }) => {
           actions: i.actions.map((j) => ({ ...j, isChecked })),
           read_configs: i.read_configs.map((j) => ({ ...j, isChecked })),
         })),
+        sensors: data[index]?.sensors.map((i) => ({
+          ...i,
+          isChecked,
+          actions: i.actions.map((j) => ({ ...j, isChecked })),
+          read_configs: i.read_configs.map((j) => ({ ...j, isChecked })),
+        })),
       };
       setDataStations(data);
       setIsTickAllDevices(!data.some((item) => !item.isChecked));
     }
   };
 
+  const stationCheck = (data) => {
+    for (let station of data) {
+      if (station.sensors.length) {
+        station.isChecked = !station.sensors.some((i) => !i.isChecked);
+      }
+    }
+    setIsTickAllDevices(!dataStationTemp.some((i) => !i.isChecked));
+    dataStationTemp = data;
+    setDataStations(data);
+  };
+
   const onTickedChild = (
     idGroup,
     sensorId,
@@ -105,17 +124,6 @@ const SelectPermission = ({ route }) => {
     stationCheck(data);
   };
 
-  const stationCheck = (data) => {
-    for (let station of data) {
-      if (station.sensors.length) {
-        station.isChecked = !station.sensors.some((i) => !i.isChecked);
-      }
-    }
-    setIsTickAllDevices(!dataStationTemp.some((i) => !i.isChecked));
-    dataStationTemp = data;
-    setDataStations(data);
-  };
-
   const onTickedSensor = (idGroup, sensorId, isChecked) => {
     let data = [...dataStationTemp];
     const group = data.find((i) => i.id === idGroup);

package/src/screens/Unit/Detail.js

@@ -296,7 +296,7 @@ const UnitDetail = ({ route }) => {
       const to = setTimeout(() => {
         setAction(Action.IS_FIRST_OPEN_CAMERA, false);
         clearTimeout(to);
-      }, 5000);
+      }, 3000);
     }
   }, [isFirstOpenCamera, setAction]);
 
@@ -317,10 +317,11 @@ const UnitDetail = ({ route }) => {
       {/* NOTE: This is a trick to fix camera not full screen on first open app */}
       {isFirstOpenCamera && (
         <MediaPlayerDetail
-          uri={Constants.URL_STREAM_BALCONY_CAMERA}
+          uri={Constants.URL_STREAM_CAMERA_DEMO}
           isPaused={false}
           width={1}
           height={1}
+          style={styles.fakeCamera}
         />
       )}
 

package/src/screens/Unit/styles.js

@@ -84,4 +84,8 @@ export default StyleSheet.create({
     width: 1,
     height: 1,
   },
+  fakeCamera: {
+    position: 'absolute',
+    zIndex: -99999,
+  },
 });

package/src/utils/I18n/translations/en.json

@@ -991,5 +991,9 @@
   "camera_request_permission_des": "To use camera, please unlock camera permission",
   "location_require_message": "EoH needs your location permission to get current location.",
   "turn_on_location_service": "Turn on location service for your phone",
-  "turn_on_location_service_des": "To continue, let your device turn on location by turning on location service in Settings"
+  "turn_on_location_service_des": "To continue, let your device turn on location by turning on location service in Settings",
+  "detected": "Detected",
+  "not_detected": "Not detected",
+  "activated": "Activated",
+  "not_activated": "Not activated"
 }

package/src/utils/I18n/translations/vi.json

@@ -992,5 +992,9 @@
   "camera_request_permission_des": "Để sử dụng máy ảnh, vui lòng mở khóa quyền đối với máy ảnh",
   "location_require_message": "Eoh cần quyền truy cập vị trí của bạn để lấy vị trí hiện tại.",
   "turn_on_location_service": "Bật dịch vụ vị trí cho điện thoại của bạn",
-  "turn_on_location_service_des": "Để tiếp tục, bật dịch vụ vị trí cho điện thoại của bạn trong Cài Đặt"
+  "turn_on_location_service_des": "Để tiếp tục, bật dịch vụ vị trí cho điện thoại của bạn trong Cài Đặt",
+  "detected": "Phát hiện",
+  "not_detected": "Không phát hiện",
+  "activated": "Được kích hoạt",
+  "not_activated": "Không kích hoạt"
 }

package/src/utils/Utils.js

@@ -115,6 +115,7 @@ export const object_Ids = (data) => {
   let configIds = [];
   data?.forEach((station) => {
     stationIds.push(station?.id);
+    //Todo change devices When production release end_devices
     station?.sensors?.forEach((sensor) => {
       sensorIds.push(sensor?.id);
       sensor?.actions?.forEach((action) => {