@eohjsc/react-native-smart-city 0.3.17 → 0.3.18

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@eohjsc/react-native-smart-city",
   "title": "React Native Smart Home",
-  "version": "0.3.17",
+  "version": "0.3.18",
   "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/screens/AddCommon/SelectSubUnit.js

@@ -64,7 +64,7 @@ const AddCommonSelectSubUnit = ({ route }) => {
   const fetchDetails = useCallback(async () => {
     const { success, data } = await axiosGet(
       API.UNIT.UNIT_DETAIL(unit_id),
-      {},
+      { headers: { 'Cache-Control': 'no-cache' } },
       true
     );
     if (success) {

package/src/screens/AddNewDevice/hooks/ConnectDevices.js

@@ -13,7 +13,7 @@ const useConnectDevices = (new_sensor, station_id, unit_id) => {
   const fetchDetails = useCallback(async () => {
     const { success: fetchSuccess, data: unit } = await axiosGet(
       API.UNIT.UNIT_DETAIL(unit_id),
-      {},
+      { headers: { 'Cache-Control': 'no-cache' } },
       true
     );
     const station = unit.stations.find((item) => item.id === station_id);

package/src/screens/AddNewDevice/index.js

@@ -27,7 +27,7 @@ const AddNewDevice = memo(({ route }) => {
   const fetchDetails = useCallback(async () => {
     const { success, data } = await axiosGet(
       API.UNIT.UNIT_DETAIL(unit_id),
-      {},
+      { headers: { 'Cache-Control': 'no-cache' } },
       true
     );
     if (success) {

package/src/screens/AddNewGateway/hooks/index.js

@@ -9,7 +9,7 @@ const useConnectGateway = (unit_id) => {
   const fetchDetails = useCallback(async () => {
     const { success: fetchSuccess, data: unit } = await axiosGet(
       API.UNIT.UNIT_DETAIL(unit_id),
-      {},
+      { headers: { 'Cache-Control': 'no-cache' } },
       true
     );
     return { fetchSuccess, unit };

package/src/screens/SubUnit/hooks/useManageSubUnit.js

@@ -11,7 +11,7 @@ export default (unit) => {
     setIsLoading(true);
     const { success, data } = await axiosGet(
       API.UNIT.UNIT_DETAIL(unit?.id),
-      {},
+      { headers: { 'Cache-Control': 'no-cache' } },
       true
     );
     if (success) {

package/src/screens/SyncLGDevice/AddLGDevice.js

@@ -24,7 +24,7 @@ const AddLGDevice = memo(({ route }) => {
   const fetchDetails = useCallback(async () => {
     const { success, data } = await axiosGet(
       API.UNIT.UNIT_DETAIL(unit_id),
-      {},
+      { headers: { 'Cache-Control': 'no-cache' } },
       true
     );
     if (success) {

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,

package/src/screens/UnitSummary/index.js

@@ -93,7 +93,7 @@ const UnitSummary = memo(({ route }) => {
   const fetchUnitDetail = useCallback(async () => {
     const { success, data } = await axiosGet(
       API.UNIT.UNIT_DETAIL(unit?.id),
-      {},
+      { headers: { 'Cache-Control': 'no-cache' } },
       true
     );
     if (success) {