@eohjsc/react-native-smart-city 0.4.52 → 0.4.54

package/README.md

@@ -35,12 +35,35 @@ import {
   AutomateStack,
   NotificationStack,
 } from '@eohjsc/react-native-smart-city';
+import Config from 'react-native-config';
 import { createStackNavigator } from '@react-navigation/stack';
 
 // TODO: What to do with the module?
 const Stack = createStackNavigator();
 
 const YourStack = () => {
+
+
+  useEffect(() => {
+    const config = {
+      apiRoot: Config.API_ROOT,
+      GOOGLE_MAP_API_KEY: Config.GOOGLE_MAP_API_KEY,
+      LG_CLIENT_ID: Config.LG_CLIENT_ID,
+      LG_REDIRECT_URI_APP: Config.LG_REDIRECT_URI_APP,
+      LG_URL: Config.LG_URL,
+      VCONNEX_CLIENT_ID: Config.VCONNEX_CLIENT_ID,
+      VCONNEX_REDIRECT_URI_APP: Config.VCONNEX_REDIRECT_URI,
+      pusherAppKey: Config.PUSHER_APP_KEY,
+      pusherAppCluster: Config.PUSHER_APP_CLUSTER,
+      language,
+      setCurrentSensorDisplay,
+      appName: Config.APP_NAME,
+      packageName: Config.APP_PACKAGE_NAME,  //  Your package name is required
+      versionCode: Config.APP_VERSION_CODE,  //  Your app version is required
+    };
+    initSCConfig(config);
+  }, [language, setCurrentSensorDisplay]);
+
   // Declare yourAuthObject and params
   return (
     <Stack.Navigator>

package/package.json

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

package/src/commons/Action/ItemQuickAction.js

@@ -8,6 +8,16 @@ import IconComponent from '../IconComponent';
 
 const ItemQuickAction = memo(
   ({ sensor, wrapperStyle, setStatus, iconSize = 30 }) => {
+    const { quick_action } = sensor || {};
+    const {
+      config_id,
+      off_action,
+      on_status,
+      on_action,
+      off_status,
+      interval,
+      will_auto_update_status,
+    } = quick_action || {};
     const [action, setAction] = useState(sensor.action);
     // eslint-disable-next-line no-unused-vars
     const [configValues, _] = useConfigGlobalState('configValues');
@@ -17,26 +27,34 @@ const ItemQuickAction = memo(
     const [processing, setProcessing] = useState(false);
 
     useEffect(() => {
-      if (!(sensor.quick_action?.config_id in configValues)) {
+      if (!(config_id in configValues)) {
         return;
       }
-      const configValue = configValues[sensor.quick_action.config_id];
+      const configValue = configValues[config_id];
       setIsOn(configValue?.value);
-    }, [sensor, configValues]);
+    }, [configValues, config_id]);
 
     useEffect(() => {
-      if (!sensor.quick_action) {
+      if (!quick_action) {
         return;
       }
 
       if (isOn) {
-        setAction(sensor.quick_action.off_action);
-        setStatus && setStatus(sensor.quick_action.on_status);
+        setAction(off_action);
+        setStatus && setStatus(on_status);
       } else {
-        setAction(sensor.quick_action.on_action);
-        setStatus && setStatus(sensor.quick_action.off_status);
+        setAction(on_action);
+        setStatus && setStatus(off_status);
       }
-    }, [isOn, setStatus, sensor.quick_action]);
+    }, [
+      isOn,
+      setStatus,
+      quick_action,
+      off_action,
+      on_status,
+      on_action,
+      off_status,
+    ]);
 
     const userId = useSCContextSelector((state) => state?.auth.account.user.id);
     const onActionPress = useCallback(async () => {
@@ -46,9 +64,7 @@ const ItemQuickAction = memo(
       }
       setProcessing(true);
       let data = null;
-      if (
-        action?.allow_config_store_value_id === sensor?.quick_action?.config_id
-      ) {
+      if (action?.allow_config_store_value_id === config_id) {
         if (action?.name?.toLowerCase().includes('off')) {
           data = {
             config_id: action?.allow_config_store_value_id,
@@ -64,13 +80,23 @@ const ItemQuickAction = memo(
       }
       await sendRemoteCommand(sensor, action, data, userId);
 
-      if (!sensor.quick_action.will_auto_update_status) {
+      if (!will_auto_update_status) {
         setTimeout(() => {
-          setIsOn(action.id === sensor.quick_action.on_action.id);
-        }, sensor.quick_action.interval);
+          setIsOn(action.id === on_action.id);
+        }, interval);
       }
       setProcessing(false);
-    }, [processing, action, sensor, sendRemoteCommand, userId]);
+    }, [
+      processing,
+      action,
+      config_id,
+      sendRemoteCommand,
+      sensor,
+      userId,
+      will_auto_update_status,
+      interval,
+      on_action?.id,
+    ]);
 
     if (!action) {
       return <View />;

package/src/configs/SCConfig.js

@@ -100,8 +100,6 @@ const SCDefaultConfig = {
   intervalWatchConfigTime: 30000,
   setCurrentSensorDisplay: () => {},
   appName: 'E-Ra',
-  packageName: 'com.eohjsc.eohmobile.staging',
-  versionCode: 1
 };
 
 export class SCConfig {
@@ -119,12 +117,15 @@ export class SCConfig {
   static intervalWatchConfigTime = SCDefaultConfig.intervalWatchConfigTime;
   static setCurrentSensorDisplay = SCDefaultConfig.setCurrentSensorDisplay;
   static appName = SCDefaultConfig.appName;
-  static packageName = SCDefaultConfig.packageName;
-  static versionCode = SCDefaultConfig.versionCode;
 }
 
 export const initSCConfig = (config) => {
   api.setBaseURL(config.apiRoot ?? SCDefaultConfig.apiRoot);
+  api.setHeaders({
+    'Content-Type': 'application/json',
+    'App-Version-Code': config.versionCode,
+    'App-Package-Name': config.packageName,
+  });
   LocaleConfig.defaultLocale = config.language ?? SCConfig.language;
   SCConfig.ENV = config.ENV ?? SCConfig.ENV;
   SCConfig.language = config.language ?? SCConfig.language;
@@ -147,6 +148,4 @@ export const initSCConfig = (config) => {
   SCConfig.setCurrentSensorDisplay =
     config.setCurrentSensorDisplay ?? SCDefaultConfig.setCurrentSensorDisplay;
   SCConfig.appName = config.appName ?? SCDefaultConfig.appName;
-  SCConfig.packageName = config.packageName ?? SCConfig.packageName;
-  SCConfig.versionCode = config.version ?? SCConfig.versionCode;
 };

package/src/iot/Monitor.js

@@ -37,7 +37,7 @@ const watchingConfigs = {};
 
 export const updateGlobalValue = (configId, value) => {
   const configValues = getConfigGlobalState('configValues');
-  const newConfigValues = { ...configValues };
+  let newConfigValues = { ...configValues };
   newConfigValues[configId] = value;
   setConfigGlobalState('configValues', newConfigValues);
 };

package/src/utils/Apis/axios.js

@@ -11,8 +11,6 @@ import { isHTML } from '../Validation';
 const api = create({
   headers: {
     'Content-Type': 'application/json',
-    'App-Version-Code': SCConfig.versionCode,
-    'App-Package-Name': SCConfig.packageName,
   },
   timeout: 30000,
 });