@eohjsc/react-native-smart-city 0.4.79 → 0.4.81

package/package.json

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

package/src/commons/Action/ItemQuickAction.js

@@ -18,6 +18,7 @@ const ItemQuickAction = memo(
       off_status,
       interval,
       will_auto_update_status,
+      on_state_values,
     } = quick_action || {};
     const [action, setAction] = useState(sensor?.action);
     // eslint-disable-next-line no-unused-vars
@@ -29,9 +30,16 @@ const ItemQuickAction = memo(
     const sendRemoteCommand = useRemoteControl();
     const [processing, setProcessing] = useState(false);
 
+    const getIsOnValue = useCallback(() => {
+      if (on_state_values && on_state_values.length > 0) {
+        return on_state_values.includes(currentValue);
+      }
+      return !!currentValue;
+    }, [currentValue, on_state_values]);
+
     useEffect(() => {
-      setIsOn(currentValue);
-    }, [currentValue]);
+      setIsOn(getIsOnValue());
+    }, [getIsOnValue]);
 
     useEffect(() => {
       if (!quick_action) {

package/src/commons/Action/__test__/ItemQuickAction.test.js

@@ -33,14 +33,14 @@ describe('Test ItemQuickAction', () => {
         config_id: 51,
         interval: 5000,
         off_action: {
-          icon: 'down',
+          icon: 'on',
           command_prefer_over_bluetooth: true,
           command_prefer_over_googlehome: false,
           command_prefer_over_internet: false,
           id: 10,
         },
         on_action: {
-          icon: 'up',
+          icon: 'off',
           command_prefer_over_bluetooth: true,
           command_prefer_over_googlehome: false,
           command_prefer_over_internet: false,
@@ -258,4 +258,30 @@ describe('Test ItemQuickAction', () => {
     });
     expect(Toast.show).not.toBeCalled();
   });
+  it('test config value 0 on_state_values 0', async () => {
+    sensor.quick_action.on_state_values = [0];
+    const globalStates = require('../../../iot/states');
+    globalStates.useConfigGlobalState = () => [{ 51: { value: 0 } }, null];
+
+    await act(async () => {
+      tree = await create(
+        <ItemQuickAction sensor={sensor} wrapperStyle={style} />
+      );
+    });
+    const icon = tree.root.findByType(IconComponent);
+    expect(icon.props.icon).toEqual(sensor.quick_action.off_action.icon);
+  });
+  it('test config value 0 on_state_values 1', async () => {
+    sensor.quick_action.on_state_values = [1];
+    const globalStates = require('../../../iot/states');
+    globalStates.useConfigGlobalState = () => [{ 51: { value: 0 } }, null];
+
+    await act(async () => {
+      tree = await create(
+        <ItemQuickAction sensor={sensor} wrapperStyle={style} />
+      );
+    });
+    const icon = tree.root.findByType(IconComponent);
+    expect(icon.props.icon).toEqual(sensor.quick_action.on_action.icon);
+  });
 });

package/src/commons/Device/WaterQualitySensor/QualityIndicatorsItem.js

@@ -46,7 +46,7 @@ const QualityIndicatorItem = memo(
         <Text size={24} color={Colors.Gray9} style={styles.txtValue}>
           {measure && measure.length ? `${value} ${measure}` : `${value}`}
         </Text>
-        {!!evaluate && (
+        {!!evaluate?.color && (
           <Text size={12} color={evaluate.color} style={styles.txtEvaluate}>
             {evaluate.text}
           </Text>

package/src/screens/Automate/ScriptDetail/Styles/indexStyles.js

@@ -162,4 +162,8 @@ export default StyleSheet.create({
   flex1: {
     flex: 1,
   },
+  iconEndDevice: {
+    marginTop: 5,
+    marginRight: 15,
+  },
 });

package/src/screens/Automate/ScriptDetail/index.js

@@ -21,7 +21,6 @@ import MenuActionMore from '../../../commons/MenuActionMore';
 import Add from '../../../../assets/images/Add.svg';
 import { useNavigation, useRoute } from '@react-navigation/native';
 import { axiosGet, axiosPost } from '../../../utils/Apis/axios';
-import FImage from '../../../commons/FImage';
 import Routes from '../../../utils/Route';
 import { ToastBottomHelper } from '../../../utils/Utils';
 import ItemAutomate from '../../../commons/Automate/ItemAutomate';
@@ -31,6 +30,7 @@ import RenameScript from './Components/RenameScript';
 import DeleteScript from './Components/DeleteScript';
 import Images from '../../../configs/Images';
 import { useBackendPermission } from '../../../utils/Permission/backend';
+import IconComponent from '../../../commons/IconComponent';
 
 const PreventDoubleTouch = withPreventDoubleClick(TouchableOpacity);
 
@@ -265,9 +265,9 @@ const Item = ({ item, index }) => {
         </Text>
       </View>
       <View style={styles.rightItem}>
-        <FImage
-          source={{ uri: item?.sensor_icon_kit }}
-          style={styles.iconItem}
+        <IconComponent
+          icon={item?.sensor_icon_kit}
+          style={styles.iconEndDevice}
         />
         <View style={styles.contentItem}>
           <View style={styles.titleItem}>

package/src/screens/Sharing/SelectUser.js

@@ -148,6 +148,7 @@ const SharingInviteMembers = ({ route }) => {
         </View>
       </TouchableWithoutFeedback>
       <ViewButtonBottom
+        disableKeyBoardAnimated={true}
         leftTitle={t('back')}
         onLeftClick={() => navigation.goBack()}
         rightTitle={t('done')}

package/src/screens/Sharing/Styles/SelectPermissionStyles.js

@@ -64,7 +64,6 @@ export default StyleSheet.create({
     fontStyle: 'normal',
   },
   wrapViewButtonStyle: {
-    paddingTop: 90,
-    marginBottom: 30,
+    paddingTop: 70,
   },
 });