Make QR Tips not polled when on other screens

moved function to useEffect instead on QrScanner Screen
This commit is contained in:
2024-08-16 11:18:56 +08:00
parent 47898d1489
commit 13dd88cd66

View File

@@ -8,6 +8,7 @@ import ScannedDataBox from '../components/ScannedDataBox';
import { scanQRCode, getQRTips } from '../api/qrCodeAPI'; import { scanQRCode, getQRTips } from '../api/qrCodeAPI';
import SettingsScreen from './SettingsScreen'; import SettingsScreen from './SettingsScreen';
import NetInfo from '@react-native-community/netinfo'; import NetInfo from '@react-native-community/netinfo';
import { useFocusEffect } from '@react-navigation/native';
const { width: screenWidth, height: screenHeight } = Dimensions.get('window'); const { width: screenWidth, height: screenHeight } = Dimensions.get('window');
@@ -27,8 +28,6 @@ const QRScannerScreen: React.FC<{ clearScanData: () => void }> = ({ clearScanDat
const { hasPermission, requestPermission } = useCameraPermission(); const { hasPermission, requestPermission } = useCameraPermission();
const device = useCameraDevice('back'); const device = useCameraDevice('back');
// Fetch QR Tips and manage polling
useEffect(() => {
const fetchTips = async () => { const fetchTips = async () => {
try { try {
const response = await getQRTips(); const response = await getQRTips();
@@ -38,13 +37,16 @@ const QRScannerScreen: React.FC<{ clearScanData: () => void }> = ({ clearScanDat
} }
}; };
requestPermission(); // Request camera permission on component mount // Only run when the screen is focusd
useFocusEffect(
React.useCallback(() => {
requestPermission(); // Request camera permission when screen is focused
// Initial fetch for QR tips // Initial fetch for QR tips
fetchTips(); fetchTips();
// Set interval for fetching QR tips every 5 seconds // Set interval for fetching QR tips every 6 seconds
const intervalId = setInterval(fetchTips, 10000); const intervalId = setInterval(fetchTips, 6000);
// Subscribe to network state updates // Subscribe to network state updates
const unsubscribe = NetInfo.addEventListener(state => { const unsubscribe = NetInfo.addEventListener(state => {
@@ -54,12 +56,12 @@ const QRScannerScreen: React.FC<{ clearScanData: () => void }> = ({ clearScanDat
} }
}); });
// Cleanup on component unmount
return () => { return () => {
clearInterval(intervalId); // Clear interval clearInterval(intervalId); // Clear interval when screen is unfocused
unsubscribe(); // Unsubscribe from network state updates unsubscribe(); // Unsubscribe from network state updates
}; };
}, []); }, [])
);
const showScannedDataBox = () => { const showScannedDataBox = () => {
setIsScannedDataBoxVisible(true); setIsScannedDataBoxVisible(true);
@@ -79,6 +81,7 @@ const QRScannerScreen: React.FC<{ clearScanData: () => void }> = ({ clearScanDat
setIsScannedDataBoxVisible(false); setIsScannedDataBoxVisible(false);
}); });
}; };
const clearSelectedQrCodeData = () => { const clearSelectedQrCodeData = () => {
console.log("!!!!!clearSelectedQrCodeData"); console.log("!!!!!clearSelectedQrCodeData");
setQRCodeId(null); setQRCodeId(null);
@@ -166,7 +169,6 @@ const QRScannerScreen: React.FC<{ clearScanData: () => void }> = ({ clearScanDat
if (!device) { if (!device) {
return <Text>Loading camera...</Text>; return <Text>Loading camera...</Text>;
} }
return ( return (
<View style={styles.container}> <View style={styles.container}>
{/* Banner for network connectivity */} {/* Banner for network connectivity */}
@@ -299,7 +301,7 @@ const styles = StyleSheet.create({
borderRadius: 10, borderRadius: 10,
overflow: 'hidden', overflow: 'hidden',
alignSelf: 'center', alignSelf: 'center',
marginTop: '10%', marginTop: '1%',
}, },
settingsButton: { settingsButton: {
position: 'absolute', position: 'absolute',