@eohjsc/react-native-smart-city 0.3.82 → 0.3.84

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@eohjsc/react-native-smart-city",
   "title": "React Native Smart Home",
-  "version": "0.3.82",
+  "version": "0.3.84",
   "description": "TODO",
   "main": "index.js",
   "files": [
@@ -179,7 +179,6 @@
     "react-native-maps-directions": "^1.8.0",
     "react-native-modal": "^11.5.6",
     "react-native-modal-datetime-picker": "^8.9.3",
-    "react-native-new-snap-carousel": "^3.9.3",
     "react-native-onesignal": "^4.3.1",
     "react-native-pager-view": "^5.4.1",
     "react-native-parallax-scroll-view": "^0.21.3",
@@ -191,6 +190,7 @@
     "react-native-responsive-fontsize": "^0.5.1",
     "react-native-safe-area-context": "^3.1.1",
     "react-native-screens": "^2.9.0",
+    "react-native-snap-carousel": "4.0.0-beta.5",
     "react-native-super-grid": "^4.0.3",
     "react-native-svg": "^12.1.0",
     "react-native-toast-message": "^2.1.1",

package/src/commons/ActionGroup/SliderRangeTemplateStyles.js

@@ -15,6 +15,7 @@ export default StyleSheet.create({
   },
   slider: {
     width: 131,
+    transform: [{ scaleY: 2 }],
   },
   trackSlider: {
     height: 8,

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

@@ -6,6 +6,8 @@ import { Colors } from '../../../configs';
 import { CircleView } from '../../../commons';
 import Text from '../../../commons/Text';
 import IconComponent from '../../IconComponent';
+import images from '../../../configs/Images';
+import FImage from '../../FImage';
 
 const CurrentRainSensor = memo(({ data = [] }) => {
   const item = data.length
@@ -31,9 +33,14 @@ const CurrentRainSensor = memo(({ data = [] }) => {
           start={{ x: 1, y: 0 }}
           end={{ x: 1, y: 1 }}
         />
-        <IconComponent
-          icon={icon_kit_data?.icon || icon || 'CheckCircleOutlined'}
-        />
+        {icon_kit_data?.icon || icon ? (
+          <IconComponent icon={icon_kit_data?.icon || icon} />
+        ) : (
+          <FImage
+            source={images.activeCurrentSensor}
+            style={styles.iconDefault}
+          />
+        )}
         <Text style={styles.text}>{text}</Text>
       </CircleView>
     </View>
@@ -68,4 +75,8 @@ const styles = StyleSheet.create({
     lineHeight: 32,
     fontSize: 24,
   },
+  iconDefault: {
+    width: 37,
+    height: 37,
+  },
 });

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

@@ -2,6 +2,8 @@ import React from 'react';
 import { View } from 'react-native';
 import renderer, { act } from 'react-test-renderer';
 import CurrentRainSensor from '../CurrentRainSensor';
+import FImage from '../../../FImage';
+import IconComponent from '../../../IconComponent';
 
 describe('Test CurrentRainSensor', () => {
   let tree;
@@ -21,7 +23,7 @@ describe('Test CurrentRainSensor', () => {
     });
     const instance = tree.root;
     const Views = instance.findAllByType(View);
-    expect(Views).toHaveLength(2);
+    expect(Views).toHaveLength(3);
   });
 
   it('render CurrentRainSensor raining: true', async () => {
@@ -40,7 +42,7 @@ describe('Test CurrentRainSensor', () => {
     });
     const instance = tree.root;
     const Views = instance.findAllByType(View);
-    expect(Views).toHaveLength(2);
+    expect(Views).toHaveLength(3);
   });
 
   it('render CurrentRainSensor data empty', async () => {
@@ -49,6 +51,44 @@ describe('Test CurrentRainSensor', () => {
     });
     const instance = tree.root;
     const Views = instance.findAllByType(View);
-    expect(Views).toHaveLength(2);
+    expect(Views).toHaveLength(3);
+  });
+  it('render CurrentRainSensor default icon', async () => {
+    const data = [
+      {
+        evaluate: {
+          text: 'default',
+          backgroundColor: '#FEFFE6',
+          borderColor: '#FADB14',
+          icon_kit_data: '',
+          icon: '',
+        },
+      },
+    ];
+    await act(async () => {
+      tree = renderer.create(<CurrentRainSensor data={data} />);
+    });
+    const instance = tree.root;
+    const fimage = instance.findAllByType(FImage);
+    expect(fimage).toHaveLength(1);
+  });
+  it('render CurrentRainSensor has icon kit and icon', async () => {
+    const data = [
+      {
+        evaluate: {
+          text: 'default',
+          backgroundColor: '#FEFFE6',
+          borderColor: '#FADB14',
+          icon_kit_data: 'http:s//',
+          icon: 'http:s//',
+        },
+      },
+    ];
+    await act(async () => {
+      tree = renderer.create(<CurrentRainSensor data={data} />);
+    });
+    const instance = tree.root;
+    const iconComponent = instance.findAllByType(IconComponent);
+    expect(iconComponent).toHaveLength(1);
   });
 });

package/src/configs/Constants.js

@@ -260,6 +260,7 @@ export const NOTIFICATION_TYPES = {
   NOTIFY_REMOVE_SUB_UNIT: 'NOTIFY_REMOVE_SUB_UNIT',
   NOTIFY_REMOVE_DEVICE: 'NOTIFY_REMOVE_DEVICE',
   NOTIFY_EMERGENCY: 'NOTIFY_EMERGENCY',
+  NOTIFY_UPGRADE_SYSTEM: 'NOTIFY_UPGRADE_SYSTEM',
   NOTIFY_CHANGE_UNIT_OLD_OWNER: 'NOTIFY_CHANGE_UNIT_OLD_OWNER',
   NOTIFY_CHANGE_UNIT_NEW_OWNER: 'NOTIFY_CHANGE_UNIT_NEW_OWNER',
   AIR_QUALITY: 'AIR_QUALITY',

package/src/configs/Images.js

@@ -25,4 +25,5 @@ export default {
   dienquang: require('../Images/SmartAccount/DienQuang.png'),
   lg: require('../Images/SmartAccount/LG.png'),
   inforCode: require('../Images/DevMode/inforCode.png'),
+  activeCurrentSensor: require('../Images/Common/Sunny.png'),
 };

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

@@ -55,16 +55,23 @@ export const SensorDisplayItem = ({
     const data = item.configuration.configs.map((config) => {
       const configValue = configValues[config.id]?.value;
       const configEvaluate = evaluate[config.id] || {};
+      let value = {};
       if (configValue === null || configValue === undefined) {
-        return;
+        value = {
+          id: config.id,
+          value: null,
+          evaluate: null,
+        };
+      } else {
+        value = {
+          id: config.id,
+          value: configValue,
+          evaluate: evaluateValue(config.id, configValue) || configEvaluate,
+        };
       }
-      const value = {
-        id: config.id,
-        value: configValue,
-        evaluate: evaluateValue(config.id, configValue) || configEvaluate,
-      };
       return { ...config, ...value };
     });
+
     return data.filter(Boolean);
   }, [configValues, evaluateValue, item, evaluate]);
 

package/src/screens/Device/detail.js

@@ -532,7 +532,6 @@ const DeviceDetail = ({ route }) => {
               lastUpdated: lastUpdated,
             };
           });
-
           setConfigValues((prev) => {
             let hasValueChange = false;
             data.configs.map((config) => {

package/src/screens/Notification/components/NotificationItem.js

@@ -320,6 +320,14 @@ const NotificationItem = memo(({ item }) => {
             <IconComponent icon={'home'} style={styles.backgroundSummer} />
           ),
         };
+      case NOTIFICATION_TYPES.NOTIFY_UPGRADE_SYSTEM:
+        return {
+          content: customColorText(t('the_system_has_been_upgraded')),
+          redirect: () => null,
+          iconContent: (
+            <IconComponent icon={'home'} style={styles.backgroundSummer} />
+          ),
+        };
       case NOTIFICATION_TYPES.NOTIFY_EMERGENCY:
         switch (params?.type) {
           case EMERGENCY_TYPE.CREATED:

package/src/screens/Unit/components/MyUnitDevice/index.js

@@ -7,7 +7,7 @@ import ItemQuickAction from '../../../../commons/Action/ItemQuickAction';
 import Text from '../../../../commons/Text';
 import Routes from '../../../../utils/Route';
 import { Colors } from '../../../../configs';
-import FImage from '../../../../commons/FImage';
+import IconComponent from '../../../../commons/IconComponent';
 import { DEVICE_TYPE } from '../../../../configs/Constants';
 
 const MyUnitDevice = ({ device, unit }) => {
@@ -45,7 +45,10 @@ const MyUnitDevice = ({ device, unit }) => {
     <View style={styles.item}>
       <TouchableOpacity style={styles.flex1} onPress={goToSensorDisplay}>
         <View style={styles.rowCenter}>
-          <FImage style={styles.image} source={{ uri: device?.icon_kit }} />
+          <IconComponent
+            icon={device?.icon_kit || device?.icon}
+            style={styles.image}
+          />
           <View style={styles.marginTop3}>
             <Text numberOfLines={1} semibold style={styles.nameDevice}>
               {device.name}

package/src/utils/I18n/translations/en.json

@@ -1121,5 +1121,6 @@
   "pin_mode": "PIN mode",
   "rename_device_fail": "Rename device fail",
   "release_time": "Release time",
-  "data_address": "Data address"
+  "data_address": "Data address",
+  "the_system_has_been_upgraded" : "To provide a better user experience, [Era] will perform a system upgrade.The upgrade will take about 10 minutes.\n\n Some device control functions will be interrupted during the upgrade.[Era] would like to ask for your understanding for this inconvenience.\n\nBest regards."
 }

package/src/utils/I18n/translations/vi.json

@@ -1120,5 +1120,7 @@
   "pin_mode": "Chế độ mã PIN",
   "rename_device_fail": "Đổi tên thiết bị thất bại",
   "release_time": "Thời gian nhả trạng thái",
-  "data_address": "Địa chỉ dữ liệu"
+  "data_address": "Địa chỉ dữ liệu",
+  "the_system_has_been_upgraded" : "Để mang lại trải nghiệm tốt hơn cho người dùng, [Era] sẽ tiến hành nâng cấp hệ thống.Việc nâng cấp sẽ diễn ra trong khoảng 10 phút.\n\nMột số chức năng điều khiển thiết bị sẽ bị gián đoạn trong thời gian nâng cấp.[Era] kính mong quý khách hàng thông cảm cho sự bất tiện này.\n\nTrân trọng "
+  
 }