feat: 样式优化

This commit is contained in:
jinyaqiu 2025-07-17 20:16:35 +08:00
parent 436b44a107
commit 44ff7ce36d
3 changed files with 54 additions and 118 deletions

View File

@ -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(true);
checkAuthStatus(router, () => {
router.replace('/ask')
}).then(() => {
setIsLoading(false);
} catch (error) {
console.error('检查登录状态出错:', error);
setIsLoading(false);
} finally {
setIsLoading(false);
}
};
checkAuthStatus();
});
}, []);
// 轮询获取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,8 +31,6 @@ 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">
@ -135,7 +71,6 @@ export default function HomeScreen() {
</Text>
</TouchableOpacity>
</View>
}
</View >
);
}

View File

@ -89,12 +89,14 @@ 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>
<View style={{ alignItems: 'flex-end', flex: 1 }}>
<MoreArrowSvg />
</View>
</View>
{/* 数据统计 */}
<CountComponent
data={[{ title: t("generalSetting.totalVideo", { ns: "personal" }), number: countData?.counter?.total_count?.video_count || 0 }, { title: t("generalSetting.totalPhoto", { ns: "personal" }), number: countData?.counter?.total_count?.photo_count || 0 }, { title: t("generalSetting.live", { ns: "personal" }), number: countData?.counter?.total_count?.live_count || 0 }, { title: t("generalSetting.videoLength", { ns: "personal" }), number: formatDuration(countData?.counter?.total_count?.video_length || 0) }]}
@ -154,6 +156,7 @@ const styles = StyleSheet.create({
backgroundColor: "#FAF9F6",
padding: 16,
borderRadius: 18,
paddingTop: 20
},
userInfo: {
flexDirection: 'row',

View File

@ -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,