@eohjsc/react-native-smart-city 0.2.56 → 0.2.60

package/src/configs/API.js

@@ -82,6 +82,9 @@ const API = {
       SCConfig.apiRoot + `/property_manager/sensors/${id}/`,
     REMOVE_SENSOR: (id) =>
       SCConfig.apiRoot + `/property_manager/sensors/${id}/`,
+    CHANGE_SUB_UNIT: (unit_id, station_id, id) =>
+      SCConfig.apiRoot +
+      `/property_manager/${unit_id}/sub_units/${station_id}/devices/${id}/change_sub_unit/`,
   },
   SHARED_SENSOR: {
     ACCESS: (id) =>
@@ -172,11 +175,16 @@ const API = {
         SCConfig.apiRoot +
         `/connection_manager/lg_thinq/device_status/${sensorId}/`,
     },
+    VCONNEX: {
+      AUTHORIZE: (client_id, redirect_uri, user_id, station_id) =>
+        // eslint-disable-next-line max-len
+        `https://partner-api-stg.vconnex.vn/oauth/authorize?client_id=${client_id}&redirect_uri=${redirect_uri}&response_type=code&scope=SYNCH&scope=CONTROL&scope=QUERY&state=${user_id}@${station_id}`,
+    },
   },
   NOTIFICATION: {
-    LIST_ALL_NOTIFICATIONS: (page, type) =>
-      SCConfig.apiRoot + `/notifications/root/?page=${page}&type=${type}`,
-    SET_READ: (id) => SCConfig.apiRoot + `/notifications/root/${id}/set_read/`,
+    LIST_EOH_NOTIFICATIONS: (page, type) =>
+      SCConfig.apiRoot + `/notifications/eoh/?page=${page}&type=${type}`,
+    SET_READ: (id) => SCConfig.apiRoot + `/notifications/eoh/${id}/set_read/`,
   },
   EXTERNAL: {
     GOOGLE_MAP: {
@@ -184,6 +192,8 @@ const API = {
         'https://maps.googleapis.com/maps/api/place/autocomplete/json',
       GET_LAT_LNG_BY_PLACE_ID:
         'https://maps.googleapis.com/maps/api/place/details/json',
+      GET_LOCATION_FROM_LAT_LNG:
+        'https://maps.googleapis.com/maps/api/geocode/json',
     },
   },
   SMART_ACCOUNT: {

package/src/configs/Constants.js

@@ -1,6 +1,6 @@
 import { Platform, Dimensions, StatusBar } from 'react-native';
 import { RFValue } from 'react-native-responsive-fontsize';
-import OneTap from '../../assets/images/OneTap@1x.svg';
+import OneTap from '../../assets/images/OneTap.svg';
 import ValueChange from '../../assets/images/ValueChange.svg';
 import Schedule from '../../assets/images/Schedule.svg';
 
@@ -84,7 +84,7 @@ export const SCANNING_STATUS = {
 };
 
 export const SubUnitName = {
-  scenario: 'Kịch Bản',
+  smart: 'Kịch Bản',
 };
 
 export const AUTOMATE_TYPE = {
@@ -116,13 +116,13 @@ export const AUTOMATES = {
   value_change: {
     value: AUTOMATE_TYPE.VALUE_CHANGE,
     title: 'value_change',
-    explanation: 'short_explanation',
+    explanation: 'setup_the_conditions',
     icon: ValueChange,
   },
   schedule: {
     value: AUTOMATE_TYPE.SCHEDULE,
     title: 'schedule',
-    explanation: 'short_explanation',
+    explanation: 'setup_the_schedule',
     icon: Schedule,
   },
 };
@@ -572,6 +572,16 @@ export const TESTID = {
   // ThreeButtonHistory
   HISTORY_BUTTON: 'HISTORY_BUTTON',
   HISTORY_CALENDAR: 'HISTORY_CALENDAR',
+
+  // DropDownPicker
+  DROP_DOWN_PICKER_ITEM: 'DROP_DOWN_PICKER_ITEM',
+
+  // SelectAddress
+  BUTTON_YOUR_LOCATION: 'BUTTON_YOUR_LOCATION',
+  BUTTON_CHOOSE_ON_MAP: 'BUTTON_CHOOSE_ON_MAP',
+
+  // MoveToAnotherSubUnit
+  ROW_SUB_UNIT: 'ROW_SUB_UNIT',
 };
 
 export const NOTIFICATION_TYPES = {

package/src/configs/Images.js

@@ -7,4 +7,7 @@ export default {
   file: require('../Images/Common/file.png'),
   activeButton: require('../Images/Common/ActiveButton.png'),
   logo: require('../Images/Common/logo.png'),
+  buttonPauseCurtain: require('../Images/Common/buttonPause-center-curtain.png'),
+  buttonLeftCurtain: require('../Images/Common/buttonLeftCurtain.png'),
+  buttonRightCurtain: require('../Images/Common/buttonRightCurtain.png'),
 };

package/src/configs/SCConfig.js

@@ -90,6 +90,8 @@ const SCDefaultConfig = {
   LG_CLIENT_ID: '2b85aee334f046848341547894bb7c4e',
   LG_REDIRECT_URI_APP: 'app://eoh/sync-lg-device',
   LG_URL: 'https://qt-vn.m.lgaccount.com/emp/v2',
+  VCONNEX_CLIENT_ID: '',
+  VCONNEX_REDIRECT_URI_APP: '',
   pusherAppKey: '9a591ae4a764acc08714',
   pusherAppCluster: 'ap1',
 };
@@ -100,6 +102,8 @@ export class SCConfig {
   static LG_CLIENT_ID = SCDefaultConfig.LG_CLIENT_ID;
   static LG_REDIRECT_URI_APP = SCDefaultConfig.LG_REDIRECT_URI_APP;
   static LG_URL = SCDefaultConfig.LG_URL;
+  static VCONNEX_CLIENT_ID = SCDefaultConfig.VCONNEX_CLIENT_ID;
+  static VCONNEX_REDIRECT_URI_APP = SCDefaultConfig.VCONNEX_REDIRECT_URI_APP;
   static pusherAppKey = SCDefaultConfig.pusherAppKey;
   static pusherAppCluste = SCDefaultConfig.pusherAppCluster;
 }
@@ -113,6 +117,10 @@ export const initSCConfig = (config) => {
   SCConfig.LG_REDIRECT_URI_APP =
     config.LG_REDIRECT_URI_APP ?? SCDefaultConfig.LG_REDIRECT_URI_APP;
   SCConfig.LG_URL = config.LG_URL ?? SCDefaultConfig.LG_URL;
+  SCConfig.VCONNEX_CLIENT_ID =
+    config.VCONNEX_CLIENT_ID ?? SCDefaultConfig.VCONNEX_CLIENT_ID;
+  SCConfig.VCONNEX_REDIRECT_URI_APP =
+    config.VCONNEX_REDIRECT_URI_APP ?? SCDefaultConfig.VCONNEX_REDIRECT_URI_APP;
   SCConfig.pusherAppKey = config.pusherAppKey ?? SCDefaultConfig.pusherAppKey;
   SCConfig.pusherAppCluster =
     config.pusherAppCluster ?? SCDefaultConfig.pusherAppCluster;

package/src/context/actionType.ts

@@ -4,6 +4,7 @@ export const Action = {
   STORE_STATUS_BAR: 'STORE_STATUS_BAR',
   LIST_DEVICE_TYPES: 'LIST_DEVICE_TYPES',
   LIST_ACTION: 'LIST_ACTION',
+  IS_FIRST_OPEN_CAMERA: 'IS_FIRST_OPEN_CAMERA',
 };
 
 export type AuthData = {
@@ -44,3 +45,7 @@ export type ActionDataMap = {
   LIST_DEVICE_TYPES: ListDevice;
   LIST_ACTION: ListAction;
 };
+
+export type AppType = {
+  isFirstOpenCamera: boolean;
+};

package/src/context/mockStore.ts

@@ -47,5 +47,8 @@ export const mockSCStore = (data: ContextData): ContextData => {
       barStyle: data?.statusBar?.barStyle || mockDataStore?.statusBar?.barStyle,
     },
     listAction: [...mockDataStore.listAction, ...(data?.listAction || [])],
+    app: {
+      isFirstOpenCamera: true,
+    },
   };
 };

package/src/context/reducer.ts

@@ -7,6 +7,7 @@ import {
   Action,
   ListDevice,
   ListAction,
+  AppType,
 } from './actionType';
 
 export type ContextData = {
@@ -15,6 +16,7 @@ export type ContextData = {
   listDevice: ListDevice;
   listAction: ListAction;
   statusBar: StatusBar;
+  app: AppType;
 };
 
 export type Action = {
@@ -35,6 +37,9 @@ export const initialState = {
   statusBar: {} as StatusBar,
   listDevice: {} as ListDevice,
   listAction: [] as ListAction,
+  app: {
+    isFirstOpenCamera: true,
+  },
 };
 
 export const reducer = (currentState: ContextData, action: Action) => {
@@ -83,6 +88,15 @@ export const reducer = (currentState: ContextData, action: Action) => {
       }
 
       return { ...currentState, listAction: newListAction };
+
+    case Action.IS_FIRST_OPEN_CAMERA:
+      return {
+        ...currentState,
+        app: {
+          ...currentState.app,
+          isFirstOpenCamera: payload,
+        },
+      };
     default:
       return currentState;
   }

package/src/iot/RemoteControl/Bluetooth.js

@@ -5,6 +5,7 @@ import t from '../../hooks/Common/useTranslations';
 import base64 from 'react-native-base64';
 import { BleManager } from 'react-native-ble-plx';
 import { ToastBottomHelper } from '../../utils/Utils';
+import { useEffect, useState } from 'react';
 
 const bluetoothDevices = {};
 const needToScanDevices = [];
@@ -165,6 +166,19 @@ export const isBluetoothEnabled = async () => {
   return state === 'PoweredOn';
 };
 
+export const useIsBluetoothEnabled = () => {
+  const [isEnabled, setIsEnabled] = useState(null);
+
+  useEffect(() => {
+    const subscription = bleManager.onStateChange((state) => {
+      setIsEnabled(state === 'PoweredOn');
+    }, true);
+
+    return () => subscription.remove();
+  }, []);
+  return isEnabled;
+};
+
 export const enableBluetoothForAndroid = async () => {
   await bleManager.enable();
 };

package/src/iot/RemoteControl/index.js

@@ -16,7 +16,6 @@ export const sendRemoteCommand = async (sensor, action, data) => {
     );
     return;
   }
-
   if (action.command_prefer_over_bluetooth) {
     try {
       await sendCommandOverBluetooth(sensor, action, data);

package/src/navigations/UnitStack.js

@@ -1,9 +1,10 @@
 import React, { memo } from 'react';
-import { StyleSheet, Platform } from 'react-native';
+import { View, StyleSheet, Platform } from 'react-native';
 import { IconOutline } from '@ant-design/icons-react-native';
 import { createStackNavigator } from '@react-navigation/stack';
 import { get } from 'lodash';
 
+import Text from '../commons/Text';
 import { useTranslations } from '../hooks/Common/useTranslations';
 import { Colors, Device } from '../configs';
 import Route from '../utils/Route';
@@ -13,7 +14,8 @@ import AQIGuide from '../screens/AQIGuide';
 import DeviceDetail from '../screens/Device/detail';
 import SharingMemberList from '../screens/Sharing/MemberList';
 import ManageSubUnit from '../screens/SubUnit/ManageSubUnit';
-import SelectLocation from '../screens/Unit/SelectLocation';
+import SelectAddress from '../screens/Unit/SelectAddress';
+import ChooseLocation from '../screens/Unit/ChooseLocation';
 import ManageUnit from '../screens/Unit/ManageUnit';
 import ListSmartAccount from '../screens/Unit/SmartAccount';
 import MyAllUnit from '../screens/Unit/MyAllUnit';
@@ -29,6 +31,7 @@ import AddNewAutoSmart from '../screens/AddNewAutoSmart';
 import PlaybackCamera from '../screens/PlayBackCamera';
 import AllCamera from '../screens/AllCamera';
 import ManageAccessScreen from '../screens/ManageAccess';
+import MoveToAnotherSubUnit from '../screens/MoveToAnotherSubUnit';
 import GuestInfo from '../screens/GuestInfo';
 import ScriptDetail from '../screens/ScriptDetail';
 import EditActionsList from '../screens/EditActionsList';
@@ -39,6 +42,7 @@ import SelectAction from '../screens/AddNewAction/SelectAction';
 import EditSubUnit from '../screens/SubUnit/EditSubUnit';
 import SetUpSensor from '../screens/AddNewAction/SetupSensor';
 import EditDevice from '../screens/Device/EditDevice/index';
+import EmergencySetting from '../screens/EmergencySetting';
 
 const Stack = createStackNavigator();
 
@@ -98,13 +102,30 @@ export const UnitStack = memo((props) => {
         }}
       />
       <Stack.Screen
-        name={Route.SelectLocation}
-        component={SelectLocation}
+        name={Route.SelectAddress}
+        component={SelectAddress}
         options={{
           headerShown: true,
           headerTitle: t('select_address'),
         }}
       />
+      <Stack.Screen
+        name={Route.ChooseLocation}
+        component={ChooseLocation}
+        options={{
+          headerShown: true,
+          headerTitle: () => (
+            <View style={styles.alignCenter}>
+              <Text type="H3" color={Colors.Gray9} bold>
+                {t('choose_on_map')}
+              </Text>
+              <Text type="H4" color={Colors.Gray8}>
+                {t('plan_and_zoom_to_adjust')}
+              </Text>
+            </View>
+          ),
+        }}
+      />
       <Stack.Screen
         name={Route.UnitSummary}
         component={UnitSummary}
@@ -210,6 +231,13 @@ export const UnitStack = memo((props) => {
           headerShown: false,
         }}
       />
+      <Stack.Screen
+        name={Route.MoveToAnotherSubUnit}
+        component={MoveToAnotherSubUnit}
+        options={{
+          headerShown: false,
+        }}
+      />
       <Stack.Screen
         name={Route.GuestInfo}
         component={GuestInfo}
@@ -272,6 +300,13 @@ export const UnitStack = memo((props) => {
           headerShown: false,
         }}
       />
+      <Stack.Screen
+        name={Route.EmergencySetting}
+        component={EmergencySetting}
+        options={{
+          headerShown: false,
+        }}
+      />
     </Stack.Navigator>
   );
 });
@@ -280,4 +315,7 @@ const styles = StyleSheet.create({
   icLeft: {
     marginLeft: Device.isIOS ? 8 : 0,
   },
+  alignCenter: {
+    alignItems: 'center',
+  },
 });

package/src/screens/ActivityLog/FilterPopup.js

@@ -211,7 +211,7 @@ const FilterPopup = ({
               onStart={onPickStartDate}
               onEnd={onPickEndDate}
               formatType="date"
-              inline={false}
+              inline={true}
             />
             {userFilterEnabled && (
               <>

package/src/screens/ActivityLog/ItemLog.js

@@ -29,14 +29,23 @@ const DetailLog = ({ item }) => {
           {item.action_name
             ? `${item.action_name} ${t('by')} `
             : `${t('activated_by')} `}
-          <Text style={styles.name}>{item.name || item.params?.username}</Text>
+          <Text style={styles.name}>{item.name || item.username}</Text>
         </Text>
       );
     case ACTIVITY_LOG_TYPES.SCRIPT_UPDATED_BY:
       return (
         <Text style={styles.text}>
           {`${t('script_updated_by')} `}
-          <Text style={styles.name}>{item.name || item.params?.username}</Text>
+          <Text style={styles.name}>{item.name || item.username}</Text>
+        </Text>
+      );
+    default:
+      return (
+        <Text style={styles.text}>
+          {item.action_name
+            ? `${item.action_name} ${t('by')} `
+            : `${t('activated_by')} `}
+          <Text style={styles.name}>{item.name || item.username}</Text>
         </Text>
       );
   }

package/src/screens/ActivityLog/__test__/ItemLog.test.js

@@ -46,6 +46,7 @@ test('test ItemLog one tap', () => {
       params: {
         username: 'username',
       },
+      username: 'username',
       created_at: '2021-07-02T15:48:24.917932Z',
     },
     type: `automate.${AUTOMATE_TYPE.ONE_TAP}`,
@@ -60,6 +61,51 @@ test('test ItemLog one tap', () => {
   expect(texts[2].props.children).toBe(props.item.params.username);
 });
 
+test('test ItemLog script update', () => {
+  let tree;
+  let props = {
+    item: {
+      content_code: 'SCRIPT_UPDATED_BY',
+      params: {
+        username: 'username',
+      },
+      username: 'username',
+      created_at: '2021-07-02T15:48:24.917932Z',
+    },
+    type: 'automate',
+    length: 2,
+    index: 1,
+  };
+  act(() => {
+    tree = create(wrapComponent(props));
+  });
+  const instance = tree.root;
+  const texts = instance.findAllByType(Text);
+  expect(texts[2].props.children).toBe(props.item.username);
+});
+
+test('test ItemLog no content_code', () => {
+  let tree;
+  let props = {
+    item: {
+      params: {
+        username: 'username',
+      },
+      created_at: '2021-07-02T15:48:24.917932Z',
+    },
+    username: 'username',
+    type: 'action',
+    length: 2,
+    index: 1,
+  };
+  act(() => {
+    tree = create(wrapComponent(props));
+  });
+  const instance = tree.root;
+  const texts = instance.findAllByType(Text);
+  expect(texts[2].props.children).toBe(props.item.username);
+});
+
 describe('test ItemLog emergency event', () => {
   let tree;
   let props;

package/src/screens/ActivityLog/hooks/index.js

@@ -12,6 +12,7 @@ const apiMaps = {
     url: () => API.SENSOR.ACTIVITY_LOG(),
     params: (id) => ({ id: id }),
     standardizeData: getDataForList,
+    memberUrl: (id) => API.SHARE.UNITS_MEMBERS(id),
   },
   ['emergency_event']: {
     url: () => API.EMERGENCY_BUTTON.ACTIVITY_LOG(),

package/src/screens/ActivityLog/index.js

@@ -66,7 +66,6 @@ const ActivityLogScreen = ({ route }) => {
       {getTitleFromTime(data[0].created_at, new Date())}
     </Text>
   );
-
   useEffect(() => {
     onRefresh();
     // eslint-disable-next-line react-hooks/exhaustive-deps

package/src/screens/AddCommon/SelectSubUnit.js

@@ -11,6 +11,7 @@ import Routes from '../../utils/Route';
 import { TESTID } from '../../configs/Constants';
 import styles from './SelectSubUnitStyles';
 import Button from '../../commons/Button';
+import { SCConfig } from '../../configs/SCConfig';
 
 const AddCommonSelectSubUnit = ({ route }) => {
   const t = useTranslations();
@@ -31,6 +32,9 @@ const AddCommonSelectSubUnit = ({ route }) => {
       case 'AddHassiDevice':
         setTitle(t('select_a_sub_unit'));
         break;
+      case 'AddVconnexDevice':
+        setTitle(t('select_a_sub_unit'));
+        break;
       default:
         setTitle(t('add_new_gateway'));
         setSubTitle(t('select_a_sub_unit'));
@@ -70,10 +74,28 @@ const AddCommonSelectSubUnit = ({ route }) => {
           station: subUnits[selectedIndex]?.id,
         });
         break;
+      case 'AddVconnexDevice':
+        navigation.navigate(Routes.Browser, {
+          link: API.IOT.VCONNEX.AUTHORIZE(
+            SCConfig.VCONNEX_CLIENT_ID,
+            SCConfig.VCONNEX_REDIRECT_URI_APP,
+            unit.user_id,
+            subUnits[selectedIndex]?.id
+          ),
+        });
+        break;
       default:
         break;
     }
-  }, [addType, navigation, subUnits, selectedIndex, unit.name, route.params]);
+  }, [
+    addType,
+    navigation,
+    subUnits,
+    selectedIndex,
+    unit?.name,
+    unit.user_id,
+    route.params,
+  ]);
 
   const handleSelectIndex = (index) => {
     if (index !== selectedIndex) {
@@ -86,7 +108,7 @@ const AddCommonSelectSubUnit = ({ route }) => {
   const addSubUnit = useCallback(() => {
     navigation.navigate(Routes.AddSubUnitStack, {
       screen: Routes.AddSubUnit,
-      params: { unit, ...route.params },
+      params: { unit, ...route.params, addType: 'AddHassiDevice' },
     });
   }, [navigation, unit, route.params]);
 

package/src/screens/AddCommon/SelectUnit.js

@@ -48,6 +48,9 @@ const AddCommonSelectUnit = ({ route }) => {
       case 'AddHassioDevice':
         setTitle(t('text_select_a_unit'));
         break;
+      case 'AddVconnexDevice':
+        setTitle(t('text_select_a_unit'));
+        break;
       default:
         setTitle(t('add_new_sub_unit'));
         setSubTitle(t('add_new_subunit_select_unit'));
@@ -102,6 +105,15 @@ const AddCommonSelectUnit = ({ route }) => {
           unit_id: units[selectedIndex].id,
         });
         break;
+      case 'AddVconnexDevice':
+        navigation.navigate(Routes.AddDeviceStack, {
+          screen: Routes.AddCommonSelectSubUnit,
+          params: {
+            unit_id: units[selectedIndex].id,
+            addType: 'AddVconnexDevice',
+          },
+        });
+        break;
       default:
         break;
     }