@eohjsc/react-native-smart-city 0.2.85 → 0.2.88

package/src/configs/Constants.js

@@ -73,6 +73,16 @@ export const Constants = {
 
 export const DEVICE_TYPE = {
   LG_THINQ: 'LG_THINQ',
+  HANET: 'HANET',
+};
+
+const marginItem = 12;
+const marginHorizontal = 16;
+const widthItem = (Constants.width - marginHorizontal * 2 - marginItem) / 2;
+const heightItem = (widthItem / 166) * 106;
+export const DEVICE_SIZE = {
+  width: widthItem,
+  height: heightItem,
 };
 
 export const SCANNING_STATUS = {
@@ -100,6 +110,26 @@ export const AUTOMATE_TYPE = {
   SCENARIO: 'scenario',
 };
 
+export const SMART_TIVI_BUTTON = {
+  ONOFF_BUTTON: 'OnOff',
+  EXIT_BUTTON: 'Exit',
+  VOLUME_UP_BUTTON: 'VolumeUp',
+  VOLUME_DOWN_BUTTON: 'VolumeDown',
+  CH_UP: 'ChUp',
+  CH_DOWN: 'ChDown',
+  PREV_BUTTON: 'Prev',
+  STOP_BUTTON: 'Stop',
+  NEXT_BUTTON: 'Next',
+  UP_BUTTON: 'Up',
+  DOWN_BUTTON: 'Down',
+  LEFT_BUTTON: 'Left',
+  RIGHT_BUTTON: 'Right',
+  OK_BUTTON: 'Ok',
+  HOME_BUTTON: 'Home',
+  BACK_BUTTON: 'Back',
+  CHANNEL_BUTTON: 'Channel',
+};
+
 export const AUTOMATE_SELECT = {
   SELECT_DEVICE: 'select_device',
   SELECT_SENSOR: 'select_sensor',
@@ -636,6 +666,23 @@ export const TESTID = {
 
   // MoveToAnotherSubUnit
   ROW_SUB_UNIT: 'ROW_SUB_UNIT',
+
+  // HanetCameraDetail
+  TEXT_COUNT_MEMBER: 'TEXT_COUNT_MEMBER',
+  TEXT_COUNT_STRANGER: 'TEXT_COUNT_STRANGER',
+  ROW_HANET_MANAGE_ACCESS: 'ROW_HANET_MANAGE_ACCESS',
+  HANET_MANAGE_ACCESS_ADD_BUTTON: 'HANET_MANAGE_ACCESS_ADD_BUTTON',
+  HANET_ADD_MEMBER_OPTION: 'HANET_ADD_MEMBER_OPTION',
+
+  //SetupGeneratePasscode
+  GENERATE_PASSCODE_CHOOSE_USER: 'GENERATE_PASSCODE_CHOOSE_USER',
+  GENERATE_PASSCODE_SET_TIME: 'GENERATE_PASSCODE_SET_TIME',
+  GENERATE_PASSCODE_SET_DURATION: 'GENERATE_PASSCODE_SET_DURATION',
+
+  //AutoLock
+  AUTO_LOCK_BUTTON_ENABLE: 'AUTO_LOCK_BUTTON_ENABLE',
+  AUTO_LOCK_BUTTON_INSTANT: 'AUTO_LOCK_BUTTON_INSTANT',
+  AUTO_LOCK_BUTTON_RELOCK_TIMING: 'AUTO_LOCK_BUTTON_RELOCK_TIMING',
 };
 
 export const NOTIFICATION_TYPES = {
@@ -663,6 +710,8 @@ export const NOTIFICATION_TYPES = {
   NOTIFY_DEVICE_DISCONNECT: 'NOTIFY_DEVICE_DISCONNECT',
   NOTIFY_RENAME_SUB_UNIT: 'NOTIFY_RENAME_SUB_UNIT',
   NOTIFY_UPDATE_ADDRESS: 'NOTIFY_UPDATE_ADDRESS',
+  NOTIFY_REMOVE_SUB_UNIT: 'NOTIFY_REMOVE_SUB_UNIT',
+  NOTIFY_REMOVE_DEVICE: 'NOTIFY_REMOVE_DEVICE',
 };
 
 export const ACTIVITY_LOG_TYPES = {
@@ -670,3 +719,15 @@ export const ACTIVITY_LOG_TYPES = {
   ACTIVATED_BY: 'ACTIVATED_BY',
   SCRIPT_UPDATED_BY: 'SCRIPT_UPDATED_BY',
 };
+
+export const SENSOR_TYPE = {
+  AIR_QUALITY: 'air_quality',
+  TURBIDITY: 'turbidity',
+  PH: 'ph',
+  CLO: 'clo',
+  UV: 'uv',
+  SMOKE: 'smoke',
+  FIRE: 'fire',
+  SOS: 'sos',
+  FILTER_WATER: 'filter_water',
+};

package/src/configs/SCConfig.js

@@ -92,7 +92,7 @@ const SCDefaultConfig = {
   LG_URL: 'https://qt-vn.m.lgaccount.com/emp/v2',
   VCONNEX_CLIENT_ID: '',
   VCONNEX_REDIRECT_URI_APP: '',
-  pusherAppKey: '9a591ae4a764acc08714',
+  pusherAppKey: '8557fcc63959f564f1aa',
   pusherAppCluster: 'ap1',
 };
 

package/src/context/actionType.ts

@@ -7,6 +7,8 @@ export const Action = {
   IS_FIRST_OPEN_CAMERA: 'IS_FIRST_OPEN_CAMERA',
   IS_LAVIDA_SOURCE: 'IS_LAVIDA_SOURCE',
   IS_CONNECT_WIFI_GATEWAY: 'IS_CONNECT_WIFI_GATEWAY',
+  SET_BLUETOOTH_STATE: 'SET_BLUETOOTH_STATE',
+  SET_NETWORK_CONNECTED: 'SET_NETWORK_CONNECTED',
 };
 
 export type AuthData = {
@@ -52,4 +54,6 @@ export type AppType = {
   isFirstOpenCamera: boolean;
   isLavidaSource: boolean;
   isConnectWifiGateway: boolean;
+  isBluetoothEnabled: boolean;
+  isNetworkConnected: boolean;
 };

package/src/context/mockStore.ts

@@ -49,6 +49,9 @@ export const mockSCStore = (data: ContextData): ContextData => {
     listAction: [...mockDataStore.listAction, ...(data?.listAction || [])],
     app: {
       isFirstOpenCamera: true,
+      isConnectWifiGateway: false,
+      isBluetoothEnabled: true,
+      isNetworkConnected: true,
     },
   };
 };

package/src/context/reducer.ts

@@ -41,6 +41,8 @@ export const initialState = {
     isFirstOpenCamera: true,
     isLavidaSource: false,
     isConnectWifiGateway: false,
+    isBluetoothEnabled: false,
+    isNetworkConnected: false,
   },
 };
 
@@ -117,6 +119,24 @@ export const reducer = (currentState: ContextData, action: Action) => {
         },
       };
     }
+    case Action.SET_BLUETOOTH_STATE: {
+      return {
+        ...currentState,
+        app: {
+          ...currentState.app,
+          isBluetoothEnabled: payload,
+        },
+      };
+    }
+    case Action.SET_NETWORK_CONNECTED: {
+      return {
+        ...currentState,
+        app: {
+          ...currentState.app,
+          isNetworkConnected: payload,
+        },
+      };
+    }
     default:
       return currentState;
   }

package/src/iot/RemoteControl/Bluetooth.js

@@ -5,7 +5,6 @@ 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 = [];
@@ -185,31 +184,13 @@ export const sendDataOverBluetooth = async (
     return result;
   }
 
-  // eslint-disable-next-line no-shadow
-  setTimeout(async (device) => {
-    await device.cancelConnection();
+  const timeout = setTimeout(() => {
+    device.cancelConnection();
+    clearTimeout(timeout);
   }, responseTime);
   return result;
 };
 
-export const isBluetoothEnabled = async () => {
-  const state = await bleManager.state();
-  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

@@ -40,7 +40,6 @@ export const sendRemoteCommand = async (
       }
     }
   }
-
   if (action.command_prefer_over_internet) {
     result = await sendCommandOverInternet(sensor, action, data, 'internet');
   }

package/src/navigations/HanetCameraStack.js

@@ -0,0 +1,41 @@
+import { createStackNavigator } from '@react-navigation/stack';
+import React, { memo } from 'react';
+import HanetCameraDetail from '../screens/HanetCamera/Detail';
+import HanetManageAccess from '../screens/HanetCamera/ManageAccess';
+import HanetMemberInfo from '../screens/HanetCamera/MemberInfo';
+import HanetCaptureFaceID from '../screens/HanetCamera/CaptureFaceID';
+import Route from '../utils/Route';
+import { screenOptions } from './utils';
+
+const Stack = createStackNavigator();
+
+export const HanetCameraStack = memo(() => {
+  return (
+    <Stack.Navigator
+      screenOptions={{
+        ...screenOptions,
+      }}
+    >
+      <Stack.Screen
+        name={Route.HanetCameraDetail}
+        component={HanetCameraDetail}
+        options={{ headerShown: false }}
+      />
+      <Stack.Screen
+        name={Route.HanetManageAccess}
+        component={HanetManageAccess}
+        options={{ headerShown: false }}
+      />
+      <Stack.Screen
+        name={Route.HanetMemberInfo}
+        component={HanetMemberInfo}
+        options={{ headerShown: false }}
+      />
+      <Stack.Screen
+        name={Route.HanetCaptureFaceID}
+        component={HanetCaptureFaceID}
+        options={{ headerShown: false }}
+      />
+    </Stack.Navigator>
+  );
+});

package/src/navigations/SmartIrStack.js

@@ -0,0 +1,31 @@
+import { createStackNavigator } from '@react-navigation/stack';
+import React, { memo } from 'react';
+
+import SelectDeviceType from '../screens/SmartIr/components/SelectDeviceType';
+import SelectBrand from '../screens/SmartIr/components/SelectBrand';
+import GroupButtonByType from '../screens/SmartIr/components/GroupButtonByType/GroupButtonByType';
+import Route from '../utils/Route';
+import { screenOptions } from './utils';
+
+const Stack = createStackNavigator();
+
+export const SmartIrStack = memo(() => {
+  return (
+    <Stack.Navigator
+      screenOptions={{
+        ...screenOptions,
+        headerShown: false,
+      }}
+    >
+      <Stack.Screen
+        name={Route.SelectDeviceType}
+        component={SelectDeviceType}
+      />
+      <Stack.Screen name={Route.SelectBrand} component={SelectBrand} />
+      <Stack.Screen
+        name={Route.GroupButtonByType}
+        component={GroupButtonByType}
+      />
+    </Stack.Navigator>
+  );
+});

package/src/navigations/SmartLockStack.js

@@ -0,0 +1,51 @@
+import { createStackNavigator } from '@react-navigation/stack';
+import React, { memo } from 'react';
+
+import Route from '../utils/Route';
+import { screenOptions } from './utils';
+import SetupGeneratePasscode from '../commons/ActionGroup/OnOffSmartLock/SetupGeneratePasscode/index';
+import AutoLock from '../commons/ActionGroup/OnOffSmartLock/AutoLock/index';
+import PasscodeList from '../commons/ActionGroup/OnOffSmartLock/PasscodeList/index';
+import ItemPasscode from '../commons/ActionGroup/OnOffSmartLock/PasscodeList/ItemPasscode';
+
+const Stack = createStackNavigator();
+
+export const SmartLockStack = memo(() => {
+  return (
+    <Stack.Navigator
+      screenOptions={{
+        ...screenOptions,
+        headerShown: false,
+      }}
+    >
+      <Stack.Screen
+        name={Route.SetupGeneratePasscode}
+        component={SetupGeneratePasscode}
+        options={{
+          headerShown: false,
+        }}
+      />
+      <Stack.Screen
+        name={Route.AutoLock}
+        component={AutoLock}
+        options={{
+          headerShown: false,
+        }}
+      />
+      <Stack.Screen
+        name={Route.PasscodeList}
+        component={PasscodeList}
+        options={{
+          headerShown: false,
+        }}
+      />
+      <Stack.Screen
+        name={Route.ItemPasscode}
+        component={ItemPasscode}
+        options={{
+          headerShown: false,
+        }}
+      />
+    </Stack.Navigator>
+  );
+});

package/src/navigations/UnitStack.js

@@ -1,7 +1,9 @@
-import React, { memo } from 'react';
+import React, { memo, useContext, useEffect } from 'react';
 import { View, StyleSheet } from 'react-native';
 import { IconOutline } from '@ant-design/icons-react-native';
 import { createStackNavigator } from '@react-navigation/stack';
+import { BleManager } from 'react-native-ble-plx';
+import NetInfo from '@react-native-community/netinfo';
 import { get } from 'lodash';
 
 import Text from '../commons/Text';
@@ -10,6 +12,8 @@ import { Colors, Device } from '../configs';
 import Route from '../utils/Route';
 import ActivityLogScreen from '../screens/ActivityLog';
 import { screenOptions } from './utils';
+import { SCContext } from '../context';
+import { Action } from '../context/actionType';
 
 import AQIGuide from '../screens/AQIGuide';
 import DeviceDetail from '../screens/Device/detail';
@@ -45,11 +49,33 @@ import SetUpSensor from '../screens/AddNewAction/SetupSensor';
 import EditDevice from '../screens/Device/EditDevice/index';
 import EmergencySetting from '../screens/EmergencySetting';
 import ConfirmUnitDeletion from '../screens/ConfirmUnitDeletion';
+import { HanetCameraStack } from './HanetCameraStack';
 
 const Stack = createStackNavigator();
 
+const bleManager = new BleManager();
+
 export const UnitStack = memo((props) => {
   const t = useTranslations();
+  const { setAction } = useContext(SCContext);
+
+  useEffect(() => {
+    const unsubscribe = NetInfo.addEventListener((state) => {
+      setAction(Action.SET_NETWORK_CONNECTED, state.isConnected);
+    });
+    return () => unsubscribe();
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
+  useEffect(() => {
+    const subscription = bleManager.onStateChange((state) => {
+      setAction(Action.SET_BLUETOOTH_STATE, state === 'PoweredOn');
+    }, true);
+
+    return () => subscription.remove();
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
   return (
     <Stack.Navigator
       screenOptions={{
@@ -117,12 +143,16 @@ export const UnitStack = memo((props) => {
         component={ChooseLocation}
         options={{
           headerShown: true,
+          headerTitleStyle: {
+            ...styles.headerLocation,
+          },
           headerTitle: () => (
-            <View style={styles.alignCenter}>
+            <View style={styles.headerLocation}>
               <Text type="H3" color={Colors.Gray9} bold>
                 {t('choose_on_map')}
               </Text>
-              <Text type="H4" color={Colors.Gray8}>
+
+              <Text type="H4" color={Colors.Gray8} style={styles.headerContent}>
                 {t('plan_and_zoom_to_adjust')}
               </Text>
             </View>
@@ -162,6 +192,13 @@ export const UnitStack = memo((props) => {
           headerShown: false,
         }}
       />
+      <Stack.Screen
+        name={Route.HanetCameraStack}
+        component={HanetCameraStack}
+        options={{
+          headerShown: false,
+        }}
+      />
       <Stack.Screen
         name={Route.UVIndexGuide}
         component={UVIndexGuide}
@@ -323,7 +360,12 @@ const styles = StyleSheet.create({
   icLeft: {
     marginLeft: Device.isIOS ? 8 : 0,
   },
-  alignCenter: {
+  headerLocation: {
     alignItems: 'center',
+    justifyContent: 'center',
+  },
+  headerContent: {
+    textAlign: 'center',
+    paddingBottom: 8,
   },
 });

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

@@ -37,6 +37,7 @@ String.prototype.capitalize = function () {
   return this.charAt(0).toUpperCase() + this.slice(1);
 };
 
+let onEndReachedCalledDuringMomentum = false;
 let dataTemp = [];
 
 export default ({ id, type, share, filterEnabled }) => {
@@ -59,7 +60,7 @@ export default ({ id, type, share, filterEnabled }) => {
     if (page === 1) {
       setIsRefreshing(true);
     } else {
-      if (!isCanLoadMore || isLoading) {
+      if (!isCanLoadMore) {
         return;
       }
       setIsLoading(true);
@@ -81,6 +82,7 @@ export default ({ id, type, share, filterEnabled }) => {
       params.append(key, value);
     }
     params.append('page', page);
+
     const { success, data } = await axiosGet(api.url(id), {
       params: params,
     });
@@ -110,9 +112,20 @@ export default ({ id, type, share, filterEnabled }) => {
     }
   };
 
-  const onRefresh = () => fetchData({ ...filters, page: 1 });
+  const onRefresh = () => {
+    setIsCanLoadMore(true);
+    fetchData({ ...filters, page: 1 });
+  };
+
+  const onLoadMore = () => {
+    if (!onEndReachedCalledDuringMomentum) {
+      onEndReachedCalledDuringMomentum = true;
+      fetchData({ ...filters, page: page + 1 });
+    }
+  };
 
-  const onLoadMore = () => fetchData({ ...filters, page: page + 1 });
+  const onMomentumScrollBegin = () =>
+    (onEndReachedCalledDuringMomentum = false);
 
   return {
     data,
@@ -124,5 +137,6 @@ export default ({ id, type, share, filterEnabled }) => {
     fetchMembers,
     filters,
     setFilters,
+    onMomentumScrollBegin,
   };
 };

package/src/screens/ActivityLog/index.js

@@ -34,7 +34,9 @@ const ActivityLogScreen = ({ route }) => {
     fetchMembers,
     filters,
     setFilters,
+    onMomentumScrollBegin,
   } = useActivityLog({ id, type, share, filterEnabled });
+
   const [showFilterPopup, setShowFilterPopup, setHideFilterPopup] =
     useBoolean();
 
@@ -113,6 +115,7 @@ const ActivityLogScreen = ({ route }) => {
           removeClippedSubviews={true}
           maxToRenderPerBatch={20}
           contentContainerStyle={styles.contentContainerStyle}
+          onMomentumScrollBegin={onMomentumScrollBegin}
         />
       </View>
       {(filterEnabled.user || filterEnabled.date) && (

package/src/screens/AddCommon/SelectSubUnit.js

@@ -107,6 +107,7 @@ const AddCommonSelectSubUnit = ({ route }) => {
             SCConfig.VCONNEX_CLIENT_ID,
             SCConfig.VCONNEX_REDIRECT_URI_APP,
             unit.user_id,
+            unit_id,
             subUnits[selectedIndex]?.id
           ),
         });

package/src/screens/AddCommon/__test__/SelectSubUnit.test.js

@@ -152,7 +152,7 @@ describe('Test SelectSubUnit container', () => {
         case 'AddVconnexDevice':
           expect(mockedNavigate).toBeCalledWith('Browser', {
             // eslint-disable-next-line max-len
-            link: 'https://partner-api-stg.vconnex.vn/oauth/authorize?client_id=&redirect_uri=&response_type=code&scope=SYNCH&scope=CONTROL&scope=QUERY&state=undefined@undefined',
+            link: 'https://partner-api.vconnex.vn/oauth/authorize?client_id=&redirect_uri=&response_type=code&scope=SYNCH&scope=CONTROL&scope=QUERY&state=undefined@undefined@undefined',
           });
           break;
         case 'AddDeviceNewFlow':

package/src/screens/AddNewAction/SelectSensorDevices.js

@@ -175,7 +175,7 @@ const SelectSensorDevices = memo(({ route }) => {
           {t(title)}
         </Text>
 
-        {!!listStation.length > 0 ? (
+        {listStation ? (
           <NavBar
             listStation={listStation}
             listMenuItem={listMenuItem}
@@ -185,7 +185,9 @@ const SelectSensorDevices = memo(({ route }) => {
           />
         ) : (
           <View style={styles.noneData}>
-            <Text center>{t('text_sub_unit_not_have_device')}</Text>
+            <Text center>
+              {t('you_do_not_have_the_device_or_have_share_control_device')}
+            </Text>
           </View>
         )}