physical/physical-expo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

为多个组件和API添加用户登录状态检查，确保只有在用户登录后才能查询和修改收藏状态

Browse Source
This commit is contained in:
yuchenglong
2026-01-16 18:02:08 +08:00
parent b5fd763c7e
commit 887d205f65
8 changed files with 107 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/(tabs)/favorite.tsx
View File

@@ -5,6 +5,7 @@ import { IconSymbol, IconSymbolName } from "@/components/ui/icon-symbol";
import { Colors } from "@/constants/theme";
import { useTheme } from "@/context/ThemeContext";
import { fetchFavorites, removeFavorite } from "@/lib/api";
import { storage } from "@/lib/storage";
import { FavoriteItem, Match } from "@/types/api";
import { Image } from "expo-image";
import { useRouter } from "expo-router";
@@ -67,6 +68,13 @@ export default function FavoriteScreen() {
if (loading) return;
setLoading(true);
try {
const token = await storage.getAccessToken();
if (!token) {
setFavorites([]);
setHasMore(false);
return;
}
const currentPage = isRefresh ? 1 : page;
const res = await fetchFavorites(activeTab, currentPage);
if (isRefresh) {

8
app/(tabs)/finished.tsx
View File

@@ -15,6 +15,7 @@ import {
fetchSports,
fetchTodayMatches,
} from "@/lib/api";
import { storage } from "@/lib/storage";
import { League, Match, Sport } from "@/types/api";
import React, { useEffect, useMemo, useState } from "react";
import { useTranslation } from "react-i18next";
@@ -316,8 +317,12 @@ export default function HomeScreen() {
deviceTimeZone
);
const token = await storage.getAccessToken();
let listWithFavStatus = list;
if (token) {
// 直接传递 match.id 查询是否收藏，并更新列表状态
const listWithFavStatus = await Promise.all(
listWithFavStatus = await Promise.all(
list.map(async (m) => {
try {
const favRes = await checkFavorite("match", m.id);
@@ -328,6 +333,7 @@ export default function HomeScreen() {
}
})
);
}
// 将收藏的比赛置顶
const sortedList = [...listWithFavStatus].sort((a, b) => {

8
app/(tabs)/index.tsx
View File

@@ -15,6 +15,7 @@ import {
fetchSports,
fetchTodayMatches,
} from "@/lib/api";
import { storage } from "@/lib/storage";
import { League, Match, Sport } from "@/types/api";
import React, { useEffect, useMemo, useState } from "react";
import { useTranslation } from "react-i18next";
@@ -316,8 +317,12 @@ export default function HomeScreen() {
deviceTimeZone
);
const token = await storage.getAccessToken();
let listWithFavStatus = list;
if (token) {
// 直接传递 match.id 查询是否收藏，并更新列表状态
const listWithFavStatus = await Promise.all(
listWithFavStatus = await Promise.all(
list.map(async (m) => {
try {
// 查询比赛是否已被收藏
@@ -329,6 +334,7 @@ export default function HomeScreen() {
}
})
);
}
// 将收藏的比赛置顶
const sortedList = [...listWithFavStatus].sort((a, b) => {

8
app/(tabs)/live.tsx
View File

@@ -6,6 +6,7 @@ import { Colors } from "@/constants/theme";
import { useAppState } from "@/context/AppStateContext";
import { useTheme } from "@/context/ThemeContext";
import { checkFavorite, fetchLiveScore } from "@/lib/api";
import { storage } from "@/lib/storage";
import { LiveScoreMatch, Match } from "@/types/api";
import { useRouter } from "expo-router";
import React, { useEffect, useState } from "react";
@@ -66,8 +67,12 @@ export default function LiveScreen() {
isLive: true,
}));
const token = await storage.getAccessToken();
let listWithFavStatus = converted;
if (token) {
// 直接传递 match.id 查询是否收藏，并更新列表状态
const listWithFavStatus = await Promise.all(
listWithFavStatus = await Promise.all(
converted.map(async (m) => {
try {
const favRes = await checkFavorite("match", m.id);
@@ -78,6 +83,7 @@ export default function LiveScreen() {
}
})
);
}
// 将收藏的比赛置顶
const sortedList = [...listWithFavStatus].sort((a, b) => {

11
app/(tabs)/upcoming.tsx
View File

@@ -13,6 +13,7 @@ import {
fetchSports,
fetchUpcomingMatches,
} from "@/lib/api";
import { storage } from "@/lib/storage";
import { League, Sport, UpcomingMatch } from "@/types/api";
import React, { useEffect, useState } from "react";
import { useTranslation } from "react-i18next";
@@ -261,7 +262,8 @@ export default function HomeScreen() {
};
const loadMatches = async () => {
if (selectedSportId === null) return;
const token = await storage.getAccessToken();
if (selectedSportId === null || !token) return;
setLoading(true);
try {
@@ -271,8 +273,12 @@ export default function HomeScreen() {
selectedLeagueKey || ""
);
const token = await storage.getAccessToken();
let listWithFavStatus = list;
if (token) {
// 直接传递 match.id 查询是否收藏，并更新列表状态
const listWithFavStatus = await Promise.all(
listWithFavStatus = await Promise.all(
list.map(async (m) => {
try {
const favRes = await checkFavorite("match", m.id.toString());
@@ -283,6 +289,7 @@ export default function HomeScreen() {
}
})
);
}
// 将收藏的比赛置顶
const sortedList = [...listWithFavStatus].sort((a, b) => {

7
components/live-detail/live-score-header.tsx
View File

@@ -1,6 +1,7 @@
import { ThemedText } from "@/components/themed-text";
import { IconSymbol } from "@/components/ui/icon-symbol";
import { addFavorite, checkFavorite, removeFavorite } from "@/lib/api";
import { storage } from "@/lib/storage";
import { LiveScoreMatch } from "@/types/api";
import { LinearGradient } from "expo-linear-gradient";
import { useRouter } from "expo-router";
@@ -46,6 +47,8 @@ export function LiveScoreHeader({ match, topInset }: LiveScoreHeaderProps) {
// 检查收藏状态
React.useEffect(() => {
const loadFavStatus = async () => {
const token = await storage.getAccessToken();
if (!token) return;
try {
const res = await checkFavorite("match", match.event_key.toString());
setIsFav(res.isFavorite);
@@ -59,6 +62,8 @@ export function LiveScoreHeader({ match, topInset }: LiveScoreHeaderProps) {
// 检查主队收藏状态
React.useEffect(() => {
const loadHomeFav = async () => {
const token = await storage.getAccessToken();
if (!token) return;
try {
const res = await checkFavorite("team", match.home_team_key.toString());
setIsHomeFav(res.isFavorite);
@@ -74,6 +79,8 @@ export function LiveScoreHeader({ match, topInset }: LiveScoreHeaderProps) {
// 检查客队收藏状态
React.useEffect(() => {
const loadAwayFav = async () => {
const token = await storage.getAccessToken();
if (!token) return;
try {
const res = await checkFavorite("team", match.away_team_key.toString());
setIsAwayFav(res.isFavorite);

7
components/match-detail/score-header.tsx
View File

@@ -1,6 +1,7 @@
import { ThemedText } from "@/components/themed-text";
import { IconSymbol } from "@/components/ui/icon-symbol";
import { addFavorite, checkFavorite, removeFavorite } from "@/lib/api";
import { storage } from "@/lib/storage";
import { MatchDetailData } from "@/types/api";
import { LinearGradient } from "expo-linear-gradient";
import { useRouter } from "expo-router";
@@ -30,6 +31,8 @@ export function ScoreHeader({ data, isDark, topInset }: ScoreHeaderProps) {
// 检查比赛收藏状态
React.useEffect(() => {
const loadFavStatus = async () => {
const token = await storage.getAccessToken();
if (!token) return;
try {
const res = await checkFavorite("match", match.eventKey.toString());
setIsFav(res.isFavorite);
@@ -45,6 +48,8 @@ export function ScoreHeader({ data, isDark, topInset }: ScoreHeaderProps) {
// 检查主队收藏状态
React.useEffect(() => {
const loadHomeFav = async () => {
const token = await storage.getAccessToken();
if (!token) return;
try {
const res = await checkFavorite("team", match.homeTeamKey.toString());
setIsHomeFav(res.isFavorite);
@@ -60,6 +65,8 @@ export function ScoreHeader({ data, isDark, topInset }: ScoreHeaderProps) {
// 检查客队收藏状态
React.useEffect(() => {
const loadAwayFav = async () => {
const token = await storage.getAccessToken();
if (!token) return;
try {
const res = await checkFavorite("team", match.awayTeamKey.toString());
setIsAwayFav(res.isFavorite);

10
lib/api.ts
View File

@@ -431,6 +431,11 @@ export const fetchUserProfile = async (): Promise<UserProfile> => {
export const addFavorite = async (request: FavoriteRequest): Promise<any> => {
try {
const token = await storage.getAccessToken();
if (!token) {
// throw new Error("Please login first");
return;
}
// console.log("Adding favorite with request:", request);
const response = await apiClient.post<ApiResponse<any>>(
API_ENDPOINTS.FAVORITES,
@@ -451,6 +456,11 @@ export const removeFavorite = async (request: {
typeId: string;
}): Promise<any> => {
try {
const token = await storage.getAccessToken();
if (!token) {
// throw new Error("Please login first");
return;
}
console.log("Removing favorite with request:", request);
const response = await apiClient.delete<ApiResponse<any>>(
API_ENDPOINTS.FAVORITES,