@eohjsc/react-native-smart-city 0.2.87 → 0.2.90

package/src/commons/Device/HorizontalBarChart.js

@@ -149,6 +149,7 @@ const HorizontalBarChart = memo(({ datas, config }) => {
       <HighchartsReactNative
         styles={styles.chartStyle}
         options={chartOptions}
+        webviewStyles={styles.webviewStyle}
       />
     </View>
   );
@@ -168,4 +169,10 @@ const styles = StyleSheet.create({
     backgroundColor: Colors.White,
     flex: 1,
   },
+  webviewStyle: {
+    flex: 1,
+    minHeight: 200,
+    height: 300,
+    opacity: 0.99,
+  },
 });

package/src/commons/Device/ItemDevice.js

@@ -12,16 +12,12 @@ import { useTranslations } from '../../hooks/Common/useTranslations';
 import ItemQuickAction from '../../commons/Action/ItemQuickAction';
 import Text from '../../commons/Text';
 import { isDeviceConnected } from '../../iot/RemoteControl/Bluetooth';
+import { useSCContextSelector } from '../../context';
 
-import { Colors, Constants } from '../../configs';
-import { TESTID, DEVICE_TYPE } from '../../configs/Constants';
+import { Colors } from '../../configs';
+import { TESTID, DEVICE_TYPE, DEVICE_SIZE } from '../../configs/Constants';
 import FImage from '../../commons/FImage';
 
-const marginItem = 12;
-const marginHorizontal = 16;
-const widthItem = (Constants.width - marginHorizontal * 2 - marginItem) / 2;
-const heightItem = (widthItem / 166) * 106;
-
 const ItemDevice = memo(
   ({
     svgMain,
@@ -30,14 +26,21 @@ const ItemDevice = memo(
     sensor,
     unit,
     station,
-    isNetworkConnected,
     isGGHomeConnected,
+    serverDown,
     status,
     wrapStyle,
   }) => {
     const t = useTranslations();
     const navigation = useNavigation();
 
+    const isBluetoothEnabled = useSCContextSelector(
+      (state) => state.app.isBluetoothEnabled
+    );
+    const isNetworkConnected = useSCContextSelector(
+      (state) => state.app.isNetworkConnected
+    );
+
     const goToSensorDisplay = useCallback(() => {
       navigation.navigate(Routes.DeviceDetail, {
         unitData: unit,
@@ -59,11 +62,11 @@ const ItemDevice = memo(
 
     const isConnectedViaInternet =
       status === undefined
-        ? isNetworkConnected && sensor.is_connected
-        : isNetworkConnected && status.is_connected;
-    const isConnectedViaBLE = isDeviceConnected(
-      sensor?.remote_control_options?.bluetooth?.address
-    );
+        ? !serverDown && isNetworkConnected && sensor.is_connected
+        : !serverDown && isNetworkConnected && status.is_connected;
+    const isConnectedViaBLE =
+      isBluetoothEnabled &&
+      isDeviceConnected(sensor?.remote_control_options?.bluetooth?.address);
     const isConnectedViaGGHome =
       !!sensor &&
       sensor?.is_other_device &&
@@ -129,8 +132,8 @@ const styles = StyleSheet.create({
     shadowOpacity: 0.1,
     shadowRadius: 3,
     elevation: 4,
-    width: widthItem,
-    height: heightItem,
+    width: DEVICE_SIZE.width,
+    height: DEVICE_SIZE.height,
     backgroundColor: Colors.White,
     justifyContent: 'space-between',
     marginBottom: 8,

package/src/commons/Device/LinearChart.js

@@ -89,7 +89,11 @@ function LinearChart({ datas }) {
 
   return (
     <View style={styles.container}>
-      <HighchartsReactNative styles={styles.chartStyle} options={options} />
+      <HighchartsReactNative
+        styles={styles.chartStyle}
+        webviewStyles={styles.webviewStyle}
+        options={options}
+      />
     </View>
   );
 }
@@ -108,4 +112,10 @@ const styles = StyleSheet.create({
     backgroundColor: Colors.White,
     flex: 1,
   },
+  webviewStyle: {
+    flex: 1,
+    minHeight: 200,
+    height: 300,
+    opacity: 0.99,
+  },
 });

package/src/commons/SubUnit/Favorites/index.js

@@ -15,7 +15,7 @@ const SubUnitFavorites = ({
   unit,
   isOwner,
   favorites,
-  isNetworkConnected,
+  serverDown,
   isGGHomeConnected,
   wrapItemStyle,
 }) => {
@@ -72,8 +72,8 @@ const SubUnitFavorites = ({
               sensor={sensor}
               unit={unit}
               station={sensor.station}
-              isNetworkConnected={isNetworkConnected}
               isGGHomeConnected={isGGHomeConnected}
+              serverDown={serverDown}
               status={sensorsStatus.find((s) => s.id === sensor.id)}
               wrapStyle={wrapItemStyle}
             />

package/src/commons/SubUnit/ShortDetail.js

@@ -4,10 +4,11 @@ import { useNavigation, useIsFocused } from '@react-navigation/native';
 import { useTranslations } from '../../hooks/Common/useTranslations';
 
 import { Images, Device, API } from '../../configs';
-import { TESTID } from '../../configs/Constants';
+import { DEVICE_TYPE, TESTID } from '../../configs/Constants';
 import { Section } from '../Section';
 import Text from '../Text';
 import ItemDevice from '../Device/ItemDevice';
+import ItemHanetDevice from '../Device/Hanet/ItemHanetDevice';
 import ItemAddNew from '../Device/ItemAddNew';
 import { standardizeCameraScreenSize } from '../../utils/Utils';
 import Routes from '../../utils/Route';
@@ -22,7 +23,7 @@ const { standardizeWidth, standardizeHeight } = standardizeCameraScreenSize(
 const ShortDetailSubUnit = ({
   unit,
   station,
-  isNetworkConnected,
+  serverDown,
   isGGHomeConnected,
 }) => {
   const t = useTranslations();
@@ -126,24 +127,42 @@ const ShortDetailSubUnit = ({
 
       <View style={styles.boxDevices}>
         {!!station.sensors &&
-          station.sensors.map((sensor, index) => (
-            <ItemDevice
-              key={`sensor-${sensor.id}`}
-              id={sensor.id}
-              svgMain={sensor.icon || 'sensor'}
-              statusIcon={sensor.action && sensor.action.icon}
-              statusColor={sensor.action && sensor.action.color}
-              description={sensor.value}
-              title={sensor.name}
-              index={index}
-              sensor={sensor}
-              unit={unit}
-              station={station}
-              isNetworkConnected={isNetworkConnected}
-              isGGHomeConnected={isGGHomeConnected}
-              status={sensorsStatus.find((s) => s.id === sensor.id)}
-            />
-          ))}
+          station.sensors.map((sensor, index) => {
+            switch (sensor.device_type) {
+              case DEVICE_TYPE.HANET:
+                return (
+                  <ItemHanetDevice
+                    key={`sensor-${sensor.id}`}
+                    id={sensor.id}
+                    svgMain={sensor.icon || 'sensor'}
+                    title={sensor.name}
+                    index={index}
+                    sensor={sensor}
+                    unit={unit}
+                    station={station}
+                  />
+                );
+              default:
+                return (
+                  <ItemDevice
+                    key={`sensor-${sensor.id}`}
+                    id={sensor.id}
+                    svgMain={sensor.icon || 'sensor'}
+                    statusIcon={sensor.action && sensor.action.icon}
+                    statusColor={sensor.action && sensor.action.color}
+                    description={sensor.value}
+                    title={sensor.name}
+                    index={index}
+                    sensor={sensor}
+                    unit={unit}
+                    station={station}
+                    isGGHomeConnected={isGGHomeConnected}
+                    serverDown={serverDown}
+                    status={sensorsStatus.find((s) => s.id === sensor.id)}
+                  />
+                );
+            }
+          })}
         <ItemAddNew title={t('add_new_device')} onAddNew={handleOnAddNew} />
       </View>
     </Section>

package/src/configs/API.js

@@ -187,6 +187,28 @@ const API = {
         `https://partner-api.vconnex.vn/oauth/authorize?client_id=${client_id}&redirect_uri=${redirect_uri}&response_type=code&scope=SYNCH&scope=CONTROL&scope=QUERY&state=${user_id}@${unit_id}@${station_id}`,
     },
   },
+  CAMERA: {
+    HANET: {
+      CHECKIN: (device_id) =>
+        SCConfig.apiRoot +
+        `/camera_manager/hanet/cameras/${device_id}/checkin/`,
+      PLACE_MEMBERS: (place_id) =>
+        SCConfig.apiRoot + `/camera_manager/hanet/places/${place_id}/members/`,
+      RENAME_MEMBER: (place_id, member_id) =>
+        SCConfig.apiRoot +
+        `/camera_manager/hanet/places/${place_id}/members/${member_id}/rename/`,
+      REMOVE_MEMBER: (place_id, member_id) =>
+        SCConfig.apiRoot +
+        `/camera_manager/hanet/places/${place_id}/members/${member_id}/`,
+      UPDATE_FACE_ID: (place_id, member_id) =>
+        SCConfig.apiRoot +
+        `/camera_manager/hanet/places/${place_id}/members/${member_id}/update_face_id/`,
+      REGISTER: (place_id) =>
+        SCConfig.apiRoot + `/camera_manager/hanet/places/${place_id}/members/`,
+      PUSHER_AUTH: () =>
+        SCConfig.apiRoot + '/camera_manager/hanet/pusher/auth/',
+    },
+  },
   NOTIFICATION: {
     LIST_EOH_NOTIFICATIONS: (page, type) =>
       SCConfig.apiRoot + `/notifications/eoh/?page=${page}&type=${type}`,

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',
@@ -637,6 +667,13 @@ 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',

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

@@ -50,6 +50,8 @@ export const mockSCStore = (data: ContextData): ContextData => {
     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 = [];
@@ -192,24 +191,6 @@ export const sendDataOverBluetooth = async (
   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/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={{
@@ -166,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}

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

@@ -93,9 +93,9 @@ export default ({ id, type, share, filterEnabled }) => {
         setData(api.standardizeData(results));
       } else {
         dataTemp = dataTemp.concat(results);
-        setIsCanLoadMore(page < Math.ceil(data.count / 20));
         setData(api.standardizeData(dataTemp));
       }
+      setIsCanLoadMore(page < Math.ceil(data.count / 20));
     }
     page === 1 ? setIsRefreshing(false) : setIsLoading(false);
   };