@eohjsc/react-native-smart-city 0.2.88 → 0.2.91

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@eohjsc/react-native-smart-city",
   "title": "React Native Smart Home",
-  "version": "0.2.88",
+  "version": "0.2.91",
   "description": "TODO",
   "main": "index.js",
   "files": [
@@ -98,6 +98,7 @@
     "@ant-design/icons-react-native": "^2.2.1",
     "@ant-design/react-native": "^4.0.5",
     "@eohjsc/highcharts": "^1.0.6",
+    "@eohjsc/react-native-keyboard-aware-scroll-view": "^0.9.5",
     "@formatjs/intl-getcanonicallocales": "^1.4.5",
     "@formatjs/intl-numberformat": "^5.6.2",
     "@formatjs/intl-pluralrules": "^3.4.7",
@@ -161,7 +162,6 @@
     "react-native-image-resizer": "^1.4.5",
     "react-native-input-credit-card": "^0.5.5",
     "react-native-iphone-x-helper": "^1.2.1",
-    "react-native-keyboard-aware-scroll-view": "https://github.com/hinh-eoh/react-native-keyboard-aware-scroll-view.git",
     "react-native-linear-gradient": "^2.5.6",
     "react-native-localize": "^1.4.1",
     "react-native-maps": "0.27.1",

package/src/screens/Device/detail.js

@@ -8,7 +8,6 @@ import React, {
 import { View, TouchableOpacity } from 'react-native';
 import { useTranslations } from '../../hooks/Common/useTranslations';
 import moment from 'moment';
-import _ from 'lodash';
 import { get } from 'lodash';
 import { useSelector } from 'react-redux';
 import { IconFill, IconOutline } from '@ant-design/icons-react-native';
@@ -463,10 +462,14 @@ const DeviceDetail = ({ route }) => {
     setDisplayValues((currentDisplayValues) => {
       for (const [configId, value] of Object.entries(configValues)) {
         const intId = parseInt(configId);
-        const index = _.findIndex(currentDisplayValues, (o) => o.id === intId);
+        const index = currentDisplayValues.findIndex(
+          (element) => element.id === intId
+        );
+
+        const item = currentDisplayValues[index];
         if (index !== -1) {
           currentDisplayValues[index].value = value;
-          currentDisplayValues[index].evaluate = null;
+          currentDisplayValues[index].evaluate = item.evaluate;
         } else {
           currentDisplayValues.push({
             id: intId,
@@ -496,7 +499,19 @@ const DeviceDetail = ({ route }) => {
       params: { unitId: unit?.id, group },
     });
   }, [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 (
@@ -536,31 +551,33 @@ const DeviceDetail = ({ route }) => {
               );
           }
         })}
-        <Card title={t('controller')}>
-          {display.items.map((item) => {
-            switch (item?.configuration?.template) {
-              case 'color_picker_template':
-              case 'slider_range_template':
-                return (
-                  <SensorDisplayItem
-                    testID={TESTID.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>
+        {!!isHaveColorSliderTemplate && (
+          <Card title={t('controller')}>
+            {display.items.map((item) => {
+              switch (item?.configuration?.template) {
+                case 'color_picker_template':
+                case 'slider_range_template':
+                  return (
+                    <SensorDisplayItem
+                      testID={TESTID.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>
     );
   };