fix(player): 优化上下滑切集黑屏

chore(merge): 合并 iOS 无线数据选择框触发
fix(ios): 用系统网络请求唤起无线数据选择
2026-10-26 13:15:56 +08:00 · 2026-10-26 09:35:29 +08:00 · 2026-10-26 09:35:29 +08:00 · 2026-10-25 21:23:26 +08:00 · 2026-10-25 21:23:25 +08:00 · 2026-10-24 17:22:57 +08:00
241 changed files with 9716 additions and 3205 deletions
@@ -1,7 +1,7 @@
 <!-- Author: fruit.com.cn -->
-
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission
+        android:name="android.permission.INTERNET"/>
    <application
        android:label="FruitShorts"
        android:name="${applicationName}"
@@ -23,9 +23,8 @@
                 while the Flutter UI initializes. After that, this theme continues
                 to determine the Window background behind the Flutter UI. -->
            <meta-data
-              android:name="io.flutter.embedding.android.NormalTheme"
-              android:resource="@style/NormalTheme"
-              />
+                android:name="io.flutter.embedding.android.NormalTheme"
+                android:resource="@style/NormalTheme"/>
            <intent-filter>
                <action android:name="android.intent.action.MAIN"/>
                <category android:name="android.intent.category.LAUNCHER"/>
@@ -35,7 +34,7 @@
             This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
        <meta-data
            android:name="flutterEmbedding"
-            android:value="2" />
+            android:value="2"/>
    </application>
    <!-- Required to query activities that can process text, see:
         https://developer.android.com/training/package-visibility and
@@ -44,8 +43,10 @@
         In particular, this is used by the Flutter engine in io.flutter.plugin.text.ProcessTextPlugin. -->
    <queries>
        <intent>
-            <action android:name="android.intent.action.PROCESS_TEXT"/>
-            <data android:mimeType="text/plain"/>
+            <action
+                android:name="android.intent.action.PROCESS_TEXT"/>
+            <data
+                android:mimeType="text/plain"/>
        </intent>
    </queries>
 </manifest>
@@ -36,6 +36,9 @@ class MainActivity : FlutterActivity() {
    private var imeInset = 0

    override fun onCreate(savedInstanceState: Bundle?) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+            splashScreen.setOnExitAnimationListener { screen -> screen.remove() }
+        }
        super.onCreate(savedInstanceState)
        window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
    }
@@ -1,4 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- Author: fruit.com.cn -->
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
    <item android:drawable="@color/splash_background" />
+    <item>
+        <bitmap
+            android:gravity="center"
+            android:src="@drawable/splash_screen" />
+    </item>
 </layer-list>
@@ -1,4 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- Author: fruit.com.cn -->
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
    <item android:drawable="@color/splash_background" />
+    <item>
+        <bitmap
+            android:gravity="center"
+            android:src="@drawable/splash_screen" />
+    </item>
 </layer-list>
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- Author: fruit.com.cn -->
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@color/splash_background" />
    <item>
-        <bitmap android:gravity="fill" android:src="@drawable/background"/>
-    </item>
-    <item>
-        <bitmap android:gravity="center" android:src="@drawable/splash"/>
+        <bitmap
+            android:gravity="center"
+            android:src="@drawable/splash_screen" />
    </item>
 </layer-list>
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Author: fruit.com.cn -->
-
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
    <item android:drawable="@color/splash_background" />
+    <item>
+        <bitmap
+            android:gravity="center"
+            android:src="@drawable/splash_screen" />
+    </item>
 </layer-list>
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- Author: fruit.com.cn -->
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@color/splash_background" />
    <item>
-        <bitmap android:gravity="fill" android:src="@drawable/background"/>
-    </item>
-    <item>
-        <bitmap android:gravity="center" android:src="@drawable/splash"/>
+        <bitmap
+            android:gravity="center"
+            android:src="@drawable/splash_screen" />
    </item>
 </layer-list>
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-  <background android:drawable="@mipmap/ic_launcher_background"/>
-  <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+  <background android:drawable="@color/ic_launcher_background"/>
+  <foreground>
+      <inset
+          android:drawable="@drawable/ic_launcher_foreground"
+          android:inset="16%" />
+  </foreground>
 </adaptive-icon>
@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Author: fruit.com.cn -->
-
 <resources>
    <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
        <item name="android:windowBackground">@drawable/launch_background</item>
-        <item name="android:windowSplashScreenBackground">@color/splash_background</item>
-        <item name="android:windowSplashScreenAnimatedIcon">@drawable/android12splash</item>
+        <item name="android:forceDarkAllowed">false</item>
+        <item name="android:windowFullscreen">false</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">false</item>
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
+        <item name="android:windowSplashScreenBackground">#000000</item>
+        <item name="android:windowSplashScreenAnimatedIcon">@drawable/splash_brand</item>
+        <item name="android:windowSplashScreenAnimationDuration">0</item>
    </style>
    <style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
        <item name="android:windowBackground">@color/splash_background</item>
@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Author: fruit.com.cn -->
-
 <resources>
    <style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
        <item name="android:windowBackground">@drawable/launch_background</item>
-        <item name="android:windowSplashScreenBackground">@color/splash_background</item>
-        <item name="android:windowSplashScreenAnimatedIcon">@drawable/android12splash</item>
+        <item name="android:forceDarkAllowed">false</item>
+        <item name="android:windowFullscreen">false</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">false</item>
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
+        <item name="android:windowSplashScreenBackground">#000000</item>
+        <item name="android:windowSplashScreenAnimatedIcon">@drawable/splash_brand</item>
+        <item name="android:windowSplashScreenAnimationDuration">0</item>
    </style>
    <style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
        <item name="android:windowBackground">@color/splash_background</item>
@@ -2,5 +2,6 @@
 <!-- Author: fruit.com.cn -->

 <resources>
-    <color name="splash_background">#1F1B16</color>
-</resources>
+	<color name="splash_background">#000000</color>
+	<color name="ic_launcher_background">#FF6B2C</color>
+</resources>
@@ -1288,3 +1288,34 @@ $ flutter test
 - 下拉刷新统一为 40×40、60% 黑底圆角指示器内嵌 20 白色加载圈，不再显示任何状态文字。
 - 网络分页与本地分页 footer 统一仅显示白色加载圈，无更多状态完全隐藏；通知页补触底自动加载。
 - 移除不再使用的刷新提示与无更多文案；`flutter analyze`：No issues found。
+
+## 2026-10-22 首页热播榜重做
+
+- 首页榜单 tab 改为独立领奖台 + 单列排行布局，不再复用三列网格。
+- 前三名按 2/1/3 排列，冠军放大并上移；第 4 名起使用大号描边名次与横向信息行。
+- 榜单沿用现有播放热度排序、分页和播放逻辑；`flutter analyze`：No issues found。
+
+## 2026-10-22 播放器双击点赞与飘心
+
+- 沉浸式播放器改用 onTapUp + 280ms Timer 判定双击，双击取消单击，长按左右倍速与中间更多保持不变。
+- 双击和右侧心形共用点赞方法，成功后控制器通知并点亮红色实心心形，失败由 controller 回滚并使用 Toast。
+- 飘心层使用独立 IgnorePointer Stack，动画完成后自动移除；`flutter analyze`：No issues found。
+- `flutter test test/player/double_tap_like_test.dart`：2 项测试全部通过。
+- 移除视频表面点击识别器，双击后增加 300ms 暂停防护；飘心收敛为 3~4 颗、20~26、±18、90~120dp、600~700ms。
+- 双击窗口延长至 320ms，单击 Timer 使用点击序号校验，双击后保留 350ms 播放切换保护。
+- `double_tap_like_test.dart` 覆盖 120/250/300ms 双击与 500ms 单击恢复：2 项测试全部通过。
+
+## 2026-10-22 统一二级搜索页
+
+- 首页与推荐/剧单/全部短剧搜索入口统一 push SearchPage，不再切换推荐 tab 聚焦。
+- 搜索页提供返回、自动聚焦输入框与取消，复用 `/app/search` 逻辑和首页三列卡片。
+- 清理旧的 searchRequest/focusSearch/syncSearch 参数；`flutter analyze`：No issues found。
+- 搜索页结果改为独立两列卡片，左右 14、列距 12、行距 16，并移除 HomeFeedCard 复用。
+- 搜索结果支持下拉刷新：保留旧结果按当前关键词重取第一页，空关键词直接回弹且不改变焦点。
+
+## 2026-10-22 App 图标与开屏更新
+
+- Launcher/Android 12 启动背景统一纯黑，自适应图标背景改为品牌橙。
+- Android/iOS 图标与启动资源已重新生成；应用内开屏固定 splash_logo，宽 200 等比居中。
+- `flutter analyze`：No issues found。
+- 移除 Flutter 内 `_startupSplash` 与 `startup-splash`，只保留系统原生开屏；最新斜体字标素材已重新生成。
@@ -11,6 +11,7 @@
 		331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; };
 		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
 		74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
+		8C4E1A022F9A4B1000C636F3 /* WirelessDataPrompt.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8C4E1A012F9A4B1000C636F3 /* WirelessDataPrompt.swift */; };
 		7884E8682EC3CC0700C636F2 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7884E8672EC3CC0400C636F2 /* SceneDelegate.swift */; };
 		78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */; };
 		97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
@@ -49,6 +50,7 @@
 		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
 		74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
 		74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
+		8C4E1A012F9A4B1000C636F3 /* WirelessDataPrompt.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WirelessDataPrompt.swift; sourceTree = "<group>"; };
 		7884E8672EC3CC0400C636F2 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
 		78E0A7A72DC9AD7400C4905E /* FlutterGeneratedPluginSwiftPackage */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = FlutterGeneratedPluginSwiftPackage; path = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage; sourceTree = "<group>"; };
 		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
@@ -122,6 +124,7 @@
 				1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */,
 				1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */,
 				74858FAE1ED2DC5600515810 /* AppDelegate.swift */,
+				8C4E1A012F9A4B1000C636F3 /* WirelessDataPrompt.swift */,
 				7884E8672EC3CC0400C636F2 /* SceneDelegate.swift */,
 				74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */,
 			);
@@ -282,6 +285,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */,
+				8C4E1A022F9A4B1000C636F3 /* WirelessDataPrompt.swift in Sources */,
 				1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */,
 				7884E8682EC3CC0700C636F2 /* SceneDelegate.swift in Sources */,
 			);
@@ -2,6 +2,8 @@ import Flutter
 import UIKit
 import AVFoundation

+private let thumbnailHTTPHeaderFieldsKey = "AVURLAssetHTTPHeaderFieldsKey"
+
 private final class ThumbnailResponseGate {
  private let lock = NSLock()
  private var completed = false
@@ -29,12 +31,13 @@ final class RunnerFlutterViewController: FlutterViewController {

  override func viewDidLoad() {
    super.viewDidLoad()
-    view.backgroundColor = UIColor(red: 16.0 / 255.0, green: 12.0 / 255.0, blue: 10.0 / 255.0, alpha: 1)
+    view.backgroundColor = .black
  }
 }

@main
@objc class AppDelegate: FlutterAppDelegate, FlutterImplicitEngineDelegate {
+  private let wirelessDataPrompt = WirelessDataPrompt()
  private let thumbnailQueue = DispatchQueue(
    label: "com.stormg.lumadrama.thumbnail",
    qos: .userInitiated
@@ -48,8 +51,18 @@ final class RunnerFlutterViewController: FlutterViewController {
    return super.application(application, didFinishLaunchingWithOptions: launchOptions)
  }

+  override func applicationDidBecomeActive(_ application: UIApplication) {
+    super.applicationDidBecomeActive(application)
+    requestWirelessDataPrompt()
+  }
+
+  func requestWirelessDataPrompt() {
+    wirelessDataPrompt.requestSystemPrompt()
+  }
+
  func didInitializeImplicitFlutterEngine(_ engineBridge: FlutterImplicitEngineBridge) {
    GeneratedPluginRegistrant.register(with: engineBridge.pluginRegistry)
+    registerWirelessDataChannel(engineBridge)
    let channel = FlutterMethodChannel(
      name: "com.stormg.lumadrama/share",
      binaryMessenger: engineBridge.applicationRegistrar.messenger()
@@ -104,7 +117,7 @@ final class RunnerFlutterViewController: FlutterViewController {

      let options: [String: Any]? = headers.isEmpty
        ? nil
-        : [AVURLAssetHTTPHeaderFieldsKey: headers]
+        : [thumbnailHTTPHeaderFieldsKey: headers]
      let asset = AVURLAsset(url: assetUrl, options: options)
      let generator = AVAssetImageGenerator(asset: asset)
      generator.appliesPreferredTrackTransform = true
@@ -130,4 +143,22 @@ final class RunnerFlutterViewController: FlutterViewController {
      }
    }
  }
+
+  private func registerWirelessDataChannel(_ engineBridge: FlutterImplicitEngineBridge) {
+    let channel = FlutterMethodChannel(
+      name: WirelessDataPrompt.channelName,
+      binaryMessenger: engineBridge.applicationRegistrar.messenger()
+    )
+    channel.setMethodCallHandler { [weak self] call, result in
+      guard call.method == WirelessDataPrompt.awaitDecisionMethod else {
+        result(FlutterMethodNotImplemented)
+        return
+      }
+      guard let self else {
+        result(nil)
+        return
+      }
+      self.wirelessDataPrompt.awaitDecision(result)
+    }
+  }
 }
@@ -16,18 +16,13 @@
                    <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                        <subviews>
-                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" image="LaunchBackground" translatesAutoresizingMaskIntoConstraints="NO" id="tWc-Dq-wcI"/>
-                            <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" image="LaunchImage" translatesAutoresizingMaskIntoConstraints="NO" id="YRO-k0-Ey4"></imageView>
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" image="LaunchImage" translatesAutoresizingMaskIntoConstraints="NO" id="YRO-k0-Ey4"/>
                        </subviews>
-                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <color key="backgroundColor" red="0" green="0" blue="0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                        <constraints>
                            <constraint firstItem="YRO-k0-Ey4" firstAttribute="leading" secondItem="Ze5-6b-2t3" secondAttribute="leading" id="3T2-ad-Qdv"/>
-                            <constraint firstItem="tWc-Dq-wcI" firstAttribute="bottom" secondItem="Ze5-6b-2t3" secondAttribute="bottom" id="RPx-PI-7Xg"/>
-                            <constraint firstItem="tWc-Dq-wcI" firstAttribute="top" secondItem="Ze5-6b-2t3" secondAttribute="top" id="SdS-ul-q2q"/>
-                            <constraint firstAttribute="trailing" secondItem="tWc-Dq-wcI" secondAttribute="trailing" id="Swv-Gf-Rwn"/>
                            <constraint firstAttribute="trailing" secondItem="YRO-k0-Ey4" secondAttribute="trailing" id="TQA-XW-tRk"/>
                            <constraint firstItem="YRO-k0-Ey4" firstAttribute="bottom" secondItem="Ze5-6b-2t3" secondAttribute="bottom" id="duK-uY-Gun"/>
-                            <constraint firstItem="tWc-Dq-wcI" firstAttribute="leading" secondItem="Ze5-6b-2t3" secondAttribute="leading" id="kV7-tw-vXt"/>
                            <constraint firstItem="YRO-k0-Ey4" firstAttribute="top" secondItem="Ze5-6b-2t3" secondAttribute="top" id="xPn-NY-SIU"/>
                        </constraints>
                    </view>
@@ -38,7 +33,6 @@
        </scene>
    </scenes>
    <resources>
-        <image name="LaunchImage" width="1152" height="1152"/>
-        <image name="LaunchBackground" width="1" height="1"/>
+        <image name="LaunchImage" width="390" height="844"/>
    </resources>
 </document>
@@ -1,109 +1,111 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-<dict>
-	<key>CADisableMinimumFrameDurationOnPhone</key>
-	<true/>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>$(DEVELOPMENT_LANGUAGE)</string>
-	<key>CFBundleDisplayName</key>
-	<string>FruitShorts</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>FruitShorts</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>$(FLUTTER_BUILD_NAME)</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>$(FLUTTER_BUILD_NUMBER)</string>
-	<key>LSRequiresIPhoneOS</key>
-	<true/>
-	<key>NSAppTransportSecurity</key>
 	<dict>
-		<key>NSAllowsArbitraryLoads</key>
+		<key>CADisableMinimumFrameDurationOnPhone</key>
 		<true/>
-		<key>NSAllowsLocalNetworking</key>
+		<key>CFBundleDevelopmentRegion</key>
+		<string>$(DEVELOPMENT_LANGUAGE)</string>
+		<key>CFBundleDisplayName</key>
+		<string>FruitShorts</string>
+		<key>CFBundleExecutable</key>
+		<string>$(EXECUTABLE_NAME)</string>
+		<key>CFBundleIdentifier</key>
+		<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+		<key>CFBundleInfoDictionaryVersion</key>
+		<string>6.0</string>
+		<key>CFBundleName</key>
+		<string>FruitShorts</string>
+		<key>CFBundlePackageType</key>
+		<string>APPL</string>
+		<key>CFBundleShortVersionString</key>
+		<string>$(FLUTTER_BUILD_NAME)</string>
+		<key>CFBundleSignature</key>
+		<string>????</string>
+		<key>CFBundleVersion</key>
+		<string>$(FLUTTER_BUILD_NUMBER)</string>
+		<key>LSRequiresIPhoneOS</key>
 		<true/>
-		<key>NSExceptionDomains</key>
+		<key>NSAppTransportSecurity</key>
 		<dict>
-			<key>127.0.0.1</key>
+			<key>NSAllowsArbitraryLoads</key>
+			<true/>
+			<key>NSAllowsLocalNetworking</key>
+			<true/>
+			<key>NSExceptionDomains</key>
 			<dict>
-				<key>NSExceptionAllowsInsecureHTTPLoads</key>
-				<true/>
-				<key>NSIncludesSubdomains</key>
-				<true/>
-			</dict>
-			<key>localhost</key>
-			<dict>
-				<key>NSExceptionAllowsInsecureHTTPLoads</key>
-				<true/>
-				<key>NSIncludesSubdomains</key>
-				<true/>
-			</dict>
-			<key>192.168.31.187</key>
-			<dict>
-				<key>NSExceptionAllowsInsecureHTTPLoads</key>
-				<true/>
-				<key>NSIncludesSubdomains</key>
-				<true/>
-			</dict>
-			<key>39.162.50.99</key>
-			<dict>
-				<key>NSExceptionAllowsInsecureHTTPLoads</key>
-				<true/>
-				<key>NSIncludesSubdomains</key>
-				<true/>
-			</dict>
-		</dict>
-	</dict>
-	<key>NSLocalNetworkUsageDescription</key>
-	<string>开发阶段需要访问同一局域网内的短剧内容服务。</string>
-	<key>UIApplicationSceneManifest</key>
-	<dict>
-		<key>UIApplicationSupportsMultipleScenes</key>
-		<false/>
-		<key>UISceneConfigurations</key>
-		<dict>
-			<key>UIWindowSceneSessionRoleApplication</key>
-			<array>
+				<key>127.0.0.1</key>
 				<dict>
-					<key>UISceneClassName</key>
-					<string>UIWindowScene</string>
-					<key>UISceneConfigurationName</key>
-					<string>flutter</string>
-					<key>UISceneDelegateClassName</key>
-					<string>$(PRODUCT_MODULE_NAME).SceneDelegate</string>
-					<key>UISceneStoryboardFile</key>
-					<string>Main</string>
+					<key>NSExceptionAllowsInsecureHTTPLoads</key>
+					<true/>
+					<key>NSIncludesSubdomains</key>
+					<true/>
 				</dict>
-			</array>
+				<key>localhost</key>
+				<dict>
+					<key>NSExceptionAllowsInsecureHTTPLoads</key>
+					<true/>
+					<key>NSIncludesSubdomains</key>
+					<true/>
+				</dict>
+				<key>10.43.47.1</key>
+				<dict>
+					<key>NSExceptionAllowsInsecureHTTPLoads</key>
+					<true/>
+					<key>NSIncludesSubdomains</key>
+					<true/>
+				</dict>
+				<key>39.162.50.99</key>
+				<dict>
+					<key>NSExceptionAllowsInsecureHTTPLoads</key>
+					<true/>
+					<key>NSIncludesSubdomains</key>
+					<true/>
+				</dict>
+			</dict>
 		</dict>
+		<key>NSLocalNetworkUsageDescription</key>
+		<string>开发阶段需要访问同一局域网内的短剧内容服务。</string>
+		<key>UIApplicationSceneManifest</key>
+		<dict>
+			<key>UIApplicationSupportsMultipleScenes</key>
+			<false/>
+			<key>UISceneConfigurations</key>
+			<dict>
+				<key>UIWindowSceneSessionRoleApplication</key>
+				<array>
+					<dict>
+						<key>UISceneClassName</key>
+						<string>UIWindowScene</string>
+						<key>UISceneConfigurationName</key>
+						<string>flutter</string>
+						<key>UISceneDelegateClassName</key>
+						<string>$(PRODUCT_MODULE_NAME).SceneDelegate</string>
+						<key>UISceneStoryboardFile</key>
+						<string>Main</string>
+					</dict>
+				</array>
+			</dict>
+		</dict>
+		<key>UIApplicationSupportsIndirectInputEvents</key>
+		<true/>
+		<key>UILaunchStoryboardName</key>
+		<string>LaunchScreen</string>
+		<key>UIMainStoryboardFile</key>
+		<string>Main</string>
+		<key>UISupportedInterfaceOrientations</key>
+		<array>
+			<string>UIInterfaceOrientationPortrait</string>
+			<string>UIInterfaceOrientationLandscapeLeft</string>
+			<string>UIInterfaceOrientationLandscapeRight</string>
+		</array>
+		<key>UISupportedInterfaceOrientations~ipad</key>
+		<array>
+			<string>UIInterfaceOrientationPortrait</string>
+			<string>UIInterfaceOrientationLandscapeLeft</string>
+			<string>UIInterfaceOrientationLandscapeRight</string>
+		</array>
+		<key>UIStatusBarHidden</key>
+		<false/>
 	</dict>
-	<key>UIApplicationSupportsIndirectInputEvents</key>
-	<true/>
-	<key>UILaunchStoryboardName</key>
-	<string>LaunchScreen</string>
-	<key>UIMainStoryboardFile</key>
-	<string>Main</string>
-	<key>UISupportedInterfaceOrientations</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>UISupportedInterfaceOrientations~ipad</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-</dict>
 </plist>
@@ -1,6 +1,11 @@
+// Author: fruit.com.cn
+
 import Flutter
 import UIKit

 class SceneDelegate: FlutterSceneDelegate {
-
+  override func sceneDidBecomeActive(_ scene: UIScene) {
+    super.sceneDidBecomeActive(scene)
+    (UIApplication.shared.delegate as? AppDelegate)?.requestWirelessDataPrompt()
+  }
 }
@@ -0,0 +1,68 @@
+// Author: fruit.com.cn
+
+import CoreTelephony
+import Flutter
+import Foundation
+
+/// 监听系统无线数据选择，并用 URLSession 唤起系统选择框。
+final class WirelessDataPrompt {
+  static let channelName = "com.stormg.lumadrama/wireless-data"
+  static let awaitDecisionMethod = "awaitDecision"
+
+  /// 系统选择框由 URLSession 触发，Dart 的 Socket 请求不会弹出。
+  private static let promptURL = URL(string: "https://captive.apple.com/hotspot-detect.html")
+
+  private let cellularData = CTCellularData()
+  private let lock = NSLock()
+  private var pending: [FlutterResult] = []
+  private var decided = false
+  private var didRequestPrompt = false
+
+  init() {
+    cellularData.cellularDataRestrictionDidUpdateNotifier = { [weak self] state in
+      DispatchQueue.main.async {
+        self?.completeIfDecided(state)
+      }
+    }
+  }
+
+  /// 应用进入前台后请求一次，促使系统弹出无线数据选择。
+  func requestSystemPrompt() {
+    guard !didRequestPrompt, let promptURL = Self.promptURL else {
+      return
+    }
+    didRequestPrompt = true
+    _ = cellularData.restrictedState
+    URLSession.shared.dataTask(with: promptURL) { _, _, _ in }.resume()
+  }
+
+  /// 未允许前先挂起；用户允许无线数据后再放行。
+  func awaitDecision(_ result: @escaping FlutterResult) {
+    lock.lock()
+    if decided {
+      lock.unlock()
+      DispatchQueue.main.async {
+        result(nil)
+      }
+      return
+    }
+    pending.append(result)
+    lock.unlock()
+  }
+
+  private func completeIfDecided(_ state: CTCellularDataRestrictedState) {
+    if state != .notRestricted {
+      return
+    }
+    lock.lock()
+    if decided {
+      lock.unlock()
+      return
+    }
+    decided = true
+    let waiters = pending
+    pending.removeAll()
+    lock.unlock()
+    waiters.forEach { $0(nil) }
+  }
+}
@@ -30,6 +30,7 @@ import 'core/data/repositories/favorite_repository.dart';
 import 'core/data/repositories/interaction_repository.dart';
 import 'core/data/repositories/notice_repository.dart';
 import 'core/data/repositories/playback_repository.dart';
+import 'core/data/repositories/playlist_repository.dart';
 import 'core/data/repositories/search_repository.dart';
 import 'core/data/repositories/store_repository.dart';
 import 'core/data/repositories/watch_history_repository.dart';
@@ -41,6 +42,7 @@ import 'core/data/services/download_controller.dart';
 import 'core/data/services/favorite_controller.dart';
 import 'core/data/services/interaction_controller.dart';
 import 'core/data/services/locale_controller.dart';
+import 'core/data/services/playlist_controller.dart';
 import 'core/data/services/event_tracker.dart';
 import 'core/data/services/playback_position_cache.dart';
 import 'core/data/services/playback_session.dart';
@@ -83,6 +85,7 @@ class LumaDramaApp extends StatefulWidget {
    this.commerceRepository,
    this.storeRepository,
    this.searchRepository,
+    this.playlistRepository,
    this.haptics = const FlutterHaptics(),
  });

@@ -103,6 +106,7 @@ class LumaDramaApp extends StatefulWidget {
  final CommerceRepository? commerceRepository;
  final StoreRepository? storeRepository;
  final SearchRepository? searchRepository;
+  final PlaylistRepository? playlistRepository;
  final Haptics haptics;

  @override
@@ -126,8 +130,10 @@ class _LumaDramaAppState extends State<LumaDramaApp> {
    _sessionStore,
  );

+  late final CatalogApi _catalogApi = CatalogApi(_apiClient);
+
  late final CatalogRepository _catalogRepository =
-      widget.catalogRepository ?? HttpCatalogRepository(CatalogApi(_apiClient));
+      widget.catalogRepository ?? HttpCatalogRepository(_catalogApi);

  late final CategoryRepository _categoryRepository =
      widget.categoryRepository ??
@@ -177,6 +183,13 @@ class _LumaDramaAppState extends State<LumaDramaApp> {
  late final SearchRepository _searchRepository =
      widget.searchRepository ?? HttpSearchRepository(CatalogApi(_apiClient));

+  /// 测试注入了目录仓库时不打剧单接口，剧单页继续用本地分区。
+  late final PlaylistRepository? _playlistRepository =
+      widget.playlistRepository ??
+      (widget.catalogRepository == null
+          ? HttpPlaylistRepository(CatalogApi(_apiClient))
+          : null);
+
  late final StoreRepository _storeRepository =
      widget.storeRepository ?? HttpStoreRepository(CommerceApi(_apiClient));

@@ -239,14 +252,26 @@ class _LumaDramaAppState extends State<LumaDramaApp> {
    super.dispose();
  }

+  CategoryController _createCategories() {
+    final controller = CategoryController(_categoryRepository);
+    if (widget.catalogRepository == null) {
+      controller.dramaPageLoader = CategoryApi(_apiClient).dramas;
+    }
+    controller.load();
+    return controller;
+  }
+
  @override
  Widget build(BuildContext context) {
+    final playlists = _playlistRepository;
    return MultiProvider(
      providers: [
        Provider(create: (_) => PlaybackCoordinator()),
        Provider<EventTracker>(create: (_) => EventTracker(_apiClient)),
        Provider<PlayerFactory>(create: (_) => widget.playerFactory),
        Provider<CatalogRepository>.value(value: _catalogRepository),
+        if (widget.catalogRepository == null)
+          Provider<CatalogApi>.value(value: _catalogApi),
        Provider<PlaybackRepository>.value(value: _playback),
        Provider<PlaybackPositionCache>.value(value: _playbackPositionCache),
        Provider<WatchHistoryRepository>.value(value: _watchHistory),
@@ -260,11 +285,17 @@ class _LumaDramaAppState extends State<LumaDramaApp> {
        Provider<SearchRepository>.value(value: _searchRepository),
        Provider<Haptics>.value(value: widget.haptics),
        ChangeNotifierProvider(
-          create: (_) => CatalogController(_catalogRepository)..load(),
-        ),
-        ChangeNotifierProvider(
-          create: (_) => CategoryController(_categoryRepository)..load(),
+          create: (_) {
+            final catalog = CatalogController(_catalogRepository);
+            if (widget.catalogRepository != null) catalog.load();
+            return catalog;
+          },
        ),
+        ChangeNotifierProvider(create: (_) => _createCategories()),
+        if (playlists != null)
+          ChangeNotifierProvider(
+            create: (_) => PlaylistController(playlists),
+          ),
        ChangeNotifierProvider.value(value: _favoriteController),
        ChangeNotifierProvider.value(value: _downloadController),
        ChangeNotifierProvider.value(value: _walletController),
@@ -14,7 +14,7 @@ class AppConfig {
  /// 开发调试默认服务地址，当前指向本机局域网 IP。
  ///
  /// 换网络时只改这一行，地址不要带结尾斜杠。
-  static const String devHostBaseUrl = 'http://192.168.31.187:8081';
+  static const String devHostBaseUrl = 'http://10.43.47.1:8081';

  /// 本机后端地址：通过 `adb reverse tcp:8081 tcp:8081` 映射到开发机，
  /// 探测可达时 App 直连本机服务；不可达时回落到公网地址。
@@ -1,17 +1,30 @@
 // Author: fruit.com.cn

+import 'locale_text.dart';
+
 /// 服务端内容分类。id 按契约保持字符串，避免雪花 ID 精度丢失。
 class ContentCategory {
-  const ContentCategory({required this.id, required this.name});
+  const ContentCategory({
+    required this.id,
+    required this.name,
+    this.locales = const {},
+  });

  final String id;
+
+  /// 中文名称，与 locales 里的 zh 相同。
  final String name;
+  final Map<String, String> locales;

  /// 解析 `GET /app/categories` 的单项。
  factory ContentCategory.fromJson(Map<String, dynamic> json) {
-    return ContentCategory(
-      id: (json['id'] ?? '').toString(),
-      name: json['name'] as String? ?? '',
-    );
+    final locales = localeMap(json['locales']);
+    final name = json['name'] as String? ?? locales['zh'] ?? '';
+    return ContentCategory(id: (json['id'] ?? '').toString(), name: name, locales: locales);
+  }
+
+  /// 按界面语言取名称。缺对应语言时回落到中文。
+  String localizedName(String languageCode) {
+    return localizedText(languageCode, name, locales);
  }
 }
@@ -1,6 +1,9 @@
 // Author: fruit.com.cn

+import 'dart:ui';
+
 import 'json_numbers.dart';
+import 'locale_text.dart';

 /// 短剧与剧集，字段与后端 `/app/**` 的下发结构对应。
 ///
@@ -76,7 +79,14 @@ class Drama {
    required this.synopsis,
    required this.posterUrl,
    this.episodes = const [],
+    this.titleLocales = const {},
+    this.synopsisLocales = const {},
+    this.tag = '',
+    this.tagLocales = const {},
+    this.tagColor = '',
    this.category = '',
+    this.categoryLocales = const {},
+    this.types = const [],
    this.genre = '',
    this.totalEpisodes = 0,
    this.freeEpisodes = 0,
@@ -94,9 +104,16 @@ class Drama {
  final String id;
  final String title;
  final String synopsis;
+  final Map<String, String> titleLocales;
+  final Map<String, String> synopsisLocales;
+  final String tag;
+  final Map<String, String> tagLocales;
+  final String tagColor;
  final String posterUrl;
  final List<Episode> episodes;
  final String category;
+  final Map<String, String> categoryLocales;
+  final List<Map<String, String>> types;
  final String genre;
  final int totalEpisodes;
  final int freeEpisodes;
@@ -127,19 +144,26 @@ class Drama {
  /// 列表卡片：带一集可播预览（首页直接起播），完整剧集进详情再取。
  factory Drama.fromCardJson(Map<String, dynamic> json) {
    final preview = json['preview'];
+    final text = _DramaText.fromJson(json);
    return Drama(
      id: (json['id'] ?? '').toString(),
-      title: json['title'] as String? ?? '',
-      synopsis: json['synopsis'] as String? ?? '',
+      title: text.title,
+      synopsis: text.synopsis,
+      titleLocales: text.titleLocales,
+      synopsisLocales: text.synopsisLocales,
+      tag: text.tag,
+      tagLocales: text.tagLocales,
+      tagColor: json['tagColor'] as String? ?? '',
      posterUrl: json['cover'] as String? ?? '',
      episodes: preview is Map<String, dynamic>
          ? [Episode.fromJson(preview)]
          : const [],
-      category: json['category'] as String? ?? '',
-      genre: json['genre'] as String? ?? '',
+      category: text.category,
+      categoryLocales: text.categoryLocales,
+      types: text.types,
+      genre: text.genre,
      totalEpisodes: (json['totalEpisodes'] as num?)?.toInt() ?? 0,
      isHot: json['isHot'] == true,
-      // viewCount 后端是 Long，按字符串下发（见 json_numbers.dart）
      viewCount: jsonToInt(json['viewCount']),
      likeCount: _optionalInt(json['likeCount']),
      favoriteCount: _optionalInt(json['favoriteCount']),
@@ -152,13 +176,21 @@ class Drama {

  /// 详情：带剧集列表。
  factory Drama.fromDetailJson(Map<String, dynamic> json) {
+    final text = _DramaText.fromJson(json);
    return Drama(
      id: (json['id'] ?? '').toString(),
-      title: json['title'] as String? ?? '',
-      synopsis: json['synopsis'] as String? ?? '',
+      title: text.title,
+      synopsis: text.synopsis,
+      titleLocales: text.titleLocales,
+      synopsisLocales: text.synopsisLocales,
+      tag: text.tag,
+      tagLocales: text.tagLocales,
+      tagColor: json['tagColor'] as String? ?? '',
      posterUrl: json['cover'] as String? ?? '',
-      category: json['category'] as String? ?? '',
-      genre: json['genre'] as String? ?? '',
+      category: text.category,
+      categoryLocales: text.categoryLocales,
+      types: text.types,
+      genre: text.genre,
      totalEpisodes: (json['totalEpisodes'] as num?)?.toInt() ?? 0,
      freeEpisodes: (json['freeEpisodes'] as num?)?.toInt() ?? 0,
      isHot: json['isHot'] == true,
@@ -176,6 +208,37 @@ class Drama {
          .toList(),
    );
  }
+
+  String localizedTitle(String languageCode) {
+    return localizedText(languageCode, title, titleLocales);
+  }
+
+  String localizedSynopsis(String languageCode) {
+    return localizedText(languageCode, synopsis, synopsisLocales);
+  }
+
+  String localizedTag(String languageCode) {
+    return localizedText(languageCode, tag, tagLocales);
+  }
+
+  /// 标签角标背景色。接口没给合法色值时用 fallback。
+  Color tagRibbonColor(Color fallback) {
+    final parsed = _colorFromHex(tagColor);
+    return parsed ?? fallback;
+  }
+
+  /// 按当前语言取类型名称。接口没带语言表时返回空，调用方继续用中文 genre。
+  List<String> localizedTypeLabels(String languageCode) {
+    final labels = <String>[];
+    for (final item in types) {
+      final label = localizedText(languageCode, item['zh'] ?? '', item);
+      if (label.isNotEmpty && !labels.contains(label)) labels.add(label);
+    }
+    if (labels.isNotEmpty) return labels;
+    final primary = localizedText(languageCode, '', categoryLocales);
+    if (primary.isNotEmpty) return [primary];
+    return const [];
+  }
 }

 int? _optionalInt(dynamic value) => value == null ? null : jsonToInt(value);
@@ -184,3 +247,81 @@ String? _optionalString(dynamic value) {
  final text = value is String ? value.trim() : '';
  return text.isEmpty ? null : text;
 }
+
+Color? _colorFromHex(String raw) {
+  final text = raw.trim();
+  if (text.length != 7 || !text.startsWith('#')) return null;
+  final value = int.tryParse(text.substring(1), radix: 16);
+  if (value == null) return null;
+  return Color(0xFF000000 | value);
+}
+
+List<Map<String, String>> _typeLocales(Object? raw) {
+  if (raw is! List) return const [];
+  return raw.whereType<Map>().map(localeMap).toList(growable: false);
+}
+
+/// 从语言表还原中文展示字段。列表接口不再单独下发 title / synopsis / tag。
+class _DramaText {
+  const _DramaText({
+    required this.title,
+    required this.synopsis,
+    required this.titleLocales,
+    required this.synopsisLocales,
+    required this.tag,
+    required this.tagLocales,
+    required this.category,
+    required this.categoryLocales,
+    required this.types,
+    required this.genre,
+  });
+
+  final String title;
+  final String synopsis;
+  final Map<String, String> titleLocales;
+  final Map<String, String> synopsisLocales;
+  final String tag;
+  final Map<String, String> tagLocales;
+  final String category;
+  final Map<String, String> categoryLocales;
+  final List<Map<String, String>> types;
+  final String genre;
+
+  factory _DramaText.fromJson(Map<String, dynamic> json) {
+    final titleLocales = localeMap(json['titleLocales']);
+    final synopsisLocales = localeMap(json['synopsisLocales']);
+    final tagLocales = localeMap(json['tagLocales']);
+    final categoryLocales = localeMap(json['categoryLocales']);
+    final types = _typeLocales(json['types']);
+    final category = _firstText(categoryLocales, json['category'], types);
+    return _DramaText(
+      title: _firstText(titleLocales, json['title']),
+      synopsis: _firstText(synopsisLocales, json['synopsis'] ?? json['description']),
+      titleLocales: titleLocales,
+      synopsisLocales: synopsisLocales,
+      tag: _firstText(tagLocales, json['tag']),
+      tagLocales: tagLocales,
+      category: category,
+      categoryLocales: categoryLocales,
+      types: types,
+      genre: _genreText(types, json['genre']),
+    );
+  }
+}
+
+String _firstText(Map<String, String> locales, Object? fallback, [List<Map<String, String>>? types]) {
+  final chinese = locales['zh'] ?? '';
+  if (chinese.isNotEmpty) return chinese;
+  if (types != null && types.isNotEmpty) {
+    final label = types.first['zh'] ?? '';
+    if (label.isNotEmpty) return label;
+  }
+  return fallback is String ? fallback : '';
+}
+
+String _genreText(List<Map<String, String>> types, Object? fallback) {
+  final names = types.map((item) => item['zh'] ?? '').where((value) => value.isNotEmpty);
+  final joined = names.join(' / ');
+  if (joined.isNotEmpty) return joined;
+  return fallback is String ? fallback : '';
+}
@@ -48,7 +48,7 @@ class FeedSection {
  factory FeedSection.fromJson(Map<String, dynamic> json) {
    return FeedSection(
      code: json['code'] as String? ?? '',
-      title: json['title'] as String? ?? '',
+      title: _sectionTitle(json),
      dramas: (json['dramas'] as List? ?? const [])
          .whereType<Map<String, dynamic>>()
          .map(Drama.fromCardJson)
@@ -84,3 +84,12 @@ class FeedBanner {
    );
  }
 }
+
+String _sectionTitle(Map<String, dynamic> json) {
+  final locales = json['titleLocales'];
+  if (locales is Map) {
+    final chinese = locales['zh']?.toString() ?? '';
+    if (chinese.isNotEmpty) return chinese;
+  }
+  return json['title'] as String? ?? '';
+}
@@ -0,0 +1,16 @@
+// Author: fruit.com.cn
+
+/// 把接口里的语言表解析成字符串映射。
+Map<String, String> localeMap(Object? raw) {
+  if (raw is! Map) return const {};
+  return raw.map((key, value) => MapEntry('$key', value?.toString() ?? ''));
+}
+
+/// 按当前语言取文案。没有对应语言时用中文，中文也没有时用 fallback。
+String localizedText(String languageCode, String fallback, Map<String, String> locales) {
+  final selected = locales[languageCode] ?? '';
+  if (selected.isNotEmpty) return selected;
+  final chinese = locales['zh'] ?? '';
+  if (chinese.isNotEmpty) return chinese;
+  return fallback;
+}
@@ -14,6 +14,7 @@ class PlayTicket {
    this.unlockCoin = 0,
    this.previewSeconds = 0,
    this.qualities = const [],
+    this.tracks = const [],
    this.thumbnailsUrl,
    this.likeCount,
    this.commentCount,
@@ -39,8 +40,11 @@ class PlayTicket {
  /// 试看秒数：仅 `COIN_REQUIRED` 时有意义（付费解锁在 B2 做）。
  final int previewSeconds;

-  /// 后端下发的清晰度档位（如 AUTO / 720P / 1080P），HLS 由播放器自动切换。
+  /// 后端下发的清晰度档位（如 AUTO / 720p / 1080p）。
  final List<String> qualities;
+
+  /// 各档签名地址。AUTO 是主列表，点选其它档位时换成对应地址。
+  final List<PlayQualityTrack> tracks;
  final String? thumbnailsUrl;
  final int? likeCount;
  final int? commentCount;
@@ -64,6 +68,7 @@ class PlayTicket {
          .whereType<String>()
          .where((quality) => quality.isNotEmpty)
          .toList(),
+      tracks: _tracks(json['tracks'], json['playUrl'] as String? ?? ''),
      thumbnailsUrl: _optionalString(json['thumbnailsUrl']),
      likeCount: json['likeCount'] == null
          ? null
@@ -75,6 +80,67 @@ class PlayTicket {
  }
 }

+List<PlayQualityTrack> _tracks(dynamic raw, String playUrl) {
+  final tracks = <PlayQualityTrack>[];
+  if (raw is List) {
+    for (final item in raw) {
+      if (item is! Map) continue;
+      final quality = item['quality'] as String? ?? '';
+      final url = item['playUrl'] as String? ?? '';
+      if (quality.isEmpty || url.isEmpty) continue;
+      tracks.add(PlayQualityTrack(quality: quality, playUrl: url));
+    }
+  }
+  if (tracks.isEmpty && playUrl.isNotEmpty) {
+    tracks.add(PlayQualityTrack(quality: 'AUTO', playUrl: playUrl));
+  }
+  return tracks;
+}
+
+/// 按票据里的分轨地址取播放地址；没有分轨时，从主列表路径推出同目录的单档地址。
+String? qualityPlayUrl({
+  required String quality,
+  required List<PlayQualityTrack> tracks,
+  required String currentUrl,
+}) {
+  final wanted = quality.toUpperCase();
+  for (final track in tracks) {
+    if (track.quality.toUpperCase() == wanted && track.playUrl.isNotEmpty) {
+      return track.playUrl;
+    }
+  }
+  return siblingRenditionUrl(currentUrl, wanted);
+}
+
+/// `.../master.m3u8` 与 `.../720p/index.m3u8` 互相换算，查询参数原样保留。
+String? siblingRenditionUrl(String currentUrl, String quality) {
+  final uri = Uri.tryParse(currentUrl);
+  if (uri == null || uri.path.isEmpty) return null;
+  final path = uri.path;
+  const masterSuffix = '/master.m3u8';
+  String? root;
+  if (path.endsWith(masterSuffix)) {
+    root = path.substring(0, path.length - masterSuffix.length);
+  } else {
+    final match = RegExp(r'/(\d+p)/index\.m3u8$').firstMatch(path);
+    if (match == null) return null;
+    root = path.substring(0, match.start);
+  }
+  final next = quality.toUpperCase() == 'AUTO'
+      ? '$root$masterSuffix'
+      : '$root/${quality.toLowerCase()}/index.m3u8';
+  if (next == path) return currentUrl;
+  return uri.replace(path: next).toString();
+}
+
+/// 一档清晰度的签名播放地址。
+class PlayQualityTrack {
+  const PlayQualityTrack({required this.quality, required this.playUrl});
+
+  final String quality;
+  final String playUrl;
+}
+
 String? _optionalString(dynamic value) {
  final text = value is String ? value.trim() : '';
  return text.isEmpty ? null : text;
@@ -0,0 +1,68 @@
+// Author: fruit.com.cn
+
+import 'drama.dart';
+import 'locale_text.dart';
+
+/// C 端剧单：`GET /app/playlists` 与 `GET /app/playlists/{id}` 的同一结构。
+class PlaylistDetail {
+  const PlaylistDetail({
+    required this.id,
+    required this.name,
+    required this.description,
+    this.locales = const {},
+    this.descriptionLocales = const {},
+    required this.dramaCount,
+    required this.dramas,
+    this.pageIndex = 1,
+    this.pageSize = 0,
+  });
+
+  final String id;
+
+  /// 中文名称，与 locales 里的 zh 相同。
+  final String name;
+  final Map<String, String> locales;
+
+  /// 中文描述，与 descriptionLocales 里的 zh 相同。
+  final String description;
+  final Map<String, String> descriptionLocales;
+  final int dramaCount;
+  final int pageIndex;
+  final int pageSize;
+  final List<Drama> dramas;
+
+  factory PlaylistDetail.fromJson(Map<String, dynamic> json) {
+    final dramas = _dramasOf(json['list']);
+    final locales = localeMap(json['locales']);
+    final descriptions = localeMap(json['descriptionLocales']);
+    return PlaylistDetail(
+      id: (json['id'] ?? '').toString(),
+      name: json['name'] as String? ?? locales['zh'] ?? '',
+      locales: locales,
+      description: json['description'] as String? ?? descriptions['zh'] ?? '',
+      descriptionLocales: descriptions,
+      dramaCount: (json['dramaCount'] as num?)?.toInt() ?? dramas.length,
+      pageIndex: (json['pageIndex'] as num?)?.toInt() ?? 1,
+      pageSize: (json['pageSize'] as num?)?.toInt() ?? dramas.length,
+      dramas: dramas,
+    );
+  }
+
+  /// 按界面语言取名称。缺对应语言时回落到中文。
+  String localizedName(String languageCode) {
+    return localizedText(languageCode, name, locales);
+  }
+
+  /// 按界面语言取描述。缺对应语言时回落到中文。
+  String localizedDescription(String languageCode) {
+    return localizedText(languageCode, description, descriptionLocales);
+  }
+}
+
+List<Drama> _dramasOf(Object? rows) {
+  if (rows is! List) return const [];
+  return rows
+      .whereType<Map>()
+      .map((item) => Drama.fromCardJson(Map<String, dynamic>.from(item)))
+      .toList(growable: false);
+}
@@ -1,6 +1,7 @@
 // Author: fruit.com.cn

 import 'json_numbers.dart';
+import 'locale_text.dart';

 /// 服务端续看记录：`GET /app/watch/progress?dramaId=` 与 `/app/watch/recent` 的下发结构。
 ///
@@ -13,17 +14,20 @@ class WatchProgress {
    required this.position,
    required this.duration,
    this.dramaTitle,
+    this.titleLocales = const {},
    this.dramaCover,
    this.episodeNumber,
    this.totalEpisodes,
    this.finished = false,
    this.playCount = 0,
+    this.viewCount,
    this.updatedAt,
  });

  final String dramaId;
  final String episodeId;
  final String? dramaTitle;
+  final Map<String, String> titleLocales;
  final String? dramaCover;
  final int? episodeNumber;
  final int? totalEpisodes;
@@ -31,6 +35,9 @@ class WatchProgress {
  final Duration duration;
  final bool finished;
  final int playCount;
+
+  /// 短剧热度。历史列表没下发时为空，不能拿用户自己的 playCount 冒充。
+  final int? viewCount;
  final DateTime? updatedAt;

  bool get hasPosition => position > Duration.zero;
@@ -41,11 +48,17 @@ class WatchProgress {
    return (position.inMilliseconds / duration.inMilliseconds).clamp(0.0, 1.0);
  }

+  /// 按当前语言取剧名。没有对应语言时回退中文，再回退 dramaTitle。
+  String localizedTitle(String languageCode) {
+    return localizedText(languageCode, dramaTitle ?? '', titleLocales);
+  }
+
  factory WatchProgress.fromJson(Map<String, dynamic> json) {
    return WatchProgress(
      dramaId: (json['dramaId'] ?? '').toString(),
      episodeId: (json['episodeId'] ?? '').toString(),
      dramaTitle: json['dramaTitle']?.toString(),
+      titleLocales: localeMap(json['titleLocales']),
      dramaCover: json['dramaCover']?.toString(),
      episodeNumber: json['episodeNumber'] == null
          ? null
@@ -57,6 +70,9 @@ class WatchProgress {
      duration: Duration(milliseconds: jsonToInt(json['durationMs'])),
      finished: json['finished'] == true,
      playCount: jsonToInt(json['playCount']),
+      viewCount: json['viewCount'] == null
+          ? null
+          : jsonToInt(json['viewCount']),
      updatedAt: DateTime.tryParse(json['updatedAt'] as String? ?? ''),
    );
  }
@@ -65,6 +81,7 @@ class WatchProgress {
    'dramaId': dramaId,
    'episodeId': episodeId,
    if (dramaTitle != null) 'dramaTitle': dramaTitle,
+    if (titleLocales.isNotEmpty) 'titleLocales': titleLocales,
    if (dramaCover != null) 'dramaCover': dramaCover,
    if (episodeNumber != null) 'episodeNumber': episodeNumber,
    if (totalEpisodes != null) 'totalEpisodes': totalEpisodes,
@@ -72,6 +89,7 @@ class WatchProgress {
    'durationMs': duration.inMilliseconds,
    'finished': finished,
    'playCount': playCount,
+    if (viewCount != null) 'viewCount': viewCount,
    if (updatedAt != null) 'updatedAt': updatedAt!.toIso8601String(),
  };
 }
@@ -31,9 +31,13 @@ class WatchRecord {
  }

  /// 服务端分页标题优先，详情标题作为回退。
-  String get displayTitle {
-    final pageTitle = progress.dramaTitle?.trim() ?? '';
-    return pageTitle.isNotEmpty ? pageTitle : drama?.title.trim() ?? '';
+  String get displayTitle => localizedDisplayTitle('zh');
+
+  /// 按当前语言取标题。分页语言表优先，详情语言表作为回退。
+  String localizedDisplayTitle(String languageCode) {
+    final pageTitle = progress.localizedTitle(languageCode).trim();
+    if (pageTitle.isNotEmpty) return pageTitle;
+    return drama?.localizedTitle(languageCode).trim() ?? '';
  }

  /// 服务端分页封面优先，详情封面作为回退。
@@ -148,7 +148,8 @@ class ApiClient {
            skipAuthRetry: skipAuthRetry,
          );
        }
-        onUnauthorized?.call();
+        final token = accessTokenReader?.call();
+        if (token == null || token.isEmpty) onUnauthorized?.call();
        throw ApiException(401, cause.message ?? '登录已过期');
      }
      if (cause is ApiException) {
@@ -33,6 +33,7 @@ class AuthApi {
    required String code,
    required String deviceId,
    String platform = '',
+    String osVersion = '',
    String appVersion = '',
  }) async {
    final data = await _client.post(
@@ -43,6 +44,7 @@ class AuthApi {
        'code': code,
        'deviceId': deviceId,
        'platform': platform,
+        'osVersion': osVersion,
        'appVersion': appVersion,
      },
    );
@@ -55,6 +57,7 @@ class AuthApi {
    required String code,
    required String deviceId,
    String platform = '',
+    String osVersion = '',
    String appVersion = '',
  }) async {
    final data = await _client.post(
@@ -65,6 +68,7 @@ class AuthApi {
        'code': code,
        'deviceId': deviceId,
        'platform': platform,
+        'osVersion': osVersion,
        'appVersion': appVersion,
      },
    );
@@ -76,6 +80,7 @@ class AuthApi {
    required String password,
    required String deviceId,
    String platform = '',
+    String osVersion = '',
    String appVersion = '',
  }) async {
    final data = await _client.post(
@@ -87,6 +92,7 @@ class AuthApi {
        'countryCode': 'ID',
        'deviceId': deviceId,
        'platform': platform,
+        'osVersion': osVersion,
        'appVersion': appVersion,
      },
    );
@@ -98,6 +104,7 @@ class AuthApi {
    required String password,
    required String deviceId,
    String platform = '',
+    String osVersion = '',
    String appVersion = '',
  }) async {
    final data = await _client.post(
@@ -108,18 +115,25 @@ class AuthApi {
        'password': password,
        'deviceId': deviceId,
        'platform': platform,
+        'osVersion': osVersion,
        'appVersion': appVersion,
      },
    );
    return AuthSession.fromJson((data as Map).cast<String, dynamic>());
  }

-  Future<AuthSession> refresh(String refreshToken) async {
+  Future<AuthSession> refresh(
+    String refreshToken, {
+    String platform = '',
+    String osVersion = '',
+  }) async {
    final data = await _client.post(
      '/app/auth/refresh',
-      body: {'refreshToken': refreshToken},
-      // 刷新请求本身不带旧令牌重试，失败就是失败
-      skipAuthRetry: true,
+      body: {
+        'refreshToken': refreshToken,
+        'platform': platform,
+        'osVersion': osVersion,
+      },
    );
    return AuthSession.fromJson((data as Map).cast<String, dynamic>());
  }
@@ -1,6 +1,9 @@
+import '../models/content_category.dart';
 import '../models/drama.dart';
 import '../models/feed_page.dart';
 import '../models/home_feed.dart';
+import '../models/page_result.dart';
+import '../models/playlist_detail.dart';
 import '../models/search_result.dart';
 import 'api_client.dart';

@@ -58,12 +61,95 @@ class CatalogApi {
    return SearchResult.fromJson(_asMap(data));
  }

+  static const int playlistPageSize = 10;
+  static const int playlistDramaPageSize = 20;
+
+  /// 已启用剧单，分页返回，每条带已上线短剧卡片。
+  Future<PageResult<PlaylistDetail>> playlists({
+    int pageIndex = 1,
+    int pageSize = playlistPageSize,
+  }) async {
+    final data = await _client.get(
+      '/app/playlists',
+      query: {
+        'pageIndex': '$pageIndex',
+        'pageSize': '$pageSize',
+      },
+    );
+    return PageResult.parse(data, PlaylistDetail.fromJson);
+  }
+
+  /// 单个剧单详情。短剧按 pageIndex、pageSize 翻页。
+  Future<PlaylistDetail> playlist(
+    String id, {
+    int pageIndex = 1,
+    int pageSize = playlistDramaPageSize,
+  }) async {
+    return PlaylistDetail.fromJson(
+      _asMap(
+        await _client.get(
+          '/app/playlists/$id',
+          query: {
+            'pageIndex': '$pageIndex',
+            'pageSize': '$pageSize',
+          },
+        ),
+      ),
+    );
+  }
+
+  /// 已启用首页分类，名称在 locales。
+  Future<List<ContentCategory>> classifications() async {
+    return _categories(await _client.get('/app/categories'));
+  }
+
+  /// 已启用类型，名称在 locales。
+  Future<List<ContentCategory>> dramaCategories() async {
+    return _categories(await _client.get('/app/drama-categories'));
+  }
+
+  /// 已启用标签，名称在 locales。
+  Future<List<ContentCategory>> tags() async {
+    return _categories(await _client.get('/app/tags'));
+  }
+
+  static const int libraryPageSize = 20;
+
+  /// 全部短剧。同一组 id 多选为或，组与组之间为且。
+  Future<PageResult<Drama>> libraryDramas({
+    List<String> categoryIds = const [],
+    List<String> classificationIds = const [],
+    List<String> tagIds = const [],
+    int pageIndex = 1,
+    int pageSize = libraryPageSize,
+  }) async {
+    final data = await _client.post(
+      '/app/dramas/page',
+      body: {
+        'pageIndex': pageIndex,
+        'pageSize': pageSize,
+        'categoryIds': categoryIds,
+        'classificationIds': classificationIds,
+        'tagIds': tagIds,
+      },
+    );
+    return PageResult.parse(data, Drama.fromCardJson);
+  }
+
  Future<Drama> dramaDetail(String dramaId) async {
    return Drama.fromDetailJson(
      _asMap(await _client.get('/app/dramas/$dramaId')),
    );
  }

+  List<ContentCategory> _categories(Object? data) {
+    if (data is! List) return const [];
+    return [
+      for (final item in data)
+        if (item is Map<String, dynamic>) ContentCategory.fromJson(item),
+    ];
+  }
+
  Map<String, dynamic> _asMap(Object? data) {
    if (data is Map<String, dynamic>) return data;
    throw const ApiException(-1, '返回数据格式异常');
@@ -1,12 +1,16 @@
 // Author: fruit.com.cn

 import '../models/content_category.dart';
+import '../models/drama.dart';
+import '../models/page_result.dart';
 import 'api_client.dart';

 /// 内容分类接口，对应契约 `GET /app/categories`。
 class CategoryApi {
  const CategoryApi(this._client);

+  static const int dramaPageSize = 20;
+
  final ApiClient _client;

  /// 拉取已启用分类，id 全程按字符串解析。
@@ -18,4 +22,20 @@ class CategoryApi {
        if (item is Map<String, dynamic>) ContentCategory.fromJson(item),
    ];
  }
+
+  /// 分类下已上线短剧，pageIndex 从 1 开始。
+  Future<PageResult<Drama>> dramas(
+    String categoryId, {
+    int pageIndex = 1,
+    int pageSize = dramaPageSize,
+  }) async {
+    final data = await _client.get(
+      '/app/categories/$categoryId/dramas',
+      query: {
+        'pageIndex': '$pageIndex',
+        'pageSize': '$pageSize',
+      },
+    );
+    return PageResult.parse(data, Drama.fromCardJson);
+  }
 }
@@ -36,4 +36,9 @@ class LibraryApi {
  Future<void> removeFavorite(String dramaId) async {
    await _client.delete('/app/favorites/$dramaId');
  }
+
+  /// 一次取消多部短剧，请求体为 dramaIds 数组。
+  Future<void> removeFavorites(List<String> dramaIds) async {
+    await _client.post('/app/favorites/remove', body: {'dramaIds': dramaIds});
+  }
 }
@@ -13,6 +13,9 @@ abstract interface class FavoriteRepository {
  Future<PageResult<Drama>> page({int pageIndex = 1, int pageSize = 20});

  Future<void> remove(String dramaId);
+
+  /// 一次取消多部短剧。
+  Future<void> removeMany(List<String> dramaIds);
 }

 class HttpFavoriteRepository implements FavoriteRepository {
@@ -36,6 +39,10 @@ class HttpFavoriteRepository implements FavoriteRepository {

  @override
  Future<void> remove(String dramaId) => _api.removeFavorite(dramaId);
+
+  @override
+  Future<void> removeMany(List<String> dramaIds) =>
+      _api.removeFavorites(dramaIds);
 }

 /// 内存实现：单测与 widget 测试注入用。
@@ -51,6 +58,7 @@ class InMemoryFavoriteRepository implements FavoriteRepository {
  bool failRemove = false;
  int toggleCalls = 0;
  int pageCalls = 0;
+  int removeManyCalls = 0;

  @override
  Future<bool> toggle(String dramaId) async {
@@ -80,4 +88,11 @@ class InMemoryFavoriteRepository implements FavoriteRepository {
    if (failRemove) throw StateError('favorite unavailable');
    _saved.remove(dramaId);
  }
+
+  @override
+  Future<void> removeMany(List<String> dramaIds) async {
+    removeManyCalls += 1;
+    if (failRemove) throw StateError('favorite unavailable');
+    _saved.removeAll(dramaIds);
+  }
 }
@@ -0,0 +1,38 @@
+// Author: fruit.com.cn
+
+import '../models/page_result.dart';
+import '../models/playlist_detail.dart';
+import '../remote/catalog_api.dart';
+
+/// 剧单来源：列表分页拉取，详情用于打开单条时刷新。
+abstract interface class PlaylistRepository {
+  Future<PageResult<PlaylistDetail>> fetchPlaylists({
+    int pageIndex = 1,
+    int pageSize = CatalogApi.playlistPageSize,
+  });
+
+  Future<PlaylistDetail> fetchPlaylist(
+    String id, {
+    int pageIndex = 1,
+    int pageSize = CatalogApi.playlistDramaPageSize,
+  });
+}
+
+class HttpPlaylistRepository implements PlaylistRepository {
+  HttpPlaylistRepository(this._api);
+
+  final CatalogApi _api;
+
+  @override
+  Future<PageResult<PlaylistDetail>> fetchPlaylists({
+    int pageIndex = 1,
+    int pageSize = CatalogApi.playlistPageSize,
+  }) => _api.playlists(pageIndex: pageIndex, pageSize: pageSize);
+
+  @override
+  Future<PlaylistDetail> fetchPlaylist(
+    String id, {
+    int pageIndex = 1,
+    int pageSize = CatalogApi.playlistDramaPageSize,
+  }) => _api.playlist(id, pageIndex: pageIndex, pageSize: pageSize);
+}
@@ -0,0 +1,173 @@
+// Author: fruit.com.cn
+// 全部短剧筛选与分页：拉取分类、类型、标签，并按页加载短剧。
+
+import '../models/content_category.dart';
+import '../models/drama.dart';
+import '../models/page_result.dart';
+import '../remote/catalog_api.dart';
+
+/// 全部短剧筛选与分页所需的远端能力。
+abstract interface class AllDramasRemote {
+  /// 已启用分类。
+  Future<List<ContentCategory>> classifications();
+
+  /// 已启用类型。
+  Future<List<ContentCategory>> categories();
+
+  /// 已启用标签。
+  Future<List<ContentCategory>> tags();
+
+  /// 按当前筛选取一页短剧。
+  Future<PageResult<Drama>> dramas({
+    required List<String> categoryIds,
+    required List<String> classificationIds,
+    required List<String> tagIds,
+    required int pageIndex,
+  });
+}
+
+/// 用现有目录接口实现全部短剧远端能力。
+class CatalogAllDramasRemote implements AllDramasRemote {
+  /// 绑定目录接口。
+  const CatalogAllDramasRemote(this._api);
+
+  final CatalogApi _api;
+
+  @override
+  Future<List<ContentCategory>> classifications() => _api.classifications();
+
+  @override
+  Future<List<ContentCategory>> categories() => _api.dramaCategories();
+
+  @override
+  Future<List<ContentCategory>> tags() => _api.tags();
+
+  @override
+  Future<PageResult<Drama>> dramas({
+    required List<String> categoryIds,
+    required List<String> classificationIds,
+    required List<String> tagIds,
+    required int pageIndex,
+  }) {
+    return _api.libraryDramas(
+      categoryIds: categoryIds,
+      classificationIds: classificationIds,
+      tagIds: tagIds,
+      pageIndex: pageIndex,
+    );
+  }
+}
+
+/// 全部短剧：筛选项来自类型、分类、标签，列表按页加载。
+class AllDramasController {
+  AllDramasController({
+    AllDramasRemote? api,
+    this.classifications = const [],
+    this.categories = const [],
+    this.tags = const [],
+    this.dramas = const [],
+  }) : _api = api;
+
+  final AllDramasRemote? _api;
+  List<ContentCategory> classifications;
+  List<ContentCategory> categories;
+  List<ContentCategory> tags;
+  final Set<String> selectedClassifications = {};
+  final Set<String> selectedCategories = {};
+  final Set<String> selectedTags = {};
+  List<Drama> dramas;
+  bool loading = false;
+  bool loadingMore = false;
+  bool hasMore = false;
+  String? error;
+  int _page = 1;
+  int _total = 0;
+
+  bool get usesRemote => _api != null;
+
+  /// 预览用：筛选项和列表都已在本地，不请求接口。
+  factory AllDramasController.preview({
+    List<ContentCategory> classifications = const [],
+    List<ContentCategory> categories = const [],
+    List<ContentCategory> tags = const [],
+    List<Drama> dramas = const [],
+  }) {
+    return AllDramasController(
+      classifications: classifications,
+      categories: categories,
+      tags: tags,
+      dramas: dramas,
+    );
+  }
+
+  /// 从第一页重新拉取筛选项和短剧。没有接口时直接返回。
+  Future<void> refresh() async {
+    if (_api == null) return;
+    loading = true;
+    error = null;
+    _page = 1;
+    try {
+      final filters = await Future.wait([
+        _api.classifications(),
+        _api.categories(),
+        _api.tags(),
+      ]);
+      classifications = filters[0];
+      categories = filters[1];
+      tags = filters[2];
+      final page = await _loadPage(1);
+      dramas = page;
+      hasMore = dramas.length < _total;
+    } catch (caught) {
+      error = '$caught';
+    } finally {
+      loading = false;
+    }
+  }
+
+  /// 追加下一页。没有更多、正在加载或没有接口时直接返回。
+  Future<void> loadMore() async {
+    if (_api == null || loading || loadingMore || !hasMore) return;
+    loadingMore = true;
+    error = null;
+    try {
+      final next = await _loadPage(_page + 1);
+      _page += 1;
+      dramas = [...dramas, ...next];
+      hasMore = dramas.length < _total;
+    } catch (caught) {
+      error = '$caught';
+    } finally {
+      loadingMore = false;
+    }
+  }
+
+  /// 切换一个分类。传入空字符串表示清空这一组。
+  void toggleClassification(String id) =>
+      _toggle(selectedClassifications, id);
+
+  /// 切换一个类型。传入空字符串表示清空这一组。
+  void toggleCategory(String id) => _toggle(selectedCategories, id);
+
+  /// 切换一个标签。传入空字符串表示清空这一组。
+  void toggleTag(String id) => _toggle(selectedTags, id);
+
+  void _toggle(Set<String> selected, String id) {
+    if (id.isEmpty) {
+      selected.clear();
+      return;
+    }
+    if (!selected.add(id)) selected.remove(id);
+  }
+
+  Future<List<Drama>> _loadPage(int pageIndex) async {
+    final page = await _api!.dramas(
+      categoryIds: selectedCategories.toList(growable: false),
+      classificationIds: selectedClassifications.toList(growable: false),
+      tagIds: selectedTags.toList(growable: false),
+      pageIndex: pageIndex,
+    );
+    _total = page.total;
+    return page.list;
+  }
+}
@@ -1,3 +1,5 @@
+import 'dart:io' show Platform;
+
 import 'package:flutter/foundation.dart';

 import '../models/auth_session.dart';
@@ -9,7 +11,7 @@ import 'auth_session_store.dart';
 ///
 /// 职责：本地会话的读写（[AuthSessionStore]）、注册/登录/登出、令牌刷新；
 /// 也是 [ApiClient] 的 `accessTokenReader` / `tokenRefresher` / `onUnauthorized` 实现方 ——
-/// 401 → 刷新 → 重试失败就清会话，UI 通过 [isSignedIn] 自动回到未登录态。
+/// 401 → 刷新 → 重试。令牌被拒绝才清会话，服务中断时保持登录。
 class AuthController extends ChangeNotifier {
  AuthController(this._api, this._store);

@@ -19,6 +21,10 @@ class AuthController extends ChangeNotifier {
  AuthSession? _session;
  String _deviceId = '';
  bool _loaded = false;
+  Future<bool>? _refreshing;
+
+  /// 登录已过期、账号停用才清本地会话。服务不可达不能当成退出登录。
+  static const Set<int> _rejectedSessionCodes = {401, 100001};

  bool get isLoaded => _loaded;
  bool get isSignedIn => _session != null;
@@ -43,6 +49,7 @@ class AuthController extends ChangeNotifier {
      password: password,
      deviceId: await _store.deviceId(),
      platform: _platform,
+      osVersion: _osVersion,
    );
    await _apply(session);
  }
@@ -53,14 +60,12 @@ class AuthController extends ChangeNotifier {
      password: password,
      deviceId: await _store.deviceId(),
      platform: _platform,
+      osVersion: _osVersion,
    );
    await _apply(session);
  }

-  Future<void> sendOtp({
-    required String target,
-    String scene = 'LOGIN',
-  }) async {
+  Future<void> sendOtp({required String target, String scene = 'LOGIN'}) async {
    await _api.sendOtp(
      target: target,
      scene: scene,
@@ -77,6 +82,7 @@ class AuthController extends ChangeNotifier {
      code: code,
      deviceId: await _store.deviceId(),
      platform: _platform,
+      osVersion: _osVersion,
    );
    await _apply(session);
  }
@@ -90,10 +96,17 @@ class AuthController extends ChangeNotifier {
      code: code,
      deviceId: await _store.deviceId(),
      platform: _platform,
+      osVersion: _osVersion,
    );
    await _apply(session);
  }

+  Future<void> clear() async {
+    _session = null;
+    await _store.clear();
+    notifyListeners();
+  }
+
  Future<void> signOut() async {
    final refreshToken = _session?.refreshToken ?? '';
    _session = null;
@@ -107,29 +120,43 @@ class AuthController extends ChangeNotifier {
    }
  }

-  /// 供 [ApiClient] 调用：刷新令牌并落盘。失败时清本地会话。
-  Future<bool> refresh() async {
+  /// 供 [ApiClient] 调用：刷新令牌并落盘。
+  ///
+  /// 同一时刻只刷新一次，避免重启期间并发 401 把新令牌轮换掉。
+  /// 网络失败或 5xx 保留本地会话；只有令牌被拒绝才退出登录。
+  Future<bool> refresh() {
+    final current = _refreshing;
+    if (current != null) return current;
+    final run = _refreshSingle();
+    _refreshing = run;
+    return run.whenComplete(() {
+      if (identical(_refreshing, run)) _refreshing = null;
+    });
+  }
+
+  Future<bool> _refreshSingle() async {
    final refreshToken = _session?.refreshToken ?? '';
    if (refreshToken.isEmpty) {
      await clear();
      return false;
    }
    try {
-      await _apply(await _api.refresh(refreshToken));
+      await _apply(
+        await _api.refresh(
+          refreshToken,
+          platform: _platform,
+          osVersion: _osVersion,
+        ),
+      );
      return true;
+    } on ApiException catch (error) {
+      if (_rejectedSessionCodes.contains(error.code)) await clear();
+      return false;
    } catch (_) {
-      await clear();
      return false;
    }
  }

-  Future<void> clear() async {
-    if (_session == null) return;
-    _session = null;
-    await _store.clear();
-    notifyListeners();
-  }
-
  /// 资料保存成功后同步登录态摘要，保留当前令牌。
  Future<void> applyProfile(AuthUser user) async {
    final current = _session;
@@ -154,4 +181,9 @@ class AuthController extends ChangeNotifier {
    if (kIsWeb) return 'WEB';
    return defaultTargetPlatform == TargetPlatform.iOS ? 'IOS' : 'ANDROID';
  }
+
+  String get _osVersion {
+    if (kIsWeb) return '';
+    return Platform.operatingSystemVersion;
+  }
 }
@@ -6,6 +6,8 @@ import '../../config/app_config.dart';
 import '../models/content_category.dart';
 import '../models/drama.dart';
 import '../models/home_feed.dart';
+import '../models/page_result.dart';
+import '../remote/category_api.dart';
 import '../repositories/category_repository.dart';

 /// 剧场页数据：服务端分类清单与发现 feed。
@@ -14,13 +16,80 @@ class CategoryController extends ChangeNotifier {

  final CategoryRepository _repository;

+  /// 生产环境注入。未注入时首页分类继续用本地筛选。
+  Future<PageResult<Drama>> Function(
+    String categoryId, {
+    int pageIndex,
+    int pageSize,
+  })? dramaPageLoader;
+
  List<ContentCategory> categories = const [];
+  final Map<String, CategoryDramaSlot> _slots = {};
  HomeFeed feed = const HomeFeed();
  bool loading = false;
  String? error;
  String? debugError;
  bool _disposed = false;

+  /// 某个分类自己的短剧分页，不和别的分类共用。
+  CategoryDramaSlot slotOf(String categoryId) {
+    return _slots.putIfAbsent(categoryId, CategoryDramaSlot.new);
+  }
+
+  /// 打开分类并加载第一页短剧。
+  Future<void> openCategory(String categoryId) async {
+    final loader = dramaPageLoader;
+    if (loader == null) return;
+    final slot = slotOf(categoryId);
+    slot.loading = true;
+    slot.loadingMore = false;
+    _notify();
+    try {
+      final page = await loader(
+        categoryId,
+        pageIndex: 1,
+        pageSize: CategoryApi.dramaPageSize,
+      );
+      slot.dramas = page.list;
+      slot.total = page.total;
+      slot.pageIndex = 1;
+    } catch (exception) {
+      if (kDebugMode) debugPrint('[category] $exception');
+    } finally {
+      slot.loading = false;
+      _notify();
+    }
+  }
+
+  /// 上拉加载这个分类的下一页。
+  Future<void> loadMore(String categoryId) async {
+    final loader = dramaPageLoader;
+    final slot = _slots[categoryId];
+    if (loader == null || slot == null) return;
+    if (slot.loading || slot.loadingMore || !slot.hasMore) return;
+    slot.loadingMore = true;
+    _notify();
+    try {
+      final page = await loader(
+        categoryId,
+        pageIndex: slot.pageIndex + 1,
+        pageSize: CategoryApi.dramaPageSize,
+      );
+      if (page.list.isEmpty) {
+        slot.total = slot.dramas.length;
+      } else {
+        slot.dramas = [...slot.dramas, ...page.list];
+        slot.total = page.total;
+        slot.pageIndex += 1;
+      }
+    } catch (exception) {
+      if (kDebugMode) debugPrint('[category] more $exception');
+    } finally {
+      slot.loadingMore = false;
+      _notify();
+    }
+  }
+
  /// 分类九宫格点击后读取该分类的剧目；缺失分区返回空列表。
  List<Drama> dramasOf(String categoryId) {
    final code = 'category-$categoryId';
@@ -30,19 +99,23 @@ class CategoryController extends ChangeNotifier {
    return const [];
  }

-  /// 加载分类与发现 feed；失败保留可重试错误态。
+  /// 首页只拉分类，再拉第一个分类的短剧。发现页聚合留到没有短剧分页时再取。
  Future<void> load() async {
    loading = true;
    error = null;
    debugError = null;
    _notify();
    try {
-      final results = await Future.wait<Object>([
-        _repository.fetchCategories(),
-        _repository.fetchDiscoverFeed(),
-      ]);
-      categories = results[0] as List<ContentCategory>;
-      feed = results[1] as HomeFeed;
+      if (dramaPageLoader != null) {
+        categories = await _repository.fetchCategories();
+      } else {
+        final results = await Future.wait<Object>([
+          _repository.fetchCategories(),
+          _repository.fetchDiscoverFeed(),
+        ]);
+        categories = results[0] as List<ContentCategory>;
+        feed = results[1] as HomeFeed;
+      }
    } catch (exception) {
      error = 'categoriesError';
      debugError = exception.toString();
@@ -53,6 +126,9 @@ class CategoryController extends ChangeNotifier {
      loading = false;
      _notify();
    }
+    if (error == null && dramaPageLoader != null && categories.isNotEmpty) {
+      await openCategory(categories.first.id);
+    }
  }

  void _notify() {
@@ -65,3 +141,14 @@ class CategoryController extends ChangeNotifier {
    super.dispose();
  }
 }
+
+/// 单个分类的短剧分页状态。
+class CategoryDramaSlot {
+  List<Drama> dramas = const [];
+  int total = 0;
+  int pageIndex = 0;
+  bool loading = false;
+  bool loadingMore = false;
+
+  bool get hasMore => dramas.length < total;
+}
@@ -161,6 +161,37 @@ class FavoriteController extends ChangeNotifier {
    }
  }

+  /// 一次取消多部收藏。失败时整批回滚。
+  Future<bool> removeMany(List<String> dramaIds) async {
+    final ids = dramaIds.toSet();
+    if (ids.isEmpty) return true;
+    final previousCards = cards;
+    final previousTotal = total;
+    final previousHasMore = hasMore;
+    final removed = cards.where((drama) => ids.contains(drama.id)).toList();
+    if (removed.isEmpty) return true;
+    cards = cards.where((drama) => !ids.contains(drama.id)).toList();
+    for (final id in ids) {
+      _saved.remove(id);
+    }
+    total = total > removed.length ? total - removed.length : 0;
+    hasMore = cards.length < total;
+    notify();
+    try {
+      await _repository.removeMany(dramaIds);
+      return true;
+    } catch (_) {
+      cards = previousCards;
+      total = previousTotal;
+      hasMore = previousHasMore;
+      for (final drama in removed) {
+        _saved.add(drama.id);
+      }
+      notify();
+      return false;
+    }
+  }
+
  /// 取消收藏（"我的"页列表里删除某条）。
  Future<bool> remove(String dramaId) async {
    final index = cards.indexWhere((drama) => drama.id == dramaId);
@@ -0,0 +1,177 @@
+// Author: fruit.com.cn
+
+part of 'playback_session.dart';
+
+/// 当前集加上一集、下一集，切集时最多三个解码器。
+const int maxLivePlayers = 3;
+
+/// 另一条播放路由必须等当前路由释放完全部原生播放器。
+class PlaybackCoordinator {
+  PlaybackSession? _owner;
+  Future<void> _handoff = Future<void>.value();
+
+  Future<bool> _acquire(PlaybackSession session, bool Function() valid) {
+    final result = _handoff.then((_) async {
+      if (!valid()) return false;
+      if (_owner != session) {
+        final previous = _owner;
+        await previous?._releasePlayers();
+        if (previous != null && previous.livePlayerCount != 0) return false;
+        _owner = null;
+        if (!valid()) return false;
+        _owner = session;
+      }
+      return true;
+    });
+    _handoff = result.then<void>((_) {});
+    return result;
+  }
+
+  void _forget(PlaybackSession session) {
+    if (_owner == session && session.livePlayerCount == 0) _owner = null;
+  }
+}
+
+_PlayerSlot? _usableWarm(
+  PlaybackSession session,
+  _PlayerSlot? slot,
+  int index,
+) {
+  if (slot == null || slot.index != index || slot.failure != null) return null;
+  if (session.isLocked) return null;
+  return slot;
+}
+
+/// 滑走的一集若仍是相邻集，就留着最后一帧，其余槽位释放。
+Future<void> _parkNeighbors(
+  PlaybackSession session,
+  _PlayerSlot? old,
+  _PlayerSlot? warmNext,
+  _PlayerSlot? warmPrevious,
+) async {
+  await _placeNeighbor(session, old);
+  await _placeNeighbor(session, warmNext);
+  await _placeNeighbor(session, warmPrevious);
+}
+
+Future<void> _placeNeighbor(PlaybackSession session, _PlayerSlot? slot) async {
+  if (slot == null || slot == session._active || slot.retiring) return;
+  if (session._next == null && slot.index == session._nextIndex) {
+    session._next = slot;
+    return;
+  }
+  if (session._previous == null && slot.index == session._previousIndex) {
+    session._previous = slot;
+    return;
+  }
+  await session._retire(slot);
+}
+
+/// 当前集已经出画后，静默准备上一集和下一集。
+void _warmNeighbors(PlaybackSession session) {
+  final request = session._generation;
+  session._preloadTask = () async {
+    await Future.wait([
+      _warmOne(session, request, session._nextIndex, next: true),
+      _warmOne(session, request, session._previousIndex, next: false),
+    ]);
+  }();
+}
+
+Future<void> _warmOne(
+  PlaybackSession session,
+  int request,
+  int? index, {
+  required bool next,
+}) async {
+  final candidate = await _allocateNeighbor(
+    session,
+    request,
+    index,
+    next: next,
+  );
+  if (candidate == null) return;
+  await candidate.ready;
+  if (session._closed || !_stillHeld(session, candidate, next: next)) return;
+  if (candidate.failure == null) {
+    session._notify();
+    return;
+  }
+  await session._enqueue(() async {
+    if (!_stillHeld(session, candidate, next: next)) return;
+    _clearNeighbor(session, next: next);
+    await session._retire(candidate);
+  });
+}
+
+Future<_PlayerSlot?> _allocateNeighbor(
+  PlaybackSession session,
+  int request,
+  int? index, {
+  required bool next,
+}) async {
+  _PlayerSlot? created;
+  await session._enqueue(() async {
+    if (session._closed || request != session._generation) return;
+    final allowed = _neighborAllowed(session, index);
+    final current = next ? session._next : session._previous;
+    if (!allowed || current?.index != index) {
+      _clearNeighbor(session, next: next);
+      await session._retire(current);
+    }
+    if (!_canAllocate(session, request, allowed: allowed, next: next)) {
+      return;
+    }
+    try {
+      created = session._create(index!);
+    } on StateError catch (error) {
+      if (kDebugMode) debugPrint('相邻集预热跳过: $error');
+      return;
+    }
+    if (next) {
+      session._next = created;
+    } else {
+      session._previous = created;
+    }
+  });
+  return created;
+}
+
+bool _neighborAllowed(PlaybackSession session, int? index) {
+  return index != null &&
+      index >= 0 &&
+      index < session.episodes.length &&
+      index != session._currentIndex &&
+      session.canPlay(session.episodes[index]);
+}
+
+bool _canAllocate(
+  PlaybackSession session,
+  int request, {
+  required bool allowed,
+  required bool next,
+}) {
+  final held = next ? session._next : session._previous;
+  return session._visible &&
+      !session._overlayOpen &&
+      request == session._generation &&
+      session._active?.prepared == true &&
+      allowed &&
+      held == null;
+}
+
+bool _stillHeld(
+  PlaybackSession session,
+  _PlayerSlot slot, {
+  required bool next,
+}) {
+  return (next ? session._next : session._previous) == slot;
+}
+
+void _clearNeighbor(PlaybackSession session, {required bool next}) {
+  if (next) {
+    session._next = null;
+    return;
+  }
+  session._previous = null;
+}
@@ -5,42 +5,18 @@ import 'dart:async';
 import 'package:flutter/foundation.dart';
 import '../models/drama.dart';
 import '../models/player_port.dart';
+import 'video_player_port.dart';
+
+part 'playback_neighbors.dart';
+
+/// 新纹理第一帧常是黑的，旧画面只盖住这一小段。
+const Duration _qualityHandoffHold = Duration(milliseconds: 200);

 typedef PlayerFactory = PlayerPort Function(Episode episode);
 typedef PlayerPreparation =
    Future<void> Function(Episode episode, PlayerPort player);

-/// Shared by routes: the previous session releases all native players before
-/// another session allocates. The app therefore has at most two, not two per page.
-class PlaybackCoordinator {
-  PlaybackSession? _owner;
-  Future<void> _handoff = Future<void>.value();
-
-  Future<bool> _acquire(PlaybackSession session, bool Function() valid) {
-    final result = _handoff.then((_) async {
-      if (!valid()) return false;
-      if (_owner != session) {
-        final previous = _owner;
-        await previous?._releasePlayers();
-        // A failed native disposal cannot be treated as a free decoder slot.
-        if (previous != null && previous.livePlayerCount != 0) return false;
-        _owner = null;
-        if (!valid()) return false;
-        _owner = session;
-      }
-      return true;
-    });
-    _handoff = result.then<void>((_) {});
-    return result;
-  }
-
-  void _forget(PlaybackSession session) {
-    if (_owner == session && session.livePlayerCount == 0) _owner = null;
-  }
-}
-
-/// Owns current + one prepared successor. All allocation, playback and disposal
-/// operations are serialized; initialization can run while current plays.
+/// Owns current plus previous/next frames; allocation stays serialized.
 class PlaybackSession extends ChangeNotifier {
  PlaybackSession({
    required this.episodes,
@@ -66,11 +42,14 @@ class PlaybackSession extends ChangeNotifier {
  final Set<_PlayerSlot> _live = {};
  _PlayerSlot? _active;
  _PlayerSlot? _next;
+  _PlayerSlot? _previous;
+  _PlayerSlot? _handoff;
  Future<void> _operations = Future<void>.value();
  Future<void> _preloadTask = Future<void>.value();
  int _generation = 0;
  int _currentIndex = 0;
  int? _nextIndex;
+  int? _previousIndex;
  bool _selected = false;
  bool _loading = false;
  bool _closed = false;
@@ -115,7 +94,7 @@ class PlaybackSession extends ChangeNotifier {
  /// during a swipe without starting audio or registering history listeners.
  PlayerPort? preparedPlayerAt(int index) {
    if (_closed) return null;
-    for (final slot in [_active, _next]) {
+    for (final slot in [_active, _next, _previous]) {
      if (slot == null ||
          slot.retiring ||
          slot.index != index ||
@@ -127,25 +106,46 @@ class PlaybackSession extends ChangeNotifier {
    return null;
  }

+  /// 清晰度切换时盖住黑帧的旧播放器。只在仍由会话持有时交给界面。
+  PlayerPort? handoffAt(int index) {
+    final slot = _handoff;
+    if (_closed || slot == null || slot.retiring || slot.index != index) {
+      return null;
+    }
+    return slot.player;
+  }
+
  /// 队列重排后把当前仍在播放的 slot 映射到新索引，不重新创建播放器。
-  void remapCurrentIndex(int index, {int? preloadIndex}) {
+  void remapCurrentIndex(int index, {int? preloadIndex, int? previousIndex}) {
    if (_closed || index < 0 || index >= episodes.length) return;
    final activeSlot = _active;
    if (activeSlot == null || activeSlot.index != _currentIndex) {
      _currentIndex = index;
-      _nextIndex = preloadIndex;
+      _rememberNeighbors(preloadIndex, previousIndex);
      _notify();
      return;
    }
    _generation++;
    activeSlot.index = index;
    _currentIndex = index;
-    _nextIndex = preloadIndex;
+    _rememberNeighbors(preloadIndex, previousIndex);
    final staleNext = _next;
+    final stalePrevious = _previous;
    _next = null;
+    _previous = null;
    _notify();
-    unawaited(_enqueue(() async => _retire(staleNext)));
-    if (_visible && !_overlayOpen) _schedulePreload();
+    unawaited(
+      _enqueue(() async {
+        await _retire(staleNext);
+        await _retire(stalePrevious);
+      }),
+    );
+    if (_visible && !_overlayOpen) _warmNeighbors(this);
+  }
+
+  void _rememberNeighbors(int? preloadIndex, int? previousIndex) {
+    _nextIndex = preloadIndex;
+    _previousIndex = previousIndex;
  }

  Future<void> _enqueue(Future<void> Function() operation) {
@@ -162,7 +162,9 @@ class PlaybackSession extends ChangeNotifier {
  }

  _PlayerSlot _create(int index) {
-    if (_live.length >= 2) throw StateError('Playback resource limit reached');
+    if (_live.length >= maxLivePlayers) {
+      throw StateError('Playback resource limit reached');
+    }
    final slot = _PlayerSlot(index, factory(episodes[index]));
    _live.add(slot);
    slot.ready = () async {
@@ -184,9 +186,15 @@ class PlaybackSession extends ChangeNotifier {
  Future<void> _retire(_PlayerSlot? slot) async {
    if (slot == null || !_live.contains(slot)) return;
    slot.retiring = true;
-    final cleared = _active == slot || _next == slot;
+    final cleared =
+        _active == slot ||
+        _next == slot ||
+        _previous == slot ||
+        _handoff == slot;
    if (_active == slot) _active = null;
    if (_next == slot) _next = null;
+    if (_previous == slot) _previous = null;
+    if (_handoff == slot) _handoff = null;
    if (cleared) _notify();
    await waitForFrame?.call();
    await slot.ready;
@@ -200,7 +208,11 @@ class PlaybackSession extends ChangeNotifier {

  /// preloadIndex comes from the visible queue, so filtered categories and series
  /// use exactly the same mechanism without warming an unrelated episode.
-  Future<void> select(int index, {int? preloadIndex}) async {
+  Future<void> select(
+    int index, {
+    int? preloadIndex,
+    int? previousIndex,
+  }) async {
    if (_closed || index < 0 || index >= episodes.length) return;
    // 切到另一集时，上一集按下的暂停不跟着走：滑过去就应该自动播放。
    // 重复选中同一集（例如页面重新可见）不在这里恢复，尊重用户按下的暂停。
@@ -210,7 +222,7 @@ class PlaybackSession extends ChangeNotifier {
    final request = ++_generation;
    _selected = true;
    _currentIndex = index;
-    _nextIndex = preloadIndex;
+    _rememberNeighbors(preloadIndex, previousIndex);
    _error = null;
    if (!_visible) {
      _loading = false;
@@ -235,6 +247,7 @@ class PlaybackSession extends ChangeNotifier {
    _PlayerSlot? target;
    await _enqueue(() async {
      if (_closed || request != _generation) return;
+      await _retire(_handoff);
      final old = _active;
      if (old != null &&
          old.index == index &&
@@ -244,19 +257,22 @@ class PlaybackSession extends ChangeNotifier {
        return;
      }
      if (old != null) await old.player.pause();
-      final warm = _next;
+      final warmNext = _next;
+      final warmPrevious = _previous;
      _active = null;
      _next = null;
-      final hit = warm?.index == index && warm?.failure == null && !isLocked;
-      if (hit) {
+      _previous = null;
+      final warm =
+          _usableWarm(this, warmNext, index) ??
+          _usableWarm(this, warmPrevious, index);
+      if (warm != null) {
        target = _active = warm;
-        _loading = !warm!.prepared;
+        _loading = !warm.prepared;
        _notify();
        // Start a ready successor before awaiting slow disposal of the old one.
        if (warm.prepared) await _start(warm, request);
      }
-      await _retire(old);
-      if (!hit) await _retire(warm);
+      await _parkNeighbors(this, old, warmNext, warmPrevious);
      if (_closed || request != _generation || isLocked) return;
      if (target == null) {
        target = _active = _create(index);
@@ -269,7 +285,109 @@ class PlaybackSession extends ChangeNotifier {
    await slot.ready;
    if (_closed || request != _generation || _active != slot) return;
    await _enqueue(() => _start(slot, request));
-    if (!_closed && request == _generation) _schedulePreload();
+    if (!_closed && request == _generation) _warmNeighbors(this);
+  }
+
+  /// 后台准备新片源，成功后再替换当前播放器。失败时原播放器保持不动。
+  Future<bool> replaceCurrent() async {
+    if (_closed || !_selected) return false;
+    final index = _currentIndex;
+    if (index < 0 || index >= episodes.length || isLocked) return false;
+    if (!canPlay(episodes[index])) return false;
+    final request = _generation;
+    final slot = await _prepareReplacement(index, request);
+    if (slot == null) {
+      await _resumeActive();
+      return false;
+    }
+    await slot.ready;
+    if (!_replacementReady(slot, request)) {
+      await _dropReplacement(slot);
+      await _resumeActive();
+      return false;
+    }
+    final previous = await _showReplacement(slot, request);
+    if (_active != slot) {
+      await _dropReplacement(slot);
+      return false;
+    }
+    await _enqueue(() => _start(slot, request));
+    await Future<void>.delayed(_qualityHandoffHold);
+    if (previous != null && _handoff == previous && _active == slot) {
+      await _enqueue(() => _retire(previous));
+    }
+    if (!_closed && request == _generation) _warmNeighbors(this);
+    return _active == slot && slot.failure == null;
+  }
+
+  Future<_PlayerSlot?> _prepareReplacement(int index, int request) async {
+    _PlayerSlot? created;
+    await _enqueue(() async {
+      if (_closed || request != _generation || _active == null) return;
+      final warm = _next;
+      _next = null;
+      await _retire(_handoff);
+      await _retire(warm);
+      if (_closed || request != _generation || _active == null) return;
+      try {
+        created = _create(index);
+      } catch (_) {
+        created = null;
+      }
+    });
+    return created;
+  }
+
+  bool _replacementReady(_PlayerSlot slot, int request) {
+    return !_closed &&
+        request == _generation &&
+        _active != null &&
+        slot.failure == null &&
+        slot.prepared;
+  }
+
+  Future<void> _resumeActive() async {
+    final slot = _active;
+    if (slot == null || !_userWantsPlay || _closed) return;
+    await _enqueue(() => _applyPlayback(slot));
+  }
+
+  Future<void> _dropReplacement(_PlayerSlot slot) {
+    return _enqueue(() async {
+      if (_live.contains(slot)) await _retire(slot);
+    });
+  }
+
+  /// 先把已出画的新播放器交到界面上，旧播放器留给调用方稍后释放。
+  Future<_PlayerSlot?> _showReplacement(_PlayerSlot slot, int request) async {
+    _PlayerSlot? previous;
+    var shown = false;
+    await _enqueue(() async {
+      if (!_replacementReady(slot, request)) return;
+      previous = _active;
+      await _catchUp(slot, previous);
+      _handoff = previous;
+      _active = slot;
+      shown = true;
+      if (previous != null) await previous!.player.pause();
+      _notify();
+    });
+    if (!shown || _active != slot) return null;
+    return previous;
+  }
+
+  /// 旧片仍在播，把新片对齐到当前进度，盖住时画面才接得上。
+  Future<void> _catchUp(_PlayerSlot slot, _PlayerSlot? previous) async {
+    final next = slot.player;
+    final current = previous?.player;
+    if (next is! VideoPlayerPort || current is! VideoPlayerPort) return;
+    final position = current.controller.value.position;
+    if (position <= Duration.zero) return;
+    try {
+      await next.seekTo(position);
+    } catch (_) {
+      // 对齐失败仍用准备阶段的进度，不因此放弃切换。
+    }
  }

  Future<void> _start(_PlayerSlot slot, int request) async {
@@ -304,54 +422,6 @@ class PlaybackSession extends ChangeNotifier {
    slot.playing = shouldPlay;
  }

-  void _schedulePreload() {
-    final request = _generation;
-    final index = _nextIndex;
-    _preloadTask = () async {
-      _PlayerSlot? candidate;
-      await _enqueue(() async {
-        if (_closed || request != _generation) return;
-        final allowed =
-            index != null &&
-            index >= 0 &&
-            index < episodes.length &&
-            index != _currentIndex &&
-            canPlay(episodes[index]);
-        if (!allowed || _next?.index != index) {
-          final stale = _next;
-          _next = null;
-          await _retire(stale);
-        }
-        if (!_visible ||
-            _overlayOpen ||
-            request != _generation ||
-            _active?.prepared != true ||
-            !allowed) {
-          return;
-        }
-        try {
-          candidate = _next ??= _create(index);
-        } catch (_) {
-          // Optional allocation failure must not interrupt the playing item.
-        }
-      });
-      final slot = candidate;
-      if (slot == null) return;
-      await slot.ready;
-      if (_closed || _next != slot) return;
-      if (slot.failure != null) {
-        // Optional work fails silently. A later explicit selection retries.
-        await _enqueue(() async {
-          if (_next != slot) return;
-          _next = null;
-          await _retire(slot);
-        });
-      } else {
-        _notify();
-      }
-    }();
-  }
-
  void setAppResumed(bool value) {
    _appResumed = value;
    _syncPlayback();
@@ -376,18 +446,24 @@ class PlaybackSession extends ChangeNotifier {
  void _syncPlayback() {
    if (_closed) return;
    if (_visible && _selected && active == null) {
-      unawaited(select(_currentIndex, preloadIndex: _nextIndex));
+      unawaited(
+        select(
+          _currentIndex,
+          preloadIndex: _nextIndex,
+          previousIndex: _previousIndex,
+        ),
+      );
      return;
    }
    final slot = _active;
    if (slot != null) unawaited(_enqueue(() => _applyPlayback(slot)));
-    if (_visible && !_overlayOpen && !_loading) _schedulePreload();
+    if (_visible && !_overlayOpen && !_loading) _warmNeighbors(this);
  }

  Future<void> _releasePlayers() {
    _generation++;
    return _enqueue(() async {
-      _active = _next = null;
+      _active = _next = _previous = _handoff = null;
      _loading = false;
      _notify();
      for (final slot in _live.toList()) {
@@ -0,0 +1,107 @@
+// Author: fruit.com.cn
+
+import 'package:flutter/foundation.dart';
+
+import '../models/playlist_detail.dart';
+import '../remote/catalog_api.dart';
+import '../repositories/playlist_repository.dart';
+
+/// 推荐页剧单：已启用剧单及其短剧卡片。
+class PlaylistController extends ChangeNotifier {
+  PlaylistController(this._repository);
+
+  final PlaylistRepository _repository;
+
+  static const int pageSize = CatalogApi.playlistPageSize;
+
+  List<PlaylistDetail> items = const [];
+  bool loading = false;
+  bool loadingMore = false;
+  bool loaded = false;
+  bool hasMore = false;
+  String? error;
+  int _pageIndex = 1;
+  bool _disposed = false;
+
+  /// 从第一页重新拉取。失败保留错误态，成功后替换本地缓存。
+  Future<void> load() async {
+    loading = true;
+    error = null;
+    _notify();
+    try {
+      final page = await _repository.fetchPlaylists(pageSize: pageSize);
+      items = page.list;
+      _pageIndex = 1;
+      hasMore = items.length < page.total;
+      loaded = true;
+    } catch (exception) {
+      error = 'playlistsError';
+      if (kDebugMode) debugPrint('[playlist] $exception');
+    } finally {
+      loading = false;
+      _notify();
+    }
+  }
+
+  /// 滚到底时追加下一页。没有更多或正在请求时直接返回。
+  Future<void> loadMore() async {
+    if (loading || loadingMore || !hasMore) return;
+    loadingMore = true;
+    _notify();
+    try {
+      final page = await _repository.fetchPlaylists(
+        pageIndex: _pageIndex + 1,
+        pageSize: pageSize,
+      );
+      if (page.list.isEmpty) {
+        hasMore = false;
+      } else {
+        items = [...items, ...page.list];
+        _pageIndex += 1;
+        hasMore = items.length < page.total;
+      }
+    } catch (exception) {
+      if (kDebugMode) debugPrint('[playlist] more $exception');
+    } finally {
+      loadingMore = false;
+      _notify();
+    }
+  }
+
+  /// 打开某一剧单时再取一次详情；失败则回落到列表里已有的那条。
+  Future<PlaylistDetail> detail(
+    String id, {
+    int pageIndex = 1,
+    int pageSize = CatalogApi.playlistDramaPageSize,
+  }) async {
+    try {
+      return await _repository.fetchPlaylist(
+        id,
+        pageIndex: pageIndex,
+        pageSize: pageSize,
+      );
+    } catch (exception) {
+      if (kDebugMode) debugPrint('[playlist] detail $id $exception');
+      return items.firstWhere(
+        (item) => item.id == id,
+        orElse: () => PlaylistDetail(
+          id: id,
+          name: '',
+          description: '',
+          dramaCount: 0,
+          dramas: const [],
+        ),
+      );
+    }
+  }
+
+  void _notify() {
+    if (!_disposed) notifyListeners();
+  }
+
+  @override
+  void dispose() {
+    _disposed = true;
+    super.dispose();
+  }
+}
@@ -122,6 +122,8 @@ abstract interface class SpriteThumbnailAxisSource implements Listenable {
  SpriteThumbnailFrame? cachedFrameAt(String? thumbnailsUrl, Duration position);

  bool hasAxis(String? thumbnailsUrl);
+
+  Future<void> prepareAt(String? thumbnailsUrl, Duration position);
 }

 /// VTT 时间轴、cue 二分与 sprite ui.Image LRU 缓存。
@@ -153,6 +155,7 @@ class SpriteThumbnailAxisService extends ChangeNotifier
  List<String> get spriteCacheKeys => _spriteCache.keys.toList();

  /// 播放器就绪时预取当前 cue 与相邻 sprite，拖动帧不触发网络或解码。
+  @override
  Future<void> prepareAt(String? thumbnailsUrl, Duration position) async {
    final url = _normalizeUrl(thumbnailsUrl);
    if (_disposed || url == null) return;
Author	SHA1	Message	Date
Zhou Weidong	222bacdeeb	fix(player): 优化上下滑切集黑屏	2026-10-26 13:15:56 +08:00
Zhou Weidong	b83b5799e3	chore(merge): 合并 iOS 无线数据选择框触发	2026-10-26 09:35:29 +08:00
Zhou Weidong	d4ae8f427f	fix(ios): 用系统网络请求唤起无线数据选择 Flutter 的接口请求不会触发系统选择框，进入前台后补一次 URLSession 请求。	2026-10-26 09:35:29 +08:00
Zhou Weidong	98d7debfb5	chore(merge): 合并 iOS 无线数据询问	2026-10-25 21:23:26 +08:00
Zhou Weidong	b5e9deb4bd	feat(ios): 首次启动询问无线数据权限 iOS 在首个接口请求前等待系统无线数据选择，避免未授权时请求被静默拒绝。	2026-10-25 21:23:25 +08:00
Zhou Weidong	47df002d8e	chore(merge): 合并客户端多语言筛选与注销原因修正	2026-10-24 17:22:57 +08:00
Zhou Weidong	4f1feeadbd	fix(app): 注销原因对齐到输入框顶部	2026-10-24 17:20:24 +08:00
Zhou Weidong	8b50b5bd06	feat(app): 客户端展示多语言并支持筛选分页	2026-10-24 17:20:24 +08:00
Zhou Weidong	8481611372	chore(merge): 合并错误码三语文案	2026-10-23 13:05:29 +08:00
Zhou Weidong	b1e95b370c	feat(app): 按错误码展示中英印尼文案	2026-10-23 13:05:29 +08:00
Zhou Weidong	0ef0d46919	chore(merge): 合并未使用注销原因清理	2026-10-23 12:45:30 +08:00
Zhou Weidong	b4d38f8e10	refactor(app): 删除未使用的注销原因组件	2026-10-23 12:45:30 +08:00
Zhou Weidong	c034627fdb	chore(merge): 合并播放协议搜索与空状态	2026-10-23 12:38:47 +08:00
Zhou Weidong	ef29fc5f15	feat(app): 完善播放协议搜索与空状态	2026-10-23 12:38:47 +08:00
Zhou Weidong	671e0ce143	merge: 将远程 main 同步到 develop	2026-10-23 08:09:24 +08:00
Zhou Weidong	0f1f64a09f	merge: 将 release/v1.0.0 同步到 main	2026-10-23 03:22:26 +08:00
Zhou Weidong	d29ae20491	merge: 将客户端调整同步到 release/v1.0.0	2026-10-23 03:21:53 +08:00
Zhou Weidong	12e08a89a4	fix(player): 提高解锁金币标签对比度	2026-10-23 03:18:24 +08:00
Zhou Weidong	e0ba54f23b	fix(cover): 封面占位改为品牌标识	2026-10-23 03:18:24 +08:00
Zhou Weidong	5043d6c25b	fix(l10n): 缩短印尼语全部短剧文案	2026-10-23 03:18:24 +08:00
Zhou Weidong	ab6800aba2	fix(search): 避免键盘顶起搜索页	2026-10-23 03:18:24 +08:00
Zhou Weidong	f8500bbaca	fix(player): 完善进度预览清屏与下拉刷新	2026-10-23 03:18:24 +08:00
Zhou Weidong	9b1afbdb36	feat(recommend): 剧单更多进入两列详情页	2026-10-23 03:18:24 +08:00
Zhou Weidong	f4cf7bc2dd	fix(home): 调整榜单版式并去掉二级分类	2026-10-23 03:18:24 +08:00
Zhou Weidong	60489d6dca	fix(ios): 修复逐帧请求头编译失败	2026-10-23 03:18:23 +08:00
Zhou Weidong	44d3bcba18	style(empty): 放大空状态图标并降低亮度	2026-10-23 01:10:59 +08:00
Zhou Weidong	f206977ad8	fix(config): 开发服务地址改为当前局域网	2026-10-23 01:10:59 +08:00
Zhou Weidong	f3d64f6fb5	fix(auth): 登录页靠上排列并支持外部失焦	2026-10-23 01:10:59 +08:00
Zhou Weidong	6318ca24ec	feat(splash): 缩短开屏停留并统一开屏图	2026-10-23 01:06:07 +08:00
Zhou Weidong	b513ac0a9c	merge: 调整品牌开屏与纯黑原生启动	2026-10-22 23:15:36 +08:00
Zhou Weidong	25d90e1383	feat: 调整品牌开屏与纯黑原生启动	2026-10-22 23:15:27 +08:00
Zhou Weidong	7804809d83	merge: 开屏后直接展示首页骨架	2026-10-22 23:11:13 +08:00
Zhou Weidong	5f278a3510	feat: 开屏后直接展示首页骨架	2026-10-22 23:11:03 +08:00
Zhou Weidong	56d7abc6b1	merge: 保留系统开屏并更新品牌素材	2026-10-22 23:04:31 +08:00
Zhou Weidong	345cc2ad28	feat: 保留系统开屏并更新品牌素材	2026-10-22 23:04:23 +08:00
Zhou Weidong	41bd4683c3	merge: 更新 App 图标与开屏素材	2026-10-22 22:59:14 +08:00
Zhou Weidong	d868ce9336	feat: 更新 App 图标与开屏素材	2026-10-22 22:59:07 +08:00
Zhou Weidong	928ac1de19	merge: 增加搜索结果下拉刷新	2026-10-22 22:53:01 +08:00
Zhou Weidong	6b3d870c93	feat: 增加搜索结果下拉刷新	2026-10-22 22:52:50 +08:00
Zhou Weidong	281f13a810	merge: 调整搜索结果两列布局	2026-10-22 22:50:55 +08:00
Zhou Weidong	8637f5da21	style: 调整搜索结果两列布局	2026-10-22 22:50:47 +08:00
Zhou Weidong	0319f8a6a8	merge: 统一首页与推荐搜索入口	2026-10-22 22:48:29 +08:00
Zhou Weidong	9aa797504b	feat: 统一首页与推荐搜索入口	2026-10-22 22:48:21 +08:00
Zhou Weidong	933333b0fe	merge: 使用点击序号防止双击误暂停	2026-10-22 22:39:30 +08:00
Zhou Weidong	bbc759473c	fix: 使用点击序号防止双击误暂停	2026-10-22 22:39:21 +08:00
Zhou Weidong	9ddd7fc833	merge: 修复播放器重复暂停手势	2026-10-22 22:34:26 +08:00
Zhou Weidong	5794dd4e4d	fix: 修复播放器重复暂停手势	2026-10-22 22:34:18 +08:00
Zhou Weidong	76c4b528d3	merge: 修正双击点赞与心形联动	2026-10-22 22:30:11 +08:00
Zhou Weidong	68ccfa21c0	fix: 修正双击点赞与心形联动	2026-10-22 22:30:01 +08:00
Zhou Weidong	78d0166eb7	merge: 增加播放器双击点赞与飘心	2026-10-22 22:25:22 +08:00
Zhou Weidong	4140c4eb50	feat: 增加播放器双击点赞与飘心	2026-10-22 22:25:14 +08:00
Zhou Weidong	e2cc409e5a	merge: 重做首页热播榜布局	2026-10-22 22:20:01 +08:00
Zhou Weidong	9b83283689	feat: 重做首页热播榜布局	2026-10-22 22:19:55 +08:00
Vicky	a1c0af3f00	merge: 将 release/v1.0.0 同步到 main	2026-10-21 20:07:35 +08:00
Vicky	b5bfc1d7b2	merge: 将 develop 同步到 release/v1.0.0	2026-10-21 20:07:30 +08:00
Vicky	1d2ba93e48	merge: 同步 release 剔除 x86_64 到 main	2026-10-21 19:13:33 +08:00
Vicky	c08df9af40	merge: 同步 release 剔除 x86_64 到 release/v1.0.0	2026-10-21 19:13:28 +08:00
Vicky	be166f5856	merge: 同步生产包 ABI 约束到 main	2026-10-21 19:10:11 +08:00
Vicky	e531c78997	merge: 同步生产包 ABI 约束到 release/v1.0.0	2026-10-21 19:10:10 +08:00
Vicky	8ed6cd9fd6	merge: 同步生产打包单包说明到 main	2026-10-21 19:07:03 +08:00
Vicky	c1d55b91a2	merge: 同步生产打包单包说明到 release/v1.0.0	2026-10-21 19:06:57 +08:00
Vicky	3dcfa02372	merge: 同步 README 生产打包说明到 main	2026-10-21 19:03:06 +08:00
Vicky	b6826f7483	merge: 同步 README 生产打包说明到 release/v1.0.0	2026-10-21 19:03:01 +08:00
Vicky	cd3d84cf9a	merge: 将 release/v1.0.0 同步到 main	2026-10-21 18:58:26 +08:00
Vicky	010ce326ea	merge: 将 develop 同步到 release/v1.0.0	2026-10-21 18:58:12 +08:00
Zhou Weidong	2577797772	merge: 将 C3 埋点同步到 main	2026-10-21 09:09:34 +08:00
Zhou Weidong	05e2952815	merge: 将 C3 埋点同步到 release/v1.0.0	2026-10-21 09:07:42 +08:00
Zhou Weidong	6ae9e8e043	merge: 将 release/v1.0.0 同步到 main	2026-10-20 22:26:48 +08:00
Zhou Weidong	182b7e3ac2	merge: 将 develop 同步到 release/v1.0.0	2026-10-20 22:23:32 +08:00
Zhou Weidong	8bb365db2a	merge: 将 release/v1.0.0 合入 main	2026-10-20 20:38:58 +08:00
Zhou Weidong	0cb57d084d	merge: 将 develop 合入 release/v1.0.0 # Conflicts: # lib/core/config/app_config.dart # lib/main.dart # test/config/server_endpoint_test.dart	2026-10-20 20:36:43 +08:00
jianghaifeng	5c174b007c	Merge pull request 'Release/v1.0.0' (#1 ) from release/v1.0.0 into main Reviewed-on: #1	2026-10-19 13:42:16 +00:00
Zhou Weidong	35364c949a	chore(release): 合并 develop 到 release/v1.0.0	2026-10-19 21:39:21 +08:00
Zhou Weidong	814b2c0b7b	chore(config): 默认服务地址改为公网 39.162.50.99:8081	2026-10-19 21:12:16 +08:00
Zhou Weidong	3d0e0804ca	fix(app): 修复视频播放明文HTTP与双网络访问切换	2026-10-19 18:37:38 +08:00