@eohjsc/react-native-smart-city 0.4.83 → 0.4.84

package/package.json

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

package/src/commons/UnitSummary/ConfigHistoryChart/index.js

@@ -36,7 +36,10 @@ export const useFetchConfigHistory = (configs, setChartData) => {
         'date_from',
         startDate.subtract(7, 'hours').format('YYYY-MM-DDTHH:mm:ss')
       );
-      params.append('date_to', endDate.format('YYYY-MM-DDTHH:mm:ss'));
+      params.append(
+        'date_to',
+        endDate.subtract(7, 'hours').format('YYYY-MM-DDTHH:mm:ss')
+      );
 
       const { success, data } = await axiosGet(
         API.CONFIG.DISPLAY_HISTORY_V3(),

package/src/hooks/IoT/useBluetoothDeviceConnected.js

@@ -7,10 +7,8 @@ const useBluetoothDeviceConnected = (device) => {
   const isBluetoothEnabled = useSCContextSelector((state) => {
     return state.bluetooth.isEnabled;
   });
-
-  const isConnected =
-    isBluetoothEnabled &&
-    !!connectedDevices[device?.remote_control_options?.bluetooth?.address];
+  const address = device?.remote_control_options?.bluetooth?.address;
+  const isConnected = isBluetoothEnabled && !!connectedDevices[address];
 
   return { isConnected };
 };

package/src/iot/RemoteControl/Bluetooth.js

@@ -30,7 +30,7 @@ export const clearFoundDevices = () => {
 
 export const scanBluetoothDevices = async (names, onDeviceFound) => {
   names.map((name) => {
-    if (bluetoothDevices[name]) {
+    if (needToScanDevices.includes(name)) {
       return;
     }
     needToScanDevices.push(name);
@@ -163,20 +163,26 @@ export const sendDataOverBluetooth = async (
   let fullDataDevice = null;
   let result = true;
   let hasResponse = false;
-
   try {
-    connectedDevice = await device.connect();
+    connectedDevice = await device.connect({ timeout: 5000 });
   } catch (e) {
     const BLE_ERROR = {
       DEVICE_IS_NOT_ALREADY_CONNECTED: 201,
       DEVICE_WAS_DISCONNECTED: 203,
+      DEVICE_CONNECTION_TIMEOUT: 3,
+      PHONE_HAS_BLUETOOTH_TURNED_OFF: 102,
     };
-    if (
-      e?.errorCode === BLE_ERROR.DEVICE_IS_NOT_ALREADY_CONNECTED ||
-      BLE_ERROR.DEVICE_WAS_DISCONNECTED
-    ) {
-      await bleManager.cancelDeviceConnection(device.id);
-      return BLUETOOOH_DEVICE_UNSTABLE;
+    switch (e?.errorCode) {
+      case BLE_ERROR.DEVICE_IS_NOT_ALREADY_CONNECTED:
+      case BLE_ERROR.DEVICE_WAS_DISCONNECTED:
+        await bleManager.cancelDeviceConnection(device.id);
+        return BLUETOOOH_DEVICE_UNSTABLE;
+      case BLE_ERROR.DEVICE_CONNECTION_TIMEOUT:
+      case BLE_ERROR.PHONE_HAS_BLUETOOTH_TURNED_OFF:
+        delete bluetoothDevices[device.address];
+        return SEND_COMMAND_OVER_BLUETOOTH_FAIL;
+      default:
+        return SEND_COMMAND_OVER_BLUETOOTH_FAIL;
     }
   }
   try {

package/src/screens/Device/components/SensorConnectStatusViewHeader.js

@@ -39,22 +39,22 @@ export const SensorConnectStatusViewHeader = ({
           </>
         );
       }
-      if (connectedViaNetwork) {
+      if (connectedViaBle) {
         return (
           <>
             <ConnectedViewHeader
               lastUpdated={lastUpdated}
+              type={'Bluetooth'}
               isDisplayTime={isDisplayTime}
               showWindDirection={showWindDirection}
             />
           </>
         );
-      } else if (connectedViaBle) {
+      } else if (connectedViaNetwork) {
         return (
           <>
             <ConnectedViewHeader
               lastUpdated={lastUpdated}
-              type={'Bluetooth'}
               isDisplayTime={isDisplayTime}
               showWindDirection={showWindDirection}
             />

package/src/screens/Device/components/VisualChart.js

@@ -292,7 +292,7 @@ const VisualChart = ({ item, isDemo = false, isWidgetOrder }) => {
   return (
     <View style={styles.container}>
       <View style={styles.titleHistory}>
-        <Text size={20} semibold color={Colors.Gray9}>
+        <Text type="H3" semibold color={Colors.Gray9}>
           {item.label}
         </Text>
       </View>

package/src/screens/Device/detail.js

@@ -190,6 +190,13 @@ const DeviceDetail = ({ route }) => {
     }
   }, [unitId]);
 
+  const checkScanDevicesBLE = useCallback(async () => {
+    const bluetooth = controlOptions?.bluetooth;
+    if (isBluetoothEnabled && bluetooth) {
+      bluetoothScanDevices([bluetooth.address]);
+    }
+  }, [bluetoothScanDevices, controlOptions?.bluetooth, isBluetoothEnabled]);
+
   useEffect(() => {
     if (unitId && !unitData) {
       fetchUnitDetail();
@@ -222,10 +229,7 @@ const DeviceDetail = ({ route }) => {
   }, [unit, isNetworkConnected]);
 
   useEffect(() => {
-    if (isBluetoothEnabled && controlOptions?.bluetooth) {
-      const bluetooth = controlOptions.bluetooth;
-      bluetoothScanDevices([bluetooth.address]);
-    }
+    checkScanDevicesBLE();
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [isBluetoothEnabled, bluetoothPermGranted, controlOptions, unit]);
 
@@ -296,7 +300,9 @@ const DeviceDetail = ({ route }) => {
 
     success &&
       data.items.length &&
-      data.items.some((item) => (item?.template || item?.type) === 'action') &&
+      data.items.some(
+        (item) => item.template.toLowerCase().search('action') !== -1
+      ) &&
       (await fetchRemoteControlOptions());
   }, [token, sensor, setDeviceId, fetchRemoteControlOptions]);
 
@@ -489,6 +495,7 @@ const DeviceDetail = ({ route }) => {
         await connectHomeAssistant(unit.remote_control_options.googlehome);
       })();
     }
+    checkScanDevicesBLE();
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [sensor, unit, isNetworkConnected, fetchDataDeviceDetail]);