@eohjsc/react-native-smart-city 0.3.29 → 0.3.32

package/src/utils/Route/index.js

@@ -43,9 +43,7 @@ const Routes = {
   AQIGuide: 'AQIGuide',
   AddNewDevice: 'AddNewDevice',
   AddNewGateway: 'AddNewGateway',
-  SetupGatewayWifi: 'SetupGatewayWifi',
   ConnectingDevices: 'ConnectingDevices',
-  ConnectingGateway: 'ConnectingGateway',
   ManageUnit: 'ManageUnit',
   SelectAddress: 'SelectAddress',
   ChooseLocation: 'ChooseLocation',
@@ -55,14 +53,26 @@ const Routes = {
   UnitDetail: 'UnitDetail',
   DrawerMain: 'DrawerMain',
   ConnectDevices: 'ConnectDevices',
-  ConnectedGateway: 'ConnectedGateway',
   SharedStack: 'SharedStack',
   DashboardStack: 'DashboardStack',
   AddSubUnit: 'AddSubUnit',
   AddCommonSelectUnit: 'AddCommonSelectUnit',
   AddCommonSelectSubUnit: 'AddCommonSelectSubUnit',
-  AddGatewaySelectGateway: 'AddGatewaySelectGateway',
-  ConnectingProcess: 'ConnectingProcess',
+
+  SelectDeviceUnit: 'SelectDeviceUnit',
+  SelectDeviceSubUnit: 'SelectDeviceSubUnit',
+  SelectDeviceType: 'SelectDeviceType',
+  SelectModbusGateway: 'SelectModbusGateway',
+  SelectZigbeeGateway: 'SelectZigbeeGateway',
+  ConnectingZigbeeDevice: 'ConnectingZigbeeDevice',
+  ScanModbusQR: 'ScanModbusQR',
+  ConnectingModbusDevice: 'ConnectingModbusDevice',
+  ScanWifiDeviceQR: 'ScanWifiDeviceQR',
+  ScanGatewayQR: 'ScanGatewayQR',
+  ConnectingWifiDevice: 'ConnectingWifiDevice',
+  ShareWifiPassword: 'ShareWifiPassword',
+  RenameNewDevices: 'RenameNewDevices',
+
   UnitMemberList: 'UnitMemberList',
   SharingSelectPermission: 'SharingSelectPermission',
   SharingInviteMembers: 'SharingInviteMembers',
@@ -70,8 +80,6 @@ const Routes = {
   WindSpeed: 'WindSpeed',
   WaterQualitySensor: 'WaterQualitySensor',
   AddLocationMaps: 'AddLocationMaps',
-  ScanSensorQR: 'ScanSensorQR',
-  ScanChipQR: 'ScanChipQR',
   ParkingAreaDetail: 'ParkingAreaDetail',
   SavedVehicle: 'SavedVehicle',
   MapDashboard: 'MapDashboard',
@@ -130,14 +138,12 @@ const Routes = {
   SmartAccountConnecting: 'SmartAccountConnecting',
   EmergencySetting: 'EmergencySetting',
   FirstWarning: 'FirstWarning',
-  ConnectWifiWarning: 'ConnectWifiWarning',
-  GatewayWifiList: 'GatewayWifiList',
   ConfirmUnitDeletion: 'ConfirmUnitDeletion',
   SmartAccount: 'SmartAccount',
   SmartHomeDashboard: 'SmartHomeDashboard',
   SetupGeneratePasscode: 'SetupGeneratePasscode',
   SideMenuDetail: 'SideMenuDetail',
-  SelectDeviceType: 'SelectDeviceType',
+  SelectIrDeviceType: 'SelectIrDeviceType',
   SelectBrand: 'SelectBrand',
   GroupButtonByType: 'GroupButtonByType',
   AutoLock: 'AutoLock',
@@ -148,11 +154,17 @@ const Routes = {
   EnterPassword: 'EnterPassword',
   SelectAddToFavorites: 'SelectAddToFavorites',
   Template: 'Template',
+  TemplateDetail: 'TemplateDetail',
   Gateway: 'Gateway',
   Smart: 'Smart',
   TemplateStack: 'TemplateStack',
   GatewayStack: 'GatewayStack',
   SmartStack: 'SmartStack',
+  MainDevMode: 'MainDevMode',
+  DrawerScreen: 'DrawerScreen',
+  Information: 'Information',
+  GatewayList: 'GatewayList',
+  EditTemplate: 'EditTemplate',
 };
 
 export default Routes;

package/src/commons/Connecting/index.js

@@ -1,67 +0,0 @@
-import React, { useEffect, useCallback, useState } from 'react';
-import { View } from 'react-native';
-import * as Progress from 'react-native-progress';
-import Text from '../Text';
-import { Colors, Constants } from '../../configs';
-import styles from './styles';
-import { useTranslations } from '../../hooks/Common/useTranslations';
-import { HeaderCustom } from '../Header';
-
-const Connecting = ({ isLoading, isConnect, isPercentConnect }) => {
-  const t = useTranslations();
-  const [percent, setPercent] = useState(0);
-
-  useEffect(() => {
-    processLoading();
-  }, [processLoading]);
-
-  const processLoading = useCallback(() => {
-    let interval;
-    if (isLoading) {
-      interval = setInterval(() => {
-        setPercent((prev) => {
-          if (prev === 1) {
-            clearInterval(interval);
-            return 1;
-          } else if (prev === 0.8 && isConnect) {
-            clearInterval(interval);
-            return 0.8;
-          } else {
-            return prev + 0.2;
-          }
-        });
-      }, 180);
-    } else {
-      clearInterval(interval);
-    }
-  }, [isConnect, isLoading]);
-  return (
-    <View style={styles.screen}>
-      <HeaderCustom title={t('connect_device')} isShowSeparator />
-      <View style={styles.body}>
-        <View style={styles.connecting}>
-          <Text type="H4" bold>
-            {t('connecting')}
-          </Text>
-        </View>
-        <View style={styles.percentLoad}>
-          <Progress.Bar
-            progress={isPercentConnect || percent}
-            animated={true}
-            color={Colors.Primary}
-            indeterminateAnimationDuration={1000}
-            height={7}
-            width={Constants.width - 80}
-            useNativeDriver={true}
-          />
-          <Text style={styles.textPercentLoad}>{`${parseInt(
-            (isPercentConnect || percent) * 100,
-            10
-          )}%`}</Text>
-        </View>
-      </View>
-    </View>
-  );
-};
-
-export default Connecting;

package/src/commons/ConnectingProcess/DeviceItem/DeviceItem.js

@@ -1,28 +0,0 @@
-import React, { memo } from 'react';
-import { View } from 'react-native';
-import styles from './DeviceItemStyles';
-import FImage from '../../FImage';
-import _TextInput from '../../Form/TextInput';
-import Images from '../../../configs/Images';
-
-const DeviceItem = memo(
-  ({ icon, name, setNewName, handleSelectionChange, isSelection }) => {
-    return (
-      <View style={styles.container}>
-        <FImage
-          source={icon ? { uri: icon } : Images.deviceIcon}
-          style={styles.iconSensor}
-        />
-        <_TextInput
-          value={name}
-          textInputStyle={styles.textItem}
-          onChange={setNewName}
-          selection={isSelection && { start: 0, end: 0 }}
-          onSelectionChange={handleSelectionChange}
-        />
-      </View>
-    );
-  }
-);
-
-export default DeviceItem;

package/src/commons/ConnectingProcess/DeviceItem/DeviceItemStyles.js

@@ -1,41 +0,0 @@
-import { StyleSheet } from 'react-native';
-import { Colors } from '../../../configs';
-
-export default StyleSheet.create({
-  container: {
-    borderRadius: 10,
-    width: 250,
-    borderWidth: 1,
-    borderColor: Colors.Gray4,
-    backgroundColor: Colors.White,
-    justifyContent: 'center',
-    flexDirection: 'row',
-    shadowColor: Colors.Shadow,
-    shadowOffset: {
-      width: 0,
-      height: 2,
-    },
-    shadowOpacity: 0.1,
-    shadowRadius: 3,
-    elevation: 6,
-    paddingLeft: 30,
-    paddingRight: 30,
-    display: 'flex',
-    alignItems: 'center',
-  },
-  iconSensor: {
-    width: 32,
-    height: 32,
-    resizeMode: 'contain',
-  },
-  textItem: {
-    borderWidth: 0,
-    borderBottomWidth: 1,
-    borderBottomColor: Colors.Primary,
-    textAlign: 'center',
-    marginTop: -10,
-    padding: 5,
-    fontSize: 16,
-    height: 50,
-  },
-});

package/src/commons/ConnectingProcess/__test__/Connecting.test.js

@@ -1,163 +0,0 @@
-import React from 'react';
-import renderer, { act } from 'react-test-renderer';
-import MockAdapter from 'axios-mock-adapter';
-
-import ConnectingProcess from '../index';
-import { SafeAreaView } from 'react-native';
-import { SCProvider } from '../../../context';
-import { mockSCStore } from '../../../context/mockStore';
-import api from '../../../utils/Apis/axios';
-import { API } from '../../../configs';
-
-const wrapComponent = (route) => (
-  <SCProvider initState={mockSCStore({})}>
-    <ConnectingProcess route={route} />
-  </SCProvider>
-);
-
-const mock = new MockAdapter(api.axiosInstance);
-
-describe('Test ConnectingProcess', () => {
-  let tree;
-
-  test('render without params', () => {
-    act(() => {
-      tree = renderer.create(wrapComponent({}));
-    });
-    const instance = tree.root;
-    const safeAreaView = instance.findAllByType(SafeAreaView);
-    expect(safeAreaView).toHaveLength(1);
-  });
-
-  test('create ConnectingProcess with devicePrefixName = SENSOR call api success', async () => {
-    const scan_sensor_data = { imei: 'SENSOR-afasdfas' };
-    const devicePrefixName = 'SENSOR';
-    const gateway = { id: 1, name: 'gateway' };
-    const station = { id: 1, icon_kit: 'a', name: 'station' };
-    const route = {
-      params: { scan_sensor_data, gateway, station, devicePrefixName },
-    };
-    mock.onPost(API.SUB_UNIT.SENSOR_SCAN(1)).reply(200);
-    await act(async () => {
-      tree = await renderer.create(wrapComponent(route));
-    });
-    const instance = tree.root;
-    const safeAreaView = instance.findAllByType(SafeAreaView);
-    expect(safeAreaView).toHaveLength(1);
-  });
-
-  test('create ConnectingProcess with devicePrefixName = SENSOR call api fail', async () => {
-    const scan_sensor_data = { imei: 'SENSOR-afasdfas' };
-    const devicePrefixName = 'SENSOR';
-    const gateway = { id: 1, name: 'gateway' };
-    const station = { id: 1, icon_kit: 'a', name: 'station' };
-    const route = {
-      params: { scan_sensor_data, gateway, station, devicePrefixName },
-    };
-    mock.onPost(API.SUB_UNIT.SENSOR_SCAN(1)).reply(400);
-    await act(async () => {
-      tree = await renderer.create(wrapComponent(route));
-    });
-    const instance = tree.root;
-    const safeAreaView = instance.findAllByType(SafeAreaView);
-    expect(safeAreaView).toHaveLength(1);
-  });
-
-  test('create ConnectingProcess with devicePrefixName = ROBOT call api success', async () => {
-    const scan_sensor_data = { imei: 'SENSOR-afasdfas' };
-    const devicePrefixName = 'ROBOT';
-    const gateway = { id: 1, name: 'gateway' };
-    const station = { id: 1, icon_kit: 'a', name: 'station' };
-    const route = {
-      params: {
-        scan_sensor_data,
-        gateway,
-        station,
-        devicePrefixName,
-        unit_id: 1,
-        unit: {
-          id: 1,
-        },
-      },
-    };
-    mock.onPost(API.UNIT.CHIP_SCAN(1)).reply(200);
-    await act(async () => {
-      tree = await renderer.create(wrapComponent(route));
-    });
-    const instance = tree.root;
-    const safeAreaView = instance.findAllByType(SafeAreaView);
-    expect(safeAreaView).toHaveLength(1);
-  });
-
-  test('create ConnectingProcess with devicePrefixName = ROBOT call api fail', async () => {
-    const scan_sensor_data = { imei: 'SENSOR-afasdfas' };
-    const devicePrefixName = 'ROBOT';
-    const gateway = { id: 1, name: 'gateway' };
-    const station = { id: 1, icon_kit: 'a', name: 'station' };
-    const route = {
-      params: {
-        scan_sensor_data,
-        gateway,
-        station,
-        devicePrefixName,
-        unit_id: 1,
-        unit: {
-          id: 1,
-        },
-      },
-    };
-    mock.onPost(API.UNIT.CHIP_SCAN(1)).reply(400);
-    await act(async () => {
-      tree = await renderer.create(wrapComponent(route));
-    });
-    const instance = tree.root;
-    const safeAreaView = instance.findAllByType(SafeAreaView);
-    expect(safeAreaView).toHaveLength(1);
-  });
-
-  test('create ConnectingProcess with devicePrefixName = LITE call api success', async () => {
-    const scan_sensor_data = { imei: 'SENSOR-afasdfas' };
-    const devicePrefixName = 'LITE';
-    const gateway = { id: 1, name: 'gateway' };
-    const station = { id: 1, icon_kit: 'a', name: 'station' };
-    const route = {
-      params: {
-        scan_sensor_data,
-        gateway,
-        station,
-        devicePrefixName,
-        unit_id: 1,
-      },
-    };
-    mock.onPost(API.UNIT.ADD_GATEWAY(1)).reply(200);
-    await act(async () => {
-      tree = await renderer.create(wrapComponent(route));
-    });
-    const instance = tree.root;
-    const safeAreaView = instance.findAllByType(SafeAreaView);
-    expect(safeAreaView).toHaveLength(1);
-  });
-
-  test('create ConnectingProcess with devicePrefixName = LITE call api fail', async () => {
-    const scan_sensor_data = { imei: 'SENSOR-afasdfas' };
-    const devicePrefixName = 'LITE';
-    const gateway = { id: 1, name: 'gateway' };
-    const station = { id: 1, icon_kit: 'a', name: 'station' };
-    const route = {
-      params: {
-        scan_sensor_data,
-        gateway,
-        station,
-        devicePrefixName,
-        unit_id: 1,
-      },
-    };
-    mock.onPost(API.UNIT.ADD_GATEWAY(1)).reply(400);
-    await act(async () => {
-      tree = await renderer.create(wrapComponent(route));
-    });
-    const instance = tree.root;
-    const safeAreaView = instance.findAllByType(SafeAreaView);
-    expect(safeAreaView).toHaveLength(1);
-  });
-});

package/src/commons/ConnectingProcess/__test__/DeviceItem.test.js

@@ -1,19 +0,0 @@
-import React from 'react';
-import renderer, { act } from 'react-test-renderer';
-import DeviceItem from '../DeviceItem/DeviceItem';
-import FImage from '../../FImage';
-import _TextInput from '../../Form/TextInput';
-
-describe('Test DeviceItem button', () => {
-  let tree;
-  test('create DeviceItem button', () => {
-    act(() => {
-      tree = renderer.create(<DeviceItem />);
-    });
-    const instance = tree.root;
-    const image = instance.findAllByType(FImage);
-    const text = instance.findAllByType(_TextInput);
-    expect(image).toHaveLength(1);
-    expect(text).toHaveLength(1);
-  });
-});

package/src/commons/ConnectingProcess/index.js

@@ -1,213 +0,0 @@
-import React, { useEffect, useCallback, useState } from 'react';
-import { SafeAreaView, View, TouchableOpacity } from 'react-native';
-import { useTranslations } from '../../hooks/Common/useTranslations';
-import Routes from '../../utils/Route';
-import { useNavigation } from '@react-navigation/native';
-import ImageSuccessfully from '../../Images/Common/SuccessfullyConnected.svg';
-
-import Text from '../Text';
-import { axiosPatch, axiosPost } from '../../utils/Apis/axios';
-import { API, Colors } from '../../configs';
-import styles from './styles';
-import DeviceItem from './DeviceItem/DeviceItem';
-import Connecting from '../Connecting';
-import { useSCContextSelector } from '../../context';
-
-const ConnectingSuccess = ({
-  unit,
-  sensor,
-  station,
-  unit_name,
-  newName,
-  setNewName,
-  isSelection,
-  handleSelectionChange,
-}) => {
-  const t = useTranslations();
-  return (
-    <View style={styles.ConnectingSuccess}>
-      <ImageSuccessfully />
-      <Text bold style={styles.connectingText}>
-        {t('successfully_connected')}
-      </Text>
-      <Text size={14} style={styles.textHome}>
-        {`${unit?.name || unit_name} ${
-          station?.name !== undefined ? '- ' + station?.name : ''
-        }`}
-      </Text>
-      <DeviceItem
-        icon={sensor?.icon_kit}
-        name={newName}
-        setNewName={setNewName}
-        handleSelectionChange={handleSelectionChange}
-        isSelection={isSelection}
-      />
-    </View>
-  );
-};
-
-const ConnectingProcess = ({ route }) => {
-  const { navigate, goBack } = useNavigation();
-  const t = useTranslations();
-
-  const {
-    scan_sensor_data,
-    gateway,
-    station,
-    unit,
-    unit_id,
-    unit_name,
-    devicePrefixName,
-    wifi_ssid,
-    wifi_pass,
-  } = route.params || {};
-  const [isLoading, setIsLoading] = useState(true);
-  const [sensor, setSensor] = useState(null);
-  const user = useSCContextSelector((state) => state?.auth?.account?.user);
-  const [newName, setNewName] = useState('');
-  const [isSelection, setIsSelection] = useState(true);
-
-  const connectingDevice = useCallback(async () => {
-    setIsLoading(true);
-    switch (devicePrefixName) {
-      case 'SENSOR': {
-        const body = { imei: scan_sensor_data?.imei, chip: gateway?.id };
-        const { success, data } = await axiosPost(
-          API.SUB_UNIT.SENSOR_SCAN(station.id),
-          body
-        );
-        if (success) {
-          setSensor(data);
-          setNewName(data?.name);
-        } else {
-          goBack();
-        }
-
-        break;
-      }
-      case 'ROBOT': {
-        const { success, data } = await axiosPost(API.UNIT.CHIP_SCAN(unit.id), {
-          imei: gateway?.imei,
-          qr_code: scan_sensor_data?.imei,
-          name: gateway?.model,
-          station: station?.id,
-          wifi_ssid: wifi_ssid,
-          wifi_pass: wifi_pass,
-          phone: user?.phone_number,
-        });
-        if (success) {
-          setSensor(data);
-          setNewName(data?.name);
-        } else {
-          goBack();
-        }
-        break;
-      }
-      case 'LITE': {
-        const { success, data } = await axiosPost(
-          API.UNIT.ADD_GATEWAY(unit_id),
-          {
-            imei: gateway?.imei,
-            chip_name: gateway?.model,
-          }
-        );
-        if (success) {
-          setSensor(data);
-          setNewName(data?.name || gateway?.model);
-        } else {
-          goBack();
-        }
-        break;
-      }
-    }
-    setIsLoading(false);
-  }, [
-    devicePrefixName,
-    scan_sensor_data?.imei,
-    gateway?.id,
-    gateway?.imei,
-    gateway?.model,
-    station,
-    goBack,
-    unit,
-    wifi_ssid,
-    wifi_pass,
-    user?.phone_number,
-    unit_id,
-  ]);
-
-  const handleDone = useCallback(async () => {
-    switch (devicePrefixName) {
-      case 'SENSOR': {
-        await axiosPatch(API.SENSOR.SENSOR_DETAIL(sensor?.id), {
-          name: newName,
-        });
-        break;
-      }
-      case 'ROBOT':
-      case 'LITE': {
-        await axiosPatch(API.CHIP.CHIP_DETAIL(sensor?.id), {
-          name: newName,
-        });
-        break;
-      }
-    }
-    navigate(Routes.UnitStack, {
-      screen: Routes.UnitDetail,
-      params: {
-        unitId: unit?.id || unit_id,
-        unitData: unit,
-        routeName: 'DashboardStack',
-        stationId: station?.id,
-      },
-    });
-  }, [
-    devicePrefixName,
-    navigate,
-    newName,
-    sensor?.id,
-    station?.id,
-    unit,
-    unit_id,
-  ]);
-
-  const handleSelectionChange = useCallback(() => {
-    setIsSelection(false);
-  }, []);
-
-  useEffect(() => {
-    connectingDevice();
-  }, [connectingDevice]);
-
-  return (
-    <SafeAreaView style={styles.wrap}>
-      <View style={styles.boxText}>
-        <Text bold style={styles.connectingText}>
-          {t('connect_device')}
-        </Text>
-        {!!isLoading && <Connecting isLoading={isLoading} />}
-        {!isLoading && (
-          <ConnectingSuccess
-            unit={unit}
-            sensor={sensor}
-            station={station}
-            unit_name={unit_name}
-            newName={newName}
-            setNewName={setNewName}
-            isSelection={isSelection}
-            handleSelectionChange={handleSelectionChange}
-          />
-        )}
-      </View>
-      {!isLoading && (
-        <TouchableOpacity style={styles.buttonDone} onPress={handleDone}>
-          <Text color={Colors.Primary} type={'H4'}>
-            {t('done')}
-          </Text>
-        </TouchableOpacity>
-      )}
-    </SafeAreaView>
-  );
-};
-
-export default ConnectingProcess;

package/src/commons/ConnectingProcess/styles.js

@@ -1,69 +0,0 @@
-import { StyleSheet } from 'react-native';
-import { Colors } from '../../configs';
-import {
-  getStatusBarHeight,
-  getBottomSpace,
-} from 'react-native-iphone-x-helper';
-
-export default StyleSheet.create({
-  wrap: {
-    paddingTop: getStatusBarHeight(true),
-    backgroundColor: Colors.White,
-    width: '100%',
-    height: '100%',
-    justifyContent: 'space-between',
-  },
-  connectingText: {
-    marginLeft: 30,
-    marginTop: 16,
-    fontSize: 20,
-    color: Colors.Gray9,
-  },
-  animatedEllipsis: {
-    fontSize: 25,
-    color: Colors.Gray9,
-    marginTop: 14,
-  },
-  warningText: {
-    marginHorizontal: 30,
-    marginTop: 16,
-    fontSize: 14,
-    color: Colors.Gray8,
-  },
-  boxText: {
-    flex: 1,
-  },
-  progressBar: {
-    flexDirection: 'column',
-    marginTop: 180,
-    marginHorizontal: 30,
-  },
-  connecting: {
-    flexDirection: 'row',
-    justifyContent: 'center',
-    marginBottom: 10,
-  },
-  percentLoad: {
-    flexDirection: 'row',
-    justifyContent: 'center',
-    alignItems: 'center',
-  },
-  textPercentLoad: {
-    marginLeft: 10,
-  },
-  ConnectingSuccess: {
-    marginTop: 180,
-    justifyContent: 'center',
-    alignItems: 'center',
-  },
-  textHome: {
-    paddingTop: 16,
-    paddingBottom: 8,
-  },
-  buttonDone: {
-    width: '100%',
-    justifyContent: 'center',
-    alignItems: 'center',
-    paddingBottom: getBottomSpace() + 24,
-  },
-});