@eohjsc/react-native-smart-city 0.3.17 → 0.3.20

package/package.json

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

package/src/commons/ActionGroup/NumberUpDownActionTemplate.js

@@ -22,8 +22,8 @@ const NumberUpDownActionTemplate = ({ actionGroup, doAction, sensor }) => {
 
   // eslint-disable-next-line no-unused-vars
   const [configValues, setConfigValues] = useConfigGlobalState('configValues');
-  const [value, setValue] = useState();
   const valueDefault = 28;
+  const [value, setValue] = useState(valueDefault);
 
   useEffect(() => {
     if (sensor?.device_type === DEVICE_TYPE.LG_THINQ) {
@@ -40,15 +40,12 @@ const NumberUpDownActionTemplate = ({ actionGroup, doAction, sensor }) => {
 
   useEffect(() => {
     if (!config) {
-      setValue(valueDefault);
       return;
     }
 
     const configValue = configValues[config];
     if (configValue !== null && configValue !== undefined) {
       setValue(configValue);
-    } else {
-      setValue(valueDefault);
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [JSON.stringify(configValues)]);

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

@@ -55,7 +55,6 @@ const OnOffTemplate = memo(({ actionGroup, doAction, sensor }) => {
   );
 
   const triggerAction = useCallback(async () => {
-    setTempIsOn((prev) => !prev);
     switch (sensor?.device_type) {
       case DEVICE_TYPE.ZIGBEE:
         if (action_on_data && action_off_data) {
@@ -75,11 +74,10 @@ const OnOffTemplate = memo(({ actionGroup, doAction, sensor }) => {
         }
         break;
       case DEVICE_TYPE.LG_THINQ:
+        setTempIsOn((prev) => !prev);
         if (action_data) {
           await doAction(action_data, JSON.stringify({ value: !isOn }));
         }
-
-        updateStatusFromPusher();
         break;
       default:
         if (action_data) {
@@ -98,6 +96,7 @@ const OnOffTemplate = memo(({ actionGroup, doAction, sensor }) => {
         }
         break;
     }
+    updateStatusFromPusher();
     if (sensor?.is_managed_by_backend) {
       configuration?.config &&
         sensor?.device_type !== 'GOOGLE_HOME' &&
@@ -130,7 +129,13 @@ const OnOffTemplate = memo(({ actionGroup, doAction, sensor }) => {
     if (sensor?.is_managed_by_backend && sensor.device_type !== 'GOOGLE_HOME') {
       watchMultiConfigs([configuration.config]);
     }
-  }, [sensor, configuration.config]);
+  }, [sensor, configuration.config, getIsOnValue]);
+
+  useEffect(() => {
+    if (sensor?.device_type !== DEVICE_TYPE.LG_THINQ) {
+      setTempIsOn(getIsOnValue());
+    }
+  }, [getIsOnValue, sensor?.device_type]);
 
   const Component = useMemo(() => {
     return getComponent(actionGroup.template);

package/src/screens/Unit/Detail.js

@@ -257,6 +257,7 @@ const UnitDetail = ({ route }) => {
           unit={unit}
           favoriteDevices={favoriteDevices}
           favoriteAutomates={favoriteAutomates}
+          wrapItemStyle={styles.wrapItemStyle}
         />
       );
     }

package/src/screens/Unit/styles.js

@@ -1,5 +1,10 @@
 import { StyleSheet } from 'react-native';
-import { Colors } from '../../configs';
+import { Colors, Constants } from '../../configs';
+
+const marginItem = 12;
+const marginHorizontal = 16;
+const widthItem = (Constants.width - marginHorizontal * 2 - marginItem) / 2;
+const heightItem = (widthItem / 166) * 126;
 
 export default StyleSheet.create({
   container: {
@@ -71,6 +76,10 @@ export default StyleSheet.create({
     margin: 0,
     padding: 0,
   },
+  wrapItemStyle: {
+    height: heightItem,
+    marginVertical: 0,
+  },
   camera: {
     width: 1,
     height: 1,