@eohjsc/react-native-smart-city 0.4.59 → 0.4.60

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@eohjsc/react-native-smart-city",
   "title": "React Native Smart Home",
-  "version": "0.4.59",
+  "version": "0.4.60",
   "description": "TODO",
   "main": "index.js",
   "files": [
@@ -37,7 +37,6 @@
     "android-deploy-test": "bundle exec fastlane android beta",
     "reset-cache": "react-native start --reset-cache",
     "merge_conflict": "yarn jest && yarn update_coverage_result && yarn check_coverage_config",
-    "jest": "jest --detectOpenHandles",
     "jest1": "jest --detectOpenHandles --coverage=0",
     "example": "yarn --cwd example",
     "pods": "cd example && pod-install --quiet",

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

@@ -7,7 +7,6 @@ import { AccessibilityLabel } from '../../../configs/Constants';
 import { factory } from 'factory-girl';
 import IconComponent from '../../IconComponent';
 import { IconOutline } from '@ant-design/icons-react-native';
-import Toast from 'react-native-toast-message';
 
 class Sensor {}
 
@@ -68,16 +67,13 @@ describe('Test ItemQuickAction', () => {
       tree = await create(<ItemQuickAction sensor={newSensor} />);
     });
     const instance = tree.root;
-    const buttonOnActionPress = instance.find(
+    const buttonOnActionPress = instance.findAll(
       (el) =>
         el.props.accessibilityLabel ===
           `${AccessibilityLabel.ITEM_QUICK_ACTION_PRESS}-${sensor?.id}` &&
         el.type === TouchableOpacity
     );
-    await act(async () => {
-      await buttonOnActionPress.props.onPress();
-    });
-    expect(Toast.show).not.toBeCalled();
+    expect(buttonOnActionPress).toHaveLength(0);
   });
 
   it('click quick action icon down , isSendingCommand = true', async () => {

package/src/commons/Device/RainningSensor/CurrentRainSensor.js

@@ -9,43 +9,57 @@ import IconComponent from '../../IconComponent';
 import images from '../../../configs/Images';
 import FImage from '../../FImage';
 
-const CurrentRainSensor = memo(({ data = [], isWidgetOrder }) => {
-  const item = data.length
-    ? data[0]
-    : {
-        evaluate: {},
-      };
-  const { text, backgroundColor, borderColor, icon, icon_kit_data } =
-    item.evaluate || {};
+const CurrentRainSensor = memo(
+  ({
+    data = [],
+    isWidgetOrder,
+    size = 180,
+    textType = 'H2',
+    iconSize = 30,
+  }) => {
+    const item = data.length
+      ? data[0]
+      : {
+          evaluate: {},
+        };
+    const { text, backgroundColor, borderColor, icon, icon_kit_data } =
+      item.evaluate || {};
 
-  return (
-    <View style={[styles.standard, isWidgetOrder && styles.marginBottomZero]}>
-      <CircleView
-        size={190}
-        backgroundColor={backgroundColor}
-        borderWidth={2}
-        borderColor={borderColor}
-        style={styles.center}
-      >
-        <LinearGradient
-          style={styles.linearView}
-          colors={[Colors.TransparentWhite, 'white']}
-          start={{ x: 1, y: 0 }}
-          end={{ x: 1, y: 1 }}
-        />
-        {icon_kit_data?.icon || icon ? (
-          <IconComponent icon={icon_kit_data?.icon || icon} />
-        ) : (
-          <FImage
-            source={images.activeCurrentSensor}
-            style={styles.iconDefault}
+    return (
+      <View style={[styles.standard, isWidgetOrder && styles.marginBottomZero]}>
+        <CircleView
+          size={size}
+          backgroundColor={backgroundColor}
+          borderWidth={2}
+          borderColor={borderColor}
+          style={styles.center}
+        >
+          <LinearGradient
+            style={styles.linearView}
+            colors={[Colors.TransparentWhite, 'white']}
+            start={{ x: 1, y: 0 }}
+            end={{ x: 1, y: 1 }}
           />
-        )}
-        <Text style={styles.text}>{text}</Text>
-      </CircleView>
-    </View>
-  );
-});
+          {icon_kit_data?.icon || icon ? (
+            <IconComponent
+              size={iconSize}
+              iconSize={iconSize}
+              icon={icon_kit_data?.icon || icon}
+            />
+          ) : (
+            <FImage
+              source={images.activeCurrentSensor}
+              style={styles.iconDefault}
+            />
+          )}
+          <Text type={textType} style={styles.text}>
+            {text}
+          </Text>
+        </CircleView>
+      </View>
+    );
+  }
+);
 
 export default CurrentRainSensor;
 
@@ -76,7 +90,6 @@ const styles = StyleSheet.create({
   text: {
     marginTop: 8,
     lineHeight: 32,
-    fontSize: 24,
   },
   iconDefault: {
     width: 37,

package/src/screens/Device/__test__/sensorDisplayItem.test.js

@@ -360,6 +360,9 @@ describe('Test SensorDisplayItem', () => {
         },
       ],
       isWidgetOrder: undefined,
+      size: 120,
+      iconSize: 25,
+      textType: 'H4',
     });
   });
 
@@ -392,6 +395,9 @@ describe('Test SensorDisplayItem', () => {
           evaluate: null,
         },
       ],
+      size: 120,
+      iconSize: 25,
+      textType: 'H4',
       isWidgetOrder: undefined,
     });
   });
@@ -410,6 +416,9 @@ describe('Test SensorDisplayItem', () => {
 
     await _testCircleMini(item, {
       data: undefined,
+      size: 120,
+      iconSize: 25,
+      textType: 'H4',
       isWidgetOrder: undefined,
     });
   });

package/src/screens/Device/components/SensorDisplayItem.js

@@ -194,6 +194,9 @@ export const SensorDisplayItem = ({
     case 'circle_mini':
       return (
         <CurrentRainSensor
+          size={120}
+          textType="H4"
+          iconSize={25}
           data={getDataCircleMini(item)}
           isWidgetOrder={isWidgetOrder}
         />