fix(pages): fix guide page and privacy popup

Author: bingling-sama

src/app/auth/guide.tsx

@@ -46,7 +46,7 @@ const GuidePage: FC = () => {
   const [toVisible, setToVisible] = useState<boolean>(true);
   const currentStyle = useVisualScheme(state => state.currentStyle);
   const [reachedLastPage, setReachedLastPage] = useState<boolean>(false);
-  const { agreement, setAgreement } = usePrivacy();
+  const { hydrated, agreement, setAgreement } = usePrivacy();
   const gradientValue = useSharedValue(0);
   // eslint-disable-next-line unused-imports/no-unused-vars
   const timeoutFn = (activeIndex: number, timeout: number) => {
@@ -59,7 +59,7 @@ const GuidePage: FC = () => {
 
   useFocusEffect(
     useCallback(() => {
-      if (!agreement) {
+      if (hydrated && !agreement) {
         Modal.show({
           children: <AgreementModal />,
           mode: 'middle',
@@ -86,7 +86,7 @@ const GuidePage: FC = () => {
         });
       }
       return () => {};
-    }, [])
+    }, [hydrated, agreement])
   );
 
   useEffect(() => {

src/app/index.tsx

@@ -1,4 +1,4 @@
-import { Href, Redirect, SplashScreen } from 'expo-router';
+import { router, SplashScreen } from 'expo-router';
 import { getItem, setItem } from 'expo-secure-store';
 import * as React from 'react';
 import { Platform } from 'react-native';
@@ -8,61 +8,45 @@ import useCourse from '@/store/course';
 import { setupGlobalErrorHandler } from '@/utils/errorHandler';
 import { updateCourseData } from '@/utils/updateWidget';
 
-// 由于 expo 没有 initialRoutes
-// 重定向到 tabs
-// 详情见 issue: https://github.com/expo/router/issues/763#issuecomment-1635316964
 const Index = () => {
-  const [initialRoute, setInitialRoute] = React.useState<string | null>(null);
   const hydrated = useCourse(state => state.hydrated);
+  const initialized = React.useRef(false);
 
   React.useEffect(() => {
-    // if (__DEV__) {
-    //   //console.log('mock server setup');
-    //   setupMockServer();
-    // }
+    if (!hydrated || initialized.current) return;
+    initialized.current = true;
 
     const init = async () => {
-      const firstLaunch = await getItem('firstLaunch');
-
-      const token = await getItem('longToken');
-
-      // 设置全局错误处理器
-      setupGlobalErrorHandler();
-      // 等待 AsyncStorage 加载
-      if (hydrated) await SplashScreen.hideAsync();
-      if (!token) {
-        if (firstLaunch === null) {
-          // 是首次启动，设置标记并跳转到guide
-          setItem('firstLaunch', 'false');
-          setInitialRoute('/auth/guide');
-        } else {
-          if (Platform.OS === 'android') {
-            updateCourseData()
-              .then(() => {
-                console.log('updateWidget');
-              })
-              .catch(error => {
-                console.error('更新小组件失败:', error);
-              });
+      try {
+        const firstLaunch = await getItem('firstLaunch');
+        const token = await getItem('longToken');
+
+        setupGlobalErrorHandler();
+        await SplashScreen.hideAsync();
+
+        if (!token) {
+          if (firstLaunch === null) {
+            setItem('firstLaunch', 'false');
+            console.log('首次启动，跳转到引导页');
+            router.replace('/auth/guide');
+          } else if (Platform.OS === 'android') {
+            updateCourseData().catch(error =>
+              console.error('更新小组件失败:', error)
+            );
+          } else {
+            router.replace('/auth/login');
           }
-
-          // 不是首次启动但没有token，去登录
-          setInitialRoute('/auth/guide');
+        } else {
+          router.replace('/(tabs)');
         }
-      } else {
-        // 有token直接进入主页
-        setInitialRoute('/(tabs)');
+      } catch (error) {
+        console.error('初始化失败:', error);
       }
     };
 
-    SplashScreen.preventAutoHideAsync();
     init();
   }, [hydrated]);
 
-  if (!initialRoute) {
-    return null;
-  }
-
-  return <Redirect href={initialRoute as Href}></Redirect>;
+  return null;
 };
 export default Index;

src/store/privacy.ts

@@ -3,6 +3,8 @@ import { create } from 'zustand';
 import { createJSONStorage, persist } from 'zustand/middleware';
 
 interface PrivacyState {
+  hydrated: boolean;
+  setHydrated: (hydrated: boolean) => void;
   agreement: boolean;
   setAgreement: (_agreement: boolean) => void;
 }
@@ -11,13 +13,20 @@ const usePrivacy = create<PrivacyState>()(
   persist(
     set => {
       return {
+        hydrated: false,
+        setHydrated: (hydrated: boolean) => set({ hydrated }),
         agreement: false,
         setAgreement: (agreement: boolean) => set({ agreement }),
       };
     },
     {
       name: 'agreement',
       storage: createJSONStorage(() => AsyncStorage),
+      onRehydrateStorage: state => {
+        return () => {
+          state?.setHydrated(true);
+        };
+      },
     }
   )
 );