feat: enhance LivePlayer messages with localized text and improve M3U parsing logic

Fix fetch m3u failed when m3u file without extinf.

README.md

@@ -4,7 +4,7 @@
 
 ## ✨ 功能特性
 
-- **跨平台支持**: 同时支持 Apple TV 和 Android TV。
+- **框架跨平台支持**: 同时支持构建 Apple TV 和 Android TV。
 - **现代化前端**: 使用 Expo、React Native TVOS 和 TypeScript 构建，性能卓越。
 - **Expo Router**: 基于文件系统的路由，使导航逻辑清晰简单。
 - **后端服务**: 配套 Express 后端，用于处理数据获取、搜索和详情展示。
@@ -52,10 +52,8 @@
 接下来，在项目根目录运行前端应用：
 
 ```sh
-# (如果还在 backend 目录) 返回根目录
-cd ..
 
-# 安装前端依赖
+# 安装依赖
 yarn
 
 # [首次运行或依赖更新后] 生成原生项目文件
@@ -73,7 +71,8 @@ yarn android-tv
 
 - 1.2.x 以上版本需配合 [MoonTV](https://github.com/senshinya/MoonTV) 部署使用，api 地址填部MoonTV署后的访问地址。
 
-  - **注意：** 地址后面不要带 `/` ,不要遗漏 `http://` 或者 `https://` 
+  - **注意：** 地址后面不要带 `/` ,不要遗漏 `http://` 或者 `https://`
+  - 如果部署在CF，请确保电视端可以访问，不然会出现无法登录或者登录项与自己配置不符的问题
 
 - 如果不想依赖 MoonTV，可以使用 1.1.x 版本。
 

app.json

@@ -38,6 +38,7 @@
     "android": {
       "package": "com.oriontv",
       "usesCleartextTraffic": true,
+      "hardwareAcceleration": true,
       "networkSecurityConfig": "@xml/network_security_config",
       "icon": "./assets/images/icon.png",
       "permissions": [

app/_layout.tsx

@@ -63,7 +63,7 @@ export default function RootLayout() {
         <Stack.Screen name="search" options={{ headerShown: false }} />
         <Stack.Screen name="live" options={{ headerShown: false }} />
         <Stack.Screen name="settings" options={{ headerShown: false }} />
-        {/* <Stack.Screen name="favorites" options={{ headerShown: false }} /> */}
+        <Stack.Screen name="favorites" options={{ headerShown: false }} />
         <Stack.Screen name="+not-found" />
       </Stack>
       <Toast />

app/detail.tsx

@@ -77,17 +77,23 @@ export default function DetailScreen() {
         <View style={styles.topContainer}>
           <Image source={{ uri: detail.poster }} style={styles.poster} />
           <View style={styles.infoContainer}>
-            <ThemedText style={styles.title} numberOfLines={1}>
+            <View style={styles.titleContainer}>
-              {detail.title}
+              <ThemedText style={styles.title} numberOfLines={1} ellipsizeMode="tail">
-            </ThemedText>
+                {detail.title}
+              </ThemedText>
+              <StyledButton onPress={toggleFavorite} variant="ghost" style={styles.favoriteButton}>
+                <FontAwesome
+                  name={isFavorited ? "heart" : "heart-o"}
+                  size={24}
+                  color={isFavorited ? "#feff5f" : "#ccc"}
+                />
+              </StyledButton>
+            </View>
             <View style={styles.metaContainer}>
               <ThemedText style={styles.metaText}>{detail.year}</ThemedText>
               <ThemedText style={styles.metaText}>{detail.type_name}</ThemedText>
             </View>
-            {/* <Pressable onPress={toggleFavorite} style={styles.favoriteButton}>
+
-              <FontAwesome name={isFavorited ? "star" : "star-o"} size={24} color={isFavorited ? "#FFD700" : "#ccc"} />
-              <ThemedText style={styles.favoriteButtonText}>{isFavorited ? "已收藏" : "收藏"}</ThemedText>
-            </Pressable> */}
             <ScrollView style={styles.descriptionScrollView}>
               <ThemedText style={styles.description}>{detail.desc}</ThemedText>
             </ScrollView>
@@ -101,29 +107,32 @@ export default function DetailScreen() {
               {!allSourcesLoaded && <ActivityIndicator style={{ marginLeft: 10 }} />}
             </View>
             <View style={styles.sourceList}>
-              {searchResults.map((item, index) => (
+              {searchResults.map((item, index) => {
-                <StyledButton
+                const isSelected = detail?.source === item.source;
-                  key={index}
+                return (
-                  onPress={() => setDetail(item)}
+                  <StyledButton
-                  hasTVPreferredFocus={index === 0}
+                    key={index}
-                  isSelected={detail?.source === item.source}
+                    onPress={() => setDetail(item)}
-                  style={styles.sourceButton}
+                    hasTVPreferredFocus={index === 0}
-                >
+                    isSelected={isSelected}
-                  <ThemedText style={styles.sourceButtonText}>{item.source_name}</ThemedText>
+                    style={styles.sourceButton}
-                  {item.episodes.length > 1 && (
+                  >
-                    <View style={styles.badge}>
+                    <ThemedText style={styles.sourceButtonText}>{item.source_name}</ThemedText>
-                      <Text style={styles.badgeText}>
+                    {item.episodes.length > 1 && (
-                        {item.episodes.length > 99 ? "99+" : `${item.episodes.length}`} 集
+                      <View style={[styles.badge, isSelected && styles.selectedBadge]}>
-                      </Text>
+                        <Text style={styles.badgeText}>
-                    </View>
+                          {item.episodes.length > 99 ? "99+" : `${item.episodes.length}`} 集
-                  )}
+                        </Text>
-                  {item.resolution && (
+                      </View>
-                    <View style={[styles.badge, { backgroundColor: "#28a745" }]}>
+                    )}
-                      <Text style={styles.badgeText}>{item.resolution}</Text>
+                    {item.resolution && (
-                    </View>
+                      <View style={[styles.badge, { backgroundColor: "#666" }, isSelected && styles.selectedBadge]}>
-                  )}
+                        <Text style={styles.badgeText}>{item.resolution}</Text>
-                </StyledButton>
+                      </View>
-              ))}
+                    )}
+                  </StyledButton>
+                );
+              })}
             </View>
           </View>
           <View style={styles.episodesContainer}>
@@ -167,11 +176,15 @@ const styles = StyleSheet.create({
     marginLeft: 20,
     justifyContent: "flex-start",
   },
+  titleContainer: {
+    flexDirection: "row",
+    alignItems: "center",
+  },
   title: {
+    paddingTop: 16,
     fontSize: 28,
     fontWeight: "bold",
-    marginBottom: 10,
+    flexShrink: 1,
-    paddingTop: 20,
   },
   metaContainer: {
     flexDirection: "row",
@@ -191,13 +204,9 @@ const styles = StyleSheet.create({
     lineHeight: 22,
   },
   favoriteButton: {
-    flexDirection: "row",
-    alignItems: "center",
-    marginTop: 10,
     padding: 10,
-    backgroundColor: "rgba(255, 255, 255, 0.1)",
+    marginLeft: 10,
-    borderRadius: 5,
+    backgroundColor: "transparent",
-    alignSelf: "flex-start",
   },
   favoriteButtonText: {
     marginLeft: 8,
@@ -230,16 +239,23 @@ const styles = StyleSheet.create({
     fontSize: 16,
   },
   badge: {
-    backgroundColor: "red",
+    backgroundColor: "#666",
     borderRadius: 10,
     paddingHorizontal: 6,
     paddingVertical: 2,
     marginLeft: 8,
   },
   badgeText: {
-    color: "white",
+    color: "#fff",
     fontSize: 12,
     fontWeight: "bold",
+    paddingBottom: 2.5,
+  },
+  selectedBadge: {
+    backgroundColor: "#4c4c4c",
+  },
+  selectedbadgeText: {
+    color: "#333",
   },
   episodesContainer: {
     marginTop: 20,

app/favorites.tsx

@@ -1,27 +1,19 @@
 import React, { useEffect } from "react";
-import { View, FlatList, StyleSheet, ActivityIndicator, Image, Pressable } from "react-native";
+import { View, FlatList, StyleSheet, ActivityIndicator } from "react-native";
-import { useRouter } from "expo-router";
 import { ThemedView } from "@/components/ThemedView";
 import { ThemedText } from "@/components/ThemedText";
 import useFavoritesStore from "@/stores/favoritesStore";
 import { Favorite } from "@/services/storage";
+import VideoCard from "@/components/VideoCard.tv";
+import { api } from "@/services/api";
 
 export default function FavoritesScreen() {
-  const router = useRouter();
   const { favorites, loading, error, fetchFavorites } = useFavoritesStore();
 
   useEffect(() => {
     fetchFavorites();
   }, [fetchFavorites]);
 
-  const handlePress = (favorite: Favorite & { key: string }) => {
-    const [source, id] = favorite.key.split("+");
-    router.push({
-      pathname: "/detail",
-      params: { q: favorite.title, source, id },
-    });
-  };
-
   if (loading) {
     return (
       <ThemedView style={styles.centered}>
@@ -46,17 +38,22 @@ export default function FavoritesScreen() {
     );
   }
 
-  const renderItem = ({ item }: { item: Favorite & { key: string } }) => (
+  const renderItem = ({ item }: { item: Favorite & { key: string } }) => {
-    <Pressable onPress={() => handlePress(item)} style={styles.itemContainer}>
+    const [source, id] = item.key.split("+");
-      <Image source={{ uri: item.poster }} style={styles.poster} />
+    return (
-      <View style={styles.infoContainer}>
+      <VideoCard
-        <ThemedText style={styles.title} numberOfLines={1}>
+        id={id}
-          {item.title}
+        source={source}
-        </ThemedText>
+        title={item.title}
-        <ThemedText style={styles.year}>{item.year}</ThemedText>
+        sourceName={item.source_name}
-      </View>
+        poster={item.cover}
-    </Pressable>
+        year={item.year}
-  );
+        api={api}
+        episodeIndex={1}
+        progress={0}
+      />
+    );
+  };
 
   return (
     <ThemedView style={styles.container}>
@@ -67,7 +64,7 @@ export default function FavoritesScreen() {
         data={favorites}
         renderItem={renderItem}
         keyExtractor={(item) => item.key}
-        numColumns={3}
+        numColumns={5}
         contentContainerStyle={styles.list}
       />
     </ThemedView>
@@ -99,26 +96,4 @@ const styles = StyleSheet.create({
   list: {
     padding: 10,
   },
-  itemContainer: {
-    flex: 1,
-    margin: 10,
-    alignItems: "center",
-  },
-  poster: {
-    width: 120,
-    height: 180,
-    borderRadius: 8,
-  },
-  infoContainer: {
-    marginTop: 8,
-    alignItems: "center",
-  },
-  title: {
-    fontSize: 16,
-    fontWeight: "bold",
-  },
-  year: {
-    fontSize: 14,
-    color: "#888",
-  },
 });

app/index.tsx

@@ -124,9 +124,9 @@ export default function HomeScreen() {
           </Pressable>
         </View>
         <View style={styles.rightHeaderButtons}>
-          {/* <StyledButton style={styles.searchButton} onPress={() => router.push("/favorites")} variant="ghost">
+          <StyledButton style={styles.searchButton} onPress={() => router.push("/favorites")} variant="ghost">
             <Heart color={colorScheme === "dark" ? "white" : "black"} size={24} />
-          </StyledButton> */}
+          </StyledButton>
           <StyledButton
             style={styles.searchButton}
             onPress={() => router.push({ pathname: "/search" })}

app/live.tsx

@@ -106,7 +106,7 @@ export default function LiveScreen() {
               <View style={styles.groupColumn}>
                 <FlatList
                   data={channelGroups}
-                  keyExtractor={(item) => item}
+                  keyExtractor={(item, index) => `group-${item}-${index}`}
                   renderItem={({ item }) => (
                     <StyledButton
                       text={item}
@@ -124,7 +124,7 @@ export default function LiveScreen() {
                 ) : (
                   <FlatList
                     data={groupedChannels[selectedGroup] || []}
-                    keyExtractor={(item) => item.id}
+                    keyExtractor={(item, index) => `${item.id}-${item.group}-${index}`}
                     renderItem={({ item }) => (
                       <StyledButton
                         text={item.name || "Unknown Channel"}
@@ -190,6 +190,8 @@ const styles = StyleSheet.create({
     paddingVertical: 8,
     paddingHorizontal: 4,
     marginVertical: 4,
+    paddingLeft: 10,
+    paddingRight: 10,
   },
   groupButtonText: {
     fontSize: 13,
@@ -198,6 +200,8 @@ const styles = StyleSheet.create({
     paddingVertical: 6,
     paddingHorizontal: 4,
     marginVertical: 3,
+    paddingLeft: 16,
+    paddingRight: 16,
   },
   channelItemText: {
     fontSize: 12,

app/play.tsx

@@ -42,13 +42,13 @@ export default function PlayScreen() {
   const {
     isLoading,
     showControls,
-    showNextEpisodeOverlay,
+    // showNextEpisodeOverlay,
     initialPosition,
     introEndTime,
     setVideoRef,
     handlePlaybackStatusUpdate,
     setShowControls,
-    setShowNextEpisodeOverlay,
+    // setShowNextEpisodeOverlay,
     reset,
     loadVideo,
   } = usePlayerStore();
@@ -151,7 +151,7 @@ export default function PlayScreen() {
           </View>
         )}
 
-        <NextEpisodeOverlay visible={showNextEpisodeOverlay} onCancel={() => setShowNextEpisodeOverlay(false)} />
+        {/* <NextEpisodeOverlay visible={showNextEpisodeOverlay} onCancel={() => setShowNextEpisodeOverlay(false)} /> */}
       </TouchableOpacity>
 
       <EpisodeSelectionModal />

app/search.tsx

@@ -11,6 +11,7 @@ import { useRemoteControlStore } from "@/stores/remoteControlStore";
 import { RemoteControlModal } from "@/components/RemoteControlModal";
 import { useSettingsStore } from "@/stores/settingsStore";
 import { useRouter } from "expo-router";
+import { Colors } from "@/constants/Colors";
 
 export default function SearchScreen() {
   const [keyword, setKeyword] = useState("");
@@ -101,7 +102,7 @@ export default function SearchScreen() {
             {
               backgroundColor: colorScheme === "dark" ? "#2c2c2e" : "#f0f0f0",
               color: colorScheme === "dark" ? "white" : "black",
-              borderColor: isInputFocused ? "#007bff" : "transparent",
+              borderColor: isInputFocused ? Colors.dark.primary : "transparent",
             },
           ]}
           placeholder="搜索电影、剧集..."

app/settings.tsx

@@ -6,18 +6,17 @@ import { ThemedView } from "@/components/ThemedView";
 import { StyledButton } from "@/components/StyledButton";
 import { useThemeColor } from "@/hooks/useThemeColor";
 import { useSettingsStore } from "@/stores/settingsStore";
-import useAuthStore from "@/stores/authStore";
+// import useAuthStore from "@/stores/authStore";
 import { useRemoteControlStore } from "@/stores/remoteControlStore";
 import { APIConfigSection } from "@/components/settings/APIConfigSection";
 import { LiveStreamSection } from "@/components/settings/LiveStreamSection";
 import { RemoteInputSection } from "@/components/settings/RemoteInputSection";
-import { VideoSourceSection } from "@/components/settings/VideoSourceSection";
+// import { VideoSourceSection } from "@/components/settings/VideoSourceSection";
 import Toast from "react-native-toast-message";
 
 export default function SettingsScreen() {
   const { loadSettings, saveSettings, setApiBaseUrl, setM3uUrl } = useSettingsStore();
   const { lastMessage } = useRemoteControlStore();
-  const { isLoggedIn, logout } = useAuthStore();
   const backgroundColor = useThemeColor({}, "background");
 
   const [hasChanges, setHasChanges] = useState(false);

components/LivePlayer.tsx

@@ -66,7 +66,7 @@ export default function LivePlayer({ streamUrl, channelTitle, onPlaybackStatusUp
   if (!streamUrl) {
     return (
       <View style={styles.container}>
-        <Text style={styles.messageText}>Select a channel to play.</Text>
+        <Text style={styles.messageText}>按向下键选择频道</Text>
       </View>
     );
   }
@@ -74,7 +74,7 @@ export default function LivePlayer({ streamUrl, channelTitle, onPlaybackStatusUp
   if (isTimeout) {
     return (
       <View style={styles.container}>
-        <Text style={styles.messageText}>Failed to load stream. It might be offline or unavailable.</Text>
+        <Text style={styles.messageText}>加载失败，请重试</Text>
       </View>
     );
   }
@@ -98,7 +98,7 @@ export default function LivePlayer({ streamUrl, channelTitle, onPlaybackStatusUp
       {isLoading && (
         <View style={styles.loadingOverlay}>
           <ActivityIndicator size="large" color="#fff" />
-          <Text style={styles.messageText}>Loading...</Text>
+          <Text style={styles.messageText}>加载中...</Text>
         </View>
       )}
       {channelTitle && !isLoading && !isTimeout && (

components/PlayerControls.tsx

@@ -168,7 +168,7 @@ const styles = StyleSheet.create({
     position: "absolute",
     left: 0,
     height: 8,
-    backgroundColor: "#ff0000",
+    backgroundColor: "#fff",
     borderRadius: 4,
   },
   progressBarTouchable: {

components/SeekingBar.tsx

@@ -80,7 +80,7 @@ const styles = StyleSheet.create({
   },
   seekingBarFilled: {
     height: "100%",
-    backgroundColor: "#ff0000",
+    backgroundColor: "#fff",
     borderRadius: 2.5,
   },
 });

components/SourceSelectionModal.tsx

@@ -72,7 +72,9 @@ const styles = StyleSheet.create({
   sourceItem: {
     paddingVertical: 2,
     margin: 4,
-    width: "31%",
+    marginLeft: 10,
+    marginRight: 8,
+    width: "30%",
   },
   sourceItemText: {
     fontSize: 14,

components/StyledButton.tsx

@@ -29,11 +29,10 @@ export const StyledButton = forwardRef<View, StyledButtonProps>(
           color: colors.text,
         },
         selectedButton: {
-          backgroundColor: colors.tint,
+          backgroundColor: colors.primary,
         },
         focusedButton: {
-          backgroundColor: colors.link,
+          borderColor: colors.primary,
-          borderColor: colors.background,
         },
         selectedText: {
           color: Colors.dark.text,
@@ -47,11 +46,11 @@ export const StyledButton = forwardRef<View, StyledButtonProps>(
           color: colors.text,
         },
         focusedButton: {
-          backgroundColor: colors.link,
+          backgroundColor: colors.primary,
           borderColor: colors.background,
         },
         selectedButton: {
-          backgroundColor: "rgba(0, 122, 255, 0.3)",
+          backgroundColor: colors.primary,
         },
         selectedText: {
           color: colors.link,
@@ -65,7 +64,8 @@ export const StyledButton = forwardRef<View, StyledButtonProps>(
           color: colors.text,
         },
         focusedButton: {
-          backgroundColor: "rgba(119, 119, 119, 0.9)",
+          backgroundColor: "rgba(119, 119, 119, 0.2)",
+          borderColor: colors.primary,
         },
         selectedButton: {},
         selectedText: {},

components/VideoCard.tv.tsx

@@ -6,6 +6,7 @@ import { Heart, Star, Play, Trash2 } from "lucide-react-native";
 import { FavoriteManager, PlayRecordManager } from "@/services/storage";
 import { API, api } from "@/services/api";
 import { ThemedText } from "@/components/ThemedText";
+import { Colors } from "@/constants/Colors";
 
 interface VideoCardProps {
   id: string;
@@ -209,6 +210,9 @@ const styles = StyleSheet.create({
   overlay: {
     ...StyleSheet.absoluteFillObject,
     backgroundColor: "rgba(0,0,0,0.3)",
+    borderColor: Colors.dark.primary,
+    borderWidth: 2,
+    borderRadius: 8,
     justifyContent: "center",
     alignItems: "center",
   },
@@ -290,17 +294,17 @@ const styles = StyleSheet.create({
     bottom: 0,
     left: 0,
     right: 0,
-    height: 3,
+    height: 4,
-    backgroundColor: "rgba(0, 0, 0, 0.5)",
+    backgroundColor: "rgba(0, 0, 0, 0.8)",
   },
   progressBar: {
-    height: 3,
+    height: 4,
-    backgroundColor: "#ff0000",
+    backgroundColor: Colors.dark.primary,
   },
   continueWatchingBadge: {
     flexDirection: "row",
     alignItems: "center",
-    backgroundColor: "rgba(255, 0, 0, 0.8)",
+    backgroundColor: Colors.dark.primary,
     paddingHorizontal: 10,
     paddingVertical: 5,
     borderRadius: 5,
@@ -312,7 +316,7 @@ const styles = StyleSheet.create({
     fontWeight: "bold",
   },
   continueLabel: {
-    color: "#ff5252",
+    color: Colors.dark.primary,
     fontSize: 12,
   },
 });

components/VideoLoadingAnimation.tsx

@@ -199,17 +199,17 @@ const VideoLoadingAnimation: React.FC<VideoLoadingAnimationProps> = ({ showProgr
           </View>
         </Animated.View>
 
-        <View style={styles.loadingDots}>
+        {/* <View style={styles.loadingDots}>
           <Animated.View style={[styles.dot, animatedStyles.bounce[0]]} />
           <Animated.View style={[styles.dot, animatedStyles.bounce[1]]} />
           <Animated.View style={[styles.dot, animatedStyles.bounce[2]]} />
-        </View>
+        </View> */}
 
         {showProgressBar && (
           <View style={styles.progressBar}>
             <Animated.View style={[styles.progressFill, animatedStyles.progress]}>
               <LinearGradient
-                colors={["#4fd1c7", "#06b6d4", "#3b82f6", "#8b5cf6"]}
+                colors={["#00bb5e", "#feff5f"]}
                 style={StyleSheet.absoluteFill}
                 start={{ x: 0, y: 0 }}
                 end={{ x: 1, y: 0 }}

components/settings/APIConfigSection.tsx

@@ -6,6 +6,7 @@ import { SettingsSection } from "./SettingsSection";
 import { useSettingsStore } from "@/stores/settingsStore";
 import { useRemoteControlStore } from "@/stores/remoteControlStore";
 import { useButtonAnimation } from "@/hooks/useAnimation";
+import { Colors } from "@/constants/Colors";
 
 interface APIConfigSectionProps {
   onChanged: () => void;
@@ -126,8 +127,8 @@ const styles = StyleSheet.create({
     borderColor: "transparent",
   },
   inputFocused: {
-    borderColor: "#007AFF",
+    borderColor: Colors.dark.primary,
-    shadowColor: "#007AFF",
+    shadowColor: Colors.dark.primary,
     shadowOffset: { width: 0, height: 0 },
     shadowOpacity: 0.8,
     shadowRadius: 10,

components/settings/LiveStreamSection.tsx

@@ -6,6 +6,7 @@ import { SettingsSection } from "./SettingsSection";
 import { useSettingsStore } from "@/stores/settingsStore";
 import { useRemoteControlStore } from "@/stores/remoteControlStore";
 import { useButtonAnimation } from "@/hooks/useAnimation";
+import { Colors } from "@/constants/Colors";
 
 interface LiveStreamSectionProps {
   onChanged: () => void;
@@ -120,8 +121,8 @@ const styles = StyleSheet.create({
     borderColor: "transparent",
   },
   inputFocused: {
-    borderColor: "#007AFF",
+    borderColor: Colors.dark.primary,
-    shadowColor: "#007AFF",
+    shadowColor: Colors.dark.primary,
     shadowOffset: { width: 0, height: 0 },
     shadowOpacity: 0.8,
     shadowRadius: 10,

components/settings/RemoteInputSection.tsx

@@ -6,6 +6,7 @@ import { SettingsSection } from "./SettingsSection";
 import { useSettingsStore } from "@/stores/settingsStore";
 import { useRemoteControlStore } from "@/stores/remoteControlStore";
 import { useButtonAnimation } from "@/hooks/useAnimation";
+import { Colors } from "@/constants/Colors";
 
 interface RemoteInputSectionProps {
   onChanged: () => void;
@@ -59,7 +60,7 @@ export const RemoteInputSection: React.FC<RemoteInputSectionProps> = ({ onChange
           <Switch
             value={remoteInputEnabled}
             onValueChange={() => {}} // 禁用Switch的直接交互
-            trackColor={{ false: "#767577", true: "#007AFF" }}
+            trackColor={{ false: "#767577", true: Colors.dark.primary }}
             thumbColor={remoteInputEnabled ? "#ffffff" : "#f4f3f4"}
             pointerEvents="none"
           />
@@ -70,7 +71,7 @@ export const RemoteInputSection: React.FC<RemoteInputSectionProps> = ({ onChange
         <View style={styles.statusContainer}>
           <View style={styles.statusItem}>
             <ThemedText style={styles.statusLabel}>服务状态：</ThemedText>
-            <ThemedText style={[styles.statusValue, { color: isServerRunning ? "#00FF00" : "#FF6B6B" }]}>
+            <ThemedText style={[styles.statusValue, { color: isServerRunning ? Colors.dark.primary : "#FF6B6B" }]}>
               {isServerRunning ? "运行中" : "已停止"}
             </ThemedText>
           </View>

components/settings/SettingsSection.tsx

@@ -1,6 +1,7 @@
 import React, { useState } from "react";
 import { StyleSheet, Pressable } from "react-native";
 import { ThemedView } from "@/components/ThemedView";
+import { Colors } from "@/constants/Colors";
 
 interface SettingsSectionProps {
   children: React.ReactNode;
@@ -9,12 +10,7 @@ interface SettingsSectionProps {
   focusable?: boolean;
 }
 
-export const SettingsSection: React.FC<SettingsSectionProps> = ({ 
+export const SettingsSection: React.FC<SettingsSectionProps> = ({ children, onFocus, onBlur, focusable = false }) => {
-  children, 
-  onFocus, 
-  onBlur, 
-  focusable = false 
-}) => {
   const [isFocused, setIsFocused] = useState(false);
 
   const handleFocus = () => {
@@ -28,20 +24,12 @@ export const SettingsSection: React.FC<SettingsSectionProps> = ({
   };
 
   if (!focusable) {
-    return (
+    return <ThemedView style={styles.section}>{children}</ThemedView>;
-      <ThemedView style={styles.section}>
-        {children}
-      </ThemedView>
-    );
   }
 
   return (
     <ThemedView style={[styles.section, isFocused && styles.sectionFocused]}>
-      <Pressable
+      <Pressable style={styles.sectionPressable} onFocus={handleFocus} onBlur={handleBlur}>
-        style={styles.sectionPressable}
-        onFocus={handleFocus}
-        onBlur={handleBlur}
-      >
         {children}
       </Pressable>
     </ThemedView>
@@ -57,10 +45,10 @@ const styles = StyleSheet.create({
     borderColor: "#333",
   },
   sectionFocused: {
-    borderColor: "#007AFF",
+    borderColor: Colors.dark.primary,
     backgroundColor: "#007AFF10",
   },
   sectionPressable: {
     width: "100%",
   },
-});
+});

constants/Colors.ts

@@ -26,5 +26,6 @@ export const Colors = {
     tabIconSelected: tintColorDark,
     link: "#0a7ea4",
     border: "#333",
+    primary: "#00bb5e",
   },
 };

package.json

@@ -2,7 +2,7 @@
   "name": "OrionTV",
   "private": true,
   "main": "expo-router/entry",
-  "version": "1.2.3",
+  "version": "1.2.6",
   "scripts": {
     "start": "EXPO_USE_METRO_WORKSPACE_ROOT=1 expo start",
     "start-tv": "EXPO_TV=1 EXPO_USE_METRO_WORKSPACE_ROOT=1 expo start",

services/api.ts

@@ -43,7 +43,6 @@ export interface SearchResult {
 export interface Favorite {
   cover: string;
   title: string;
-  poster: string;
   source_name: string;
   total_episodes: number;
   search_title: string;

services/m3u.ts

@@ -16,23 +16,37 @@ export const parseM3U = (m3uText: string): Channel[] => {
   for (const line of lines) {
     const trimmedLine = line.trim();
     if (trimmedLine.startsWith('#EXTINF:')) {
-      currentChannelInfo = { id: '', name: '', url: '', logo: '', group: '' };
+      currentChannelInfo = {}; // Start a new channel
-      const commaIndex = trimmedLine.indexOf(',');
+      const commaIndex = trimmedLine.lastIndexOf(',');
       if (commaIndex !== -1) {
         currentChannelInfo.name = trimmedLine.substring(commaIndex + 1).trim();
         const attributesPart = trimmedLine.substring(8, commaIndex);
         const logoMatch = attributesPart.match(/tvg-logo="([^"]*)"/i);
-        if (logoMatch && logoMatch[1]) currentChannelInfo.logo = logoMatch[1];
+        if (logoMatch && logoMatch[1]) {
+          currentChannelInfo.logo = logoMatch[1];
+        }
         const groupMatch = attributesPart.match(/group-title="([^"]*)"/i);
-        if (groupMatch && groupMatch[1]) currentChannelInfo.group = groupMatch[1];
+        if (groupMatch && groupMatch[1]) {
+          currentChannelInfo.group = groupMatch[1];
+        }
       } else {
         currentChannelInfo.name = trimmedLine.substring(8).trim();
       }
     } else if (currentChannelInfo && trimmedLine && !trimmedLine.startsWith('#') && trimmedLine.includes('://')) {
       currentChannelInfo.url = trimmedLine;
       currentChannelInfo.id = currentChannelInfo.url; // Use URL as ID
-      parsedChannels.push(currentChannelInfo as Channel);
+      
-      currentChannelInfo = null;
+      // Ensure all required fields are present, providing defaults if necessary
+      const finalChannel: Channel = {
+        id: currentChannelInfo.id,
+        url: currentChannelInfo.url,
+        name: currentChannelInfo.name || 'Unknown',
+        logo: currentChannelInfo.logo || '',
+        group: currentChannelInfo.group || 'Default',
+      };
+      
+      parsedChannels.push(finalChannel);
+      currentChannelInfo = null; // Reset for the next channel
     }
   }
   return parsedChannels;
@@ -57,14 +71,14 @@ export const getPlayableUrl = (originalUrl: string | null): string | null => {
     return null;
   }
   // In React Native, we use the proxy for all http streams to avoid potential issues.
-  if (originalUrl.toLowerCase().startsWith('http://')) {
+  // if (originalUrl.toLowerCase().startsWith('http://')) {
-    // Use the baseURL from the existing api instance.
+  //   // Use the baseURL from the existing api instance.
-    if (!api.baseURL) {
+  //   if (!api.baseURL) {
-        console.warn("API base URL is not set. Cannot create proxy URL.")
+  //       console.warn("API base URL is not set. Cannot create proxy URL.")
-        return originalUrl; // Fallback to original URL
+  //       return originalUrl; // Fallback to original URL
-    }
+  //   }
-    return `${api.baseURL}/proxy?url=${encodeURIComponent(originalUrl)}`;
+  //   return `${api.baseURL}/proxy?url=${encodeURIComponent(originalUrl)}`;
-  }
+  // }
   // HTTPS streams can be played directly.
   return originalUrl;
-};
+};

stores/detailStore.ts

@@ -133,11 +133,11 @@ const useDetailStore = create<DetailState>((set, get) => ({
         set({ error: "未找到任何播放源" });
       }
 
-      // if (get().detail) {
+      if (get().detail) {
-      //   const { source, id } = get().detail!;
+        const { source, id } = get().detail!;
-      //   const isFavorited = await FavoriteManager.isFavorited(source, id.toString());
+        const isFavorited = await FavoriteManager.isFavorited(source, id.toString());
-      //   set({ isFavorited });
+        set({ isFavorited });
-      // }
+      }
     } catch (e) {
       if ((e as Error).name !== "AbortError") {
         set({ error: e instanceof Error ? e.message : "获取数据失败" });
@@ -151,9 +151,9 @@ const useDetailStore = create<DetailState>((set, get) => ({
 
   setDetail: async (detail) => {
     set({ detail });
-    // const { source, id } = detail;
+    const { source, id } = detail;
-    // const isFavorited = await FavoriteManager.isFavorited(source, id.toString());
+    const isFavorited = await FavoriteManager.isFavorited(source, id.toString());
-    // set({ isFavorited });
+    set({ isFavorited });
   },
 
   abort: () => {