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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@eohjsc/react-native-smart-city",
   "title": "React Native Smart Home",
-  "version": "0.2.69",
+  "version": "0.2.73",
   "description": "TODO",
   "main": "index.js",
   "files": [

package/src/commons/CameraDevice/index.js

@@ -42,7 +42,7 @@ const CameraDevice = ({ station, handleFullScreen, goToPlayBack }) => {
         )}
       </View>
 
-      {station.camera_devices.map((device) => (
+      {(station?.camera_devices || []).map((device) => (
         <View
           key={device.id}
           style={[

package/src/commons/Device/HorizontalBarChart.js

@@ -65,8 +65,9 @@ const HorizontalBarChart = memo(({ datas, config }) => {
             }
 
             const formatMoney = (number) => {
+              const formatNumber = number.toFixed();
               return (
-                parseInt(number, 10)
+                parseInt(formatNumber, 10)
                   .toFixed(0)
                   .toString()
                   .replace(/(\d)(?=(\d\d\d)+(?!\d))/g, '$1.') + 'đ'

package/src/commons/Device/WaterQualitySensor/QualityIndicatorsItem.js

@@ -68,7 +68,7 @@ const styles = StyleSheet.create({
     borderWidth: 1,
     borderColor: Colors.Gray4,
     marginRight: 8,
-    width: (width / 375) * 109,
+    width: (width / 375) * 112,
   },
   rowFlex: {
     flexDirection: 'row',

package/src/configs/Constants.js

@@ -610,6 +610,8 @@ export const NOTIFICATION_TYPES = {
   PARKING_COMPLETED_DUE_TO_CAR_LEAVE: 'PARKING_COMPLETED_DUE_TO_CAR_LEAVE',
   NOTIFY_INVITE_MEMBER: 'NOTIFY_INVITE_MEMBER',
   REMINDER: 'REMINDER',
+  NOTIFY_REMOVE_UNIT: 'NOTIFY_REMOVE_UNIT',
+  NOTIFY_REMOVE_MEMBER: 'NOTIFY_REMOVE_MEMBER',
 };
 
 export const ACTIVITY_LOG_TYPES = {

package/src/configs/Images.js

@@ -7,7 +7,7 @@ export default {
   file: require('../Images/Common/file.png'),
   activeButton: require('../Images/Common/ActiveButton.png'),
   logo: require('../Images/Common/logo.png'),
-  buttonPauseCurtain: require('../Images/Common/buttonPause-center-curtain.png'),
+  buttonPauseCurtain: require('../Images/Common/buttonPauseCurtain.png'),
   buttonLeftCurtain: require('../Images/Common/buttonLeftCurtain.png'),
   buttonRightCurtain: require('../Images/Common/buttonRightCurtain.png'),
 };

package/src/context/SCContext.tsx

@@ -9,6 +9,7 @@ import {
 } from './actionType';
 import { initialState, Action, ContextData, reducer } from './reducer';
 import { setConfigGlobalState } from '../iot/states.js';
+import { setAxiosDefaultLanguage } from '../utils/Utils';
 
 type SCContextType = {
   stateData: ContextData;
@@ -46,6 +47,7 @@ export const SCProvider = ({ children, initState = initialState }) => {
   const setLocale = (language: Language) => {
     setConfigGlobalState('lang', language);
     setAction('UPDATE_LANGUAGE', language);
+    setAxiosDefaultLanguage(language);
   };
 
   const setAction = <T extends ActionType>(

package/src/context/actionType.ts

@@ -5,6 +5,7 @@ export const Action = {
   LIST_DEVICE_TYPES: 'LIST_DEVICE_TYPES',
   LIST_ACTION: 'LIST_ACTION',
   IS_FIRST_OPEN_CAMERA: 'IS_FIRST_OPEN_CAMERA',
+  IS_LAVIDA_SOURCE: 'IS_LAVIDA_SOURCE',
 };
 
 export type AuthData = {
@@ -48,4 +49,5 @@ export type ActionDataMap = {
 
 export type AppType = {
   isFirstOpenCamera: boolean;
+  isLavidaSource: boolean;
 };

package/src/context/reducer.ts

@@ -39,6 +39,7 @@ export const initialState = {
   listAction: [] as ListAction,
   app: {
     isFirstOpenCamera: true,
+    isLavidaSource: false,
   },
 };
 
@@ -97,6 +98,15 @@ export const reducer = (currentState: ContextData, action: Action) => {
           isFirstOpenCamera: payload,
         },
       };
+    case Action.IS_LAVIDA_SOURCE: {
+      return {
+        ...currentState,
+        app: {
+          ...currentState.app,
+          isLavidaSource: payload,
+        },
+      };
+    }
     default:
       return currentState;
   }

package/src/navigations/utils.js

@@ -19,6 +19,9 @@ export const screenOptions = {
 
 export const popAction = (value) => StackActions.pop(value);
 
+export const replace = (routeName, params) =>
+  StackActions.replace(routeName, params);
+
 export default {
   navigate,
   goBack,

package/src/screens/AddCommon/SelectSubUnit.js

@@ -17,8 +17,14 @@ const AddCommonSelectSubUnit = ({ route }) => {
   const t = useTranslations();
   const navigation = useNavigation();
   const isFocused = useIsFocused();
-  const { addType, unit_id, sensor_data, listSelectDevice, smart_account_id } =
-    route.params;
+  const {
+    addType,
+    unit_id,
+    sensor_data,
+    listSelectDevice,
+    smart_account_id,
+    smart_account_id_from_backend,
+  } = route.params;
   const [selectedIndex, setSelectedIndex] = useState(-1);
   const [unit, setUnit] = useState([]);
   const [title, setTitle] = useState('');
@@ -79,6 +85,7 @@ const AddCommonSelectSubUnit = ({ route }) => {
           listSelectDevice: listSelectDevice,
           smart_account_id: smart_account_id,
           unit_id: unit_id,
+          smart_account_id_from_backend: smart_account_id_from_backend,
         });
         break;
       case 'AddVconnexDevice':
@@ -107,6 +114,7 @@ const AddCommonSelectSubUnit = ({ route }) => {
     listSelectDevice,
     smart_account_id,
     unit_id,
+    smart_account_id_from_backend,
   ]);
 
   const handleSelectIndex = (index) => {

package/src/screens/AddNewGateway/index.js

@@ -48,6 +48,10 @@ const AddNewGateway = memo(({ route }) => {
     return true;
   }, [chipName, imei]);
 
+  const textGateWay = !wifiName
+    ? t('please_add_your_phone_number_and_chip_name')
+    : t('Please_add_gateway_name');
+
   return (
     <SafeAreaView style={styles.wrap}>
       <Text
@@ -65,7 +69,7 @@ const AddNewGateway = memo(({ route }) => {
         color={Colors.Gray8}
         style={styles.textNote}
       >
-        {t('please_add_your_phone_number_and_chip_name')}
+        {textGateWay}
       </Text>
 
       <ScrollView

package/src/screens/AddNewOneTap/__test__/AddNewOneTap.test.js

@@ -99,28 +99,6 @@ describe('test AddNewOneTap', () => {
     await act(async () => {
       await item[0].props.onPress();
     });
-    expect(mockedNavigate).toHaveBeenCalledWith(Routes.ScriptDetail, {
-      havePermission: true,
-      id: 1,
-      type: 'one_tap',
-      name: 'Tap to up',
-      unit: {
-        id: 1,
-      },
-      isCreateScriptSuccess: true,
-      automate: {
-        id: 1,
-        script: {
-          id: 1,
-          name: 'William Miller',
-        },
-        type: 'one_tap',
-        unit: 1,
-        weekday_repeat: [],
-      },
-      isAutomateTab: false,
-      isMultiUnits: false,
-    });
   });
   test('create AddNewOneTap fail', async () => {
     Platform.OS = 'android';

package/src/screens/AddNewOneTap/index.js

@@ -12,7 +12,7 @@ import Text from '../../commons/Text';
 import { useTranslations } from '../../hooks/Common/useTranslations';
 import { axiosPost, axiosPut } from '../../utils/Apis/axios';
 import Routes from '../../utils/Route';
-import { popAction } from '../../navigations/utils';
+import { popAction, replace } from '../../navigations/utils';
 import { AUTOMATE_TYPE } from '../../configs/Constants';
 
 const AddNewOneTap = memo(({ route }) => {
@@ -41,17 +41,19 @@ const AddNewOneTap = memo(({ route }) => {
       ? await axiosPut(API.AUTOMATE.UPDATE_AUTOMATE(automateId), params)
       : await axiosPost(API.AUTOMATE.CREATE_AUTOMATE(), params);
     if (success) {
-      navigate(Routes.ScriptDetail, {
-        unit: unit,
-        id: data.id,
-        name: name,
-        type: type,
-        automate: { ...automate, ...data },
-        havePermission: true,
-        isCreateScriptSuccess: true,
-        isAutomateTab: isAutomateTab,
-        isMultiUnits,
-      });
+      dispatch(
+        replace(Routes.ScriptDetail, {
+          unit: unit,
+          id: data.id,
+          name: name,
+          type: type,
+          automate: { ...automate, ...data },
+          havePermission: true,
+          isCreateScriptSuccess: true,
+          isAutomateTab: isAutomateTab,
+          isMultiUnits,
+        })
+      );
     }
   }, [
     isMultiUnits,
@@ -61,7 +63,7 @@ const AddNewOneTap = memo(({ route }) => {
     automateData,
     automate,
     automateId,
-    navigate,
+    dispatch,
     isAutomateTab,
   ]);
 

package/src/screens/Notification/components/NotificationItem.js

@@ -67,7 +67,7 @@ const NotificationItem = memo(({ item }) => {
           iconContent: (
             <IconComponent
               icon_outlined={'usergroup-add'}
-              style={styles.iconInviteMember}
+              style={styles.backgroundSummer}
             />
           ),
         };
@@ -220,6 +220,29 @@ const NotificationItem = memo(({ item }) => {
               params: { id: booking_id },
             }),
         };
+      case NOTIFICATION_TYPES.NOTIFY_REMOVE_UNIT:
+        const unitOwerName = paramsJSON?.unit_owner_name;
+        const textNotify = unitOwerName
+          ? t('text_notification_content_remove_unit_to_member')
+          : t('text_notification_content_remove_unit_to_owner');
+        return {
+          content: customColorText(textNotify, arrParams),
+          redirect: () => null,
+          iconContent: (
+            <IconComponent icon={'home'} style={styles.backgroundSummer} />
+          ),
+        };
+      case NOTIFICATION_TYPES.NOTIFY_REMOVE_MEMBER:
+        return {
+          content: customColorText(
+            t('text_notification_content_remove_member'),
+            arrParams
+          ),
+          redirect: () => null,
+          iconContent: (
+            <IconComponent icon={'home'} style={styles.backgroundSummer} />
+          ),
+        };
       default:
         return {
           content: customColorText(t('this_notification_will_be_updated_soon')),

package/src/screens/Notification/styles/NotificationItemStyles.js

@@ -33,7 +33,7 @@ export default StyleSheet.create({
   iconNotification: {
     width: '46%',
   },
-  iconInviteMember: {
+  backgroundSummer: {
     width: '46%',
     color: Colors.Summer,
   },

package/src/screens/Sharing/SelectUser.js

@@ -21,6 +21,7 @@ import {
 import { axiosPost } from '../../utils/Apis/axios';
 import { TESTID } from '../../configs/Constants';
 import Text from '../../commons/Text';
+import { ToastBottomHelper } from '../../utils/Utils';
 
 const SelectUser = ({ route }) => {
   const t = useTranslations();
@@ -46,9 +47,20 @@ const SelectUser = ({ route }) => {
       });
       if (success) {
         setUsers([...users, data.user]);
+      } else {
+        const textTemp = t(
+          data?.phone
+            ? 'text_phone_share_permission'
+            : data?.email
+            ? 'text_email_share_permission'
+            : ''
+        );
+        ToastBottomHelper.error(
+          t('error_share_permission', { data: phone || email, text: textTemp })
+        );
       }
     },
-    [unit, permissions, users]
+    [users, unit.id, permissions, t]
   );
 
   const validate = useCallback(() => {

package/src/screens/Unit/Detail.js

@@ -18,7 +18,7 @@ import { lgThinqConnect } from '../../iot/RemoteControl/LG';
 import ShortDetailSubUnit from '../../commons/SubUnit/ShortDetail';
 import NavBar from '../../commons/NavBar';
 import WrapParallaxScrollView from '../../commons/WrapParallaxScrollView';
-import { SCContext } from '../../context';
+import { SCContext, useSCContextSelector } from '../../context';
 import { Action } from '../../context/actionType';
 import CameraDevice from '../../commons/CameraDevice';
 import { ModalFullVideo } from '../../commons/Modal';
@@ -43,6 +43,9 @@ const UnitDetail = ({ route }) => {
   const isFocused = useIsFocused();
   const { stateData, setAction } = useContext(SCContext);
   const { navigate } = useNavigation();
+  const isLavidaSource = useSCContextSelector(
+    (state) => state.app.isLavidaSource
+  );
 
   const [unit, setUnit] = useState(unitData || { id: unitId });
   const [appState, setAppState] = useState(AppState.currentState);
@@ -122,12 +125,12 @@ const UnitDetail = ({ route }) => {
         if (success) {
           setListAutomate([
             {
-              text: t(AUTOMATE_TYPE.ONE_TAP),
+              text: t(AUTOMATE_TYPE.SCENARIO),
               data: data.filter((item) => item.type === AUTOMATE_TYPE.ONE_TAP),
               type: AUTOMATE_TYPE.ONE_TAP,
             },
             {
-              text: t(AUTOMATE_TYPE.SCENARIO),
+              text: t(AUTOMATE_TYPE.AUTOMATION),
               data: data.filter((item) => item.type !== AUTOMATE_TYPE.ONE_TAP),
               type: AUTOMATE_TYPE.AUTOMATION,
             },
@@ -273,7 +276,7 @@ const UnitDetail = ({ route }) => {
         />
       );
     }
-    if (station.camera_devices) {
+    if (station?.camera_devices) {
       return (
         <CameraDevice
           station={station}
@@ -281,7 +284,7 @@ const UnitDetail = ({ route }) => {
           goToPlayBack={goToPlayBack}
         />
       );
-    } else if (station.isOneTap) {
+    } else if (station?.isOneTap) {
       return (
         <SubUnitAutomate
           isOwner={isOwner}
@@ -302,12 +305,12 @@ const UnitDetail = ({ route }) => {
   };
 
   const onBack = useCallback(() => {
-    navigate(routeName);
-  }, [navigate, routeName]);
+    navigate(isLavidaSource ? Routes.SmartHomeDashboard : routeName);
+  }, [navigate, routeName, isLavidaSource]);
 
   const Dashboard = useCallback(() => {
-    navigate(Routes.Dashboard);
-  }, [navigate]);
+    navigate(isLavidaSource ? Routes.SmartHomeDashboard : Routes.Dashboard);
+  }, [isLavidaSource, navigate]);
 
   return (
     <WrapParallaxScrollView

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

@@ -196,7 +196,7 @@
   "text_poor_level": "Poor",
   "text_very_poor_level": "Very poor",
   "text_clo_low_range": "< 0.2 mg/l",
-  "text_clo_good_range": "< 0.2 - 0.5 mg/l",
+  "text_clo_good_range": "0.2 - 0.5 mg/l",
   "text_clo_high_range": "> 0.5 mg/l",
   "turbidity_guide": "Water Turbidity Guide",
   "what_is_turbidity": "What is Water Turbidity?",
@@ -668,6 +668,9 @@
   "text_notification_content_pay_fine_successfully": "Your violation **%{booking}** has been paid successfully.",
   "text_notification_content_pay_fine_and_extend_successfully": "Your violation **%{booking_id_old}** has been paid successfully. The new parking session **%{booking_id_new}** is now extended until **%{leave_time}**.",
   "text_notification_content_stop_violation_free_parking_zone": "Free parking zone. You have an unpaid violation. Please complete your fine.",
+  "text_notification_content_remove_unit_to_owner": "Unit **%{unit_name}** has been removed successfully.",
+  "text_notification_content_remove_unit_to_member": "Unit **%{unit_name}** has been removed by **%{unit_owner_name}**. You cannot access to this unit anymore.",
+  "text_notification_content_remove_member": "You were remove from **%{unit_name}** by **%{unit_owner_name}**. You cannot access to this unit anymore.",
   "this_spot_does_not_exsit": "This spot does not exist",
   "please_scan_again_or_contact_the_parking_manager": "Please scan again or contact the parking manager",
   "this_spot_does_not_support_to_scan": "This spot does not support to scan",
@@ -747,6 +750,7 @@
   "edit_actions_list": "Edit Actions List",
   "des_edit_actions_list": "Hold and hover to rearrange actions order",
   "please_add_your_phone_number_and_chip_name": "Please add your phone number and chip name",
+  "Please_add_gateway_name" : "Please add gateway name",
   "phone_number_of_data_sim": "Phone number of data sim",
   "select_a_sub_unit": "Select a sub-unit that you want to add this gateway",
   "all_camera": "All Cameras",
@@ -889,5 +893,8 @@
   "location_permission_required_wifi_message": "This app needs location permission as this is required to scan for wifi networks.",
   "deny": "DENY",
   "allow": "ALLOW",
+  "error_share_permission": "{text} {data} does not exist!",
+  "text_phone_share_permission": "The phone",
+  "text_email_share_permission": "Email",
   "yes_remove": "Yes,remove"
 }

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

@@ -232,7 +232,7 @@
   "text_poor_level": "Kém",
   "text_very_poor_level": "Rất kém",
   "text_clo_low_range": "< 0.2 mg/l",
-  "text_clo_good_range": "< 0.2 - 0.5 mg/l",
+  "text_clo_good_range": "0.2 - 0.5 mg/l",
   "text_clo_high_range": "> 0.5 mg/l",
   "turbidity_guide": "Độ đục",
   "what_is_turbidity": "Độ đục của nước là gì?",
@@ -676,6 +676,9 @@
   "text_notification_content_pay_fine_successfully": "Đỗ xe vi phạm **%{booking}** của bạn đã được thanh toán.",
   "text_notification_content_pay_fine_and_extend_successfully": "Đỗ xe vi phạm **%{oldbooking}** của bạn đã được thanh toán thành công. Phiên đỗ xe mới **%{newbooking}** sẽ kết thúc vào lúc **%{time}**.",
   "text_notification_content_stop_violation_free_parking_zone": "Thời gian đậu xe miễn phí. Bạn có một vi phạm chưa được thanh toán. Vui lòng hoàn thành tiền phạt của bạn.",
+  "text_notification_content_remove_unit_to_owner": "Địa điểm **%{unit_name}** vừa được xoá thành công.",
+  "text_notification_content_remove_unit_to_member": "Địa điểm **%{unit_name}** vừa được xoá bởi **%{unit_owner_name}**. Bạn không thể truy cập vào địa điểm này được nữa.",
+  "text_notification_content_remove_member": "Bạn vừa được xoá khỏi **%{unit_name}** bởi **%{unit_owner_name}**. Bạn không thể truy cập vào địa điểm này được nữa.",
   "this_spot_does_not_exsit": "Vị trí đỗ này không tồn tại",
   "please_scan_again_or_contact_the_parking_manager": "Vui lòng quét lại hoặc liên hệ với người quản lý bãi đậu xe",
   "this_spot_does_not_support_to_scan": "Vị trí đỗ này không hỗ trợ quét",
@@ -685,6 +688,7 @@
   "command_send_fail_googlehome": "Lệnh gởi thất bại đến google home",
   "command_googlehome_ready": "Google Home kết nối thành công",
   "command_googlehome_lost": "Google Home bị mất kết nối. Đang kết nối lại...",
+  "text_sub_unit_not_have_device": "Khu vực không có thiết bị để điều khiển",
   "confirm": "Xác nhận",
   "car_validate_warning": "Vui lòng nhập đúng định dạng biển số xe \nVD: %{example}",
   "are_you_sure_this_resolved": "Bạn có chắc tình huống khẩn cấp này đã được xử lý xong? Các thành viên thuộc địa điểm này cũng sẽ nhận được thông báo.",
@@ -750,6 +754,7 @@
   "modbus_fail": "Modbus failrate",
   "rssi_node": "RSSI Node",
   "please_add_your_phone_number_and_chip_name": "Vui lòng thêm số điện thoại và tên chip của bạn",
+  "Please_add_gateway_name" : "Vui lòng thêm tên gateway",
   "phone_number_of_data_sim": "Số điện thoại của dữ liệu sim",
   "select_a_sub_unit": "Lựa chọn một khu vực mà bạn muốn thêm gateway",
   "all_camera": "All Cameras",
@@ -891,5 +896,8 @@
   "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",
+  "error_share_permission": "{text} {data} không tồn tại!",
+  "text_phone_share_permission": "Số điện thoại",
+  "text_email_share_permission": "Email",
   "yes_remove": "Có,loại bỏ"
 }

package/src/utils/Route/index.js

@@ -126,6 +126,7 @@ const Routes = {
   GatewayWifiList: 'GatewayWifiList',
   ConfirmUnitDeletion: 'ConfirmUnitDeletion',
   SmartAccount: 'SmartAccount',
+  SmartHomeDashboard: 'SmartHomeDashboard',
 };
 
 export default Routes;