@eohjsc/react-native-smart-city 0.3.66 → 0.3.68

package/src/screens/Device/detail.js

@@ -49,7 +49,6 @@ import { AlertAction, ButtonPopup, MenuActionMore } from '../../commons';
 import { SensorDisplayItem } from './components/SensorDisplayItem';
 import { EmergencyCountdown } from './components/EmergencyCountdown';
 import { SensorConnectStatusViewHeader } from './components/SensorConnectStatusViewHeader';
-import { Card } from '../../commons/CardShadow';
 import PreventAccess from '../../commons/PreventAccess';
 
 import styles from './styles';
@@ -601,21 +600,7 @@ const DeviceDetail = ({ route }) => {
     });
   }, [navigation, unit?.group, unit?.id]);
 
-  const isHaveColorSliderTemplate = useMemo(() => {
-    let isFlag = false;
-    display?.items.some((item) => {
-      switch (item?.configuration?.template) {
-        case 'color_picker_template':
-        case 'slider_range_template':
-          return (isFlag = true);
-        default:
-          return (isFlag = false);
-      }
-    });
-    return isFlag;
-  }, [display]);
   // replace isConnected=True to see template
-
   const renderSensorConnected = () => {
     return (
       <SensorConnectStatusViewHeader
@@ -629,16 +614,30 @@ const DeviceDetail = ({ route }) => {
         showWindDirection={showWindDirection}
         isDeviceHasBle={isDeviceHasBle}
       >
-        {display.items.map((item) => {
+        {display.items.map((item, index) => {
           switch (item?.configuration?.template) {
             case 'color_picker_template':
             case 'slider_range_template':
-              return <></>;
+              return (
+                <SensorDisplayItem
+                  accessibilityLabel={AccessibilityLabel.SENSOR_DISPLAY_ITEM}
+                  key={index}
+                  item={item}
+                  emergency={onEmergencyButtonPress}
+                  sensor={sensor}
+                  getData={getData}
+                  maxValue={maxValue}
+                  offsetTitle={offsetTitle}
+                  setOffsetTitle={setOffsetTitle}
+                  setShowWindDirection={setShowWindDirection}
+                  background={station?.background}
+                />
+              );
             default:
               return (
                 <SensorDisplayItem
                   accessibilityLabel={AccessibilityLabel.SENSOR_DISPLAY_ITEM}
-                  key={item.id.toString()}
+                  key={index}
                   item={item}
                   emergency={onEmergencyButtonPress}
                   sensor={sensor}
@@ -652,35 +651,6 @@ const DeviceDetail = ({ route }) => {
               );
           }
         })}
-        {!!isHaveColorSliderTemplate && (
-          <Card title={t('controller')}>
-            {display.items.map((item) => {
-              switch (item?.configuration?.template) {
-                case 'color_picker_template':
-                case 'slider_range_template':
-                  return (
-                    <SensorDisplayItem
-                      accessibilityLabel={
-                        AccessibilityLabel.SENSOR_DISPLAY_ITEM
-                      }
-                      key={item.id.toString()}
-                      item={item}
-                      emergency={onEmergencyButtonPress}
-                      sensor={sensor}
-                      getData={getData}
-                      maxValue={maxValue}
-                      offsetTitle={offsetTitle}
-                      setOffsetTitle={setOffsetTitle}
-                      setShowWindDirection={setShowWindDirection}
-                      background={station?.background}
-                    />
-                  );
-                default:
-                  return <></>;
-              }
-            })}
-          </Card>
-        )}
       </SensorConnectStatusViewHeader>
     );
   };

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

@@ -55,7 +55,8 @@ const NotificationItem = memo(({ item }) => {
           },
           iconContent: (
             <IconComponent
-              icon_outlined={'usergroup-add'}
+              icon={'usergroup-add'}
+              outlined
               style={styles.backgroundSummer}
             />
           ),

package/src/screens/ScriptDetail/index.js

@@ -357,9 +357,11 @@ const ScriptDetail = ({ route }) => {
   const isHaveScriptActions = data?.length > 0;
 
   const textCondition = useMemo(() => {
-    if (type === AUTOMATE_TYPE.VALUE_CHANGE) {
+    if (
+      [AUTOMATE_TYPE.VALUE_CHANGE, AUTOMATE_TYPE.EVENT_SENSOR].includes(type)
+    ) {
       const { condition, config_name, value, sensor_type } =
-        automate?.value_change;
+        automate?.value_change || automate?.event_sensor;
       const stateConditionData = STATE_VALUE_SENSOR_TYPES.find(
         (i) => i.type === sensor_type
       );
@@ -413,7 +415,9 @@ const ScriptDetail = ({ route }) => {
         const textWeekday = sortWeekday.map((item) => weekday[item]).join(', ');
         return `${textWeekday} ${t('at')} ${time}`;
       }
-    } else if (type === AUTOMATE_TYPE.EVENT) {
+    } else if (
+      [AUTOMATE_TYPE.EVENT, AUTOMATE_TYPE.EVENT_ACTION].includes(type)
+    ) {
       const { action, end_device_name, config_name, sensor_type, value } =
         automate?.event;
       let textEvent = '';

package/src/screens/UnitSummary/components/3PPowerConsumption/index.js

@@ -5,7 +5,7 @@ import { API, Colors } from '../../../../configs';
 import moment from 'moment';
 import { Section, Today } from '../../../../commons';
 import ListQualityIndicator from '../../../../commons/Device/WaterQualitySensor/ListQualityIndicator';
-import PMSensorIndicatior from '../../../../commons/Device/PMSensor/PMSensorIndicatior';
+import PMSensorIndicator from '../../../../commons/Device/PMSensor/PMSensorIndicator';
 import ConfigHistoryChart from '../../../../commons/UnitSummary/ConfigHistoryChart';
 import { useTranslations } from '../../../../hooks/Common/useTranslations';
 import HistoryChart from '../../../../commons/Device/HistoryChart';
@@ -243,7 +243,7 @@ const ThreePhasePowerConsumption = memo(({ summaryDetail }) => {
           {t('text_total_power_consumption')}
         </Text>
 
-        <PMSensorIndicatior data={dataTotal} style={styles.styleTotalPower} />
+        <PMSensorIndicator data={dataTotal} style={styles.styleTotalPower} />
         {!!getData?.length && (
           <HistoryChart
             datas={getData}

package/src/screens/UnitSummary/components/PowerConsumption/index.js

@@ -6,7 +6,7 @@ import { API, Colors } from '../../../../configs';
 import Text from '../../../../commons/Text';
 import { Section, Today } from '../../../../commons';
 import ListQualityIndicator from '../../../../commons/Device/WaterQualitySensor/ListQualityIndicator';
-import PMSensorIndicatior from '../../../../commons/Device/PMSensor/PMSensorIndicatior';
+import PMSensorIndicator from '../../../../commons/Device/PMSensor/PMSensorIndicator';
 import ConfigHistoryChart from '../../../../commons/UnitSummary/ConfigHistoryChart';
 import HistoryChart from '../../../../commons/Device/HistoryChart';
 import { AccessibilityLabel } from '../../../../configs/Constants';
@@ -152,7 +152,7 @@ const PowerConsumption = memo(({ summaryDetail }) => {
           {t('text_total_power_consumption')}
         </Text>
 
-        <PMSensorIndicatior data={dataTotal} style={styles.styleTotalPower} />
+        <PMSensorIndicator data={dataTotal} style={styles.styleTotalPower} />
         {!!getData?.length && (
           <HistoryChart
             datas={getData}

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

@@ -1104,8 +1104,9 @@
   "text_alert_modal_popup_ct": "It’s a critical action and cannot be undone.",
   "text_understand_modal_popup_ct": "I fully understand that this action is critical and will lead to data loss.",
   "cannot_find_device_wifi": "Cannot find Device's Wifi",
-  "this_command_is_just_support_bluetooth_only": "This command is just support bluetooth only",
+  "choose_only_one": "Choose only one condition event",
   "photo_request_permission_des": "To select photo from gallery, please unlock access photo permission",
+  "this_command_is_just_support_bluetooth_only": "This command is just support bluetooth only",
   "used_pin": "Used  PIN",
   "all_gateway": "All Gateway",
   "pin_number": "Pin number",

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

@@ -1103,8 +1103,9 @@
   "text_working_hard": "Chúng tôi đang làm việc chăm chỉ để làm cho điều này hoạt động",
   "photo_request_permission": "Quyền yêu cầu ảnh",
   "cannot_find_device_wifi": "Không thể tìm thấy Wifi của thiết bị",
-  "this_command_is_just_support_bluetooth_only": "Lệnh gửi này chỉ hỗ trợ bluetooth",
+  "choose_only_one": "Chỉ chọn một điều kiện",
   "photo_request_permission_des": "Để chọn ảnh từ thư viện, vui lòng mở khóa quyền truy cập ảnh",
+  "this_command_is_just_support_bluetooth_only": "Lệnh gửi này chỉ hỗ trợ bluetooth",
   "used_pin": "PIN đã sử dụng",
   "all_gateway": "Tất cả cổng kết nối",
   "pin_number": "Số PIN",