Merge branch 'main' of https://git.ambigrat.com/shenyan/physical-expo

app/(tabs)/favorite.tsx

@@ -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) {

app/(tabs)/finished.tsx

@@ -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,18 +317,23 @@ export default function HomeScreen() {
         deviceTimeZone
       );
 
-      // 直接传递 match.id 查询是否收藏，并更新列表状态
-      const listWithFavStatus = await Promise.all(
-        list.map(async (m) => {
-          try {
-            const favRes = await checkFavorite("match", m.id);
-            return { ...m, fav: favRes.isFavorite };
-          } catch (error) {
-            console.error(`Check favorite failed for match ${m.id}:`, error);
-            return m;
-          }
-        })
-      );
+      const token = await storage.getAccessToken();
+      let listWithFavStatus = list;
+
+      if (token) {
+        // 直接传递 match.id 查询是否收藏，并更新列表状态
+        listWithFavStatus = await Promise.all(
+          list.map(async (m) => {
+            try {
+              const favRes = await checkFavorite("match", m.id);
+              return { ...m, fav: favRes.isFavorite };
+            } catch (error) {
+              console.error(`Check favorite failed for match ${m.id}:`, error);
+              return m;
+            }
+          })
+        );
+      }
 
       // 将收藏的比赛置顶
       const sortedList = [...listWithFavStatus].sort((a, b) => {

app/(tabs)/index.tsx

@@ -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,19 +317,24 @@ export default function HomeScreen() {
         deviceTimeZone
       );
 
-      // 直接传递 match.id 查询是否收藏，并更新列表状态
-      const listWithFavStatus = await Promise.all(
-        list.map(async (m) => {
-          try {
-            // 查询比赛是否已被收藏
-            const favRes = await checkFavorite("match", m.id);
-            return { ...m, fav: favRes.isFavorite };
-          } catch (error) {
-            console.error(`Check favorite failed for match ${m.id}:`, error);
-            return m;
-          }
-        })
-      );
+      const token = await storage.getAccessToken();
+      let listWithFavStatus = list;
+
+      if (token) {
+        // 直接传递 match.id 查询是否收藏，并更新列表状态
+        listWithFavStatus = await Promise.all(
+          list.map(async (m) => {
+            try {
+              // 查询比赛是否已被收藏
+              const favRes = await checkFavorite("match", m.id);
+              return { ...m, fav: favRes.isFavorite };
+            } catch (error) {
+              console.error(`Check favorite failed for match ${m.id}:`, error);
+              return m;
+            }
+          })
+        );
+      }
 
       // 将收藏的比赛置顶
       const sortedList = [...listWithFavStatus].sort((a, b) => {

app/(tabs)/live.tsx

@@ -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,18 +67,23 @@ export default function LiveScreen() {
         isLive: true,
       }));
 
-      // 直接传递 match.id 查询是否收藏，并更新列表状态
-      const listWithFavStatus = await Promise.all(
-        converted.map(async (m) => {
-          try {
-            const favRes = await checkFavorite("match", m.id);
-            return { ...m, fav: favRes.isFavorite };
-          } catch (error) {
-            console.error(`Check favorite failed for match ${m.id}:`, error);
-            return m;
-          }
-        })
-      );
+      const token = await storage.getAccessToken();
+      let listWithFavStatus = converted;
+
+      if (token) {
+        // 直接传递 match.id 查询是否收藏，并更新列表状态
+        listWithFavStatus = await Promise.all(
+          converted.map(async (m) => {
+            try {
+              const favRes = await checkFavorite("match", m.id);
+              return { ...m, fav: favRes.isFavorite };
+            } catch (error) {
+              console.error(`Check favorite failed for match ${m.id}:`, error);
+              return m;
+            }
+          })
+        );
+      }
 
       // 将收藏的比赛置顶
       const sortedList = [...listWithFavStatus].sort((a, b) => {

app/(tabs)/upcoming.tsx

@@ -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,18 +273,23 @@ export default function HomeScreen() {
         selectedLeagueKey || ""
       );
 
-      // 直接传递 match.id 查询是否收藏，并更新列表状态
-      const listWithFavStatus = await Promise.all(
-        list.map(async (m) => {
-          try {
-            const favRes = await checkFavorite("match", m.id.toString());
-            return { ...m, fav: favRes.isFavorite };
-          } catch (error) {
-            console.error(`Check favorite failed for match ${m.id}:`, error);
-            return m;
-          }
-        })
-      );
+      const token = await storage.getAccessToken();
+      let listWithFavStatus = list;
+
+      if (token) {
+        // 直接传递 match.id 查询是否收藏，并更新列表状态
+        listWithFavStatus = await Promise.all(
+          list.map(async (m) => {
+            try {
+              const favRes = await checkFavorite("match", m.id.toString());
+              return { ...m, fav: favRes.isFavorite };
+            } catch (error) {
+              console.error(`Check favorite failed for match ${m.id}:`, error);
+              return m;
+            }
+          })
+        );
+      }
 
       // 将收藏的比赛置顶
       const sortedList = [...listWithFavStatus].sort((a, b) => {