mirror of
https://github.com/zimplexing/OrionTV.git
synced 2026-02-15 04:14:42 +08:00
Compare commits
7 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2fd30c8fd7 | ||
|
|
f09f103d59 | ||
|
|
828a0b3d72 | ||
|
|
e8a1ea2717 | ||
|
|
bd7087264d | ||
|
|
990745eba9 | ||
|
|
cab3e2ed12 |
@@ -63,7 +63,7 @@ export default function RootLayout() {
|
|||||||
<Stack.Screen name="search" options={{ headerShown: false }} />
|
<Stack.Screen name="search" options={{ headerShown: false }} />
|
||||||
<Stack.Screen name="live" options={{ headerShown: false }} />
|
<Stack.Screen name="live" options={{ headerShown: false }} />
|
||||||
<Stack.Screen name="settings" 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.Screen name="+not-found" />
|
||||||
</Stack>
|
</Stack>
|
||||||
<Toast />
|
<Toast />
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import { useLocalSearchParams, useRouter } from "expo-router";
|
|||||||
import { ThemedView } from "@/components/ThemedView";
|
import { ThemedView } from "@/components/ThemedView";
|
||||||
import { ThemedText } from "@/components/ThemedText";
|
import { ThemedText } from "@/components/ThemedText";
|
||||||
import { StyledButton } from "@/components/StyledButton";
|
import { StyledButton } from "@/components/StyledButton";
|
||||||
|
import VideoLoadingAnimation from "@/components/VideoLoadingAnimation";
|
||||||
import useDetailStore from "@/stores/detailStore";
|
import useDetailStore from "@/stores/detailStore";
|
||||||
import { FontAwesome } from "@expo/vector-icons";
|
import { FontAwesome } from "@expo/vector-icons";
|
||||||
|
|
||||||
@@ -49,11 +50,7 @@ export default function DetailScreen() {
|
|||||||
};
|
};
|
||||||
|
|
||||||
if (loading) {
|
if (loading) {
|
||||||
return (
|
return <VideoLoadingAnimation showProgressBar={false} />;
|
||||||
<ThemedView style={styles.centered}>
|
|
||||||
<ActivityIndicator size="large" />
|
|
||||||
</ThemedView>
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (error) {
|
if (error) {
|
||||||
@@ -80,17 +77,23 @@ export default function DetailScreen() {
|
|||||||
<View style={styles.topContainer}>
|
<View style={styles.topContainer}>
|
||||||
<Image source={{ uri: detail.poster }} style={styles.poster} />
|
<Image source={{ uri: detail.poster }} style={styles.poster} />
|
||||||
<View style={styles.infoContainer}>
|
<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 ? "#FFD700" : "#ccc"}
|
||||||
|
/>
|
||||||
|
</StyledButton>
|
||||||
|
</View>
|
||||||
<View style={styles.metaContainer}>
|
<View style={styles.metaContainer}>
|
||||||
<ThemedText style={styles.metaText}>{detail.year}</ThemedText>
|
<ThemedText style={styles.metaText}>{detail.year}</ThemedText>
|
||||||
<ThemedText style={styles.metaText}>{detail.type_name}</ThemedText>
|
<ThemedText style={styles.metaText}>{detail.type_name}</ThemedText>
|
||||||
</View>
|
</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}>
|
<ScrollView style={styles.descriptionScrollView}>
|
||||||
<ThemedText style={styles.description}>{detail.desc}</ThemedText>
|
<ThemedText style={styles.description}>{detail.desc}</ThemedText>
|
||||||
</ScrollView>
|
</ScrollView>
|
||||||
@@ -170,11 +173,15 @@ const styles = StyleSheet.create({
|
|||||||
marginLeft: 20,
|
marginLeft: 20,
|
||||||
justifyContent: "flex-start",
|
justifyContent: "flex-start",
|
||||||
},
|
},
|
||||||
|
titleContainer: {
|
||||||
|
flexDirection: "row",
|
||||||
|
alignItems: "center",
|
||||||
|
},
|
||||||
title: {
|
title: {
|
||||||
|
paddingTop: 16,
|
||||||
fontSize: 28,
|
fontSize: 28,
|
||||||
fontWeight: "bold",
|
fontWeight: "bold",
|
||||||
marginBottom: 10,
|
flexShrink: 1,
|
||||||
paddingTop: 20,
|
|
||||||
},
|
},
|
||||||
metaContainer: {
|
metaContainer: {
|
||||||
flexDirection: "row",
|
flexDirection: "row",
|
||||||
@@ -194,13 +201,9 @@ const styles = StyleSheet.create({
|
|||||||
lineHeight: 22,
|
lineHeight: 22,
|
||||||
},
|
},
|
||||||
favoriteButton: {
|
favoriteButton: {
|
||||||
flexDirection: "row",
|
|
||||||
alignItems: "center",
|
|
||||||
marginTop: 10,
|
|
||||||
padding: 10,
|
padding: 10,
|
||||||
backgroundColor: "rgba(255, 255, 255, 0.1)",
|
marginLeft: 10,
|
||||||
borderRadius: 5,
|
backgroundColor: "transparent",
|
||||||
alignSelf: "flex-start",
|
|
||||||
},
|
},
|
||||||
favoriteButtonText: {
|
favoriteButtonText: {
|
||||||
marginLeft: 8,
|
marginLeft: 8,
|
||||||
|
|||||||
@@ -1,27 +1,19 @@
|
|||||||
import React, { useEffect } from "react";
|
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 { ThemedView } from "@/components/ThemedView";
|
||||||
import { ThemedText } from "@/components/ThemedText";
|
import { ThemedText } from "@/components/ThemedText";
|
||||||
import useFavoritesStore from "@/stores/favoritesStore";
|
import useFavoritesStore from "@/stores/favoritesStore";
|
||||||
import { Favorite } from "@/services/storage";
|
import { Favorite } from "@/services/storage";
|
||||||
|
import VideoCard from "@/components/VideoCard.tv";
|
||||||
|
import { api } from "@/services/api";
|
||||||
|
|
||||||
export default function FavoritesScreen() {
|
export default function FavoritesScreen() {
|
||||||
const router = useRouter();
|
|
||||||
const { favorites, loading, error, fetchFavorites } = useFavoritesStore();
|
const { favorites, loading, error, fetchFavorites } = useFavoritesStore();
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
fetchFavorites();
|
fetchFavorites();
|
||||||
}, [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) {
|
if (loading) {
|
||||||
return (
|
return (
|
||||||
<ThemedView style={styles.centered}>
|
<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 (
|
return (
|
||||||
<ThemedView style={styles.container}>
|
<ThemedView style={styles.container}>
|
||||||
@@ -67,7 +64,7 @@ export default function FavoritesScreen() {
|
|||||||
data={favorites}
|
data={favorites}
|
||||||
renderItem={renderItem}
|
renderItem={renderItem}
|
||||||
keyExtractor={(item) => item.key}
|
keyExtractor={(item) => item.key}
|
||||||
numColumns={3}
|
numColumns={5}
|
||||||
contentContainerStyle={styles.list}
|
contentContainerStyle={styles.list}
|
||||||
/>
|
/>
|
||||||
</ThemedView>
|
</ThemedView>
|
||||||
@@ -99,26 +96,4 @@ const styles = StyleSheet.create({
|
|||||||
list: {
|
list: {
|
||||||
padding: 10,
|
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",
|
|
||||||
},
|
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -124,9 +124,9 @@ export default function HomeScreen() {
|
|||||||
</Pressable>
|
</Pressable>
|
||||||
</View>
|
</View>
|
||||||
<View style={styles.rightHeaderButtons}>
|
<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} />
|
<Heart color={colorScheme === "dark" ? "white" : "black"} size={24} />
|
||||||
</StyledButton> */}
|
</StyledButton>
|
||||||
<StyledButton
|
<StyledButton
|
||||||
style={styles.searchButton}
|
style={styles.searchButton}
|
||||||
onPress={() => router.push({ pathname: "/search" })}
|
onPress={() => router.push({ pathname: "/search" })}
|
||||||
|
|||||||
17
app/play.tsx
17
app/play.tsx
@@ -1,5 +1,5 @@
|
|||||||
import React, { useEffect, useRef } from "react";
|
import React, { useEffect, useRef } from "react";
|
||||||
import { StyleSheet, TouchableOpacity, ActivityIndicator, BackHandler, AppState, AppStateStatus } from "react-native";
|
import { StyleSheet, TouchableOpacity, BackHandler, AppState, AppStateStatus, View } from "react-native";
|
||||||
import { useLocalSearchParams, useRouter } from "expo-router";
|
import { useLocalSearchParams, useRouter } from "expo-router";
|
||||||
import { Video, ResizeMode } from "expo-av";
|
import { Video, ResizeMode } from "expo-av";
|
||||||
import { useKeepAwake } from "expo-keep-awake";
|
import { useKeepAwake } from "expo-keep-awake";
|
||||||
@@ -9,7 +9,7 @@ import { EpisodeSelectionModal } from "@/components/EpisodeSelectionModal";
|
|||||||
import { SourceSelectionModal } from "@/components/SourceSelectionModal";
|
import { SourceSelectionModal } from "@/components/SourceSelectionModal";
|
||||||
import { SeekingBar } from "@/components/SeekingBar";
|
import { SeekingBar } from "@/components/SeekingBar";
|
||||||
import { NextEpisodeOverlay } from "@/components/NextEpisodeOverlay";
|
import { NextEpisodeOverlay } from "@/components/NextEpisodeOverlay";
|
||||||
import { LoadingOverlay } from "@/components/LoadingOverlay";
|
import VideoLoadingAnimation from "@/components/VideoLoadingAnimation";
|
||||||
import useDetailStore from "@/stores/detailStore";
|
import useDetailStore from "@/stores/detailStore";
|
||||||
import { useTVRemoteHandler } from "@/hooks/useTVRemoteHandler";
|
import { useTVRemoteHandler } from "@/hooks/useTVRemoteHandler";
|
||||||
import Toast from "react-native-toast-message";
|
import Toast from "react-native-toast-message";
|
||||||
@@ -116,11 +116,7 @@ export default function PlayScreen() {
|
|||||||
}, [isLoading]);
|
}, [isLoading]);
|
||||||
|
|
||||||
if (!detail) {
|
if (!detail) {
|
||||||
return (
|
return <VideoLoadingAnimation showProgressBar />;
|
||||||
<ThemedView style={[styles.container, styles.centered]}>
|
|
||||||
<ActivityIndicator size="large" color="#fff" />
|
|
||||||
</ThemedView>
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
@@ -130,7 +126,6 @@ export default function PlayScreen() {
|
|||||||
ref={videoRef}
|
ref={videoRef}
|
||||||
style={styles.videoPlayer}
|
style={styles.videoPlayer}
|
||||||
source={{ uri: currentEpisode?.url || "" }}
|
source={{ uri: currentEpisode?.url || "" }}
|
||||||
usePoster
|
|
||||||
posterSource={{ uri: detail?.poster ?? "" }}
|
posterSource={{ uri: detail?.poster ?? "" }}
|
||||||
resizeMode={ResizeMode.CONTAIN}
|
resizeMode={ResizeMode.CONTAIN}
|
||||||
onPlaybackStatusUpdate={handlePlaybackStatusUpdate}
|
onPlaybackStatusUpdate={handlePlaybackStatusUpdate}
|
||||||
@@ -150,7 +145,11 @@ export default function PlayScreen() {
|
|||||||
|
|
||||||
<SeekingBar />
|
<SeekingBar />
|
||||||
|
|
||||||
<LoadingOverlay visible={isLoading} />
|
{isLoading && (
|
||||||
|
<View style={styles.videoContainer}>
|
||||||
|
<VideoLoadingAnimation showProgressBar />
|
||||||
|
</View>
|
||||||
|
)}
|
||||||
|
|
||||||
<NextEpisodeOverlay visible={showNextEpisodeOverlay} onCancel={() => setShowNextEpisodeOverlay(false)} />
|
<NextEpisodeOverlay visible={showNextEpisodeOverlay} onCancel={() => setShowNextEpisodeOverlay(false)} />
|
||||||
</TouchableOpacity>
|
</TouchableOpacity>
|
||||||
|
|||||||
@@ -1,8 +1,9 @@
|
|||||||
import React, { useState, useRef, useEffect } from "react";
|
import React, { useState, useRef, useEffect } from "react";
|
||||||
import { View, TextInput, StyleSheet, FlatList, ActivityIndicator, Alert, Keyboard } from "react-native";
|
import { View, TextInput, StyleSheet, FlatList, Alert, Keyboard } from "react-native";
|
||||||
import { ThemedView } from "@/components/ThemedView";
|
import { ThemedView } from "@/components/ThemedView";
|
||||||
import { ThemedText } from "@/components/ThemedText";
|
import { ThemedText } from "@/components/ThemedText";
|
||||||
import VideoCard from "@/components/VideoCard.tv";
|
import VideoCard from "@/components/VideoCard.tv";
|
||||||
|
import VideoLoadingAnimation from "@/components/VideoLoadingAnimation";
|
||||||
import { api, SearchResult } from "@/services/api";
|
import { api, SearchResult } from "@/services/api";
|
||||||
import { Search, QrCode } from "lucide-react-native";
|
import { Search, QrCode } from "lucide-react-native";
|
||||||
import { StyledButton } from "@/components/StyledButton";
|
import { StyledButton } from "@/components/StyledButton";
|
||||||
@@ -121,9 +122,7 @@ export default function SearchScreen() {
|
|||||||
</View>
|
</View>
|
||||||
|
|
||||||
{loading ? (
|
{loading ? (
|
||||||
<View style={styles.centerContainer}>
|
<VideoLoadingAnimation showProgressBar={false} />
|
||||||
<ActivityIndicator size="large" />
|
|
||||||
</View>
|
|
||||||
) : error ? (
|
) : error ? (
|
||||||
<View style={styles.centerContainer}>
|
<View style={styles.centerContainer}>
|
||||||
<ThemedText style={styles.errorText}>{error}</ThemedText>
|
<ThemedText style={styles.errorText}>{error}</ThemedText>
|
||||||
|
|||||||
@@ -6,18 +6,17 @@ import { ThemedView } from "@/components/ThemedView";
|
|||||||
import { StyledButton } from "@/components/StyledButton";
|
import { StyledButton } from "@/components/StyledButton";
|
||||||
import { useThemeColor } from "@/hooks/useThemeColor";
|
import { useThemeColor } from "@/hooks/useThemeColor";
|
||||||
import { useSettingsStore } from "@/stores/settingsStore";
|
import { useSettingsStore } from "@/stores/settingsStore";
|
||||||
import useAuthStore from "@/stores/authStore";
|
// import useAuthStore from "@/stores/authStore";
|
||||||
import { useRemoteControlStore } from "@/stores/remoteControlStore";
|
import { useRemoteControlStore } from "@/stores/remoteControlStore";
|
||||||
import { APIConfigSection } from "@/components/settings/APIConfigSection";
|
import { APIConfigSection } from "@/components/settings/APIConfigSection";
|
||||||
import { LiveStreamSection } from "@/components/settings/LiveStreamSection";
|
import { LiveStreamSection } from "@/components/settings/LiveStreamSection";
|
||||||
import { RemoteInputSection } from "@/components/settings/RemoteInputSection";
|
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";
|
import Toast from "react-native-toast-message";
|
||||||
|
|
||||||
export default function SettingsScreen() {
|
export default function SettingsScreen() {
|
||||||
const { loadSettings, saveSettings, setApiBaseUrl, setM3uUrl } = useSettingsStore();
|
const { loadSettings, saveSettings, setApiBaseUrl, setM3uUrl } = useSettingsStore();
|
||||||
const { lastMessage } = useRemoteControlStore();
|
const { lastMessage } = useRemoteControlStore();
|
||||||
const { isLoggedIn, logout } = useAuthStore();
|
|
||||||
const backgroundColor = useThemeColor({}, "background");
|
const backgroundColor = useThemeColor({}, "background");
|
||||||
|
|
||||||
const [hasChanges, setHasChanges] = useState(false);
|
const [hasChanges, setHasChanges] = useState(false);
|
||||||
@@ -111,18 +110,18 @@ export default function SettingsScreen() {
|
|||||||
),
|
),
|
||||||
key: "livestream",
|
key: "livestream",
|
||||||
},
|
},
|
||||||
{
|
// {
|
||||||
component: (
|
// component: (
|
||||||
<VideoSourceSection
|
// <VideoSourceSection
|
||||||
onChanged={markAsChanged}
|
// onChanged={markAsChanged}
|
||||||
onFocus={() => {
|
// onFocus={() => {
|
||||||
setCurrentFocusIndex(3);
|
// setCurrentFocusIndex(3);
|
||||||
setCurrentSection("videoSource");
|
// setCurrentSection("videoSource");
|
||||||
}}
|
// }}
|
||||||
/>
|
// />
|
||||||
),
|
// ),
|
||||||
key: "videoSource",
|
// key: "videoSource",
|
||||||
},
|
// },
|
||||||
];
|
];
|
||||||
|
|
||||||
// TV遥控器事件处理
|
// TV遥控器事件处理
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
import React, { useState, useRef, useEffect } from "react";
|
import React, { useState, useRef, useEffect } from "react";
|
||||||
import { Modal, View, TextInput, StyleSheet, ActivityIndicator, useTVEventHandler } from "react-native";
|
import { Modal, View, TextInput, StyleSheet, ActivityIndicator, useTVEventHandler } from "react-native";
|
||||||
|
import { usePathname } from "expo-router";
|
||||||
import Toast from "react-native-toast-message";
|
import Toast from "react-native-toast-message";
|
||||||
import useAuthStore from "@/stores/authStore";
|
import useAuthStore from "@/stores/authStore";
|
||||||
import { useSettingsStore } from "@/stores/settingsStore";
|
import { useSettingsStore } from "@/stores/settingsStore";
|
||||||
@@ -20,9 +21,11 @@ const LoginModal = () => {
|
|||||||
const passwordInputRef = useRef<TextInput>(null);
|
const passwordInputRef = useRef<TextInput>(null);
|
||||||
const loginButtonRef = useRef<View>(null);
|
const loginButtonRef = useRef<View>(null);
|
||||||
const [focused, setFocused] = useState("username");
|
const [focused, setFocused] = useState("username");
|
||||||
|
const pathname = usePathname();
|
||||||
|
const isSettingsPage = pathname.includes("settings");
|
||||||
|
|
||||||
const tvEventHandler = (evt: any) => {
|
const tvEventHandler = (evt: any) => {
|
||||||
if (!evt || !isLoginModalVisible) {
|
if (!evt || !isLoginModalVisible || isSettingsPage) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -48,7 +51,7 @@ const LoginModal = () => {
|
|||||||
useTVEventHandler(tvEventHandler);
|
useTVEventHandler(tvEventHandler);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (isLoginModalVisible) {
|
if (isLoginModalVisible && !isSettingsPage) {
|
||||||
const isUsernameVisible = serverConfig?.StorageType !== "localstorage";
|
const isUsernameVisible = serverConfig?.StorageType !== "localstorage";
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
if (isUsernameVisible) {
|
if (isUsernameVisible) {
|
||||||
@@ -58,7 +61,7 @@ const LoginModal = () => {
|
|||||||
}
|
}
|
||||||
}, 200);
|
}, 200);
|
||||||
}
|
}
|
||||||
}, [isLoginModalVisible, serverConfig]);
|
}, [isLoginModalVisible, serverConfig, isSettingsPage]);
|
||||||
|
|
||||||
const handleLogin = async () => {
|
const handleLogin = async () => {
|
||||||
const isLocalStorage = serverConfig?.StorageType === "localstorage";
|
const isLocalStorage = serverConfig?.StorageType === "localstorage";
|
||||||
@@ -83,7 +86,12 @@ const LoginModal = () => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Modal transparent={true} visible={isLoginModalVisible} animationType="fade" onRequestClose={hideLoginModal}>
|
<Modal
|
||||||
|
transparent={true}
|
||||||
|
visible={isLoginModalVisible && !isSettingsPage}
|
||||||
|
animationType="fade"
|
||||||
|
onRequestClose={hideLoginModal}
|
||||||
|
>
|
||||||
<View style={styles.overlay}>
|
<View style={styles.overlay}>
|
||||||
<ThemedView style={styles.container}>
|
<ThemedView style={styles.container}>
|
||||||
<ThemedText style={styles.title}>需要登录</ThemedText>
|
<ThemedText style={styles.title}>需要登录</ThemedText>
|
||||||
|
|||||||
334
components/VideoLoadingAnimation.tsx
Normal file
334
components/VideoLoadingAnimation.tsx
Normal file
@@ -0,0 +1,334 @@
|
|||||||
|
import React, { useEffect, useRef } from "react";
|
||||||
|
import { View, StyleSheet, Animated, Easing } from "react-native";
|
||||||
|
import { LinearGradient } from "expo-linear-gradient";
|
||||||
|
|
||||||
|
interface VideoLoadingAnimationProps {
|
||||||
|
showProgressBar?: boolean;
|
||||||
|
}
|
||||||
|
|
||||||
|
const VideoLoadingAnimation: React.FC<VideoLoadingAnimationProps> = ({ showProgressBar = true }) => {
|
||||||
|
const floatAnim = useRef(new Animated.Value(0)).current;
|
||||||
|
const pulseAnim = useRef(new Animated.Value(0)).current;
|
||||||
|
const bounceAnims = [
|
||||||
|
useRef(new Animated.Value(0)).current,
|
||||||
|
useRef(new Animated.Value(0)).current,
|
||||||
|
useRef(new Animated.Value(0)).current,
|
||||||
|
];
|
||||||
|
const progressAnim = useRef(new Animated.Value(0)).current;
|
||||||
|
const gradientAnim = useRef(new Animated.Value(0)).current;
|
||||||
|
const textFadeAnim = useRef(new Animated.Value(0)).current;
|
||||||
|
const shapeAnims = [
|
||||||
|
useRef(new Animated.Value(0)).current,
|
||||||
|
useRef(new Animated.Value(0)).current,
|
||||||
|
useRef(new Animated.Value(0)).current,
|
||||||
|
useRef(new Animated.Value(0)).current,
|
||||||
|
];
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
const floatAnimation = Animated.loop(
|
||||||
|
Animated.sequence([
|
||||||
|
Animated.timing(floatAnim, {
|
||||||
|
toValue: -20,
|
||||||
|
duration: 1500,
|
||||||
|
useNativeDriver: true,
|
||||||
|
easing: Easing.inOut(Easing.ease),
|
||||||
|
}),
|
||||||
|
Animated.timing(floatAnim, {
|
||||||
|
toValue: 0,
|
||||||
|
duration: 1500,
|
||||||
|
useNativeDriver: true,
|
||||||
|
easing: Easing.inOut(Easing.ease),
|
||||||
|
}),
|
||||||
|
])
|
||||||
|
);
|
||||||
|
|
||||||
|
const pulseAnimation = Animated.loop(
|
||||||
|
Animated.sequence([
|
||||||
|
Animated.timing(pulseAnim, {
|
||||||
|
toValue: 1,
|
||||||
|
duration: 1000,
|
||||||
|
useNativeDriver: true,
|
||||||
|
easing: Easing.inOut(Easing.ease),
|
||||||
|
}),
|
||||||
|
Animated.timing(pulseAnim, {
|
||||||
|
toValue: 0,
|
||||||
|
duration: 1000,
|
||||||
|
useNativeDriver: true,
|
||||||
|
easing: Easing.inOut(Easing.ease),
|
||||||
|
}),
|
||||||
|
])
|
||||||
|
);
|
||||||
|
|
||||||
|
const bounceAnimations = bounceAnims.map((anim, i) =>
|
||||||
|
Animated.loop(
|
||||||
|
Animated.sequence([
|
||||||
|
Animated.delay(i * 160),
|
||||||
|
Animated.timing(anim, {
|
||||||
|
toValue: 1,
|
||||||
|
duration: 700,
|
||||||
|
useNativeDriver: true,
|
||||||
|
easing: Easing.inOut(Easing.ease),
|
||||||
|
}),
|
||||||
|
Animated.timing(anim, {
|
||||||
|
toValue: 0,
|
||||||
|
duration: 700,
|
||||||
|
useNativeDriver: true,
|
||||||
|
easing: Easing.inOut(Easing.ease),
|
||||||
|
}),
|
||||||
|
])
|
||||||
|
)
|
||||||
|
);
|
||||||
|
|
||||||
|
const progressAnimation = Animated.loop(
|
||||||
|
Animated.timing(progressAnim, {
|
||||||
|
toValue: 1,
|
||||||
|
duration: 4000,
|
||||||
|
useNativeDriver: false, // width animation not supported by native driver
|
||||||
|
easing: Easing.inOut(Easing.ease),
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
const gradientAnimation = Animated.loop(
|
||||||
|
Animated.timing(gradientAnim, {
|
||||||
|
toValue: 1,
|
||||||
|
duration: 2000,
|
||||||
|
useNativeDriver: false, // gradient animation not supported by native driver
|
||||||
|
easing: Easing.inOut(Easing.ease),
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
const textFadeAnimation = Animated.loop(
|
||||||
|
Animated.sequence([
|
||||||
|
Animated.timing(textFadeAnim, {
|
||||||
|
toValue: 1,
|
||||||
|
duration: 1000,
|
||||||
|
useNativeDriver: true,
|
||||||
|
easing: Easing.inOut(Easing.ease),
|
||||||
|
}),
|
||||||
|
Animated.timing(textFadeAnim, {
|
||||||
|
toValue: 0,
|
||||||
|
duration: 1000,
|
||||||
|
useNativeDriver: true,
|
||||||
|
easing: Easing.inOut(Easing.ease),
|
||||||
|
}),
|
||||||
|
])
|
||||||
|
);
|
||||||
|
|
||||||
|
const shapeAnimations = shapeAnims.map((anim, i) =>
|
||||||
|
Animated.loop(
|
||||||
|
Animated.sequence([
|
||||||
|
Animated.delay(i * 2000),
|
||||||
|
Animated.timing(anim, {
|
||||||
|
toValue: 1,
|
||||||
|
duration: 8000,
|
||||||
|
useNativeDriver: true,
|
||||||
|
easing: Easing.inOut(Easing.ease),
|
||||||
|
}),
|
||||||
|
])
|
||||||
|
)
|
||||||
|
);
|
||||||
|
|
||||||
|
Animated.parallel([
|
||||||
|
floatAnimation,
|
||||||
|
pulseAnimation,
|
||||||
|
...bounceAnimations,
|
||||||
|
progressAnimation,
|
||||||
|
gradientAnimation,
|
||||||
|
textFadeAnimation,
|
||||||
|
...shapeAnimations,
|
||||||
|
]).start();
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
const animatedStyles = {
|
||||||
|
float: {
|
||||||
|
transform: [{ translateY: floatAnim }],
|
||||||
|
},
|
||||||
|
pulse: {
|
||||||
|
opacity: pulseAnim.interpolate({ inputRange: [0, 1], outputRange: [1, 0.7] }),
|
||||||
|
transform: [
|
||||||
|
{ translateX: -12.5 },
|
||||||
|
{ translateY: -15 },
|
||||||
|
{
|
||||||
|
scale: pulseAnim.interpolate({ inputRange: [0, 1], outputRange: [1, 1.1] }),
|
||||||
|
},
|
||||||
|
],
|
||||||
|
},
|
||||||
|
bounce: bounceAnims.map((anim) => ({
|
||||||
|
transform: [{ scale: anim.interpolate({ inputRange: [0, 1], outputRange: [0.8, 1.2] }) }],
|
||||||
|
opacity: anim.interpolate({ inputRange: [0, 1], outputRange: [0.5, 1] }),
|
||||||
|
})),
|
||||||
|
progress: {
|
||||||
|
width: progressAnim.interpolate({
|
||||||
|
inputRange: [0, 0.7, 1],
|
||||||
|
outputRange: ["0%", "100%", "100%"],
|
||||||
|
}),
|
||||||
|
},
|
||||||
|
textFade: {
|
||||||
|
opacity: textFadeAnim.interpolate({ inputRange: [0, 1], outputRange: [0.6, 1] }),
|
||||||
|
},
|
||||||
|
shapes: shapeAnims.map((anim, i) => ({
|
||||||
|
transform: [
|
||||||
|
{
|
||||||
|
translateY: anim.interpolate({
|
||||||
|
inputRange: [0, 0.33, 0.66, 1],
|
||||||
|
outputRange: [0, -30, 10, 0],
|
||||||
|
}),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
rotate: anim.interpolate({
|
||||||
|
inputRange: [0, 1],
|
||||||
|
outputRange: ["0deg", "360deg"],
|
||||||
|
}),
|
||||||
|
},
|
||||||
|
],
|
||||||
|
})),
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<View style={styles.container}>
|
||||||
|
<View style={styles.bgShapes}>
|
||||||
|
<Animated.View style={[styles.shape, styles.shape1, animatedStyles.shapes[0]]} />
|
||||||
|
<Animated.View style={[styles.shape, styles.shape2, animatedStyles.shapes[1]]} />
|
||||||
|
<Animated.View style={[styles.shape, styles.shape3, animatedStyles.shapes[2]]} />
|
||||||
|
<Animated.View style={[styles.shape, styles.shape4, animatedStyles.shapes[3]]} />
|
||||||
|
</View>
|
||||||
|
<View style={styles.loadingContainer}>
|
||||||
|
<Animated.View style={[styles.videoIcon, animatedStyles.float]}>
|
||||||
|
<View style={styles.videoFrame}>
|
||||||
|
<Animated.View style={[styles.playButton, animatedStyles.pulse]} />
|
||||||
|
</View>
|
||||||
|
</Animated.View>
|
||||||
|
|
||||||
|
<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>
|
||||||
|
|
||||||
|
{showProgressBar && (
|
||||||
|
<View style={styles.progressBar}>
|
||||||
|
<Animated.View style={[styles.progressFill, animatedStyles.progress]}>
|
||||||
|
<LinearGradient
|
||||||
|
colors={["#4fd1c7", "#06b6d4", "#3b82f6", "#8b5cf6"]}
|
||||||
|
style={StyleSheet.absoluteFill}
|
||||||
|
start={{ x: 0, y: 0 }}
|
||||||
|
end={{ x: 1, y: 0 }}
|
||||||
|
/>
|
||||||
|
</Animated.View>
|
||||||
|
</View>
|
||||||
|
)}
|
||||||
|
|
||||||
|
<Animated.Text style={[styles.loadingText, animatedStyles.textFade]}>正在加载视频</Animated.Text>
|
||||||
|
</View>
|
||||||
|
</View>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
const styles = StyleSheet.create({
|
||||||
|
container: {
|
||||||
|
flex: 1,
|
||||||
|
alignItems: "center",
|
||||||
|
justifyContent: "center",
|
||||||
|
overflow: "hidden",
|
||||||
|
},
|
||||||
|
loadingContainer: {
|
||||||
|
alignItems: "center",
|
||||||
|
zIndex: 10,
|
||||||
|
},
|
||||||
|
videoIcon: {
|
||||||
|
width: 100,
|
||||||
|
height: 100,
|
||||||
|
marginBottom: 30,
|
||||||
|
},
|
||||||
|
videoFrame: {
|
||||||
|
width: "100%",
|
||||||
|
height: "100%",
|
||||||
|
backgroundColor: "rgba(255, 255, 255, 0.05)",
|
||||||
|
borderWidth: 3,
|
||||||
|
borderColor: "rgba(255, 255, 255, 0.2)",
|
||||||
|
borderRadius: 12,
|
||||||
|
justifyContent: "center",
|
||||||
|
alignItems: "center",
|
||||||
|
},
|
||||||
|
playButton: {
|
||||||
|
width: 0,
|
||||||
|
height: 0,
|
||||||
|
borderStyle: "solid",
|
||||||
|
borderLeftWidth: 25,
|
||||||
|
borderLeftColor: "rgba(255, 255, 255, 0.9)",
|
||||||
|
borderTopWidth: 15,
|
||||||
|
borderTopColor: "transparent",
|
||||||
|
borderBottomWidth: 15,
|
||||||
|
borderBottomColor: "transparent",
|
||||||
|
},
|
||||||
|
loadingDots: {
|
||||||
|
flexDirection: "row",
|
||||||
|
justifyContent: "center",
|
||||||
|
gap: 8,
|
||||||
|
marginBottom: 20,
|
||||||
|
},
|
||||||
|
dot: {
|
||||||
|
width: 12,
|
||||||
|
height: 12,
|
||||||
|
backgroundColor: "rgba(255, 255, 255, 0.9)",
|
||||||
|
borderRadius: 6,
|
||||||
|
},
|
||||||
|
progressBar: {
|
||||||
|
width: 300,
|
||||||
|
height: 6,
|
||||||
|
backgroundColor: "rgba(255, 255, 255, 0.1)",
|
||||||
|
borderRadius: 3,
|
||||||
|
marginVertical: 20,
|
||||||
|
overflow: "hidden",
|
||||||
|
},
|
||||||
|
progressFill: {
|
||||||
|
height: "100%",
|
||||||
|
borderRadius: 3,
|
||||||
|
},
|
||||||
|
loadingText: {
|
||||||
|
color: "rgba(255, 255, 255, 0.9)",
|
||||||
|
fontSize: 18,
|
||||||
|
fontWeight: "300",
|
||||||
|
letterSpacing: 2,
|
||||||
|
marginTop: 10,
|
||||||
|
},
|
||||||
|
bgShapes: {
|
||||||
|
position: "absolute",
|
||||||
|
top: 0,
|
||||||
|
left: 0,
|
||||||
|
width: "100%",
|
||||||
|
height: "100%",
|
||||||
|
zIndex: 1,
|
||||||
|
},
|
||||||
|
shape: {
|
||||||
|
position: "absolute",
|
||||||
|
backgroundColor: "rgba(255, 255, 255, 0.05)",
|
||||||
|
borderRadius: 50,
|
||||||
|
},
|
||||||
|
shape1: {
|
||||||
|
width: 80,
|
||||||
|
height: 80,
|
||||||
|
top: "20%",
|
||||||
|
left: "10%",
|
||||||
|
},
|
||||||
|
shape2: {
|
||||||
|
width: 60,
|
||||||
|
height: 60,
|
||||||
|
top: "60%",
|
||||||
|
right: "15%",
|
||||||
|
},
|
||||||
|
shape3: {
|
||||||
|
width: 100,
|
||||||
|
height: 100,
|
||||||
|
bottom: "20%",
|
||||||
|
left: "20%",
|
||||||
|
},
|
||||||
|
shape4: {
|
||||||
|
width: 40,
|
||||||
|
height: 40,
|
||||||
|
top: "30%",
|
||||||
|
right: "30%",
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
export default VideoLoadingAnimation;
|
||||||
@@ -2,7 +2,7 @@
|
|||||||
"name": "OrionTV",
|
"name": "OrionTV",
|
||||||
"private": true,
|
"private": true,
|
||||||
"main": "expo-router/entry",
|
"main": "expo-router/entry",
|
||||||
"version": "1.2.2",
|
"version": "1.2.4",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"start": "EXPO_USE_METRO_WORKSPACE_ROOT=1 expo start",
|
"start": "EXPO_USE_METRO_WORKSPACE_ROOT=1 expo start",
|
||||||
"start-tv": "EXPO_TV=1 EXPO_USE_METRO_WORKSPACE_ROOT=1 expo start",
|
"start-tv": "EXPO_TV=1 EXPO_USE_METRO_WORKSPACE_ROOT=1 expo start",
|
||||||
@@ -36,6 +36,7 @@
|
|||||||
"expo-build-properties": "~0.12.3",
|
"expo-build-properties": "~0.12.3",
|
||||||
"expo-constants": "~16.0.2",
|
"expo-constants": "~16.0.2",
|
||||||
"expo-font": "~12.0.7",
|
"expo-font": "~12.0.7",
|
||||||
|
"expo-linear-gradient": "~13.0.2",
|
||||||
"expo-linking": "~6.3.1",
|
"expo-linking": "~6.3.1",
|
||||||
"expo-router": "~3.5.16",
|
"expo-router": "~3.5.16",
|
||||||
"expo-splash-screen": "~0.27.5",
|
"expo-splash-screen": "~0.27.5",
|
||||||
|
|||||||
@@ -43,7 +43,6 @@ export interface SearchResult {
|
|||||||
export interface Favorite {
|
export interface Favorite {
|
||||||
cover: string;
|
cover: string;
|
||||||
title: string;
|
title: string;
|
||||||
poster: string;
|
|
||||||
source_name: string;
|
source_name: string;
|
||||||
total_episodes: number;
|
total_episodes: number;
|
||||||
search_title: string;
|
search_title: string;
|
||||||
|
|||||||
@@ -133,11 +133,11 @@ const useDetailStore = create<DetailState>((set, get) => ({
|
|||||||
set({ error: "未找到任何播放源" });
|
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) {
|
} catch (e) {
|
||||||
if ((e as Error).name !== "AbortError") {
|
if ((e as Error).name !== "AbortError") {
|
||||||
set({ error: e instanceof Error ? e.message : "获取数据失败" });
|
set({ error: e instanceof Error ? e.message : "获取数据失败" });
|
||||||
@@ -151,9 +151,9 @@ const useDetailStore = create<DetailState>((set, get) => ({
|
|||||||
|
|
||||||
setDetail: async (detail) => {
|
setDetail: async (detail) => {
|
||||||
set({ 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: () => {
|
abort: () => {
|
||||||
|
|||||||
@@ -27,7 +27,13 @@ interface PlayerState {
|
|||||||
introEndTime?: number;
|
introEndTime?: number;
|
||||||
outroStartTime?: number;
|
outroStartTime?: number;
|
||||||
setVideoRef: (ref: RefObject<Video>) => void;
|
setVideoRef: (ref: RefObject<Video>) => void;
|
||||||
loadVideo: (options: {source: string, id: string, title: string; episodeIndex: number, position?: number}) => Promise<void>;
|
loadVideo: (options: {
|
||||||
|
source: string;
|
||||||
|
id: string;
|
||||||
|
title: string;
|
||||||
|
episodeIndex: number;
|
||||||
|
position?: number;
|
||||||
|
}) => Promise<void>;
|
||||||
playEpisode: (index: number) => void;
|
playEpisode: (index: number) => void;
|
||||||
togglePlayPause: () => void;
|
togglePlayPause: () => void;
|
||||||
seek: (duration: number) => void;
|
seek: (duration: number) => void;
|
||||||
@@ -41,8 +47,9 @@ interface PlayerState {
|
|||||||
setOutroStartTime: () => void;
|
setOutroStartTime: () => void;
|
||||||
reset: () => void;
|
reset: () => void;
|
||||||
_seekTimeout?: NodeJS.Timeout;
|
_seekTimeout?: NodeJS.Timeout;
|
||||||
|
_isRecordSaveThrottled: boolean;
|
||||||
// Internal helper
|
// Internal helper
|
||||||
_savePlayRecord: (updates?: Partial<PlayRecord>) => void;
|
_savePlayRecord: (updates?: Partial<PlayRecord>, options?: { immediate?: boolean }) => void;
|
||||||
}
|
}
|
||||||
|
|
||||||
const usePlayerStore = create<PlayerState>((set, get) => ({
|
const usePlayerStore = create<PlayerState>((set, get) => ({
|
||||||
@@ -62,6 +69,7 @@ const usePlayerStore = create<PlayerState>((set, get) => ({
|
|||||||
introEndTime: undefined,
|
introEndTime: undefined,
|
||||||
outroStartTime: undefined,
|
outroStartTime: undefined,
|
||||||
_seekTimeout: undefined,
|
_seekTimeout: undefined,
|
||||||
|
_isRecordSaveThrottled: false,
|
||||||
|
|
||||||
setVideoRef: (ref) => set({ videoRef: ref }),
|
setVideoRef: (ref) => set({ videoRef: ref }),
|
||||||
|
|
||||||
@@ -81,7 +89,7 @@ const usePlayerStore = create<PlayerState>((set, get) => ({
|
|||||||
console.info("Detail not found after initialization");
|
console.info("Detail not found after initialization");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
};
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const playRecord = await PlayRecordManager.get(detail.source, detail.id.toString());
|
const playRecord = await PlayRecordManager.get(detail.source, detail.id.toString());
|
||||||
@@ -170,7 +178,7 @@ const usePlayerStore = create<PlayerState>((set, get) => ({
|
|||||||
if (existingIntroEndTime) {
|
if (existingIntroEndTime) {
|
||||||
// Clear the time
|
// Clear the time
|
||||||
set({ introEndTime: undefined });
|
set({ introEndTime: undefined });
|
||||||
get()._savePlayRecord({ introEndTime: undefined });
|
get()._savePlayRecord({ introEndTime: undefined }, { immediate: true });
|
||||||
Toast.show({
|
Toast.show({
|
||||||
type: "info",
|
type: "info",
|
||||||
text1: "已清除片头时间",
|
text1: "已清除片头时间",
|
||||||
@@ -179,7 +187,7 @@ const usePlayerStore = create<PlayerState>((set, get) => ({
|
|||||||
// Set the time
|
// Set the time
|
||||||
const newIntroEndTime = status.positionMillis;
|
const newIntroEndTime = status.positionMillis;
|
||||||
set({ introEndTime: newIntroEndTime });
|
set({ introEndTime: newIntroEndTime });
|
||||||
get()._savePlayRecord({ introEndTime: newIntroEndTime });
|
get()._savePlayRecord({ introEndTime: newIntroEndTime }, { immediate: true });
|
||||||
Toast.show({
|
Toast.show({
|
||||||
type: "success",
|
type: "success",
|
||||||
text1: "设置成功",
|
text1: "设置成功",
|
||||||
@@ -196,7 +204,7 @@ const usePlayerStore = create<PlayerState>((set, get) => ({
|
|||||||
if (existingOutroStartTime) {
|
if (existingOutroStartTime) {
|
||||||
// Clear the time
|
// Clear the time
|
||||||
set({ outroStartTime: undefined });
|
set({ outroStartTime: undefined });
|
||||||
get()._savePlayRecord({ outroStartTime: undefined });
|
get()._savePlayRecord({ outroStartTime: undefined }, { immediate: true });
|
||||||
Toast.show({
|
Toast.show({
|
||||||
type: "info",
|
type: "info",
|
||||||
text1: "已清除片尾时间",
|
text1: "已清除片尾时间",
|
||||||
@@ -206,7 +214,7 @@ const usePlayerStore = create<PlayerState>((set, get) => ({
|
|||||||
if (!status.durationMillis) return;
|
if (!status.durationMillis) return;
|
||||||
const newOutroStartTime = status.durationMillis - status.positionMillis;
|
const newOutroStartTime = status.durationMillis - status.positionMillis;
|
||||||
set({ outroStartTime: newOutroStartTime });
|
set({ outroStartTime: newOutroStartTime });
|
||||||
get()._savePlayRecord({ outroStartTime: newOutroStartTime });
|
get()._savePlayRecord({ outroStartTime: newOutroStartTime }, { immediate: true });
|
||||||
Toast.show({
|
Toast.show({
|
||||||
type: "success",
|
type: "success",
|
||||||
text1: "设置成功",
|
text1: "设置成功",
|
||||||
@@ -215,7 +223,18 @@ const usePlayerStore = create<PlayerState>((set, get) => ({
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
_savePlayRecord: (updates = {}) => {
|
_savePlayRecord: (updates = {}, options = {}) => {
|
||||||
|
const { immediate = false } = options;
|
||||||
|
if (!immediate) {
|
||||||
|
if (get()._isRecordSaveThrottled) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
set({ _isRecordSaveThrottled: true });
|
||||||
|
setTimeout(() => {
|
||||||
|
set({ _isRecordSaveThrottled: false });
|
||||||
|
}, 10000); // 10 seconds
|
||||||
|
}
|
||||||
|
|
||||||
const { detail } = useDetailStore.getState();
|
const { detail } = useDetailStore.getState();
|
||||||
const { currentEpisodeIndex, episodes, status, introEndTime, outroStartTime } = get();
|
const { currentEpisodeIndex, episodes, status, introEndTime, outroStartTime } = get();
|
||||||
if (detail && status?.isLoaded) {
|
if (detail && status?.isLoaded) {
|
||||||
@@ -235,6 +254,7 @@ const usePlayerStore = create<PlayerState>((set, get) => ({
|
|||||||
...existingRecord,
|
...existingRecord,
|
||||||
...updates,
|
...updates,
|
||||||
});
|
});
|
||||||
|
console.log("Play record saved")
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|||||||
36
yarn.lock
36
yarn.lock
@@ -4587,6 +4587,11 @@ expo-keep-awake@~13.0.2:
|
|||||||
resolved "https://registry.yarnpkg.com/expo-keep-awake/-/expo-keep-awake-13.0.2.tgz#5ef31311a339671eec9921b934fdd90ab9652b0e"
|
resolved "https://registry.yarnpkg.com/expo-keep-awake/-/expo-keep-awake-13.0.2.tgz#5ef31311a339671eec9921b934fdd90ab9652b0e"
|
||||||
integrity sha512-kKiwkVg/bY0AJ5q1Pxnm/GvpeB6hbNJhcFsoOWDh2NlpibhCLaHL826KHUM+WsnJRbVRxJ+K9vbPRHEMvFpVyw==
|
integrity sha512-kKiwkVg/bY0AJ5q1Pxnm/GvpeB6hbNJhcFsoOWDh2NlpibhCLaHL826KHUM+WsnJRbVRxJ+K9vbPRHEMvFpVyw==
|
||||||
|
|
||||||
|
expo-linear-gradient@~13.0.2:
|
||||||
|
version "13.0.2"
|
||||||
|
resolved "https://registry.yarnpkg.com/expo-linear-gradient/-/expo-linear-gradient-13.0.2.tgz#21bd7bc7c71ef4f7c089521daa16db729d2aec5f"
|
||||||
|
integrity sha512-EDcILUjRKu4P1rtWcwciN6CSyGtH7Bq4ll3oTRV7h3h8oSzSilH1g6z7kTAMlacPBKvMnkkWOGzW6KtgMKEiTg==
|
||||||
|
|
||||||
expo-linking@~6.3.1:
|
expo-linking@~6.3.1:
|
||||||
version "6.3.1"
|
version "6.3.1"
|
||||||
resolved "https://registry.yarnpkg.com/expo-linking/-/expo-linking-6.3.1.tgz#05aef8a42bd310391d0b00644be40d80ece038d9"
|
resolved "https://registry.yarnpkg.com/expo-linking/-/expo-linking-6.3.1.tgz#05aef8a42bd310391d0b00644be40d80ece038d9"
|
||||||
@@ -8804,7 +8809,16 @@ string-length@^5.0.1:
|
|||||||
char-regex "^2.0.0"
|
char-regex "^2.0.0"
|
||||||
strip-ansi "^7.0.1"
|
strip-ansi "^7.0.1"
|
||||||
|
|
||||||
"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
|
"string-width-cjs@npm:string-width@^4.2.0":
|
||||||
|
version "4.2.3"
|
||||||
|
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
|
||||||
|
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
|
||||||
|
dependencies:
|
||||||
|
emoji-regex "^8.0.0"
|
||||||
|
is-fullwidth-code-point "^3.0.0"
|
||||||
|
strip-ansi "^6.0.1"
|
||||||
|
|
||||||
|
string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
|
||||||
version "4.2.3"
|
version "4.2.3"
|
||||||
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
|
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
|
||||||
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
|
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
|
||||||
@@ -8895,7 +8909,7 @@ string_decoder@~1.1.1:
|
|||||||
dependencies:
|
dependencies:
|
||||||
safe-buffer "~5.1.0"
|
safe-buffer "~5.1.0"
|
||||||
|
|
||||||
"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
|
"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
|
||||||
version "6.0.1"
|
version "6.0.1"
|
||||||
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
|
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
|
||||||
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
|
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
|
||||||
@@ -8909,6 +8923,13 @@ strip-ansi@^5.0.0, strip-ansi@^5.2.0:
|
|||||||
dependencies:
|
dependencies:
|
||||||
ansi-regex "^4.1.0"
|
ansi-regex "^4.1.0"
|
||||||
|
|
||||||
|
strip-ansi@^6.0.0, strip-ansi@^6.0.1:
|
||||||
|
version "6.0.1"
|
||||||
|
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
|
||||||
|
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
|
||||||
|
dependencies:
|
||||||
|
ansi-regex "^5.0.1"
|
||||||
|
|
||||||
strip-ansi@^7.0.1:
|
strip-ansi@^7.0.1:
|
||||||
version "7.1.0"
|
version "7.1.0"
|
||||||
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45"
|
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45"
|
||||||
@@ -9740,7 +9761,7 @@ word-wrap@^1.2.5:
|
|||||||
resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34"
|
resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34"
|
||||||
integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==
|
integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==
|
||||||
|
|
||||||
"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
|
"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
|
||||||
version "7.0.0"
|
version "7.0.0"
|
||||||
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
|
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
|
||||||
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
|
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
|
||||||
@@ -9758,6 +9779,15 @@ wrap-ansi@^6.2.0:
|
|||||||
string-width "^4.1.0"
|
string-width "^4.1.0"
|
||||||
strip-ansi "^6.0.0"
|
strip-ansi "^6.0.0"
|
||||||
|
|
||||||
|
wrap-ansi@^7.0.0:
|
||||||
|
version "7.0.0"
|
||||||
|
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
|
||||||
|
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
|
||||||
|
dependencies:
|
||||||
|
ansi-styles "^4.0.0"
|
||||||
|
string-width "^4.1.0"
|
||||||
|
strip-ansi "^6.0.0"
|
||||||
|
|
||||||
wrap-ansi@^8.1.0:
|
wrap-ansi@^8.1.0:
|
||||||
version "8.1.0"
|
version "8.1.0"
|
||||||
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"
|
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"
|
||||||
|
|||||||
Reference in New Issue
Block a user