@eohjsc/react-native-smart-city 0.7.3-rc9 → 0.7.4

package/src/screens/Unit/SelectAddress.js

@@ -1,17 +1,17 @@
-import React, { memo, useCallback, useEffect, useRef, useState } from 'react';
-import { TouchableOpacity, View, ScrollView } from 'react-native';
-import MapView, { Marker, Circle, PROVIDER_GOOGLE } from 'react-native-maps';
+import { IconOutline } from '@ant-design/icons-react-native';
 import { useNavigation } from '@react-navigation/native';
-import AntDesign from 'react-native-vector-icons/AntDesign';
-import MaterialIcons from 'react-native-vector-icons/MaterialIcons';
+import React, { memo, useCallback, useEffect, useRef, useState } from 'react';
+import { ScrollView, TouchableOpacity, View } from 'react-native';
+import MapView, { Circle, Marker, PROVIDER_GOOGLE } from 'react-native-maps';
 import { check, RESULTS } from 'react-native-permissions';
+import MaterialIcons from 'react-native-vector-icons/MaterialIcons';
 import { openPromptEnableLocation } from '../../utils/Setting/Location';
 
+import { FullLoading } from '../../commons';
 import BottomButtonView from '../../commons/BottomButtonView';
 import SearchBarLocation from '../../commons/SearchLocation';
 import RowLocation from '../../commons/SearchLocation/RowLocation';
 import Text from '../../commons/Text';
-import { FullLoading } from '../../commons';
 import { useTranslations } from '../../hooks/Common/useTranslations';
 import {
   GEOLOCATION_ERROR,
@@ -19,15 +19,15 @@ import {
   OpenSetting,
 } from '../../utils/Permission/common';
 
-import styles from './SelectAddressStyles';
 import { API, Colors, SCConfig } from '../../configs';
-import { axiosGet } from '../../utils/Apis/axios';
-import Routes from '../../utils/Route';
 import {
   AccessibilityLabel,
-  MAP_INITIAL_REGION,
   EOH_LOCATION,
+  MAP_INITIAL_REGION,
 } from '../../configs/Constants';
+import { axiosGet } from '../../utils/Apis/axios';
+import Routes from '../../utils/Route';
+import styles from './SelectAddressStyles';
 
 navigator.geolocation = require('@react-native-community/geolocation');
 
@@ -210,7 +210,11 @@ const SelectAddress = memo(({ route }) => {
               style={styles.button}
               accessibilityLabel={AccessibilityLabel.BUTTON_CHOOSE_ON_MAP}
             >
-              <AntDesign name="enviroment" size={27} color={Colors.Primary} />
+              <IconOutline
+                name="environment"
+                size={27}
+                color={Colors.Primary}
+              />
               <Text type="Body" color={Colors.Gray9} style={styles.text} bold>
                 {t('choose_on_map')}
               </Text>
@@ -248,7 +252,7 @@ const SelectAddress = memo(({ route }) => {
               }}
               tracksViewChanges={false}
             >
-              <AntDesign name="enviroment" size={27} color={Colors.Blue10} />
+              <IconOutline name="environment" size={27} color={Colors.Blue10} />
             </Marker>
           </>
         )}

package/src/screens/Unit/components/AutomateScript/index.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import { View, TouchableWithoutFeedback } from 'react-native';
-import AntDesign from 'react-native-vector-icons/AntDesign';
+import { IconOutline } from '@ant-design/icons-react-native';
 import { useTranslations } from '../../../../hooks/Common/useTranslations';
 import Text from '../../../../commons/Text';
 import FImage from '../../../../commons/FImage';
@@ -61,7 +61,7 @@ const AutomateScript = ({ automate, onPress, isSelected }) => {
             <Text numberOfLines={1} type={'Label'} color={Colors.Gray7}>
               {t('created_by', { name: author })}
             </Text>
-            <AntDesign name="right" size={12} />
+            <IconOutline name="right" size={12} />
           </View>
         </View>
       </View>

package/src/screens/Unit/components/ButtonWrapper/index.js

@@ -2,7 +2,7 @@ import React, { memo } from 'react';
 import { View, TouchableOpacity, Image } from 'react-native';
 import Text from '../../../../commons/Text';
 import { Colors } from '../../../../configs';
-import AntDesign from 'react-native-vector-icons/AntDesign';
+import { IconOutline } from '@ant-design/icons-react-native';
 import { AccessibilityLabel } from '../../../../configs/Constants';
 import styles from './styles';
 
@@ -46,10 +46,10 @@ const ButtonWrapper = ({
             <Image source={{ uri: value }} style={styles.avatar} />
           ) : (
             <View style={styles.avatar}>
-              <AntDesign name={'user'} size={27} />
+              <IconOutline name={'user'} size={27} />
             </View>
           )}
-          <AntDesign name="right" size={20} color={Colors.Gray7} />
+          <IconOutline name="right" size={20} color={Colors.Gray7} />
         </View>
       </View>
       {children}

package/src/screens/Unit/components/Header/index.js

@@ -1,7 +1,7 @@
 import React, { useCallback, useRef, useState } from 'react';
 import { Dimensions, View, TouchableOpacity, StyleSheet } from 'react-native';
 import Popover from '../../../../commons/Popover';
-import AntDesign from 'react-native-vector-icons/AntDesign';
+import { IconOutline } from '@ant-design/icons-react-native';
 import MaterialIcons from 'react-native-vector-icons/MaterialIcons';
 import { useTranslations } from '../../../../hooks/Common/useTranslations';
 
@@ -98,7 +98,7 @@ const HeaderComponent = ({ title, goBack, dark, hideRight, style }) => {
                 onPress={() => setShowModal(true)}
                 style={styles.rightHeader}
               >
-                <AntDesign
+                <IconOutline
                   name="plus"
                   size={32}
                   color={dark ? Colors.Black : Colors.White}

package/src/screens/Unit/components/SharedUnit/index.js

@@ -1,7 +1,7 @@
 import React, { Fragment, useCallback } from 'react';
 import { View, Image, TouchableOpacity } from 'react-native';
 import { useTranslations } from '../../../../hooks/Common/useTranslations';
-import AntDesign from 'react-native-vector-icons/AntDesign';
+import { IconFill, IconOutline } from '@ant-design/icons-react-native';
 
 import { API, Colors, Images } from '../../../../configs';
 import Text from '../../../../commons/Text';
@@ -88,7 +88,7 @@ const SharedUnit = ({
         {isOptions && (
           <Fragment>
             {item.is_pin ? (
-              <AntDesign
+              <IconOutline
                 name="pushpin"
                 size={20}
                 color={Colors.Blue10}
@@ -98,7 +98,7 @@ const SharedUnit = ({
                 }
               />
             ) : (
-              <AntDesign
+              <IconOutline
                 name="pushpin"
                 size={20}
                 onPress={addPinSharedUnit}
@@ -106,7 +106,7 @@ const SharedUnit = ({
               />
             )}
             {item.is_star ? (
-              <AntDesign
+              <IconFill
                 name="star"
                 size={20}
                 color={Colors.Yellow6}
@@ -116,7 +116,7 @@ const SharedUnit = ({
                 }
               />
             ) : (
-              <AntDesign
+              <IconOutline
                 name="star"
                 size={20}
                 onPress={addStarSharedUnit}

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

@@ -1,16 +1,15 @@
+import { IconOutline } from '@ant-design/icons-react-native';
 import React, { memo, useCallback, useMemo, useState } from 'react';
 import { TouchableOpacity, View } from 'react-native';
-import AntDesign from 'react-native-vector-icons/AntDesign';
-import MaterialCommunityIcons from 'react-native-vector-icons/MaterialCommunityIcons';
 
 import styles from './styles';
 
 import { Section, Text } from '../../../../commons';
-import VisualChart from '../../../Device/components/VisualChart';
-import { useTranslations } from '../../../../hooks/Common/useTranslations';
-import { useWatchConfigs } from '../../../../hooks/IoT';
 import { Colors } from '../../../../configs';
 import AccessibilityLabel from '../../../../configs/AccessibilityLabel';
+import { useTranslations } from '../../../../hooks/Common/useTranslations';
+import { useWatchConfigs } from '../../../../hooks/IoT';
+import VisualChart from '../../../Device/components/VisualChart';
 import SegmentedRoundChart from './SegmentedRoundChart';
 
 const AirQuality = memo(({ summaryDetail }) => {
@@ -80,7 +79,7 @@ const AirQuality = memo(({ summaryDetail }) => {
             <View
               style={[styles.boxEmotion, { backgroundColor: outdoorColor }]}
             >
-              <AntDesign name={outdoorIcon} size={35} />
+              <IconOutline name={outdoorIcon} size={35} />
             </View>
             <View
               style={[
@@ -122,11 +121,7 @@ const AirQuality = memo(({ summaryDetail }) => {
           {<SegmentedRoundChart data={outdoor} />}
           {!!advices?.length && (
             <View style={styles.boxHealth}>
-              <MaterialCommunityIcons
-                name="alert-circle-outline"
-                size={20}
-                style={styles.iconMargin}
-              />
+              <IconOutline name="alert" size={20} style={styles.iconMargin} />
               <Text semibold color={Colors.Gray9} type="H4">
                 {t('Health advices:')}
               </Text>

package/src/screens/UnitSummary/components/WaterQuality/Item/index.js

@@ -1,12 +1,12 @@
-import React, { memo } from 'react';
-import { View, StyleSheet, TouchableOpacity } from 'react-native';
-import AntDesign from 'react-native-vector-icons/AntDesign';
+import { IconOutline } from '@ant-design/icons-react-native';
 import { useNavigation } from '@react-navigation/native';
+import React, { memo } from 'react';
+import { StyleSheet, TouchableOpacity, View } from 'react-native';
 
 import Text from '../../../../../commons/Text';
 import { Colors, Constants } from '../../../../../configs';
-import Route from '../../../../../utils/Route';
 import { useConfigGlobalState } from '../../../../../iot/states';
+import Route from '../../../../../utils/Route';
 
 const width_item = (Constants.width - 48) / 2;
 
@@ -23,9 +23,9 @@ const Item = memo(({ id, svgMain, title, measure, des, color, waterType }) => {
         <Text>{title}</Text>
         {waterType && (
           <TouchableOpacity onPress={goToDetail} style={styles.buttonInfo}>
-            <AntDesign
+            <IconOutline
               style={styles.row}
-              name="infocirlceo"
+              name="info-circle"
               size={20}
               color={Colors.Black}
             />

package/src/screens/UnitSummary/index.js

@@ -2,7 +2,7 @@ import React, { memo, useCallback, useEffect, useState } from 'react';
 import { View, StyleSheet } from 'react-native';
 import { useNavigation } from '@react-navigation/native';
 import { TouchableOpacity } from 'react-native';
-import AntDesign from 'react-native-vector-icons/AntDesign';
+import { IconOutline } from '@ant-design/icons-react-native';
 import moment from 'moment';
 
 import { useTranslations } from '../../hooks/Common/useTranslations';
@@ -168,8 +168,8 @@ const UnitSummary = memo(({ route }) => {
                 accessibilityLabel={AccessibilityLabel.UNIT_SUMMARY_GUIDE_TOUCH}
                 onPress={() => navigation.navigate(GuideName)}
               >
-                <AntDesign
-                  name={'infocirlceo'}
+                <IconOutline
+                  name="info-circle"
                   size={25}
                   color={Colors.Black}
                 />

package/src/utils/Apis/axios.js

@@ -1,11 +1,11 @@
 /* eslint-disable no-console */
-import { create } from 'apisauce';
-import { getData, storeData } from '../Storage';
-import { ToastBottomHelper } from '../Utils';
 import NetInfo from '@react-native-community/netinfo';
+import { create } from 'apisauce';
+import { SCConfig } from '../../configs';
 import { PROBLEM_CODE } from '../../configs/Constants';
 import { getTranslate } from '../I18n';
-import { SCConfig } from '../../configs';
+import { getData, storeData } from '../Storage';
+import { ToastBottomHelper } from '../Utils';
 import { isHTML } from '../Validation';
 
 const api = create({
@@ -261,7 +261,7 @@ export function createFormData(data, list_file_field) {
       });
       return;
     }
-    formData.append(key, data[key]);
+    data[key] && formData.append(key, data[key]);
   });
 
   return formData;

package/src/utils/Functions/ShortEmail.js

@@ -1,4 +1,5 @@
 export const shortEmailName = (email) => {
   const regex = '([^@]+)';
+  /* istanbul ignore next */
   return email?.match(regex)[0] || '';
 };

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

@@ -238,6 +238,8 @@ export default {
     'Overall Water quality is based on below those conditions',
   water_quality_guide: 'Water Quality Guide',
   clo_guide: 'Chlorine Residual Guide',
+  aqi_guide: 'AQI Guide',
+  uv_index_guide: 'UV Index Guide',
   what_is_clo: 'What is Chlorine residual?',
   text_what_clo:
     'Residual chlorine is the low level amount of chlorine remaining in the water after a certain period of ' +
@@ -380,7 +382,6 @@ export default {
   text_select_permissions_desc: 'Select permissions will be grant',
   text_read_config: 'Read configs',
   text_actions: 'Actions',
-  geolocation: 'Geolocation',
   background: 'Background',
   remove_unit: 'Remove unit',
   text_pins: 'pins',
@@ -487,7 +488,7 @@ export default {
   wind_quality_sensor: 'Wind Quality Sensor',
   current_water_quality: 'Current Quality Sensor',
   clo_residual: 'Clo Residual',
-  text_explain_add_geolocation:
+  text_explain_add_location:
     'Tell us where this unit is. It will help automatically personalized your experience.',
   raining: 'Raining',
   not_raining: 'Not raining',
@@ -840,7 +841,7 @@ export default {
   select_unit_members: 'Select from Unit members',
   select_contacts: 'Select contacts',
   no_contact: 'No contacts',
-  is: 'is',
+  is_equal: 'is equal',
   is_below: 'is below',
   is_above: 'is above',
   text_notification_content_air_quality_high:
@@ -1018,6 +1019,8 @@ export default {
   multi_units_automate: 'Multi-Units Smart',
   tap_to_run: 'Tap to run',
   how_to_start: 'How to start',
+  edit_condition: 'Edit condition',
+  device_display: 'Device display',
   'set_up {name}': 'Setup {name}',
   choose_action: 'Choose action',
   action: 'action',

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

@@ -94,8 +94,8 @@ export default {
   verify: 'Xác nhận',
   text_new_unit: 'Địa điểm',
   text_sub_units: 'Khu vực',
+  is_equal: 'bằng',
   is_below: 'dưới',
-  is: 'bằng',
   is_above: 'trên',
   edit_actions_list: 'Chỉnh sửa danh sách hành động',
   des_edit_actions_list:
@@ -197,7 +197,8 @@ export default {
   text_name: 'Tên',
   left_menu_notifications: 'Thông báo',
   text_settings: 'Cài đặt',
-  'AQI Guide': 'Chỉ số AQI',
+  aqi_guide: 'Chỉ số AQI',
+  uv_index_guide: 'Chỉ số UV',
   'What is AQI?': 'Chỉ số AQI là gì?',
   text_what_aqi:
     'AQI là các chữ cái viết tắt của “Air Quality Index” – chỉ số chất lượng không khí. Chỉ số này được sử dụng để ' +
@@ -436,7 +437,6 @@ export default {
   text_select_permissions_desc: 'Chọn các hành động cho phép',
   text_read_config: 'Thông số đọc',
   text_actions: 'Điều khiển',
-  geolocation: 'Vị trí',
   background: 'Hình nền',
   remove_unit: 'Xoá địa điểm',
   text_pins: 'Lượt ghim',
@@ -555,7 +555,7 @@ export default {
   wind_quality_sensor: 'Cảm biến chất lượng nước',
   current_water_quality: 'Chất lượng nước hiện tại',
   clo_residual: 'Clo dư',
-  text_explain_add_geolocation:
+  text_explain_add_location:
     'Hãy cho chúng tôi biết địa điểm này nằm ở đâu. Việc này sẽ giúp cá nhân hoá các trải nghiệm của bạn trong ' +
     'việc quản lý.',
   raining: 'Đang mưa',
@@ -1033,6 +1033,8 @@ export default {
   continue: 'Tiếp tục',
   tap_to_run: 'Nhấn để chạy',
   how_to_start: 'Cách khởi động',
+  edit_condition: 'Chỉnh sửa điều kiện',
+  device_display: 'Thiết bị hiển thị',
   'set_up {name}': 'Thiết lập {name}',
   choose_action: 'Lựa chọn hành động',
   action: 'hành động',
@@ -1320,6 +1322,8 @@ export default {
   smart_supplier: 'Nhà Cung Cấp Thông Minh',
   text_email_or_phone_number: 'Email hoặc Số điện thoại',
   enter_password: 'Mật khẩu',
+  you_need_to_enter_password:
+    'Bạn cần nhập mật khẩu để xác nhận yêu cầu của mình',
   connecting_smart_account: 'Đang kết nối tài khoản',
   warning_connecting_smart_account:
     'Đừng tắt thiết bị hoặc đóng ứng dụng này trong quá trình thiết lập. Quá trình thiết lập có thể mất vài ' +

package/src/utils/bluetooth.js

@@ -0,0 +1,3 @@
+import { BleManager } from 'react-native-ble-plx';
+
+export const bleManager = new BleManager();