@eohjsc/react-native-smart-city 0.2.64 → 0.2.68

package/src/screens/AllCamera/index.js

@@ -59,7 +59,7 @@ const AllCamera = () => {
     navigate(Routes.PlaybackCamera, { item, thumbnail });
   };
 
-  const CameraItem = ({ item }) => {
+  const CameraItem = ({ item, width, height }) => {
     return (
       <View style={styles.wrap}>
         {!!item && (
@@ -74,6 +74,8 @@ const AllCamera = () => {
             amount={amount}
             handleFullScreen={handleFullScreen}
             goToPlayBack={goToPlayBack(item, thumbnail)}
+            width={width}
+            height={height}
           />
         )}
       </View>
@@ -88,12 +90,32 @@ const AllCamera = () => {
         ) : amount === 4 ? (
           <>
             <View style={styles.row}>
-              <CameraItem key={item?.id} item={item[0]} />
-              <CameraItem key={item?.id} item={item[1]} />
+              <CameraItem
+                key={item?.id}
+                item={item[0]}
+                width={188}
+                height={112}
+              />
+              <CameraItem
+                key={item?.id}
+                item={item[1]}
+                width={188}
+                height={112}
+              />
             </View>
             <View style={styles.row}>
-              <CameraItem key={item?.id} item={item[2]} />
-              <CameraItem key={item?.id} item={item[3]} />
+              <CameraItem
+                key={item?.id}
+                item={item[2]}
+                width={188}
+                height={112}
+              />
+              <CameraItem
+                key={item?.id}
+                item={item[3]}
+                width={188}
+                height={112}
+              />
             </View>
           </>
         ) : (

package/src/screens/Device/EditDevice/index.js

@@ -23,7 +23,7 @@ const EditDevice = memo(() => {
   const navigation = useNavigation();
   const { params = {} } = useRoute();
   const { sensor, setSensorNameDetail, sensorNameDetail } = params;
-  const [inputName, setInputName] = useState('');
+  const [inputName, setInputName] = useState(sensorNameDetail || '');
   const [sensorName, setSensorName] = useState(sensorNameDetail || '');
   const { stateAlertAction, hideAlertAction, onShowRename, onShowDelete } =
     useEditDevice();
@@ -130,8 +130,8 @@ const EditDevice = memo(() => {
       >
         {!stateAlertAction.isDelete && (
           <_TextInput
-            onChange={(text) => setInputName(text)}
-            defaultValue={sensorName}
+            onChange={setInputName}
+            value={inputName}
             textInputStyle={styles.textInputStyle}
             wrapStyle={styles.textInputWrapStyle}
             selectionColor={Colors.Primary}

package/src/screens/Device/components/SensorDisplayItem.js

@@ -20,6 +20,7 @@ import FooterInfo from '../../../commons/Device/FooterInfo';
 import MediaPlayerDetail from '../../../commons/MediaPlayerDetail';
 import { standardizeCameraScreenSize } from '../../../utils/Utils';
 import { Device } from '../../../configs';
+import { useSCContextSelector } from '../../../context';
 
 const { standardizeWidth, standardizeHeight } = standardizeCameraScreenSize(
   Device.screenWidth - 32
@@ -37,11 +38,12 @@ export const SensorDisplayItem = ({
   background,
 }) => {
   const t = useTranslations();
+  const userId = useSCContextSelector((state) => state.auth.account.user.id);
   const doAction = useCallback(
     (action, data) => {
-      sendRemoteCommand(sensor, action, data);
+      sendRemoteCommand(sensor, action, data, userId);
     },
-    [sensor]
+    [sensor, userId]
   );
   if (item.configuration.type === 'compass') {
     setShowWindDirection(true);

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

@@ -17,7 +17,7 @@ const useChipScan = (route) => {
       const { success, data: new_chip } = await axiosPost(
         API.UNIT.CHIP_SCAN(unit_id),
         {
-          imei: imei,
+          imei: imei || body.imei,
           qr_code: body.imei,
           phone: phoneNumber,
           name: chipName,
@@ -27,10 +27,19 @@ const useChipScan = (route) => {
         }
       );
       if (success) {
-        navigation.navigate(Routes.ConnectingGateway, {
-          new_chip,
-          ...route.params,
-        });
+        if (new_chip.is_wifi) {
+          navigation.navigate(Routes.ConnectWifiWarning, {
+            wifi_ssid: new_chip.wifi_ssid,
+            wifi_pass: new_chip.wifi_pass,
+            chip_id: new_chip.id,
+            unit_id: unit_id,
+          });
+        } else {
+          navigation.navigate(Routes.ConnectingGateway, {
+            new_chip,
+            ...route.params,
+          });
+        }
       } else {
         navigation.goBack();
       }

package/src/screens/SubUnit/AddSubUnit.js

@@ -13,7 +13,6 @@ import {
   SafeAreaView,
 } from 'react-native';
 import { useNavigation } from '@react-navigation/native';
-import ImageResizer from 'react-native-image-resizer';
 import { useTranslations } from '../../hooks/Common/useTranslations';
 
 import { API, Colors } from '../../configs';
@@ -26,26 +25,6 @@ import { ToastBottomHelper } from '../../utils/Utils';
 import { TESTID } from '../../configs/Constants';
 import styles from './AddSubUnitStyles';
 
-const MAX_FILE_SIZE_BYTES = 1.5 * 1024 * 1024; // 1.5mb
-
-const prepareImageToUpload = async (image) => {
-  if (!image || image.size < MAX_FILE_SIZE_BYTES) {
-    return image;
-  }
-  const result = await ImageResizer.createResizedImage(
-    image.path,
-    1280,
-    1280,
-    'JPEG',
-    70
-  );
-  return {
-    fileName: result?.name,
-    type: 'image/jpeg',
-    uri: result?.uri,
-  };
-};
-
 const AddSubUnit = ({ route }) => {
   const t = useTranslations();
   const { navigate, goBack } = useNavigation();
@@ -56,6 +35,13 @@ const AddSubUnit = ({ route }) => {
   const [showImagePicker, setShowImagePicker] = useState(false);
   let awaitCreate = useRef(false);
 
+  const cleanData = () => {
+    setRoomName('');
+    setWallpaper('');
+    setImageUrl('');
+    awaitCreate.current = false;
+  };
+
   const goDone = useCallback(async () => {
     if (isAddUnit) {
       if (!awaitCreate.current) {
@@ -65,7 +51,6 @@ const AddSubUnit = ({ route }) => {
           address: location,
           background: wallpaper,
         };
-        dataObj.background = await prepareImageToUpload(dataObj.background);
         const formData = createFormData(dataObj, ['background']);
         const { success, data } = await axiosPost(
           API.UNIT.CREATE_UNIT(),
@@ -82,6 +67,7 @@ const AddSubUnit = ({ route }) => {
               routeName: Routes.DashboardStack,
             },
           });
+          cleanData();
         } else {
           awaitCreate.current = false;
           ToastBottomHelper.error(t('text_create_unit_fail'));
@@ -91,9 +77,8 @@ const AddSubUnit = ({ route }) => {
       if (!awaitCreate.current) {
         awaitCreate.current = true;
         const dataObj = { name: roomName, background: wallpaper };
-        dataObj.background = await prepareImageToUpload(dataObj.background);
         const formData = createFormData(dataObj, ['background']);
-        const { success, data } = await axiosPost(
+        const { success } = await axiosPost(
           API.SUB_UNIT.CREATE_SUB_UNIT(unit.id),
           formData,
           {
@@ -115,10 +100,12 @@ const AddSubUnit = ({ route }) => {
             screen: Routes.UnitDetail,
             params: {
               unitId: unit.id,
-              unitData: data,
+              unitData: unit,
               isAddSubUnit: true,
+              routeName: Routes.DashboardStack,
             },
           });
+          cleanData();
         } else {
           awaitCreate.current = false;
           ToastBottomHelper.error(t('text_create_sub_unit_fail'));
@@ -188,6 +175,7 @@ const AddSubUnit = ({ route }) => {
                 textInputStyle={styles.roomName}
                 wrapStyle={styles.textInput}
                 selectionColor={Colors.Primary}
+                value={roomName}
               />
 
               {isAddUnit && (

package/src/screens/SubUnit/__test__/AddSubUnit.test.js

@@ -161,7 +161,8 @@ describe('Test AddSubUnit', () => {
       screen: Routes.UnitDetail,
       params: {
         unitId: route.params.unit.id,
-        unitData: response.data,
+        unitData: route.params.unit,
+        routeName: 'DashboardStack',
         isAddSubUnit: true,
       },
     });

package/src/screens/TDSGuide/index.js

@@ -22,12 +22,12 @@ const TDSGuide = memo(() => {
         >
           {t('what_is_tds_title')}
         </Text>
-        <Text type="Body">{t('what_is_tds_text')}</Text>
+        <Text style={styles.tdsText}>{t('what_is_tds_text')}</Text>
         <Text type="H3" semibold style={styles.titlePadding}>
           {t('tds_guidlines_title')}
         </Text>
         <>
-          <Text type="Body">
+          <Text style={styles.tdsText}>
             {t('tds_guidlines_text_1')}
             {'\n'}
             {'\n'}
@@ -56,4 +56,7 @@ const styles = StyleSheet.create({
     paddingTop: 20,
     paddingBottom: 10,
   },
+  tdsText: {
+    fontSize: 15,
+  },
 });

package/src/screens/Unit/AddMenu.js

@@ -4,6 +4,7 @@ import { useTranslations } from '../../hooks/Common/useTranslations';
 import Routes from '../../utils/Route';
 import AddSubUnitIcon from '../../../assets/images/Popover/Dashboard/AddSubUnit.svg';
 import AddDeviceIcon from '../../../assets/images/Popover/Dashboard/AddDevice.svg';
+import SmartAccount from '../../../assets/images/Popover/Dashboard/SmartAccount.svg';
 import AddMemberIcon from '../../../assets/images/Popover/Dashboard/AddMember.svg';
 import { useNavigation } from '@react-navigation/native';
 
@@ -50,6 +51,20 @@ const AddMenu = memo(({ unit, afterItemClick, showAdd, setHideAdd }) => {
         image: <AddDeviceIcon width={43} height={43} />, // TODO change icon
         data: { screen: Routes.SetupGatewayWifi, params: { unit_id: unit.id } },
       },
+      {
+        id: 5,
+        route: Routes.AddGatewayStack,
+        text: t('gateway') + ' Wifi',
+        image: <AddDeviceIcon width={43} height={43} />,
+        data: { screen: Routes.FirstWarning, params: { unit_id: unit.id } },
+      },
+      {
+        id: 6,
+        route: Routes.SmartAccount,
+        text: t('name_smart_account'),
+        image: <SmartAccount width={43} height={43} />, // TODO change icon
+        type: Routes.SmartAccount,
+      },
     ];
   }, [t, unit]);
 

package/src/screens/Unit/Detail.js

@@ -30,7 +30,16 @@ import { AUTOMATE_TYPE } from '../../configs/Constants';
 
 const UnitDetail = ({ route }) => {
   const t = useTranslations();
-  const { unitId, unitData, isOneTap, routeName, isAddSubUnit } = route.params;
+
+  const {
+    unitId,
+    unitData,
+    isOneTap,
+    routeName,
+    isAddSubUnit,
+    isSuccessfullyConnected,
+  } = route.params;
+
   const isFocused = useIsFocused();
   const { stateData, setAction } = useContext(SCContext);
   const { navigate } = useNavigation();
@@ -253,7 +262,7 @@ const UnitDetail = ({ route }) => {
   };
 
   const renderDetailSubUnit = () => {
-    if (station.isFavorites) {
+    if (station?.isFavorites) {
       return (
         <SubUnitFavorites
           unit={unit}
@@ -296,6 +305,10 @@ const UnitDetail = ({ route }) => {
     navigate(routeName);
   }, [navigate, routeName]);
 
+  const Dashboard = useCallback(() => {
+    navigate(Routes.Dashboard);
+  }, [navigate]);
+
   return (
     <WrapParallaxScrollView
       uriImg={unit.background}
@@ -308,7 +321,7 @@ const UnitDetail = ({ route }) => {
       onAdd={setShowAdd}
       onMore={showPopoverWithRef}
       hideRightPlus={!isOwner}
-      onBack={routeName && onBack}
+      onBack={(isSuccessfullyConnected && Dashboard) || (routeName && onBack)}
     >
       <View style={styles.container}>
         <Summaries unit={unit} />

package/src/screens/Unit/components/__test__/MyUnitDevice.test.js

@@ -1,17 +1,23 @@
 import React from 'react';
 import { View } from 'react-native';
 import { act, create } from 'react-test-renderer';
+import { SCProvider } from '../../../../context';
+import { mockSCStore } from '../../../../context/mockStore';
 import MyUnitDevice from '../MyUnitDevice';
 
+const wrapComponent = (sensor) => (
+  <SCProvider initState={mockSCStore({})}>
+    <MyUnitDevice sensor={sensor} />
+  </SCProvider>
+);
+
 describe('Test MyUnitDevice', () => {
   let tree;
 
   it('Test render with status', async () => {
     await act(() => {
       tree = create(
-        <MyUnitDevice
-          sensor={{ status: 'Ok', name: 'Test', station_name: '' }}
-        />
+        wrapComponent({ status: 'Ok', name: 'Test', station_name: '' })
       );
     });
     const instance = tree.root;
@@ -21,9 +27,7 @@ describe('Test MyUnitDevice', () => {
 
   it('Test render without status', async () => {
     await act(() => {
-      tree = create(
-        <MyUnitDevice sensor={{ name: 'Test', station_name: '' }} />
-      );
+      tree = create(wrapComponent({ name: 'Test', station_name: '' }));
     });
     const instance = tree.root;
     const Views = instance.findAllByType(View);

package/src/screens/UnitSummary/components/PowerConsumption/index.js

@@ -77,10 +77,8 @@ const PowerConsumption = memo(({ summaryDetail }) => {
   const dataTotal = [];
   dataTotal.push(totalPower);
 
-  const [startDate, setStartDate] = useState(
-    moment().subtract(6, 'days').valueOf()
-  );
-  const [endDate, setEndDate] = useState(moment().valueOf());
+  const [startDate, setStartDate] = useState(moment().subtract(6, 'days'));
+  const [endDate, setEndDate] = useState(moment());
   const [groupBy, setGroupBy] = useState('date');
   const [getData, setData] = useState([]);
   const [chartConfig, setChartConfig] = useState({

package/src/screens/UnitSummary/components/RunningDevices/__test__/index.test.js

@@ -3,6 +3,14 @@ import { act, create } from 'react-test-renderer';
 import RunningDevices from '..';
 import { TouchableOpacity } from 'react-native';
 import ItemDevice from '../../../../../commons/Device/ItemDevice';
+import { mockSCStore } from '../../../../../context/mockStore';
+import { SCProvider } from '../../../../../context';
+
+const wrapComponent = (unit, summaryDetail) => (
+  <SCProvider initState={mockSCStore({})}>
+    <RunningDevices unit={unit} summaryDetail={summaryDetail} />
+  </SCProvider>
+);
 
 const mockedNavigate = jest.fn();
 
@@ -55,9 +63,7 @@ describe('test RunningDevices', () => {
       };
 
       await act(async () => {
-        tree = await create(
-          <RunningDevices unit={unit} summaryDetail={summaryDetail} />
-        );
+        tree = await create(wrapComponent(unit, summaryDetail));
       });
       const instance = tree.root;
       const texts = instance.findAllByType(ItemDevice);
@@ -95,9 +101,7 @@ describe('test RunningDevices', () => {
     };
 
     await act(async () => {
-      tree = await create(
-        <RunningDevices unit={unit} summaryDetail={summaryDetail} />
-      );
+      tree = await create(wrapComponent(unit, summaryDetail));
     });
     const instance = tree.root;
     const texts = instance.findAllByType(ItemDevice);

package/src/screens/WaterQualityGuide/index.js

@@ -450,9 +450,9 @@ const styles = StyleSheet.create({
     position: 'absolute',
     fontSize: 20,
     transform: [{ rotate: '90deg' }],
-    left: -28,
+    left: -40,
     bottom: 8,
-    width: 115,
+    width: 150,
     height: 28,
     textAlign: 'center',
   },

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",
@@ -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,10 @@
   "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"
 }

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",
@@ -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,10 @@
   "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"
 }

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,