@eohjsc/react-native-smart-city 0.4.49 → 0.4.51

package/package.json

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

package/src/commons/Action/ItemQuickAction.js

@@ -7,8 +7,7 @@ import { useConfigGlobalState } from '../../iot/states';
 import IconComponent from '../IconComponent';
 
 const ItemQuickAction = memo(
-  ({ sensor, wrapperStyle, setStatus, iconSize = 40 }) => {
-    const [isSendingCommand, setIsSendingCommand] = useState(false);
+  ({ sensor, wrapperStyle, setStatus, iconSize = 30 }) => {
     const [action, setAction] = useState(sensor.action);
     // eslint-disable-next-line no-unused-vars
     const [configValues, _] = useConfigGlobalState('configValues');
@@ -64,7 +63,6 @@ const ItemQuickAction = memo(
         data = JSON.stringify(data);
       }
       await sendRemoteCommand(sensor, action, data, userId);
-      setIsSendingCommand(true);
 
       if (!sensor.quick_action.will_auto_update_status) {
         setTimeout(() => {
@@ -86,7 +84,7 @@ const ItemQuickAction = memo(
         <View style={wrapperStyle}>
           <IconComponent
             icon={action?.icon_kit || action?.icon || 'PoweroffOutlined'}
-            isSendingCommand={isSendingCommand}
+            isOn={isOn}
             iconSize={iconSize}
             size={iconSize}
           />

package/src/commons/ActionGroup/OnOffTemplate/OnOffButtonTemplate.js

@@ -36,7 +36,7 @@ const OnOffButtonTemplate = memo(
               <IconComponent
                 icon={icon}
                 iconSize={30}
-                active={isOn}
+                isOn={isOn}
                 colorInActive={Colors.Gray6}
                 color={Colors.Green7}
               />

package/src/commons/ActionGroup/OptionsDropdownActionTemplate.js

@@ -28,15 +28,16 @@ const OptionsDropdownActionTemplate = ({
   isWidgetOrder,
 }) => {
   const t = useTranslations();
-  const { configuration = {}, title = '' } = item;
   const {
+    title,
     action_data,
     options = [],
     icon_kit_data,
     icon,
     config,
     allow_config_store_value,
-  } = configuration;
+  } = item?.configuration || {};
+
   // eslint-disable-next-line no-unused-vars
   const [configValues, setConfigValues] = useConfigGlobalState('configValues');
   const checkIcon = /\d/.test(icon); // to do check icon svg and icon antDesign
@@ -96,7 +97,7 @@ const OptionsDropdownActionTemplate = ({
     hideAlertAction,
   ]);
 
-  useUnwatchLGDeviceConfigControl(sensor, [configuration.config]);
+  useUnwatchLGDeviceConfigControl(sensor, [config]);
 
   const iconKit = !!icon_kit_data && icon_kit_data.icon;
 
@@ -117,7 +118,6 @@ const OptionsDropdownActionTemplate = ({
         {!checkIcon && (
           <IconComponent
             icon={iconKit || icon}
-            isSendingCommand={false}
             iconSize={27}
             size={27}
             style={styles.marginRight}

package/src/commons/ActionGroup/StatesGridActionTemplate.js

@@ -79,7 +79,7 @@ const GridItem = ({ item, doAction, sensor }) => {
         {!checkIcon && (
           <IconComponent
             icon={iconKit || icon}
-            active={active}
+            isOn={active}
             color={Colors.White}
             style={styles.iconComponent}
           />

package/src/commons/ActionGroup/__test__/OptionsDropdownTemplate.test.js

@@ -56,8 +56,8 @@ describe('Test OptionsDropdownActionTemplate', () => {
   beforeEach(() => {
     watchMultiConfigs.mockClear();
     displayItem = {
-      title: 'Fan Speed',
       configuration: {
+        title: 'Fan Speed',
         action_data: actionData,
         config: 5,
         action: 'e5d23347-ee31-4fe3-9fb5-bbce05bf4b61',

package/src/commons/IconComponent/index.js

@@ -8,14 +8,13 @@ import FImage from '../FImage';
 const IconComponent = memo(
   ({
     icon,
-    isSendingCommand = false,
+    isOn = false,
     size = 30,
     iconSize = 30,
     style,
     antIconStyle,
     color,
     colorInActive,
-    active,
   }) => {
     let extraStyle = {
       width: size,
@@ -49,11 +48,8 @@ const IconComponent = memo(
     }, [icon]);
 
     const colorIcon = useMemo(() => {
-      if (isSendingCommand || !active) {
-        return colorInActive || Colors.TextGray;
-      }
-      return color || Colors.Green7;
-    }, [active, color, colorInActive, isSendingCommand]);
+      return isOn ? color || Colors.Green7 : colorInActive || Colors.TextGray;
+    }, [color, colorInActive, isOn]);
 
     if (!icon) {
       return null;

package/src/configs/SCConfig.js

@@ -100,6 +100,8 @@ const SCDefaultConfig = {
   intervalWatchConfigTime: 30000,
   setCurrentSensorDisplay: () => {},
   appName: 'E-Ra',
+  packageName: 'com.eohjsc.eohmobile.staging',
+  versionCode: 1
 };
 
 export class SCConfig {
@@ -117,6 +119,8 @@ 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) => {
@@ -143,4 +147,6 @@ 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/utils/Apis/axios.js

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