@eohjsc/react-native-smart-city 0.3.70 → 0.3.71

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@eohjsc/react-native-smart-city",
   "title": "React Native Smart Home",
-  "version": "0.3.70",
+  "version": "0.3.71",
   "description": "TODO",
   "main": "index.js",
   "files": [

package/src/commons/ActionGroup/NumberUpDownActionTemplate.js

@@ -55,7 +55,6 @@ const NumberUpDownActionTemplate = ({
           data.config_id = config;
           data.config_value = actionValue;
         }
-        data = JSON.stringify(data);
       }
       await doAction(actionData, data);
       if (!is_managed_by_backend) {

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

@@ -56,7 +56,7 @@ const OnOffTemplate = memo(({ actionGroup = {}, doAction, sensor }) => {
   const updateStatusFromPusher = useCallback(() => {
     setTimeout(() => {
       setTempIsOn(temp);
-    }, 2500);
+    }, 3000);
   }, []);
 
   const triggerAction = useCallback(async () => {
@@ -64,28 +64,39 @@ const OnOffTemplate = memo(({ actionGroup = {}, doAction, sensor }) => {
     if (!action_data) {
       return;
     }
-    let data = {
-      value: isOn ? 0 : 1,
-      state: isOn ? 0 : 1, // todo Bang remove this for Zigbee
-    };
-    if (allow_config_store_value && config) {
-      data.config_id = config;
-      data.config_value = data.value;
+    let data;
+    if (sensor?.device_type === DEVICE_TYPE.GOOGLE_HOME) {
+      data = null;
+    } else {
+      data = {
+        value: isOn ? 0 : 1,
+        state: isOn ? 0 : 1, // todo Bang remove this for Zigbee
+      };
+      if (allow_config_store_value && config) {
+        data.config_id = config;
+        data.config_value = data.value;
+      }
+    }
+    if (sensor?.device_type === DEVICE_TYPE.LG_THINQ) {
+      setTempIsOn((prev) => !prev);
     }
-    setTempIsOn((prev) => !prev);
     await doAction(action_data, data);
     updateStatusFromPusher(); // todo Bang read about this magic
 
-    sensor?.is_managed_by_backend && config && watchMultiConfigs([config]);
+    sensor?.is_managed_by_backend &&
+      config &&
+      sensor.device_type === DEVICE_TYPE.LG_THINQ &&
+      watchMultiConfigs([config]);
   }, [
     isOn,
     action_off_data,
     action_on_data,
+    sensor?.device_type,
+    sensor?.is_managed_by_backend,
     allow_config_store_value,
     config,
     doAction,
     updateStatusFromPusher,
-    sensor?.is_managed_by_backend,
   ]);
 
   useUnwatchLGDeviceConfigControl(sensor, [config]);

package/src/commons/ActionGroup/OptionsDropdownActionTemplate.js

@@ -9,7 +9,7 @@ import { useDropdownAction } from './hooks/useDropdownAction';
 import { useConfigGlobalState } from '../../iot/states';
 import { useUnwatchLGDeviceConfigControl } from '../../hooks/IoT';
 import styles from './OptionsDropdownActionTemplateStyle';
-import { AccessibilityLabel } from '../../configs/Constants';
+import { AccessibilityLabel, DEVICE_TYPE } from '../../configs/Constants';
 import IconComponent from '../../commons/IconComponent';
 import { useTranslations } from '../../hooks/Common/useTranslations';
 import SvgDoorState from '../../../assets/images/Device/door-state.svg';
@@ -70,25 +70,31 @@ const OptionsDropdownActionTemplate = ({
     const newOption = options[selectedIndex];
     const value = getOptionValue(newOption, allow_config_store_value);
 
-    let data = {
-      value: newOption?.value_int, // todo Bang keep only this
-      level: value,
-      key_code: newOption?.value_int,
-    };
-    if (allow_config_store_value && config) {
-      data.config_id = config;
-      data.config_value = newOption?.value_int;
+    let data;
+    if (sensor?.device_type === DEVICE_TYPE.GOOGLE_HOME) {
+      data = value;
+    } else {
+      data = {
+        value: newOption?.value_int, // todo Bang keep only this
+        level: value,
+        key_code: newOption?.value_int,
+      };
+      if (allow_config_store_value && config) {
+        data.config_id = config;
+        data.config_value = newOption?.value_int;
+      }
     }
     doAction(action_data, data);
     hideAlertAction();
   }, [
-    config,
+    options,
+    selectedIndex,
     allow_config_store_value,
-    action_data,
+    sensor.device_type,
+    config,
     doAction,
+    action_data,
     hideAlertAction,
-    options,
-    selectedIndex,
   ]);
 
   useUnwatchLGDeviceConfigControl(sensor, [configuration.config]);

package/src/commons/ActionGroup/SliderRangeTemplate.js

@@ -35,7 +35,7 @@ const SliderRangeTemplate = memo(({ actionGroup = {}, doAction, sensor }) => {
     async (value) => {
       await doAction(
         configuration?.action_brightness_data || configuration?.action_data,
-        JSON.stringify({ value_brness: value })
+        JSON.stringify({ value_brness: value, value: value })
       );
     },
     [

package/src/commons/ActionGroup/ThreeButtonTemplate.js

@@ -20,6 +20,9 @@ const ThreeButtonTemplate = memo(({ actionGroup, doAction }) => {
     icon1,
     icon2,
     icon3,
+    icon_kit1_data,
+    icon_kit2_data,
+    icon_kit3_data,
     text_door_lock,
     is_display_lock,
   } = configuration || {};
@@ -28,7 +31,7 @@ const ThreeButtonTemplate = memo(({ actionGroup, doAction }) => {
     return icon === 'stop' ? (
       <View style={styles.squareStop} />
     ) : (
-      <IconComponent icon={icon2} iconSize={30} />
+      <IconComponent icon={icon} iconSize={30} />
     );
   };
   const onButton1Press = useCallback(() => {
@@ -91,7 +94,7 @@ const ThreeButtonTemplate = memo(({ actionGroup, doAction }) => {
           underlayColor={Colors.Gray2}
         >
           <View style={styles.imageButton}>
-            <IconComponent icon={icon1} iconSize={30} />
+            <IconComponent icon={icon_kit1_data?.icon || icon1} iconSize={30} />
           </View>
           <Text style={styles.text}>{text1}</Text>
         </TouchableOpacity>
@@ -102,7 +105,9 @@ const ThreeButtonTemplate = memo(({ actionGroup, doAction }) => {
           onPress={onButton2Press}
           underlayColor={Colors.Gray2}
         >
-          <View style={styles.imageButton}>{iconCustom(icon2)}</View>
+          <View style={styles.imageButton}>
+            {iconCustom(icon_kit2_data?.icon || icon2)}
+          </View>
           <Text style={styles.text}>{text2}</Text>
         </TouchableOpacity>
 
@@ -113,7 +118,7 @@ const ThreeButtonTemplate = memo(({ actionGroup, doAction }) => {
           underlayColor={Colors.Gray2}
         >
           <View style={styles.imageButton}>
-            <IconComponent icon={icon3} iconSize={30} />
+            <IconComponent icon={icon_kit3_data?.icon || icon3} iconSize={30} />
           </View>
           <Text style={styles.text}>{text3}</Text>
         </TouchableOpacity>

package/src/commons/ActionGroup/__test__/OptionsDropdownTemplate.test.js

@@ -308,10 +308,6 @@ describe('Test OptionsDropdownActionTemplate', () => {
     });
     expect(alertAction.props.visible).toBeFalsy();
 
-    expect(mockDoAction).toHaveBeenCalledWith(action_data, {
-      value: 1,
-      level: 'level-1',
-      key_code: 1,
-    });
+    expect(mockDoAction).toHaveBeenCalledWith(action_data, 'level-1');
   });
 });

package/src/commons/ActionGroup/__test__/SliderRangeTemplate.test.js

@@ -62,7 +62,7 @@ describe('Test SliderRangeTemplate', () => {
     });
     expect(mockDoAction).toHaveBeenCalledWith(
       action_data,
-      JSON.stringify({ value_brness: 50 })
+      JSON.stringify({ value_brness: 50, value: 50 })
     );
   });
 
@@ -82,7 +82,7 @@ describe('Test SliderRangeTemplate', () => {
     });
     expect(mockDoAction).toHaveBeenCalledWith(
       action_data,
-      JSON.stringify({ value_brness: 50 })
+      JSON.stringify({ value_brness: 50, value: 50 })
     );
   });
 

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

@@ -1,13 +1,11 @@
-import React, { memo, useMemo } from 'react';
+import React, { memo } from 'react';
 import { View, StyleSheet } from 'react-native';
 import LinearGradient from 'react-native-linear-gradient';
 
 import { Colors } from '../../../configs';
 import { CircleView } from '../../../commons';
 import Text from '../../../commons/Text';
-import IconRain from '../../../../assets/images/Device/rain.svg';
-import IconSunny from '../../../../assets/images/Device/sunny.svg';
-import IconSunnyBlack from '../../../../assets/images/Device/inactive-icon.svg';
+import IconComponent from '../../IconComponent';
 
 const CurrentRainSensor = memo(({ data = [] }) => {
   const item = data.length
@@ -15,17 +13,8 @@ const CurrentRainSensor = memo(({ data = [] }) => {
     : {
         evaluate: {},
       };
-  const { text, raining, backgroundColor, borderColor } = item.evaluate || {};
-  const renderIcon = useMemo(() => {
-    let icon = <IconSunny />;
-    if (raining) {
-      icon = <IconRain />;
-    } else {
-      const isOn = String(text)?.toLowerCase() === 'on';
-      icon = isOn ? <IconSunny /> : <IconSunnyBlack width={32} height={32} />;
-    }
-    return icon;
-  }, [raining, text]);
+  const { text, backgroundColor, borderColor, icon, icon_kit_data } =
+    item.evaluate || {};
 
   return (
     <View style={styles.standard}>
@@ -42,7 +31,9 @@ const CurrentRainSensor = memo(({ data = [] }) => {
           start={{ x: 1, y: 0 }}
           end={{ x: 1, y: 1 }}
         />
-        {renderIcon}
+        <IconComponent
+          icon={icon_kit_data?.icon || icon || 'CheckCircleOutlined'}
+        />
         <Text style={styles.text}>{text}</Text>
       </CircleView>
     </View>

package/src/configs/SCConfig.js

@@ -1,3 +1,4 @@
+/* istanbul ignore file */
 import { LocaleConfig } from 'react-native-calendars';
 import api from '../utils/Apis/axios';
 

package/src/iot/RemoteControl/HomeAssistant.js

@@ -214,7 +214,6 @@ async function sendCommandSingleAction(connection, ghAction, data) {
   if (name && data) {
     message.service_data[name] = data;
   }
-
   try {
     await connection.sendMessagePromise(message);
     return true;
@@ -238,21 +237,13 @@ export async function sendCommandOverHomeAssistant(
 
   const connection = getDeviceConnection(connections, device);
   if (!connection) {
-    ToastBottomHelper.error(t('command_send_fail_homeassistant'));
+    ToastBottomHelper.error(t('home_assistant_device_not_found'));
     return;
   }
 
   let triggerSuccess;
 
-  if (action.googlehome_actions) {
-    for (let i = 0; i < action.googlehome_actions.length; i++) {
-      triggerSuccess = await sendCommandSingleAction(
-        connection,
-        action.googlehome_actions[i],
-        data
-      );
-    }
-  } else if (action.googlehome_action) {
+  if (action.googlehome_action) {
     triggerSuccess = await sendCommandSingleAction(
       connection,
       action.googlehome_action,

package/src/iot/RemoteControl/__test__/HomeAssistant.test.js

@@ -75,11 +75,6 @@ describe('Remote Control Home Assistant', () => {
 
   const action = {
     id: 1,
-    googlehome_actions: [
-      {
-        message: 'message',
-      },
-    ],
     googlehome_action: {
       message: 'message',
     },
@@ -238,38 +233,11 @@ describe('Remote Control Home Assistant', () => {
     );
     await sendCommandOverHomeAssistant(connections, sensor, action);
     expect(connection.sendMessagePromise).toBeCalledWith(
-      action.googlehome_actions[0].message
+      action.googlehome_action.message
     );
   });
 
   it('Send command over Home Assistant will send message to chip with service_data and data', async () => {
-    action.googlehome_actions[0].message = {
-      type: 'call_service',
-      domain: 'climate',
-      service: 'set_temperature',
-      service_data: {
-        temperature: 0,
-        entity_id: 'climate.dqsmart_0108f6cdde',
-      },
-      id: 20,
-    };
-    mock.onPost(API.DEVICE.ACTIVITY_LOG()).reply(200);
-    const connections = await homeAssistantConnect(
-      {},
-      options,
-      mockEstablished,
-      mockDisconnected,
-      mockReconnected
-    );
-    await sendCommandOverHomeAssistant(connections, sensor, action, 19);
-    action.googlehome_actions[0].message.service_data.temperature = 19;
-    expect(connection.sendMessagePromise).toBeCalledWith(
-      action.googlehome_actions[0].message
-    );
-  });
-
-  it('Send command over Home Assistant action googlehome_action one to one', async () => {
-    action.googlehome_actions = null;
     action.googlehome_action.message = {
       type: 'call_service',
       domain: 'climate',

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

@@ -155,7 +155,6 @@
   "ok": "OK",
   "Status": "Status: ",
   "connected": "Connected",
-  "home_assistant_connected": "Home Assistant is connected",
   "don_t_have_an_account": "Don't have an account?",
   "please_enter_your_phone_number": "Please enter your phone number",
   "please_enter_your_password": "Please enter your password",
@@ -371,6 +370,8 @@
   "check_the_wifi": "Check the Wi-Fi/Cellular signal or try to reset it.",
   "check_the_ble": "Check your Bluetooth status and try to use QUICK ACTION to control.",
   "disconnected": "Disconnected",
+  "home_assistant_connected": "Home Assistant is connected",
+  "home_assistant_device_not_found": "Home Assistant device not found",
   "home_assistant_disconnected": "Home Assistant is disconnected",
   "rename_sub_unit": "Rename sub-unit",
   "select_image": "Select image",

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

@@ -206,7 +206,6 @@
   "ok": "OK",
   "Status": "Trạng thái: ",
   "connected": "Đã kết nối",
-  "home_assistant_connected": "Home Assistant đã kết nối",
   "don_t_have_an_account": "Bạn chưa có tài khoản?",
   "please_enter_your_phone_number": "Vui lòng nhập số điện thoại",
   "please_enter_your_password": "Vui lòng nhập mật khẩu",
@@ -419,6 +418,7 @@
   "check_the_wifi": "Kiểm tra lại Wi-Fi/tín hiệu di động hoặc thử khởi động lại.",
   "check_the_ble": "Kiểm tra trạng thái Bluetooth của bạn và thử sử dụng HÀNH ĐỘNG NHANH để điều khiển",
   "disconnected": "Ngắt kết nối",
+  "home_assistant_connected": "Home Assistant đã kết nối",
   "home_assistant_disconnected": "Home Assistant bị ngắt kết nối",
   "rename_sub_unit": "Đổi tên khu vực",
   "select_image": "Chọn ảnh",
@@ -709,6 +709,7 @@
   "this_spot_does_not_support_to_scan": "Vị trí đỗ này không hỗ trợ quét",
   "please_book_by_the_normal_way": "Vui lòng đặt trước bằng cách thông thường",
   "qr_code_invalid": "Mã QR này không hợp lệ",
+  "home_assistant_device_not_found": "Không tìm thấy thiết bị Home Assistant",
   "command_send_success_homeassistant": "Lệnh gởi thành công đến Home Assistant",
   "command_send_fail_homeassistant": "Lệnh gởi thất bại đến Home Assistant",
   "command_homeassistant_ready": "Home Assistant kết nối thành công",