@eohjsc/react-native-smart-city 0.2.65 → 0.2.69

package/src/utils/Apis/axios.js

@@ -2,7 +2,6 @@ import axios from 'axios';
 import { deleteData, getData, storeData } from '../Storage';
 import { ToastBottomHelper } from '../Utils';
 import NetInfo from '@react-native-community/netinfo';
-import { Platform } from 'react-native';
 
 export const replaceParams = (apiURL, params) => {
   let _result = apiURL;
@@ -166,9 +165,9 @@ export function createFormData(data, list_file_field) {
       }
 
       formData.append(key, {
-        uri: Platform.OS === 'ios' ? item.sourceURL : item.path,
-        type: item.mime,
         name: item.filename || item.path?.split('/').pop(),
+        type: item.mime,
+        uri: item.path,
       });
       return;
     }

package/src/utils/I18n/translations/en.json

@@ -240,8 +240,10 @@
   "invalid_phone_number": "Invalid phone number",
   "Found bluetooth %{name} for remote control": "Found bluetooth %{name} for remote control",
   "Sending command via bluetooth": "Sending command via bluetooth",
-  "Command is sent to device via bluetooth": "Command is sent to device via bluetooth",
-  "Command is fail to send via bluetooth": "Command is fail to send via bluetooth",
+  "command_is_sent_to_device_via_bluetooth": "Command is sent to device via bluetooth",
+  "command_is_fail_to_send_via_bluetooth": "Command is fail to send via bluetooth",
+  "control_device_via_bluetooth_successfully": "Control device via bluetooth successfully",
+  "control_device_via_bluetooth_failed": "Control device via bluetooth failed",
   "Sending command via internet": "Sending command via internet",
   "Command is sent to device via internet": "Command is sent to device via internet",
   "Command is fail to send via internet": "Command is fail to send via internet",
@@ -796,7 +798,7 @@
   "smart": "Smart",
   "smart_account": "Smart account",
   "delete_smart_account": "Delete smart account",
-  "are_you_sure_want_to_delete": "Are you sure you want to delete {text} ?",
+  "this_action_will_remove_all_related_devices": "This action will remove all related devices and it’s setting forever. Do you wish to continue?",
   "multi_unit": "Multi Units",
   "edit_device": "Edit Device",
   "device_name": "Device name",
@@ -856,6 +858,21 @@
   "volume": "Volume",
   "this_notification_will_be_updated_soon": "This notification will be updated soon",
   "text_submit": "Submit",
+  "connecting": "Connecting",
+  "connect_device": "Connect Device",
+  "connect": "Connect",
+  "server_error": "Server Error",
+  "add_gateway_success": "Add gateway success",
+  "set_network": "Set network",
+  "select_wifi": "Select your wifi network",
+  "enter_wifi_password": "Enter wifi password",
+  "gateway_warning_content_1": "To bring you good experiences, ",
+  "gateway_warning_content_2": "your device needs a permanent wifi connection.",
+  "gateway_warning_content_3": "In the next steps, you will be instructed to connect to wifi for the device. ",
+  "gateway_warning_content_4": "To give you a good experience, you need to know the name and password of the wifi network and make sure the device is placed in a good location.",
+  "warning_beta_test_feature": "This feature is in beta test, not official yet",
+  "connecting_gateway_warning_1": "By continuing, EoH needs to connect to the device's wifi.",
+  "connecting_gateway_warning_2": "A message will appear asking you to connect.",
   "remove_account": "Remove Account",
   "text_sub_unit_not_have_device": "You don't have sub-unit with a device to control",
   "tap_to_add_new_schedule": "Tap + to add new schedule",
@@ -866,5 +883,11 @@
   "curtain_opens": "Curtain opens",
   "curtain_closes": "Curtain closes",
   "schedule_name": "Schedule name",
-  "enter_name": "Enter name"
+  "enter_name": "Enter name",
+  "name_smart_account": "Smart Account",
+  "location_permission_required_wifi_title": "Location permission is required for WiFi connections",
+  "location_permission_required_wifi_message": "This app needs location permission as this is required to scan for wifi networks.",
+  "deny": "DENY",
+  "allow": "ALLOW",
+  "yes_remove": "Yes,remove"
 }

package/src/utils/I18n/translations/vi.json

@@ -276,8 +276,10 @@
   "invalid_phone_number": "Số điện thoại không hợp lệ.",
   "Found bluetooth %{name} for remote control": "Tìm thấy thiết bị điều khiển bluetooth %{name}",
   "Sending command via bluetooth": "Đang gởi lệnh thông qua bluetooth",
-  "Command is sent to device via bluetooth": "Lệnh được gởi tới thiết bị thông qua bluetooth",
-  "Command is fail to send via bluetooth": "Không thế gởi tới thiết bị thông qua bluetooth",
+  "command_is_sent_to_device_via_bluetooth": "Lệnh được gởi tới thiết bị thông qua bluetooth",
+  "command_is_fail_to_send_via_bluetooth": "Không thế gởi tới thiết bị thông qua bluetooth",
+  "control_device_via_bluetooth_successfully": "Điều khiển thiết bị qua bluetooth thành công",
+  "control_device_via_bluetooth_failed": "Điều khiển thiết bị qua bluetooth thất bại",
   "Sending command via internet": "Đang gởi lệnh thông qua internet",
   "Command is sent to device via internet": "Lệnh được gởi tới thiết bị thông qua internet",
   "Command is fail to send via internet": "Không thế gởi tới thiết bị thông qua internet",
@@ -797,7 +799,7 @@
   "smart": "Thông minh",
   "smart_account": "Tài khoản thông minh",
   "delete_smart_account": "Xóa tài khoản thông minh",
-  "are_you_sure_want_to_delete": "Bạn có muốn xóa {text} ?",
+  "this_action_will_remove_all_related_devices": "Hành động này sẽ xóa tất cả các thiết bị liên quan và nó sẽ cài đặt vĩnh viễn. Bạn có muốn tiếp tục không?",
   "edit_device": "Chỉnh sửa thiết bị",
   "device_name": "Tên thiết bị",
   "rename_successfully": "Đổi tên thành công!",
@@ -857,6 +859,21 @@
   "volume": "Âm lượng",
   "this_notification_will_be_updated_soon": "Thông báo này sẽ sớm được cập nhật",
   "text_submit": "Xác nhận",
+  "connecting": "Đang kết nối",
+  "connect_device": "Kết nối thiết bị",
+  "connect": "Kết nối",
+  "server_error": "Lỗi hệ thống",
+  "set_network": "Chọn mạng",
+  "select_wifi": "Chọn mạng wifi của bạn",
+  "enter_wifi_password": "Nhập mật khẩu wifi",
+  "gateway_warning_content_1": "Để mang đến cho bạn những trải nghiệm tốt, ",
+  "gateway_warning_content_2": "thiết bị cần kết nối wifi thường trực.",
+  "gateway_warning_content_3": "Trong các bước tiếp theo, bạn sẽ được hướng dẫn kết nối wifi cho thiết bị. ",
+  "gateway_warning_content_4": "Bạn cần biết tên và mật khẩu của mạng wifi và đảm bảo thiết bị được đặt ở vị trí tốt.",
+  "warning_beta_test_feature": "Tính năng này đang ở giai đoạn beta test, chưa phải bản chính thức.",
+  "connecting_gateway_warning_1": "Bằng việc tiếp tục, EoH cần kết nối với Wifi của thiết bị.",
+  "connecting_gateway_warning_2": "Một thông báo sẽ hiện lên và yêu cầu bạn kết nối.",
+  "add_gateway_success": "Thêm gateway thành công",
   "tap_to_add_new_schedule": "Nhấn + để thêm lịch trình mới",
   "remove_account": "Xóa tài khoản",
    "text_subunit_not_have_device": "Bạn không có khu vực nào có thiết bị để điều khiển",
@@ -868,5 +885,11 @@
   "curtain_opens": "Rèm mở",
   "curtain_closes": "Rèm đóng",
   "schedule_name": "Tên lịch trình",
-  "enter_name": "Nhập tên"
+  "enter_name": "Nhập tên",
+  "name_smart_account": "Smart Account",
+  "location_permission_required_wifi_title": "Quyền vị trí là bắt buộc đối với kết nối WiFi",
+  "location_permission_required_wifi_message": "Ứng dụng này cần có quyền định vị vì ứng dụng này được yêu cầu để quét các mạng Wi-Fi.",
+  "deny": "Từ chối",
+  "allow": "Cho phép",
+  "yes_remove": "Có,loại bỏ"
 }

package/src/utils/Route/index.js

@@ -121,7 +121,11 @@ const Routes = {
   ListDeviceSmartAccount: 'ListDeviceSmartAccount',
   SmartAccountConnecting: 'SmartAccountConnecting',
   EmergencySetting: 'EmergencySetting',
+  FirstWarning: 'FirstWarning',
+  ConnectWifiWarning: 'ConnectWifiWarning',
+  GatewayWifiList: 'GatewayWifiList',
   ConfirmUnitDeletion: 'ConfirmUnitDeletion',
+  SmartAccount: 'SmartAccount',
 };
 
 export default Routes;

package/src/utils/Utils.js

@@ -120,10 +120,6 @@ export const removeFromString = (str, index) => {
   return str.substr(0, index) + str.substr(index + 1);
 };
 
-export const arePropsEqual = (prevProps, nextProps) => {
-  return JSON.stringify(prevProps) === JSON.stringify(nextProps);
-};
-
 export default {
   validateEmail,
   isObjectEmpty,

package/src/commons/ActionGroup/__test__/MenuActionAddSchedule.test.js

@@ -1,71 +0,0 @@
-import React from 'react';
-import renderer, { act } from 'react-test-renderer';
-
-import MenuActionAddSchedule from '../hooks/MenuActionAddSchedule';
-import { SCProvider } from '../../../context';
-import { mockSCStore } from '../../../context/mockStore';
-import RecurringDetail from '../hooks/RecurringDetail';
-import WheelDateTimePicker from '../../WheelDateTimePicker';
-
-const mockSetState = jest.fn();
-jest.mock('react', () => {
-  return {
-    ...jest.requireActual('react'),
-    memo: (x) => x,
-    useState: jest.fn((init) => [init, mockSetState]),
-  };
-});
-
-const wrapComponent = (actionGroup) => (
-  <SCProvider initState={mockSCStore({})}>
-    <MenuActionAddSchedule />
-  </SCProvider>
-);
-
-const mockedNavigate = jest.fn();
-
-jest.mock('@react-navigation/native', () => {
-  return {
-    ...jest.requireActual('@react-navigation/native'),
-    useNavigation: () => ({
-      goBack: mockedNavigate,
-    }),
-  };
-});
-
-jest.mock('react', () => {
-  return {
-    ...jest.requireActual('react'),
-    memo: (x) => x,
-  };
-});
-
-jest.mock('axios');
-
-describe('Test MenuActionAddSchedule', () => {
-  let tree;
-
-  test('test render MenuActionAddSchedule', async () => {
-    await act(async () => {
-      tree = await renderer.create(wrapComponent());
-    });
-    const instance = tree.root;
-
-    const recurringDetail = instance.findByType(RecurringDetail);
-    await act(async () => {
-      recurringDetail.props.onShowSetDateTime();
-    });
-
-    const wheelDateTimePicker = instance.findByType(WheelDateTimePicker);
-
-    await act(async () => {
-      wheelDateTimePicker.props.onPicked();
-    });
-
-    await act(async () => {
-      wheelDateTimePicker.props.onCancel();
-    });
-
-    expect(wheelDateTimePicker.props.isVisible).toEqual(false);
-  });
-});

package/src/commons/ActionGroup/hooks/AccessScheduleDetailStyles.js

@@ -1,41 +0,0 @@
-import { StyleSheet } from 'react-native';
-import { Colors } from '../../../configs';
-
-export default StyleSheet.create({
-  title: {
-    marginTop: 16,
-  },
-  value: {
-    marginTop: 8,
-    marginBottom: 12,
-  },
-  repeatWrap: {
-    flexDirection: 'row',
-    justifyContent: 'space-around',
-    marginTop: 16,
-  },
-  repeatItem: {
-    width: 24,
-    height: 24,
-    justifyContent: 'center',
-    alignItems: 'center',
-    borderRadius: 12,
-    borderWidth: 0,
-    borderColor: Colors.Orange,
-  },
-  repeatItemSelected: {
-    borderWidth: 1,
-  },
-  repeatText: {
-    lineHeight: 16,
-  },
-  curtainText: {
-    fontSize: 17,
-    marginTop: 12,
-    color: Colors.Gray9,
-  },
-  boder: {
-    borderBottomWidth: 1,
-    borderColor: Colors.Gray4,
-  },
-});

package/src/commons/ActionGroup/hooks/MenuActionAddSchedule.js

@@ -1,110 +0,0 @@
-import React, { memo, useCallback, useState } from 'react';
-import { View } from 'react-native';
-import { useTranslations } from '../../../hooks/Common/useTranslations';
-
-import Text from '../../Text';
-import { ModalCustom } from '../../Modal';
-import ViewButtonBottom from '../../ViewButtonBottom';
-import WheelDateTimePicker from '../../WheelDateTimePicker';
-import moment from 'moment';
-import { useBoolean } from '../../../hooks/Common';
-import RecurringDetail from './RecurringDetail';
-import _TextInput from '../../../commons/Form/TextInput';
-import styles from './MenuActionAddScheduleStyle';
-
-const MenuActionAddSchedule = memo(({ visible, hideModal, onItemClick }) => {
-  const t = useTranslations();
-
-  const [stateDateTimePicker, setStateDateTimePicker] = useState({
-    isVisible: false,
-    mode: 'time',
-    defaultValue: moment().valueOf(),
-    setter: null,
-  });
-
-  const [lockShowing, releaseLockShowing, acquireLockShowing] =
-    useBoolean(true);
-  const [recurringTimeStart, setRecurringTimeStart] = useState('');
-  const [recurringTimeEnd, setRecurringTimeEnd] = useState('');
-  const [recurringTimeRepeat, setRecurringTimeRepeat] = useState('');
-
-  const onShowSetDateTime = useCallback(
-    (currentValue, setter, mode) => {
-      acquireLockShowing();
-      setStateDateTimePicker((state) => ({
-        ...state,
-        isVisible: true,
-        mode: mode,
-        defaultValue: currentValue,
-        setter: setter,
-      }));
-    },
-    [setStateDateTimePicker, acquireLockShowing]
-  );
-
-  const onDateTimePicked = useCallback(
-    (timeData) => {
-      const setter = stateDateTimePicker.setter;
-      setter && setter(moment(timeData));
-    },
-    [stateDateTimePicker]
-  );
-
-  const onHideSetDateTime = useCallback(() => {
-    acquireLockShowing();
-    setStateDateTimePicker((state) => ({
-      ...state,
-      isVisible: false,
-    }));
-  }, [setStateDateTimePicker, acquireLockShowing]);
-
-  return (
-    <ModalCustom
-      isVisible={visible}
-      onBackButtonPress={hideModal}
-      onBackdropPress={hideModal}
-      style={styles.container}
-    >
-      <View style={styles.popoverStyle}>
-        <View style={styles.modalWrapper}>
-          <View style={styles.modalHeader}>
-            <Text style={styles.modalHeaderText}>{t('add_schedule')}</Text>
-            <View style={styles.boder} />
-            <RecurringDetail
-              onShowSetDateTime={onShowSetDateTime}
-              recurringTimeStart={recurringTimeStart}
-              recurringTimeEnd={recurringTimeEnd}
-              recurringTimeRepeat={recurringTimeRepeat}
-              setRecurringTimeStart={setRecurringTimeStart}
-              setRecurringTimeEnd={setRecurringTimeEnd}
-              setRecurringTimeRepeat={setRecurringTimeRepeat}
-            />
-
-            <Text style={styles.subName}>{t('schedule_name')}</Text>
-            <_TextInput
-              placeholder={t('enter_name')}
-              wrapStyle={styles.noMarginTop}
-              textInputStyle={styles.textInput}
-            />
-            <View style={styles.ViewButtonBottom}>
-              <ViewButtonBottom
-                leftTitle={t('cancel')}
-                onLeftClick={hideModal}
-                rightTitle={t('done')}
-              />
-            </View>
-            <WheelDateTimePicker
-              mode={stateDateTimePicker.mode}
-              isVisible={stateDateTimePicker.isVisible && lockShowing}
-              defaultValue={stateDateTimePicker.defaultValue}
-              onPicked={onDateTimePicked}
-              onCancel={onHideSetDateTime}
-              onHide={releaseLockShowing}
-            />
-          </View>
-        </View>
-      </View>
-    </ModalCustom>
-  );
-});
-export default MenuActionAddSchedule;

package/src/commons/ActionGroup/hooks/MenuActionAddScheduleStyle.js

@@ -1,69 +0,0 @@
-import { Colors } from '../../../configs';
-import { StyleSheet } from 'react-native';
-
-export default StyleSheet.create({
-  container: {
-    flex: 1,
-    margin: 0,
-  },
-  popoverStyle: {
-    width: '100%',
-    backgroundColor: Colors.White,
-    bottom: 0,
-    left: 0,
-    position: 'absolute',
-    borderRadius: 10,
-  },
-  modalWrapper: {
-    flex: 1,
-    flexDirection: 'column',
-    backgroundColor: Colors.White,
-    borderRadius: 10,
-  },
-  modalHeader: {
-    padding: 16,
-    backgroundColor: Colors.White,
-    justifyContent: 'flex-start',
-  },
-  modalHeaderText: {
-    fontSize: 17,
-    lineHeight: 24,
-    color: Colors.Gray9,
-    fontWeight: 'bold',
-    borderTopLeftRadius: 20,
-    borderTopRightRadius: 20,
-    marginVertical: 20,
-  },
-  boder: {
-    borderBottomWidth: 1,
-    borderColor: Colors.Gray4,
-  },
-  subName: {
-    color: Colors.Gray8,
-    marginTop: 12,
-  },
-  ViewButtonBottom: {
-    borderTopWidth: 1,
-    borderTopColor: Colors.Gray4,
-  },
-  scheduleName: {
-    fontSize: 17,
-    marginTop: 12,
-    color: Colors.Gray9,
-    marginBottom: 12,
-  },
-  noMarginTop: {
-    marginTop: 0,
-    backgroundColor: Colors.White,
-  },
-  textInput: {
-    marginTop: 0,
-    borderWidth: 0,
-    borderBottomWidth: 1,
-    borderBottomColor: Colors.Gray4,
-    paddingLeft: 0,
-    backgroundColor: Colors.White,
-    fontSize: 17,
-    color: Colors.Gray9,
-  },
-});

package/src/commons/ActionGroup/hooks/RecurringDetail.js

@@ -1,97 +0,0 @@
-import React, { useCallback } from 'react';
-import { View, TouchableOpacity } from 'react-native';
-import { useTranslations } from '../../../hooks/Common/useTranslations';
-
-import Text from '../../../commons/Text';
-import { Colors } from '../../../configs';
-import { REPEAT_ITEMS } from '../../../screens/GuestInfo/constant';
-import styles from './AccessScheduleDetailStyles';
-
-const RecurringDetail = ({
-  onShowSetDateTime,
-  recurringTimeStart,
-  recurringTimeEnd,
-  recurringTimeRepeat,
-  setRecurringTimeStart,
-  setRecurringTimeEnd,
-  setRecurringTimeRepeat,
-}) => {
-  const t = useTranslations();
-  const onSetTimeStart = useCallback(() => {
-    onShowSetDateTime();
-  }, [onShowSetDateTime]);
-
-  const onSetTimeEnd = useCallback(() => {
-    onShowSetDateTime();
-  }, [onShowSetDateTime]);
-
-  const onSetRepeat = useCallback(
-    (item) => {
-      const index = recurringTimeRepeat.indexOf(item.value);
-      if (index !== -1) {
-        setRecurringTimeRepeat([
-          ...recurringTimeRepeat.slice(0, index),
-          ...recurringTimeRepeat.slice(index + 1),
-        ]);
-      } else {
-        setRecurringTimeRepeat([...recurringTimeRepeat, item.value]);
-      }
-    },
-    [recurringTimeRepeat, setRecurringTimeRepeat]
-  );
-
-  const renderRepeatItem = useCallback(
-    (item, index, isSelected) => {
-      return (
-        <TouchableOpacity
-          key={index}
-          style={[styles.repeatItem, isSelected && styles.repeatItemSelected]}
-          onPress={() => onSetRepeat(item)}
-        >
-          <Text
-            type="Body"
-            lineHeight={16}
-            color={isSelected ? Colors.Orange : item.color}
-            style={styles.repeatText}
-          >
-            {item.text}
-          </Text>
-        </TouchableOpacity>
-      );
-    },
-    [onSetRepeat]
-  );
-
-  return (
-    <View>
-      <Text style={styles.curtainText}>{t('curtain_opens')}</Text>
-      <TouchableOpacity onPress={onSetTimeStart}>
-        <Text type="Body" color={Colors.Orange} style={styles.value}>
-          07:00 AM
-        </Text>
-      </TouchableOpacity>
-      <View style={styles.boder} />
-      <Text style={styles.curtainText}>{t('curtain_closes')}</Text>
-      <TouchableOpacity onPress={onSetTimeEnd}>
-        <Text type="Body" color={Colors.Orange} style={styles.value}>
-          12:00 AM
-        </Text>
-      </TouchableOpacity>
-      <View style={styles.boder} />
-      <Text type="Body" color={Colors.Gray8} style={styles.title}>
-        {t('repeat')}
-      </Text>
-      <View style={styles.repeatWrap}>
-        {REPEAT_ITEMS.map((item, index) =>
-          renderRepeatItem(
-            item,
-            index,
-            recurringTimeRepeat.includes(item.value)
-          )
-        )}
-      </View>
-    </View>
-  );
-};
-
-export default RecurringDetail;