@eohjsc/react-native-smart-city 0.2.63 → 0.2.67

package/package.json

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

package/src/commons/Device/ItemDevice.js

@@ -62,7 +62,11 @@ const ItemDevice = memo(
             <TouchableOpacity onPress={goToSensorDisplay}>
               {displayIconSensor()}
             </TouchableOpacity>
-            <ItemQuickAction sensor={sensor} unit={unit} />
+            <ItemQuickAction
+              sensor={sensor}
+              unit={unit}
+              wrapperStyle={styles.iconCircle}
+            />
           </View>
           <TouchableOpacity onPress={goToSensorDisplay}>
             <Text
@@ -133,4 +137,12 @@ const styles = StyleSheet.create({
     height: 40,
     resizeMode: 'contain',
   },
+  iconCircle: {
+    width: 32,
+    height: 32,
+    backgroundColor: Colors.Gray3,
+    borderRadius: 16,
+    justifyContent: 'center',
+    alignItems: 'center',
+  },
 });

package/src/navigations/SharedStack.js

@@ -12,7 +12,7 @@ import Routes from '../utils/Route';
 const Stack = createStackNavigator();
 const SharedStack = memo(() => {
   const t = useTranslations();
-  const navigation = useNavigation();
+  const { toggleDrawer, goBack } = useNavigation();
   const { params } = useRoute();
   return (
     <Stack.Navigator>
@@ -21,15 +21,17 @@ const SharedStack = memo(() => {
         component={Shared}
         options={{
           title: t('text_shared_with_me'),
-          headerLeft: () =>
-            params?.isMainSource && (
-              <TouchableOpacity
-                style={styles.btnMenu}
-                onPress={() => navigation.toggleDrawer()}
-              >
-                <Icon name={'menu'} color={Colors.Black} />
-              </TouchableOpacity>
-            ),
+          headerLeft: () => (
+            <TouchableOpacity
+              style={styles.btnMenu}
+              onPress={() => (params?.isMainSource ? toggleDrawer() : goBack())}
+            >
+              <Icon
+                name={params?.isMainSource ? 'menu' : 'arrow-left'}
+                color={Colors.Black}
+              />
+            </TouchableOpacity>
+          ),
           headerTitleAlign: 'left',
           headerStyle: {
             backgroundColor: Colors.Gray2,

package/src/screens/AddCommon/SelectSubUnit.js

@@ -17,11 +17,13 @@ const AddCommonSelectSubUnit = ({ route }) => {
   const t = useTranslations();
   const navigation = useNavigation();
   const isFocused = useIsFocused();
-  const { addType, unit_id } = route.params;
+  const { addType, unit_id, sensor_data, listSelectDevice, smart_account_id } =
+    route.params;
   const [selectedIndex, setSelectedIndex] = useState(-1);
   const [unit, setUnit] = useState([]);
   const [title, setTitle] = useState('');
   const [subTitle, setSubTitle] = useState('');
+  const [nameSubUnit, setNameSubUnit] = useState('');
 
   useEffect(() => {
     switch (addType) {
@@ -72,6 +74,10 @@ const AddCommonSelectSubUnit = ({ route }) => {
         navigation.navigate(Routes.SmartAccountConnecting, {
           listSensorIds: route.params.listSensorIds,
           station: subUnits[selectedIndex]?.id,
+          nameSubUnit: nameSubUnit,
+          sensor_data: sensor_data,
+          listSelectDevice: listSelectDevice,
+          smart_account_id: smart_account_id,
         });
         break;
       case 'AddVconnexDevice':
@@ -95,9 +101,14 @@ const AddCommonSelectSubUnit = ({ route }) => {
     unit?.name,
     unit.user_id,
     route.params,
+    nameSubUnit,
+    sensor_data,
+    listSelectDevice,
+    smart_account_id,
   ]);
 
   const handleSelectIndex = (index) => {
+    setNameSubUnit(subUnits[index].name);
     if (index !== selectedIndex) {
       setSelectedIndex(index);
     } else {

package/src/screens/AddNewGateway/AddNewGatewayStyles.js

@@ -1,10 +1,15 @@
-import { StyleSheet } from 'react-native';
+import { StyleSheet, StatusBar, Platform } from 'react-native';
 import { Colors } from '../../configs';
 
 export default StyleSheet.create({
   wrap: {
     flex: 1,
     backgroundColor: Colors.Gray2,
+    ...Platform.select({
+      android: {
+        paddingTop: StatusBar.currentHeight,
+      },
+    }),
   },
   textHeader: {
     marginTop: 16,

package/src/screens/AllCamera/index.js

@@ -59,7 +59,7 @@ const AllCamera = () => {
     navigate(Routes.PlaybackCamera, { item, thumbnail });
   };
 
-  const CameraItem = ({ item }) => {
+  const CameraItem = ({ item, width, height }) => {
     return (
       <View style={styles.wrap}>
         {!!item && (
@@ -74,6 +74,8 @@ const AllCamera = () => {
             amount={amount}
             handleFullScreen={handleFullScreen}
             goToPlayBack={goToPlayBack(item, thumbnail)}
+            width={width}
+            height={height}
           />
         )}
       </View>
@@ -88,12 +90,32 @@ const AllCamera = () => {
         ) : amount === 4 ? (
           <>
             <View style={styles.row}>
-              <CameraItem key={item?.id} item={item[0]} />
-              <CameraItem key={item?.id} item={item[1]} />
+              <CameraItem
+                key={item?.id}
+                item={item[0]}
+                width={188}
+                height={112}
+              />
+              <CameraItem
+                key={item?.id}
+                item={item[1]}
+                width={188}
+                height={112}
+              />
             </View>
             <View style={styles.row}>
-              <CameraItem key={item?.id} item={item[2]} />
-              <CameraItem key={item?.id} item={item[3]} />
+              <CameraItem
+                key={item?.id}
+                item={item[2]}
+                width={188}
+                height={112}
+              />
+              <CameraItem
+                key={item?.id}
+                item={item[3]}
+                width={188}
+                height={112}
+              />
             </View>
           </>
         ) : (

package/src/screens/Device/EditDevice/index.js

@@ -23,7 +23,7 @@ const EditDevice = memo(() => {
   const navigation = useNavigation();
   const { params = {} } = useRoute();
   const { sensor, setSensorNameDetail, sensorNameDetail } = params;
-  const [inputName, setInputName] = useState('');
+  const [inputName, setInputName] = useState(sensorNameDetail || '');
   const [sensorName, setSensorName] = useState(sensorNameDetail || '');
   const { stateAlertAction, hideAlertAction, onShowRename, onShowDelete } =
     useEditDevice();
@@ -130,8 +130,8 @@ const EditDevice = memo(() => {
       >
         {!stateAlertAction.isDelete && (
           <_TextInput
-            onChange={(text) => setInputName(text)}
-            defaultValue={sensorName}
+            onChange={setInputName}
+            value={inputName}
             textInputStyle={styles.textInputStyle}
             wrapStyle={styles.textInputWrapStyle}
             selectionColor={Colors.Primary}

package/src/screens/ScriptDetail/Styles/indexStyles.js

@@ -159,4 +159,7 @@ export default StyleSheet.create({
   paddingRight4: {
     paddingRight: 4,
   },
+  flex1: {
+    flex: 1,
+  },
 });

package/src/screens/ScriptDetail/index.js

@@ -269,7 +269,12 @@ const ScriptDetail = ({ route }) => {
               >
                 {item?.unit_name}
               </Text>
-              <Text numberOfLines={1} type="Label" color={Colors.Gray7}>
+              <Text
+                numberOfLines={1}
+                type="Label"
+                color={Colors.Gray7}
+                style={styles.flex1}
+              >
                 {item?.station_name}
               </Text>
             </View>

package/src/screens/SubUnit/AddSubUnit.js

@@ -13,7 +13,6 @@ import {
   SafeAreaView,
 } from 'react-native';
 import { useNavigation } from '@react-navigation/native';
-import ImageResizer from 'react-native-image-resizer';
 import { useTranslations } from '../../hooks/Common/useTranslations';
 
 import { API, Colors } from '../../configs';
@@ -26,26 +25,6 @@ import { ToastBottomHelper } from '../../utils/Utils';
 import { TESTID } from '../../configs/Constants';
 import styles from './AddSubUnitStyles';
 
-const MAX_FILE_SIZE_BYTES = 1.5 * 1024 * 1024; // 1.5mb
-
-const prepareImageToUpload = async (image) => {
-  if (!image || image.size < MAX_FILE_SIZE_BYTES) {
-    return image;
-  }
-  const result = await ImageResizer.createResizedImage(
-    image.path,
-    1280,
-    1280,
-    'JPEG',
-    70
-  );
-  return {
-    fileName: result?.name,
-    type: 'image/jpeg',
-    uri: result?.uri,
-  };
-};
-
 const AddSubUnit = ({ route }) => {
   const t = useTranslations();
   const { navigate, goBack } = useNavigation();
@@ -56,6 +35,13 @@ const AddSubUnit = ({ route }) => {
   const [showImagePicker, setShowImagePicker] = useState(false);
   let awaitCreate = useRef(false);
 
+  const cleanData = () => {
+    setRoomName('');
+    setWallpaper('');
+    setImageUrl('');
+    awaitCreate.current = false;
+  };
+
   const goDone = useCallback(async () => {
     if (isAddUnit) {
       if (!awaitCreate.current) {
@@ -65,7 +51,6 @@ const AddSubUnit = ({ route }) => {
           address: location,
           background: wallpaper,
         };
-        dataObj.background = await prepareImageToUpload(dataObj.background);
         const formData = createFormData(dataObj, ['background']);
         const { success, data } = await axiosPost(
           API.UNIT.CREATE_UNIT(),
@@ -82,6 +67,7 @@ const AddSubUnit = ({ route }) => {
               routeName: Routes.DashboardStack,
             },
           });
+          cleanData();
         } else {
           awaitCreate.current = false;
           ToastBottomHelper.error(t('text_create_unit_fail'));
@@ -91,9 +77,8 @@ const AddSubUnit = ({ route }) => {
       if (!awaitCreate.current) {
         awaitCreate.current = true;
         const dataObj = { name: roomName, background: wallpaper };
-        dataObj.background = await prepareImageToUpload(dataObj.background);
         const formData = createFormData(dataObj, ['background']);
-        const { success, data } = await axiosPost(
+        const { success } = await axiosPost(
           API.SUB_UNIT.CREATE_SUB_UNIT(unit.id),
           formData,
           {
@@ -115,10 +100,12 @@ const AddSubUnit = ({ route }) => {
             screen: Routes.UnitDetail,
             params: {
               unitId: unit.id,
-              unitData: data,
+              unitData: unit,
               isAddSubUnit: true,
+              routeName: Routes.DashboardStack,
             },
           });
+          cleanData();
         } else {
           awaitCreate.current = false;
           ToastBottomHelper.error(t('text_create_sub_unit_fail'));
@@ -188,6 +175,7 @@ const AddSubUnit = ({ route }) => {
                 textInputStyle={styles.roomName}
                 wrapStyle={styles.textInput}
                 selectionColor={Colors.Primary}
+                value={roomName}
               />
 
               {isAddUnit && (

package/src/screens/SubUnit/__test__/AddSubUnit.test.js

@@ -161,7 +161,8 @@ describe('Test AddSubUnit', () => {
       screen: Routes.UnitDetail,
       params: {
         unitId: route.params.unit.id,
-        unitData: response.data,
+        unitData: route.params.unit,
+        routeName: 'DashboardStack',
         isAddSubUnit: true,
       },
     });

package/src/screens/TDSGuide/index.js

@@ -22,12 +22,12 @@ const TDSGuide = memo(() => {
         >
           {t('what_is_tds_title')}
         </Text>
-        <Text type="Body">{t('what_is_tds_text')}</Text>
+        <Text style={styles.tdsText}>{t('what_is_tds_text')}</Text>
         <Text type="H3" semibold style={styles.titlePadding}>
           {t('tds_guidlines_title')}
         </Text>
         <>
-          <Text type="Body">
+          <Text style={styles.tdsText}>
             {t('tds_guidlines_text_1')}
             {'\n'}
             {'\n'}
@@ -56,4 +56,7 @@ const styles = StyleSheet.create({
     paddingTop: 20,
     paddingBottom: 10,
   },
+  tdsText: {
+    fontSize: 15,
+  },
 });

package/src/screens/Unit/Detail.js

@@ -30,7 +30,9 @@ import { AUTOMATE_TYPE } from '../../configs/Constants';
 
 const UnitDetail = ({ route }) => {
   const t = useTranslations();
+
   const { unitId, unitData, isOneTap, routeName, isAddSubUnit } = route.params;
+
   const isFocused = useIsFocused();
   const { stateData, setAction } = useContext(SCContext);
   const { navigate } = useNavigation();
@@ -253,13 +255,14 @@ const UnitDetail = ({ route }) => {
   };
 
   const renderDetailSubUnit = () => {
-    if (station.isFavorites) {
+    if (station?.isFavorites) {
       return (
         <SubUnitFavorites
           unit={unit}
           isOwner={isOwner}
           favorites={favorites}
           wrapItemStyle={styles.wrapItemStyle}
+          isGGHomeConnected={isGGHomeConnected}
         />
       );
     }

package/src/screens/WaterQualityGuide/index.js

@@ -450,9 +450,9 @@ const styles = StyleSheet.create({
     position: 'absolute',
     fontSize: 20,
     transform: [{ rotate: '90deg' }],
-    left: -28,
+    left: -40,
     bottom: 8,
-    width: 115,
+    width: 150,
     height: 28,
     textAlign: 'center',
   },

package/src/utils/Apis/axios.js

@@ -2,7 +2,6 @@ import axios from 'axios';
 import { deleteData, getData, storeData } from '../Storage';
 import { ToastBottomHelper } from '../Utils';
 import NetInfo from '@react-native-community/netinfo';
-import { Platform } from 'react-native';
 
 export const replaceParams = (apiURL, params) => {
   let _result = apiURL;
@@ -166,9 +165,9 @@ export function createFormData(data, list_file_field) {
       }
 
       formData.append(key, {
-        uri: Platform.OS === 'ios' ? item.sourceURL : item.path,
-        type: item.mime,
         name: item.filename || item.path?.split('/').pop(),
+        type: item.mime,
+        uri: item.path,
       });
       return;
     }