ふぁぼが空の時にクラッシュしていた問題を修正

This commit is contained in:
harukin-DeskMini 2023-02-06 12:06:21 +09:00
parent 3137d50e24
commit 655f174321
3 changed files with 20 additions and 4 deletions

21
App.js
View File

@ -67,7 +67,7 @@ export default function App() {
return ( return (
<NavigationContainer name="Root" style={{ flex: 1 }}> <NavigationContainer name="Root" style={{ flex: 1 }}>
<Tab.Navigator> <Tab.Navigator detachInactiveScreens={false}>
<Tab.Screen <Tab.Screen
name="login" name="login"
options={{ options={{
@ -228,7 +228,24 @@ const Top = ({
</Stack.Navigator> </Stack.Navigator>
); );
}; };
function MenuPage({ favoriteStation, setFavoriteStation, busAndTrainData }) { function MenuPage({
navigation,
favoriteStation,
setFavoriteStation,
busAndTrainData,
}) {
useEffect(() => {
const unsubscribe = navigation.addListener("tabPress", (e) => {
AS.getItem("favoriteStation")
.then((d) => {
const returnData = JSON.parse(d);
setFavoriteStation(returnData);
})
.catch((d) => console.log(d));
});
return unsubscribe;
}, [navigation]);
return ( return (
<Stack.Navigator> <Stack.Navigator>
<Stack.Screen <Stack.Screen

View File

@ -37,7 +37,6 @@ export const StationDeteilView = (props) => {
}); });
if (data.length == 0) { if (data.length == 0) {
setTrainBus(); setTrainBus();
return () => {};
} }
setTrainBus(data[0]); setTrainBus(data[0]);
}, [currentStation]); }, [currentStation]);

View File

@ -211,7 +211,7 @@ export default function Menu(props) {
); );
}} }}
/> />
{(currentStation || originalStationList) && ( {locationAndFavorite.length != 0 && originalStationList && (
<LED_vision <LED_vision
station={ station={
originalStationList && originalStationList &&