@eohjsc/react-native-smart-city 0.2.64 → 0.2.65

package/package.json

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

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/SubUnit/AddSubUnit.js

@@ -56,6 +56,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) {
@@ -82,6 +89,7 @@ const AddSubUnit = ({ route }) => {
               routeName: Routes.DashboardStack,
             },
           });
+          cleanData();
         } else {
           awaitCreate.current = false;
           ToastBottomHelper.error(t('text_create_unit_fail'));
@@ -93,7 +101,7 @@ const AddSubUnit = ({ route }) => {
         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 +123,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 +198,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/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,7 +255,7 @@ const UnitDetail = ({ route }) => {
   };
 
   const renderDetailSubUnit = () => {
-    if (station.isFavorites) {
+    if (station?.isFavorites) {
       return (
         <SubUnitFavorites
           unit={unit}

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',
   },