@eohjsc/react-native-smart-city 0.7.3-rc24 → 0.7.3-rc25

package/src/screens/Device/detail.js

@@ -60,6 +60,7 @@ import { useReceiveNotifications } from '../../hooks';
 import useChipJsonConfiguration, {
   useConnectChipMqtt,
 } from '../../hooks/useMqtt';
+import { useBluetoothDevice } from './components/BluetoothDevice';
 
 const DeviceDetail = ({ route }) => {
   const configIdsTemp = useRef([]);
@@ -81,13 +82,14 @@ const DeviceDetail = ({ route }) => {
   });
   const [lastEvent, setLastEvent] = useState({ id: 0, reportedAt: 0 });
 
-  const { unitData, unitId, sensorData, sensorId, isMyUnitDeviceScreen } =
+  const { unitData, unitId, sensorId, sensorData, isMyUnitDeviceScreen } =
     route?.params || {};
+
   const [unit, setUnit] = useState(unitData || { id: unitId });
-  const [sensor, setSensor] = useState(sensorData || { id: sensorId });
-  const [station, setStation] = useState(sensor?.station);
+  const [device, setDevice] = useState(sensorData || { id: sensorId });
+  const [station, setStation] = useState(device?.station);
   const { isOwner } = useIsOwnerOfUnit(unit?.user_id);
-  const [sensorName, setSensorName] = useState(sensor?.name);
+  const [sensorName, setSensorName] = useState(device?.name);
   const [lockShowing, acquireLockShowing, releaseLockShowing] = useBoolean();
   const [showPreventAccess, setShowPreventAccess, setHidePreventAccess] =
     useBoolean(false);
@@ -112,15 +114,15 @@ const DeviceDetail = ({ route }) => {
   });
 
   const { isConnected: isEoHBackendConnected } =
-    useEoHBackendDeviceConnected(sensor);
+    useEoHBackendDeviceConnected(device);
 
   const {
     isConnected: isHomeAssistantConnected,
     isConnecting: isHomeAssistantConnecting,
-  } = useHomeAssistantDeviceConnected(sensor);
+  } = useHomeAssistantDeviceConnected(device);
 
   const { isConnected: isBluetoothConnected } =
-    useBluetoothDeviceConnected(sensor);
+    useBluetoothDeviceConnected(device);
 
   const isDeviceHasBle = useMemo(() => {
     if (display.items.length === 0) {
@@ -147,11 +149,11 @@ const DeviceDetail = ({ route }) => {
   const { chips } = useChipJsonConfiguration(unit?.id);
 
   const chipFiltered = useMemo(() => {
-    return chips?.filter((item) => item?.id === sensor?.chip_id);
-  }, [chips, sensor?.chip_id]);
+    return chips?.filter((item) => item?.id === device?.chip_id);
+  }, [chips, device?.chip_id]);
 
   const { mqttConfigs } = useConnectChipMqtt(chipFiltered);
-  useDeviceWatchConfigControl(sensor, display, mqttConfigs);
+  useDeviceWatchConfigControl(device, display, mqttConfigs);
 
   const isShowSetupEmergencyContact = useMemo(
     () =>
@@ -171,7 +173,7 @@ const DeviceDetail = ({ route }) => {
   );
 
   const { isFavorite, addToFavorites, removeFromFavorites } =
-    useFavoriteDevice(sensor);
+    useFavoriteDevice(device);
 
   const currentUserId = useSCContextSelector(
     (state) => state.auth.account.user.id
@@ -181,6 +183,8 @@ const DeviceDetail = ({ route }) => {
     return Number(currentUserId) === Number(unit?.user_id);
   }, [currentUserId, unit]);
 
+  const bluetoothDevice = useBluetoothDevice(device);
+
   const fetchUnitDetail = useCallback(async () => {
     const { success, data } = await axiosGet(API.UNIT.UNIT_DETAIL(unitId));
     if (success) {
@@ -233,43 +237,40 @@ const DeviceDetail = ({ route }) => {
 
   const fetchSensorDetail = useCallback(async () => {
     const { success, data, resp_status } = await axiosGet(
-      API.DEVICE.SENSOR_DETAIL(sensorId || sensor?.id)
+      API.DEVICE.DEVICE_DETAIL(sensorId || sensorData?.id)
     );
     if (success) {
-      setSensor(data);
+      setDevice(data);
       setSensorName(data.name);
       setStation(data.station);
     } else if (resp_status === 404) {
       setShowPreventAccess();
     }
-  }, [sensor, sensorId, setShowPreventAccess]);
+  }, [sensorId, sensorData?.id, setShowPreventAccess]);
 
   useEffect(() => {
-    if (sensorId && !sensorData) {
-      fetchSensorDetail();
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [sensorId, sensorData]);
+    fetchSensorDetail();
+  }, [fetchSensorDetail]);
 
   const fetchRemoteControlOptions = useCallback(async () => {
     const { success, data } = await axiosGet(
-      API.DEVICE.REMOTE_CONTROL_OPTIONS(sensor?.id),
+      API.DEVICE.REMOTE_CONTROL_OPTIONS(device?.id),
       {},
       true
     );
     success && setControlOptions(data);
-  }, [sensor]);
+  }, [device]);
 
   const fetchDataDeviceDetail = useCallback(async () => {
     if (!token) {
       return;
     }
-    if (!sensor) {
+    if (!device) {
       return;
     }
 
     const { success, data } = await axiosGet(
-      API.DEVICE.DISPLAY(sensor?.id),
+      API.DEVICE.DISPLAY(device?.id),
       {},
       true
     );
@@ -302,7 +303,7 @@ const DeviceDetail = ({ route }) => {
         (item) => item.template.toLowerCase().search('action') !== -1
       ) &&
       (await fetchRemoteControlOptions());
-  }, [token, sensor, setDeviceId, fetchRemoteControlOptions]);
+  }, [token, device, setDeviceId, fetchRemoteControlOptions]);
 
   const {
     deviceId: emergencyDeviceId,
@@ -336,7 +337,7 @@ const DeviceDetail = ({ route }) => {
       menuItems.push({
         route: Routes.ActivityLog,
         data: {
-          id: sensor?.id,
+          id: device?.id,
           type: 'action',
           share: unit,
           filterEnabled: {
@@ -352,21 +353,21 @@ const DeviceDetail = ({ route }) => {
         text: t('edit'),
         route: Routes.EditDevice,
         data: {
-          sensor,
+          sensor: device,
           setSensorNameDetail: setSensorName,
           sensorNameDetail: sensorName,
-          setSensorDetail: setSensor,
+          setSensorDetail: setDevice,
         },
       });
       menuItems.push({
         route: Routes.ManageAccess,
-        data: { unit, sensor },
+        data: { unit, sensor: device },
         text: t('manage_access'),
       });
       menuItems.push({
         route: Routes.ChangePosition,
         data: {
-          sensor,
+          sensor: device,
           display,
           setDisplay,
           evaluate,
@@ -378,7 +379,7 @@ const DeviceDetail = ({ route }) => {
       menuItems.push({
         text: t('move_to_another_sub_unit'),
         route: Routes.MoveToAnotherSubUnit,
-        data: { unit, sensor, station, isMyUnitDeviceScreen },
+        data: { unit, sensor: device, station, isMyUnitDeviceScreen },
       });
     }
     if (isShowSetupEmergencyContact) {
@@ -401,7 +402,7 @@ const DeviceDetail = ({ route }) => {
         route: Routes.SideMenuDetail,
         data: {
           unit,
-          sensor,
+          sensor: device,
           side_menu: el,
         },
         text: el.name,
@@ -462,7 +463,7 @@ const DeviceDetail = ({ route }) => {
     t,
     isShowSetUpSmartLock,
     isFavorite,
-    sensor,
+    device,
     unit,
     sensorName,
     evaluate,
@@ -479,11 +480,11 @@ const DeviceDetail = ({ route }) => {
 
   useEffect(() => {
     fetchDataDeviceDetail();
-  }, [sensor, isNetworkConnected, fetchDataDeviceDetail]);
+  }, [device, isNetworkConnected, fetchDataDeviceDetail]);
 
-  const onRefresh = useCallback(() => {
-    fetchSensorDetail();
-    fetchDataDeviceDetail();
+  const onRefresh = useCallback(async () => {
+    await fetchSensorDetail();
+    await fetchDataDeviceDetail();
     if (
       unit.remote_control_options &&
       unit.remote_control_options.googlehome?.length &&
@@ -493,9 +494,15 @@ const DeviceDetail = ({ route }) => {
         await connectHomeAssistant(unit.remote_control_options.googlehome);
       })();
     }
-    checkScanDevicesBLE();
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [sensor, unit, isNetworkConnected, fetchDataDeviceDetail]);
+    await checkScanDevicesBLE();
+  }, [
+    fetchSensorDetail,
+    fetchDataDeviceDetail,
+    unit?.remote_control_options,
+    isNetworkConnected,
+    checkScanDevicesBLE,
+    connectHomeAssistant,
+  ]);
 
   useFocusEffect(
     useCallback(() => {
@@ -537,7 +544,7 @@ const DeviceDetail = ({ route }) => {
 
       const fetchValues = async () => {
         const { success, data, resp_status } = await axiosGet(
-          API.DEVICE.DISPLAY_VALUES_V2(sensor?.id),
+          API.DEVICE.DISPLAY_VALUES_V2(device?.id),
           {
             params: params,
           }
@@ -557,7 +564,7 @@ const DeviceDetail = ({ route }) => {
           setDisplayValuesData((prevState) => {
             if (prevState.isConnected !== data.is_connected) {
               setAction(Action.SET_DEVICES_STATUS, [
-                { id: sensor?.id, is_connected: data.is_connected },
+                { id: device?.id, is_connected: data.is_connected },
               ]);
             }
             const lastUpdated = data.last_updated && moment(data.last_updated);
@@ -603,16 +610,16 @@ const DeviceDetail = ({ route }) => {
       };
       if (
         isNetworkConnected &&
-        sensor?.is_managed_by_backend &&
-        sensor?.device_type !== DEVICE_TYPE.LG_THINQ
+        device?.is_managed_by_backend &&
+        device?.device_type !== DEVICE_TYPE.LG_THINQ
       ) {
         fetchValues();
       } else {
-        Object.keys(sensor).length > 1 &&
+        Object.keys(device).length > 1 &&
           setLoading((preState) => ({ ...preState, isConnected: false }));
       }
       // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [display.items, isNetworkConnected, sensor, mqttConfigs])
+    }, [display.items, isNetworkConnected, device, mqttConfigs])
   );
 
   useWatchConfigs(chipFiltered.length ? [] : configIdsTemp.current);
@@ -638,12 +645,12 @@ const DeviceDetail = ({ route }) => {
 
   const getDataFromLocal = async () => {
     const displayData = await getLocalData(
-      `@CACHE_REQUEST_${API.DEVICE.DISPLAY(sensor?.id)}`
+      `@CACHE_REQUEST_${API.DEVICE.DISPLAY(device?.id)}`
     );
     displayData && setDisplay(JSON.parse(displayData));
 
     const controlOptionData = await getLocalData(
-      `@CACHE_REQUEST_${API.DEVICE.REMOTE_CONTROL_OPTIONS(sensor?.id)}`
+      `@CACHE_REQUEST_${API.DEVICE.REMOTE_CONTROL_OPTIONS(device?.id)}`
     );
     controlOptionData && setControlOptions(JSON.parse(controlOptionData));
     setLoading((preState) => ({ ...preState, displayTemplate: false }));
@@ -721,8 +728,8 @@ const DeviceDetail = ({ route }) => {
   );
 
   useEffect(() => {
-    SCConfig.setCurrentSensorDisplay(sensor);
-  }, [sensor]);
+    SCConfig.setCurrentSensorDisplay(device);
+  }, [device]);
 
   const shouldRender =
     loading.displayTemplate === false &&
@@ -740,7 +747,7 @@ const DeviceDetail = ({ route }) => {
         <View style={styles.wrapTemplate}>
           {shouldRender && (
             <SensorConnectStatusViewHeader
-              sensor={sensor}
+              sensor={device}
               connectedViaNetwork={isEoHBackendConnected}
               connectedViaBle={isBluetoothConnected}
               connectedViaHomeAssistant={isHomeAssistantConnected}
@@ -751,7 +758,7 @@ const DeviceDetail = ({ route }) => {
               }
               showWindDirection={showWindDirection}
               isDeviceHasBle={isDeviceHasBle}
-              key={`sensor${sensor.id}`}
+              key={`sensor${device.id}`}
             >
               {display.items.map((item, index) => {
                 return (
@@ -773,7 +780,8 @@ const DeviceDetail = ({ route }) => {
                       item={item}
                       evaluate={evaluate}
                       emergency={onEmergencyButtonPress}
-                      sensor={sensor}
+                      sensor={device}
+                      bluetoothDevice={bluetoothDevice}
                       offsetTitle={offsetTitle}
                       setOffsetTitle={setOffsetTitle}
                       setShowWindDirection={setShowWindDirection}
@@ -807,7 +815,7 @@ const DeviceDetail = ({ route }) => {
           onSendNowAlert={onSendNowAlert}
           onHide={releaseLockShowing}
           unit={unit}
-          station={sensor?.station}
+          station={device?.station}
         />
 
         <AlertSent
@@ -816,7 +824,7 @@ const DeviceDetail = ({ route }) => {
           onPressMain={onViewDetails}
           onHide={releaseLockShowing}
           unit={unit}
-          station={sensor?.station}
+          station={device?.station}
         />
         <PreventAccess
           visible={showPreventAccess}
@@ -865,7 +873,7 @@ const DeviceDetail = ({ route }) => {
             type="H4"
             style={styles.textName}
           >
-            {unit?.name} - {sensor?.station?.name}
+            {unit?.name} - {device?.station?.name}
           </Text>
           <IconOutline
             accessibilityLabel={AccessibilityLabel.BUTTON_POPUP_RESOLVED_ICON}

package/src/utils/bluetooth.js

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