@eohjsc/react-native-smart-city 0.3.7 → 0.3.10

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

@@ -22,11 +22,11 @@ const Item = memo((props) => {
       <View size={14} color={Colors.Gray8} style={styles.textTitleX}>
         <Text>{title}</Text>
         {waterType && (
-          <TouchableOpacity onPress={goToDetail}>
+          <TouchableOpacity onPress={goToDetail} style={styles.buttonInfo}>
             <IconOutline
               style={styles.row}
               name="info-circle"
-              size={14}
+              size={20}
               color={Colors.Black}
             />
           </TouchableOpacity>
@@ -79,4 +79,12 @@ const styles = StyleSheet.create({
   row: {
     flexDirection: 'row',
   },
+  buttonInfo: {
+    width: 40,
+    height: 40,
+    justifyContent: 'center',
+    alignItems: 'center',
+    marginTop: -10,
+    marginRight: -10,
+  },
 });

package/src/screens/UnitSummary/index.js

@@ -3,9 +3,10 @@ import { View, StyleSheet } from 'react-native';
 import { useNavigation } from '@react-navigation/native';
 import { TouchableOpacity } from 'react-native';
 import { IconOutline } from '@ant-design/icons-react-native';
-import { useTranslations } from '../../hooks/Common/useTranslations';
 import moment from 'moment';
 
+import { useTranslations } from '../../hooks/Common/useTranslations';
+import { useReceiveNotifications } from '../../hooks';
 import { API, Colors } from '../../configs';
 import Routes from '../../utils/Route';
 import { axiosGet } from '../../utils/Apis/axios';
@@ -139,6 +140,19 @@ const UnitSummary = memo(({ route }) => {
     fetchSummaryDetail();
   }, [fetchSummaryDetail]);
 
+  const { dataNotification } = useReceiveNotifications();
+
+  useEffect(() => {
+    if (dataNotification) {
+      const { params = {} } = dataNotification;
+      const { summary_id } = params;
+      if (summary_id && summary_id === summaryId) {
+        fetchSummaryDetail();
+      }
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [dataNotification]);
+
   const UnitSummaryDetail = getComponentAndGuide();
   const ComponentName = UnitSummaryDetail?.componentName;
   const GuideName = UnitSummaryDetail?.guideName;

package/src/screens/WaterQualityGuide/index.js

@@ -270,7 +270,7 @@ const WaterQualityGuide = memo(({ route }) => {
 
   return (
     <SafeAreaView style={styles.container}>
-      <ScrollView style={styles.container}>
+      <ScrollView style={styles.container} scrollIndicatorInsets={{ right: 1 }}>
         <View style={styles.wrapScroll}>
           {titles.map((item, index) => {
             const { title, des } = item;

package/src/utils/Apis/axios.js

@@ -1,35 +1,36 @@
-import axios from 'axios';
-import { deleteData, getData, storeData } from '../Storage';
+import { create } from 'apisauce';
+import { getData, storeData } from '../Storage';
 import { ToastBottomHelper } from '../Utils';
 import NetInfo from '@react-native-community/netinfo';
+import { PROBLEM_CODE } from '../../configs/Constants';
+import { getTranslate } from '../I18n';
+import { SCConfig } from '../../configs';
 
-export const replaceParams = (apiURL, params) => {
-  let _result = apiURL;
-  if (typeof params === 'object') {
-    Object.keys(params).forEach((key) => {
-      _result = _result.replace(`{${key}}`, params[key]);
-    });
-  }
-  return _result;
-};
+const api = create({
+  headers: {
+    'Content-Type': 'application/json',
+  },
+  timeout: 30000,
+});
 
 const parseErrorResponse = async (error) => {
   let message;
   let data = {};
-  if (
-    error.response &&
-    error.response.data &&
-    error.response.data instanceof Object
-  ) {
-    data = error.response.data;
-    const firstKey = Object.keys(error.response.data)[0];
-    message = error.response.data[firstKey];
+  if (error.data instanceof Array) {
+    message = error.data[0];
+  } else if (error.data instanceof Object) {
+    data = error.data;
+    const firstKey = Object.keys(error.data)[0];
+    message = error.data[firstKey];
 
     if (message instanceof Array) {
       message = message[0];
     }
+    if (message?.message) {
+      message = message.message;
+    }
   } else {
-    message = error.message;
+    message = error.data || error.problem;
   }
 
   if (typeof message === 'string') {
@@ -41,6 +42,11 @@ const parseErrorResponse = async (error) => {
       }
     }
     if (!hideError) {
+      switch (error.problem) {
+        case PROBLEM_CODE.SERVER_ERROR:
+          message = getTranslate(SCConfig.language, 'server_error');
+          break;
+      }
       ToastBottomHelper.error(message);
     }
   }
@@ -50,7 +56,7 @@ const parseErrorResponse = async (error) => {
     error,
     message,
     data,
-    resp_status: error?.response?.status,
+    resp_status: error?.status || error?.response?.status,
   };
 };
 
@@ -75,6 +81,7 @@ export async function fetchWithCache(url, config = {}, updateMethod) {
     if (cacheResponse) {
       updateMethod(cacheResponse);
     }
+    // eslint-disable-next-line no-empty
   } catch {}
   const response = await axiosGet(url, config, true);
   if (!response.cache) {
@@ -83,25 +90,34 @@ export async function fetchWithCache(url, config = {}, updateMethod) {
 }
 
 export async function axiosGet(URL, config = {}, cache = false) {
-  const cacheKey = `@CACHE_REQUEST_${URL}`;
   let response;
   try {
-    response = await axios.get(URL, config);
+    response = await api.get(URL, config.params, config);
   } catch (error) {
     if (cache) {
-      // only network error or server error
-      if (!error.response || error.response.status >= 500) {
+      if (error.message === 'Network Error') {
+        return (
+          (await axiosCache(URL, 500)) || (await parseErrorResponse(error))
+        );
+      }
+      if (!error?.response || error?.response?.status >= 500) {
         return (
-          (await axiosCache(URL, error.response.status)) ||
+          (await axiosCache(URL, error?.response?.status)) ||
           (await parseErrorResponse(error))
         );
-      } else {
-        await deleteData(cacheKey);
       }
     }
     return await parseErrorResponse(error);
   }
-  const { data } = response;
+  const { data, problem } = response;
+  if (problem) {
+    if (cache) {
+      return (
+        (await axiosCache(URL, 500)) || (await parseErrorResponse(response))
+      );
+    }
+    return await parseErrorResponse(response);
+  }
   if (response.status === 200) {
     if (cache) {
       await storeData(`@CACHE_REQUEST_${URL}`, JSON.stringify(data));
@@ -121,18 +137,23 @@ export async function axiosGet(URL, config = {}, cache = false) {
 async function axiosCall(method, ...args) {
   let response;
   try {
-    response = await axios[method](...args);
+    response = await api[method](...args);
   } catch (error) {
     return await parseErrorResponse(error);
   }
 
-  const { data } = response;
+  const { data, problem } = response;
+  if (problem) {
+    return await parseErrorResponse(response);
+  }
+
   if (response.status >= 200 && response.status < 300) {
     return {
       success: true,
       data,
     };
   }
+  await parseErrorResponse(response);
 
   return {
     success: false,
@@ -186,3 +207,5 @@ export function createFormData(data, list_file_field) {
 
   return formData;
 }
+
+export default api;

package/src/utils/Converter/time.js

@@ -1,24 +1,6 @@
 import t from '../../hooks/Common/useTranslations';
 import moment from 'moment';
 
-export const transformDatetime = (data = {}, listFieldName = []) => {
-  listFieldName.forEach((name) => {
-    const value = data[name];
-    const isArray = Array.isArray(value);
-
-    if (!data.hasOwnProperty(name)) {
-      return;
-    }
-
-    if (isArray) {
-      data[name] = value.map((item) => (item ? moment(item) : item));
-      return;
-    }
-
-    data[name] = value ? moment(value) : value;
-  });
-};
-
 export const timeDifference = (current, previous, symbol = false) => {
   let msPerMinute = 60 * 1000;
   let msPerHour = msPerMinute * 60;

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

@@ -985,5 +985,15 @@
   "you_need_to_enter_password": "You need to enter password to perform this action",
   "note": "Note",
   "back": "Back",
-  "This {name} was removed!" : "This {name} was removed!"
+  "invaild_data": "Invaild data",
+  "This {name} was removed!" : "This {name} was removed!",
+  "camera_request_permission": "Camera request permission",
+  "camera_request_permission_des": "To use camera, please unlock camera permission",
+  "location_require_message": "EoH needs your location permission to get current location.",
+  "turn_on_location_service": "Turn on location service for your phone",
+  "turn_on_location_service_des": "To continue, let your device turn on location by turning on location service in Settings",
+  "detected": "Detected",
+  "not_detected": "Not detected",
+  "activated": "Activated",
+  "not_activated": "Not activated"
 }

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

@@ -985,5 +985,16 @@
   "maxmium_contacts": "Địa chỉ liên hệ tối đa",
   "note": "Lưu ý ",
   "back": "Quay lại",
-  "This {name} was removed!" : "{Name} này đã bị xóa!"
+  "invaild_data": "Dữ liệu không hợp lệ",
+  "This {name} was removed!" : "{Name} này đã bị xóa!",
+  "location_perm_denied": "Ứng dụng không cho phép truy cập vị trí.",
+  "camera_request_permission": "Quyền yêu cầu máy ảnh",
+  "camera_request_permission_des": "Để sử dụng máy ảnh, vui lòng mở khóa quyền đối với máy ảnh",
+  "location_require_message": "Eoh cần quyền truy cập vị trí của bạn để lấy vị trí hiện tại.",
+  "turn_on_location_service": "Bật dịch vụ vị trí cho điện thoại của bạn",
+  "turn_on_location_service_des": "Để tiếp tục, bật dịch vụ vị trí cho điện thoại của bạn trong Cài Đặt",
+  "detected": "Phát hiện",
+  "not_detected": "Không phát hiện",
+  "activated": "Được kích hoạt",
+  "not_activated": "Không kích hoạt"
 }

package/src/utils/Permission/common.js

@@ -0,0 +1,67 @@
+/* eslint-disable promise/prefer-await-to-then */
+/* eslint-disable promise/prefer-await-to-callbacks */
+
+import {
+  check,
+  openSettings,
+  PERMISSIONS,
+  request,
+  RESULTS,
+} from 'react-native-permissions';
+import AlertAsync from 'react-native-alert-async';
+import t from '../../hooks/Common/useTranslations';
+import { Platform } from 'react-native';
+
+const isAndroid = Platform.OS === 'android';
+
+export const OpenSetting = async (alertTitle, alertMessage) => {
+  await AlertAsync(alertTitle, alertMessage, [
+    {
+      text: t('cancel'),
+      onPress: () => {},
+      style: 'cancel',
+    },
+    {
+      text: t('ok'),
+      onPress: () => {
+        openSettings().then();
+      },
+    },
+  ]);
+};
+
+export const permitPermissionFunction = (keyPermission, callback) => {
+  if (keyPermission) {
+    check(keyPermission).then((result) => {
+      switch (result) {
+        case RESULTS.DENIED:
+        case RESULTS.LIMITED:
+          request(keyPermission).then((res) => callback(res));
+          break;
+        case RESULTS.BLOCKED:
+        case RESULTS.GRANTED:
+          callback(result);
+          break;
+        default:
+          break;
+      }
+    });
+  }
+};
+
+export const keyPermission = {
+  SMS_RECEIVE: PERMISSIONS.ANDROID.RECEIVE_SMS,
+  LOCATION: isAndroid
+    ? PERMISSIONS.ANDROID.ACCESS_FINE_LOCATION
+    : PERMISSIONS.IOS.LOCATION_WHEN_IN_USE,
+  CAMERA: isAndroid ? PERMISSIONS.ANDROID.CAMERA : PERMISSIONS.IOS.CAMERA,
+  SELECT_PHOTO: isAndroid
+    ? PERMISSIONS.ANDROID.READ_EXTERNAL_STORAGE
+    : PERMISSIONS.IOS.PHOTO_LIBRARY,
+};
+
+export const GEOLOCATION_ERROR = {
+  PERMISSION_DENIED: 1,
+  POSITION_UNAVAILABLE: 2,
+  TIMEOUT: 3,
+};

package/src/utils/Route/index.js

@@ -136,6 +136,7 @@ const Routes = {
   SmartAccount: 'SmartAccount',
   SmartHomeDashboard: 'SmartHomeDashboard',
   SetupGeneratePasscode: 'SetupGeneratePasscode',
+  SideMenuDetail: 'SideMenuDetail',
   SelectDeviceType: 'SelectDeviceType',
   SelectBrand: 'SelectBrand',
   GroupButtonByType: 'GroupButtonByType',

package/src/utils/Setting/Location.js

@@ -0,0 +1,30 @@
+import { Platform } from 'react-native';
+import RNAndroidLocationEnabler from 'react-native-android-location-enabler';
+import AlertAsync from 'react-native-alert-async';
+import t from '../../hooks/Common/useTranslations';
+
+export const openPromptEnableLocation = async () => {
+  if (Platform.OS === 'android') {
+    try {
+      await RNAndroidLocationEnabler.promptForEnableLocationIfNeeded({
+        interval: 10000,
+        fastInterval: 5000,
+      });
+      return true;
+    } catch (err) {
+      return false;
+    }
+  } else {
+    await AlertAsync(
+      t('turn_on_location_service'),
+      t('turn_on_location_service_des'),
+      [
+        {
+          text: t('ok'),
+          onPress: () => {},
+        },
+      ]
+    );
+    return false;
+  }
+};

package/src/utils/Utils.js

@@ -1,21 +1,21 @@
-import { PixelRatio, Linking } from 'react-native';
+import { PixelRatio, Linking, Alert } from 'react-native';
 import Toast from 'react-native-toast-message';
 import validator from 'validator';
-import axios from 'axios';
 import { Constants } from '../configs';
+import api from './Apis/axios';
 
 export const setAxiosDefaultAuthToken = (token) => {
-  axios.defaults.headers.common.Accept = 'application/json';
-  axios.defaults.headers.common.Authorization = `Token ${token}`;
+  api.setHeaders({ Authorization: `Token ${token}` });
 };
 
 export const setAxiosDefaultLanguage = (language) => {
-  axios.defaults.headers.common['Accept-Language'] =
-    language || Constants.LANGUAGE.DEFAULT;
+  api.setHeaders({
+    'Accept-Language': language || Constants.LANGUAGE.DEFAULT,
+  });
 };
 
 export const deleteDefaultAuthToken = () => {
-  delete axios.defaults.headers.common.Authorization;
+  delete api.headers.Authorization;
 };
 
 export const validateEmail = (text) => {
@@ -115,6 +115,7 @@ export const object_Ids = (data) => {
   let configIds = [];
   data?.forEach((station) => {
     stationIds.push(station?.id);
+    //Todo change devices When production release end_devices
     station?.sensors?.forEach((sensor) => {
       sensorIds.push(sensor?.id);
       sensor?.actions?.forEach((action) => {
@@ -129,6 +130,10 @@ export const object_Ids = (data) => {
   return listObject;
 };
 
+export const notImplemented = (t) => {
+  Alert.alert(t('feature_under_development'));
+};
+
 export default {
   validateEmail,
   isObjectEmpty,

package/src/utils/__test__/Utils.test.js

@@ -0,0 +1,12 @@
+import { validateEmail, formatMoney } from '../Utils';
+
+describe('Test utils', () => {
+  test('test validateEmail', () => {
+    const result = validateEmail('eoh.2020@gmail.com');
+    expect(result).toEqual(true);
+  });
+  test('test formatMoney', () => {
+    const result = formatMoney(10000);
+    expect(result).toEqual('10.000 đ');
+  });
+});