@eohjsc/react-native-smart-city 0.2.86 → 0.2.89

package/src/commons/Device/LinearChart.js

@@ -47,46 +47,9 @@ const chartOptions = {
       text: '',
     },
     labels: {
-      formatter: function (value) {
-        const time = new Date(this.value || value);
-        let date = ('0' + time.getDate()).slice(-2);
-        let month = ('0' + (time.getMonth() + 1)).slice(-2);
-        return `${date}.${month}`;
-      },
-    },
-    minRange: 3600 * 24 * 1000,
-    tickInterval: 24 * 3600 * 1000,
-  },
-  plotOptions: {
-    series: {
-      events: {
-        legendItemClick: function () {
-          const { index, visible, chart } = this;
-          const { series } = chart;
-          series.forEach((serie, i) => {
-            if (i !== index) {
-              serie.visible ? serie.show() : serie.hide();
-            }
-          });
-          const isHiding = (serie, i) => {
-            if (i === index) {
-              return visible;
-            }
-            return !serie.visible;
-          };
-          if (this.chart.series.every(isHiding)) {
-            this.chart.yAxis[0].update({
-              min: 0,
-              max: 100,
-            });
-          } else {
-            this.chart.yAxis[0].update({
-              min: undefined,
-              max: undefined,
-            });
-          }
-        },
-      },
+      align: 'center',
+      padding: 70,
+      format: '{value:%d.%m %H:%M}',
     },
   },
 };
@@ -126,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>
   );
 }
@@ -145,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/Device/__test__/DisconnectedView.test.js

@@ -5,9 +5,9 @@ import renderer, { act } from 'react-test-renderer';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
 
-const wrapComponent = (sensor) => (
+const wrapComponent = (sensor, isDeviceHasBle) => (
   <SCProvider initState={mockSCStore({})}>
-    <DisconnectedView sensor={sensor} />
+    <DisconnectedView sensor={sensor} isDeviceHasBle={isDeviceHasBle} />
   </SCProvider>
 );
 
@@ -63,4 +63,15 @@ describe('Test DisconnectedView', () => {
     const Views = instance.findAllByType(View);
     expect(Views).toHaveLength(15);
   });
+
+  test('render DisconnectedView text check bluetooth', () => {
+    const isDeviceHasBle = true;
+    const sensor = { icon: 'test' };
+    act(() => {
+      tree = renderer.create(wrapComponent(sensor, isDeviceHasBle));
+    });
+    const instance = tree.root;
+    const Views = instance.findAllByType(View);
+    expect(Views).toHaveLength(17);
+  });
 });

package/src/commons/RowItem/index.js

@@ -21,7 +21,8 @@ export const RowItem = memo(
     type, //primary | disable | undefined
     leftIcon,
     text,
-    subtext,
+    isShowSubText = true,
+    subtext = '',
     subtextColor = Colors.Gray6,
     rightComponent,
     onPress,
@@ -40,14 +41,18 @@ export const RowItem = memo(
         <View style={styles.wrapItem}>
           <TouchableOpacity onPress={onPress} disabled={type === 'disable'}>
             <View style={styles.Border}>
-              <View style={styles.paddingLeft16}>
-                <CircleView size={40} backgroundColor={circleColor} center>
-                  {leftIcon}
-                </CircleView>
-              </View>
+              {!!leftIcon && (
+                <View style={styles.paddingLeft16}>
+                  <CircleView size={40} backgroundColor={circleColor} center>
+                    {leftIcon}
+                  </CircleView>
+                </View>
+              )}
               <View style={styles.columeFlex}>
                 <Text style={styles.titleName}> {text}</Text>
-                <Text style={styles.status}> {subtext}</Text>
+                {!!isShowSubText && (
+                  <Text style={styles.status}> {subtext}</Text>
+                )}
               </View>
               {!!rightComponent && (
                 <View style={styles.endFlex}>{rightComponent}</View>

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/commons/WheelDateTimePicker/index.js

@@ -92,10 +92,14 @@ const WheelDateTimePicker = ({
   }, [dateSelected, hourSelected, minuteSelected, onCancel, onPicked]);
 
   const title = useMemo(() => {
-    if (mode === 'time') {
-      return t('set_time');
+    switch (mode) {
+      case 'time':
+        return t('set_time');
+      case 'datetime':
+        return t('set_date_time');
+      default:
+        return t('minutes');
     }
-    return t('set_date_time');
   }, [t, mode]);
 
   return (
@@ -125,7 +129,7 @@ const WheelDateTimePicker = ({
             style={styles.picker}
           />
         </View>
-      ) : (
+      ) : mode === 'datetime' ? (
         <View style={styles.container}>
           <Picker
             dataSource={dateData}
@@ -153,6 +157,16 @@ const WheelDateTimePicker = ({
             style={styles.picker}
           />
         </View>
+      ) : (
+        <View style={styles.container}>
+          <Picker
+            dataSource={minuteData}
+            selectedIndex={indexInitialMinute}
+            onValueChange={onValueMinuteChange}
+            keyPrefix="minute"
+            style={styles.picker}
+          />
+        </View>
       )}
       <ViewButtonBottom
         leftTitle={t('cancel')}

package/src/configs/API.js

@@ -184,7 +184,29 @@ const API = {
     VCONNEX: {
       AUTHORIZE: (client_id, redirect_uri, user_id, unit_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}@${unit_id}@${station_id}`,
+        `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: {

package/src/configs/Colors.js

@@ -110,6 +110,7 @@ export const Colors = {
   Blue10: '#1890FF',
   Blue11: '#096DD9',
   Blue12: '#0050B3',
+  Blue13: '#E2F0F8',
 
   //Range Volcano:
   Volcano3: '#FFBB96',

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 = {
@@ -682,4 +729,5 @@ export const SENSOR_TYPE = {
   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>
+  );
+});