@eohjsc/react-native-smart-city 0.7.27 → 0.7.30

package/src/iot/mqtt.js

@@ -1,6 +1,5 @@
-import moment from 'moment';
 import { getObject, storeObject } from '../utils/Storage';
-import { updateGlobalValue } from './Monitor';
+import { getLastUpdated, updateGlobalValue } from './UpdateStates';
 import { Buffer } from 'buffer';
 
 const struct = require('python-struct');
@@ -87,6 +86,84 @@ const float_cdab = (bytes_str) => {
   return value_unpacked('>f', swapped);
 };
 
+const uint_64_abcd = (bytes_str) => {
+  return value_unpacked('>Q', bytes_str?.slice(0, 16));
+};
+
+const uint_64_dcba = (bytes_str) => {
+  return value_unpacked('<Q', bytes_str?.slice(0, 16));
+};
+
+const uint_64_badc = (bytes_str) => {
+  const swapped =
+    bytes_str?.slice(12, 16) +
+    bytes_str?.slice(8, 12) +
+    bytes_str?.slice(4, 8) +
+    bytes_str?.slice(0, 4);
+  return value_unpacked('<Q', swapped);
+};
+
+const uint_64_cdab = (bytes_str) => {
+  const swapped =
+    bytes_str?.slice(12, 16) +
+    bytes_str?.slice(8, 12) +
+    bytes_str?.slice(4, 8) +
+    bytes_str?.slice(0, 4);
+  return value_unpacked('>Q', swapped);
+};
+
+const int_64_abcd = (bytes_str) => {
+  return value_unpacked('>q', bytes_str?.slice(0, 16));
+};
+
+const int_64_dcba = (bytes_str) => {
+  return value_unpacked('<q', bytes_str?.slice(0, 16));
+};
+
+const int_64_badc = (bytes_str) => {
+  const swapped =
+    bytes_str?.slice(12, 16) +
+    bytes_str?.slice(8, 12) +
+    bytes_str?.slice(4, 8) +
+    bytes_str?.slice(0, 4);
+  return value_unpacked('<q', swapped);
+};
+
+const int_64_cdab = (bytes_str) => {
+  const swapped =
+    bytes_str?.slice(12, 16) +
+    bytes_str?.slice(8, 12) +
+    bytes_str?.slice(4, 8) +
+    bytes_str?.slice(0, 4);
+  return value_unpacked('>q', swapped);
+};
+
+const double_abcd = (bytes_str) => {
+  return value_unpacked('>d', bytes_str?.slice(0, 16));
+};
+
+const double_dcba = (bytes_str) => {
+  return value_unpacked('<d', bytes_str?.slice(0, 16));
+};
+
+const double_badc = (bytes_str) => {
+  const swapped =
+    bytes_str?.slice(12, 16) +
+    bytes_str?.slice(8, 12) +
+    bytes_str?.slice(4, 8) +
+    bytes_str?.slice(0, 4);
+  return value_unpacked('<d', swapped);
+};
+
+const double_cdab = (bytes_str) => {
+  const swapped =
+    bytes_str?.slice(12, 16) +
+    bytes_str?.slice(8, 12) +
+    bytes_str?.slice(4, 8) +
+    bytes_str?.slice(0, 4);
+  return value_unpacked('>d', swapped);
+};
+
 const range_value_converting = (
   raw_value,
   raw_min,
@@ -133,6 +210,18 @@ const mappingTransformer = {
   convert_ai: convert_ai,
   int_first4: int_first4,
   int_last4: int_last4,
+  double_abcd: double_abcd,
+  double_dcba: double_dcba,
+  double_badc: double_badc,
+  double_cdab: double_cdab,
+  uint_64_abcd: uint_64_abcd,
+  uint_64_dcba: uint_64_dcba,
+  uint_64_badc: uint_64_badc,
+  uint_64_cdab: uint_64_cdab,
+  int_64_abcd: int_64_abcd,
+  int_64_dcba: int_64_dcba,
+  int_64_badc: int_64_badc,
+  int_64_cdab: int_64_cdab,
 };
 
 const extract_config_value = (register, value_bytes) => {
@@ -227,7 +316,7 @@ const check_filter = (value, config) => {
   return value < low || value > high;
 };
 
-const updateGlobalValueMqtt = async (config, value) => {
+const updateGlobalValueMqtt = async (config, value, time) => {
   if (!config?.id) {
     return;
   }
@@ -235,9 +324,10 @@ const updateGlobalValueMqtt = async (config, value) => {
     return;
   }
 
-  const last_updated = moment().format('YYYY-MM-DDTHH:mm:ss.SSSSSS');
+  const { last_updated, last_updated_micro } = getLastUpdated(time);
+
   if (typeof value === 'string') {
-    updateGlobalValue(config.id, { value, last_updated });
+    updateGlobalValue(config.id, { value, last_updated, last_updated_micro });
     return;
   }
 
@@ -248,10 +338,18 @@ const updateGlobalValueMqtt = async (config, value) => {
     return;
   }
 
-  updateGlobalValue(config.id, { value, last_updated });
+  updateGlobalValue(config.id, { value, last_updated, last_updated_micro });
+};
+
+export const handleSelfSensorData = (chip, configsById, data, time) => {
+  chip?.self_sensor?.configs.forEach((config) => {
+    const configId = config.id;
+    const value = data?.[config.name];
+    updateGlobalValueMqtt(configsById[configId], value, time);
+  });
 };
 
-export const handleModbusData = (chip, configById, data) => {
+export const handleModbusData = (chip, configsById, data, time) => {
   const modbus_gateway = chip?.modbus_gateway;
   if (!modbus_gateway) {
     return;
@@ -269,16 +367,22 @@ export const handleModbusData = (chip, configById, data) => {
       sensor_data = new_sensor_data;
 
       const configId = register?.config;
-      updateGlobalValueMqtt(configById[configId], value);
+      updateGlobalValueMqtt(configsById[configId], value, time);
     });
   });
 };
 
-export const handleChipData = (configById, configId, data) => {
-  updateGlobalValueMqtt(configById[configId], data?.v);
+export const handleChipData = (configsById, configId, data, time) => {
+  updateGlobalValueMqtt(configsById[configId], data?.v, time);
 };
 
-export const handleZigbeeData = (chip, configById, ieee_address, data) => {
+export const handleZigbeeData = (
+  chip,
+  configsById,
+  ieee_address,
+  data,
+  time
+) => {
   const zigbee_gateway = chip?.zigbee_gateway;
   if (!zigbee_gateway) {
     return;
@@ -293,14 +397,20 @@ export const handleZigbeeData = (chip, configById, ieee_address, data) => {
   const device = zigbee_device_by_ieee[ieee_address];
   if (device) {
     (device.configs || []).forEach((config_map) => {
-      let value = data?.data[config_map?.key];
+      let value = data?.data?.[config_map?.key];
       const configId = config_map?.config;
-      updateGlobalValueMqtt(configById[configId], value);
+      updateGlobalValueMqtt(configsById[configId], value, time);
     });
   }
 };
 
-export const handleThirdPartyData = (chip, configById, device_uid, data) => {
+export const handleThirdPartyData = (
+  chip,
+  configsById,
+  device_uid,
+  data,
+  time
+) => {
   const third_party_gateway = chip?.third_party_gateway;
   if (!third_party_gateway) {
     return;
@@ -314,9 +424,9 @@ export const handleThirdPartyData = (chip, configById, device_uid, data) => {
 
   const device = third_party_device_by_uid[device_uid];
   device?.configs?.forEach((config_map) => {
-    const value = data[config_map?.key];
+    const value = data?.[config_map?.key];
     const configId = config_map?.config;
-    updateGlobalValueMqtt(configById[configId], value);
+    updateGlobalValueMqtt(configsById[configId], value, time);
   });
 };
 
@@ -325,13 +435,29 @@ export const handleMqttMessage = (
   payloadData,
   code,
   chip,
-  configById
+  configsById
 ) => {
+  if (topic === `eoh/chip/${code}/is_online`) {
+    // Online Status
+    // topic: eoh/chip/${code}/is_online
+    // payload: {ol: 1}
+    handleSelfSensorData(chip, configsById, { is_online: payloadData?.ol });
+    return;
+  }
+
+  if (topic === `eoh/chip/${code}/self_sensor`) {
+    // Self Sensor
+    // topic: eoh/chip/${code}/self_sensor
+    // payload: {is_battery: 1, temperature: 27.5, volt: 3.3, ...}
+    handleSelfSensorData(chip, configsById, payloadData, payloadData?.time);
+    return;
+  }
+
   if (topic === `eoh/chip/${code}/data`) {
     // Modbus
     // topic: eoh/chip/${code}/data
     // payload: {data: '01aa010a', 'ack':'1', 'chip_temperature':5333, 'rssi':-61}
-    handleModbusData(chip, configById, payloadData.data);
+    handleModbusData(chip, configsById, payloadData?.data, payloadData?.time);
   }
 
   const matchArduinoConfigValue = topic.match(/config\/(\d+)\/value/);
@@ -339,7 +465,29 @@ export const handleMqttMessage = (
     // Arduino
     // topic: eoh/chip/{code}/config/127363/value
     // payload: {v: 2130} or {v: 'on'}
-    handleChipData(configById, matchArduinoConfigValue[1], payloadData);
+    handleChipData(
+      configsById,
+      matchArduinoConfigValue[1],
+      payloadData,
+      payloadData?.time
+    );
+  }
+
+  const matchBatchConfigValue = topic.match(/config_value/);
+  if (matchBatchConfigValue) {
+    // Arduino
+    // topic: eoh/chip/{code}/config_value
+    // payload: {1: 2130, 2: 3000}
+    // This is a batch update for multiple configs
+    Object.keys(payloadData).forEach((key) => {
+      handleChipData(
+        configsById,
+        key,
+        { v: payloadData[key] },
+        payloadData.time
+      );
+    });
+    return;
   }
 
   const matchZigbeeConfigValue = topic.match(/zigbee\/(.+)\/data/);
@@ -347,7 +495,13 @@ export const handleMqttMessage = (
     // Zigbee
     // topic: eoh/chip/code-123/zigbee/IEEE-123/data
     // payload: {zigbee_data: 'aaa', 'data': {state: 1, state_0: 0}}
-    handleZigbeeData(chip, configById, matchZigbeeConfigValue[1], payloadData);
+    handleZigbeeData(
+      chip,
+      configsById,
+      matchZigbeeConfigValue[1],
+      payloadData,
+      payloadData?.time
+    );
   }
 
   const matchThirdPartyConfigValue = topic.match(/third_party\/(.+)\/data/);
@@ -357,9 +511,10 @@ export const handleMqttMessage = (
     // payload: {state: 1, temperature: 27.6}
     handleThirdPartyData(
       chip,
-      configById,
+      configsById,
       matchThirdPartyConfigValue[1],
-      payloadData
+      payloadData,
+      payloadData?.time
     );
   }
 };

package/src/navigations/UnitStack.js

@@ -29,6 +29,7 @@ import SetupScriptDelay from '../screens/Automate/AddNewAction/SetupScriptDelay'
 import SetupScriptNotify from '../screens/Automate/AddNewAction/SetupScriptNotify';
 import SetupScriptEmail from '../screens/Automate/AddNewAction/SetupScriptEmail';
 import SetupScriptReceiverEmail from '../screens/Automate/AddNewAction/SetupScriptReceiverEmail';
+import SetupScriptReceiverNotify from '../screens/Automate/AddNewAction/SetupScriptReceiverNotify';
 import AddAutomationTypeSmart from '../screens/Automate/AddNewAutoSmart/AddAutomationTypeSmart';
 import AddUnknownTypeSmart from '../screens/Automate/AddNewAutoSmart/AddUnknownTypeSmart';
 import EditActionsList from '../screens/Automate/EditActionsList';
@@ -44,6 +45,7 @@ import DeviceDetail from '../screens/Device/detail';
 import EditDevice from '../screens/Device/EditDevice/index';
 import DeviceInfo from '../screens/DeviceInfo';
 import EmergencySetting from '../screens/EmergencySetting';
+import CreatePassword from '../screens/CreatePassword';
 import EnterPassword from '../screens/EnterPassword';
 import GuestInfo from '../screens/GuestInfo';
 import ManageAccessScreen from '../screens/ManageAccess';
@@ -374,6 +376,13 @@ export const UnitStack = memo((props) => {
           headerShown: false,
         }}
       />
+      <Stack.Screen
+        name={Route.CreatePassword}
+        component={CreatePassword}
+        options={{
+          headerShown: false,
+        }}
+      />
       <Stack.Screen
         name={Route.EnterPassword}
         component={EnterPassword}
@@ -465,6 +474,13 @@ export const UnitStack = memo((props) => {
           headerShown: false,
         }}
       />
+      <Stack.Screen
+        name={Route.SetupScriptReceiverNotify}
+        component={SetupScriptReceiverNotify}
+        options={{
+          headerShown: false,
+        }}
+      />
       <Stack.Screen
         name={Route.UpdateReceiverEmailScript}
         component={UpdateReceiverEmailScript}

package/src/screens/ActivityLog/ItemLog.js

@@ -46,6 +46,7 @@ const DetailLog = ({ item }) => {
             ? `${item.action_name} ${t('by')} `
             : `${t('activated_by')} `}
           <Text style={styles.name}>{item.name || item.username}</Text>
+          <Text style={styles.text}>{'\n' + item.message}</Text>
         </Text>
       );
   }

package/src/screens/AddNewGateway/RenameNewDevices.js

@@ -8,6 +8,7 @@ import Text from '../../commons/Text';
 import GatewayIcon from '../../../assets/images/AddNewDevice/gateway-icon.svg';
 import _TextInput from '../../commons/Form/TextInput';
 import AccessibilityLabel from '../../configs/AccessibilityLabel';
+import useInAppReview from '../../hooks/Review/useInAppReview';
 import Routes from '../../utils/Route';
 import styles from './RenameNewDevicesStyles';
 import { axiosGet, axiosPost } from '../../utils/Apis/axios';
@@ -33,6 +34,7 @@ const RenameNewDevices = memo(({ route }) => {
   const [selectedDevice, setSelectedDevice] = useState([]);
   const [originalDevices, setOriginalDevices] = useState([]);
   const [isAutoFocus, setIsAutoFocus] = useState(true);
+  const { allowInAppReview } = useInAppReview(false);
 
   const renameLabel = AccessibilityLabel.CONNECTED_DEVICE_RENAME_DEVICE;
 
@@ -94,6 +96,7 @@ const RenameNewDevices = memo(({ route }) => {
         setIsDisabled(false);
         clearTimeout(clear);
       }, 3000);
+      allowInAppReview();
       goBackUnitDetail();
       return;
     }
@@ -135,6 +138,7 @@ const RenameNewDevices = memo(({ route }) => {
     }
 
     if (success1 || success2) {
+      allowInAppReview();
       goBackUnitDetail();
     }
     if (!success1) {
@@ -145,6 +149,7 @@ const RenameNewDevices = memo(({ route }) => {
     }
     setLoading(false);
   }, [
+    allowInAppReview,
     goBackUnitDetail,
     info,
     isChangedName,

package/src/screens/AddNewGateway/__test__/RenameNewDevices.test.js

@@ -14,6 +14,18 @@ import api from '../../../utils/Apis/axios';
 import { CheckBoxCustom } from '../../Sharing/Components';
 import RenameNewDevices from '../RenameNewDevices';
 
+const mockAllowInAppReview = jest.fn();
+const mockAskReview = jest.fn();
+jest.mock('../../../hooks/Review/useInAppReview', () => {
+  return {
+    __esModule: true,
+    default: jest.fn(() => ({
+      allowInAppReview: mockAllowInAppReview,
+      askReview: mockAskReview,
+    })),
+  };
+});
+
 const wrapComponent = (route) => (
   <SCProvider initState={mockSCStore({})}>
     <RenameNewDevices route={route} />
@@ -103,6 +115,8 @@ describe('Test rename new devices', () => {
   };
 
   beforeEach(() => {
+    mockAllowInAppReview.mockClear();
+    mockAskReview.mockClear();
     navigate.mockClear();
     mock.reset();
     route = {
@@ -403,6 +417,8 @@ describe('Test rename new devices', () => {
         ],
       })
     );
+    expect(mockAllowInAppReview).toHaveBeenCalled();
+    expect(mockAskReview).not.toHaveBeenCalled();
     mockedDispatchNavigate();
   });
 
@@ -443,6 +459,8 @@ describe('Test rename new devices', () => {
     });
 
     expect(mock.history.post).toHaveLength(0);
+    expect(mockAllowInAppReview).toHaveBeenCalled();
+    expect(mockAskReview).not.toHaveBeenCalled();
     mockedDispatchNavigate();
   });
 

package/src/screens/Automate/AddNewAction/ReceiverSelect.js

@@ -0,0 +1,208 @@
+import React, { useCallback, useMemo, useState, useEffect, memo } from 'react';
+import { FlatList, View } from 'react-native';
+import { useNavigation } from '@react-navigation/native';
+import CheckBox from '@react-native-community/checkbox';
+import styles from './Styles/ReceiverSelectStyles';
+import { CircleView, HeaderCustom, Text } from '../../../commons';
+import { useTranslations } from '../../../hooks/Common/useTranslations';
+
+import BottomButtonView from '../../../commons/BottomButtonView';
+import { Search } from '../../../commons/DevMode';
+import { convertToSlug } from '../../../utils/Functions/Search';
+import { axiosGet } from '../../../utils/Apis/axios';
+import { API, Colors } from '../../../configs';
+import { useSCContextSelector } from '../../../context';
+import { Image } from 'react-native';
+
+const ReceiverSelect = ({
+  listUser,
+  unitId,
+  title,
+  setListUser,
+  onLoadOption,
+  onNext,
+}) => {
+  const t = useTranslations();
+  const { goBack } = useNavigation();
+  const [members, setMembers] = useState([]);
+  const [search, setSearch] = useState('');
+  const currentUserId = useSCContextSelector(
+    (state) => state.auth.account.user.id
+  );
+
+  const loadMembers = useCallback(async () => {
+    const { success, data } = await axiosGet(API.SHARE.UNITS_MEMBERS(unitId));
+    if (success) {
+      setMembers(
+        data.map((item) => ({
+          ...item,
+          ...onLoadOption(item),
+        }))
+      );
+    }
+  }, [unitId, onLoadOption]);
+
+  useEffect(() => {
+    loadMembers();
+  }, [loadMembers]);
+
+  const filterMembers = useMemo(() => {
+    return members.filter((member) => {
+      const text = convertToSlug(search);
+      const isNameMatch = convertToSlug(member.name ?? '').includes(text);
+      const isPhoneMatch = convertToSlug(member.phone_number ?? '').includes(
+        text
+      );
+      const isEmailMatch = convertToSlug(member.email ?? '').includes(text);
+      return isNameMatch || isPhoneMatch || isEmailMatch;
+    });
+  }, [members, search]);
+
+  const arrColor = useMemo(
+    () => [
+      Colors.GeekBlue3,
+      Colors.Purple3,
+      Colors.Orange3,
+      Colors.Volcano3,
+      Colors.Blue9,
+      Colors.Green3,
+      Colors.Cyan2,
+    ],
+    []
+  );
+
+  const selectableIds = useMemo(
+    () =>
+      members.filter((member) => !member.disabled).map((member) => member.id),
+    [members]
+  );
+
+  const allSelected = useMemo(
+    () => selectableIds.length === listUser.length,
+    [listUser, selectableIds]
+  );
+
+  const onChecked = useCallback(
+    (id) => (checked) => {
+      setListUser((prev) =>
+        checked ? [...prev, id] : prev.filter((userId) => userId !== id)
+      );
+    },
+    [setListUser]
+  );
+
+  const onDeselectAll = useCallback(() => {
+    setListUser([]);
+  }, [setListUser]);
+
+  const onSelectAll = useCallback(() => {
+    setListUser(selectableIds);
+  }, [selectableIds, setListUser]);
+
+  const onToggleAll = useCallback(
+    (checked) => {
+      if (checked) {
+        onSelectAll();
+      } else {
+        onDeselectAll();
+      }
+    },
+    [onSelectAll, onDeselectAll]
+  );
+
+  const RowMember = memo(({ member, index, onValueChange }) => {
+    const { id, name, avatar, share_id, label, invalidLabel, disabled } =
+      member;
+    const [role, roleColor] = useMemo(() => {
+      if (!share_id) {
+        return [t('owner'), Colors.Primary];
+      }
+      if (id === currentUserId) {
+        return [t('me'), Colors.Primary];
+      }
+      return [t('member'), Colors.Gray6];
+    }, [share_id, id]);
+
+    const firstWordsInName = useMemo(() => {
+      return name.charAt();
+    }, [name]);
+
+    const circleColor = arrColor[index % arrColor.length];
+
+    return (
+      <View style={styles.rowContainer}>
+        <View style={styles.border}>
+          <CheckBox
+            disabled={disabled}
+            lineWidth={4}
+            value={listUser.includes(id)}
+            onValueChange={onValueChange(id)}
+            style={styles.checkbox}
+          />
+          <View style={styles.paddingLeft16}>
+            {avatar ? (
+              <Image source={{ uri: avatar }} style={styles.avatar} />
+            ) : (
+              <CircleView size={40} backgroundColor={circleColor} center>
+                <Text color={Colors.White}>{firstWordsInName}</Text>
+              </CircleView>
+            )}
+          </View>
+          <View style={styles.paddingLeft16}>
+            <Text style={styles.titleName}>{name}</Text>
+            {label ? (
+              <Text style={styles.status}>{label}</Text>
+            ) : (
+              <Text style={styles.invalid}>{invalidLabel}</Text>
+            )}
+          </View>
+          <View style={styles.endFlex}>
+            <Text style={[styles.textRole, { color: roleColor }]}>{role}</Text>
+          </View>
+        </View>
+      </View>
+    );
+  });
+
+  return (
+    <View style={styles.wrap}>
+      <HeaderCustom isShowClose onClose={goBack} title={title} />
+
+      <View style={styles.wrapSelectAll}>
+        <Search onSearch={setSearch} />
+        <View style={styles.wrapCheckboxSelectAll}>
+          <CheckBox
+            value={allSelected}
+            onValueChange={onToggleAll}
+            style={styles.checkboxSelectAll}
+          />
+          <Text>{allSelected ? t('deselect_all') : t('select_all')}</Text>
+        </View>
+      </View>
+      <View style={styles.borderSelectAll} />
+
+      <FlatList
+        data={filterMembers}
+        renderItem={({ item, index }) => (
+          <RowMember member={item} index={index} onValueChange={onChecked} />
+        )}
+        keyExtractor={(item) => item.id.toString()}
+        ListEmptyComponent={
+          <View style={styles.viewEmpty}>
+            <Text style={styles.textCenter}>{t('no_member')}</Text>
+          </View>
+        }
+      />
+      <View style={styles.container}>
+        <BottomButtonView
+          style={styles.bottomButtonView}
+          mainTitle={t('done')}
+          onPressMain={onNext}
+          typeMain={listUser.length ? 'primary' : 'disabled'}
+        />
+      </View>
+    </View>
+  );
+};
+
+export default ReceiverSelect;

package/src/screens/Automate/AddNewAction/SetupScriptEmail.js

@@ -42,7 +42,7 @@ const SetupScriptEmail = ({ route }) => {
   }, [navigate, automate, initialUnitId, formData]);
 
   const canSave = useMemo(() => {
-    const { title, message } = formData || {};
+    const { title, message } = formData;
     return !!title && !!message;
   }, [formData]);