diff --git a/src/enterprise.css b/src/enterprise.css index f257492..25d8d81 100644 --- a/src/enterprise.css +++ b/src/enterprise.css @@ -1,4 +1,5 @@ /* Author: fruit.com.cn */ +.feed-video-shell,.feed-video-shell .video-player{width:100%;height:100%;object-fit:cover;background:#151515} .single-video-feed{position:relative}.feed-arrows{position:fixed;right:28px;top:50%;z-index:5;display:grid;gap:10px;transform:translateY(-50%)}.feed-arrows button{width:42px;height:42px;border:1px solid #555;border-radius:50%;background:#111c;color:#fff;font-size:20px;cursor:pointer}.feed-arrows button:disabled{opacity:.3;cursor:not-allowed}@media(max-width:760px){.feed-arrows{right:14px;top:auto;bottom:84px;transform:none}.feed-arrows button{width:38px;height:38px;background:#0009}} .single-video-page{position:fixed;inset:64px 0 0;background:#050505;z-index:2}.single-video-toolbar{position:absolute;top:0;left:0;right:0;height:58px;z-index:3;display:flex;align-items:center;gap:14px;padding:0 24px;background:linear-gradient(#000b,transparent);pointer-events:none}.single-video-toolbar button{pointer-events:auto;border:0;background:#0008;color:#fff;border-radius:50%;width:34px;height:34px;font-size:20px}.single-video-toolbar img{width:72px;height:34px;object-fit:contain}.single-video-toolbar span{color:#ddd;font-size:12px}.single-video-feed{height:100%;overflow-y:auto;scroll-snap-type:y mandatory;overscroll-behavior-y:contain}.single-video-feed>div{height:100%;scroll-snap-align:start}.single-video-slide{position:relative;height:100%;max-width:900px;margin:0 auto;background:#111}.single-video-stage,.single-video-stage .video-player,.single-video-placeholder{width:100%;height:100%;object-fit:contain;background:#050505}.single-video-placeholder{position:relative;display:grid;place-items:center}.single-video-placeholder img{width:100%;height:100%;object-fit:cover;opacity:.38}.single-video-placeholder span{position:absolute;background:#000b;border-radius:10px;padding:12px 16px;color:#fff}.single-video-info{position:absolute;left:28px;right:28px;bottom:28px;text-shadow:0 2px 14px #000}.single-video-info span{color:#ff786f;font-size:11px;letter-spacing:.12em}.single-video-info h1{margin:7px 0;font:700 28px Outfit}.single-video-info p{margin:0;color:#ddd}@media(max-width:760px){.single-video-page{inset:58px 0 0}.single-video-toolbar{padding:0 14px}.single-video-feed>div,.single-video-slide{height:100dvh}.single-video-info{left:20px;right:20px;bottom:34px}.single-video-info h1{font-size:23px}} .youtube-watch-layout{display:grid;grid-template-columns:minmax(0,1fr) 330px;gap:28px;max-width:1320px;margin:0 auto}.watch-main{min-width:0}.watch-channel-bar{display:flex;align-items:center;gap:12px;margin-bottom:16px}.watch-channel-bar img{width:72px;height:34px;object-fit:contain}.watch-channel-bar div{display:grid;gap:3px}.watch-channel-bar small{color:#999}.watch-channel-bar button{margin-left:auto;border:0;border-radius:20px;padding:10px 16px;background:#fff;color:#111;font-weight:600}.episode-feed{display:grid;gap:20px;scroll-snap-type:y mandatory}.episode-slide{position:relative;min-height:min(72vh,700px);scroll-snap-align:start;overflow:hidden;border-radius:16px;background:#111}.episode-slide-player{height:100%;min-height:min(72vh,700px)}.episode-slide-player .video-player,.episode-slide-placeholder{width:100%;height:100%;min-height:min(72vh,700px);object-fit:contain;background:#050505}.episode-slide-placeholder{position:relative;display:grid;place-items:center}.episode-slide-placeholder img{width:100%;height:100%;object-fit:cover;opacity:.42}.episode-slide-placeholder span{position:absolute;color:#fff;padding:12px 16px;border-radius:10px;background:#000b}.episode-slide-caption{position:absolute;left:24px;right:24px;bottom:20px;text-shadow:0 2px 15px #000}.episode-slide-caption span{color:#ff786f;font-size:11px;letter-spacing:.12em}.episode-slide-caption h2{margin:6px 0;font:700 26px Outfit}.episode-slide-caption p{margin:0;color:#ddd}.watch-sidebar{display:grid;align-content:start;gap:24px}.episode-list-panel{padding:16px;border:1px solid #303030;border-radius:14px;background:#171717}.episode-list-title{display:flex;align-items:center;gap:9px;margin-bottom:12px}.episode-list-title h2,.watch-recommendations h2{margin:0;font:700 20px Outfit}.episode-list-title span{color:#999}.episode-list-panel button{display:flex;align-items:center;gap:10px;width:100%;padding:10px;border:0;border-radius:8px;background:transparent;color:#ccc;text-align:left;cursor:pointer}.episode-list-panel button:hover,.episode-list-panel button.active{background:#3a2223;color:#fff}.episode-list-panel button b{color:#ff786f}.episode-list-panel button span{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.episode-list-panel button small{margin-left:auto}.watch-recommendations .media-card{margin-top:14px}@media(max-width:900px){.youtube-watch-layout{display:block}.watch-sidebar{margin-top:20px}.episode-slide,.episode-slide-player,.episode-slide-player .video-player,.episode-slide-placeholder{min-height:calc(100dvh - 190px)}.episode-feed{margin:0 -14px}.episode-slide{border-radius:0}.episode-slide-caption{bottom:28px}.watch-channel-bar,.watch-title,.watch-subtitle{margin-left:14px;margin-right:14px}} diff --git a/src/pages/ShortsFeedPage.jsx b/src/pages/ShortsFeedPage.jsx index 58ff5c3..dcd811e 100644 --- a/src/pages/ShortsFeedPage.jsx +++ b/src/pages/ShortsFeedPage.jsx @@ -1,12 +1,13 @@ // Author: fruit.com.cn -import { useEffect, useRef } from 'react'; +import { useEffect, useRef, useState } from 'react'; import { Link } from 'react-router-dom'; import { Play } from 'lucide-react'; import { videos } from '../data/catalog'; import { appApi } from '../services/appApi'; -import { normalizePage, normalizeDrama, uniqueDramas } from '../services/normalizers'; +import { normalizePage, normalizeDrama, selectPlaybackUrl, uniqueDramas } from '../services/normalizers'; import { useApi } from '../hooks/useApi'; import { useAppStore } from '../app/store'; +import { VideoPlayer } from '../components/player/VideoPlayer'; -function FeedItem({ video }) { const ref = useRef(null); useEffect(() => { const element = ref.current; const observer = new IntersectionObserver(([entry]) => { if (entry.isIntersecting) element.play().catch(() => {}); else element.pause(); }, { threshold: 0.7 }); observer.observe(element); return () => observer.disconnect(); }, []); const src = video.preview?.playUrl || video.videoUrl || ''; return
; } +function FeedItem({ video }) { const ref = useRef(null); const [active, setActive] = useState(false); const playback = useApi(() => video.preview?.id ? appApi.episodePlay(video.preview.id) : Promise.resolve(null), [video.preview?.id]); const src = selectPlaybackUrl(playback.data, video.preview?.playUrl); useEffect(() => { const element = ref.current; const observer = new IntersectionObserver(([entry]) => setActive(entry.isIntersecting), { threshold: 0.7 }); observer.observe(element); return () => observer.disconnect(); }, []); return
{src ? : {video.title}}
YMB SHORTS

{video.title}

{video.channel}

{video.watch || 'Watch drama'}
; } export function ShortsFeedPage() { const { locale } = useAppStore(); const api = useApi(() => appApi.dramas().then((payload) => uniqueDramas(normalizePage(payload).list.map((item) => normalizeDrama(item, locale.code)))), [locale.code]); const items = api.data || []; return
YMB SHORTS

{locale.shortTitle}

{locale.swipeHint || 'Swipe up to discover the next story'}

{api.loading &&
Loading real shorts…
}{api.error &&
{api.error}
}{!api.loading && !items.length &&
{locale.empty}
}{items.map((video) => )}
; } diff --git a/src/pages/WatchPage.jsx b/src/pages/WatchPage.jsx index d855b54..afcc548 100644 --- a/src/pages/WatchPage.jsx +++ b/src/pages/WatchPage.jsx @@ -3,12 +3,12 @@ import { useEffect, useRef, useState } from 'react'; import { useNavigate, useParams } from 'react-router-dom'; import { useAppStore } from '../app/store'; import { appApi } from '../services/appApi'; -import { normalizeDrama, normalizePage, resolvePlaybackUrl, uniqueDramas } from '../services/normalizers'; +import { normalizeDrama, normalizePage, selectPlaybackUrl, uniqueDramas } from '../services/normalizers'; import { useApi } from '../hooks/useApi'; import { VideoPlayer } from '../components/player/VideoPlayer'; function SwipeVideo({ video, active }) { - const ref = useRef(null); const playback = useApi(() => video.preview?.id ? appApi.episodePlay(video.preview.id) : Promise.resolve(null), [video.preview?.id]); const src = resolvePlaybackUrl(playback.data?.playUrl || video.preview?.playUrl); const image = video.image; + const ref = useRef(null); const playback = useApi(() => video.preview?.id ? appApi.episodePlay(video.preview.id) : Promise.resolve(null), [video.preview?.id]); const src = selectPlaybackUrl(playback.data, video.preview?.playUrl); const image = video.image; useEffect(() => { const node = ref.current; const observer = new IntersectionObserver(([entry]) => { if (entry.isIntersecting) node.classList.add('visible'); else node.classList.remove('visible'); }, { threshold: 0.7 }); observer.observe(node); return () => observer.disconnect(); }, []); return
{src ? :
{video.title}{playback.loading ? 'Loading video…' : playback.error || 'Preview unavailable'}
}
YMB SHORTS

{video.title}

{video.channel} · {video.views}

; } diff --git a/src/services/normalizers.js b/src/services/normalizers.js index 65fe3d6..0d6ad18 100644 --- a/src/services/normalizers.js +++ b/src/services/normalizers.js @@ -19,3 +19,5 @@ export function normalizePage(payload) { export function resolvePlaybackUrl(value) { return resolveMedia(value); } export function uniqueDramas(items) { const seen = new Set(); return items.filter((item) => { if (seen.has(item.id)) return false; seen.add(item.id); return true; }); } + +export function selectPlaybackUrl(playback, fallback = '') { const tracks = playback?.tracks || []; const preferred = tracks.find((track) => track.quality === '360p') || tracks.find((track) => track.quality === 'AUTO') || tracks[0]; return resolveMedia(preferred?.playUrl || playback?.playUrl || fallback); }