@eohjsc/react-native-smart-city 0.2.22 → 0.2.23

package/package.json

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

package/src/commons/Modal/ModalFullVideo.js

@@ -13,6 +13,7 @@ const ModalFullVideo = ({
   data,
   resizeMode = 'cover',
   onClose,
+  uri,
 }) => {
   useEffect(() => {
     // eslint-disable-next-line react-hooks/rules-of-hooks
@@ -27,7 +28,7 @@ const ModalFullVideo = ({
     >
       <View style={styles.modalContent}>
         <MediaPlayerDetail
-          uri={data?.uri}
+          uri={uri || data?.uri}
           thumbnail={data?.thumbnail}
           style={styles.camera}
           wrapStyles={styles.wrapStyles}

package/src/commons/UnitSummary/AirQuality/index.js

@@ -1,5 +1,5 @@
 import React, { memo, useCallback, useMemo, useState } from 'react';
-import { StyleSheet, TouchableOpacity, View } from 'react-native';
+import { TouchableOpacity, View } from 'react-native';
 import { IconOutline } from '@ant-design/icons-react-native';
 import { useTranslations } from '../../../hooks/Common/useTranslations';
 
@@ -10,6 +10,7 @@ import ConfigHistoryChart from '../ConfigHistoryChart';
 
 import SegmentedRoundDisplay from './SegmentedRoundDisplay';
 import { TESTID } from '../../../configs/Constants';
+import styles from './styles';
 
 const AirQuality = memo(({ summaryDetail }) => {
   const t = useTranslations();
@@ -124,14 +125,6 @@ const AirQuality = memo(({ summaryDetail }) => {
             style={styles.segment}
             textHeader={t('text_air_quality_index')}
           />
-
-          <TouchableOpacity
-            style={[styles.touchStatus, { backgroundColor: outdoorColor }]}
-          >
-            <Text size={14} color={Colors.White}>
-              {outdoorStatus}
-            </Text>
-          </TouchableOpacity>
           {!!advices && !!advices.length && (
             <View style={styles.boxHealth}>
               <IconOutline name="alert" size={20} style={styles.iconMargin} />
@@ -175,113 +168,3 @@ const AirQuality = memo(({ summaryDetail }) => {
 });
 
 export default AirQuality;
-
-const styles = StyleSheet.create({
-  textIndoor: {
-    color: Colors.Gray9,
-    fontSize: 20,
-    marginBottom: 4,
-  },
-  textDesIndoor: {
-    color: Colors.Gray8,
-    fontSize: 12,
-    marginBottom: 16,
-  },
-  textNotAvailable: {
-    textAlign: 'center',
-  },
-  boxStatus: {
-    borderRadius: 10,
-    height: 80,
-    overflow: 'hidden',
-    flexDirection: 'row',
-    marginBottom: 16,
-  },
-  boxEmotion: {
-    height: 80,
-    width: 80,
-    backgroundColor: Colors.Yellow6,
-    justifyContent: 'center',
-    alignItems: 'center',
-  },
-  textStatus: {
-    fontSize: 16,
-    color: Colors.Gray9,
-    marginRight: 24,
-    textAlign: 'right',
-    maxWidth: 120,
-  },
-  boxTextStatus: {
-    backgroundColor: Colors.Yellow4,
-    flex: 1,
-    alignItems: 'flex-end',
-    justifyContent: 'center',
-  },
-  boxNumber: {
-    flexDirection: 'row',
-    justifyContent: 'space-between',
-    marginBottom: 16,
-  },
-  boxHealth: {
-    flexDirection: 'row',
-    marginBottom: 12,
-    alignItems: 'center',
-    marginTop: 10,
-  },
-  boxContentHealth: {
-    flexDirection: 'row',
-    alignItems: 'center',
-    marginBottom: 8,
-  },
-  boxDot: {
-    width: 8,
-    height: 8,
-    borderRadius: 4,
-    backgroundColor: Colors.Yellow6,
-    marginRight: 8,
-  },
-  textOutdoor: {
-    color: Colors.Gray9,
-    fontSize: 20,
-    marginBottom: 24,
-    marginTop: 16,
-  },
-  touchOption: {
-    borderWidth: 1,
-    borderColor: Colors.Gray5,
-    paddingHorizontal: 16,
-    paddingVertical: 5,
-    marginHorizontal: 4,
-    borderRadius: 2,
-  },
-  textOption: {
-    alignSelf: 'center',
-    marginBottom: 8,
-  },
-  touchStatus: {
-    borderRadius: 100,
-    paddingHorizontal: 24,
-    alignSelf: 'center',
-    paddingVertical: 3,
-    marginTop: 12,
-  },
-  segment: {
-    marginTop: 36,
-    alignSelf: 'center',
-  },
-  boxOutdoorValues: {
-    flexDirection: 'row',
-    justifyContent: 'center',
-  },
-  iconMargin: {
-    marginRight: 8,
-  },
-  historyChart: {
-    paddingHorizontal: 16,
-    backgroundColor: Colors.White,
-    borderRadius: 20,
-    borderWidth: 1,
-    borderColor: Colors.Gray4,
-    marginTop: 16,
-  },
-});

package/src/commons/UnitSummary/AirQuality/styles.js

@@ -0,0 +1,112 @@
+import { StyleSheet } from 'react-native';
+
+import { Colors } from '../../../configs';
+
+export default StyleSheet.create({
+  textIndoor: {
+    color: Colors.Gray9,
+    fontSize: 20,
+    marginBottom: 4,
+  },
+  textDesIndoor: {
+    color: Colors.Gray8,
+    fontSize: 12,
+    marginBottom: 16,
+  },
+  textNotAvailable: {
+    textAlign: 'center',
+  },
+  boxStatus: {
+    borderRadius: 10,
+    height: 80,
+    overflow: 'hidden',
+    flexDirection: 'row',
+    marginBottom: 16,
+  },
+  boxEmotion: {
+    height: 80,
+    width: 80,
+    backgroundColor: Colors.Yellow6,
+    justifyContent: 'center',
+    alignItems: 'center',
+  },
+  textStatus: {
+    fontSize: 16,
+    color: Colors.Gray9,
+    marginRight: 24,
+    textAlign: 'right',
+    maxWidth: 120,
+  },
+  boxTextStatus: {
+    backgroundColor: Colors.Yellow4,
+    flex: 1,
+    alignItems: 'flex-end',
+    justifyContent: 'center',
+  },
+  boxNumber: {
+    flexDirection: 'row',
+    justifyContent: 'space-between',
+    marginBottom: 16,
+  },
+  boxHealth: {
+    flexDirection: 'row',
+    marginBottom: 12,
+    alignItems: 'center',
+    marginTop: 36,
+  },
+  boxContentHealth: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    marginBottom: 8,
+  },
+  boxDot: {
+    width: 8,
+    height: 8,
+    borderRadius: 4,
+    backgroundColor: Colors.Yellow6,
+    marginRight: 8,
+  },
+  textOutdoor: {
+    color: Colors.Gray9,
+    fontSize: 20,
+    marginBottom: 24,
+    marginTop: 16,
+  },
+  touchOption: {
+    borderWidth: 1,
+    borderColor: Colors.Gray5,
+    paddingHorizontal: 16,
+    paddingVertical: 5,
+    marginHorizontal: 4,
+    borderRadius: 2,
+  },
+  textOption: {
+    paddingTop: 4,
+  },
+  touchStatus: {
+    borderRadius: 100,
+    paddingHorizontal: 24,
+    alignSelf: 'center',
+    paddingVertical: 3,
+    marginTop: 12,
+  },
+  segment: {
+    marginTop: 36,
+    alignSelf: 'center',
+  },
+  boxOutdoorValues: {
+    flexDirection: 'row',
+    justifyContent: 'center',
+  },
+  iconMargin: {
+    marginRight: 8,
+  },
+  historyChart: {
+    paddingHorizontal: 16,
+    backgroundColor: Colors.White,
+    borderRadius: 20,
+    borderWidth: 1,
+    borderColor: Colors.Gray4,
+    marginTop: 16,
+  },
+});

package/src/configs/Constants.js

@@ -67,6 +67,10 @@ export const Constants = {
   DEEP_LINK,
 };
 
+export const DEVICE_TYPE = {
+  LG_THINQ: 'LG_THINQ',
+};
+
 export const SCANNING_STATUS = {
   BOOKING_ACTIVATED: 'booking_activated',
   WRONG_SPOT: 'wrong_spot',

package/src/screens/Device/detail.js

@@ -37,7 +37,7 @@ import Text from '../../commons/Text';
 import { transformDatetime } from '../../utils/Converter/time';
 import { AlertAction, ButtonPopup, MenuActionMore } from '../../commons';
 import EmergencyButton from '../../commons/Device/Emergency/EmergencyButton';
-import { TESTID } from '../../configs/Constants';
+import { DEVICE_TYPE, TESTID } from '../../configs/Constants';
 import FooterInfo from '../../commons/Device/FooterInfo';
 import Routes from '../../utils/Route';
 import { sendRemoteCommand } from '../../iot/RemoteControl';
@@ -381,13 +381,10 @@ const DeviceDetail = ({ account, route }) => {
         return <DisconnectedView sensor={sensor} />;
       }
     } else {
-      if (isGGHomeConnected) {
+      if (sensor.device_type === DEVICE_TYPE.LG_THINQ) {
         return (
           <>
-            <ConnectedViewHeader
-              lastUpdated={lastUpdated}
-              type={'GoogleHome'}
-            />
+            <ConnectedViewHeader lastUpdated={lastUpdated} />
             {display.items.map((item) => (
               <SensorDisplayItem
                 testID={TESTID.SENSOR_DISPLAY_ITEM}
@@ -404,7 +401,31 @@ const DeviceDetail = ({ account, route }) => {
           </>
         );
       } else {
-        return <DisconnectedView sensor={sensor} type={'GoogleHome'} />;
+        if (isGGHomeConnected) {
+          return (
+            <>
+              <ConnectedViewHeader
+                lastUpdated={lastUpdated}
+                type={'GoogleHome'}
+              />
+              {display.items.map((item) => (
+                <SensorDisplayItem
+                  testID={TESTID.SENSOR_DISPLAY_ITEM}
+                  key={item.id.toString()}
+                  item={item}
+                  emergency={onEmergencyButtonPress}
+                  sensor={sensor}
+                  getData={getData}
+                  maxValue={maxValue}
+                  offsetTitle={offsetTitle}
+                  setOffsetTitle={setOffsetTitle}
+                />
+              ))}
+            </>
+          );
+        } else {
+          return <DisconnectedView sensor={sensor} type={'GoogleHome'} />;
+        }
       }
     }
   };

package/src/screens/PlayBackCamera/index.js

@@ -176,6 +176,7 @@ const PlayBackCamera = () => {
         data={dataFullScreen}
         modalStyles={styles.modal}
         onClose={onClose}
+        uri={uri}
       />
 
       <ModalCustom isVisible={isShowDate} style={styles.modal}>