From 44ff7ce36d016c38e6918b916cc642f98f2b85cb Mon Sep 17 00:00:00 2001
From: jinyaqiu <jinyaqiu@fairclip.cn>
Date: Thu, 17 Jul 2025 20:16:35 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/(tabs)/index.tsx          | 157 ++++++++++------------------------
 app/(tabs)/owner.tsx          |   7 +-
 components/owner/resource.tsx |   8 +-
 3 files changed, 54 insertions(+), 118 deletions(-)

diff --git a/app/(tabs)/index.tsx b/app/(tabs)/index.tsx
index dccdf2a..5fd34c8 100644
--- a/app/(tabs)/index.tsx
+++ b/app/(tabs)/index.tsx
@@ -1,88 +1,26 @@
 import IP from '@/assets/icons/svg/ip.svg';
-import * as MediaLibrary from 'expo-media-library';
+import { checkAuthStatus } from '@/lib/auth';
 import { useRouter } from 'expo-router';
-import * as SecureStore from 'expo-secure-store';
-import React, { useEffect, useRef, useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { Platform, Text, TouchableOpacity, View } from 'react-native';
+import { Text, TouchableOpacity, View } from 'react-native';
 import { useSafeAreaInsets } from "react-native-safe-area-context";
-import MemoList from './memo-list';
 
 export default function HomeScreen() {
     const router = useRouter();
     const { t } = useTranslation();
     const insets = useSafeAreaInsets();
     const [isLoading, setIsLoading] = useState(true);
-    const [isLoggedIn, setIsLoggedIn] = useState(false);
-    const [token, setToken] = useState('');
-    const tokenInterval = useRef<NodeJS.Timeout | number>(null);
-    const isMounted = useRef(true);
-
-    const getAuthToken = async (): Promise<string> => {
-        let tokenValue = '';
-        if (Platform.OS === 'web') {
-            tokenValue = localStorage.getItem('token') || '';
-        } else {
-            tokenValue = (await SecureStore.getItemAsync('token')) || '';
-        }
-        setToken(tokenValue); // 只在获取到新token时更新状态
-        return tokenValue;
-    };
 
     useEffect(() => {
-        const checkAuthStatus = async () => {
-            try {
-                const loggedIn = !!token;
-                setIsLoggedIn(loggedIn);
-
-                if (loggedIn) {
-                    // 已登录，请求必要的权限
-                    const { status } = await MediaLibrary.requestPermissionsAsync();
-                    if (status === 'granted') {
-                        console.log('Media library permission granted in HomeScreen.');
-                    }
-                    router.replace('/ask');
-                }
-                setIsLoading(false);
-            } catch (error) {
-                console.error('检查登录状态出错:', error);
-                setIsLoading(false);
-            } finally {
-                setIsLoading(false);
-            }
-        };
-        checkAuthStatus();
+        setIsLoading(true);
+        checkAuthStatus(router, () => {
+            router.replace('/ask')
+        }).then(() => {
+            setIsLoading(false);
+        });
     }, []);
 
-    // 轮询获取token
-    useEffect(() => {
-        // 如果已经有token，直接返回
-        if (token) {
-            if (tokenInterval.current) {
-                clearInterval(tokenInterval.current);
-            }
-            return;
-        }
-        if (!tokenInterval.current) return;
-        // 设置轮询 
-        tokenInterval.current = setInterval(async () => {
-            if (isMounted.current) {
-                const currentToken = await getAuthToken();
-                // 如果获取到token，清除定时器
-                if (currentToken && tokenInterval.current) {
-                    clearInterval(tokenInterval.current);
-                }
-            }
-        }, 5000);
-
-        // 返回清理函数
-        return () => {
-            if (tokenInterval.current) {
-                clearInterval(tokenInterval.current);
-            }
-        };
-    }, [token]); // 添加token作为依赖
-
     if (isLoading) {
         return (
             <View className="flex-1 bg-bgPrimary justify-center items-center">
@@ -93,49 +31,46 @@ export default function HomeScreen() {
 
     return (
         <View className="flex-1">
-            {
-                isLoggedIn ? <MemoList /> :
-                    <View className="flex-1 bg-bgPrimary px-[1rem] h-screen overflow-auto py-[2rem] " style={{ paddingTop: insets.top + 48 }}>
-                        {/* 标题区域 */}
-                        <View className="mb-10 w-full px-5">
-                            <Text className="text-white text-3xl font-bold mb-3 text-left">
-                                {t('auth.welcomeAwaken.awaken', { ns: 'login' })}
-                                {"\n"}
-                                {t('auth.welcomeAwaken.your', { ns: 'login' })}
-                                {"\n"}
-                                {t('auth.welcomeAwaken.pm', { ns: 'login' })}
-                            </Text>
-                            <Text className="text-white/85 text-base text-left">
-                                {t('auth.welcomeAwaken.slogan', { ns: 'login' })}
-                            </Text>
-                        </View>
+            <View className="flex-1 bg-bgPrimary px-[1rem] h-screen overflow-auto py-[2rem] " style={{ paddingTop: insets.top + 48 }}>
+                {/* 标题区域 */}
+                <View className="mb-10 w-full px-5">
+                    <Text className="text-white text-3xl font-bold mb-3 text-left">
+                        {t('auth.welcomeAwaken.awaken', { ns: 'login' })}
+                        {"\n"}
+                        {t('auth.welcomeAwaken.your', { ns: 'login' })}
+                        {"\n"}
+                        {t('auth.welcomeAwaken.pm', { ns: 'login' })}
+                    </Text>
+                    <Text className="text-white/85 text-base text-left">
+                        {t('auth.welcomeAwaken.slogan', { ns: 'login' })}
+                    </Text>
+                </View>
 
-                        {/* Memo 形象区域 */}
-                        <View className="items-center">
-                            <IP />
-                        </View>
+                {/* Memo 形象区域 */}
+                <View className="items-center">
+                    <IP />
+                </View>
 
-                        {/* 介绍文本 */}
-                        <Text className="text-white text-base text-center mb-[1rem] leading-6 opacity-90 px-10 -mt-[4rem]">
-                            {t('auth.welcomeAwaken.gallery', { ns: 'login' })}
-                            {"\n"}
-                            {t('auth.welcomeAwaken.back', { ns: 'login' })}
-                        </Text>
+                {/* 介绍文本 */}
+                <Text className="text-white text-base text-center mb-[1rem] leading-6 opacity-90 px-10 -mt-[4rem]">
+                    {t('auth.welcomeAwaken.gallery', { ns: 'login' })}
+                    {"\n"}
+                    {t('auth.welcomeAwaken.back', { ns: 'login' })}
+                </Text>
 
-                        {/* 唤醒按钮 */}
-                        <TouchableOpacity
-                            className="bg-white rounded-full px-10 py-4 shadow-[0_2px_4px_rgba(0,0,0,0.1)] w-full items-center"
-                            onPress={async () => {
-                                router.push('/login')
-                            }}
-                            activeOpacity={0.8}
-                        >
-                            <Text className="text-[#4C320C] font-bold text-lg">
-                                {t('auth.welcomeAwaken.awake', { ns: 'login' })}
-                            </Text>
-                        </TouchableOpacity>
-                    </View>
-            }
+                {/* 唤醒按钮 */}
+                <TouchableOpacity
+                    className="bg-white rounded-full px-10 py-4 shadow-[0_2px_4px_rgba(0,0,0,0.1)] w-full items-center"
+                    onPress={async () => {
+                        router.push('/login')
+                    }}
+                    activeOpacity={0.8}
+                >
+                    <Text className="text-[#4C320C] font-bold text-lg">
+                        {t('auth.welcomeAwaken.awake', { ns: 'login' })}
+                    </Text>
+                </TouchableOpacity>
+            </View>
         </View >
     );
 }
\ No newline at end of file
diff --git a/app/(tabs)/owner.tsx b/app/(tabs)/owner.tsx
index fd3812e..19dcac5 100644
--- a/app/(tabs)/owner.tsx
+++ b/app/(tabs)/owner.tsx
@@ -89,11 +89,13 @@ export default function OwnerPage() {
 
                         {/* 资源数据 */}
                         <View style={styles.resourceContainer}>
-                            <View style={{ gap: 16 }}>
+                            <View style={{ gap: 16, width: "80%" }}>
                                 <ResourceComponent title={t("generalSetting.usedStorage", { ns: "personal" })} data={{ all: userInfoDetails.total_bytes, used: countData.used_bytes }} icon={<UsedStorageSvg />} isFormatBytes={true} />
                                 <ResourceComponent title={t("generalSetting.remainingPoints", { ns: "personal" })} data={{ all: userInfoDetails.total_points, used: userInfoDetails.remain_points }} icon={<PointsSvg />} />
                             </View>
-                            <MoreArrowSvg />
+                            <View style={{ alignItems: 'flex-end', flex: 1 }}>
+                                <MoreArrowSvg />
+                            </View>
                         </View>
                         {/* 数据统计 */}
                         <CountComponent
@@ -154,6 +156,7 @@ const styles = StyleSheet.create({
         backgroundColor: "#FAF9F6",
         padding: 16,
         borderRadius: 18,
+        paddingTop: 20
     },
     userInfo: {
         flexDirection: 'row',
diff --git a/components/owner/resource.tsx b/components/owner/resource.tsx
index 92b2566..61a6aba 100644
--- a/components/owner/resource.tsx
+++ b/components/owner/resource.tsx
@@ -49,17 +49,15 @@ const styles = StyleSheet.create({
         width: "90%",
         flexDirection: "row",
         alignItems: "center",
+        justifyContent: "flex-start",
         gap: 16,
     },
     title: {
         fontSize: 12,
         fontWeight: "700",
-        width: 100
-    },
-    subtitle: {
-        fontSize: 10,
-        fontWeight: "400",
+        width: "25%"
     },
+
     dataContainer: {
         position: "absolute",
         right: 0,