@eohjsc/react-native-smart-city 0.4.99 → 0.5.1

package/src/screens/Automate/OneTap/__test__/AddNewOneTap.test.js

@@ -38,6 +38,7 @@ describe('test OneTap', () => {
         unit: { id: 1 },
         isMultiUnits: false,
         isAutomateTab: false,
+        closeScreen: Routes.ScriptDetail,
       },
     };
 
@@ -66,15 +67,28 @@ describe('test OneTap', () => {
       await inputName[0].props.onChangeText('Tap to up');
     });
 
-    const item = instance.findAll(
+    const item = instance.find(
       (el) =>
         el.props.accessibilityLabel === AccessibilityLabel.BOTTOM_VIEW_MAIN &&
         el.type === TouchableOpacity
     );
 
-    expect(item).toHaveLength(1);
     await act(async () => {
-      await item[0].props.onPress();
+      await item.props.onPress();
+    });
+
+    expect(mockedNavigate).toHaveBeenCalledWith({
+      merge: true,
+      name: Routes.ScriptDetail,
+      params: {
+        newAutomate: {
+          id: 1,
+          script: { id: 1, name: 'William Miller' },
+          type: 'one_tap',
+          unit: 1,
+          weekday_repeat: [],
+        },
+      },
     });
   });
 

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

@@ -318,8 +318,8 @@ describe('test DeviceDetail', () => {
         data: '00012',
       }
     );
-    expect(valueBoxs[0].props.value).toEqual('0.1');
-    expect(valueBoxs[1].props.value).toEqual('0.2');
+    expect(valueBoxs[0].props.value).toEqual(0.1);
+    expect(valueBoxs[1].props.value).toEqual(0.2);
   });
 
   it('should render device detail, modbus call updateGlobalValue, int_all exceed 32767', async () => {
@@ -330,8 +330,8 @@ describe('test DeviceDetail', () => {
         data: '0001F000',
       }
     );
-    expect(valueBoxs[0].props.value).toEqual('0.1');
-    expect(valueBoxs[1].props.value).toEqual('-409.6');
+    expect(valueBoxs[0].props.value).toEqual(0.1);
+    expect(valueBoxs[1].props.value).toEqual(-409.6);
   });
 
   it('should render device detail, modbus call updateGlobalValue, uint_32', async () => {
@@ -346,8 +346,8 @@ describe('test DeviceDetail', () => {
         data: '0001CCDDBBAA',
       }
     );
-    expect(valueBoxs[0].props.value).toEqual('0.1');
-    expect(valueBoxs[1].props.value).toEqual('343708356.1');
+    expect(valueBoxs[0].props.value).toEqual(0.1);
+    expect(valueBoxs[1].props.value).toEqual(343708356.1);
   });
 
   it('should render device detail, modbus call updateGlobalValue, float_cdba', async () => {
@@ -363,8 +363,8 @@ describe('test DeviceDetail', () => {
       }
     );
 
-    expect(valueBoxs[0].props.value).toEqual('0.1');
-    expect(valueBoxs[1].props.value).toEqual('369.6');
+    expect(valueBoxs[0].props.value).toEqual(0.1);
+    expect(valueBoxs[1].props.value).toEqual(369.6);
   });
 
   it('should render device detail, modbus call updateGlobalValue, float_cdba, data not hex format', async () => {
@@ -380,7 +380,7 @@ describe('test DeviceDetail', () => {
       }
     );
 
-    expect(valueBoxs[0].props.value).toEqual('0.1');
+    expect(valueBoxs[0].props.value).toEqual(0.1);
     expect(valueBoxs[1].props.value).toEqual('--');
   });
 
@@ -396,7 +396,7 @@ describe('test DeviceDetail', () => {
         data: '0001P5670123', // reverse for simple
       }
     );
-    expect(valueBoxs[0].props.value).toEqual('0.1');
+    expect(valueBoxs[0].props.value).toEqual(0.1);
     expect(valueBoxs[1].props.value).toEqual('--');
   });
 
@@ -412,8 +412,8 @@ describe('test DeviceDetail', () => {
         data: '0001CCDDBBAA',
       }
     );
-    expect(valueBoxs[0].props.value).toEqual('0.1');
-    expect(valueBoxs[1].props.value).toEqual('5244.5');
+    expect(valueBoxs[0].props.value).toEqual(0.1);
+    expect(valueBoxs[1].props.value).toEqual(5244.5);
   });
 
   test('should render device detail, modbus call updateGlobalValue, int_last4', async () => {
@@ -429,8 +429,8 @@ describe('test DeviceDetail', () => {
       }
     );
 
-    expect(valueBoxs[0].props.value).toEqual('0.1');
-    expect(valueBoxs[1].props.value).toEqual('4804.2');
+    expect(valueBoxs[0].props.value).toEqual(0.1);
+    expect(valueBoxs[1].props.value).toEqual(4804.2);
   });
 
   it('should render device detail, modbus call updateGlobalValue, convert_ai', async () => {
@@ -448,8 +448,8 @@ describe('test DeviceDetail', () => {
       }
     );
 
-    expect(valueBoxs[0].props.value).toEqual('0.1');
-    expect(valueBoxs[1].props.value).toEqual('10');
+    expect(valueBoxs[0].props.value).toEqual(0.1);
+    expect(valueBoxs[1].props.value).toEqual(10);
   });
 
   it('should render device detail, modbus call updateGlobalValue, convert_ai min_raw same max_raw', async () => {
@@ -467,7 +467,7 @@ describe('test DeviceDetail', () => {
       }
     );
 
-    expect(valueBoxs[0].props.value).toEqual('0.1');
+    expect(valueBoxs[0].props.value).toEqual(0.1);
     expect(valueBoxs[1].props.value).toEqual('--');
   });
 
@@ -482,7 +482,7 @@ describe('test DeviceDetail', () => {
       }
     );
 
-    expect(valueBoxs[0].props.value).toEqual('0.1');
+    expect(valueBoxs[0].props.value).toEqual(0.1);
     expect(valueBoxs[1].props.value).toEqual('--');
   });
 
@@ -496,7 +496,20 @@ describe('test DeviceDetail', () => {
       }
     );
 
-    expect(valueBoxs[0].props.value).toEqual('10');
+    expect(valueBoxs[0].props.value).toEqual(10);
+    expect(valueBoxs[1].props.value).toEqual('--');
+  });
+
+  it('arduino pin submit data type string updateGlobalValue', async () => {
+    const valueBoxs = await _receiveDataOnDeviceDetail(
+      [{ id: 128282 }, { id: 128324 }],
+      'config/128282/value/',
+      {
+        v: 'on',
+      }
+    );
+
+    expect(valueBoxs[0].props.value).toEqual('on');
     expect(valueBoxs[1].props.value).toEqual('--');
   });
 
@@ -538,7 +551,7 @@ describe('test DeviceDetail', () => {
       }
     );
 
-    expect(valueBoxs[0].props.value).toEqual('36');
+    expect(valueBoxs[0].props.value).toEqual(36);
     expect(valueBoxs[1].props.value).toEqual('--');
   });
 

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

@@ -22,7 +22,11 @@ import { useEvaluateValue } from '../hooks/useEvaluateValue';
 import styles from '../styles';
 import { DetailHistoryChart } from './DetailHistoryChart';
 import VisualChart from './VisualChart';
-
+import { standardizeCameraScreenSize } from '../../../utils/Utils';
+import { Device } from '../../../configs';
+const { standardizeWidth, standardizeHeight } = standardizeCameraScreenSize(
+  Device.screenWidth - 32
+);
 export const SensorDisplayItem = ({
   item = {},
   sensor,
@@ -147,8 +151,8 @@ export const SensorDisplayItem = ({
             }}
             key={`camera-device-${id}`}
             cameraName={name}
-            width="100%"
-            height="100%"
+            width={standardizeWidth}
+            height={standardizeHeight}
           />
         </View>
       );

package/src/screens/Device/detail.js

@@ -512,7 +512,7 @@ const DeviceDetail = ({ route }) => {
         const { configs, options, config, from_config, to_config } =
           configuration;
 
-        configs?.forEach((config) => configIdsSet.add(config.id));
+        configs?.forEach((object) => configIdsSet.add(object.id));
         options?.forEach((option) => configIdsSet.add(option.config));
 
         if (config) {
@@ -615,7 +615,7 @@ const DeviceDetail = ({ route }) => {
     }, [display.items, isNetworkConnected, sensor, mqttConfigs])
   );
 
-  useWatchConfigs(configIdsTemp.current);
+  useWatchConfigs(chipFiltered.length ? [] : configIdsTemp.current);
 
   const isShowEmergencyResolve =
     display.items.filter(
@@ -751,6 +751,7 @@ const DeviceDetail = ({ route }) => {
               }
               showWindDirection={showWindDirection}
               isDeviceHasBle={isDeviceHasBle}
+              key={`sensor${sensor.id}`}
             >
               {display.items.map((item, index) => {
                 return (

package/src/screens/Device/hooks/useDeviceWatchConfigControl.js

@@ -8,12 +8,11 @@ export const useDeviceWatchConfigControl = (
   display,
   mqttConfigs = {}
 ) => {
+  const { is_managed_by_backend, device_type } = device;
   const configsNeedWatching = useMemo(() => {
     if (
-      !device?.is_managed_by_backend ||
-      [DEVICE_TYPE.GOOGLE_HOME, DEVICE_TYPE.LG_THINQ].includes(
-        device?.device_type
-      )
+      !is_managed_by_backend ||
+      [DEVICE_TYPE.GOOGLE_HOME, DEVICE_TYPE.LG_THINQ].includes(device_type)
     ) {
       return [];
     }
@@ -24,11 +23,6 @@ export const useDeviceWatchConfigControl = (
       );
     }
     return configsControl;
-  }, [
-    mqttConfigs,
-    device?.device_type,
-    device?.is_managed_by_backend,
-    display,
-  ]);
+  }, [is_managed_by_backend, device_type, display, mqttConfigs]);
   useWatchConfigs(configsNeedWatching);
 };

package/src/screens/Unit/ManageUnitStyles.js

@@ -18,7 +18,7 @@ export default StyleSheet.create({
     bottom: 0,
     borderWidth: 0,
     alignSelf: 'center',
-    paddingBottom: 16 + getBottomSpace(),
+    paddingBottom: 20 + getBottomSpace(),
   },
   boxImage: {
     flexDirection: 'row',

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

@@ -1464,6 +1464,8 @@ export default {
   end_devices_added: 'end devices added',
   bellow_widget_is_not_configured: 'Bellow widget is not configured',
   bellow_widget_is_wrongly_configured: 'Bellow widget is wrongly configured',
+  widget_have_not_been_shared:
+    '{widget} widget have not been shared. Please contact the owner',
   'customize...': 'Customize...',
   uri_invalid: 'URI invalid',
   when_value_is: 'When value is',

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

@@ -1474,6 +1474,8 @@ export default {
   end_devices_added: 'thiết bị được thêm vào',
   bellow_widget_is_not_configured: 'Tiện ích bên dưới chưa được cấu hình',
   bellow_widget_is_wrongly_configured: 'Tiện ích bên dưới được cấu hình sai',
+  widget_have_not_been_shared:
+    'Tiện ích {widget} chưa được chia sẽ. Vui lòng liên hệ với chủ sở hữu',
   'customize...': 'Tùy chỉnh...',
   uri_invalid: 'URI không hợp lệ',
   when_value_is: 'Khi giá trị là',

package/src/commons/ActionGroup/OnOffTemplate/styles.js

@@ -1,7 +0,0 @@
-import { StyleSheet } from 'react-native';
-
-export default StyleSheet.create({
-  wrap: {
-    marginBottom: 16,
-  },
-});