Merge commit '655f174321ccfe35b1631adf568f590dc6286b03' into develop

App.js

@@ -67,7 +67,7 @@ export default function App() {
 
   return (
     <NavigationContainer name="Root" style={{ flex: 1 }}>
-      <Tab.Navigator>
+      <Tab.Navigator detachInactiveScreens={false}>
         <Tab.Screen
           name="login"
           options={{
@@ -228,7 +228,24 @@ const Top = ({
     </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 (
     <Stack.Navigator>
       <Stack.Screen

components/ActionSheetComponents/StationDeteilView.js

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

menu.js

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