@eohjsc/react-native-smart-city 0.3.16 → 0.3.19

package/package.json

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

package/src/commons/ActionGroup/NumberUpDownActionTemplate.js

@@ -22,8 +22,8 @@ const NumberUpDownActionTemplate = ({ actionGroup, doAction, sensor }) => {
 
   // eslint-disable-next-line no-unused-vars
   const [configValues, setConfigValues] = useConfigGlobalState('configValues');
-  const [value, setValue] = useState();
   const valueDefault = 28;
+  const [value, setValue] = useState(valueDefault);
 
   useEffect(() => {
     if (sensor?.device_type === DEVICE_TYPE.LG_THINQ) {
@@ -40,15 +40,12 @@ const NumberUpDownActionTemplate = ({ actionGroup, doAction, sensor }) => {
 
   useEffect(() => {
     if (!config) {
-      setValue(valueDefault);
       return;
     }
 
     const configValue = configValues[config];
     if (configValue !== null && configValue !== undefined) {
       setValue(configValue);
-    } else {
-      setValue(valueDefault);
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [JSON.stringify(configValues)]);

package/src/commons/ConnectingProcess/index.js

@@ -14,6 +14,35 @@ import Connecting from '../Connecting';
 import { useSCContextSelector } from '../../context';
 import { ToastBottomHelper } from '../../utils/Utils';
 
+const ConnectingSuccess = ({
+  unit,
+  sensor,
+  station,
+  unit_name,
+  newName,
+  setNewName,
+}) => {
+  const t = useTranslations();
+  return (
+    <View style={styles.ConnectingSuccess}>
+      <ImageSuccessfully />
+      <Text bold style={styles.connectingText}>
+        {t('successfully_connected')}
+      </Text>
+      <Text size={14} style={styles.textHome}>
+        {`${unit?.name || unit_name} ${
+          station?.name !== undefined ? '- ' + station?.name : ''
+        }`}
+      </Text>
+      <DeviceItem
+        icon={sensor?.icon_kit}
+        name={newName}
+        setNewName={setNewName}
+      />
+    </View>
+  );
+};
+
 const ConnectingProcess = ({ route }) => {
   const { navigate, goBack } = useNavigation();
   const t = useTranslations();
@@ -34,7 +63,7 @@ const ConnectingProcess = ({ route }) => {
   const user = useSCContextSelector((state) => state?.auth?.account?.user);
   const [newName, setNewName] = useState('');
 
-  const ConnectingDevice = useCallback(async () => {
+  const connectingDevice = useCallback(async () => {
     setIsLoading(true);
     switch (devicePrefixName) {
       case 'SENSOR': {
@@ -106,27 +135,6 @@ const ConnectingProcess = ({ route }) => {
     unit_id,
   ]);
 
-  const ConnectingSuccess = useCallback(() => {
-    return (
-      <View style={styles.ConnectingSuccess}>
-        <ImageSuccessfully />
-        <Text bold style={styles.connectingText}>
-          {t('successfully_connected')}
-        </Text>
-        <Text size={14} style={styles.textHome}>
-          {`${unit?.name || unit_name} ${
-            station?.name !== undefined ? '- ' + station?.name : ''
-          }`}
-        </Text>
-        <DeviceItem
-          icon={sensor?.icon_kit}
-          name={newName}
-          setNewName={setNewName}
-        />
-      </View>
-    );
-  }, [newName, sensor?.icon_kit, station?.name, t, unit?.name, unit_name]);
-
   const handleDone = useCallback(async () => {
     let result, message;
     switch (devicePrefixName) {
@@ -178,8 +186,8 @@ const ConnectingProcess = ({ route }) => {
   ]);
 
   useEffect(() => {
-    ConnectingDevice();
-  }, [ConnectingDevice]);
+    connectingDevice();
+  }, [connectingDevice]);
 
   return (
     <SafeAreaView style={styles.wrap}>
@@ -188,7 +196,16 @@ const ConnectingProcess = ({ route }) => {
           {t('connect_device')}
         </Text>
         {!!isLoading && <Connecting isLoading={isLoading} />}
-        {!isLoading && <ConnectingSuccess />}
+        {!isLoading && (
+          <ConnectingSuccess
+            unit={unit}
+            sensor={sensor}
+            station={station}
+            unit_name={unit_name}
+            newName={newName}
+            setNewName={setNewName}
+          />
+        )}
       </View>
       {!isLoading && (
         <TouchableOpacity style={styles.buttonDone} onPress={handleDone}>

package/src/screens/Unit/Detail.js

@@ -257,6 +257,7 @@ const UnitDetail = ({ route }) => {
           unit={unit}
           favoriteDevices={favoriteDevices}
           favoriteAutomates={favoriteAutomates}
+          wrapItemStyle={styles.wrapItemStyle}
         />
       );
     }

package/src/screens/Unit/styles.js

@@ -1,5 +1,10 @@
 import { StyleSheet } from 'react-native';
-import { Colors } from '../../configs';
+import { Colors, Constants } from '../../configs';
+
+const marginItem = 12;
+const marginHorizontal = 16;
+const widthItem = (Constants.width - marginHorizontal * 2 - marginItem) / 2;
+const heightItem = (widthItem / 166) * 126;
 
 export default StyleSheet.create({
   container: {
@@ -71,6 +76,10 @@ export default StyleSheet.create({
     margin: 0,
     padding: 0,
   },
+  wrapItemStyle: {
+    height: heightItem,
+    marginVertical: 0,
+  },
   camera: {
     width: 1,
     height: 1,