@eohjsc/react-native-smart-city 0.7.23 → 0.7.25

package/src/screens/Device/detail.js

@@ -21,6 +21,7 @@ import {
   useAlertResolveEmergency,
   useEmergencyButton,
 } from './hooks/useEmergencyButton';
+import { useDashboardDevice } from './hooks/useDashboardDevice';
 import { useFavoriteDevice } from './hooks/useFavoriteDevice';
 import { usePopover } from '../../hooks/Common';
 import { setConfigGlobalState, getConfigGlobalState } from '../../iot/states';
@@ -172,6 +173,9 @@ const DeviceDetail = ({ route }) => {
     [display.items]
   );
 
+  const { isPinnedDashboard, addToDashboard, removeFromDashboard } =
+    useDashboardDevice(device);
+
   const { isFavorite, addToFavorites, removeFromFavorites } =
     useFavoriteDevice(device);
 
@@ -333,6 +337,30 @@ const DeviceDetail = ({ route }) => {
 
   const listMenuItem = useMemo(() => {
     const menuItems = [];
+
+    if (!isPinnedDashboard) {
+      menuItems.push({
+        doAction: addToDashboard,
+        text: t('add_to_dashboard'),
+      });
+    } else {
+      menuItems.push({
+        doAction: removeFromDashboard,
+        text: t('remove_from_dashboard'),
+      });
+    }
+    if (!isFavorite) {
+      menuItems.push({
+        doAction: addToFavorites,
+        text: t('add_to_favorites'),
+      });
+    } else {
+      menuItems.push({
+        doAction: removeFromFavorites,
+        text: t('remove_from_favorites'),
+      });
+    }
+
     if (display.items.some((i) => getActionComponent(i.template))) {
       menuItems.push({
         route: Routes.ActivityLog,
@@ -443,17 +471,6 @@ const DeviceDetail = ({ route }) => {
         text: t('passcode_list'),
       });
     }
-    if (!isFavorite) {
-      menuItems.unshift({
-        doAction: addToFavorites,
-        text: t('add_to_favorites'),
-      });
-    } else {
-      menuItems.unshift({
-        doAction: removeFromFavorites,
-        text: t('remove_from_favorites'),
-      });
-    }
     return [...menuItems];
   }, [
     display,
@@ -462,6 +479,7 @@ const DeviceDetail = ({ route }) => {
     sideMenu,
     t,
     isShowSetUpSmartLock,
+    isPinnedDashboard,
     isFavorite,
     device,
     unit,
@@ -471,7 +489,9 @@ const DeviceDetail = ({ route }) => {
     fetchDataDeviceDetail,
     isMyUnitDeviceScreen,
     emergencyDeviceId,
+    addToDashboard,
     addToFavorites,
+    removeFromDashboard,
     removeFromFavorites,
   ]);
 
@@ -729,6 +749,19 @@ const DeviceDetail = ({ route }) => {
   const HeaderRight = useMemo(
     () => (
       <View style={styles.headerRight}>
+        <TouchableOpacity
+          onPress={isPinnedDashboard ? removeFromDashboard : addToDashboard}
+          accessibilityLabel={AccessibilityLabel.HEADER_DEVICE_BUTTON_PIN}
+        >
+          <View style={styles.buttonStar}>
+            {isPinnedDashboard ? (
+              <IconFill name="pushpin" size={25} color={Colors.Yellow6} />
+            ) : (
+              <IconOutline name="pushpin" size={25} />
+            )}
+          </View>
+        </TouchableOpacity>
+
         <TouchableOpacity
           onPress={isFavorite ? removeFromFavorites : addToFavorites}
           accessibilityLabel={AccessibilityLabel.HEADER_DEVICE_BUTTON_STAR}
@@ -761,12 +794,15 @@ const DeviceDetail = ({ route }) => {
       </View>
     ),
     [
+      isPinnedDashboard,
       isFavorite,
-      removeFromFavorites,
-      addToFavorites,
       isShowSetupEmergencyContact,
-      onPressSetting,
+      addToDashboard,
+      addToFavorites,
+      removeFromDashboard,
+      removeFromFavorites,
       handleShowMenuAction,
+      onPressSetting,
     ]
   );
 

package/src/screens/Device/hooks/useDashboardDevice.js

@@ -0,0 +1,34 @@
+import { useContext, useCallback } from 'react';
+import { API } from '../../../configs';
+import { SCContext, useSCContextSelector } from '../../../context';
+import { Action } from '../../../context/actionType';
+import { axiosPost } from '../../../utils/Apis/axios';
+
+export const useDashboardDevice = (device) => {
+  const { setAction } = useContext(SCContext);
+  const dashboardDeviceIds = useSCContextSelector(
+    (state) => state.unit.dashboardDeviceIds
+  );
+
+  const isPinnedDashboard = dashboardDeviceIds.includes(device.id);
+
+  const addToDashboard = useCallback(async () => {
+    const { success } = await axiosPost(API.DEVICE.ADD_TO_DASHBOARD(device.id));
+    success && setAction(Action.ADD_DEVICES_TO_DASHBOARD, [device.id]);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [device.id]);
+
+  const removeFromDashboard = useCallback(async () => {
+    const { success } = await axiosPost(
+      API.DEVICE.REMOVE_FROM_DASHBOARD(device.id)
+    );
+    success && setAction(Action.REMOVE_DEVICES_FROM_DASHBOARD, [device.id]);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [device.id]);
+
+  return {
+    isPinnedDashboard,
+    addToDashboard,
+    removeFromDashboard,
+  };
+};

package/src/utils/FactoryGateway.js

@@ -423,6 +423,90 @@ export const gatewayDataFactory = {
       chip: 7689,
       icon_kit: null,
     },
+    {
+      // Third Party
+      id: 9,
+      configs: [
+        {
+          id: 37,
+          status_texts: [],
+          is_on: false,
+          get_value_unit: '',
+          period_configs: [],
+          auto_triggers: [],
+          spotsensorconnect: null,
+          last_maxmin: null,
+          user_receive_email: [],
+          phone_send_sms: [],
+          status_configuration: {},
+          is_auto_release: false,
+          related_actions: [],
+          active: true,
+          name: 'LED',
+          is_read: true,
+          is_write: true,
+          range_min: null,
+          range_max: null,
+          unit: '',
+          scale: 1,
+          is_main: true,
+          is_chart: true,
+          is_report: true,
+          is_chart_column: false,
+          is_hide: false,
+          display_type: '',
+          is_alarm: false,
+          email_flags: false,
+          time_is_over: null,
+          maintain_time: 5,
+          number_send_email: null,
+          period_send_email: 15,
+          allow_min_value: 0,
+          allow_max_value: 0,
+          message: 'Thông báo.',
+          last_time_send_email: null,
+          ai_trans_offset_value: '0.000',
+          ai_trans_average_sample: 0,
+          last_values: [],
+          icon: '',
+          scale_write: 1,
+          lock: false,
+          flag: false,
+          index: 0,
+          decimal_behind: null,
+          active_filter: '',
+          high_level: 0,
+          low_level: 0,
+          value_converter: '',
+          ack: false,
+          sensor_type: '',
+          value_type: 'number',
+          enable_log_max_min: true,
+          log_value_mode: 1,
+          freq_log_data: 600,
+          number_days_storage: 180,
+          storage_start_date: '2025-01-07',
+          release_time: 0,
+          sensor: 9,
+          end_device: 4,
+          last_value: null,
+          last_value_log: null,
+        },
+      ],
+      active: true,
+      name: 'LED',
+      mix: true,
+      index: 0,
+      icon: '',
+      is_managed_by_backend: true,
+      device_id: '',
+      last_updated: null,
+      connection_time: 60,
+      sent_email: false,
+      realtime_monitoring: false,
+      chip: 3,
+      icon_kit: null,
+    },
   ],
   id: 7689,
   sn: '57ae596e-ef65-4162-9b6f-4f67f2c86632',
@@ -523,4 +607,25 @@ export const gatewayDataFactory = {
     ],
     chip: 7682,
   },
+  third_party_gateway: {
+    id: 4,
+    sensors: [
+      {
+        id: 5,
+        configs: [
+          {
+            id: 5,
+            key: 'led',
+            value_type: 'number',
+            device: 5,
+            config: 37,
+          },
+        ],
+        device_uid: '0x00158d00022fd388',
+        gateway: 4,
+        sensor: 9,
+      },
+    ],
+    chip: 7689,
+  },
 };

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

@@ -42,6 +42,9 @@ export default {
   contact_infomation: 'Contact Infomation',
   company_infomation: 'Company Infomation',
   terms_and_condition: 'Terms & Conditions',
+  add_to_dashboard: 'Add to Dashboard',
+  remove_from_dashboard: 'Remove from Dashboard',
+  dashboard_devices: 'Dashboard Devices',
   text_sub_units: 'Sub-units',
   text_my_units: 'My Units',
   text_shared_units: 'Shared Units',

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

@@ -117,6 +117,9 @@ export default {
   text_good_night: 'Chào buổi tối, {0}',
   text_anonymous: '',
   multi_unit: 'Nhiều đơn vị',
+  add_to_dashboard: 'Thêm vào Dashboard',
+  remove_from_dashboard: 'Loại khỏi Dashboard',
+  dashboard_devices: 'Thiết bị thường dùng',
   text_my_units: 'Địa điểm của tôi',
   text_shared_units: 'Địa điểm được chia sẻ       ',
   text_copyright:
@@ -491,7 +494,7 @@ export default {
   to: 'đến',
   condition: 'Điều kiện',
   no_condition: 'Không điều kiện',
-  available_condition: 'Số điều khiện còn lại [{number}]',
+  available_condition: 'Số điều kiện còn lại [{number}]',
   available_action: 'Số hành động còn lại [{number}]',
   shared_unit: 'Khu vực được chia sẻ',
   owner_unit: 'Chủ khu vực',
@@ -1049,10 +1052,10 @@ export default {
   update_condition_success: 'Cập nhật điều kiện thành công',
   edit_condition_success: 'Chỉnh sửa điều kiện thành công',
   delete_condition: 'Xoá điều kiện',
-  are_met: 'Tất cả điều khiện đều thỏa',
+  are_met: 'Tất cả điều kiện đều thỏa',
   is_met: 'Một trong các điều kiện được thỏa',
-  add_condition: 'Thêm điều khiện',
-  add_condition_success: 'Thêm điều khiện thành công',
+  add_condition: 'Thêm điều kiện',
+  add_condition_success: 'Thêm điều kiện thành công',
   device_display: 'Thiết bị hiển thị',
   time_frame: 'Khung thời gian',
   ex_time_frame: 'Ví dụ: 8:00 a.m. mỗi ngày.',

package/src/utils/Storage.js

@@ -9,11 +9,27 @@ export const STORAGE_KEY = {
 };
 
 export const storeData = async (key, value) => {
-  return await AsyncStorage.setItem(`${key}`, value);
+  return await AsyncStorage.setItem(key, value);
 };
 
 export const getData = async (key) => {
-  return await AsyncStorage.getItem(`${key}`);
+  return await AsyncStorage.getItem(key);
+};
+
+export const storeObject = async (key, value) => {
+  return await AsyncStorage.setItem(key, JSON.stringify(value));
+};
+
+export const getObject = async (key, defaultValue) => {
+  const value = await AsyncStorage.getItem(key);
+  if (value === null) {
+    return defaultValue;
+  }
+  try {
+    return JSON.parse(value);
+  } catch (e) {
+    return defaultValue;
+  }
 };
 
 export const removeMultiple = async (keys) => {