From b447ec0c76dbbe99336559ae4efaed9ac50d5dab Mon Sep 17 00:00:00 2001
From: Developer <dev@bilibili-app.local>
Date: Fri, 13 Mar 2026 00:30:07 +0800
Subject: [PATCH] 1

---
 components/BigVideoCard.tsx      | 65 +++++++++++++++++++++++---------
 components/NativeVideoPlayer.tsx | 22 ++++++-----
 utils/videoRows.ts               | 16 ++++++--
 3 files changed, 72 insertions(+), 31 deletions(-)

diff --git a/components/BigVideoCard.tsx b/components/BigVideoCard.tsx
index a7aa6fe..1083859 100644
--- a/components/BigVideoCard.tsx
+++ b/components/BigVideoCard.tsx
@@ -37,6 +37,7 @@ export function BigVideoCard({ item, isVisible, onPress }: Props) {
   const [videoUrl, setVideoUrl] = useState<string | undefined>();
   const [isDash, setIsDash] = useState(false);
   const [paused, setPaused] = useState(true);
+  const [muted, setMuted] = useState(true);
   const thumbOpacity = useRef(new Animated.Value(1)).current;
 
   // Reset video state when the item changes
@@ -44,6 +45,7 @@ export function BigVideoCard({ item, isVisible, onPress }: Props) {
     setVideoUrl(undefined);
     setIsDash(false);
     setPaused(true);
+    setMuted(true);
     thumbOpacity.setValue(1);
   }, [item.bvid]);
 
@@ -88,6 +90,7 @@ export function BigVideoCard({ item, isVisible, onPress }: Props) {
     if (!videoUrl) return;
     setPaused(!isVisible);
     if (!isVisible) {
+      setMuted(true);
       // Restore thumbnail when leaving viewport
       Animated.timing(thumbOpacity, {
         toValue: 1,
@@ -111,9 +114,28 @@ export function BigVideoCard({ item, isVisible, onPress }: Props) {
     <TouchableOpacity style={styles.card} onPress={onPress} activeOpacity={0.9}>
       {/* Media area */}
       <View style={[mediaDimensions, { position: "relative" }]}>
-        {/* Thumbnail */}
+        {/* Video player — rendered first so it sits behind the thumbnail */}
+        {videoUrl && (
+          <Video
+            source={
+              isDash
+                ? { uri: videoUrl, type: "mpd", headers: HEADERS }
+                : { uri: videoUrl, headers: HEADERS }
+            }
+            style={StyleSheet.absoluteFill}
+            resizeMode="cover"
+            muted={muted}
+            paused={paused}
+            repeat
+            controls={false}
+            onReadyForDisplay={handleVideoReady}
+          />
+        )}
+
+        {/* Thumbnail — on top of Video, fades out once video is ready */}
         <Animated.View
           style={[StyleSheet.absoluteFill, { opacity: thumbOpacity }]}
+          pointerEvents="none"
         >
           <Image
             source={{ uri: proxyImageUrl(item.pic) }}
@@ -136,22 +158,19 @@ export function BigVideoCard({ item, isVisible, onPress }: Props) {
           </Text>
         </View>
 
-        {/* Video player — only mounted when URL is available */}
-        {videoUrl && (
-          <Video
-            source={
-              isDash
-                ? { uri: videoUrl, type: "mpd", headers: HEADERS }
-                : { uri: videoUrl, headers: HEADERS }
-            }
-            style={StyleSheet.absoluteFill}
-            resizeMode="cover"
-            muted
-            paused={paused}
-            repeat
-            controls={false}
-            onReadyForDisplay={handleVideoReady}
-          />
+        {/* Mute toggle — visible only when video is playing */}
+        {videoUrl && !paused && (
+          <TouchableOpacity
+            style={styles.muteBtn}
+            onPress={() => setMuted((m) => !m)}
+            activeOpacity={0.7}
+          >
+            <Ionicons
+              name={muted ? "volume-mute" : "volume-high"}
+              size={16}
+              color="#fff"
+            />
+          </TouchableOpacity>
         )}
       </View>
 
@@ -188,6 +207,18 @@ const styles = StyleSheet.create({
     zIndex: 2,
   },
   durationText: { color: "#fff", fontSize: 10 },
+  muteBtn: {
+    position: "absolute",
+    top: 8,
+    right: 8,
+    backgroundColor: "rgba(0,0,0,0.5)",
+    borderRadius: 14,
+    width: 28,
+    height: 28,
+    alignItems: "center",
+    justifyContent: "center",
+    zIndex: 3,
+  },
   info: { padding: 8 },
   title: { fontSize: 14, color: "#212121", lineHeight: 18, marginBottom: 4 },
   meta: {
diff --git a/components/NativeVideoPlayer.tsx b/components/NativeVideoPlayer.tsx
index d6cd8ff..5cc2b37 100644
--- a/components/NativeVideoPlayer.tsx
+++ b/components/NativeVideoPlayer.tsx
@@ -190,6 +190,7 @@ export function NativeVideoPlayer({
 
   const [showQuality, setShowQuality] = useState(false);
 
+  const [buffered, setBuffered] = useState(0);
   const [isSeeking, setIsSeeking] = useState(false);
   const isSeekingRef = useRef(false);
   const [touchX, setTouchX] = useState<number | null>(null);
@@ -332,6 +333,7 @@ export function NativeVideoPlayer({
   const touchRatio =
     touchX !== null ? clamp(touchX / barWidthRef.current, 0, 1) : null;
   const progressRatio = duration > 0 ? clamp(currentTime / duration, 0, 1) : 0;
+  const bufferedRatio = duration > 0 ? clamp(buffered / duration, 0, 1) : 0;
 
   const THUMB_DISPLAY_W = 120; // scaled display width
 
@@ -419,9 +421,10 @@ export function NativeVideoPlayer({
           resizeMode="contain"
           controls={false}
           paused={paused}
-          onProgress={({ currentTime: ct, seekableDuration: dur }) => {
+          onProgress={({ currentTime: ct, seekableDuration: dur, playableDuration: buf }) => {
             setCurrentTime(ct);
             if (dur > 0) setDuration(dur);
+            setBuffered(buf);
             onTimeUpdate?.(ct);
           }}
           onLoad={() => {
@@ -498,16 +501,18 @@ export function NativeVideoPlayer({
               {...panResponder.panHandlers}
             >
               <View style={styles.track}>
+                {/* Buffered: lighter white overlay on top of base */}
                 <View
                   style={[
-                    styles.seg,
-                    { flex: 1, backgroundColor: "#00AEEC" },
+                    styles.trackLayer,
+                    { width: `${bufferedRatio * 100}%` as any, backgroundColor: "rgba(255,255,255,0.35)" },
                   ]}
                 />
+                {/* Played: accent color on top */}
                 <View
                   style={[
-                    styles.playedOverlay,
-                    { width: `${progressRatio * 100}%` as any },
+                    styles.trackLayer,
+                    { width: `${progressRatio * 100}%` as any, backgroundColor: "#00AEEC" },
                   ]}
                 />
               </View>
@@ -672,18 +677,15 @@ const styles = StyleSheet.create({
   },
   track: {
     height: BAR_H,
-    flexDirection: "row",
     borderRadius: 2,
     overflow: "hidden",
-    backgroundColor: "rgba(255,255,255,0.3)",
+    backgroundColor: "rgba(255,255,255,0.2)",
   },
-  seg: { height: BAR_H },
-  playedOverlay: {
+  trackLayer: {
     position: "absolute",
     top: 0,
     left: 0,
     height: BAR_H,
-    backgroundColor: "rgba(255,255,255,0.3)",
   },
   ball: {
     position: "absolute",
diff --git a/utils/videoRows.ts b/utils/videoRows.ts
index 14d6260..ba22519 100644
--- a/utils/videoRows.ts
+++ b/utils/videoRows.ts
@@ -27,11 +27,19 @@ export function toListRows(videos: VideoItem[]): ListRow[] {
   const rows: ListRow[] = [];
   for (let start = 0; start < videos.length; start += PAGE) {
     const chunk = videos.slice(start, start + PAGE);
-    const body = chunk.slice(0, chunk.length - 1);
-    for (let i = 0; i < body.length; i += 2) {
-      rows.push({ type: 'pair', left: body[i], right: body[i + 1] ?? null });
+    // Pick the video with the highest view count as the BigRow
+    let bigIdx = 0;
+    let maxView = chunk[0].stat?.view ?? 0;
+    for (let i = 1; i < chunk.length; i++) {
+      const v = chunk[i].stat?.view ?? 0;
+      if (v > maxView) { maxView = v; bigIdx = i; }
     }
-    rows.push({ type: 'big', item: chunk[chunk.length - 1] });
+    const bigItem = chunk[bigIdx];
+    const rest = chunk.filter((_, i) => i !== bigIdx);
+    for (let i = 0; i < rest.length; i += 2) {
+      rows.push({ type: 'pair', left: rest[i], right: rest[i + 1] ?? null });
+    }
+    rows.push({ type: 'big', item: bigItem });
   }
 
   return rows;