@eohjsc/react-native-smart-city 0.2.76 → 0.2.81

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@eohjsc/react-native-smart-city",
   "title": "React Native Smart Home",
-  "version": "0.2.76",
+  "version": "0.2.81",
   "description": "TODO",
   "main": "index.js",
   "files": [
@@ -97,10 +97,10 @@
   "dependencies": {
     "@ant-design/icons-react-native": "^2.2.1",
     "@ant-design/react-native": "^4.0.5",
+    "@eohjsc/highcharts": "^1.0.3",
     "@formatjs/intl-getcanonicallocales": "^1.4.5",
     "@formatjs/intl-numberformat": "^5.6.2",
     "@formatjs/intl-pluralrules": "^3.4.7",
-    "@highcharts/highcharts-react-native": "highcharts/highcharts-react-native#107/head",
     "@invertase/react-native-apple-authentication": "^1.1.2",
     "@messageformat/core": "^3.0.0",
     "@react-native-community/async-storage": "^1.12.1",

package/src/commons/Device/HorizontalBarChart.js

@@ -1,6 +1,6 @@
 import React, { memo, useEffect, useMemo, useState } from 'react';
 import { View, StyleSheet } from 'react-native';
-import HighchartsReactNative from '@highcharts/highcharts-react-native/src/HighchartsReactNative';
+import HighchartsReactNative from '@eohjsc/highcharts';
 import { isEmpty } from 'lodash';
 
 import { Colors } from '../../configs';

package/src/commons/Device/LinearChart.js

@@ -1,6 +1,6 @@
 import React, { memo, useState, useEffect, useCallback } from 'react';
 import { StyleSheet, View } from 'react-native';
-import HighchartsReactNative from '@highcharts/highcharts-react-native';
+import HighchartsReactNative from '@eohjsc/highcharts';
 import moment from 'moment';
 import { Colors } from '../../configs';
 

package/src/commons/SubUnit/Favorites/index.js

@@ -31,9 +31,12 @@ const SubUnitFavorites = ({
           favorites.devices.forEach((sensor) => {
             params.append('sensors', sensor.id);
           });
-          const { success, data } = await axiosGet(API.SENSOR.STATUS(), {
-            params: params,
-          });
+          const { success, data } = await axiosGet(
+            API.UNIT.SENSORS_STATUS(unit.id),
+            {
+              params: params,
+            }
+          );
           if (success) {
             setSensorsStatus(data);
           }
@@ -45,7 +48,7 @@ const SubUnitFavorites = ({
     } else {
       clearInterval(intervalSensorStatus.current);
     }
-  }, [isFocused, favorites?.devices]);
+  }, [isFocused, favorites?.devices, unit.id]);
 
   const handleOnAddNew = () => {
     alert(t('feature_under_development'));

package/src/commons/SubUnit/ShortDetail.js

@@ -35,9 +35,12 @@ const ShortDetailSubUnit = ({ unit, station, isGGHomeConnected }) => {
           station.sensors.forEach((sensor) => {
             params.append('sensors', sensor.id);
           });
-          const { success, data } = await axiosGet(API.SENSOR.STATUS(), {
-            params: params,
-          });
+          const { success, data } = await axiosGet(
+            API.UNIT.SENSORS_STATUS(unit.id),
+            {
+              params: params,
+            }
+          );
           if (success) {
             setSensorsStatus(data);
           }
@@ -49,7 +52,7 @@ const ShortDetailSubUnit = ({ unit, station, isGGHomeConnected }) => {
     } else {
       clearInterval(intervalSensorStatus.current);
     }
-  }, [isFocused, station?.sensors]);
+  }, [isFocused, station?.sensors, unit.id]);
 
   const renderCamera = () => {
     if (station?.camera) {

package/src/configs/API.js

@@ -35,6 +35,8 @@ const API = {
       SCConfig.apiRoot + `/property_manager/units/${id}/device_sensor/`,
     ADD_GATEWAY: (id) =>
       SCConfig.apiRoot + `/property_manager/units/${id}/add_gateway/`,
+    SENSORS_STATUS: (id) =>
+      SCConfig.apiRoot + `/property_manager/units/${id}/sensors_status/`,
   },
   SUB_UNIT: {
     REMOVE_SUB_UNIT: (unitId, id) =>
@@ -87,7 +89,6 @@ const API = {
     CHANGE_SUB_UNIT: (unit_id, station_id, id) =>
       SCConfig.apiRoot +
       `/property_manager/${unit_id}/sub_units/${station_id}/devices/${id}/change_sub_unit/`,
-    STATUS: () => SCConfig.apiRoot + '/property_manager/sensors/status/',
   },
   SHARED_SENSOR: {
     ACCESS: (id) =>

package/src/iot/RemoteControl/__test__/Bluetooth.test.js

@@ -42,7 +42,7 @@ describe('Test IOT Bluetooth', () => {
     Toast._ref = null;
 
     onStateChangeFn('PoweredOn');
-    expect(Toast.show).not.toBeCalled();
+    expect(Toast.show).toBeCalled();
 
     Toast._ref = true;
   });

package/src/screens/Unit/__test__/Detail.test.js

@@ -74,7 +74,7 @@ describe('Test UnitDetail', () => {
 
   const detailUnitApiUrl = API.UNIT.UNIT_DETAIL(1);
   const summaryUnitApiUrl = API.UNIT.UNIT_SUMMARY(1);
-  const sensorStatusApiUrl = API.SENSOR.STATUS();
+  const sensorStatusApiUrl = API.UNIT.SENSORS_STATUS(1);
 
   let tree;
 

package/src/utils/Utils.js

@@ -72,10 +72,6 @@ export const openMapDirection = (item) => () => {
 
 export const ToastBottomHelper = {
   success: (msg, line2) => {
-    if (!Toast._ref) {
-      return;
-    }
-
     Toast.show({
       type: 'success',
       position: 'bottom',
@@ -85,10 +81,6 @@ export const ToastBottomHelper = {
     });
   },
   error: (msg, line2) => {
-    if (!Toast._ref) {
-      return;
-    }
-
     Toast.show({
       type: 'error',
       position: 'bottom',
@@ -98,10 +90,6 @@ export const ToastBottomHelper = {
     });
   },
   info: (msg, line2) => {
-    if (!Toast._ref) {
-      return;
-    }
-
     Toast.show({
       type: 'info',
       position: 'bottom',