@eohjsc/react-native-smart-city 0.4.31 → 0.4.32

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@eohjsc/react-native-smart-city",
   "title": "React Native Smart Home",
-  "version": "0.4.31",
+  "version": "0.4.32",
   "description": "TODO",
   "main": "index.js",
   "files": [
@@ -65,7 +65,9 @@
   "peerDependencies": {
     "@react-native-community/clipboard": "*",
     "react": "*",
-    "react-native": "*"
+    "react-native": "*",
+    "react-native-modal": "*",
+    "react-native-modal-datetime-picker": "*"
   },
   "devDependencies": {
     "@babel/core": "^7.12.9",
@@ -181,8 +183,8 @@
     "react-native-localize": "^1.4.1",
     "react-native-maps": "0.27.1",
     "react-native-maps-directions": "^1.8.0",
-    "react-native-modal": "11.10.0",
-    "react-native-modal-datetime-picker": "8.9.3",
+    "react-native-modal": "^13.0.1",
+    "react-native-modal-datetime-picker": "^15.0.1",
     "react-native-new-snap-carousel": "^3.9.3",
     "react-native-onesignal": "^4.3.1",
     "react-native-pager-view": "^5.4.1",

package/src/commons/Processing/index.js

@@ -4,7 +4,7 @@ import * as Progress from 'react-native-progress';
 
 import Text from '../Text';
 import { HeaderCustom } from '../Header';
-// import { getPusher } from '../../utils/Pusher';
+import { getPusher } from '../../utils/Pusher';
 import { ModalCustom } from '../Modal';
 import { Colors, Constants } from '../../configs';
 import styles from './styles';
@@ -74,13 +74,13 @@ const Processing = ({
   }, [setHidePopupTurnOnGuide, setIsRecallChipScan]);
 
   useEffect(() => {
-    // const channel = getPusher().subscribe(channelName);
-    // channel.bind('progress', (message) => {
-    //   processMessage(channel, message);
-    // });
-    // return () => {
-    //   getPusher().unsubscribe(channelName);
-    // };
+    const channel = getPusher().subscribe(channelName);
+    channel.bind('progress', (message) => {
+      processMessage(channel, message);
+    });
+    return () => {
+      getPusher().unsubscribe(channelName);
+    };
   }, [channelName, complete, fail, processMessage]);
 
   useEffect(() => {

package/src/commons/Unit/HeaderUnit/index.js

@@ -4,9 +4,11 @@ import { Icon } from '@ant-design/react-native';
 import { useNavigation } from '@react-navigation/native';
 import { getStatusBarHeight } from 'react-native-iphone-x-helper';
 
-import { Colors, Device } from '../../../configs';
+import { Colors, Device, Images } from '../../../configs';
 import Text from '../../Text';
 import { AccessibilityLabel } from '../../../configs/Constants';
+import { Image } from 'react-native';
+import { Platform } from 'react-native';
 
 const HeaderUnit = memo(
   ({
@@ -47,11 +49,7 @@ const HeaderUnit = memo(
           style={styles.btnLeft}
           onPress={onPressBack}
         >
-          <Icon
-            name={'left'}
-            size={27}
-            color={transparent ? Colors.White : Colors.Black}
-          />
+          <Image source={Images.arrowLeft} style={styles.iconBack} />
         </TouchableOpacity>
         <View style={[styles.boxTitle, styleBoxTitle]}>
           {title && (
@@ -70,7 +68,7 @@ const HeaderUnit = memo(
                 onPress={onPressAdd}
               >
                 <Icon
-                  name={'plus'}
+                  name={Platform.OS === 'android' ? 'plus-square' : 'plus'}
                   size={27}
                   color={transparent ? Colors.White : Colors.Black}
                 />
@@ -83,9 +81,10 @@ const HeaderUnit = memo(
               accessibilityLabel={idButtonMore}
             >
               <Icon
-                name={'more'}
+                name={'ellipsis'}
                 size={27}
                 color={transparent ? Colors.White : Colors.Black}
+                style={styles.iconMore}
               />
             </TouchableOpacity>
           </View>
@@ -146,4 +145,12 @@ const styles = StyleSheet.create({
     borderBottomWidth: 1,
     borderBottomColor: Colors.Gray4,
   },
+  iconMore: {
+    transform: [{ rotate: '90deg' }],
+  },
+  iconBack: {
+    tintColor: Colors.White,
+    width: 16,
+    height: 20,
+  },
 });

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

@@ -4,7 +4,7 @@ import moment from 'moment';
 import { API } from '../../../configs';
 import HistoryChart from '../../../commons/Device/HistoryChart';
 import { axiosGet } from '../../../utils/Apis/axios';
-// import { getPusher } from '../../../utils/Pusher';
+import { getPusher } from '../../../utils/Pusher';
 
 const fetchDataS3 = async (url) => {
   const { data } = await axiosGet(url, {
@@ -87,30 +87,30 @@ export const updateConfigChart = async (
   );
 
   data.configs.map((config) => {
-    // if (config.middle.not_ready.length > 0) {
-    //   const channel = getPusher().subscribe(config.middle.channel);
-    //   channel.bind('caching-value-log-process', async () => {
-    //     await Promise.all(
-    //       config.middle.not_ready.map((item) =>
-    //         (async () => {
-    //           item.data = await fetchDataS3(item.url);
-    //         })()
-    //       )
-    //     );
-    //     const middleDataByDay = [
-    //       ...config.middle.not_ready,
-    //       ...config.middle.ready,
-    //     ];
-    //     middleDataByDay.sort((a, b) => (a.date > b.date ? 1 : -1)); // small to large
-    //     const middleData = middleDataByDay.map((x) => x.data).flat();
-    //     data_by_id[config.id] = [...config.head, ...middleData, ...config.tail];
-    //     setChartData((chartData) => {
-    //       const index = chartData.map((c) => c.id).indexOf(config.id);
-    //       chartData[index].data = data_by_id[config.id];
-    //       return [...chartData];
-    //     });
-    //   });
-    // }
+    if (config.middle.not_ready.length > 0) {
+      const channel = getPusher().subscribe(config.middle.channel);
+      channel.bind('caching-value-log-process', async () => {
+        await Promise.all(
+          config.middle.not_ready.map((item) =>
+            (async () => {
+              item.data = await fetchDataS3(item.url);
+            })()
+          )
+        );
+        const middleDataByDay = [
+          ...config.middle.not_ready,
+          ...config.middle.ready,
+        ];
+        middleDataByDay.sort((a, b) => (a.date > b.date ? 1 : -1)); // small to large
+        const middleData = middleDataByDay.map((x) => x.data).flat();
+        data_by_id[config.id] = [...config.head, ...middleData, ...config.tail];
+        setChartData((chartData) => {
+          const index = chartData.map((c) => c.id).indexOf(config.id);
+          chartData[index].data = data_by_id[config.id];
+          return [...chartData];
+        });
+      });
+    }
   });
 };
 

package/src/iot/Monitor.js

@@ -48,8 +48,8 @@ const watchConfig = (configId) => {
     return;
   }
   watchingConfigs[configId] = 1;
-  // const channel = getPusher().subscribe(`private-config_v2-${configId}`);
-  // channel.bind('new-value', updateGlobalValue.bind(channel, configId));
+  const channel = getPusher().subscribe(`private-config_v2-${configId}`);
+  channel.bind('new-value', updateGlobalValue.bind(channel, configId));
 };
 
 const unwatchConfig = (configId) => {

package/src/screens/AddNewGateway/ConnectingModbusDevice.js

@@ -54,10 +54,10 @@ const ConnectingModbusDevice = ({ route }) => {
 
   useEffect(() => {
     if (channelNameTemp) {
-      // const channel = getPusher().subscribe(channelNameTemp);
-      // channel.bind('change_modbus_address_completed', (messageRes) => {
-      //   setIsChangeAddressSuccess(messageRes.success);
-      // });
+      const channel = getPusher().subscribe(channelNameTemp);
+      channel.bind('change_modbus_address_completed', (messageRes) => {
+        setIsChangeAddressSuccess(messageRes.success);
+      });
     }
   }, [channelNameTemp, setIsChangeAddressSuccess]);
 

package/src/screens/HanetCamera/utils/Monitor.js

@@ -40,10 +40,10 @@ const destroyPusher = () => {
 
 // eslint-disable-next-line promise/prefer-await-to-callbacks
 export const watchHanetCheckinData = (hanetCamera, callback) => {
-  // const channel = getPusher().subscribe(
-  //   `private-hanet-camera-${hanetCamera.device_id}`
-  // );
-  // channel.bind('new-checkin-data', callback);
+  const channel = getPusher().subscribe(
+    `private-hanet-camera-${hanetCamera.device_id}`
+  );
+  channel.bind('new-checkin-data', callback);
 };
 
 export const unwatchHanetCheckinData = (hanetCamera) => {