@eohjsc/react-native-smart-city 0.4.25 → 0.4.27

package/android/build.gradle

@@ -10,17 +10,17 @@
 //   original location:
 //   - https://github.com/facebook/react-native/blob/0.58-stable/local-cli/templates/HelloWorld/android/app/build.gradle
 
-def DEFAULT_COMPILE_SDK_VERSION = 28
-def DEFAULT_BUILD_TOOLS_VERSION = '28.0.3'
-def DEFAULT_MIN_SDK_VERSION = 16
-def DEFAULT_TARGET_SDK_VERSION = 28
+def DEFAULT_COMPILE_SDK_VERSION = 33
+def DEFAULT_BUILD_TOOLS_VERSION = '30.0.3'
+def DEFAULT_MIN_SDK_VERSION = 24
+def DEFAULT_TARGET_SDK_VERSION = 33
 
 def safeExtGet(prop, fallback) {
     rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
 }
 
 apply plugin: 'com.android.library'
-apply plugin: 'maven'
+apply plugin: 'maven-publish'
 
 buildscript {
     // The Android Gradle plugin is only required when opening the android folder stand-alone.
@@ -38,9 +38,6 @@ buildscript {
     }
 }
 
-apply plugin: 'com.android.library'
-apply plugin: 'maven'
-
 android {
     compileSdkVersion safeExtGet('compileSdkVersion', DEFAULT_COMPILE_SDK_VERSION)
     buildToolsVersion safeExtGet('buildToolsVersion', DEFAULT_BUILD_TOOLS_VERSION)
@@ -106,17 +103,17 @@ def configureReactNativePom(def pom) {
 afterEvaluate { project ->
     // some Gradle build hooks ref:
     // https://www.oreilly.com/library/view/gradle-beyond-the/9781449373801/ch03.html
-    task androidJavadoc(type: Javadoc) {
-        source = android.sourceSets.main.java.srcDirs
-        classpath += files(android.bootClasspath)
-        classpath += files(project.getConfigurations().getByName('compile').asList())
-        include '**/*.java'
-    }
-
-    task androidJavadocJar(type: Jar, dependsOn: androidJavadoc) {
-        classifier = 'javadoc'
-        from androidJavadoc.destinationDir
-    }
+    // task androidJavadoc(type: Javadoc) {
+    //     source = android.sourceSets.main.java.srcDirs
+    //     classpath += files(android.bootClasspath)
+    //     classpath += files(project.getConfigurations().getByName('compile').asList())
+    //     include '**/*.java'
+    // }
+
+    // task androidJavadocJar(type: Jar, dependsOn: androidJavadoc) {
+    //     classifier = 'javadoc'
+    //     from androidJavadoc.destinationDir
+    // }
 
     task androidSourcesJar(type: Jar) {
         classifier = 'sources'
@@ -135,15 +132,13 @@ afterEvaluate { project ->
 
     artifacts {
         archives androidSourcesJar
-        archives androidJavadocJar
+        // archives androidJavadocJar
     }
 
     task installArchives(type: Upload) {
         configuration = configurations.archives
-        repositories.mavenDeployer {
-            // Deploy to react-native-event-bridge/maven, ready to publish to npm
-            repository url: "file://${projectDir}/../android/maven"
-            configureReactNativePom pom
+        repositories.maven {
+            url = uri("file://${projectDir}/../android/maven")
         }
     }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@eohjsc/react-native-smart-city",
   "title": "React Native Smart Home",
-  "version": "0.4.25",
+  "version": "0.4.27",
   "description": "TODO",
   "main": "index.js",
   "files": [
@@ -128,6 +128,7 @@
     "apisauce": "^2.1.5",
     "axios": "^0.19.2",
     "base-64": "^1.0.0",
+    "buffer": "^6.0.3",
     "deprecated-react-native-prop-types": "^2.3.0",
     "dotenv": "^8.2.0",
     "google-libphonenumber": "^3.2.10",
@@ -135,7 +136,8 @@
     "i18n-js": "^3.7.1",
     "i18next": "^20.1.0",
     "lodash": "^4.17.19",
-    "lottie-react-native": "4.0.3",
+    "lottie-ios": "3.4.1",
+    "lottie-react-native": "5.1.4",
     "moment": "^2.27.0",
     "moment-timezone": "^0.5.32",
     "numeral": "^2.0.6",

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/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,31 +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) => {

package/src/utils/Monitor.js

@@ -2,8 +2,8 @@ import { getPusher, destroyPusher } from './Pusher';
 
 // eslint-disable-next-line promise/prefer-await-to-callbacks
 export const watchNotificationData = (user, callback) => {
-  const channel = getPusher().subscribe(`private-user-${user.id}`);
-  channel.bind('new-notification', callback);
+  // const channel = getPusher().subscribe(`private-user-${user.id}`);
+  // channel.bind('new-notification', callback);
 };
 
 export const unwatchNotificationData = (user) => {