|
|
@@ -16,7 +16,10 @@ import { SplashScreen } from "expo";
|
|
|
import * as Font from "expo-font";
|
|
|
import { Ionicons } from "@expo/vector-icons";
|
|
|
import { NavigationContainer } from "@react-navigation/native";
|
|
|
-import { createStackNavigator } from "@react-navigation/stack";
|
|
|
+import {
|
|
|
+ createStackNavigator,
|
|
|
+ CardStyleInterpolators,
|
|
|
+} from "@react-navigation/stack";
|
|
|
import Dialog from "./components/Dialog";
|
|
|
|
|
|
import { useModel } from "flooks";
|
|
|
@@ -30,11 +33,6 @@ import { navigationRef } from "./navigation/RootNavigation";
|
|
|
|
|
|
import * as ApplyStatus from "./config/ApplyStatus";
|
|
|
|
|
|
-import {
|
|
|
- createStackNavigator,
|
|
|
- CardStyleInterpolators,
|
|
|
-} from "@react-navigation/stack";
|
|
|
-
|
|
|
const Stack = createStackNavigator();
|
|
|
|
|
|
const config = {
|
|
|
@@ -78,18 +76,20 @@ export default function App(props) {
|
|
|
loadResourcesAndDataAsync();
|
|
|
}, [props.skipLoadingScreen]);
|
|
|
|
|
|
- const initialRouteName = React.useMemo(() => {
|
|
|
- console.log(isLogin);
|
|
|
+ const [initialRouteName, setInitialRouteName] = React.useState("");
|
|
|
+ React.useEffect(() => {
|
|
|
if (isLogin) {
|
|
|
if (status !== "PASS") {
|
|
|
- return "Guide";
|
|
|
+ setInitialRouteName("Guide");
|
|
|
} else {
|
|
|
- return "Root";
|
|
|
+ setInitialRouteName("Root");
|
|
|
}
|
|
|
} else {
|
|
|
- return "Login";
|
|
|
+ setInitialRouteName("Login");
|
|
|
}
|
|
|
- }, [isLogin, status]);
|
|
|
+ }, [isLogin, guideStep]);
|
|
|
+
|
|
|
+
|
|
|
|
|
|
if (!isLoadingComplete && !props.skipLoadingScreen) {
|
|
|
return null;
|