feat: phase1 UI prep — 设备ID系统传递 + 国家本地化展示 + 继续观看直进播放页

设备标识: Android SSAID/ iOS IDFV 原生通道 → Dart DeviceIdProvider
国家解析: 注册/登录从后端 IP → 国家/语言/时区/币种 自动落库
账号资料: 全部本地化展示 (account_display.dart)
我的页: 继续观看卡片点击直接进播放页

android/app/src/main/kotlin/com/stormg/lumadrama/MainActivity.kt

@@ -4,6 +4,7 @@ package com.stormg.lumadrama
 
 import android.content.Intent
 import android.app.PictureInPictureParams
+import android.content.Context
 import android.content.res.Configuration
 import android.graphics.Bitmap
 import android.media.MediaMetadataRetriever
@@ -12,6 +13,8 @@ import android.os.Build
 import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
+import android.provider.Settings
+import android.telephony.TelephonyManager
 import android.util.Rational
 import android.content.pm.PackageManager
 import android.view.WindowManager
@@ -21,6 +24,7 @@ import io.flutter.embedding.android.FlutterActivity
 import io.flutter.embedding.engine.FlutterEngine
 import io.flutter.plugin.common.MethodChannel
 import java.io.ByteArrayOutputStream
+import java.util.Locale
 import java.util.concurrent.ExecutorService
 import java.util.concurrent.Executors
 import java.util.concurrent.atomic.AtomicBoolean
@@ -65,6 +69,23 @@ class MainActivity : FlutterActivity() {
                 result.success(false)
             }
         }
+        // 设备标识：SSAID 免权限，卸载重装不变，避免客户端自己生成的 id 每次重装都变
+        MethodChannel(flutterEngine.dartExecutor.binaryMessenger, "com.stormg.lumadrama/device")
+            .setMethodCallHandler { call, result ->
+                when (call.method) {
+                    "ssaid" -> {
+                        val value = try {
+                            Settings.Secure.getString(contentResolver, Settings.Secure.ANDROID_ID)
+                        } catch (_: Exception) {
+                            null
+                        }
+                        result.success(value)
+                    }
+                    // 设备区域：注册时作为服务端 IP 解析失败后的兜底
+                    "region" -> result.success(currentRegion())
+                    else -> result.notImplemented()
+                }
+            }
         MethodChannel(flutterEngine.dartExecutor.binaryMessenger, "com.stormg.lumadrama/share")
             .setMethodCallHandler { call, result ->
                 if (call.method != "shareText") {
@@ -156,6 +177,28 @@ class MainActivity : FlutterActivity() {
             ?.bottom
             ?: 0
 
+    /** 网络运营商国家优先，其次 SIM 卡，最后系统语言；都拿不到返回空串。 */
+    private fun currentRegion(): String {
+        return try {
+            val telephony = getSystemService(Context.TELEPHONY_SERVICE) as? TelephonyManager
+            val localeCountry = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                resources.configuration.locales.get(0).country
+            } else {
+                @Suppress("DEPRECATION")
+                resources.configuration.locale.country
+            }
+            val candidates = listOfNotNull(
+                telephony?.networkCountryIso,
+                telephony?.simCountryIso,
+                localeCountry
+            )
+            candidates.firstOrNull { it.isNotBlank() }?.uppercase(Locale.ROOT) ?: ""
+        } catch (_: Exception) {
+            // 个别 ROM 读运营商信息会抛 SecurityException，别让注册流程卡住
+            ""
+        }
+    }
+
     private fun emitImeInset(value: Int) {
         if (value == imeInset) return
         imeInset = value

ios/Runner.xcodeproj/project.pbxproj

@@ -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 */,
 			);

ios/Runner/AppDelegate.swift

@@ -37,6 +37,7 @@ final class RunnerFlutterViewController: FlutterViewController {
 
 @main
 @objc class AppDelegate: FlutterAppDelegate, FlutterImplicitEngineDelegate {
+  private let wirelessDataPrompt = WirelessDataPrompt()
   private let thumbnailQueue = DispatchQueue(
     label: "com.stormg.lumadrama.thumbnail",
     qos: .userInitiated
@@ -50,8 +51,19 @@ 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)
+    registerDeviceIdChannel(engineBridge)
     let channel = FlutterMethodChannel(
       name: "com.stormg.lumadrama/share",
       binaryMessenger: engineBridge.applicationRegistrar.messenger()
@@ -132,4 +144,45 @@ final class RunnerFlutterViewController: FlutterViewController {
       }
     }
   }
+
+  /// 设备标识：IDFV 免权限，卸载本 App 不变，避免客户端自生成的 id 每次重装都变。
+  /// 同通道顺带提供设备区域（ISO-2），注册时作为服务端 IP 解析失败后的兜底。
+  private func registerDeviceIdChannel(_ engineBridge: FlutterImplicitEngineBridge) {
+    let channel = FlutterMethodChannel(
+      name: "com.stormg.lumadrama/device",
+      binaryMessenger: engineBridge.applicationRegistrar.messenger()
+    )
+    channel.setMethodCallHandler { call, result in
+      switch call.method {
+      case "idfv":
+        result(UIDevice.current.identifierForVendor?.uuidString)
+      case "region":
+        if #available(iOS 16.0, *) {
+          result(Locale.current.region?.identifier)
+        } else {
+          result(Locale.current.regionCode)
+        }
+      default:
+        result(FlutterMethodNotImplemented)
+      }
+    }
+  }
+
+  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)
+    }
+  }
 }

ios/Runner/Info.plist

@@ -48,7 +48,7 @@
 					<key>NSIncludesSubdomains</key>
 					<true/>
 				</dict>
-				<key>10.43.47.1</key>
+				<key>192.168.31.243</key>
 				<dict>
 					<key>NSExceptionAllowsInsecureHTTPLoads</key>
 					<true/>

ios/Runner/SceneDelegate.swift

@@ -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()
+  }
 }

ios/Runner/WirelessDataPrompt.swift

@@ -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) }
+  }
+}

lib/app.dart

@@ -14,6 +14,7 @@ import 'core/data/remote/catalog_api.dart';
 import 'core/data/remote/category_api.dart';
 import 'core/data/remote/comment_api.dart';
 import 'core/data/remote/commerce_api.dart';
+import 'core/data/remote/device_profile.dart';
 import 'core/data/remote/download_api.dart';
 import 'core/data/remote/interaction_api.dart';
 import 'core/data/remote/library_api.dart';
@@ -30,6 +31,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 +43,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 +86,7 @@ class LumaDramaApp extends StatefulWidget {
     this.commerceRepository,
     this.storeRepository,
     this.searchRepository,
+    this.playlistRepository,
     this.haptics = const FlutterHaptics(),
   });
 
@@ -103,6 +107,7 @@ class LumaDramaApp extends StatefulWidget {
   final CommerceRepository? commerceRepository;
   final StoreRepository? storeRepository;
   final SearchRepository? searchRepository;
+  final PlaylistRepository? playlistRepository;
   final Haptics haptics;
 
   @override
@@ -113,12 +118,13 @@ class _LumaDramaAppState extends State<LumaDramaApp> {
   late final AuthSessionStore _sessionStore = AuthSessionStore();
 
   /// 全 App 共用一个 ApiClient：这样目录、账号、后续的互动/进度请求
-  /// 都自动带 `Authorization` 与 `X-Device-Id`，401 的刷新重试也只有一处实现。
+  /// 都自动带 `Authorization`、`X-Device-Id` 与平台头，401 的刷新重试也只有一处实现。
   late final ApiClient _apiClient = ApiClient(
     accessTokenReader: () => _auth.accessToken,
     tokenRefresher: () => _auth.refresh(),
     onUnauthorized: () => _auth.clear(),
     deviceIdReader: _sessionStore.deviceId,
+    platformReader: clientPlatform,
   );
 
   late final AuthController _auth = AuthController(
@@ -126,8 +132,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 ??
@@ -135,17 +143,11 @@ class _LumaDramaAppState extends State<LumaDramaApp> {
 
   late final WatchHistoryRepository _watchHistory =
       widget.watchHistoryRepository ??
-      HttpWatchHistoryRepository(
-        WatchApi(_apiClient),
-        isSignedIn: () => _auth.isSignedIn,
-      );
+      HttpWatchHistoryRepository(WatchApi(_apiClient));
 
   late final FavoriteRepository _favorites =
       widget.favoriteRepository ??
-      HttpFavoriteRepository(
-        LibraryApi(_apiClient),
-        isSignedIn: () => _auth.isSignedIn,
-      );
+      HttpFavoriteRepository(LibraryApi(_apiClient));
 
   late final PlaybackRepository _playback =
       widget.playbackRepository ??
@@ -177,6 +179,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));
 
@@ -206,7 +215,7 @@ class _LumaDramaAppState extends State<LumaDramaApp> {
     unawaited(_localeController.load());
     // 登录/登出时同步收藏状态：收藏属于账号，不能跨账号串联
     _auth.addListener(_onAuthChanged);
-    if (_auth.isSignedIn) unawaited(_favoriteController.load());
+    unawaited(_favoriteController.load());
     if (_auth.isSignedIn) unawaited(_walletController.load());
     unawaited(_downloadController.restore());
   }
@@ -222,6 +231,7 @@ class _LumaDramaAppState extends State<LumaDramaApp> {
       unawaited(_walletController.load());
     } else {
       _favoriteController.clear();
+      unawaited(_favoriteController.load());
       _downloadController.reset();
       _walletController.reset();
     }
@@ -239,14 +249,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 +282,15 @@ 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),

lib/core/config/app_config.dart

@@ -14,7 +14,7 @@ class AppConfig {
   /// 开发调试默认服务地址，当前指向本机局域网 IP。
   ///
   /// 换网络时只改这一行，地址不要带结尾斜杠。
-  static const String devHostBaseUrl = 'http://10.43.47.1:8081';
+  static const String devHostBaseUrl = 'http://192.168.31.243:8081';
 
   /// 本机后端地址：通过 `adb reverse tcp:8081 tcp:8081` 映射到开发机，
   /// 探测可达时 App 直连本机服务；不可达时回落到公网地址。

lib/core/data/models/content_category.dart

@@ -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);
   }
 }

lib/core/data/models/drama.dart

@@ -1,6 +1,9 @@
 // Author: fruit.com.cn
 
+import 'dart:ui';
+
 import 'json_numbers.dart';
+import 'locale_text.dart';
 
 /// 短剧与剧集，字段与后端 `/app/**` 的下发结构对应。
 ///
@@ -18,6 +21,7 @@ class Episode {
     this.likeCount,
     this.commentCount,
     this.thumbnailsUrl,
+    this.posterUrl,
   });
 
   final String id;
@@ -34,12 +38,14 @@ class Episode {
   final int? likeCount;
   final int? commentCount;
   final String? thumbnailsUrl;
+  final String? posterUrl;
 
   Episode withVideoUrl(
     String url, {
     int? likeCount,
     int? commentCount,
     String? thumbnailsUrl,
+    String? posterUrl,
   }) => Episode(
     id: id,
     number: number,
@@ -51,6 +57,21 @@ class Episode {
     likeCount: likeCount ?? this.likeCount,
     commentCount: commentCount ?? this.commentCount,
     thumbnailsUrl: thumbnailsUrl ?? this.thumbnailsUrl,
+    posterUrl: posterUrl ?? this.posterUrl,
+  );
+
+  Episode withStats({int? likeCount, int? commentCount}) => Episode(
+    id: id,
+    number: number,
+    title: title,
+    isFree: isFree,
+    videoUrl: videoUrl,
+    durationSec: durationSec,
+    locked: locked,
+    likeCount: likeCount ?? this.likeCount,
+    commentCount: commentCount ?? this.commentCount,
+    thumbnailsUrl: thumbnailsUrl,
+    posterUrl: posterUrl,
   );
 
   factory Episode.fromJson(Map<String, dynamic> json) {
@@ -65,6 +86,7 @@ class Episode {
       likeCount: _optionalInt(json['likeCount']),
       commentCount: _optionalInt(json['commentCount']),
       thumbnailsUrl: _optionalString(json['thumbnailsUrl']),
+      posterUrl: _optionalString(json['posterUrl']),
     );
   }
 }
@@ -76,7 +98,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 +123,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 +163,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 +195,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 +227,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 +266,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 : '';
+}

lib/core/data/models/episode_stats.dart

@@ -0,0 +1,55 @@
+// Author: fruit.com.cn
+
+import 'json_numbers.dart';
+
+/// 播放页轻量互动计数快照，不包含播放地址或票据信息。
+class EpisodeStats {
+  const EpisodeStats({
+    required this.episodeId,
+    required this.dramaId,
+    required this.likeCount,
+    required this.commentCount,
+    required this.favoriteCount,
+    required this.liked,
+    required this.favorited,
+  });
+
+  final String episodeId;
+  final String dramaId;
+  final int likeCount;
+  final int commentCount;
+  final int favoriteCount;
+  final bool liked;
+  final bool favorited;
+
+  EpisodeStats copyWith({
+    String? dramaId,
+    int? likeCount,
+    int? commentCount,
+    int? favoriteCount,
+    bool? liked,
+    bool? favorited,
+  }) {
+    return EpisodeStats(
+      episodeId: episodeId,
+      dramaId: dramaId ?? this.dramaId,
+      likeCount: likeCount ?? this.likeCount,
+      commentCount: commentCount ?? this.commentCount,
+      favoriteCount: favoriteCount ?? this.favoriteCount,
+      liked: liked ?? this.liked,
+      favorited: favorited ?? this.favorited,
+    );
+  }
+
+  factory EpisodeStats.fromJson(Map<String, dynamic> json) {
+    return EpisodeStats(
+      episodeId: jsonToId(json['episodeId']),
+      dramaId: jsonToId(json['dramaId']),
+      likeCount: jsonToInt(json['likeCount']),
+      commentCount: jsonToInt(json['commentCount']),
+      favoriteCount: jsonToInt(json['favoriteCount']),
+      liked: json['liked'] == true,
+      favorited: json['favorited'] == true,
+    );
+  }
+}

lib/core/data/models/home_feed.dart

@@ -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? ?? '';
+}

lib/core/data/models/interaction.dart

@@ -58,14 +58,16 @@ class LikeToggleResult {
 
 /// 控制器统一返回结果；失败消息可直接展示后端 `message`。
 class OperationResult<T> {
-  const OperationResult._(this.data, this.errorMessage);
+  const OperationResult._(this.data, this.errorMessage, this.errorCode);
 
-  const OperationResult.success([T? data]) : this._(data, null);
+  const OperationResult.success([T? data]) : this._(data, null, null);
 
-  const OperationResult.failure(this.errorMessage) : data = null;
+  const OperationResult.failure(this.errorMessage, {this.errorCode})
+    : data = null;
 
   final T? data;
   final String? errorMessage;
+  final int? errorCode;
 
   bool get isSuccess => errorMessage == null;
 }

lib/core/data/models/locale_text.dart

@@ -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;
+}

lib/core/data/models/play_ticket.dart

@@ -16,6 +16,7 @@ class PlayTicket {
     this.qualities = const [],
     this.tracks = const [],
     this.thumbnailsUrl,
+    this.posterUrl,
     this.likeCount,
     this.commentCount,
   });
@@ -46,6 +47,7 @@ class PlayTicket {
   /// 各档签名地址。AUTO 是主列表，点选其它档位时换成对应地址。
   final List<PlayQualityTrack> tracks;
   final String? thumbnailsUrl;
+  final String? posterUrl;
   final int? likeCount;
   final int? commentCount;
 
@@ -70,6 +72,7 @@ class PlayTicket {
           .toList(),
       tracks: _tracks(json['tracks'], json['playUrl'] as String? ?? ''),
       thumbnailsUrl: _optionalString(json['thumbnailsUrl']),
+      posterUrl: _optionalString(json['posterUrl']),
       likeCount: json['likeCount'] == null
           ? null
           : jsonToInt(json['likeCount']),

lib/core/data/models/playlist_detail.dart

@@ -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);
+}

lib/core/data/models/watch_progress.dart

@@ -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,6 +14,7 @@ class WatchProgress {
     required this.position,
     required this.duration,
     this.dramaTitle,
+    this.titleLocales = const {},
     this.dramaCover,
     this.episodeNumber,
     this.totalEpisodes,
@@ -25,6 +27,7 @@ class WatchProgress {
   final String dramaId;
   final String episodeId;
   final String? dramaTitle;
+  final Map<String, String> titleLocales;
   final String? dramaCover;
   final int? episodeNumber;
   final int? totalEpisodes;
@@ -45,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
@@ -72,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,

lib/core/data/models/watch_record.dart

@@ -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() ?? '';
   }
 
   /// 服务端分页封面优先，详情封面作为回退。

lib/core/data/remote/api_client.dart

@@ -24,6 +24,7 @@ class ApiClient {
     this.tokenRefresher,
     this.onUnauthorized,
     this.deviceIdReader,
+    this.platformReader,
   }) : _fixedBaseUrl = baseUrl {
     _dio = Dio(
       BaseOptions(
@@ -40,6 +41,7 @@ class ApiClient {
       AuthHeaderInterceptor(
         accessTokenReader: accessTokenReader,
         deviceIdReader: deviceIdReader,
+        platformReader: platformReader,
       ),
       const EnvelopeInterceptor(),
       NetworkLogInterceptor(),
@@ -67,6 +69,9 @@ class ApiClient {
   /// 设备号（`X-Device-Id`）：注册风控、后续下载绑定都要用
   final Future<String> Function()? deviceIdReader;
 
+  /// 客户端平台（`X-Client-Platform`）：后台区分 iOS / Android
+  final String Function()? platformReader;
+
   Future<Object?> get(String path, {Map<String, String>? query}) {
     return _request('GET', path, query: query);
   }

lib/core/data/remote/api_interceptors.dart

@@ -32,7 +32,11 @@ class TokenExpiredException implements Exception {
 ///
 /// 每个请求都重新取一次令牌，所以刷新成功后重发的那次会自动带上新令牌。
 class AuthHeaderInterceptor extends Interceptor {
-  AuthHeaderInterceptor({this.accessTokenReader, this.deviceIdReader});
+  AuthHeaderInterceptor({
+    this.accessTokenReader,
+    this.deviceIdReader,
+    this.platformReader,
+  });
 
   /// 当前 access token；未登录返回 null 或空串。
   final String? Function()? accessTokenReader;
@@ -40,6 +44,9 @@ class AuthHeaderInterceptor extends Interceptor {
   /// 设备号（`X-Device-Id`）：注册风控、下载绑定都用它。
   final Future<String> Function()? deviceIdReader;
 
+  /// 客户端平台（`X-Client-Platform`）：后台区分 iOS / Android，匿名请求同样要带。
+  final String Function()? platformReader;
+
   @override
   Future<void> onRequest(
     RequestOptions options,
@@ -54,6 +61,10 @@ class AuthHeaderInterceptor extends Interceptor {
     if (deviceId != null && deviceId.isNotEmpty) {
       options.headers['X-Device-Id'] = deviceId;
     }
+    final platform = platformReader?.call() ?? '';
+    if (platform.isNotEmpty) {
+      options.headers['X-Client-Platform'] = platform;
+    }
     handler.next(options);
   }
 }

lib/core/data/remote/auth_api.dart

@@ -56,6 +56,7 @@ class AuthApi {
     required String target,
     required String code,
     required String deviceId,
+    String countryCode = '',
     String platform = '',
     String osVersion = '',
     String appVersion = '',
@@ -66,6 +67,7 @@ class AuthApi {
         'targetType': 'PHONE',
         'target': target,
         'code': code,
+        'countryCode': countryCode,
         'deviceId': deviceId,
         'platform': platform,
         'osVersion': osVersion,
@@ -79,6 +81,7 @@ class AuthApi {
     required String email,
     required String password,
     required String deviceId,
+    String countryCode = '',
     String platform = '',
     String osVersion = '',
     String appVersion = '',
@@ -89,7 +92,7 @@ class AuthApi {
         'targetType': 'EMAIL',
         'target': email,
         'password': password,
-        'countryCode': 'ID',
+        'countryCode': countryCode,
         'deviceId': deviceId,
         'platform': platform,
         'osVersion': osVersion,
@@ -134,6 +137,7 @@ class AuthApi {
         'platform': platform,
         'osVersion': osVersion,
       },
+      skipAuthRetry: true,
     );
     return AuthSession.fromJson((data as Map).cast<String, dynamic>());
   }

lib/core/data/remote/catalog_api.dart

@@ -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, '返回数据格式异常');

lib/core/data/remote/category_api.dart

@@ -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);
+  }
 }

lib/core/data/remote/device_profile.dart

@@ -0,0 +1,15 @@
+// Author: fruit.com.cn
+
+import 'dart:io' show Platform;
+
+import 'package:flutter/foundation.dart';
+
+/// 客户端平台，后台只用来区分 iOS / Android。
+///
+/// 系统版本、机型一律不上报：后台列表需要的只是「这台设备是安卓还是苹果」。
+String clientPlatform() {
+  if (kIsWeb) return 'WEB';
+  if (Platform.isAndroid) return 'ANDROID';
+  if (Platform.isIOS) return 'IOS';
+  return '';
+}

lib/core/data/remote/playback_api.dart

@@ -1,5 +1,6 @@
 // Author: fruit.com.cn
 
+import '../models/episode_stats.dart';
 import '../models/play_ticket.dart';
 import 'api_client.dart';
 
@@ -17,4 +18,11 @@ class PlaybackApi {
     if (data is Map<String, dynamic>) return PlayTicket.fromJson(data);
     throw const ApiException(-1, '返回数据格式异常');
   }
+
+  /// 轻量刷新互动计数：不签发地址，也不占用播放票据缓存。
+  Future<EpisodeStats> episodeStats(String episodeId) async {
+    final data = await _client.get('/app/episodes/$episodeId/stats');
+    if (data is Map<String, dynamic>) return EpisodeStats.fromJson(data);
+    throw const ApiException(-1, '返回数据格式异常');
+  }
 }

lib/core/data/remote/watch_api.dart

@@ -4,7 +4,7 @@ import '../models/page_result.dart';
 import '../models/watch_progress.dart';
 import 'api_client.dart';
 
-/// 观看进度接口：`/app/watch/*`（契约 §1.5）。全部需要登录态。
+/// 观看进度接口：`/app/watch/*`（契约 §1.5）。支持账号或设备身份。
 class WatchApi {
   const WatchApi(this._client);
 

lib/core/data/repositories/favorite_repository.dart

@@ -19,21 +19,15 @@ abstract interface class FavoriteRepository {
 }
 
 class HttpFavoriteRepository implements FavoriteRepository {
-  const HttpFavoriteRepository(this._api, {this.isSignedIn});
+  const HttpFavoriteRepository(this._api);
 
   final LibraryApi _api;
 
-  /// 未登录时不请求：收藏属于账号，匿名浏览时列表按空处理（点收藏按钮会先引导登录）。
-  final bool Function()? isSignedIn;
-
-  bool get _signedIn => isSignedIn?.call() ?? true;
-
   @override
   Future<bool> toggle(String dramaId) => _api.toggleFavorite(dramaId);
 
   @override
   Future<PageResult<Drama>> page({int pageIndex = 1, int pageSize = 20}) async {
-    if (!_signedIn) return const PageResult();
     return _api.favorites(pageIndex: pageIndex, pageSize: pageSize);
   }
 

lib/core/data/repositories/playback_repository.dart

@@ -1,5 +1,6 @@
 // Author: fruit.com.cn
 
+import '../models/episode_stats.dart';
 import '../models/play_ticket.dart';
 import '../remote/playback_api.dart';
 
@@ -10,6 +11,9 @@ import '../remote/playback_api.dart';
 abstract interface class PlaybackRepository {
   Future<PlayTicket> ticketFor(String episodeId, {bool forceRefresh = false});
 
+  /// 读取互动计数快照；与 [ticketFor] 分离，避免为了刷新计数重新签发地址。
+  Future<EpisodeStats> episodeStats(String episodeId);
+
   /// 当前缓存的票据是否还在有效期内（用于"回前台发现过期就重新取"）。
   bool isFresh(String episodeId);
 }
@@ -42,6 +46,10 @@ class HttpPlaybackRepository implements PlaybackRepository {
     return ticket;
   }
 
+  @override
+  Future<EpisodeStats> episodeStats(String episodeId) =>
+      _api.episodeStats(episodeId);
+
   @override
   bool isFresh(String episodeId) {
     final cached = _cache[episodeId];
@@ -65,11 +73,22 @@ class _CachedTicket {
 
 /// 测试与离线场景用：按集返回固定票据，并记录被请求过几次。
 class FakePlaybackRepository implements PlaybackRepository {
-  FakePlaybackRepository({this.ticket, this.error, this.fresh = true});
+  FakePlaybackRepository({
+    this.ticket,
+    this.error,
+    this.fresh = true,
+    this.stats,
+    this.statsError,
+    Map<String, EpisodeStats>? statsByEpisode,
+  }) : statsByEpisode = statsByEpisode ?? {};
 
   PlayTicket? ticket;
   Object? error;
+  EpisodeStats? stats;
+  Object? statsError;
+  final Map<String, EpisodeStats> statsByEpisode;
   final List<String> requests = [];
+  final List<String> statsRequests = [];
   final List<bool> forced = [];
 
   /// 模拟"票据是否还有效"：置 false 可验证回前台会重新取。
@@ -95,4 +114,13 @@ class FakePlaybackRepository implements PlaybackRepository {
           qualities: const ['AUTO', '720P', '1080P'],
         );
   }
+
+  @override
+  Future<EpisodeStats> episodeStats(String episodeId) async {
+    statsRequests.add(episodeId);
+    if (statsError != null) throw statsError!;
+    final value = statsByEpisode[episodeId] ?? stats;
+    if (value != null) return value;
+    throw StateError('episode stats not configured for $episodeId');
+  }
 }

lib/core/data/repositories/playlist_repository.dart

@@ -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);
+}

lib/core/data/repositories/watch_history_repository.dart

@@ -35,18 +35,12 @@ abstract interface class WatchHistoryRepository {
 }
 
 class HttpWatchHistoryRepository implements WatchHistoryRepository {
-  const HttpWatchHistoryRepository(this._api, {this.isSignedIn});
+  const HttpWatchHistoryRepository(this._api);
 
   final WatchApi _api;
 
-  /// 未登录时这些接口必然 401：直接短路成"没有记录"，让浏览/试看保持匿名可用。
-  final bool Function()? isSignedIn;
-
-  bool get _signedIn => isSignedIn?.call() ?? true;
-
   @override
   Future<WatchProgress?> progressFor(String dramaId) async {
-    if (!_signedIn) return null;
     return _api.progressOfDrama(dramaId);
   }
 
@@ -57,7 +51,6 @@ class HttpWatchHistoryRepository implements WatchHistoryRepository {
     Duration? duration,
     bool finished = false,
   }) async {
-    if (!_signedIn) return null;
     return _api.saveProgress(
       episodeId: episodeId,
       position: position,
@@ -71,19 +64,16 @@ class HttpWatchHistoryRepository implements WatchHistoryRepository {
     int pageIndex = 1,
     int pageSize = 20,
   }) async {
-    if (!_signedIn) return const PageResult();
     return _api.recent(pageIndex: pageIndex, pageSize: pageSize);
   }
 
   @override
   Future<void> remove(String dramaId) async {
-    if (!_signedIn) return;
     await _api.removeProgress(dramaId);
   }
 
   @override
   Future<void> clear() async {
-    if (!_signedIn) return;
     await _api.clearProgress();
   }
 }

lib/core/data/services/all_dramas_controller.dart

@@ -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; // ignore: prefer_initializing_formals
+
+  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;
+  }
+}

lib/core/data/services/auth_controller.dart

@@ -48,6 +48,7 @@ class AuthController extends ChangeNotifier {
       email: email,
       password: password,
       deviceId: await _store.deviceId(),
+      countryCode: await _store.deviceRegion(),
       platform: _platform,
       osVersion: _osVersion,
     );
@@ -95,6 +96,7 @@ class AuthController extends ChangeNotifier {
       target: target,
       code: code,
       deviceId: await _store.deviceId(),
+      countryCode: await _store.deviceRegion(),
       platform: _platform,
       osVersion: _osVersion,
     );

lib/core/data/services/auth_session_store.dart

@@ -4,6 +4,7 @@ import 'dart:math';
 import 'package:shared_preferences/shared_preferences.dart';
 
 import '../models/auth_session.dart';
+import 'device_id_provider.dart';
 
 /// 令牌与设备号的本地持久化。
 ///
@@ -11,13 +12,17 @@ import '../models/auth_session.dart';
 /// `SharedPreferences.getInstance()` 在新版本里已标注弃用，两套混用还会让
 /// widget 测试只 mock 到其中一套。
 ///
-/// 设备号是后端注册风控与后续"下载设备绑定"的依据，所以**首次生成后就固定下来**；
-/// 不引 UUID 库（保持极简依赖），用「时间戳 + 随机数」拼一个够用的 id。
+/// 设备号优先取系统标识（Android SSAID / iOS IDFV），这样卸载重装后还是同一台设备；
+/// 系统标识不可用时才回退到本地生成并持久化的 UUID，保证任何环境都能跑。
 class AuthSessionStore {
-  AuthSessionStore({SharedPreferencesAsync? preferences})
-    : _preferences = preferences ?? SharedPreferencesAsync();
+  AuthSessionStore({
+    SharedPreferencesAsync? preferences,
+    DeviceIdProvider? deviceIdProvider,
+  }) : _preferences = preferences ?? SharedPreferencesAsync(),
+       _deviceIdProvider = deviceIdProvider ?? DeviceIdProvider();
 
   final SharedPreferencesAsync _preferences;
+  final DeviceIdProvider _deviceIdProvider;
 
   static const _kAccessToken = 'auth.accessToken';
   static const _kRefreshToken = 'auth.refreshToken';
@@ -25,21 +30,46 @@ class AuthSessionStore {
   static const _kDeviceId = 'device.id';
 
   String? _cachedDeviceId;
+  String? _cachedRegion;
 
   Future<String> deviceId() async {
     if (_cachedDeviceId != null) return _cachedDeviceId!;
-    var value = await _preferences.getString(_kDeviceId) ?? '';
-    if (value.isEmpty) {
-      final random = Random();
-      value =
-          'd-${DateTime.now().millisecondsSinceEpoch.toRadixString(36)}-'
-          '${random.nextInt(1 << 32).toRadixString(36)}';
-      await _preferences.setString(_kDeviceId, value);
-    }
+    final systemId = await _deviceIdProvider.systemDeviceId();
+    final value = systemId ?? await _localDeviceId();
     _cachedDeviceId = value;
     return value;
   }
 
+  /// 设备区域（ISO-2），取不到返回空串；只在注册时作为服务端 IP 解析失败后的兜底。
+  Future<String> deviceRegion() async {
+    if (_cachedRegion != null) return _cachedRegion!;
+    final value = await _deviceIdProvider.deviceRegion() ?? '';
+    _cachedRegion = value;
+    return value;
+  }
+
+  /// 系统标识取不到时的兜底：本地 UUIDv4，生成一次后固定下来。
+  Future<String> _localDeviceId() async {
+    final stored = await _preferences.getString(_kDeviceId) ?? '';
+    if (stored.isNotEmpty) return stored;
+    final generated = 'd-${_uuidV4()}';
+    await _preferences.setString(_kDeviceId, generated);
+    return generated;
+  }
+
+  /// UUIDv4：122 位随机，碰撞概率可忽略，不引第三方依赖。
+  String _uuidV4() {
+    final random = Random.secure();
+    final bytes = List<int>.generate(16, (_) => random.nextInt(256));
+    bytes[6] = (bytes[6] & 0x0f) | 0x40;
+    bytes[8] = (bytes[8] & 0x3f) | 0x80;
+    String hex(int start, int end) => bytes
+        .sublist(start, end)
+        .map((byte) => byte.toRadixString(16).padLeft(2, '0'))
+        .join();
+    return '${hex(0, 4)}-${hex(4, 6)}-${hex(6, 8)}-${hex(8, 10)}-${hex(10, 16)}';
+  }
+
   Future<AuthSession?> read() async {
     final accessToken = await _preferences.getString(_kAccessToken) ?? '';
     final refreshToken = await _preferences.getString(_kRefreshToken) ?? '';

lib/core/data/services/category_controller.dart

@@ -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;
+}

lib/core/data/services/comment_controller.dart

@@ -197,7 +197,10 @@ class CommentController extends ChangeNotifier {
       _insertPublished(comment, replyTo);
       return OperationResult.success(comment);
     } catch (failure) {
-      return OperationResult.failure(_errorMessage(failure));
+      return OperationResult.failure(
+        _errorMessage(failure),
+        errorCode: failure is ApiException ? failure.code : null,
+      );
     } finally {
       submitting = false;
       _notify();
@@ -217,7 +220,10 @@ class CommentController extends ChangeNotifier {
       return const OperationResult.success();
     } catch (failure) {
       _restoreComment(comment, location);
-      return OperationResult.failure(_errorMessage(failure));
+      return OperationResult.failure(
+        _errorMessage(failure),
+        errorCode: failure is ApiException ? failure.code : null,
+      );
     } finally {
       _deletingCommentIds.remove(comment.id);
       _notify();
@@ -253,7 +259,10 @@ class CommentController extends ChangeNotifier {
       return OperationResult.success(result);
     } catch (failure) {
       _replaceComment(current);
-      return OperationResult.failure(_errorMessage(failure));
+      return OperationResult.failure(
+        _errorMessage(failure),
+        errorCode: failure is ApiException ? failure.code : null,
+      );
     } finally {
       _likingCommentIds.remove(comment.id);
       _notify();
@@ -277,7 +286,10 @@ class CommentController extends ChangeNotifier {
       );
       return OperationResult.success(reportId);
     } catch (failure) {
-      return OperationResult.failure(_errorMessage(failure));
+      return OperationResult.failure(
+        _errorMessage(failure),
+        errorCode: failure is ApiException ? failure.code : null,
+      );
     }
   }
 

lib/core/data/services/device_id_provider.dart

@@ -0,0 +1,50 @@
+// Author: fruit.com.cn
+
+import 'dart:io' show Platform;
+
+import 'package:flutter/foundation.dart';
+import 'package:flutter/services.dart';
+
+/// 读取系统级设备标识，两端都不需要任何权限。
+///
+/// - Android：SSAID（`Settings.Secure.ANDROID_ID`），卸载重装不变；
+/// - iOS：IDFV（`identifierForVendor`），卸载本 App 不变，同厂商应用全删才会变。
+///
+/// 两端都由原生侧提供，不引插件：项目 iOS 走 SPM，避免混入 CocoaPods。
+/// 取不到（Web、测试环境、通道异常）时返回 null，由调用方回退到本地生成的 id。
+class DeviceIdProvider {
+  static const MethodChannel _channel = MethodChannel(
+    'com.stormg.lumadrama/device',
+  );
+
+  Future<String?> systemDeviceId() async {
+    if (kIsWeb) return null;
+    try {
+      if (Platform.isAndroid) {
+        final ssaid = await _channel.invokeMethod<String>('ssaid');
+        if (ssaid != null && ssaid.isNotEmpty) return 'a-$ssaid';
+      }
+      if (Platform.isIOS) {
+        final idfv = await _channel.invokeMethod<String>('idfv');
+        if (idfv != null && idfv.isNotEmpty) return 'i-$idfv';
+      }
+    } catch (_) {
+      // 原生通道不可用（widget 测试）时走本地兜底
+    }
+    return null;
+  }
+
+  /// 设备所在区域（ISO-2），仅用于服务端 IP 解析失败时兜底注册国家。
+  /// Android 依次取网络运营商 / SIM 卡 / 系统语言的国家，iOS 取系统 region。
+  Future<String?> deviceRegion() async {
+    if (kIsWeb) return null;
+    try {
+      final region = await _channel.invokeMethod<String>('region');
+      final value = region?.trim().toUpperCase() ?? '';
+      if (value.length == 2) return value;
+    } catch (_) {
+      // 原生通道不可用（widget 测试）时返回 null，由服务端兜底
+    }
+    return null;
+  }
+}

lib/core/data/services/favorite_controller.dart

@@ -3,6 +3,7 @@
 import 'package:flutter/foundation.dart';
 
 import '../models/drama.dart';
+import '../remote/api_client.dart';
 import '../repositories/favorite_repository.dart';
 
 /// 收藏状态：**以服务端为准**。
@@ -17,6 +18,7 @@ class FavoriteController extends ChangeNotifier {
   final FavoriteRepository _repository;
   final int pageSize;
   final Set<String> _saved = {};
+  final Map<String, int> _favoriteCounts = {};
   List<Drama> cards = const [];
   int total = 0;
   bool loading = false;
@@ -24,6 +26,7 @@ class FavoriteController extends ChangeNotifier {
   bool hasMore = false;
   String? error;
   String? loadMoreError;
+  int? lastErrorCode;
   int _pageIndex = 0;
   int _requestSeq = 0;
   bool _disposed = false;
@@ -32,6 +35,53 @@ class FavoriteController extends ChangeNotifier {
 
   bool isSaved(String dramaId) => _saved.contains(dramaId);
 
+  /// 当前剧收藏数；包含本地 toggle 增量。
+  int? favoriteCount(String dramaId) => _favoriteCounts[dramaId];
+
+  /// 首次展示时缓存卡片基数；之后统一由本控制器维护，避免页面各存一份。
+  int? favoriteCountFor(Drama drama) {
+    final current = _favoriteCounts[drama.id];
+    if (current != null) return current;
+    final fallback = drama.favoriteCount;
+    if (fallback == null) return null;
+    final normalized = fallback < 0 ? 0 : fallback;
+    _favoriteCounts[drama.id] = normalized;
+    return normalized;
+  }
+
+  /// 用 stats/detail 的服务端快照校准唯一状态和计数。
+  void applyServerState(
+    String dramaId, {
+    required bool saved,
+    int? favoriteCount,
+  }) {
+    var changed = _saved.contains(dramaId) != saved;
+    if (saved) {
+      _saved.add(dramaId);
+    } else {
+      _saved.remove(dramaId);
+    }
+    if (favoriteCount != null) {
+      final normalized = favoriteCount < 0 ? 0 : favoriteCount;
+      changed = changed || _favoriteCounts[dramaId] != normalized;
+      _favoriteCounts[dramaId] = normalized;
+    }
+    if (changed) notify();
+  }
+
+  /// 详情等只有计数、没有当前收藏状态的接口使用。
+  void applyServerCount(
+    String dramaId,
+    int? favoriteCount, {
+    bool notify = true,
+  }) {
+    if (favoriteCount == null) return;
+    final normalized = favoriteCount < 0 ? 0 : favoriteCount;
+    if (_favoriteCounts[dramaId] == normalized) return;
+    _favoriteCounts[dramaId] = normalized;
+    if (notify) this.notify();
+  }
+
   void notify() {
     if (!_disposed) notifyListeners();
   }
@@ -43,6 +93,7 @@ class FavoriteController extends ChangeNotifier {
     loadingMore = false;
     error = null;
     loadMoreError = null;
+    lastErrorCode = null;
     notify();
     try {
       final page = await _repository.page(pageIndex: 1, pageSize: pageSize);
@@ -52,12 +103,14 @@ class FavoriteController extends ChangeNotifier {
       _saved
         ..clear()
         ..addAll(list.map((drama) => drama.id));
+      _rememberCardCounts(list);
       total = page.total;
       _pageIndex = 1;
       hasMore = page.list.isNotEmpty && cards.length < total;
-    } catch (_) {
+    } catch (failure) {
       if (!_disposed && request == _requestSeq) {
         error = 'favoritesError';
+        if (failure is ApiException) lastErrorCode = failure.code;
       }
     } finally {
       if (!_disposed && request == _requestSeq) {
@@ -73,6 +126,7 @@ class FavoriteController extends ChangeNotifier {
     final request = ++_requestSeq;
     loadingMore = true;
     loadMoreError = null;
+    lastErrorCode = null;
     notify();
     try {
       final page = await _repository.page(
@@ -86,12 +140,14 @@ class FavoriteController extends ChangeNotifier {
       ).where((drama) => known.add(drama.id)).toList(growable: false);
       cards = [...cards, ...appended];
       _saved.addAll(appended.map((drama) => drama.id));
+      _rememberCardCounts(appended);
       total = page.total;
       _pageIndex += 1;
       hasMore = page.list.isNotEmpty && cards.length < total;
-    } catch (_) {
+    } catch (failure) {
       if (!_disposed && request == _requestSeq) {
         loadMoreError = 'favoritesError';
+        if (failure is ApiException) lastErrorCode = failure.code;
       }
     } finally {
       if (!_disposed && request == _requestSeq) {
@@ -101,18 +157,23 @@ class FavoriteController extends ChangeNotifier {
     }
   }
 
-  /// 未登录时不要调用（服务端要求登录态）。
+  /// 每次切换都以接口状态为准；匿名请求由设备号归属。
   ///
   /// [card] 是当前剧的卡片（播放页/详情页手上就有）：收藏成功时直接放进列表，
   /// 这样"收藏完打开我的收藏"能立刻看到，不必等下一次整表刷新。
   Future<bool> toggle(String dramaId, {Drama? card}) async {
+    lastErrorCode = null;
     final wasSaved = _saved.contains(dramaId);
+    final previousCount = card == null
+        ? favoriteCount(dramaId)
+        : favoriteCountFor(card);
     final previousCards = cards;
     final previousTotal = total;
     final previousHasMore = hasMore;
     // 乐观更新
     if (wasSaved) {
       _saved.remove(dramaId);
+      _stepCount(dramaId, -1);
       if (cards.any((drama) => drama.id == dramaId)) {
         cards = cards.where((drama) => drama.id != dramaId).toList();
         total = total > 0 ? total - 1 : 0;
@@ -120,6 +181,7 @@ class FavoriteController extends ChangeNotifier {
       }
     } else {
       _saved.add(dramaId);
+      _stepCount(dramaId, 1);
     }
     notify();
     try {
@@ -128,6 +190,7 @@ class FavoriteController extends ChangeNotifier {
       if (saved) {
         _saved.add(dramaId);
         if (wasSaved) {
+          _restoreCount(dramaId, previousCount);
           cards = previousCards;
           total = previousTotal;
           hasMore = previousHasMore;
@@ -138,6 +201,9 @@ class FavoriteController extends ChangeNotifier {
         }
       } else {
         _saved.remove(dramaId);
+        if (!wasSaved) {
+          _restoreCount(dramaId, previousCount);
+        }
         if (cards.any((drama) => drama.id == dramaId)) {
           cards = cards.where((drama) => drama.id != dramaId).toList();
           total = total > 0 ? total - 1 : 0;
@@ -146,7 +212,7 @@ class FavoriteController extends ChangeNotifier {
       }
       notify();
       return true;
-    } catch (_) {
+    } catch (failure) {
       // 回滚
       cards = previousCards;
       total = previousTotal;
@@ -156,7 +222,9 @@ class FavoriteController extends ChangeNotifier {
       } else {
         _saved.remove(dramaId);
       }
+      _restoreCount(dramaId, previousCount);
       notify();
+      if (failure is ApiException) lastErrorCode = failure.code;
       return false;
     }
   }
@@ -170,9 +238,13 @@ class FavoriteController extends ChangeNotifier {
     final previousHasMore = hasMore;
     final removed = cards.where((drama) => ids.contains(drama.id)).toList();
     if (removed.isEmpty) return true;
+    final previousCounts = {
+      for (final drama in removed) drama.id: _favoriteCounts[drama.id],
+    };
     cards = cards.where((drama) => !ids.contains(drama.id)).toList();
     for (final id in ids) {
       _saved.remove(id);
+      _stepCount(id, -1);
     }
     total = total > removed.length ? total - removed.length : 0;
     hasMore = cards.length < total;
@@ -187,6 +259,9 @@ class FavoriteController extends ChangeNotifier {
       for (final drama in removed) {
         _saved.add(drama.id);
       }
+      for (final entry in previousCounts.entries) {
+        _restoreCount(entry.key, entry.value);
+      }
       notify();
       return false;
     }
@@ -197,7 +272,9 @@ class FavoriteController extends ChangeNotifier {
     final index = cards.indexWhere((drama) => drama.id == dramaId);
     if (index < 0) return true;
     final removed = cards[index];
+    final previousCount = _favoriteCounts[dramaId];
     _saved.remove(dramaId);
+    _stepCount(dramaId, -1);
     final next = [...cards]..removeAt(index);
     cards = next;
     total = total > 0 ? total - 1 : 0;
@@ -214,6 +291,7 @@ class FavoriteController extends ChangeNotifier {
       );
       cards = restored;
       _saved.add(dramaId);
+      _restoreCount(dramaId, previousCount);
       total += 1;
       hasMore = cards.length < total;
       notify();
@@ -244,6 +322,30 @@ class FavoriteController extends ChangeNotifier {
     ];
   }
 
+  void _rememberCardCounts(List<Drama> dramas) {
+    for (final drama in dramas) {
+      final count = drama.favoriteCount;
+      if (count != null && !_favoriteCounts.containsKey(drama.id)) {
+        _favoriteCounts[drama.id] = count < 0 ? 0 : count;
+      }
+    }
+  }
+
+  void _stepCount(String dramaId, int delta) {
+    final current = _favoriteCounts[dramaId];
+    if (current == null) return;
+    final next = current + delta;
+    _favoriteCounts[dramaId] = next < 0 ? 0 : next;
+  }
+
+  void _restoreCount(String dramaId, int? count) {
+    if (count == null) {
+      _favoriteCounts.remove(dramaId);
+    } else {
+      _favoriteCounts[dramaId] = count;
+    }
+  }
+
   @override
   void dispose() {
     _disposed = true;

lib/core/data/services/home_feed_controller.dart

@@ -33,6 +33,7 @@ class HomeFeedController extends ChangeNotifier {
   String? get cursor => _state(_channel).cursor;
   bool get hasMore => _state(_channel).hasMore;
   bool get loaded => _state(_channel).loaded;
+  bool get isLoading => _state(_channel).loading;
   bool get loadingMore => _state(_channel).loadingMore;
   bool get loadingFirstPage => !loaded && _state(_channel).loading;
 

lib/core/data/services/interaction_controller.dart

@@ -40,6 +40,24 @@ class InteractionController extends ChangeNotifier {
   /// 该集服务端最新点赞数。
   int? episodeLikeCount(String episodeId) => _episodeLikeCounts[episodeId];
 
+  /// 用轻量统计快照校准当前用户的分集点赞状态与计数。
+  void applyEpisodeStats(
+    String episodeId, {
+    required bool liked,
+    required int likeCount,
+  }) {
+    final changed =
+        _likedEpisodeIds.contains(episodeId) != liked ||
+        _episodeLikeCounts[episodeId] != likeCount;
+    if (liked) {
+      _likedEpisodeIds.add(episodeId);
+    } else {
+      _likedEpisodeIds.remove(episodeId);
+    }
+    _episodeLikeCounts[episodeId] = likeCount;
+    if (changed) _notify();
+  }
+
   /// 乐观切换剧集点赞，失败时回滚并以服务端返回状态校准。
   Future<OperationResult<LikeToggleResult>> toggleDramaLike(String dramaId) =>
       _toggleLike(
@@ -97,7 +115,10 @@ class InteractionController extends ChangeNotifier {
       } else {
         likedIds.remove(id);
       }
-      return OperationResult.failure(_errorMessage(failure));
+      return OperationResult.failure(
+        _errorMessage(failure),
+        errorCode: failure is ApiException ? failure.code : null,
+      );
     } finally {
       busyIds.remove(id);
       _notify();
@@ -121,7 +142,10 @@ class InteractionController extends ChangeNotifier {
       );
       return OperationResult.success(reportId);
     } catch (failure) {
-      return OperationResult.failure(_errorMessage(failure));
+      return OperationResult.failure(
+        _errorMessage(failure),
+        errorCode: failure is ApiException ? failure.code : null,
+      );
     }
   }
 

lib/core/data/services/playback_neighbors.dart

@@ -0,0 +1,223 @@
+// 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;
+      final previous = _owner;
+      if (kDebugMode) {
+        debugPrint(
+          '[player-coordinator] phase=acquire '
+          'session=${identityHashCode(session)} owner=${session.owner.name} '
+          'previous=${previous == null ? '-' : identityHashCode(previous)} '
+          'previousOwner=${previous?.owner.name ?? '-'} '
+          'previousLive=${previous?.livePlayerCount ?? 0} '
+          'same=${identical(previous, session)}',
+        );
+      }
+      if (_owner != session) {
+        if (previous != null && previous.owner != session.owner) {
+          if (kDebugMode) {
+            debugPrint(
+              '[player-owner] phase=reject-coordinator-handoff '
+              'owner=${session.owner.name} '
+              'activeOwner=${previous.owner.name}',
+            );
+          }
+          return false;
+        }
+        await previous?._releasePlayers();
+        if (previous != null && previous.livePlayerCount != 0) return false;
+        _owner = null;
+        if (!valid()) return false;
+        _owner = session;
+      }
+      if (kDebugMode) {
+        debugPrint(
+          '[player-coordinator] phase=acquired '
+          'session=${identityHashCode(session)} live=${session.livePlayerCount}',
+        );
+      }
+      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, roleHint: 'old-current');
+  await _placeNeighbor(session, warmNext, roleHint: 'next');
+  await _placeNeighbor(session, warmPrevious, roleHint: 'previous');
+}
+
+Future<void> _placeNeighbor(
+  PlaybackSession session,
+  _PlayerSlot? slot, {
+  required String roleHint,
+}) async {
+  if (slot == null || slot == session._active || slot.retiring) return;
+  if (slot.owner != session.owner) {
+    session._logOwnerRejection('park', slot);
+    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, trigger: 'park-neighbor', roleHint: roleHint);
+}
+
+/// 当前集已经出画后，按手势方向静默准备上一集和下一集。
+void _warmNeighbors(PlaybackSession session, {bool preferredNext = true}) {
+  final request = session._generation;
+  final nextTask = _warmOne(session, request, session._nextIndex, next: true);
+  final previousTask = _warmOne(
+    session,
+    request,
+    session._previousIndex,
+    next: false,
+  );
+  session._preloadTask = Future.wait(
+    preferredNext ? [nextTask, previousTask] : [previousTask, nextTask],
+  ).then<void>((_) {});
+}
+
+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,
+      trigger: 'warm-failure',
+      roleHint: next ? 'next' : 'previous',
+    );
+  });
+}
+
+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,
+        trigger: 'warm-slot-invalid',
+        roleHint: next ? 'next' : 'previous',
+      );
+    }
+    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;
+}

lib/core/data/services/playback_session.dart

@@ -7,6 +7,9 @@ import '../models/drama.dart';
 import '../models/player_port.dart';
 import 'video_player_port.dart';
 
+part 'playback_neighbors.dart';
+part 'playback_session_controls.dart';
+
 /// 新纹理第一帧常是黑的，旧画面只盖住这一小段。
 const Duration _qualityHandoffHold = Duration(milliseconds: 200);
 
@@ -14,37 +17,9 @@ 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();
+enum PlaybackSessionOwner { home, player }
 
-  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,
@@ -54,6 +29,8 @@ class PlaybackSession extends ChangeNotifier {
     this.activate,
     PlaybackCoordinator? coordinator,
     this.waitForFrame,
+    this.owner = PlaybackSessionOwner.player,
+    this.dramaIdAt,
   }) : _coordinator = coordinator ?? PlaybackCoordinator();
 
   final List<Episode> episodes;
@@ -66,16 +43,20 @@ class PlaybackSession extends ChangeNotifier {
   /// Runs only when a slot becomes current (e.g. progress listeners).
   final PlayerPreparation? activate;
   final Future<void> Function()? waitForFrame;
+  final PlaybackSessionOwner owner;
+  final String? Function(int index)? dramaIdAt;
   final PlaybackCoordinator _coordinator;
   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;
@@ -103,9 +84,18 @@ class PlaybackSession extends ChangeNotifier {
   bool get canAutoAdvance => _mayPlay && !_loading && active != null;
   bool get isLocked => !canPlay(currentEpisode);
   String? get error => _error;
+  bool get debugAppResumed => _appResumed;
+  bool get debugRouteVisible => _routeVisible;
+  bool get debugOverlayOpen => _overlayOpen;
+  bool get debugVisible => _visible;
+  bool get debugMayPlay => _mayPlay;
   // Includes initialization and asynchronous disposal, until native release ends.
   int get livePlayerCount => _live.length;
+  bool get activeSlotActivated => _active?.activated ?? false;
+  bool get activeSlotPlaying => _active?.playing ?? false;
   int? get preloadedIndex => _next?.prepared == true ? _next?.index : null;
+  int? get previousPreloadedIndex =>
+      _previous?.prepared == true ? _previous?.index : null;
   Future<void> get playbackSettled => _operations;
   Future<void> get preloadSettled => _preloadTask;
 
@@ -120,7 +110,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 ||
@@ -132,34 +122,41 @@ 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, trigger: 'remap-stale-next', roleHint: 'next');
+        await _retire(
+          stalePrevious,
+          trigger: 'remap-stale-previous',
+          roleHint: 'previous',
+        );
+      }),
+    );
+    if (_visible && !_overlayOpen) _warmNeighbors(this);
+  }
+
+  void _rememberNeighbors(int? preloadIndex, int? previousIndex) {
+    _nextIndex = preloadIndex;
+    _previousIndex = previousIndex;
   }
 
   Future<void> _enqueue(Future<void> Function() operation) {
@@ -176,8 +173,15 @@ class PlaybackSession extends ChangeNotifier {
   }
 
   _PlayerSlot _create(int index) {
-    if (_live.length >= 2) throw StateError('Playback resource limit reached');
-    final slot = _PlayerSlot(index, factory(episodes[index]));
+    if (_live.length >= maxLivePlayers) {
+      throw StateError('Playback resource limit reached');
+    }
+    final slot = _PlayerSlot(
+      index,
+      factory(episodes[index]),
+      owner: owner,
+      dramaId: dramaIdAt?.call(index),
+    );
     _live.add(slot);
     slot.ready = () async {
       try {
@@ -195,12 +199,32 @@ class PlaybackSession extends ChangeNotifier {
     return slot;
   }
 
-  Future<void> _retire(_PlayerSlot? slot) async {
-    if (slot == null || !_live.contains(slot)) return;
+  Future<void> _retire(
+    _PlayerSlot? slot, {
+    required String trigger,
+    String? roleHint,
+  }) async {
+    if (slot == null) return;
+    if (slot.owner != owner) {
+      _logOwnerRejection('retire', slot);
+      return;
+    }
+    if (!_live.contains(slot)) return;
+    final role = _slotRole(slot, roleHint: roleHint);
+    final video = slot.player is VideoPlayerPort
+        ? slot.player as VideoPlayerPort
+        : null;
+    final value = video?.controller.value;
+    final slotPlaying = slot.playing;
     slot.retiring = true;
-    final cleared = _active == slot || _next == slot || _handoff == 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();
@@ -210,22 +234,51 @@ class PlaybackSession extends ChangeNotifier {
     } finally {
       await slot.player.dispose();
       _live.remove(slot);
+      if (kDebugMode) {
+        debugPrint(
+          '[player-slot] slot_released role=$role owner=${slot.owner.name} '
+          'selectOwner=$owner drama=${slot.dramaId ?? '-'} '
+          'episodeIndex=${slot.index} '
+          'controller=${_playerIdentity(slot.player)} '
+          'slotPlaying=${slotPlaying ? 1 : 0} '
+          'isPlaying=${value?.isPlaying == true ? 1 : 0} '
+          'position=${value?.position.inMilliseconds ?? '-'} '
+          'currentIndex=$_currentIndex generation=$_generation '
+          'trigger=$trigger',
+        );
+      }
     }
   }
 
   /// 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,
+    bool? userWantsPlay,
+  }) async {
     if (_closed || index < 0 || index >= episodes.length) return;
-    // 切到另一集时，上一集按下的暂停不跟着走：滑过去就应该自动播放。
-    // 重复选中同一集（例如页面重新可见）不在这里恢复，尊重用户按下的暂停。
-    if (!_selected || index != _currentIndex) {
+    if (kDebugMode) {
+      debugPrint(
+        '[player-session] phase=select-enter session=${identityHashCode(this)} '
+        'owner=${owner.name} index=$index user=$_userWantsPlay '
+        'selected=$_selected current=$_currentIndex '
+        'appResumed=$_appResumed routeVisible=$_routeVisible '
+        'overlayOpen=$_overlayOpen visible=$_visible mayPlay=$_mayPlay '
+        'live=${_live.length}',
+      );
+    }
+    // 切换到不同剧集时恢复播放；仍停留在同一集时保留用户暂停。
+    if (userWantsPlay != null) {
+      _userWantsPlay = userWantsPlay;
+    } else if (!_selected || index != _currentIndex) {
       _userWantsPlay = true;
     }
     final request = ++_generation;
     _selected = true;
     _currentIndex = index;
-    _nextIndex = preloadIndex;
+    _rememberNeighbors(preloadIndex, previousIndex);
     _error = null;
     if (!_visible) {
       _loading = false;
@@ -250,7 +303,7 @@ class PlaybackSession extends ChangeNotifier {
     _PlayerSlot? target;
     await _enqueue(() async {
       if (_closed || request != _generation) return;
-      await _retire(_handoff);
+      await _retire(_handoff, trigger: 'select-handoff');
       final old = _active;
       if (old != null &&
           old.index == index &&
@@ -259,20 +312,27 @@ class PlaybackSession extends ChangeNotifier {
         target = old;
         return;
       }
-      if (old != null) await old.player.pause();
-      final warm = _next;
+      if (old != null) {
+        await old.player.pause();
+        old.playing = false;
+      }
+      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) {
+        warm.reusedWarm = true;
         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);
@@ -285,7 +345,7 @@ 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);
   }
 
   /// 后台准备新片源，成功后再替换当前播放器。失败时原播放器保持不动。
@@ -314,9 +374,11 @@ class PlaybackSession extends ChangeNotifier {
     await _enqueue(() => _start(slot, request));
     await Future<void>.delayed(_qualityHandoffHold);
     if (previous != null && _handoff == previous && _active == slot) {
-      await _enqueue(() => _retire(previous));
+      await _enqueue(
+        () => _retire(previous, trigger: 'quality-handoff-complete'),
+      );
     }
-    if (!_closed && request == _generation) _schedulePreload();
+    if (!_closed && request == _generation) _warmNeighbors(this);
     return _active == slot && slot.failure == null;
   }
 
@@ -326,8 +388,8 @@ class PlaybackSession extends ChangeNotifier {
       if (_closed || request != _generation || _active == null) return;
       final warm = _next;
       _next = null;
-      await _retire(_handoff);
-      await _retire(warm);
+      await _retire(_handoff, trigger: 'replacement-handoff');
+      await _retire(warm, trigger: 'replacement-next');
       if (_closed || request != _generation || _active == null) return;
       try {
         created = _create(index);
@@ -354,7 +416,9 @@ class PlaybackSession extends ChangeNotifier {
 
   Future<void> _dropReplacement(_PlayerSlot slot) {
     return _enqueue(() async {
-      if (_live.contains(slot)) await _retire(slot);
+      if (_live.contains(slot)) {
+        await _retire(slot, trigger: 'replacement-drop');
+      }
     });
   }
 
@@ -369,7 +433,10 @@ class PlaybackSession extends ChangeNotifier {
       _handoff = previous;
       _active = slot;
       shown = true;
-      if (previous != null) await previous!.player.pause();
+      if (previous != null) {
+        await previous!.player.pause();
+        previous!.playing = false;
+      }
       _notify();
     });
     if (!shown || _active != slot) return null;
@@ -413,6 +480,22 @@ class PlaybackSession extends ChangeNotifier {
   Future<void> _applyPlayback(_PlayerSlot slot) async {
     if (_closed || _active != slot || !slot.activated) return;
     final shouldPlay = _mayPlay && slot.index == _currentIndex && !isLocked;
+    final video = slot.player is VideoPlayerPort
+        ? slot.player as VideoPlayerPort
+        : null;
+    if (kDebugMode) {
+      debugPrint(
+        '[player-session] phase=apply-playback '
+        'session=${identityHashCode(this)} owner=${owner.name} '
+        'index=${slot.index} shouldPlay=$shouldPlay user=$_userWantsPlay '
+        'appResumed=$_appResumed routeVisible=$_routeVisible '
+        'overlayOpen=$_overlayOpen locked=$isLocked '
+        'player=${identityHashCode(slot.player)} '
+        'controller=${video == null ? '-' : identityHashCode(video.controller)} '
+        'isPlaying=${video?.controller.value.isPlaying ?? '-'} '
+        'slotPlaying=${slot.playing}',
+      );
+    }
     if (shouldPlay == slot.playing) return;
     if (shouldPlay) {
       await slot.player.play();
@@ -420,96 +503,42 @@ class PlaybackSession extends ChangeNotifier {
       await slot.player.pause();
     }
     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();
-  }
-
-  void setRouteVisible(bool value) {
-    _routeVisible = value;
-    _syncPlayback();
-  }
-
-  void setOverlayOpen(bool value) {
-    _overlayOpen = value;
-    _syncPlayback();
-  }
-
-  void setUserWantsPlay(bool value) {
-    _userWantsPlay = value;
-    _syncPlayback();
-    _notify();
+    if (kDebugMode) {
+      debugPrint(
+        '[player-session] phase=apply-playback-result '
+        'session=${identityHashCode(this)} index=${slot.index} '
+        'shouldPlay=$shouldPlay '
+        'isPlaying=${video?.controller.value.isPlaying ?? '-'} '
+        'slotPlaying=${slot.playing}',
+      );
+    }
   }
 
   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 = _handoff = null;
+      _active = _next = _previous = _handoff = null;
       _loading = false;
       _notify();
       for (final slot in _live.toList()) {
-        await _retire(slot);
+        await _retire(slot, trigger: 'session-release-all');
       }
     });
   }
@@ -518,6 +547,23 @@ class PlaybackSession extends ChangeNotifier {
     if (!_closed) notifyListeners();
   }
 
+  String _slotRole(_PlayerSlot slot, {String? roleHint}) {
+    if (identical(slot, _active)) return 'current';
+    if (identical(slot, _previous)) return 'previous';
+    if (identical(slot, _next)) return 'next';
+    if (identical(slot, _handoff)) return 'handoff';
+    return roleHint ?? 'unassigned';
+  }
+
+  void _logOwnerRejection(String phase, _PlayerSlot slot) {
+    if (!kDebugMode) return;
+    debugPrint(
+      '[player-owner] phase=reject-$phase expected=${owner.name} '
+      'actual=${slot.owner.name} drama=${slot.dramaId ?? '-'} '
+      'episodeIndex=${slot.index} controller=${_playerIdentity(slot.player)}',
+    );
+  }
+
   Future<void> close() async {
     if (_closed) return;
     _closed = true;
@@ -528,13 +574,27 @@ class PlaybackSession extends ChangeNotifier {
 }
 
 class _PlayerSlot {
-  _PlayerSlot(this.index, this.player);
+  _PlayerSlot(
+    this.index,
+    this.player, {
+    required this.owner,
+    required this.dramaId,
+  });
   int index;
   final PlayerPort player;
+  final PlaybackSessionOwner owner;
+  final String? dramaId;
   late final Future<void> ready;
   bool prepared = false;
   bool activated = false;
   bool playing = false;
   bool retiring = false;
+  bool reusedWarm = false;
   Object? failure;
 }
+
+String _playerIdentity(PlayerPort player) {
+  return player is VideoPlayerPort
+      ? '${identityHashCode(player.controller)}'
+      : '${identityHashCode(player)}';
+}

lib/core/data/services/playback_session_controls.dart

@@ -0,0 +1,133 @@
+// Author: fruit.com.cn
+
+part of 'playback_session.dart';
+
+/// 播放会话的可见性、用户意图与相邻集预热控制。
+extension PlaybackSessionControls on PlaybackSession {
+  /// 滑动手势开始时按方向优先准备相邻集，不改变当前集播放状态。
+  void prewarmNeighbors({required bool forward}) {
+    if (!_visible || _overlayOpen || _active?.prepared != true) return;
+    _warmNeighbors(this, preferredNext: forward);
+  }
+
+  /// 路由交接时同步暂停当前原生播放器，controller 仍由 session 持有。
+  Future<void> pauseForRouteHandoff() {
+    if (_closed) return Future<void>.value();
+    _routeVisible = false;
+    return _enqueue(() async {
+      final slot = _active;
+      if (slot == null) return;
+      await slot.player.pause();
+      slot.playing = false;
+    });
+  }
+
+  /// 路由恢复可见后立即同步当前 controller，并等待原生播放状态落地。
+  Future<void> resumeForRouteHandoff() {
+    if (_closed) return Future<void>.value();
+    _routeVisible = true;
+    return _enqueue(() async {
+      final slot = _active;
+      if (kDebugMode) {
+        debugPrint(
+          '[feed-handoff] phase=resume slot=${slot?.index} '
+          'activated=${slot?.activated} playing=${slot?.playing} '
+          'retiring=${slot?.retiring} current=$_currentIndex '
+          'visible=$_visible user=$_userWantsPlay loading=$_loading',
+        );
+      }
+      if (slot == null || slot.retiring) return;
+      if (!slot.activated) {
+        try {
+          await activate?.call(episodes[slot.index], slot.player);
+        } catch (error) {
+          if (kDebugMode) {
+            debugPrint('[feed-handoff] phase=activation-failed error=$error');
+          }
+        }
+        if (_closed || _active != slot || slot.retiring) {
+          if (kDebugMode) {
+            debugPrint(
+              '[feed-handoff] phase=activation-aborted closed=$_closed '
+              'activeSame=${identical(_active, slot)} retiring=${slot.retiring}',
+            );
+          }
+          return;
+        }
+        slot.activated = true;
+      }
+      await _applyPlayback(slot);
+      if (_visible && !_overlayOpen && !_loading) _warmNeighbors(this);
+      if (kDebugMode) {
+        debugPrint(
+          '[feed-handoff] phase=resumed activated=${slot.activated} '
+          'playing=${slot.playing}',
+        );
+      }
+    });
+  }
+
+  /// 选中锁定集时立即停播并释放所有原生播放器，不创建新片源。
+  Future<void> selectLocked(
+    int index, {
+    int? preloadIndex,
+    int? previousIndex,
+  }) {
+    if (_closed || index < 0 || index >= episodes.length) {
+      return Future<void>.value();
+    }
+    _generation++;
+    _selected = false;
+    _currentIndex = index;
+    _rememberNeighbors(preloadIndex, previousIndex);
+    _loading = false;
+    _error = null;
+    _userWantsPlay = false;
+    _notify();
+    return _releasePlayers();
+  }
+
+  /// 清晰度切换时盖住黑帧的旧播放器。只在仍由会话持有时交给界面。
+  PlayerPort? handoffAt(int index) {
+    final slot = _handoff;
+    if (_closed || slot == null || slot.retiring || slot.index != index) {
+      return null;
+    }
+    return slot.player;
+  }
+
+  /// 当前索引是否复用了已预热的播放器槽。
+  bool reusedWarmAt(int index) {
+    for (final slot in [_active, _next, _previous]) {
+      if (slot != null && !slot.retiring && slot.index == index) {
+        return slot.reusedWarm;
+      }
+    }
+    return false;
+  }
+
+  /// 同步应用前台状态并恢复或暂停当前集。
+  void setAppResumed(bool value) {
+    _appResumed = value;
+    _syncPlayback();
+  }
+
+  /// 同步播放器路由是否可见。
+  void setRouteVisible(bool value) {
+    _routeVisible = value;
+    _syncPlayback();
+  }
+
+  /// 同步浮层是否遮挡播放器。
+  void setOverlayOpen(bool value) {
+    _overlayOpen = value;
+    _syncPlayback();
+  }
+
+  /// 记录用户播放意图；切换剧集时会在 [PlaybackSession.select] 中恢复播放。
+  void setUserWantsPlay(bool value) {
+    _userWantsPlay = value;
+    _syncPlayback();
+    _notify();
+  }
+}

lib/core/data/services/playlist_controller.dart

@@ -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();
+  }
+}

lib/core/data/services/sprite_thumbnail_axis.dart

@@ -9,7 +9,7 @@ import '../../config/app_config.dart';
 import 'sprite_thumbnail_asset_loader.dart';
 
 const Duration spriteVttCacheTtl = Duration(minutes: 10);
-const int spriteImageCacheCapacity = 2;
+const int spriteImageCacheCapacity = 1;
 
 /// 单个 VTT cue 对应的 sprite 裁剪区域。
 class SpriteThumbnailCue {
@@ -132,36 +132,36 @@ class SpriteThumbnailAxisService extends ChangeNotifier
   SpriteThumbnailAxisService({
     SpriteThumbnailAssetLoader? loader,
     this.cacheTtl = spriteVttCacheTtl,
+    this.spriteCacheCapacity = spriteImageCacheCapacity,
     DateTime Function()? now,
   }) : _loader = loader ?? DioSpriteThumbnailAssetLoader(),
        _now = now ?? DateTime.now;
 
   final SpriteThumbnailAssetLoader _loader;
   final Duration cacheTtl;
+  final int spriteCacheCapacity;
   final DateTime Function() _now;
   final Map<String, _CachedAxis> _axisCache = {};
   final Map<String, Future<SpriteThumbnailAxis>> _axisRequests = {};
   final LinkedHashMap<String, _CachedSprite> _spriteCache = LinkedHashMap();
   final Map<String, Future<_CachedSprite?>> _spriteRequests = {};
   final Set<String> _failedSprites = {};
-  String? _activeAxisUrl;
-  int _axisGeneration = 0;
   bool _disposed = false;
 
-  @visibleForTesting
   int get spriteCacheSize => _spriteCache.length;
 
   @visibleForTesting
-  List<String> get spriteCacheKeys => _spriteCache.keys.toList();
+  List<String> get spriteCacheKeys => _spriteCache.keys
+      .map((url) => Uri.tryParse(url)?.pathSegments.lastOrNull ?? url)
+      .toList();
 
-  /// 播放器就绪时预取当前 cue 与相邻 sprite，拖动帧不触发网络或解码。
+  /// 播放器就绪时预取当前 cue；容量大于 1 时顺带预取相邻 sprite。
   @override
   Future<void> prepareAt(String? thumbnailsUrl, Duration position) async {
     final url = _normalizeUrl(thumbnailsUrl);
     if (_disposed || url == null) return;
-    _activateAxis(url);
     final axis = await _loadAxis(url);
-    if (_disposed || _activeAxisUrl != url) return;
+    if (_disposed) return;
     for (final cue in _prefetchCues(axis, position)) {
       await _ensureSprite(axis, cue);
     }
@@ -170,7 +170,7 @@ class SpriteThumbnailAxisService extends ChangeNotifier
   @override
   bool hasAxis(String? thumbnailsUrl) {
     final url = _normalizeUrl(thumbnailsUrl);
-    if (url == null || url != _activeAxisUrl) return false;
+    if (url == null) return false;
     return _readAxis(url) != null;
   }
 
@@ -180,12 +180,14 @@ class SpriteThumbnailAxisService extends ChangeNotifier
     Duration position,
   ) {
     final url = _normalizeUrl(thumbnailsUrl);
-    if (url == null || url != _activeAxisUrl) return null;
+    if (url == null) return null;
     final axis = _readAxis(url);
     if (axis == null) return null;
     final cue = selectSpriteThumbnailCue(axis.cues, position);
     if (cue == null) return null;
-    final cached = _readSprite(cue.spriteFile);
+    final cached = _readSprite(
+      axis.resolveSpriteUri(cue.spriteFile).toString(),
+    );
     if (cached == null) return null;
     final sourceRect = _scaledSourceRect(cached, cue.sourceRect);
     if (sourceRect == null) return null;
@@ -206,13 +208,6 @@ class SpriteThumbnailAxisService extends ChangeNotifier
     super.dispose();
   }
 
-  void _activateAxis(String url) {
-    if (_activeAxisUrl == url) return;
-    _activeAxisUrl = url;
-    _axisGeneration++;
-    _clearSprites();
-  }
-
   Future<SpriteThumbnailAxis> _loadAxis(String url) {
     final cached = _readAxis(url);
     if (cached != null) return Future.value(cached);
@@ -239,7 +234,6 @@ class SpriteThumbnailAxisService extends ChangeNotifier
       } on SpriteThumbnailForbiddenException {
         if (_disposed) return SpriteThumbnailAxis.empty(url);
         _axisCache.remove(url);
-        if (_activeAxisUrl == url) _clearSprites();
       } catch (_) {
         break;
       }
@@ -274,6 +268,7 @@ class SpriteThumbnailAxisService extends ChangeNotifier
     if (current == null) return const [];
     final index = axis.cues.indexOf(current);
     final candidates = <SpriteThumbnailCue>[current];
+    if (spriteCacheCapacity <= 1) return candidates;
     for (final direction in const [1, -1]) {
       for (var step = 1; step < axis.cues.length; step++) {
         final neighborIndex = index + direction * step;
@@ -293,23 +288,23 @@ class SpriteThumbnailAxisService extends ChangeNotifier
     SpriteThumbnailAxis axis,
     SpriteThumbnailCue cue,
   ) {
-    final cached = _readSprite(cue.spriteFile);
+    final spriteUrl = axis.resolveSpriteUri(cue.spriteFile).toString();
+    final cached = _readSprite(spriteUrl);
     if (cached != null) return Future.value(cached);
-    if (_failedSprites.contains(cue.spriteFile)) return Future.value();
-    final existing = _spriteRequests[cue.spriteFile];
+    if (_failedSprites.contains(spriteUrl)) return Future.value();
+    final existing = _spriteRequests[spriteUrl];
     if (existing != null) return existing;
-    final generation = _axisGeneration;
-    final request = _loadSprite(axis, cue, generation);
-    _spriteRequests[cue.spriteFile] = request;
+    final request = _loadSprite(axis, cue, spriteUrl);
+    _spriteRequests[spriteUrl] = request;
     return request.whenComplete(() {
-      _spriteRequests.remove(cue.spriteFile);
+      _spriteRequests.remove(spriteUrl);
     });
   }
 
   Future<_CachedSprite?> _loadSprite(
     SpriteThumbnailAxis axis,
     SpriteThumbnailCue cue,
-    int generation,
+    String spriteUrl,
   ) async {
     SpriteThumbnailDecodedImage? decoded;
     try {
@@ -318,16 +313,16 @@ class SpriteThumbnailAxisService extends ChangeNotifier
       decoded = null;
     }
     if (decoded == null) {
-      _failedSprites.add(cue.spriteFile);
+      _failedSprites.add(spriteUrl);
       if (!_disposed) notifyListeners();
       return null;
     }
-    if (_disposed || generation != _axisGeneration) {
+    if (_disposed) {
       decoded.image.dispose();
       return null;
     }
     final cached = _CachedSprite(decoded);
-    _putSprite(cue.spriteFile, cached);
+    _putSprite(spriteUrl, cached);
     notifyListeners();
     return cached;
   }
@@ -342,7 +337,7 @@ class SpriteThumbnailAxisService extends ChangeNotifier
   void _putSprite(String key, _CachedSprite value) {
     _spriteCache.remove(key)?.decoded.image.dispose();
     _spriteCache[key] = value;
-    while (_spriteCache.length > spriteImageCacheCapacity) {
+    while (_spriteCache.length > spriteCacheCapacity) {
       final oldest = _spriteCache.remove(_spriteCache.keys.first);
       oldest?.decoded.image.dispose();
     }
@@ -378,8 +373,6 @@ class SpriteThumbnailAxisService extends ChangeNotifier
   }
 
   void _clearAll() {
-    _axisGeneration++;
-    _activeAxisUrl = null;
     _axisCache.clear();
     _axisRequests.clear();
     _clearSprites();

lib/core/data/services/watch_records_controller.dart

@@ -38,6 +38,7 @@ class WatchRecordsController extends ChangeNotifier {
   String? error;
   String? loadMoreError;
   String? actionError;
+  int? lastErrorCode;
   int _pageIndex = 0;
   int _requestSeq = 0;
   bool _disposed = false;
@@ -50,6 +51,7 @@ class WatchRecordsController extends ChangeNotifier {
     error = null;
     loadMoreError = null;
     actionError = null;
+    lastErrorCode = null;
     _notify();
     try {
       final page = await _history.recent(pageIndex: 1, pageSize: pageSize);
@@ -71,6 +73,7 @@ class WatchRecordsController extends ChangeNotifier {
       );
       if (!_disposed && request == _requestSeq) {
         error = failure is ApiException ? failure.message : 'progressError';
+        if (failure is ApiException) lastErrorCode = failure.code;
       }
     } finally {
       if (!_disposed && request == _requestSeq) {
@@ -86,6 +89,7 @@ class WatchRecordsController extends ChangeNotifier {
     final request = ++_requestSeq;
     loadingMore = true;
     loadMoreError = null;
+    lastErrorCode = null;
     _notify();
     try {
       final page = await _history.recent(
@@ -108,6 +112,7 @@ class WatchRecordsController extends ChangeNotifier {
         loadMoreError = failure is ApiException
             ? failure.message
             : 'progressError';
+        if (failure is ApiException) lastErrorCode = failure.code;
       }
     } finally {
       if (!_disposed && request == _requestSeq) {
@@ -148,17 +153,19 @@ class WatchRecordsController extends ChangeNotifier {
     total = total > 0 ? total - 1 : 0;
     hasMore = records.length < total;
     actionError = null;
+    lastErrorCode = null;
     _notify();
     try {
       await _history.remove(dramaId);
       return true;
-    } catch (_) {
+    } catch (failure) {
       final next = [...records];
       next.insert(index > next.length ? next.length : index, removed);
       records = next;
       total += 1;
       hasMore = records.length < total;
       actionError = 'recordDeleteFailed';
+      if (failure is ApiException) lastErrorCode = failure.code;
       return false;
     } finally {
       _notify();
@@ -179,16 +186,18 @@ class WatchRecordsController extends ChangeNotifier {
     loadingMore = false;
     clearing = true;
     actionError = null;
+    lastErrorCode = null;
     _notify();
     try {
       await _history.clear();
       return true;
-    } catch (_) {
+    } catch (failure) {
       records = previous;
       total = previousTotal;
       _pageIndex = previousPageIndex;
       hasMore = records.length < total;
       actionError = 'recordClearFailed';
+      if (failure is ApiException) lastErrorCode = failure.code;
       return false;
     } finally {
       clearing = false;
@@ -305,6 +314,23 @@ class WatchRecordsController extends ChangeNotifier {
     if (!_disposed) notifyListeners();
   }
 
+  /// 切换账号/设备身份时清除内存数据，不删除服务端记录。
+  void reset() {
+    _requestSeq += 1;
+    records = const [];
+    total = 0;
+    loading = false;
+    loadingMore = false;
+    hasMore = false;
+    clearing = false;
+    error = null;
+    loadMoreError = null;
+    actionError = null;
+    lastErrorCode = null;
+    _pageIndex = 0;
+    _notify();
+  }
+
   @override
   void dispose() {
     _disposed = true;

lib/core/formatting/account_display.dart

@@ -0,0 +1,239 @@
+// Author: fruit.com.cn
+
+/// 账号资料页只读字段的展示格式化。
+///
+/// 后端存的是 ISO 国家码、BCP-47 语言标签和 IANA 时区（`ID` / `id-ID` / `Asia/Jakarta`），
+/// 直接展示对用户没有意义，这里统一转成当前界面语言的名称。
+/// 国家与城市名只维护中文与英文两套：界面语言为印尼语时回退英文名，
+/// 语言名与账号状态则三种界面语言都有。
+library;
+
+const _countryNamesZh = {
+  'ID': '印度尼西亚',
+  'MY': '马来西亚',
+  'SG': '新加坡',
+  'TH': '泰国',
+  'VN': '越南',
+  'PH': '菲律宾',
+  'KH': '柬埔寨',
+  'MM': '缅甸',
+  'LA': '老挝',
+  'BN': '文莱',
+  'CN': '中国',
+  'TW': '中国台湾',
+  'HK': '中国香港',
+  'MO': '中国澳门',
+  'JP': '日本',
+  'KR': '韩国',
+  'IN': '印度',
+  'PK': '巴基斯坦',
+  'BD': '孟加拉国',
+  'LK': '斯里兰卡',
+  'NP': '尼泊尔',
+  'US': '美国',
+  'CA': '加拿大',
+  'MX': '墨西哥',
+  'BR': '巴西',
+  'AR': '阿根廷',
+  'CL': '智利',
+  'CO': '哥伦比亚',
+  'PE': '秘鲁',
+  'VE': '委内瑞拉',
+  'EC': '厄瓜多尔',
+  'GT': '危地马拉',
+  'DO': '多米尼加',
+  'GB': '英国',
+  'DE': '德国',
+  'FR': '法国',
+  'ES': '西班牙',
+  'IT': '意大利',
+  'NL': '荷兰',
+  'PL': '波兰',
+  'RU': '俄罗斯',
+  'UA': '乌克兰',
+  'TR': '土耳其',
+  'SA': '沙特阿拉伯',
+  'AE': '阿联酋',
+  'IL': '以色列',
+  'EG': '埃及',
+  'NG': '尼日利亚',
+  'ZA': '南非',
+  'KE': '肯尼亚',
+  'MA': '摩洛哥',
+  'AU': '澳大利亚',
+  'NZ': '新西兰',
+};
+
+const _countryNamesEn = {
+  'ID': 'Indonesia',
+  'MY': 'Malaysia',
+  'SG': 'Singapore',
+  'TH': 'Thailand',
+  'VN': 'Vietnam',
+  'PH': 'Philippines',
+  'KH': 'Cambodia',
+  'MM': 'Myanmar',
+  'LA': 'Laos',
+  'BN': 'Brunei',
+  'CN': 'China',
+  'TW': 'Taiwan',
+  'HK': 'Hong Kong',
+  'MO': 'Macau',
+  'JP': 'Japan',
+  'KR': 'South Korea',
+  'IN': 'India',
+  'PK': 'Pakistan',
+  'BD': 'Bangladesh',
+  'LK': 'Sri Lanka',
+  'NP': 'Nepal',
+  'US': 'United States',
+  'CA': 'Canada',
+  'MX': 'Mexico',
+  'BR': 'Brazil',
+  'AR': 'Argentina',
+  'CL': 'Chile',
+  'CO': 'Colombia',
+  'PE': 'Peru',
+  'VE': 'Venezuela',
+  'EC': 'Ecuador',
+  'GT': 'Guatemala',
+  'DO': 'Dominican Republic',
+  'GB': 'United Kingdom',
+  'DE': 'Germany',
+  'FR': 'France',
+  'ES': 'Spain',
+  'IT': 'Italy',
+  'NL': 'Netherlands',
+  'PL': 'Poland',
+  'RU': 'Russia',
+  'UA': 'Ukraine',
+  'TR': 'Turkey',
+  'SA': 'Saudi Arabia',
+  'AE': 'United Arab Emirates',
+  'IL': 'Israel',
+  'EG': 'Egypt',
+  'NG': 'Nigeria',
+  'ZA': 'South Africa',
+  'KE': 'Kenya',
+  'MA': 'Morocco',
+  'AU': 'Australia',
+  'NZ': 'New Zealand',
+};
+
+const _timezoneNamesZh = {
+  'Asia/Jakarta': '雅加达',
+  'Asia/Kuala_Lumpur': '吉隆坡',
+  'Asia/Singapore': '新加坡',
+  'Asia/Bangkok': '曼谷',
+  'Asia/Ho_Chi_Minh': '胡志明市',
+  'Asia/Manila': '马尼拉',
+  'Asia/Phnom_Penh': '金边',
+  'Asia/Yangon': '仰光',
+  'Asia/Vientiane': '万象',
+  'Asia/Brunei': '斯里巴加湾市',
+  'Asia/Shanghai': '上海',
+  'Asia/Taipei': '台北',
+  'Asia/Hong_Kong': '香港',
+  'Asia/Macau': '澳门',
+  'Asia/Tokyo': '东京',
+  'Asia/Seoul': '首尔',
+  'Asia/Kolkata': '加尔各答',
+  'Asia/Karachi': '卡拉奇',
+  'Asia/Dhaka': '达卡',
+  'Asia/Colombo': '科伦坡',
+  'Asia/Kathmandu': '加德满都',
+  'America/New_York': '纽约',
+  'America/Toronto': '多伦多',
+  'America/Mexico_City': '墨西哥城',
+  'America/Sao_Paulo': '圣保罗',
+  'America/Argentina/Buenos_Aires': '布宜诺斯艾利斯',
+  'America/Santiago': '圣地亚哥',
+  'America/Bogota': '波哥大',
+  'America/Lima': '利马',
+  'America/Caracas': '加拉加斯',
+  'America/Guayaquil': '瓜亚基尔',
+  'America/Guatemala': '危地马拉城',
+  'America/Santo_Domingo': '圣多明各',
+  'Europe/London': '伦敦',
+  'Europe/Berlin': '柏林',
+  'Europe/Paris': '巴黎',
+  'Europe/Madrid': '马德里',
+  'Europe/Rome': '罗马',
+  'Europe/Amsterdam': '阿姆斯特丹',
+  'Europe/Warsaw': '华沙',
+  'Europe/Moscow': '莫斯科',
+  'Europe/Kyiv': '基辅',
+  'Europe/Istanbul': '伊斯坦布尔',
+  'Asia/Riyadh': '利雅得',
+  'Asia/Dubai': '迪拜',
+  'Asia/Jerusalem': '耶路撒冷',
+  'Africa/Cairo': '开罗',
+  'Africa/Lagos': '拉各斯',
+  'Africa/Johannesburg': '约翰内斯堡',
+  'Africa/Nairobi': '内罗毕',
+  'Africa/Casablanca': '卡萨布兰卡',
+  'Australia/Sydney': '悉尼',
+  'Pacific/Auckland': '奥克兰',
+};
+
+const _languageNames = {
+  'id': {'zh': '印度尼西亚语', 'en': 'Indonesian', 'id': 'Bahasa Indonesia'},
+  'en': {'zh': '英语', 'en': 'English', 'id': 'Inggris'},
+  'zh': {'zh': '中文', 'en': 'Chinese', 'id': 'Mandarin'},
+};
+
+const _statusNames = {
+  'normal': {'zh': '正常', 'en': 'Active', 'id': 'Aktif'},
+  'limited': {'zh': '受限', 'en': 'Limited', 'id': 'Dibatasi'},
+  'banned': {'zh': '已封禁', 'en': 'Banned', 'id': 'Diblokir'},
+  'deactivated': {'zh': '已注销', 'en': 'Deactivated', 'id': 'Dinonaktifkan'},
+};
+
+String _pick(Map<String, String> names, String localeName) =>
+    names[localeName] ?? names['en']!;
+
+/// 国家码 → 国家名；未收录的码原样返回。
+String countryName(String code, String localeName) {
+  final key = code.trim().toUpperCase();
+  if (key.isEmpty) return '';
+  final names = localeName == 'zh' ? _countryNamesZh : _countryNamesEn;
+  return names[key] ?? key;
+}
+
+/// IANA 时区 → 城市名；中文界面查表，其余语言取时区里的城市段。
+String timezoneName(String timezone, String localeName) {
+  final value = timezone.trim();
+  if (value.isEmpty) return '';
+  if (localeName == 'zh') {
+    final name = _timezoneNamesZh[value];
+    if (name != null) return name;
+  }
+  final city = value.split('/').last.replaceAll('_', ' ');
+  return city.isEmpty ? value : city;
+}
+
+/// BCP-47 语言标签 → 语言名，按主语言归类（`zh-TW` 也算中文）。
+String languageName(String language, String localeName) {
+  final value = language.trim();
+  if (value.isEmpty) return '';
+  final primary = value.split(RegExp('[-_]')).first.toLowerCase();
+  final names = _languageNames[primary];
+  return names == null ? value : _pick(names, localeName);
+}
+
+/// 账号状态 → 展示文案；未知状态原样返回。
+String accountStatusText(String status, String localeName) {
+  final value = status.trim().toLowerCase();
+  final names = _statusNames[value];
+  return names == null ? status : _pick(names, localeName);
+}
+
+/// VIP 等级：0 表示未开通，避免用户看到一个孤零零的 0。
+String vipLevelText(int level, String localeName) {
+  if (level > 0) return 'VIP $level';
+  return switch (localeName) {
+    'zh' => '未开通',
+    'id' => 'Belum aktif',
+    _ => 'Not subscribed',
+  };
+}

lib/core/formatting/localized_content.dart

@@ -8,7 +8,7 @@ String localizedDramaTitle(AppLocalizations l10n, Drama drama) =>
       'the-signal-demo' => l10n.dramaSignalTitle,
       'city-lights-demo' => l10n.dramaCityTitle,
       'vengeance-demo' => l10n.dramaVengeanceTitle,
-      _ => drama.title,
+      _ => drama.localizedTitle(l10n.localeName.split(RegExp(r'[_-]')).first),
     };
 
 String localizedDramaSynopsis(AppLocalizations l10n, Drama drama) =>
@@ -16,7 +16,7 @@ String localizedDramaSynopsis(AppLocalizations l10n, Drama drama) =>
       'the-signal-demo' => l10n.dramaSignalSynopsis,
       'city-lights-demo' => l10n.dramaCitySynopsis,
       'vengeance-demo' => l10n.dramaVengeanceSynopsis,
-      _ => drama.synopsis,
+      _ => drama.localizedSynopsis(l10n.localeName.split(RegExp(r'[_-]')).first),
     };
 
 String localizedEpisodeTitle(AppLocalizations l10n, int number) =>

lib/core/navigation/fade_page_route.dart

@@ -4,14 +4,16 @@ import 'package:flutter/widgets.dart';
 
 /// 无位移的短促淡入转场。
 class FadePageRoute<T> extends PageRouteBuilder<T> {
-  FadePageRoute({required WidgetBuilder builder, super.settings})
-    : super(
-        transitionDuration: const Duration(milliseconds: 220),
-        reverseTransitionDuration: const Duration(milliseconds: 180),
-        pageBuilder: (context, _, _) => builder(context),
-        transitionsBuilder: (context, animation, _, child) => FadeTransition(
-          opacity: CurvedAnimation(parent: animation, curve: Curves.easeOut),
-          child: child,
-        ),
-      );
+  FadePageRoute({
+    required WidgetBuilder builder,
+    super.settings,
+    super.transitionDuration = const Duration(milliseconds: 220),
+    super.reverseTransitionDuration = const Duration(milliseconds: 180),
+  }) : super(
+         pageBuilder: (context, _, _) => builder(context),
+         transitionsBuilder: (context, animation, _, child) => FadeTransition(
+           opacity: CurvedAnimation(parent: animation, curve: Curves.easeOut),
+           child: child,
+         ),
+       );
 }

lib/core/platform/wireless_data_prompt.dart

@@ -0,0 +1,62 @@
+// Author: fruit.com.cn
+
+import 'dart:async';
+
+import 'package:flutter/foundation.dart';
+import 'package:flutter/services.dart';
+
+/// iOS 首次启动等待系统无线数据选择，再发首个接口请求。
+abstract final class WirelessDataPrompt {
+  const WirelessDataPrompt._();
+
+  /// 系统选择超过此时长仍未回调时继续启动。
+  static const Duration decisionTimeout = Duration(seconds: 15);
+
+  /// 与 iOS `WirelessDataPrompt.channelName` 保持一致。
+  static const String channelName = 'com.stormg.lumadrama/wireless-data';
+
+  static const String _awaitDecisionMethod = 'awaitDecision';
+
+  static const MethodChannel _channel = MethodChannel(channelName);
+
+  static Future<void>? _pending;
+
+  /// 非 iOS 立即返回。iOS 只等待一次，失败或超时后放行。
+  static Future<void> awaitDecision({
+    required bool enabled,
+    Future<void> Function()? ask,
+    Duration? timeout,
+  }) {
+    if (!enabled) return Future<void>.value();
+    return _pending ??= _askOnce(ask, timeout ?? decisionTimeout);
+  }
+
+  /// 测试隔离用，清掉已完成的等待。
+  @visibleForTesting
+  static void resetForTest() {
+    _pending = null;
+  }
+
+  static Future<void> _askOnce(
+    Future<void> Function()? ask,
+    Duration timeout,
+  ) async {
+    try {
+      await (ask ?? _invokeChannel).call().timeout(timeout);
+    } on TimeoutException {
+      _log('decision timed out');
+    } catch (error) {
+      _log('decision skipped: $error');
+    }
+  }
+
+  static Future<void> _invokeChannel() {
+    return _channel.invokeMethod<void>(_awaitDecisionMethod);
+  }
+
+  static void _log(String message) {
+    if (kDebugMode) {
+      debugPrint('[wireless-data] $message');
+    }
+  }
+}

lib/core/theme/app_colors.dart

@@ -78,7 +78,12 @@ abstract final class AppColors {
   /// 中性深灰卡片与控件表面。
   static const contentCard = Color(0xFF16161A);
   static const contentSurface = Color(0xFF1C1C1E);
-  static const skeletonSurface = Color(0xFF141414);
+
+  /// 首页、分类与搜索网格骨架的极暗底色。
+  static const skeletonSurface = Color(0xFF0E0E0E);
+
+  /// 播放器、推荐与详情页大面积媒体占位的深灰底色。
+  static const skeletonMedia = Color(0xFF1C1C1E);
   static const contentChip = Color(0xFF2C2C2E);
   static const contentBorder = Color(0x1AFFFFFF);
   static const filterChipSelected = Color(0xFF21090E);
@@ -112,6 +117,9 @@ abstract final class AppColors {
   static const textPrimary = Color(0xFFFFFFFF);
   static const textSecondary = Color(0xFFB0B0B0);
   static const textTertiary = Color(0xFF8E8E93);
+
+  /// 列表底部「没有更多了」这类弱提示。
+  static const textHint = Color(0xFF5C5C60);
   static const textTabInactive = Color(0xFFB0B0B0);
   static const textFilterIcon = Color(0xFF7A7A7E);
   static const searchResultMeta = Color(0xFF9E9E9E);

lib/core/theme/app_dimens.dart

@@ -229,7 +229,7 @@ abstract final class AppDimens {
   static const double mineSectionLinkFont = 12;
   static const double mineSectionGap = 20;
   static const double mineContinueCardWidth = 96;
-  static const double mineContinueRowHeight = 168;
+  static const double mineContinueRowHeight = 172;
   static const double mineContinueTitleFont = 13;
   static const double mineContinueMetaFont = 11;
   static const double mineStatsValueFont = 18;

lib/core/widgets/auth_gate.dart

@@ -15,7 +15,7 @@ Future<void> openAuthPage(BuildContext context, {bool signUpMode = false}) {
 
 /// 受限动作的登录闸：已登录返回 true；未登录弹底部提示并引导登录，返回 false。
 ///
-/// 首页/发现/详情保持匿名可看，只有收藏、点赞、评论这类"要对到具体账号"的动作才走这里。
+/// 首页/发现/详情与非付费互动保持匿名可用；解锁、权益与消耗类动作走这里。
 Future<bool> ensureSignedIn(BuildContext context) async {
   final auth = context.read<AuthController>();
   if (auth.isSignedIn) return true;
@@ -76,6 +76,7 @@ Future<bool> ensureSignedIn(BuildContext context) async {
 
   if (go == true && context.mounted) {
     await openAuthPage(context);
+    if (context.mounted) return context.read<AuthController>().isSignedIn;
   }
   return false;
 }

lib/core/widgets/drama_grid_skeleton.dart

@@ -1,11 +1,21 @@
 // Author: fruit.com.cn
 
+import 'dart:math' as math;
+
 import 'package:flutter/material.dart';
 
 import '../theme/app_colors.dart';
 import '../theme/app_dimens.dart';
 
-class DramaGridSkeleton extends StatelessWidget {
+const Duration _shimmerPeriod = Duration(milliseconds: 1400);
+const double _shimmerTravel = 2.4;
+const double _shimmerStart = -1.2;
+const double _subtitleWidthFactor = 0.62;
+const double _shimmerPhaseStep = 0.13;
+const Color _shimmerHighlight = Color(0x0DFFFFFF);
+
+/// 首页短剧网格的占位。行数至少铺满可视高度，并带一道扫光。
+class DramaGridSkeleton extends StatefulWidget {
   const DramaGridSkeleton({
     super.key,
     required this.columns,
@@ -23,61 +33,145 @@ class DramaGridSkeleton extends StatelessWidget {
   final int itemCount;
   final ScrollPhysics physics;
 
+  @override
+  State<DramaGridSkeleton> createState() => _DramaGridSkeletonState();
+}
+
+class _DramaGridSkeletonState extends State<DramaGridSkeleton>
+    with SingleTickerProviderStateMixin {
+  late final AnimationController _shimmer = AnimationController(
+    vsync: this,
+    duration: _shimmerPeriod,
+  )..repeat();
+
+  @override
+  void dispose() {
+    _shimmer.dispose();
+    super.dispose();
+  }
+
   @override
   Widget build(BuildContext context) {
     return LayoutBuilder(
       builder: (context, constraints) {
-        final itemWidth =
-            (constraints.maxWidth -
-                horizontalPadding * 2 -
-                crossAxisSpacing * (columns - 1)) /
-            columns;
-        final itemExtent =
-            itemWidth / AppDimens.cardCoverAspectRatio +
-            AppDimens.skeletonBodyExtent;
-        return GridView.builder(
-          physics: physics,
-          padding: EdgeInsets.fromLTRB(
-            horizontalPadding,
-            AppDimens.spaceMd,
-            horizontalPadding,
-            AppDimens.spaceXl,
-          ),
-          gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
-            crossAxisCount: columns,
-            crossAxisSpacing: crossAxisSpacing,
-            mainAxisSpacing: mainAxisSpacing,
-            mainAxisExtent: itemExtent,
-          ),
-          itemCount: itemCount,
-          itemBuilder: (context, index) => Column(
-            key: Key('drama-grid-skeleton-$index'),
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              AspectRatio(
-                aspectRatio: AppDimens.cardCoverAspectRatio,
-                child: Container(
-                  decoration: BoxDecoration(
-                    color: AppColors.skeletonSurface,
-                    borderRadius: BorderRadius.circular(
-                      AppDimens.homeCardRadius,
-                    ),
-                  ),
-                ),
-              ),
-              const SizedBox(height: AppDimens.cardCoverTitleGap),
-              const _SkeletonBar(),
-              const SizedBox(height: AppDimens.skeletonTitleBarGap),
-              const FractionallySizedBox(
-                widthFactor: 0.62,
-                child: _SkeletonBar(),
-              ),
-            ],
+        return AnimatedBuilder(
+          animation: _shimmer,
+          builder: (context, _) => _grid(
+            constraints.maxWidth,
+            constraints.maxHeight,
+            _shimmer.value,
           ),
         );
       },
     );
   }
+
+  Widget _grid(double width, double height, double shimmerValue) {
+    final itemWidth = _itemWidth(width);
+    final itemExtent = _itemExtent(itemWidth);
+    return GridView.builder(
+      physics: widget.physics,
+      padding: EdgeInsets.fromLTRB(
+        widget.horizontalPadding,
+        AppDimens.spaceMd,
+        widget.horizontalPadding,
+        AppDimens.spaceXl,
+      ),
+      gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
+        crossAxisCount: widget.columns,
+        crossAxisSpacing: widget.crossAxisSpacing,
+        mainAxisSpacing: widget.mainAxisSpacing,
+        mainAxisExtent: itemExtent,
+      ),
+      itemCount: _fillCount(height, itemExtent),
+      itemBuilder: (context, index) =>
+          _SkeletonCard(index: index, shimmerValue: shimmerValue),
+    );
+  }
+
+  double _itemWidth(double width) {
+    final gaps = widget.crossAxisSpacing * (widget.columns - 1);
+    return (width - widget.horizontalPadding * 2 - gaps) / widget.columns;
+  }
+
+  double _itemExtent(double itemWidth) {
+    return itemWidth / AppDimens.cardCoverAspectRatio +
+        AppDimens.skeletonBodyExtent;
+  }
+
+  int _fillCount(double height, double extent) {
+    if (!height.isFinite || extent <= 0) return widget.itemCount;
+    final rowHeight = extent + widget.mainAxisSpacing;
+    final rows = (height / rowHeight).ceil() + 1;
+    return math.max(widget.itemCount, rows * widget.columns);
+  }
+}
+
+class _SkeletonCard extends StatelessWidget {
+  const _SkeletonCard({required this.index, required this.shimmerValue});
+
+  final int index;
+  final double shimmerValue;
+
+  @override
+  Widget build(BuildContext context) {
+    final phase = (shimmerValue + index * _shimmerPhaseStep) % 1.0;
+    return Stack(
+      key: Key('drama-grid-skeleton-$index'),
+      children: [
+        Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            AspectRatio(
+              aspectRatio: AppDimens.cardCoverAspectRatio,
+              child: const _SkeletonBlock(),
+            ),
+            const SizedBox(height: AppDimens.cardCoverTitleGap),
+            const _SkeletonBar(),
+            const SizedBox(height: AppDimens.skeletonTitleBarGap),
+            const FractionallySizedBox(
+              widthFactor: _subtitleWidthFactor,
+              child: _SkeletonBar(),
+            ),
+          ],
+        ),
+        Positioned.fill(
+          child: IgnorePointer(
+            child: ClipRRect(
+              borderRadius: BorderRadius.circular(AppDimens.homeCardRadius),
+              child: DecoratedBox(
+                decoration: BoxDecoration(gradient: _cardHighlight(phase)),
+              ),
+            ),
+          ),
+        ),
+      ],
+    );
+  }
+}
+
+LinearGradient _cardHighlight(double shimmerValue) {
+  final shift = _shimmerStart + _shimmerTravel * shimmerValue;
+  return LinearGradient(
+    begin: Alignment(shift, -0.3),
+    end: Alignment(shift + 1, 0.3),
+    colors: const [Colors.transparent, _shimmerHighlight, Colors.transparent],
+    stops: const [0.42, 0.5, 0.58],
+  );
+}
+
+class _SkeletonBlock extends StatelessWidget {
+  const _SkeletonBlock();
+
+  @override
+  Widget build(BuildContext context) {
+    return DecoratedBox(
+      decoration: BoxDecoration(
+        color: AppColors.skeletonSurface,
+        borderRadius: BorderRadius.circular(AppDimens.homeCardRadius),
+      ),
+    );
+  }
 }
 
 class _SkeletonBar extends StatelessWidget {

lib/core/widgets/paged_list_footer.dart

@@ -8,19 +8,27 @@ import '../theme/app_colors.dart';
 import '../theme/app_dimens.dart';
 import '../../l10n/app_localizations.dart';
 
-/// 网络分页列表底部状态：仅保留加载圈与错误重试。
+/// 网络分页列表底部：加载中、失败重试、没有下一页。
 class PagedListFooter extends StatelessWidget {
   const PagedListFooter({
     super.key,
     required this.loading,
     required this.onRetry,
     this.errorMessage,
+    this.hasMore = true,
+    this.hasItems = false,
   });
 
   final bool loading;
   final String? errorMessage;
   final Future<void> Function() onRetry;
 
+  /// 还有下一页时不显示结束文案。
+  final bool hasMore;
+
+  /// 列表为空时不显示「没有更多了」。
+  final bool hasItems;
+
   @override
   Widget build(BuildContext context) {
     final l10n = AppLocalizations.of(context)!;
@@ -58,6 +66,17 @@ class PagedListFooter extends StatelessWidget {
         ),
       );
     }
+    if (hasItems && !hasMore) {
+      return Padding(
+        key: const Key('paged-list-no-more'),
+        padding: const EdgeInsets.symmetric(vertical: 16),
+        child: Text(
+          l10n.noMoreItems,
+          textAlign: TextAlign.center,
+          style: const TextStyle(color: AppColors.textHint, fontSize: 12),
+        ),
+      );
+    }
     return const SizedBox.shrink();
   }
 }

lib/core/widgets/paged_local_list.dart

@@ -2,6 +2,7 @@
 
 import 'package:flutter/material.dart';
 
+import '../../l10n/app_localizations.dart';
 import '../theme/app_colors.dart';
 import '../theme/app_dimens.dart';
 
@@ -71,10 +72,14 @@ class PagedLoadFooter extends StatelessWidget {
     super.key,
     required this.loading,
     required this.loadMoreKey,
+    this.hasMore = true,
+    this.hasItems = false,
   });
 
   final bool loading;
   final Key loadMoreKey;
+  final bool hasMore;
+  final bool hasItems;
 
   @override
   Widget build(BuildContext context) {
@@ -93,6 +98,18 @@ class PagedLoadFooter extends StatelessWidget {
         ),
       );
     }
+    if (hasItems && !hasMore) {
+      final l10n = AppLocalizations.of(context)!;
+      return Padding(
+        key: const Key('paged-list-no-more'),
+        padding: const EdgeInsets.symmetric(vertical: 16),
+        child: Text(
+          l10n.noMoreItems,
+          textAlign: TextAlign.center,
+          style: const TextStyle(color: AppColors.textHint, fontSize: 12),
+        ),
+      );
+    }
     return const SizedBox.shrink();
   }
 }

lib/core/widgets/remote_image.dart

@@ -5,6 +5,24 @@ import 'package:flutter/material.dart';
 import '../config/app_config.dart';
 import '../theme/app_colors.dart';
 
+const int _minImageDecodePixels = 96;
+const int _maxImageDecodePixels = 2048;
+
+/// 将布局逻辑尺寸换算成有限像素尺寸，兼顾小头像和全屏首帧。
+int resolveImageDecodePixels(double? logicalExtent, double devicePixelRatio) {
+  final ratio = devicePixelRatio.isFinite && devicePixelRatio > 0
+      ? devicePixelRatio
+      : 1.0;
+  final extent =
+      logicalExtent != null && logicalExtent.isFinite && logicalExtent > 0
+      ? logicalExtent
+      : 120.0;
+  return (extent * ratio)
+      .ceil()
+      .clamp(_minImageDecodePixels, _maxImageDecodePixels)
+      .toInt();
+}
+
 /// 封面图统一入口：后端给的是相对路径，这里补服务地址并处理加载失败。
 class RemoteImage extends StatelessWidget {
   const RemoteImage(
@@ -17,6 +35,8 @@ class RemoteImage extends StatelessWidget {
     this.fallbackIconKey,
     this.fallbackAspectRatio,
     this.fallbackColor = AppColors.raised,
+    this.decodeWidth,
+    this.decodeHeight,
   });
 
   final String path;
@@ -27,21 +47,56 @@ class RemoteImage extends StatelessWidget {
   final Key? fallbackIconKey;
   final double? fallbackAspectRatio;
   final Color fallbackColor;
+  final int? decodeWidth;
+  final int? decodeHeight;
 
   @override
   Widget build(BuildContext context) {
     final url = AppConfig.mediaUrl(path);
     if (url.isEmpty) return _fallback(brand: showFallbackIcon);
-    return Image.network(
-      url,
-      width: width,
-      height: height,
-      fit: fit,
-      gaplessPlayback: true,
-      errorBuilder: (_, _, _) => _fallback(brand: showFallbackIcon),
-      frameBuilder: (context, child, frame, wasSynchronouslyLoaded) {
-        if (wasSynchronouslyLoaded || frame != null) return child;
-        return _fallback(brand: showFallbackIcon);
+    return LayoutBuilder(
+      builder: (context, constraints) {
+        final pixelRatio = MediaQuery.devicePixelRatioOf(context);
+        final layoutWidth = constraints.hasBoundedWidth
+            ? constraints.maxWidth
+            : width;
+        final aspectRatio =
+            fallbackAspectRatio != null &&
+                fallbackAspectRatio!.isFinite &&
+                fallbackAspectRatio! > 0
+            ? fallbackAspectRatio
+            : null;
+        final inferredHeight = constraints.hasBoundedHeight
+            ? constraints.maxHeight
+            : height ??
+                  (layoutWidth != null && aspectRatio != null
+                      ? layoutWidth / aspectRatio
+                      : null);
+        final cacheWidth =
+            decodeWidth ?? resolveImageDecodePixels(layoutWidth, pixelRatio);
+        final cacheHeight =
+            decodeHeight ??
+            (inferredHeight == null
+                ? null
+                : resolveImageDecodePixels(inferredHeight, pixelRatio));
+        return Image.network(
+          url,
+          width: width,
+          height: height,
+          fit: fit,
+          cacheWidth: cacheWidth
+              .clamp(_minImageDecodePixels, _maxImageDecodePixels)
+              .toInt(),
+          cacheHeight: cacheHeight
+              ?.clamp(_minImageDecodePixels, _maxImageDecodePixels)
+              .toInt(),
+          gaplessPlayback: true,
+          errorBuilder: (_, _, _) => _fallback(brand: showFallbackIcon),
+          frameBuilder: (context, child, frame, wasSynchronouslyLoaded) {
+            if (wasSynchronouslyLoaded || frame != null) return child;
+            return _fallback(brand: showFallbackIcon);
+          },
+        );
       },
     );
   }

lib/l10n/app_en.arb

@@ -219,6 +219,7 @@
   "postComment": "Post",
   "commentPostSuccess": "Comment posted",
   "loadMore": "Load more",
+  "noMoreItems": "No more",
   "commentsLoadFailed": "Comments could not be loaded.",
   "commentPostFailed": "Could not post your comment.",
   "delete": "Delete",

lib/l10n/app_id.arb

@@ -193,6 +193,7 @@
   "postComment": "Kirim",
   "commentPostSuccess": "Komentar terkirim",
   "loadMore": "Muat lebih banyak",
+  "noMoreItems": "Tidak ada lagi",
   "commentsLoadFailed": "Komentar tidak dapat dimuat.",
   "commentPostFailed": "Komentar tidak dapat dikirim.",
   "delete": "Hapus",

lib/l10n/app_localizations.dart

@@ -994,6 +994,12 @@ abstract class AppLocalizations {
   /// **'Load more'**
   String get loadMore;
 
+  /// No description provided for @noMoreItems.
+  ///
+  /// In en, this message translates to:
+  /// **'No more'**
+  String get noMoreItems;
+
   /// No description provided for @commentsLoadFailed.
   ///
   /// In en, this message translates to:

lib/l10n/app_localizations_en.dart

@@ -486,6 +486,9 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get loadMore => 'Load more';
 
+  @override
+  String get noMoreItems => 'No more';
+
   @override
   String get commentsLoadFailed => 'Comments could not be loaded.';
 

lib/l10n/app_localizations_id.dart

@@ -487,6 +487,9 @@ class AppLocalizationsId extends AppLocalizations {
   @override
   String get loadMore => 'Muat lebih banyak';
 
+  @override
+  String get noMoreItems => 'Tidak ada lagi';
+
   @override
   String get commentsLoadFailed => 'Komentar tidak dapat dimuat.';
 

lib/l10n/app_localizations_zh.dart

@@ -481,6 +481,9 @@ class AppLocalizationsZh extends AppLocalizations {
   @override
   String get loadMore => '加载更多';
 
+  @override
+  String get noMoreItems => '没有更多了';
+
   @override
   String get commentsLoadFailed => '评论加载失败，请重试。';
 

lib/l10n/app_zh.arb

@@ -193,6 +193,7 @@
   "postComment": "发布",
   "commentPostSuccess": "发表成功",
   "loadMore": "加载更多",
+  "noMoreItems": "没有更多了",
   "commentsLoadFailed": "评论加载失败，请重试。",
   "commentPostFailed": "评论发布失败，请重试。",
   "delete": "删除",

lib/main.dart

@@ -2,17 +2,21 @@
 
 import 'dart:async';
 
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 
 import 'app.dart';
 import 'core/config/app_config.dart';
 import 'core/config/server_endpoint.dart';
+import 'core/platform/wireless_data_prompt.dart';
 
 Future<void> main() async {
   WidgetsFlutterBinding.ensureInitialized();
   await ServerEndpoint.load();
-  AppConfig.ready = AppConfig.probeAndApplyBaseUrl();
+  AppConfig.ready = WirelessDataPrompt.awaitDecision(
+    enabled: !kIsWeb && defaultTargetPlatform == TargetPlatform.iOS,
+  ).then((_) => AppConfig.probeAndApplyBaseUrl());
   runApp(const LumaDramaApp());
   unawaited(
     SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]),

lib/pages/account/account_deactivate_page.dart

@@ -119,7 +119,10 @@ class _AccountDeactivatePageState extends State<AccountDeactivatePage> {
         controller: _reason,
         maxLength: AccountDeactivateLogic.maxReasonLength,
         maxLines: 4,
+        textAlignVertical: TextAlignVertical.top,
         decoration: InputDecoration(
+          alignLabelWithHint: true,
+          floatingLabelBehavior: FloatingLabelBehavior.auto,
           labelText: l10n.accountDeactivateReason,
           hintText: l10n.accountDeactivateReasonHint,
         ),

lib/pages/account/account_profile_page.dart

@@ -8,6 +8,7 @@ import 'package:provider/provider.dart';
 import '../../core/data/models/account_profile.dart';
 import '../../core/data/repositories/account_repository.dart';
 import '../../core/data/services/auth_controller.dart';
+import '../../core/formatting/account_display.dart';
 import '../../core/formatting/error_text.dart';
 import '../../core/formatting/localized_date_time.dart';
 import '../../core/theme/app_colors.dart';
@@ -225,6 +226,7 @@ class _AccountProfilePageState extends State<AccountProfilePage> {
   );
 
   Widget _readOnlyCard(AccountProfile profile, AppLocalizations l10n) {
+    final localeName = Localizations.localeOf(context).languageCode;
     return _AccountCard(
       child: Column(
         crossAxisAlignment: CrossAxisAlignment.start,
@@ -238,13 +240,34 @@ class _AccountProfilePageState extends State<AccountProfilePage> {
           ),
           const SizedBox(height: 10),
           _info(l10n.accountMaskedAccount, profile.maskedTarget),
-          _info(l10n.accountCountry, profile.countryCode),
+          _info(
+            l10n.accountCountry,
+            countryName(profile.countryCode, localeName),
+          ),
           _info(l10n.accountCurrency, profile.currency),
-          _info(l10n.accountStatus, profile.status),
-          _info(l10n.accountLanguage, profile.language),
-          _info(l10n.accountTimezone, profile.timezone),
-          _info(l10n.accountRegion, profile.regionCode),
-          _info(l10n.accountVipLevel, '${profile.vipLevel}'),
+          _info(
+            l10n.accountStatus,
+            accountStatusText(profile.status, localeName),
+          ),
+          _info(
+            l10n.accountLanguage,
+            languageName(profile.language, localeName),
+          ),
+          _info(
+            l10n.accountTimezone,
+            timezoneName(profile.timezone, localeName),
+          ),
+          // region 与 country 后端写的是同一个值，重复时不再单列一行
+          if (profile.regionCode.isNotEmpty &&
+              profile.regionCode != profile.countryCode)
+            _info(
+              l10n.accountRegion,
+              countryName(profile.regionCode, localeName),
+            ),
+          _info(
+            l10n.accountVipLevel,
+            vipLevelText(profile.vipLevel, localeName),
+          ),
           if (profile.createdAt != null)
             _info(
               l10n.accountCreatedAt,
@@ -275,7 +298,7 @@ class _AccountProfilePageState extends State<AccountProfilePage> {
         ),
         Flexible(
           child: Text(
-            value.isEmpty ? '-' : value,
+            value.isEmpty ? '—' : value,
             textAlign: TextAlign.right,
             style: const TextStyle(fontSize: AppDimens.body),
           ),

lib/pages/auth/phone_auth_sheet.dart

@@ -8,7 +8,6 @@ import 'package:provider/provider.dart';
 
 import '../../core/data/remote/api_client.dart';
 import '../../core/data/services/auth_controller.dart';
-import '../../core/formatting/error_text.dart';
 import '../../core/platform/haptics.dart';
 import '../../core/platform/keyboard_inset.dart';
 import '../../core/theme/app_colors.dart';
@@ -181,7 +180,7 @@ class _PhoneAuthSheetState extends State<PhoneAuthSheet> {
       ).showSnackBar(SnackBar(content: Text(l10n.authCodeSent)));
       _codeFocus.requestFocus();
     } on ApiException catch (error) {
-      failureMessage = userFacingApiMessage(l10n, error.code, error.message);
+      failureMessage = error.message;
     } catch (_) {
       failureMessage = l10n.authNetworkError;
     } finally {
@@ -229,7 +228,7 @@ class _PhoneAuthSheetState extends State<PhoneAuthSheet> {
       }
       if (mounted) Navigator.of(context).pop(true);
     } on ApiException catch (error) {
-      failureMessage = userFacingApiMessage(l10n, error.code, error.message);
+      failureMessage = error.message;
     } catch (_) {
       failureMessage = l10n.authNetworkError;
     } finally {

lib/pages/discover/discover_view.dart

@@ -23,30 +23,18 @@ import '../../core/widgets/catalog_debug_info.dart';
 import '../../core/widgets/catalog_endpoint_editor.dart';
 import '../../core/widgets/empty_state.dart';
 import '../../l10n/app_localizations.dart';
-import '../filter/filter_page.dart';
-import '../new_releases/new_releases_page.dart';
 import '../player/open_player.dart';
-import '../ranking/ranking_page.dart';
-import '../reserve/reserve_page.dart';
 import 'discover_binding.dart';
 import 'discover_logic.dart';
 import 'discover_types.dart';
+import 'widgets/discover_category_tab.dart';
 import 'widgets/discover_header.dart';
 import 'widgets/discover_search_results.dart';
+import 'widgets/discover_toolbar.dart';
 import 'widgets/drama_grid.dart';
 
-const Color _filterIconColor = AppColors.blueSoft;
-const Color _newIconColor = AppColors.blueSoft;
-const double _toolbarHeight = 36;
-const double _toolbarGap = 10;
-const double _toolbarRadius = 10;
 const double _categoryTabHeight = 44;
 const double _categoryTabGap = 20;
-const double _categorySelectedFontSize = 16;
-const double _categoryFontSize = 15;
-const double _categoryUnderlineWidth = 20;
-const double _categoryUnderlineHeight = 3;
-const double _categoryUnderlineStrokeWidth = 2;
 const double _stickyHeaderHeight = 44;
 const Duration _stickyHeaderTransition = Duration(milliseconds: 160);
 const Duration _categoryScrollDuration = Duration(milliseconds: 200);
@@ -295,7 +283,7 @@ class _DiscoverPageState extends State<DiscoverPage> {
   List<Widget> _theaterBlocks(AppLocalizations l10n) {
     final dramas = theater.dramas;
     return [
-      _toolbar(l10n),
+      _toolbar(),
       if (dramas.isEmpty)
         Padding(
           padding: const EdgeInsets.symmetric(vertical: 40),
@@ -318,6 +306,16 @@ class _DiscoverPageState extends State<DiscoverPage> {
               child: CircularProgressIndicator(strokeWidth: 2),
             ),
           ),
+        )
+      else if (dramas.isNotEmpty && !theater.hasMore)
+        Padding(
+          key: const Key('paged-list-no-more'),
+          padding: const EdgeInsets.symmetric(vertical: 16),
+          child: Text(
+            l10n.noMoreItems,
+            textAlign: TextAlign.center,
+            style: const TextStyle(color: AppColors.textHint, fontSize: 12),
+          ),
         ),
     ];
   }
@@ -335,8 +333,7 @@ class _DiscoverPageState extends State<DiscoverPage> {
         child: Row(
           mainAxisSize: MainAxisSize.min,
           children: [
-            _categoryTab(
-              key: const Key('theater-category-all'),
+            DiscoverCategoryTab(
               anchorKey: _anchorFor('all'),
               id: 'all',
               label: l10n.all,
@@ -345,8 +342,7 @@ class _DiscoverPageState extends State<DiscoverPage> {
             ),
             for (final category in categories.categories) ...[
               const SizedBox(width: _categoryTabGap),
-              _categoryTab(
-                key: Key('theater-category-${category.id}'),
+              DiscoverCategoryTab(
                 anchorKey: _anchorFor(category.id),
                 id: category.id,
                 label: category.name,
@@ -360,52 +356,6 @@ class _DiscoverPageState extends State<DiscoverPage> {
     );
   }
 
-  Widget _categoryTab({
-    required Key key,
-    required GlobalKey anchorKey,
-    required String id,
-    required String label,
-    required bool selected,
-    required VoidCallback onTap,
-  }) {
-    return KeyedSubtree(
-      key: anchorKey,
-      child: GestureDetector(
-        key: key,
-        behavior: HitTestBehavior.opaque,
-        onTap: onTap,
-        child: Column(
-          mainAxisSize: MainAxisSize.min,
-          mainAxisAlignment: MainAxisAlignment.center,
-          children: [
-            Text(
-              label,
-              maxLines: 1,
-              style: TextStyle(
-                color: selected ? AppColors.onSurface : AppColors.muted,
-                fontSize: selected
-                    ? _categorySelectedFontSize
-                    : _categoryFontSize,
-                fontWeight: selected ? FontWeight.w800 : FontWeight.w500,
-              ),
-            ),
-            const SizedBox(height: 4),
-            CustomPaint(
-              key: Key('theater-category-underline-$id'),
-              size: const Size(
-                _categoryUnderlineWidth,
-                _categoryUnderlineHeight,
-              ),
-              painter: CategoryUnderlinePainter(
-                color: selected ? AppColors.blue : AppColors.transparent,
-              ),
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-
   GlobalKey _anchorFor(String id) {
     return _categoryAnchors.putIfAbsent(id, GlobalKey.new);
   }
@@ -444,97 +394,8 @@ class _DiscoverPageState extends State<DiscoverPage> {
     return true;
   }
 
-  Widget _toolbar(AppLocalizations l10n) {
-    return Padding(
-      padding: const EdgeInsets.fromLTRB(14, 2, 14, 12),
-      child: Row(
-        children: [
-          Expanded(
-            child: _toolButton(
-              key: const Key('theater-toolbar-filter'),
-              icon: Icons.tune_rounded,
-              color: _filterIconColor,
-              label: l10n.filter,
-              onTap: () => _openPage(context, const FilterPage()),
-            ),
-          ),
-          const SizedBox(width: _toolbarGap),
-          Expanded(
-            child: _toolButton(
-              key: const Key('theater-toolbar-ranking'),
-              icon: Icons.local_fire_department_rounded,
-              color: AppColors.blue,
-              label: l10n.rankingTab,
-              onTap: () => _openPage(context, const RankingPage()),
-            ),
-          ),
-          const SizedBox(width: _toolbarGap),
-          Expanded(
-            child: _toolButton(
-              key: const Key('theater-toolbar-new'),
-              icon: Icons.play_circle_fill_rounded,
-              color: _newIconColor,
-              label: l10n.newDramas,
-              onTap: () => _openPage(context, const NewReleasesPage()),
-            ),
-          ),
-          const SizedBox(width: _toolbarGap),
-          Expanded(
-            child: _toolButton(
-              key: const Key('theater-toolbar-reserve'),
-              icon: Icons.calendar_month_rounded,
-              color: AppColors.blue,
-              label: l10n.reserve,
-              onTap: () => _openPage(context, const ReservePage()),
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-
-  Widget _toolButton({
-    required Key key,
-    required IconData icon,
-    required Color color,
-    required String label,
-    required VoidCallback onTap,
-  }) {
-    return Material(
-      color: AppColors.card,
-      borderRadius: BorderRadius.circular(_toolbarRadius),
-      child: InkWell(
-        key: key,
-        onTap: onTap,
-        borderRadius: BorderRadius.circular(_toolbarRadius),
-        child: Container(
-          height: _toolbarHeight,
-          decoration: BoxDecoration(
-            borderRadius: BorderRadius.circular(_toolbarRadius),
-            border: Border.all(color: AppColors.border),
-          ),
-          child: Row(
-            mainAxisAlignment: MainAxisAlignment.center,
-            children: [
-              Icon(icon, size: 16, color: color),
-              const SizedBox(width: 4),
-              Flexible(
-                child: Text(
-                  label,
-                  maxLines: 1,
-                  overflow: TextOverflow.ellipsis,
-                  style: const TextStyle(
-                    color: AppColors.onSurface,
-                    fontSize: 13,
-                    fontWeight: FontWeight.w600,
-                  ),
-                ),
-              ),
-            ],
-          ),
-        ),
-      ),
-    );
+  Widget _toolbar() {
+    return DiscoverToolbar(onOpen: (page) => _openPage(context, page));
   }
 
   void _openPage(BuildContext context, Widget page) {
@@ -601,27 +462,3 @@ class _DiscoverPageState extends State<DiscoverPage> {
     AppRootTab.mine => DiscoverPageAction.mine,
   };
 }
-
-/// 分类 tab 的弧形选中线。
-class CategoryUnderlinePainter extends CustomPainter {
-  const CategoryUnderlinePainter({required this.color});
-
-  final Color color;
-
-  @override
-  void paint(Canvas canvas, Size size) {
-    final paint = Paint()
-      ..color = color
-      ..style = PaintingStyle.stroke
-      ..strokeWidth = _categoryUnderlineStrokeWidth
-      ..strokeCap = StrokeCap.round;
-    final path = Path()
-      ..moveTo(1, 1)
-      ..quadraticBezierTo(size.width / 2, size.height + 1, size.width - 1, 1);
-    canvas.drawPath(path, paint);
-  }
-
-  @override
-  bool shouldRepaint(covariant CategoryUnderlinePainter oldDelegate) =>
-      color != oldDelegate.color;
-}

lib/pages/discover/widgets/discover_category_tab.dart

@@ -0,0 +1,89 @@
+// Author: fruit.com.cn
+// 剧场顶部分类标签和选中下划线。
+
+import 'package:flutter/material.dart';
+
+import '../../../core/theme/app_colors.dart';
+
+const double _selectedFontSize = 16;
+const double _fontSize = 15;
+const double _underlineWidth = 20;
+const double _underlineHeight = 3;
+const double _underlineStrokeWidth = 2;
+
+/// 一个可横向滚动的分类标签。
+class DiscoverCategoryTab extends StatelessWidget {
+  const DiscoverCategoryTab({
+    super.key,
+    required this.id,
+    required this.anchorKey,
+    required this.label,
+    required this.selected,
+    required this.onTap,
+  });
+
+  final String id;
+  final GlobalKey anchorKey;
+  final String label;
+  final bool selected;
+  final VoidCallback onTap;
+
+  @override
+  Widget build(BuildContext context) {
+    return KeyedSubtree(
+      key: anchorKey,
+      child: GestureDetector(
+        key: Key('theater-category-$id'),
+        behavior: HitTestBehavior.opaque,
+        onTap: onTap,
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          mainAxisAlignment: MainAxisAlignment.center,
+          children: [
+            Text(
+              label,
+              maxLines: 1,
+              style: TextStyle(
+                color: selected ? AppColors.onSurface : AppColors.muted,
+                fontSize: selected ? _selectedFontSize : _fontSize,
+                fontWeight: selected ? FontWeight.w800 : FontWeight.w500,
+              ),
+            ),
+            const SizedBox(height: 4),
+            CustomPaint(
+              key: Key('theater-category-underline-$id'),
+              size: const Size(_underlineWidth, _underlineHeight),
+              painter: CategoryUnderlinePainter(
+                color: selected ? AppColors.blue : AppColors.transparent,
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
+
+/// 分类 tab 的弧形选中线。
+class CategoryUnderlinePainter extends CustomPainter {
+  const CategoryUnderlinePainter({required this.color});
+
+  final Color color;
+
+  @override
+  void paint(Canvas canvas, Size size) {
+    final paint = Paint()
+      ..color = color
+      ..style = PaintingStyle.stroke
+      ..strokeWidth = _underlineStrokeWidth
+      ..strokeCap = StrokeCap.round;
+    final path = Path()
+      ..moveTo(1, 1)
+      ..quadraticBezierTo(size.width / 2, size.height + 1, size.width - 1, 1);
+    canvas.drawPath(path, paint);
+  }
+
+  @override
+  bool shouldRepaint(covariant CategoryUnderlinePainter oldDelegate) =>
+      color != oldDelegate.color;
+}

lib/pages/discover/widgets/discover_toolbar.dart

@@ -0,0 +1,119 @@
+// Author: fruit.com.cn
+// 剧场页筛选、排行、新剧、预约四个入口。
+
+import 'package:flutter/material.dart';
+
+import '../../../core/theme/app_colors.dart';
+import '../../../l10n/app_localizations.dart';
+import '../../filter/filter_page.dart';
+import '../../new_releases/new_releases_page.dart';
+import '../../ranking/ranking_page.dart';
+import '../../reserve/reserve_page.dart';
+
+const double _toolbarHeight = 36;
+const double _toolbarGap = 10;
+const double _toolbarRadius = 10;
+const Color _filterIconColor = AppColors.blueSoft;
+const Color _newIconColor = AppColors.blueSoft;
+
+/// 剧场工具条。点按后由调用方打开对应页面。
+class DiscoverToolbar extends StatelessWidget {
+  const DiscoverToolbar({super.key, required this.onOpen});
+
+  final void Function(Widget page) onOpen;
+
+  @override
+  Widget build(BuildContext context) {
+    final l10n = AppLocalizations.of(context)!;
+    return Padding(
+      padding: const EdgeInsets.fromLTRB(14, 2, 14, 12),
+      child: Row(
+        children: [
+          Expanded(
+            child: _button(
+              key: const Key('theater-toolbar-filter'),
+              icon: Icons.tune_rounded,
+              color: _filterIconColor,
+              label: l10n.filter,
+              onTap: () => onOpen(const FilterPage()),
+            ),
+          ),
+          const SizedBox(width: _toolbarGap),
+          Expanded(
+            child: _button(
+              key: const Key('theater-toolbar-ranking'),
+              icon: Icons.local_fire_department_rounded,
+              color: AppColors.blue,
+              label: l10n.rankingTab,
+              onTap: () => onOpen(const RankingPage()),
+            ),
+          ),
+          const SizedBox(width: _toolbarGap),
+          Expanded(
+            child: _button(
+              key: const Key('theater-toolbar-new'),
+              icon: Icons.play_circle_fill_rounded,
+              color: _newIconColor,
+              label: l10n.newDramas,
+              onTap: () => onOpen(const NewReleasesPage()),
+            ),
+          ),
+          const SizedBox(width: _toolbarGap),
+          Expanded(
+            child: _button(
+              key: const Key('theater-toolbar-reserve'),
+              icon: Icons.calendar_month_rounded,
+              color: AppColors.blue,
+              label: l10n.reserve,
+              onTap: () => onOpen(const ReservePage()),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _button({
+    required Key key,
+    required IconData icon,
+    required Color color,
+    required String label,
+    required VoidCallback onTap,
+  }) {
+    return Material(
+      color: AppColors.card,
+      borderRadius: BorderRadius.circular(_toolbarRadius),
+      child: InkWell(
+        key: key,
+        onTap: onTap,
+        borderRadius: BorderRadius.circular(_toolbarRadius),
+        child: Container(
+          height: _toolbarHeight,
+          decoration: BoxDecoration(
+            borderRadius: BorderRadius.circular(_toolbarRadius),
+            border: Border.all(color: AppColors.border),
+          ),
+          child: Row(
+            mainAxisAlignment: MainAxisAlignment.center,
+            children: [
+              Icon(icon, size: 16, color: color),
+              const SizedBox(width: 4),
+              Flexible(
+                child: Text(
+                  label,
+                  maxLines: 1,
+                  overflow: TextOverflow.ellipsis,
+                  style: const TextStyle(
+                    color: AppColors.onSurface,
+                    fontSize: 13,
+                    fontWeight: FontWeight.w600,
+                  ),
+                ),
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}

lib/pages/discover/widgets/drama_grid.dart

@@ -96,9 +96,9 @@ class DramaGridCard extends StatelessWidget {
         children: [
           _cover(),
           const SizedBox(height: _titleGap),
-          _title(),
+          _title(context),
           const SizedBox(height: _tagsGap),
-          _tags(),
+          _tags(context),
         ],
       ),
     );
@@ -151,9 +151,9 @@ class DramaGridCard extends StatelessWidget {
     );
   }
 
-  Widget _title() {
+  Widget _title(BuildContext context) {
     return Text(
-      drama.title,
+      drama.localizedTitle(Localizations.localeOf(context).languageCode),
       key: Key('home-drama-title-${drama.id}'),
       maxLines: 2,
       overflow: TextOverflow.ellipsis,
@@ -166,8 +166,8 @@ class DramaGridCard extends StatelessWidget {
     );
   }
 
-  Widget _tags() {
-    final tags = _tagValues();
+  Widget _tags(BuildContext context) {
+    final tags = _tagValues(context);
     if (tags.isEmpty) return const SizedBox.shrink();
     return Wrap(
       spacing: 6,
@@ -193,7 +193,9 @@ class DramaGridCard extends StatelessWidget {
     );
   }
 
-  List<String> _tagValues() {
+  List<String> _tagValues(BuildContext context) {
+    final localized = drama.localizedTypeLabels(Localizations.localeOf(context).languageCode);
+    if (localized.isNotEmpty) return localized.take(3).toList(growable: false);
     final result = <String>[];
     for (final value in [drama.genre, drama.category]) {
       for (final part in value.split(_tagSplitter)) {

lib/pages/discover/widgets/search_result_card.dart

@@ -16,7 +16,7 @@ class SearchResultCard extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final tags = _tags();
+    final tags = _tags(context);
     return Material(
       key: Key('search-result-card-${drama.id}'),
       color: AppColors.transparent,
@@ -60,7 +60,7 @@ class SearchResultCard extends StatelessWidget {
             ),
             const SizedBox(height: AppDimens.searchResultTitleGap),
             Text(
-              drama.title,
+              drama.localizedTitle(Localizations.localeOf(context).languageCode),
               key: Key('search-result-title-${drama.id}'),
               maxLines: 2,
               overflow: TextOverflow.ellipsis,
@@ -92,7 +92,9 @@ class SearchResultCard extends StatelessWidget {
     );
   }
 
-  List<String> _tags() {
+  List<String> _tags(BuildContext context) {
+    final localized = drama.localizedTypeLabels(Localizations.localeOf(context).languageCode);
+    if (localized.isNotEmpty) return localized.take(3).toList(growable: false);
     final seen = <String>{};
     return [drama.genre, drama.category]
         .expand((value) => value.split(RegExp(r'[,/、·]')))

lib/pages/drama_detail/drama_detail_logic.dart

@@ -38,7 +38,6 @@ class DramaDetailLogic extends ChangeNotifier {
   int? continueIndex;
   WatchProgress? progress;
   String? progressError;
-  int _favoriteCountDelta = 0;
   bool _disposed = false;
 
   void notify() {
@@ -47,6 +46,7 @@ class DramaDetailLogic extends ChangeNotifier {
 
   /// 列表卡片只带一集可播预览，进详情时补一次完整剧集列表。
   Future<void> load(Future<Drama> Function() fetch) async {
+    favorites.applyServerCount(drama.id, drama.favoriteCount, notify: false);
     if (drama.detailLoaded) {
       await loadContinue();
       return;
@@ -57,6 +57,7 @@ class DramaDetailLogic extends ChangeNotifier {
     notify();
     try {
       drama = await fetch();
+      favorites.applyServerCount(drama.id, drama.favoriteCount);
       await loadContinue();
     } on ApiException catch (exception) {
       failed = true;
@@ -139,25 +140,12 @@ class DramaDetailLogic extends ChangeNotifier {
     await loadContinue();
   }
 
-  /// 详情页展示用的收藏数；没有服务端计数时继续保持缺省展示。
-  int? get adjustedFavoriteCount {
-    final base = drama.favoriteCount;
-    if (base == null) return null;
-    final adjusted = base + _favoriteCountDelta;
-    return adjusted < 0 ? 0 : adjusted;
-  }
+  /// 详情页展示用的收藏数，统一从全局 FavoriteController 读取。
+  int? get adjustedFavoriteCount => favorites.favoriteCountFor(drama);
 
-  /// 收藏切换：乐观状态由控制器负责回滚，这里只在成功后同步计数。
+  /// 收藏切换：状态与计数均由全局控制器维护。
   Future<bool> toggleFavorite() async {
-    final wasSaved = favorites.isSaved(drama.id);
-    final ok = await favorites.toggle(drama.id, card: drama);
-    if (!ok) return false;
-    final nowSaved = favorites.isSaved(drama.id);
-    if (nowSaved != wasSaved) {
-      _favoriteCountDelta += nowSaved ? 1 : -1;
-      notify();
-    }
-    return true;
+    return favorites.toggle(drama.id, card: drama);
   }
 
   @override

lib/pages/drama_detail/drama_detail_view.dart

@@ -163,8 +163,10 @@ class _DramaDetailPageState extends State<DramaDetailPage> {
               synopsis: localizedDramaSynopsis(l10n, drama),
             ),
           ),
-          if (_tagValues(drama).isNotEmpty)
-            SliverToBoxAdapter(child: DramaTags(tags: _tagValues(drama))),
+          if (_tagValues(context, drama).isNotEmpty)
+            SliverToBoxAdapter(
+              child: DramaTags(tags: _tagValues(context, drama)),
+            ),
           SliverToBoxAdapter(child: _episodes(l10n, drama, continueIndex)),
           const SliverToBoxAdapter(child: SizedBox(height: 24)),
         ],
@@ -396,11 +398,14 @@ class _DramaDetailPageState extends State<DramaDetailPage> {
   }
 
   Future<void> _toggleFavorite(AppLocalizations l10n) async {
-    if (!await ensureSignedIn(context)) return;
     if (!mounted) return;
     unawaited(context.read<Haptics>().lightImpact());
     final ok = await logic.toggleFavorite();
     if (ok || !mounted) return;
+    if (logic.favorites.lastErrorCode == 200007) {
+      await ensureSignedIn(context);
+      return;
+    }
     ScaffoldMessenger.of(
       context,
     ).showSnackBar(SnackBar(content: Text(l10n.favoriteToggleFailed)));
@@ -442,13 +447,20 @@ class _DramaDetailPageState extends State<DramaDetailPage> {
     return record.fraction;
   }
 
-  List<String> _tagValues(Drama drama) {
+  List<String> _tagValues(BuildContext context, Drama drama) {
+    final localized = drama.localizedTypeLabels(
+      Localizations.localeOf(context).languageCode,
+    );
     final result = <String>[];
-    for (final source in [drama.category, drama.genre]) {
-      for (final part in source.split(_tagSplitter)) {
-        final value = part.trim();
-        if (value.isNotEmpty && !result.contains(value)) result.add(value);
-        if (result.length == _maxTags) return result;
+    if (localized.isNotEmpty) {
+      result.addAll(localized.take(_maxTags));
+    } else {
+      for (final source in [drama.category, drama.genre]) {
+        for (final part in source.split(_tagSplitter)) {
+          final value = part.trim();
+          if (value.isNotEmpty && !result.contains(value)) result.add(value);
+          if (result.length == _maxTags) return result;
+        }
       }
     }
     final language = drama.language.trim();

lib/pages/drama_detail/widgets/drama_episode_states.dart

@@ -94,7 +94,7 @@ class _DramaEpisodesLoadingState extends State<DramaEpisodesLoading>
               opacity: _opacity,
               child: Container(
                 decoration: BoxDecoration(
-                  color: AppColors.raised,
+                  color: AppColors.skeletonMedia,
                   borderRadius: BorderRadius.circular(_radius),
                 ),
               ),

lib/pages/favorites/favorites_page.dart

@@ -6,7 +6,6 @@ import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 
 import '../../core/data/models/drama.dart';
-import '../../core/data/services/auth_controller.dart';
 import '../../core/data/services/favorite_controller.dart';
 import '../../core/formatting/count_format.dart';
 import '../../core/formatting/error_text.dart';
@@ -77,11 +76,6 @@ class _FavoritesContentState extends State<FavoritesContent> {
   @override
   void didChangeDependencies() {
     super.didChangeDependencies();
-    final signedIn = context.watch<AuthController>().isSignedIn;
-    if (!signedIn) {
-      _requested = false;
-      return;
-    }
     if (_requested) return;
     _requested = true;
     final favorites = context.read<FavoriteController>();
@@ -93,7 +87,6 @@ class _FavoritesContentState extends State<FavoritesContent> {
   @override
   Widget build(BuildContext context) {
     final l10n = AppLocalizations.of(context)!;
-    final signedIn = context.watch<AuthController>().isSignedIn;
     return SafeArea(
       bottom: false,
       child: Column(
@@ -104,9 +97,9 @@ class _FavoritesContentState extends State<FavoritesContent> {
             showBack: widget.showBack,
           ),
           Expanded(
-            child: signedIn
-                ? _FavoritesBody(favorites: context.watch<FavoriteController>())
-                : const AuthGatePanel(),
+            child: _FavoritesBody(
+              favorites: context.watch<FavoriteController>(),
+            ),
           ),
         ],
       ),
@@ -122,6 +115,9 @@ class _FavoritesBody extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final l10n = AppLocalizations.of(context)!;
+    if (favorites.lastErrorCode == 200007) {
+      return const AuthGatePanel();
+    }
     if (favorites.loading && favorites.cards.isEmpty) {
       return const Center(
         child: CircularProgressIndicator(key: Key('favorites-loading')),
@@ -176,6 +172,8 @@ class _FavoritesBody extends StatelessWidget {
         ],
         PagedListFooter(
           loading: favorites.loadingMore,
+          hasMore: favorites.hasMore,
+          hasItems: favorites.cards.isNotEmpty,
           errorMessage: favorites.loadMoreError == null
               ? null
               : errorText(l10n, favorites.loadMoreError, l10n.favoritesError),
@@ -265,8 +263,9 @@ class _FavoriteCard extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final l10n = AppLocalizations.of(context)!;
-    final tags = _tags();
-    final synopsis = drama.synopsis.trim();
+    final languageCode = Localizations.localeOf(context).languageCode;
+    final tags = _tags(languageCode);
+    final synopsis = drama.localizedSynopsis(languageCode).trim();
     return Container(
       key: ValueKey('favorite-card-${drama.id}'),
       decoration: BoxDecoration(
@@ -309,7 +308,7 @@ class _FavoriteCard extends StatelessWidget {
                             crossAxisAlignment: CrossAxisAlignment.start,
                             children: [
                               Text(
-                                drama.title,
+                                drama.localizedTitle(languageCode),
                                 key: ValueKey('favorite-title-${drama.id}'),
                                 maxLines: 2,
                                 overflow: TextOverflow.ellipsis,
@@ -444,7 +443,9 @@ class _FavoriteCard extends StatelessWidget {
     );
   }
 
-  List<String> _tags() {
+  List<String> _tags(String languageCode) {
+    final localized = drama.localizedTypeLabels(languageCode);
+    if (localized.isNotEmpty) return localized.take(_maxTags).toList();
     final values = <String>[];
     for (final source in [drama.genre, drama.category]) {
       for (final part in source.split(_tagSplitter)) {

lib/pages/following/following_edit_bar.dart

@@ -27,6 +27,7 @@ const double _barButtonHeight = 30;
 const double _removeDialogButtonHeight = 32;
 const double _removeDialogRadius = 6;
 const double _removeDialogBottomInset = 8;
+const double _cancelFollowingDialogPadding = 20;
 
 /// 播放历史移除确认。只把移除按钮压矮。
 Future<bool> confirmHistoryRemove(BuildContext context) async {
@@ -71,13 +72,32 @@ Future<bool> confirmCancelFollowing(BuildContext context) async {
   return await showDialog<bool>(
         context: context,
         builder: (dialogContext) => AlertDialog(
+          contentPadding: const EdgeInsets.all(_cancelFollowingDialogPadding),
+          actionsPadding: const EdgeInsets.fromLTRB(
+            _cancelFollowingDialogPadding,
+            0,
+            _cancelFollowingDialogPadding,
+            _cancelFollowingDialogPadding,
+          ),
           content: Text(l10n.confirmCancelFollowing),
           actions: [
             TextButton(
+              style: TextButton.styleFrom(
+                visualDensity: VisualDensity.standard,
+                tapTargetSize: MaterialTapTargetSize.shrinkWrap,
+                minimumSize: const Size(0, _removeDialogButtonHeight),
+                padding: const EdgeInsets.symmetric(horizontal: 12),
+              ),
               onPressed: () => Navigator.pop(dialogContext, false),
               child: Text(l10n.cancel),
             ),
             FilledButton(
+              style: FilledButton.styleFrom(
+                visualDensity: VisualDensity.standard,
+                tapTargetSize: MaterialTapTargetSize.shrinkWrap,
+                minimumSize: const Size(0, _removeDialogButtonHeight),
+                padding: const EdgeInsets.symmetric(horizontal: 12),
+              ),
               onPressed: () => Navigator.pop(dialogContext, true),
               child: Text(l10n.cancelFollowing),
             ),

lib/pages/following/following_favorites_grid.dart

@@ -97,7 +97,7 @@ class FollowingFavoritesGrid extends StatelessWidget {
     final episode = drama.episodes.isEmpty ? 1 : drama.episodes.first.number;
     return FollowingGridCard(
       dramaId: drama.id,
-      title: drama.title,
+      title: drama.localizedTitle(Localizations.localeOf(context).languageCode),
       posterUrl: drama.posterUrl,
       viewCount: drama.viewCount,
       editing: isEditing,

lib/pages/following/following_page.dart

@@ -15,7 +15,6 @@ import '../../core/data/services/watch_records_controller.dart';
 import '../../core/formatting/error_text.dart';
 import '../../core/theme/app_colors.dart';
 import '../../core/theme/app_dimens.dart';
-import '../../core/widgets/auth_gate.dart';
 import '../../core/widgets/empty_state.dart';
 import '../../l10n/app_localizations.dart';
 import '../player/open_player.dart';
@@ -67,7 +66,7 @@ class _FollowingPageState extends State<FollowingPage> {
       history: context.read<WatchHistoryRepository>(),
       catalog: context.read<CatalogRepository>(),
     );
-    if (_wasSignedIn) unawaited(_history.load());
+    unawaited(_history.load());
     WidgetsBinding.instance.addPostFrameCallback((_) {
       if (mounted) unawaited(widget.favoriteController.load());
     });
@@ -75,8 +74,16 @@ class _FollowingPageState extends State<FollowingPage> {
 
   void _onAuthChanged() {
     final signedIn = _auth.isSignedIn;
-    if (signedIn && !_wasSignedIn) unawaited(_history.load());
+    if (signedIn == _wasSignedIn) return;
     _wasSignedIn = signedIn;
+    _leaveEditing();
+    _history.reset();
+    widget.favoriteController.clear();
+    unawaited(_reloadForIdentity());
+  }
+
+  Future<void> _reloadForIdentity() async {
+    await Future.wait([_history.load(), widget.favoriteController.load()]);
   }
 
   @override
@@ -104,7 +111,6 @@ class _FollowingPageState extends State<FollowingPage> {
   @override
   Widget build(BuildContext context) {
     final l10n = AppLocalizations.of(context)!;
-    final signedIn = context.watch<AuthController>().isSignedIn;
     return ColoredBox(
       key: const Key('following-page'),
       color: AppColors.appBackground,
@@ -114,47 +120,44 @@ class _FollowingPageState extends State<FollowingPage> {
           children: [
             _header(l10n),
             Expanded(
-              child: !signedIn
-                  ? const AuthGatePanel()
-                  : PageView(
-                      key: const Key('following-tab-pages'),
-                      controller: _pageController,
-                      onPageChanged: _onPageChanged,
-                      children: [
-                        FollowingKeepAliveTab(
-                          child: FollowingFavoritesGrid(
-                            controller: widget.favoriteController,
-                            selection: FollowingFavoriteSelection(
-                              editing: _editing,
-                              selected: _selected,
-                              onToggle: _toggleDrama,
-                            ),
-                            scrollController: _favoriteScroll,
-                            onGoHome: widget.onGoHome,
-                          ),
-                        ),
-                        FollowingKeepAliveTab(
-                          child: _HistoryList(
-                            controller: _history,
-                            editing: _editing,
-                            scrollController: _historyScroll,
-                            onListEmptied: _exitEditingIfEmpty,
-                          ),
-                        ),
-                      ],
+              child: PageView(
+                key: const Key('following-tab-pages'),
+                controller: _pageController,
+                onPageChanged: _onPageChanged,
+                children: [
+                  FollowingKeepAliveTab(
+                    child: FollowingFavoritesGrid(
+                      controller: widget.favoriteController,
+                      selection: FollowingFavoriteSelection(
+                        editing: _editing,
+                        selected: _selected,
+                        onToggle: _toggleDrama,
+                      ),
+                      scrollController: _favoriteScroll,
+                      onGoHome: widget.onGoHome,
                     ),
-            ),
-            if (signedIn)
-              FollowingEditSlot(
-                tab: _tab,
-                editing: _editing,
-                favorites: widget.favoriteController,
-                selected: _selected,
-                actions: FollowingEditActions(
-                  onToggleAll: _toggleAll,
-                  onRemove: () => unawaited(_cancelSelected()),
-                ),
+                  ),
+                  FollowingKeepAliveTab(
+                    child: _HistoryList(
+                      controller: _history,
+                      editing: _editing,
+                      scrollController: _historyScroll,
+                      onListEmptied: _exitEditingIfEmpty,
+                    ),
+                  ),
+                ],
               ),
+            ),
+            FollowingEditSlot(
+              tab: _tab,
+              editing: _editing,
+              favorites: widget.favoriteController,
+              selected: _selected,
+              actions: FollowingEditActions(
+                onToggleAll: _toggleAll,
+                onRemove: () => unawaited(_cancelSelected()),
+              ),
+            ),
           ],
         ),
       ),
@@ -297,7 +300,7 @@ class _FollowingPageState extends State<FollowingPage> {
     final tab = FollowingTab.values[index];
     _leaveEditing();
     _tab.value = tab;
-    if (tab == FollowingTab.history && _auth.isSignedIn) {
+    if (tab == FollowingTab.history) {
       unawaited(_history.load());
     }
   }
@@ -402,7 +405,11 @@ class _HistoryList extends StatelessWidget {
 
                 return FollowingHistoryCard(
                   dramaId: record.dramaId,
-                  title: _historyTitle(l10n, record),
+                  title: _historyTitle(
+                    l10n,
+                    record,
+                    Localizations.localeOf(context).languageCode,
+                  ),
                   posterUrl: record.displayCover,
                   viewCount:
                       record.progress.viewCount ??
@@ -433,10 +440,13 @@ class _HistoryList extends StatelessWidget {
   }
 }
 
-String _historyTitle(AppLocalizations l10n, WatchRecord record) {
-  return record.displayTitle.isEmpty
-      ? l10n.episodeLabel(record.episodeNumber)
-      : record.displayTitle;
+String _historyTitle(
+  AppLocalizations l10n,
+  WatchRecord record,
+  String languageCode,
+) {
+  final title = record.localizedDisplayTitle(languageCode);
+  return title.isEmpty ? l10n.episodeLabel(record.episodeNumber) : title;
 }
 
 String _historySubtitle(AppLocalizations l10n, WatchRecord record) {

lib/pages/following/following_paged_grid.dart

@@ -130,6 +130,8 @@ class FollowingPagedGrid extends StatelessWidget {
                   SliverToBoxAdapter(
                     child: PagedListFooter(
                       loading: loadingMore,
+                      hasMore: hasMore,
+                      hasItems: hasItems,
                       errorMessage: loadMoreError,
                       onRetry: onLoadMore,
                     ),

lib/pages/home/home_view.dart

@@ -7,6 +7,7 @@ import 'package:flutter/services.dart';
 import 'package:provider/provider.dart';
 
 import '../../core/config/app_config.dart';
+import '../../core/data/remote/catalog_api.dart';
 import '../../core/data/services/home_feed_controller.dart';
 import '../../core/data/services/catalog_controller.dart';
 import '../../core/data/services/category_controller.dart';
@@ -209,6 +210,7 @@ class _HomeTabsState extends State<_HomeTabs> {
   Widget _recommend(BuildContext context) {
     return RecommendPage(
       feedController: widget.feedController,
+      catalogApi: _catalogApi(context),
       active: logic.tab == 1,
       videoOnly: logic.videoImmersive,
       onImmersiveChanged: logic.onImmersiveChanged,
@@ -216,6 +218,14 @@ class _HomeTabsState extends State<_HomeTabs> {
     );
   }
 
+  CatalogApi? _catalogApi(BuildContext context) {
+    try {
+      return context.read<CatalogApi>();
+    } on ProviderNotFoundException {
+      return null;
+    }
+  }
+
   void _openSearch(BuildContext context) {
     Navigator.of(
       context,

lib/pages/home/widgets/home_category_dramas.dart

@@ -0,0 +1,178 @@
+// Author: fruit.com.cn
+
+import 'dart:async';
+
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+
+import '../../../core/data/models/drama.dart';
+import '../../../core/data/services/category_controller.dart';
+import '../../../core/theme/app_dimens.dart';
+import '../../../core/widgets/app_pull_to_refresh.dart';
+import '../../../core/widgets/drama_grid_skeleton.dart';
+import '../../../core/widgets/empty_state.dart';
+import '../../../core/widgets/paged_list_footer.dart';
+import '../../../l10n/app_localizations.dart';
+import 'home_feed_card.dart';
+
+const double _loadMoreThreshold = 240;
+
+/// 首页分类下的短剧：按分类分页，滑到底加载下一页。
+class HomeCategoryDramas extends StatefulWidget {
+  const HomeCategoryDramas({
+    super.key,
+    required this.onOpenDrama,
+    this.lockedCategoryId,
+  });
+
+  final ValueChanged<Drama> onOpenDrama;
+  final String? lockedCategoryId;
+
+  @override
+  State<HomeCategoryDramas> createState() => _HomeCategoryDramasState();
+}
+
+class _HomeCategoryDramasState extends State<HomeCategoryDramas> {
+  @override
+  void initState() {
+    super.initState();
+    WidgetsBinding.instance.addPostFrameCallback((_) => _ensureOpened());
+  }
+
+  @override
+  void didUpdateWidget(HomeCategoryDramas oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    if (oldWidget.lockedCategoryId != widget.lockedCategoryId) {
+      _ensureOpened();
+    }
+  }
+
+  void _ensureOpened() {
+    if (!mounted) return;
+    final controller = context.read<CategoryController>();
+    final locked = widget.lockedCategoryId;
+    if (locked == null || locked.isEmpty) return;
+    final slot = controller.slotOf(locked);
+    if (slot.loading || slot.pageIndex > 0) return;
+    unawaited(controller.openCategory(locked));
+  }
+
+  bool _onScroll(ScrollNotification notification) {
+    final categoryId = widget.lockedCategoryId;
+    if (categoryId == null || categoryId.isEmpty) return false;
+    if (notification.depth != 0) return false;
+    if (notification.metrics.extentAfter > _loadMoreThreshold) return false;
+    if (notification is! ScrollUpdateNotification &&
+        notification is! ScrollEndNotification &&
+        notification is! OverscrollNotification) {
+      return false;
+    }
+    unawaited(context.read<CategoryController>().loadMore(categoryId));
+    return false;
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final l10n = AppLocalizations.of(context)!;
+    final controller = context.watch<CategoryController>();
+    final categoryId = widget.lockedCategoryId ?? '';
+    final slot = categoryId.isEmpty ? null : controller.slotOf(categoryId);
+    final dramas = slot?.dramas ?? const <Drama>[];
+    return Column(
+      children: [
+        Expanded(
+          child: NotificationListener<ScrollNotification>(
+            onNotification: _onScroll,
+            child: AppPullToRefresh(
+              onRefresh: () async {
+                if (categoryId.isNotEmpty) {
+                  await controller.openCategory(categoryId);
+                }
+              },
+              child: _body(context, l10n, controller, categoryId, dramas),
+            ),
+          ),
+        ),
+      ],
+    );
+  }
+
+  Widget _body(
+    BuildContext context,
+    AppLocalizations l10n,
+    CategoryController controller,
+    String categoryId,
+    List<Drama> dramas,
+  ) {
+    final slot = categoryId.isEmpty ? null : controller.slotOf(categoryId);
+    if (slot != null && slot.loading && dramas.isEmpty) {
+      return const DramaGridSkeleton(
+        key: Key('home-grid-skeleton'),
+        columns: 3,
+        horizontalPadding: AppDimens.feedPageHorizontal,
+        crossAxisSpacing: AppDimens.homeGridGap,
+        mainAxisSpacing: AppDimens.homeGridRowGap,
+      );
+    }
+    if (dramas.isEmpty) {
+      return EmptyState(
+        key: const Key('home-grid-empty'),
+        icon: Icons.movie_filter_outlined,
+        title: l10n.emptyContent,
+      );
+    }
+    return LayoutBuilder(
+      builder: (context, constraints) {
+        final itemWidth =
+            (constraints.maxWidth -
+                AppDimens.feedPageHorizontal * 2 -
+                AppDimens.homeGridGap * 2) /
+            3;
+        final itemExtent =
+            itemWidth / AppDimens.cardCoverAspectRatio +
+            AppDimens.homeCardBodyExtent;
+        return CustomScrollView(
+          key: const Key('home-grid-scroll'),
+          physics: AppPullToRefresh.physics,
+          slivers: [
+            SliverPadding(
+              padding: const EdgeInsets.symmetric(
+                horizontal: AppDimens.feedPageHorizontal,
+              ),
+              sliver: SliverGrid(
+                key: const Key('home-grid-cards'),
+                gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
+                  crossAxisCount: 3,
+                  crossAxisSpacing: AppDimens.homeGridGap,
+                  mainAxisSpacing: AppDimens.homeGridRowGap,
+                  mainAxisExtent: itemExtent,
+                ),
+                delegate: SliverChildBuilderDelegate(
+                  (context, index) => HomeFeedCard(
+                    drama: dramas[index],
+                    onTap: () => widget.onOpenDrama(dramas[index]),
+                  ),
+                  childCount: dramas.length,
+                ),
+              ),
+            ),
+            SliverToBoxAdapter(
+              child: Padding(
+                padding: const EdgeInsets.only(bottom: AppDimens.spaceXl),
+                child: PagedListFooter(
+                  loading: slot != null && slot.loadingMore,
+                  hasMore: slot?.hasMore ?? false,
+                  hasItems: dramas.isNotEmpty,
+                  errorMessage: null,
+                  onRetry: () => context.read<CategoryController>().loadMore(
+                    categoryId,
+                  ),
+                ),
+              ),
+            ),
+          ],
+        );
+      },
+    );
+  }
+}

lib/pages/home/widgets/home_drama_grid.dart

@@ -99,9 +99,9 @@ class HomeDramaCard extends StatelessWidget {
               children: [
                 _cover(),
                 const SizedBox(height: _coverTitleGap),
-                _title(),
+                _title(context),
                 const SizedBox(height: _lineGap),
-                _genre(),
+                _genre(context),
                 const SizedBox(height: _lineGap),
                 _metadata(),
               ],
@@ -211,9 +211,9 @@ class HomeDramaCard extends StatelessWidget {
     );
   }
 
-  Widget _title() {
+  Widget _title(BuildContext context) {
     return Text(
-      drama.title,
+      drama.localizedTitle(Localizations.localeOf(context).languageCode),
       key: Key('home-drama-title-${drama.id}'),
       maxLines: 1,
       overflow: TextOverflow.ellipsis,
@@ -225,8 +225,11 @@ class HomeDramaCard extends StatelessWidget {
     );
   }
 
-  Widget _genre() {
-    final genre = drama.genre.isEmpty ? drama.category : drama.genre;
+  Widget _genre(BuildContext context) {
+    final labels = drama.localizedTypeLabels(Localizations.localeOf(context).languageCode);
+    final genre = labels.isEmpty
+        ? (drama.genre.isEmpty ? drama.category : drama.genre)
+        : labels.join(' / ');
     return Text(
       genre.isEmpty ? l10n.videoPending : genre,
       key: Key('home-drama-genre-${drama.id}'),

lib/pages/home/widgets/home_feed_card.dart

@@ -8,28 +8,21 @@ import '../../../core/theme/app_dimens.dart';
 import '../../../core/widgets/cover_play_count.dart';
 import '../../../core/widgets/drama_cover_badge_ribbon.dart';
 import '../../../core/widgets/remote_image.dart';
-import '../../../l10n/app_localizations.dart';
-import 'home_drama_classification.dart';
 
 final RegExp _tagSplitter = RegExp(r'[,/、·]');
 
-enum HomeDramaBadge { hot, newRelease, anime }
-
 class HomeFeedCard extends StatelessWidget {
   const HomeFeedCard({
     super.key,
     required this.drama,
     required this.onTap,
-    this.now,
   });
 
   final Drama drama;
   final VoidCallback onTap;
-  final DateTime? now;
 
   @override
   Widget build(BuildContext context) {
-    final l10n = AppLocalizations.of(context)!;
     return Material(
       key: Key('home-feed-card-${drama.id}'),
       color: AppColors.transparent,
@@ -40,7 +33,7 @@ class HomeFeedCard extends StatelessWidget {
           crossAxisAlignment: CrossAxisAlignment.start,
           mainAxisAlignment: MainAxisAlignment.start,
           children: [
-            _cover(l10n),
+            _cover(context),
             Expanded(
               child: Padding(
                 padding: const EdgeInsets.only(
@@ -51,7 +44,7 @@ class HomeFeedCard extends StatelessWidget {
                   mainAxisAlignment: MainAxisAlignment.start,
                   children: [
                     Text(
-                      drama.title,
+                      drama.localizedTitle(Localizations.localeOf(context).languageCode),
                       key: Key('home-feed-title-${drama.id}'),
                       maxLines: 2,
                       overflow: TextOverflow.ellipsis,
@@ -64,7 +57,7 @@ class HomeFeedCard extends StatelessWidget {
                       ),
                     ),
                     const SizedBox(height: AppDimens.cardTitleTagGap),
-                    _tags(),
+                    _tags(context),
                   ],
                 ),
               ),
@@ -75,8 +68,8 @@ class HomeFeedCard extends StatelessWidget {
     );
   }
 
-  Widget _cover(AppLocalizations l10n) {
-    final badge = _badge();
+  Widget _cover(BuildContext context) {
+    final label = drama.localizedTag(Localizations.localeOf(context).languageCode);
     return ClipRRect(
       key: Key('home-feed-cover-clip-${drama.id}'),
       borderRadius: BorderRadius.circular(AppDimens.cardCoverRadius),
@@ -92,14 +85,14 @@ class HomeFeedCard extends StatelessWidget {
               showFallbackIcon: true,
               fallbackColor: AppColors.contentSurface,
             ),
-            if (badge != null)
+            if (label.isNotEmpty)
               Positioned(
                 top: 0,
                 right: 0,
                 child: DramaCoverBadgeRibbon(
-                  label: _badgeLabel(l10n, badge),
-                  color: _badgeColor(badge),
-                  keyPrefix: '${drama.id}-${badge.name}',
+                  label: label,
+                  color: drama.tagRibbonColor(AppColors.badgeHot),
+                  keyPrefix: '${drama.id}-tag',
                 ),
               ),
             const Positioned(
@@ -122,35 +115,8 @@ class HomeFeedCard extends StatelessWidget {
     );
   }
 
-  HomeDramaBadge? _badge() {
-    if (drama.dramaType.toUpperCase() == 'ANIME') {
-      return HomeDramaBadge.anime;
-    }
-    if (isNewDrama(drama, now: now)) return HomeDramaBadge.newRelease;
-    if (isHotDrama(drama)) {
-      return HomeDramaBadge.hot;
-    }
-    return null;
-  }
-
-  String _badgeLabel(AppLocalizations l10n, HomeDramaBadge badge) {
-    return switch (badge) {
-      HomeDramaBadge.hot => l10n.homeBadgeHot,
-      HomeDramaBadge.newRelease => l10n.homeBadgeNew,
-      HomeDramaBadge.anime => l10n.homeBadgeAnime,
-    };
-  }
-
-  Color _badgeColor(HomeDramaBadge badge) {
-    return switch (badge) {
-      HomeDramaBadge.hot => AppColors.badgeHot,
-      HomeDramaBadge.newRelease => AppColors.badgeNew,
-      HomeDramaBadge.anime => AppColors.badgeAnime,
-    };
-  }
-
-  Widget _tags() {
-    final tags = _cardTags();
+  Widget _tags(BuildContext context) {
+    final tags = _cardTags(context);
     if (tags.isEmpty) return const SizedBox.shrink();
     return Text(
       tags.join(' | '),
@@ -166,7 +132,9 @@ class HomeFeedCard extends StatelessWidget {
     );
   }
 
-  List<String> _cardTags() {
+  List<String> _cardTags(BuildContext context) {
+    final localized = drama.localizedTypeLabels(Localizations.localeOf(context).languageCode);
+    if (localized.isNotEmpty) return localized.take(3).toList(growable: false);
     final seen = <String>{};
     return [drama.genre, drama.category]
         .expand((value) => value.split(_tagSplitter))

lib/pages/home/widgets/home_feed_grid.dart

@@ -14,20 +14,16 @@ import '../../../core/data/services/home_feed_controller.dart';
 import '../../../core/data/services/wallet_controller.dart';
 import '../../../core/theme/app_colors.dart';
 import '../../../core/theme/app_dimens.dart';
-import '../../../core/theme/app_theme.dart';
 import '../../../core/widgets/app_pull_to_refresh.dart';
 import '../../../core/widgets/drama_grid_skeleton.dart';
 import '../../../core/widgets/empty_state.dart';
 import '../../../core/widgets/paged_list_footer.dart';
 import '../../../l10n/app_localizations.dart';
-import '../../ranking/ranking_page.dart';
-import 'home_drama_classification.dart';
+import 'home_category_dramas.dart';
 import 'home_feed_card.dart';
 import 'home_grid_header.dart';
 
 const double _loadMoreThreshold = 240;
-const List<String> _costumeAliases = ['古装', 'costume', 'period'];
-const List<String> _communityAliases = ['社群', 'community', 'komunitas'];
 
 class HomeFeedGrid extends StatefulWidget {
   const HomeFeedGrid({
@@ -46,21 +42,15 @@ class HomeFeedGrid extends StatefulWidget {
 }
 
 class _HomeFeedGridState extends State<HomeFeedGrid> {
-  HomePrimaryTab _selectedPrimary = HomePrimaryTab.featured;
+  int _sectionIndex = 0;
   final PageController _pageController = PageController();
-  final Map<HomePrimaryTab, ScrollController> _scrollControllers = {
-    for (final tab in HomePrimaryTab.values) tab: ScrollController(),
-  };
-  final Map<HomePrimaryTab, String?> _selectedTags = {
-    for (final tab in HomePrimaryTab.values) tab: null,
-  };
 
   @override
   void initState() {
     super.initState();
     WidgetsBinding.instance.addPostFrameCallback((_) {
       if (mounted && _pageController.hasClients) {
-        _pageController.jumpToPage(_selectedPrimary.index);
+        _pageController.jumpToPage(_sectionIndex);
       }
     });
   }
@@ -68,9 +58,6 @@ class _HomeFeedGridState extends State<HomeFeedGrid> {
   @override
   void dispose() {
     _pageController.dispose();
-    for (final controller in _scrollControllers.values) {
-      controller.dispose();
-    }
     super.dispose();
   }
 
@@ -81,17 +68,16 @@ class _HomeFeedGridState extends State<HomeFeedGrid> {
     final catalog = context.watch<CatalogController>();
     final auth = context.watch<AuthController>();
     final wallet = context.watch<WalletController>();
-    final shortcuts = _categoryShortcuts(categories, l10n);
+    final shortcuts = _categoryShortcuts(
+      categories,
+      Localizations.localeOf(context).languageCode,
+    );
     final walletBadge = auth.isSignedIn && wallet.snapshot != null
         ? wallet.balance
         : null;
-    final ranking = _selectedPrimary == HomePrimaryTab.ranking;
     return DecoratedBox(
       key: const Key('home-grid'),
-      decoration: BoxDecoration(
-        color: ranking ? null : AppColors.appBackground,
-        gradient: ranking ? AppTheme.pageGradient : null,
-      ),
+      decoration: const BoxDecoration(color: AppColors.appBackground),
       child: SafeArea(
         bottom: false,
         child: Column(
@@ -100,8 +86,8 @@ class _HomeFeedGridState extends State<HomeFeedGrid> {
             HomeGridHeader(
               callbacks: widget.callbacks,
               categories: shortcuts,
-              selectedPrimary: _selectedPrimary,
-              onPrimarySelected: _selectPrimary,
+              selectedIndex: _sectionIndex,
+              onSectionSelected: _selectSection,
               walletBadge: walletBadge,
             ),
             Expanded(
@@ -110,22 +96,30 @@ class _HomeFeedGridState extends State<HomeFeedGrid> {
                 builder: (context, _) => PageView.builder(
                   key: const Key('home-primary-page-view'),
                   controller: _pageController,
-                  itemCount: HomePrimaryTab.values.length,
-                  onPageChanged: (index) => setState(
-                    () => _selectedPrimary = HomePrimaryTab.values[index],
-                  ),
-                  itemBuilder: (context, index) => _KeepAlivePage(
-                    key: PageStorageKey(
-                      'home-primary-page-${HomePrimaryTab.values[index].name}',
-                    ),
-                    child: _tabGrid(
-                      context,
-                      l10n,
-                      tab: HomePrimaryTab.values[index],
-                      catalog: catalog,
-                      shortcuts: shortcuts,
-                    ),
-                  ),
+                  itemCount: shortcuts.isEmpty ? 1 : shortcuts.length,
+                  onPageChanged: (index) =>
+                      setState(() => _sectionIndex = index),
+                  itemBuilder: (context, index) {
+                    if (shortcuts.isEmpty) {
+                      return _categoryPlaceholder(
+                        l10n,
+                        context.watch<CategoryController>(),
+                        catalog,
+                      );
+                    }
+                    final category = shortcuts[index];
+                    return _KeepAlivePage(
+                      key: PageStorageKey(
+                        'home-primary-page-${category.categoryId}',
+                      ),
+                      child: _tabGrid(
+                        context,
+                        l10n,
+                        category: category,
+                        catalog: catalog,
+                      ),
+                    );
+                  },
                 ),
               ),
             ),
@@ -135,28 +129,58 @@ class _HomeFeedGridState extends State<HomeFeedGrid> {
     );
   }
 
-  void _selectPrimary(HomePrimaryTab tab) {
-    if (tab == _selectedPrimary) return;
+  void _selectSection(int index) {
+    if (index == _sectionIndex) return;
     if (!_pageController.hasClients) {
-      setState(() => _selectedPrimary = tab);
+      setState(() => _sectionIndex = index);
       return;
     }
     unawaited(
       _pageController.animateToPage(
-        tab.index,
+        index,
         duration: AppDimens.homePrimaryTabAnimationDuration,
         curve: Curves.easeOut,
       ),
     );
   }
 
+  Widget _categoryPlaceholder(
+    AppLocalizations l10n,
+    CategoryController controller,
+    CatalogController catalog,
+  ) {
+    if (catalog.error != null) {
+      return _catalogErrorState(l10n, catalog);
+    }
+    if (controller.loading) {
+      return const DramaGridSkeleton(
+        key: Key('home-grid-skeleton'),
+        columns: 3,
+        horizontalPadding: AppDimens.feedPageHorizontal,
+        crossAxisSpacing: AppDimens.homeGridGap,
+        mainAxisSpacing: AppDimens.homeGridRowGap,
+      );
+    }
+    return EmptyState(
+      key: const Key('home-grid-empty'),
+      icon: Icons.movie_filter_outlined,
+      title: l10n.emptyContent,
+    );
+  }
+
   Widget _tabGrid(
     BuildContext context,
     AppLocalizations l10n, {
-    required HomePrimaryTab tab,
+    required HomeGridCategoryShortcut category,
     required CatalogController catalog,
-    required List<HomeGridCategoryShortcut> shortcuts,
   }) {
+    final controller = context.read<CategoryController>();
+    if (controller.dramaPageLoader != null && category.categoryId.isNotEmpty) {
+      return HomeCategoryDramas(
+        lockedCategoryId: category.categoryId,
+        onOpenDrama: widget.onOpenDrama,
+      );
+    }
     if (catalog.error != null && widget.feedController.dramas.isEmpty) {
       return _catalogErrorState(l10n, catalog);
     }
@@ -170,11 +194,7 @@ class _HomeFeedGridState extends State<HomeFeedGrid> {
         mainAxisSpacing: AppDimens.homeGridRowGap,
       );
     }
-    if (tab == HomePrimaryTab.ranking) {
-      return const RankingPage(embedded: true);
-    }
-    final tag = _selectedTags[tab];
-    final dramas = _dramasFor(tab, tag, shortcuts);
+    final dramas = _dramasFor(category);
     if (widget.feedController.loadingFirstPage && dramas.isEmpty) {
       return const DramaGridSkeleton(
         key: Key('home-grid-skeleton'),
@@ -201,7 +221,7 @@ class _HomeFeedGridState extends State<HomeFeedGrid> {
             onRefresh: _refresh,
             child: CustomScrollView(
               key: const Key('home-grid-scroll'),
-              controller: _scrollControllers[tab],
+              controller: null,
               physics: AppPullToRefresh.physics,
               slivers: [
                 if (dramas.isEmpty)
@@ -237,6 +257,8 @@ class _HomeFeedGridState extends State<HomeFeedGrid> {
                       padding: const EdgeInsets.only(bottom: AppDimens.spaceXl),
                       child: PagedListFooter(
                         loading: widget.feedController.loadingMore,
+                        hasMore: widget.feedController.hasMore,
+                        hasItems: true,
                         errorMessage: widget.feedController.lastError == null
                             ? null
                             : l10n.catalogError,
@@ -289,75 +311,31 @@ class _HomeFeedGridState extends State<HomeFeedGrid> {
 
   List<HomeGridCategoryShortcut> _categoryShortcuts(
     List<ContentCategory> categories,
-    AppLocalizations l10n,
+    String languageCode,
   ) {
-    final costume = _findCategory(categories, _costumeAliases);
-    final community = _findCategory(categories, _communityAliases);
     return [
-      HomeGridCategoryShortcut(
-        label: l10n.homeSectionCostume,
-        categoryName: costume?.name ?? '',
-        tab: HomePrimaryTab.costume,
-      ),
-      HomeGridCategoryShortcut(
-        label: l10n.homeSectionCommunity,
-        categoryName: community?.name ?? '',
-        tab: HomePrimaryTab.community,
-      ),
+      for (final category in categories)
+        HomeGridCategoryShortcut(
+          label: category.localizedName(languageCode),
+          categoryName: category.name,
+          categoryId: category.id,
+          tab: HomePrimaryTab.categories,
+        ),
     ];
   }
 
-  ContentCategory? _findCategory(
-    List<ContentCategory> categories,
-    List<String> aliases,
-  ) {
-    for (final category in categories) {
-      final name = category.name.toLowerCase();
-      if (aliases.any(name.contains)) return category;
-    }
-    return null;
-  }
-
-  List<Drama> _dramasFor(
-    HomePrimaryTab tab,
-    String? tag,
-    List<HomeGridCategoryShortcut> shortcuts,
-  ) {
-    Iterable<Drama> source = widget.feedController.dramas;
-    if (tab == HomePrimaryTab.costume || tab == HomePrimaryTab.community) {
-      final categoryName = shortcuts
-          .firstWhere((shortcut) => shortcut.tab == tab)
-          .categoryName
-          .toLowerCase();
-      if (categoryName.isEmpty) return const [];
-      source = source.where(
-        (drama) =>
-            drama.category.toLowerCase().contains(categoryName) ||
-            drama.genre.toLowerCase().contains(categoryName),
-      );
-    }
-    if (tag != null) {
-      source = source.where((drama) => matchesHomeTag(drama, tag));
-    }
-    final dramas = source.toList(growable: false);
-    switch (tab) {
-      case HomePrimaryTab.newReleases:
-        return [...dramas]..sort((a, b) {
-          final left = publishedAtForDrama(a);
-          final right = publishedAtForDrama(b);
-          if (left == null && right == null) return b.id.compareTo(a.id);
-          if (left == null) return 1;
-          if (right == null) return -1;
-          return right.compareTo(left);
-        });
-      case HomePrimaryTab.ranking:
-        return [...dramas]..sort((a, b) => b.viewCount.compareTo(a.viewCount));
-      case HomePrimaryTab.featured:
-      case HomePrimaryTab.categories:
-      case HomePrimaryTab.costume:
-      case HomePrimaryTab.community:
-        return dramas;
-    }
+  List<Drama> _dramasFor(HomeGridCategoryShortcut category) {
+    final dramas = widget.feedController.dramas;
+    final categoryName = category.categoryName.toLowerCase();
+    if (categoryName.isEmpty) return dramas;
+    final matched = dramas
+        .where(
+          (drama) =>
+              drama.category.toLowerCase().contains(categoryName) ||
+              drama.genre.toLowerCase().contains(categoryName),
+        )
+        .toList(growable: false);
+    return matched.isEmpty ? dramas : matched;
   }
 
   Widget _emptyState(AppLocalizations l10n) {

lib/pages/home/widgets/home_grid_header.dart

@@ -20,11 +20,13 @@ class HomeGridCategoryShortcut {
   const HomeGridCategoryShortcut({
     required this.label,
     required this.categoryName,
+    required this.categoryId,
     required this.tab,
   });
 
   final String label;
   final String categoryName;
+  final String categoryId;
   final HomePrimaryTab tab;
 }
 
@@ -47,15 +49,15 @@ class HomeGridHeader extends StatelessWidget {
     super.key,
     required this.callbacks,
     required this.categories,
-    required this.selectedPrimary,
-    required this.onPrimarySelected,
+    required this.selectedIndex,
+    required this.onSectionSelected,
     this.walletBadge,
   });
 
   final HomeGridCallbacks callbacks;
   final List<HomeGridCategoryShortcut> categories;
-  final HomePrimaryTab selectedPrimary;
-  final ValueChanged<HomePrimaryTab> onPrimarySelected;
+  final int selectedIndex;
+  final ValueChanged<int> onSectionSelected;
   final int? walletBadge;
 
   @override
@@ -67,7 +69,7 @@ class HomeGridHeader extends StatelessWidget {
       mainAxisAlignment: MainAxisAlignment.start,
       children: [
         _searchRow(l10n),
-        _primaryRow(l10n),
+        _primaryRow(),
         const SizedBox(height: AppDimens.homeSecondaryGridGap),
       ],
     );
@@ -225,7 +227,73 @@ class HomeGridHeader extends StatelessWidget {
     );
   }
 
-  Widget _primaryRow(AppLocalizations l10n) {
+  Widget _primaryRow() {
+    return _CategoryBar(
+      categories: categories,
+      selectedIndex: selectedIndex,
+      onSectionSelected: onSectionSelected,
+    );
+  }
+}
+
+class _CategoryBar extends StatefulWidget {
+  const _CategoryBar({
+    required this.categories,
+    required this.selectedIndex,
+    required this.onSectionSelected,
+  });
+
+  final List<HomeGridCategoryShortcut> categories;
+  final int selectedIndex;
+  final ValueChanged<int> onSectionSelected;
+
+  @override
+  State<_CategoryBar> createState() => _CategoryBarState();
+}
+
+class _CategoryBarState extends State<_CategoryBar> {
+  final List<GlobalKey> _itemKeys = [];
+
+  @override
+  void initState() {
+    super.initState();
+    _syncKeys();
+    WidgetsBinding.instance.addPostFrameCallback((_) => _revealSelected());
+  }
+
+  @override
+  void didUpdateWidget(_CategoryBar oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    if (oldWidget.categories.length != widget.categories.length) {
+      _syncKeys();
+    }
+    if (oldWidget.selectedIndex != widget.selectedIndex ||
+        oldWidget.categories.length != widget.categories.length) {
+      WidgetsBinding.instance.addPostFrameCallback((_) => _revealSelected());
+    }
+  }
+
+  void _syncKeys() {
+    _itemKeys
+      ..clear()
+      ..addAll(List.generate(widget.categories.length, (_) => GlobalKey()));
+  }
+
+  void _revealSelected() {
+    final index = widget.selectedIndex;
+    if (!mounted || index < 0 || index >= _itemKeys.length) return;
+    final target = _itemKeys[index].currentContext;
+    if (target == null) return;
+    Scrollable.ensureVisible(
+      target,
+      alignment: 0.5,
+      duration: AppDimens.homePrimaryTabAnimationDuration,
+      curve: Curves.easeOut,
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
     return SingleChildScrollView(
       key: const Key('home-primary-sections'),
       scrollDirection: Axis.horizontal,
@@ -234,60 +302,29 @@ class HomeGridHeader extends StatelessWidget {
       ),
       child: Row(
         crossAxisAlignment: CrossAxisAlignment.start,
-        mainAxisAlignment: MainAxisAlignment.start,
         children: [
-          _primaryItem(
-            key: const Key('home-section-featured'),
-            label: l10n.homeSectionFeatured,
-            tab: HomePrimaryTab.featured,
-          ),
-          _primaryItem(
-            key: const Key('home-section-new'),
-            label: l10n.homeSectionNew,
-            tab: HomePrimaryTab.newReleases,
-          ),
-          _primaryItem(
-            key: const Key('home-section-categories'),
-            label: l10n.homeSectionCategories,
-            tab: HomePrimaryTab.categories,
-          ),
-          _primaryItem(
-            key: const Key('home-section-ranking'),
-            label: l10n.homeSectionRanking,
-            tab: HomePrimaryTab.ranking,
-          ),
-          for (final category in categories)
-            _primaryItem(
-              key: Key(
-                category.categoryName.isEmpty
-                    ? 'home-section-${category.tab.name}'
-                    : 'home-section-category-${category.categoryName}',
-              ),
-              label: category.label,
-              tab: category.tab,
-            ),
+          for (var index = 0; index < widget.categories.length; index++)
+            _item(index),
         ],
       ),
     );
   }
 
-  Widget _primaryItem({
-    required Key key,
-    required String label,
-    required HomePrimaryTab tab,
-  }) {
-    final selected = selectedPrimary == tab;
+  Widget _item(int index) {
+    final category = widget.categories[index];
+    final selected = widget.selectedIndex == index;
     return InkWell(
-      key: key,
-      onTap: () => onPrimarySelected(tab),
+      key: _itemKeys[index],
+      onTap: () => widget.onSectionSelected(index),
       child: Padding(
+        key: Key('home-section-category-${category.categoryName}'),
         padding: const EdgeInsets.only(right: AppDimens.homePrimaryCategoryGap),
         child: SizedBox(
           height: AppDimens.homePrimaryRowHeight,
           child: Align(
             alignment: Alignment.bottomLeft,
             child: AnimatedDefaultTextStyle(
-              key: Key('home-primary-label-${tab.name}'),
+              key: Key('home-primary-label-${category.categoryId}'),
               duration: AppDimens.homePrimaryTabAnimationDuration,
               curve: Curves.easeOut,
               style: TextStyle(
@@ -300,7 +337,7 @@ class HomeGridHeader extends StatelessWidget {
                 fontWeight: selected ? FontWeight.w700 : FontWeight.w400,
                 letterSpacing: 0,
               ),
-              child: Text(label, textAlign: TextAlign.left),
+              child: Text(category.label, textAlign: TextAlign.left),
             ),
           ),
         ),

lib/pages/mine/mine_logic.dart

@@ -18,6 +18,7 @@ class MineLogic extends ChangeNotifier {
   bool recentLoading = false;
   String? recentError;
   bool _disposed = false;
+  int _requestSeq = 0;
 
   void notify() {
     if (!_disposed) notifyListeners();
@@ -25,21 +26,37 @@ class MineLogic extends ChangeNotifier {
 
   /// 最近观看：取分页首屏，剧名封面仍由目录卡片按 id 映射。
   Future<void> refreshRecent() async {
+    final request = ++_requestSeq;
     recentLoading = true;
     recentError = null;
     notify();
     try {
       final page = await history.recent(pageIndex: 1, pageSize: 10);
+      if (_disposed || request != _requestSeq) return;
       recent = page.list;
       watchRecordTotal = page.total;
     } catch (_) {
-      recentError = 'progressError';
+      if (!_disposed && request == _requestSeq) {
+        recentError = 'progressError';
+      }
     } finally {
-      recentLoading = false;
-      notify();
+      if (!_disposed && request == _requestSeq) {
+        recentLoading = false;
+        notify();
+      }
     }
   }
 
+  /// 切换账号/设备身份时先清空，避免旧身份数据回写或短暂混显。
+  void resetRecent() {
+    _requestSeq += 1;
+    recent = const [];
+    watchRecordTotal = null;
+    recentLoading = false;
+    recentError = null;
+    notify();
+  }
+
   /// 页面重新可见时刷新最近观看，避免停留在旧进度。
   void syncPage({required bool active, required bool wasActive}) {
     if (active && !wasActive) refreshRecent();

lib/pages/mine/mine_view.dart

@@ -6,8 +6,11 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:provider/provider.dart';
 
+import '../../core/data/models/drama.dart';
+import '../../core/data/models/watch_progress.dart';
 import '../../core/data/repositories/watch_history_repository.dart';
 import '../../core/data/services/auth_controller.dart';
+import '../../core/data/services/catalog_controller.dart';
 import '../../core/data/services/favorite_controller.dart';
 import '../../core/data/services/locale_controller.dart';
 import '../../core/data/services/wallet_controller.dart';
@@ -22,6 +25,7 @@ import '../downloads/downloads_page.dart';
 import '../account/account_profile_page.dart';
 import '../filter/filter_page.dart';
 import '../notices/notices_page.dart';
+import '../player/open_player.dart';
 import '../settings/settings_page.dart';
 import '../store/vip_page.dart';
 import '../wallet/wallet_page.dart';
@@ -53,25 +57,70 @@ class MyPage extends StatefulWidget {
 
 class _MyPageState extends State<MyPage> {
   late final MineLogic logic;
+  late final AuthController _auth;
+  late final FavoriteController _favorites;
+  late bool _wasSignedIn;
+  bool _activationRefreshScheduled = false;
 
   bool get embedded => widget.callbacks.embedded;
 
   @override
   void initState() {
     super.initState();
+    _auth = context.read<AuthController>();
+    _favorites = context.read<FavoriteController>();
+    _wasSignedIn = _auth.isSignedIn;
+    _auth.addListener(_onAuthChanged);
     logic = MineBinding().create(
       history: context.read<WatchHistoryRepository>(),
     );
+    if (widget.active) _scheduleFavoriteLoad();
   }
 
   @override
   void didUpdateWidget(covariant MyPage oldWidget) {
     super.didUpdateWidget(oldWidget);
-    logic.syncPage(active: widget.active, wasActive: oldWidget.active);
+    if (widget.active && !oldWidget.active) {
+      _scheduleActivationRefresh();
+    }
+  }
+
+  void _scheduleFavoriteLoad() {
+    if (_activationRefreshScheduled) return;
+    _activationRefreshScheduled = true;
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      _activationRefreshScheduled = false;
+      if (mounted) unawaited(_favorites.load());
+    });
+  }
+
+  void _scheduleActivationRefresh() {
+    if (_activationRefreshScheduled) return;
+    _activationRefreshScheduled = true;
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      _activationRefreshScheduled = false;
+      if (!mounted || !widget.active) return;
+      logic.syncPage(active: true, wasActive: false);
+      unawaited(_favorites.load());
+    });
+  }
+
+  void _onAuthChanged() {
+    final signedIn = _auth.isSignedIn;
+    if (signedIn == _wasSignedIn) return;
+    _wasSignedIn = signedIn;
+    logic.resetRecent();
+    _favorites.clear();
+    unawaited(_reloadForIdentity());
+  }
+
+  Future<void> _reloadForIdentity() async {
+    await Future.wait([logic.refreshRecent(), _favorites.load()]);
   }
 
   @override
   void dispose() {
+    _auth.removeListener(_onAuthChanged);
     logic.dispose();
     super.dispose();
   }
@@ -141,12 +190,14 @@ class _MyPageState extends State<MyPage> {
     final wallet = context.watch<WalletController>();
     final continueWatching = logic.recent.take(10).toList(growable: false);
     final followingCount =
-        auth.isSignedIn &&
-            favorites.error == null &&
-            !(favorites.loading && favorites.total == 0)
+        favorites.error == null && !(favorites.loading && favorites.total == 0)
         ? favorites.total
         : null;
-    final watchRecordCount = auth.isSignedIn ? logic.watchRecordTotal : null;
+    final watchRecordCount =
+        logic.recentError == null &&
+            !(logic.recentLoading && logic.watchRecordTotal == null)
+        ? logic.watchRecordTotal
+        : null;
     final coinBalance = auth.isSignedIn && wallet.snapshot != null
         ? wallet.balance
         : null;
@@ -175,6 +226,7 @@ class _MyPageState extends State<MyPage> {
           const SizedBox(height: AppDimens.mineSectionGap),
           MineContinueWatching(
             records: continueWatching,
+            onOpenRecord: _openContinueRecord,
             onOpenAll: _openHistoryTab,
           ),
         ],
@@ -216,7 +268,7 @@ class _MyPageState extends State<MyPage> {
   void _openDestination(MineDestination destination) {
     switch (destination) {
       case MineDestination.history:
-        _push(const WatchRecordsPage());
+        unawaited(_openHistoryPage());
       case MineDestination.downloads:
         _push(const DownloadsPage());
       case MineDestination.wallet:
@@ -244,15 +296,52 @@ class _MyPageState extends State<MyPage> {
       callback();
       return;
     }
-    _push(const WatchRecordsPage());
+    unawaited(_openHistoryPage());
   }
 
-  void _push(Widget page) {
-    Navigator.of(context).push<void>(MaterialPageRoute(builder: (_) => page));
+  /// 继续观看卡片：补齐剧集后直接进全屏播放页，播放器自己会定位到记录的秒数。
+  Future<void> _openContinueRecord(WatchProgress record) async {
+    final catalog = context.read<CatalogController>();
+    // 续看记录只有剧的概要信息，先拼一个占位对象让目录去取完整详情
+    final summary = Drama(
+      id: record.dramaId,
+      title: record.dramaTitle ?? '',
+      synopsis: '',
+      posterUrl: record.dramaCover ?? '',
+    );
+    Drama drama;
+    try {
+      drama = await catalog.requireDetail(summary);
+    } catch (_) {
+      if (!mounted) return;
+      final l10n = AppLocalizations.of(context)!;
+      ScaffoldMessenger.of(
+        context,
+      ).showSnackBar(SnackBar(content: Text(l10n.detailLoadFailed)));
+      return;
+    }
+    if (!mounted) return;
+    await playDramaFromCatalog(
+      context,
+      drama,
+      episodeId: record.episodeId.isEmpty ? null : record.episodeId,
+    );
+    if (mounted) unawaited(logic.refreshRecent());
+  }
+
+  Future<void> _openHistoryPage() async {
+    await _push(const WatchRecordsPage());
+    if (mounted) unawaited(logic.refreshRecent());
+  }
+
+  Future<void> _push(Widget page) {
+    return Navigator.of(
+      context,
+    ).push<void>(MaterialPageRoute(builder: (_) => page));
   }
 
   void _pushPlaceholder() {
-    _push(const _MinePlaceholderPage());
+    unawaited(_push(const _MinePlaceholderPage()));
   }
 
   Future<void> _openProtected(Widget page) async {
@@ -260,7 +349,7 @@ class _MyPageState extends State<MyPage> {
       await ensureSignedIn(context);
       return;
     }
-    if (mounted) _push(page);
+    if (mounted) await _push(page);
   }
 
   void _openVip() {

lib/pages/mine/widgets/mine_continue_watching.dart

@@ -12,10 +12,14 @@ class MineContinueWatching extends StatelessWidget {
   const MineContinueWatching({
     super.key,
     required this.records,
+    required this.onOpenRecord,
     required this.onOpenAll,
   });
 
   final List<WatchProgress> records;
+
+  /// 单张卡片：直接进入该剧的播放页，并定位到记录的集。
+  final ValueChanged<WatchProgress> onOpenRecord;
   final VoidCallback onOpenAll;
 
   @override
@@ -82,7 +86,11 @@ class MineContinueWatching extends StatelessWidget {
                 const SizedBox(width: AppDimens.spaceMd),
             itemBuilder: (_, index) {
               final record = visible[index];
-              return _card(l10n, record);
+              return _card(
+                l10n,
+                record,
+                Localizations.localeOf(context).languageCode,
+              );
             },
           ),
         ),
@@ -90,8 +98,12 @@ class MineContinueWatching extends StatelessWidget {
     );
   }
 
-  Widget _card(AppLocalizations l10n, WatchProgress record) {
-    final title = record.dramaTitle?.trim() ?? '';
+  Widget _card(
+    AppLocalizations l10n,
+    WatchProgress record,
+    String languageCode,
+  ) {
+    final title = record.localizedTitle(languageCode).trim();
     final episode = record.episodeNumber;
     final hasProgress = record.duration > Duration.zero;
     return SizedBox(
@@ -99,7 +111,7 @@ class MineContinueWatching extends StatelessWidget {
       child: InkWell(
         key: Key('mine-continue-${record.dramaId}'),
         borderRadius: BorderRadius.circular(AppDimens.homeCardRadius),
-        onTap: onOpenAll,
+        onTap: () => onOpenRecord(record),
         child: Column(
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [

lib/pages/new_releases/new_releases_page.dart

@@ -192,6 +192,8 @@ class _NewReleasesPageState extends State<NewReleasesPage> {
                                 ),
                                 PagedLoadFooter(
                                   loading: pager.loading,
+                                  hasMore: pager.hasMore,
+                                  hasItems: visible.isNotEmpty,
                                   loadMoreKey: const Key(
                                     'new-releases-load-more',
                                   ),
@@ -430,7 +432,7 @@ class _NewReleasesPageState extends State<NewReleasesPage> {
                 ),
               ),
             ),
-            const SizedBox(height: 6),
+            const SizedBox(height: 4),
             Text(
               drama.title,
               maxLines: 1,

lib/pages/notices/notices_page.dart

@@ -171,6 +171,17 @@ class _NoticesPageState extends State<NoticesPage> {
         label: Text(l10n.retry),
       );
     }
+    if (_controller.notices.isNotEmpty && !_controller.hasMore) {
+      return Padding(
+        key: const Key('paged-list-no-more'),
+        padding: const EdgeInsets.symmetric(vertical: 16),
+        child: Text(
+          l10n.noMoreItems,
+          textAlign: TextAlign.center,
+          style: const TextStyle(color: AppColors.textHint, fontSize: 12),
+        ),
+      );
+    }
     return const SizedBox.shrink();
   }
 

lib/pages/player/comments_auth.dart

@@ -1,24 +1,14 @@
 // Author: fruit.com.cn
 
 import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
 
 import '../../core/data/models/drama.dart';
-import '../../core/data/services/auth_controller.dart';
-import '../../core/widgets/auth_gate.dart';
 
-/// 评论入口统一登录闸：登录成功且页面仍存在时再打开评论面板。
-Future<void> openCommentsWithAuth(
+/// 评论列表与非付费互动均支持设备身份，不再把登录作为入口前置条件。
+Future<void> openComments(
   BuildContext context,
   Drama drama, {
   required Future<void> Function(BuildContext context, Drama drama) show,
 }) async {
-  final auth = context.read<AuthController>();
-  if (auth.isSignedIn) {
-    await show(context, drama);
-    return;
-  }
-  await ensureSignedIn(context);
-  if (!context.mounted || !auth.isSignedIn) return;
   await show(context, drama);
 }

lib/pages/player/player_binding.dart

@@ -15,6 +15,7 @@ class PlayerBinding {
     required PlaybackPositionCache positionCache,
     WalletController? wallet,
     DownloadController? downloads,
+    bool Function()? isSignedIn,
   }) => PlayerLogic(
     history: history,
     playback: playback,
@@ -22,5 +23,6 @@ class PlayerBinding {
     pictureInPicture: AndroidPictureInPicture(),
     wallet: wallet,
     downloads: downloads,
+    isSignedIn: isSignedIn,
   );
 }

lib/pages/player/player_logic.dart

@@ -2,12 +2,14 @@
 
 import 'dart:async';
 
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:video_player/video_player.dart';
 import 'package:flutter/scheduler.dart';
 import 'package:provider/provider.dart';
 
 import '../../core/data/models/drama.dart';
+import '../../core/data/models/episode_stats.dart';
 import '../../core/data/models/play_ticket.dart';
 import '../../core/data/models/watch_progress.dart';
 import '../../core/data/models/player_port.dart';
@@ -50,9 +52,13 @@ class PlayerLogic extends ChangeNotifier {
     this.downloads,
     PlaybackPositionCache? positionCache,
     Future<void> Function()? waitForFrame,
+    DateTime Function()? clock,
+    bool Function()? isSignedIn,
   }) : positionCache = positionCache ?? PlaybackPositionCache(),
        _waitForFrame =
-           waitForFrame ?? (() => WidgetsBinding.instance.endOfFrame);
+           waitForFrame ?? (() => WidgetsBinding.instance.endOfFrame),
+       _clock = clock ?? DateTime.now,
+       _isSignedIn = isSignedIn ?? (() => true);
 
   final WatchHistoryRepository history;
   final PlaybackRepository playback;
@@ -61,6 +67,8 @@ class PlayerLogic extends ChangeNotifier {
   final DownloadController? downloads;
   final PlaybackPositionCache positionCache;
   final Future<void> Function() _waitForFrame;
+  final DateTime Function() _clock;
+  final bool Function() _isSignedIn;
 
   late PageController pages;
   late PlaybackQueue queue;
@@ -93,13 +101,24 @@ class PlayerLogic extends ChangeNotifier {
   String selectedQuality = 'AUTO';
   Duration? _qualitySeek;
   int pageRequest = 0;
+  int? _pendingSelectionIndex;
+  int? _pendingSelectionRevision;
+  Future<void>? _selectionDrain;
   bool muted = false;
   double playbackSpeed = 1.0;
   bool stoppedAtFeedEnd = false;
+  Duration episodeStatsTtl = const Duration(seconds: 60);
+  ValueChanged<EpisodeStats>? onEpisodeStatsUpdated;
   VideoPlayerPort? scrubbingPlayer;
   bool pip = false;
   bool pipPreparing = false;
   final Map<String, int> pickedEpisode = {};
+  final Set<String> _unlockedEpisodeIds = {};
+  final Map<String, EpisodeStats> _episodeStats = {};
+  final Map<String, DateTime> _episodeStatsFetchedAt = {};
+  final Map<String, Future<void>> _episodeStatsInFlight = {};
+  final Map<String, int> _episodeStatsRevision = {};
+  final Map<String, int> _dramaStatsRevision = {};
 
   /// 解锁中的集 id 与失败文案；空表示没有进行中的解锁。
   String? unlockingEpisodeId;
@@ -163,6 +182,8 @@ class PlayerLogic extends ChangeNotifier {
     return fallback;
   }
 
+  EpisodeStats? episodeStats(String episodeId) => _episodeStats[episodeId];
+
   void notify() {
     if (!_disposed) notifyListeners();
   }
@@ -188,6 +209,7 @@ class PlayerLogic extends ChangeNotifier {
   void start({
     required PlayerFactory factory,
     required PlaybackCoordinator coordinator,
+    bool initialUserWantsPlay = true,
   }) {
     _started = true;
     _sessionFactory = factory;
@@ -205,7 +227,48 @@ class PlayerLogic extends ChangeNotifier {
       session.setRouteVisible(false);
     }
     unawaited(loadResumePoint());
-    unawaited(selectEpisode(initialIndex));
+    unawaited(
+      selectEpisode(
+        initialIndex,
+        userWantsPlay: initialUserWantsPlay ? null : false,
+      ),
+    );
+  }
+
+  /// 独立播放页覆盖首页时只暂停并保存进度，首页 session 与 controller 保持存活。
+  Future<void> pauseForFullPlayer() async {
+    if (!_started) return;
+    _logFeedHandoff('pause');
+    cancelScrub();
+    await session.pauseForRouteHandoff();
+    _logFeedHandoff('paused');
+  }
+
+  /// 独立播放页关闭并恢复首页路由后，等原生播放器实际恢复再结束交接。
+  Future<void> resumeAfterFullPlayer() async {
+    if (!_started) return;
+    _logFeedHandoff('resume');
+    if (visibleIndices.isNotEmpty) {
+      await session.resumeForRouteHandoff();
+    } else {
+      session.setRouteVisible(false);
+      await session.playbackSettled;
+    }
+    _logFeedHandoff('resumed');
+  }
+
+  void _logFeedHandoff(String phase) {
+    if (!kDebugMode) return;
+    final player = session.active;
+    final video = player is VideoPlayerPort ? player : null;
+    debugPrint(
+      '[feed-session] phase=$phase session=${identityHashCode(session)} '
+      'index=${session.currentIndex} episode=${session.currentEpisode.id} '
+      'controller=${video == null ? '-' : identityHashCode(video.controller)} '
+      'user=${session.userWantsPlay} routeVisible=${session.debugRouteVisible} '
+      'appResumed=${session.debugAppResumed} overlayOpen=${session.debugOverlayOpen} '
+      'live=${session.livePlayerCount}',
+    );
   }
 
   /// 串行替换首页 feed 队列；频道变化时重置到第 1 个，刷新时尽量保留当前剧。
@@ -238,11 +301,16 @@ class PlayerLogic extends ChangeNotifier {
       episodes: sessionEpisodes,
       factory: factory,
       // 地址只由后端下发（票据或详情里的免费集签名地址），拿不到地址即视为锁定
-      canPlay: (episode) => episode.videoUrl.isNotEmpty,
+      canPlay: (episode) =>
+          episode.videoUrl.isNotEmpty && !isEpisodeLocked(episode),
       prepare: preparePlayer,
       activate: activatePlayer,
       coordinator: coordinator,
       waitForFrame: _waitForFrame,
+      owner: homeMode ? PlaybackSessionOwner.home : PlaybackSessionOwner.player,
+      dramaIdAt: (index) => index >= 0 && index < queue.length
+          ? queue.entryAt(index).drama.id
+          : null,
     );
   }
 
@@ -299,6 +367,7 @@ class PlayerLogic extends ChangeNotifier {
       session.remapCurrentIndex(
         keepIndex,
         preloadIndex: nextVisibleIndex(keepIndex),
+        previousIndex: previousVisibleIndex(keepIndex),
       );
       _jumpToFeedPage(keepIndex);
       _notifyAfterFrameIfNeeded();
@@ -427,6 +496,7 @@ class PlayerLogic extends ChangeNotifier {
       final localPath = await downloads?.findLocalPath(episode.id);
       if (request != pageRequest) return false;
       if (localPath != null) {
+        _unlockedEpisodeIds.add(episode.id);
         blockedTicket = null;
         blockedEpisodeId = null;
         qualities = const [];
@@ -451,12 +521,14 @@ class PlayerLogic extends ChangeNotifier {
       final playUrl = preferred ?? ticket.playUrl;
       if (preferred == null) selectedQuality = 'AUTO';
       if (ticket.accessible && playUrl.isNotEmpty) {
+        _unlockedEpisodeIds.add(episode.id);
         // 签名地址原样写回，不做任何拼接/改写（AppConfig.mediaUrl 只补 host）
         sessionEpisodes[index] = episode.withVideoUrl(
           playUrl,
           likeCount: ticket.likeCount,
           commentCount: ticket.commentCount,
           thumbnailsUrl: ticket.thumbnailsUrl,
+          posterUrl: ticket.posterUrl,
         );
         return true;
       }
@@ -466,7 +538,7 @@ class PlayerLogic extends ChangeNotifier {
     } catch (exception) {
       if (request != pageRequest) return false;
       // 详情里已有可用地址（免费集）时降级继续，避免票据服务抖动就完全看不了
-      if (episode.videoUrl.isNotEmpty) {
+      if (episode.videoUrl.isNotEmpty && !isEpisodeLocked(episode)) {
         ticketError = null;
         return true;
       }
@@ -480,6 +552,160 @@ class PlayerLogic extends ChangeNotifier {
     }
   }
 
+  /// 当前集激活后刷新轻量互动计数；同集命中 TTL 或已有请求时不重复发请求。
+  Future<void> refreshEpisodeStats(int index) {
+    if (_disposed || index < 0 || index >= sessionEpisodes.length) {
+      return Future<void>.value();
+    }
+    final episodeId = sessionEpisodes[index].id;
+    final cached = _episodeStats[episodeId];
+    final fetchedAt = _episodeStatsFetchedAt[episodeId];
+    if (cached != null &&
+        fetchedAt != null &&
+        _clock().difference(fetchedAt) < episodeStatsTtl) {
+      _logEpisodeStatsRefresh(episodeId, cached: true);
+      onEpisodeStatsUpdated?.call(cached);
+      return Future<void>.value();
+    }
+    final inFlight = _episodeStatsInFlight[episodeId];
+    if (inFlight != null) {
+      _logEpisodeStatsRefresh(episodeId, cached: true, inFlight: true);
+      return inFlight;
+    }
+    _logEpisodeStatsRefresh(episodeId, cached: false);
+    final expectedDramaId = index < queue.length
+        ? queue.entryAt(index).drama.id
+        : '';
+    final episodeRevision = _episodeStatsRevision[episodeId] ?? 0;
+    final dramaRevision = _dramaStatsRevision[expectedDramaId] ?? 0;
+    late final Future<void> request;
+    request =
+        _fetchEpisodeStats(
+          episodeId,
+          expectedDramaId: expectedDramaId,
+          episodeRevision: episodeRevision,
+          dramaRevision: dramaRevision,
+        ).whenComplete(() {
+          if (identical(_episodeStatsInFlight[episodeId], request)) {
+            _episodeStatsInFlight.remove(episodeId);
+          }
+        });
+    _episodeStatsInFlight[episodeId] = request;
+    return request;
+  }
+
+  Future<void> _fetchEpisodeStats(
+    String episodeId, {
+    required String expectedDramaId,
+    required int episodeRevision,
+    required int dramaRevision,
+  }) async {
+    try {
+      final fetched = await playback.episodeStats(episodeId);
+      if (_disposed) return;
+      if ((_episodeStatsRevision[episodeId] ?? 0) != episodeRevision ||
+          (_dramaStatsRevision[expectedDramaId] ?? 0) != dramaRevision) {
+        if (kDebugMode) {
+          debugPrint(
+            '[player] phase=episode-stats-discarded episodeId=$episodeId '
+            'reason=local-state-newer',
+          );
+        }
+        return;
+      }
+      final stats = fetched.copyWith(
+        dramaId: fetched.dramaId.isEmpty ? expectedDramaId : fetched.dramaId,
+      );
+      _episodeStats[episodeId] = stats;
+      _episodeStatsFetchedAt[episodeId] = _clock();
+      final episodeIndex = sessionEpisodes.indexWhere(
+        (episode) => episode.id == episodeId,
+      );
+      if (episodeIndex >= 0) {
+        sessionEpisodes[episodeIndex] = sessionEpisodes[episodeIndex].withStats(
+          likeCount: stats.likeCount,
+          commentCount: stats.commentCount,
+        );
+      }
+      onEpisodeStatsUpdated?.call(stats);
+      notify();
+    } catch (_) {
+      // 统计接口只负责校准计数，失败时保留播放与旧值。
+    }
+  }
+
+  void _logEpisodeStatsRefresh(
+    String episodeId, {
+    required bool cached,
+    bool inFlight = false,
+  }) {
+    if (!kDebugMode) return;
+    debugPrint(
+      '[player] phase=episode-stats-refresh episodeId=$episodeId '
+      'cached=${cached ? 1 : 0}${inFlight ? ' inFlight=1' : ''}',
+    );
+  }
+
+  /// 点赞成功后同步本地统计快照，避免切回时被旧缓存覆盖。
+  void applyEpisodeLikeState(
+    String episodeId, {
+    required bool liked,
+    required int likeCount,
+  }) {
+    _episodeStatsRevision.update(
+      episodeId,
+      (value) => value + 1,
+      ifAbsent: () => 1,
+    );
+    final stats = _episodeStats[episodeId];
+    if (stats != null) {
+      _episodeStats[episodeId] = stats.copyWith(
+        liked: liked,
+        likeCount: likeCount,
+      );
+    }
+    final index = sessionEpisodes.indexWhere(
+      (episode) => episode.id == episodeId,
+    );
+    if (index >= 0) {
+      sessionEpisodes[index] = sessionEpisodes[index].withStats(
+        likeCount: likeCount,
+      );
+    }
+    notify();
+  }
+
+  /// 评论面板关闭后同步评论数。
+  void applyEpisodeCommentCount(String episodeId, int commentCount) {
+    _episodeStatsRevision.update(
+      episodeId,
+      (value) => value + 1,
+      ifAbsent: () => 1,
+    );
+    final stats = _episodeStats[episodeId];
+    if (stats != null) {
+      _episodeStats[episodeId] = stats.copyWith(commentCount: commentCount);
+    }
+    final index = sessionEpisodes.indexWhere(
+      (episode) => episode.id == episodeId,
+    );
+    if (index >= 0) {
+      sessionEpisodes[index] = sessionEpisodes[index].withStats(
+        commentCount: commentCount,
+      );
+    }
+    notify();
+  }
+
+  /// 收藏成功后让旧 stats 请求失效，计数本身只写 FavoriteController。
+  void markDramaFavoriteChanged(String dramaId) {
+    _dramaStatsRevision.update(
+      dramaId,
+      (value) => value + 1,
+      ifAbsent: () => 1,
+    );
+  }
+
   String _fileUrl(String path) =>
       path.startsWith('file:') ? path : Uri.file(path).toString();
 
@@ -530,6 +756,7 @@ class PlayerLogic extends ChangeNotifier {
       if (done.isCompleted) return;
       if (value.hasError || !value.isBuffering) done.complete();
     }
+
     controller.addListener(onChange);
     try {
       await done.future.timeout(const Duration(seconds: 4));
@@ -551,7 +778,10 @@ class PlayerLogic extends ChangeNotifier {
   /// 金币解锁当前集；成功后强制刷新票据并直接起播。
   Future<bool> unlockEpisode(int index) async {
     final service = wallet;
-    if (service == null || index < 0 || index >= sessionEpisodes.length) {
+    if (service == null ||
+        !_isSignedIn() ||
+        index < 0 ||
+        index >= sessionEpisodes.length) {
       return false;
     }
     final episode = sessionEpisodes[index];
@@ -564,9 +794,10 @@ class PlayerLogic extends ChangeNotifier {
         unlockError = service.unlockError;
         return false;
       }
+      _unlockedEpisodeIds.add(episode.id);
       final ready = await ensureTicket(index, forceRefresh: true);
       if (ready) {
-        await session.select(index, preloadIndex: nextVisibleIndex(index));
+        await _selectVisible(index);
       }
       return ready;
     } finally {
@@ -949,7 +1180,43 @@ class PlayerLogic extends ChangeNotifier {
     );
   }
 
-  Future<void> selectEpisode(int index, {int? revision}) async {
+  /// 翻页入口使用 single-flight：执行中的切集不被重复排队，只保留最新目标。
+  Future<void> requestEpisodeSelection(int index, {int? revision}) {
+    if (_disposed || index < 0 || index >= sessionEpisodes.length) {
+      return Future<void>.value();
+    }
+    _pendingSelectionIndex = index;
+    _pendingSelectionRevision = revision;
+    return _selectionDrain ??= _drainEpisodeSelections();
+  }
+
+  Future<void> _drainEpisodeSelections() async {
+    try {
+      while (!_disposed) {
+        final index = _pendingSelectionIndex;
+        if (index == null) break;
+        final revision = _pendingSelectionRevision;
+        _pendingSelectionIndex = null;
+        _pendingSelectionRevision = null;
+        await selectEpisode(index, revision: revision);
+      }
+    } finally {
+      _selectionDrain = null;
+      final index = _pendingSelectionIndex;
+      if (!_disposed && index != null) {
+        unawaited(
+          requestEpisodeSelection(index, revision: _pendingSelectionRevision),
+        );
+      }
+    }
+  }
+
+  Future<void> selectEpisode(
+    int index, {
+    int? revision,
+    bool? userWantsPlay,
+  }) async {
+    if (index < 0 || index >= sessionEpisodes.length) return;
     final feedRevisionAtStart = revision ?? feedRevision;
     final request = ++pageRequest;
     cancelScrub();
@@ -960,6 +1227,26 @@ class PlayerLogic extends ChangeNotifier {
         !isMounted()) {
       return;
     }
+    final episode = sessionEpisodes[index];
+    if (isEpisodeLocked(episode)) {
+      blockedTicket = null;
+      blockedEpisodeId = episode.id;
+      ticketError = null;
+      await session.selectLocked(
+        index,
+        preloadIndex: nextVisibleIndex(index),
+        previousIndex: previousVisibleIndex(index),
+      );
+      if (request != pageRequest ||
+          feedRevisionAtStart != feedRevision ||
+          !isMounted()) {
+        return;
+      }
+      if (!_isSignedIn()) {
+        unawaited(refreshEpisodeStats(index));
+        return;
+      }
+    }
     // 起播前先要票据：拿不到就不起播，交给三态 UI 提示（失败可重试）
     final ready = await ensureTicket(index);
     if (request != pageRequest ||
@@ -967,8 +1254,30 @@ class PlayerLogic extends ChangeNotifier {
         !isMounted()) {
       return;
     }
-    if (!ready && ticketError != null) return;
-    await session.select(index, preloadIndex: nextVisibleIndex(index));
+    if (!ready) {
+      unawaited(refreshEpisodeStats(index));
+      return;
+    }
+    await _selectVisible(index, userWantsPlay: userWantsPlay);
+  }
+
+  /// 收费集只有在本会话确认可播或解锁成功后才解除门禁。
+  bool isEpisodeLocked(Episode episode) {
+    return (episode.locked || !episode.isFree) &&
+        !_unlockedEpisodeIds.contains(episode.id);
+  }
+
+  /// 按可见队列选择一集，并预热上一集与下一集。
+  Future<void> _selectVisible(int index, {bool? userWantsPlay}) async {
+    await session.select(
+      index,
+      preloadIndex: nextVisibleIndex(index),
+      previousIndex: previousVisibleIndex(index),
+      userWantsPlay: userWantsPlay,
+    );
+    if (!_disposed && session.currentIndex == index) {
+      unawaited(refreshEpisodeStats(index));
+    }
   }
 
   int? nextVisibleIndex(int index) {
@@ -978,6 +1287,13 @@ class PlayerLogic extends ChangeNotifier {
         : null;
   }
 
+  /// 可见队列里当前集的上一集；已经是第一集时为空。
+  int? previousVisibleIndex(int index) {
+    final position = visibleIndices.indexOf(index);
+    if (position <= 0) return null;
+    return visibleIndices[position - 1];
+  }
+
   bool get hasNextEpisode => nextVisibleIndex(session.currentIndex) != null;
 
   Future<void> playNextEpisode() async {
@@ -1095,12 +1411,10 @@ class PlayerLogic extends ChangeNotifier {
     Drama drama,
     int index,
   ) async {
-    session.setRouteVisible(false);
-    await session.playbackSettled;
-    await saveCurrentProgress();
-    if (!context.mounted) return;
-    await Navigator.of(context).push(
+    final route = Navigator.of(context).push(
       FadePageRoute<void>(
+        transitionDuration: Duration.zero,
+        reverseTransitionDuration: Duration.zero,
         builder: (_) => PlayerPage(
           drama: drama,
           initialIndex: index,
@@ -1109,7 +1423,14 @@ class PlayerLogic extends ChangeNotifier {
         ),
       ),
     );
-    if (isMounted()) session.setRouteVisible(active);
+    if (kDebugMode) {
+      debugPrint('[player-entry] phase=route-pushed source=watch-all ms=0');
+    }
+    unawaited(pauseForFullPlayer());
+    unawaited(saveCurrentProgress());
+    await route;
+    if (!isMounted()) return;
+    await resumeAfterFullPlayer();
   }
 
   Future<void> showEpisodes(BuildContext context) async {

lib/pages/player/player_view_actions.dart

@@ -65,6 +65,11 @@ extension _PlayerViewActions on _PlayerPageState {
   ) async {
     final wallet = logic.wallet;
     if (wallet == null) return;
+    if (!context.read<AuthController>().isSignedIn &&
+        !await ensureSignedIn(context)) {
+      return;
+    }
+    if (!context.mounted) return;
     await showModalBottomSheet<bool>(
       context: context,
       backgroundColor: AppColors.transparent,
@@ -81,7 +86,7 @@ extension _PlayerViewActions on _PlayerPageState {
   }
 
   Future<bool> _unlockEpisode(BuildContext context, int index) async {
-    if (!await ensureSignedIn(context) || !context.mounted) return false;
+    if (!context.read<AuthController>().isSignedIn) return false;
     final ok = await logic.unlockEpisode(index);
     if (ok || !context.mounted) return ok;
     final l10n = AppLocalizations.of(context)!;
@@ -99,18 +104,53 @@ extension _PlayerViewActions on _PlayerPageState {
     Episode episode, {
     bool likeOnly = false,
   }) async {
-    unawaited(context.read<Haptics>().lightImpact());
-    if (interactions.isEpisodeBusy(episode.id) ||
-        (likeOnly && interactions.isEpisodeLiked(episode.id))) {
-      return;
+    final busyBefore = interactions.isEpisodeBusy(episode.id);
+    final likedBefore = interactions.isEpisodeLiked(episode.id);
+    if (kDebugMode) {
+      debugPrint(
+        '[player-like] phase=toggle-start '
+        'episodeId=${episode.id} likeOnly=$likeOnly '
+        'busy=$busyBefore liked=$likedBefore',
+      );
     }
-    if (!await ensureSignedIn(context) || !context.mounted) return;
-    if (interactions.isEpisodeBusy(episode.id) ||
-        (likeOnly && interactions.isEpisodeLiked(episode.id))) {
+    unawaited(context.read<Haptics>().lightImpact());
+    if (busyBefore || (likeOnly && likedBefore)) {
+      if (kDebugMode) {
+        debugPrint(
+          '[player-like] phase=toggle-skipped '
+          'episodeId=${episode.id} '
+          'reason=${busyBefore ? 'busy' : 'already-liked'}',
+        );
+      }
       return;
     }
     final result = await interactions.toggleEpisodeLike(episode.id);
-    if (result.isSuccess || !context.mounted) return;
+    if (kDebugMode) {
+      debugPrint(
+        '[player-like] phase=toggle-result '
+        'episodeId=${episode.id} success=${result.isSuccess} '
+        'liked=${interactions.isEpisodeLiked(episode.id)} '
+        'count=${interactions.episodeLikeCount(episode.id)} '
+        'error=${result.errorMessage ?? '-'}',
+      );
+    }
+    if (result.isSuccess) {
+      final likeCount = interactions.episodeLikeCount(episode.id);
+      if (likeCount != null) {
+        logic.applyEpisodeLikeState(
+          episode.id,
+          liked: interactions.isEpisodeLiked(episode.id),
+          likeCount: likeCount,
+        );
+      }
+      _refreshLikeState();
+      return;
+    }
+    if (!context.mounted) return;
+    if (result.errorCode == 200007) {
+      await ensureSignedIn(context);
+      return;
+    }
     showCenteredToast(
       context,
       result.errorMessage ?? AppLocalizations.of(context)!.likeFailed,
@@ -119,7 +159,6 @@ extension _PlayerViewActions on _PlayerPageState {
 
   Future<void> _toggleSave(BuildContext context, Drama drama) async {
     final favorites = context.read<FavoriteController>();
-    if (!await ensureSignedIn(context) || !context.mounted) return;
     unawaited(context.read<Haptics>().lightImpact());
     final wasSaved = favorites.isSaved(drama.id);
     final ok = await favorites.toggle(drama.id, card: drama);
@@ -127,10 +166,14 @@ extension _PlayerViewActions on _PlayerPageState {
     if (ok) {
       final nowSaved = favorites.isSaved(drama.id);
       if (nowSaved != wasSaved) {
-        _applyFavoriteDelta(drama.id, nowSaved: nowSaved);
+        logic.markDramaFavoriteChanged(drama.id);
       }
       return;
     }
+    if (favorites.lastErrorCode == 200007) {
+      await ensureSignedIn(context);
+      return;
+    }
     ScaffoldMessenger.of(context).showSnackBar(
       SnackBar(
         content: Text(AppLocalizations.of(context)!.favoriteToggleFailed),

lib/pages/player/widgets/comment_composer_sheet.dart

@@ -9,7 +9,6 @@ import 'package:flutter/services.dart';
 import 'package:provider/provider.dart';
 
 import '../../../core/data/models/comment.dart';
-import '../../../core/data/services/auth_controller.dart';
 import '../../../core/data/services/comment_controller.dart';
 import '../../../core/platform/haptics.dart';
 import '../../../core/platform/keyboard_inset.dart';
@@ -196,23 +195,20 @@ class _CommentComposerSheetState extends State<CommentComposerSheet> {
       return;
     }
     final l10n = AppLocalizations.of(context)!;
+    if (result.errorCode == 200007) {
+      await ensureSignedIn(context);
+      return;
+    }
     ScaffoldMessenger.of(context).showSnackBar(
       SnackBar(content: Text(result.errorMessage ?? l10n.commentPostFailed)),
     );
   }
 
-  Future<void> _authenticate() async {
-    await ensureSignedIn(context);
-    if (!mounted || !context.read<AuthController>().isSignedIn) return;
-    _inputFocus.requestFocus();
-  }
-
   @override
   Widget build(BuildContext context) {
     final l10n = AppLocalizations.of(context)!;
-    final signedIn = context.watch<AuthController>().isSignedIn;
     final hasContent = _input.text.trim().isNotEmpty;
-    final canPost = signedIn && hasContent && !widget.controller.submitting;
+    final canPost = hasContent && !widget.controller.submitting;
     final multiline = _input.text.contains('\n');
     final bottomInset = _isAndroid
         ? _pinnedKeyboardInset
@@ -247,8 +243,8 @@ class _CommentComposerSheetState extends State<CommentComposerSheet> {
                 key: const Key('comment-composer-input'),
                 controller: _input,
                 focusNode: _inputFocus,
-                readOnly: !signedIn,
-                canRequestFocus: signedIn,
+                readOnly: false,
+                canRequestFocus: true,
                 minLines: 1,
                 maxLines: 4,
                 maxLength: _maxCommentLength,
@@ -262,9 +258,7 @@ class _CommentComposerSheetState extends State<CommentComposerSheet> {
                 ),
                 cursorColor: AppColors.blue,
                 decoration: InputDecoration(
-                  hintText: signedIn
-                      ? l10n.writeComment
-                      : l10n.commentLoginHint,
+                  hintText: l10n.writeComment,
                   hintStyle: const TextStyle(
                     color: AppColors.muted,
                     fontSize: 14,
@@ -278,7 +272,7 @@ class _CommentComposerSheetState extends State<CommentComposerSheet> {
                   enabledBorder: InputBorder.none,
                   focusedBorder: InputBorder.none,
                 ),
-                onTap: signedIn ? null : _authenticate,
+                onTap: null,
               ),
             ),
             const SizedBox(height: 12),

lib/pages/player/widgets/comment_thread.dart

@@ -0,0 +1,119 @@
+// Author: fruit.com.cn
+// 评论楼中楼：展开回复、继续加载，没有下一页时给出结束提示。
+
+import 'package:flutter/material.dart';
+
+import '../../../core/data/models/comment.dart';
+import '../../../core/data/services/comment_controller.dart';
+import '../../../core/theme/app_colors.dart';
+import '../../../l10n/app_localizations.dart';
+import 'comment_tile.dart';
+
+const double _replyIndent = 52;
+
+/// 一条评论及其回复。
+class CommentThread extends StatelessWidget {
+  const CommentThread({
+    super.key,
+    required this.comment,
+    required this.controller,
+    required this.handlers,
+  });
+
+  final DramaComment comment;
+  final CommentController controller;
+  final CommentInteractionHandlers handlers;
+
+  @override
+  Widget build(BuildContext context) {
+    final replies = controller.repliesFor(comment.id);
+    final expanded = controller.repliesExpanded(comment.id);
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        CommentTile(comment: comment, handlers: handlers),
+        if (comment.replyCount > 0 || replies.isNotEmpty) _toggle(context, expanded),
+        if (expanded) _replies(context, replies),
+      ],
+    );
+  }
+
+  Widget _toggle(BuildContext context, bool expanded) {
+    final l10n = AppLocalizations.of(context)!;
+    return Padding(
+      padding: const EdgeInsets.only(left: _replyIndent, bottom: 4),
+      child: TextButton(
+        key: Key('comment-replies-${comment.id}'),
+        onPressed: () => _toggleReplies(context),
+        style: TextButton.styleFrom(
+          foregroundColor: AppColors.muted,
+          padding: EdgeInsets.zero,
+          minimumSize: const Size(0, 24),
+          tapTargetSize: MaterialTapTargetSize.shrinkWrap,
+        ),
+        child: Row(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            Container(width: 16, height: 1, color: AppColors.border),
+            const SizedBox(width: 8),
+            Text(
+              expanded ? l10n.hideReplies : l10n.viewReplies(comment.replyCount),
+              style: const TextStyle(
+                color: AppColors.muted,
+                fontSize: 12,
+                fontWeight: FontWeight.w400,
+              ),
+            ),
+            const SizedBox(width: 4),
+            Icon(
+              expanded
+                  ? Icons.keyboard_arrow_up_rounded
+                  : Icons.keyboard_arrow_down_rounded,
+              size: 14,
+              color: AppColors.muted,
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _replies(BuildContext context, List<DramaComment> replies) {
+    final l10n = AppLocalizations.of(context)!;
+    return Padding(
+      padding: const EdgeInsets.only(left: _replyIndent),
+      child: Column(
+        children: [
+          if (controller.repliesLoading(comment.id))
+            const Padding(
+              padding: EdgeInsets.symmetric(vertical: 8),
+              child: CircularProgressIndicator(),
+            ),
+          for (final reply in replies)
+            CommentTile(comment: reply, handlers: handlers, isReply: true),
+          if (controller.repliesHasMore(comment.id))
+            TextButton(
+              onPressed: () => controller.loadMoreReplies(comment.id),
+              child: Text(l10n.loadMore),
+            )
+          else if (replies.isNotEmpty)
+            Padding(
+              padding: const EdgeInsets.symmetric(vertical: 8),
+              child: Text(
+                l10n.noMoreItems,
+                style: const TextStyle(color: AppColors.textHint, fontSize: 12),
+              ),
+            ),
+        ],
+      ),
+    );
+  }
+
+  Future<void> _toggleReplies(BuildContext context) async {
+    if (controller.repliesExpanded(comment.id)) {
+      controller.hideReplies(comment.id);
+      return;
+    }
+    await controller.loadReplies(comment.id);
+  }
+}

lib/pages/player/widgets/drama_comments_sheet.dart

@@ -11,14 +11,13 @@ import '../../../core/data/models/comment.dart';
 import '../../../core/data/models/drama.dart';
 import '../../../core/data/repositories/comment_repository.dart';
 import '../../../core/data/repositories/interaction_repository.dart';
-import '../../../core/data/services/auth_controller.dart';
 import '../../../core/data/services/comment_controller.dart';
 import '../../../core/formatting/error_text.dart';
 import '../../../core/theme/app_colors.dart';
-import '../../../core/widgets/auth_gate.dart';
 import '../../../core/widgets/empty_state.dart';
 import '../../../l10n/app_localizations.dart';
 import 'comment_composer_sheet.dart';
+import 'comment_thread.dart';
 import 'comment_tile.dart';
 
 const double _composerRadius = 22;
@@ -26,10 +25,9 @@ const double _composerHeight = 44;
 const double _sendButtonSize = 38;
 const double _sheetRadius = 20;
 const double _headerHeight = 44;
-const double _replyIndent = 52;
 const double _composerTopGap = 8;
 
-/// 服务端评论底部弹窗：匿名列表、游标翻页、回复与登录发布。
+/// 服务端评论底部弹窗：匿名列表、游标翻页、回复与设备身份发布。
 class DramaCommentsSheet extends StatefulWidget {
   const DramaCommentsSheet({super.key, required this.drama, this.episodeId});
 
@@ -92,8 +90,7 @@ class _DramaCommentsSheetState extends State<DramaCommentsSheet> {
   }
 
   Future<void> _openComposer({DramaComment? replyTo}) async {
-    await ensureSignedIn(context);
-    if (!mounted || !context.read<AuthController>().isSignedIn) return;
+    if (!mounted) return;
     _removeComposerOverlay();
     final entry = OverlayEntry(
       builder: (_) => CommentComposerSheet(
@@ -222,7 +219,6 @@ class _DramaCommentsSheetState extends State<DramaCommentsSheet> {
   Widget _content(BuildContext context) {
     final l10n = AppLocalizations.of(context)!;
     final count = _serverCount ?? _controller.exactCount;
-    final signedIn = context.watch<AuthController>().isSignedIn;
     final composerReserve = _composerHeight + _composerTopGap;
     return Column(
       key: const Key('comment-sheet-content'),
@@ -269,7 +265,7 @@ class _DramaCommentsSheetState extends State<DramaCommentsSheet> {
         Padding(
           key: const Key('comment-composer-area'),
           padding: const EdgeInsets.only(top: _composerTopGap),
-          child: _fakeComposer(l10n, signedIn: signedIn),
+          child: _fakeComposer(l10n),
         ),
       ],
     );
@@ -315,7 +311,7 @@ class _DramaCommentsSheetState extends State<DramaCommentsSheet> {
       itemCount: _controller.comments.length + 1,
       itemBuilder: (context, index) {
         if (index == _controller.comments.length) return _footer(l10n);
-        return _CommentThread(
+        return CommentThread(
           comment: _controller.comments[index],
           controller: _controller,
           handlers: CommentInteractionHandlers(onReply: _beginReply),
@@ -338,10 +334,21 @@ class _DramaCommentsSheetState extends State<DramaCommentsSheet> {
         child: Text(l10n.loadMore),
       );
     }
+    if (_controller.comments.isNotEmpty) {
+      return Padding(
+        key: const Key('paged-list-no-more'),
+        padding: const EdgeInsets.symmetric(vertical: 12),
+        child: Text(
+          l10n.noMoreItems,
+          textAlign: TextAlign.center,
+          style: const TextStyle(color: AppColors.textHint, fontSize: 12),
+        ),
+      );
+    }
     return const SizedBox(height: 8);
   }
 
-  Widget _fakeComposer(AppLocalizations l10n, {required bool signedIn}) {
+  Widget _fakeComposer(AppLocalizations l10n) {
     return GestureDetector(
       behavior: HitTestBehavior.opaque,
       onTap: _openComposer,
@@ -361,7 +368,7 @@ class _DramaCommentsSheetState extends State<DramaCommentsSheet> {
                 child: Padding(
                   padding: const EdgeInsets.only(left: 16),
                   child: Text(
-                    signedIn ? l10n.writeComment : l10n.commentLoginHint,
+                    l10n.writeComment,
                     key: const Key('comment-input-placeholder-label'),
                     maxLines: 1,
                     overflow: TextOverflow.ellipsis,
@@ -435,100 +442,3 @@ class _CommentPostSuccessOverlay extends StatelessWidget {
     );
   }
 }
-
-class _CommentThread extends StatelessWidget {
-  const _CommentThread({
-    required this.comment,
-    required this.controller,
-    required this.handlers,
-  });
-
-  final DramaComment comment;
-  final CommentController controller;
-  final CommentInteractionHandlers handlers;
-
-  @override
-  Widget build(BuildContext context) {
-    final replies = controller.repliesFor(comment.id);
-    final expanded = controller.repliesExpanded(comment.id);
-    return Column(
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        CommentTile(comment: comment, handlers: handlers),
-        if (comment.replyCount > 0 || replies.isNotEmpty)
-          Padding(
-            padding: const EdgeInsets.only(left: _replyIndent, bottom: 4),
-            child: TextButton(
-              key: Key('comment-replies-${comment.id}'),
-              onPressed: () => _toggleReplies(context),
-              style: TextButton.styleFrom(
-                foregroundColor: AppColors.muted,
-                padding: EdgeInsets.zero,
-                minimumSize: const Size(0, 24),
-                tapTargetSize: MaterialTapTargetSize.shrinkWrap,
-              ),
-              child: Row(
-                mainAxisSize: MainAxisSize.min,
-                children: [
-                  Container(width: 16, height: 1, color: AppColors.border),
-                  const SizedBox(width: 8),
-                  Text(
-                    expanded
-                        ? AppLocalizations.of(context)!.hideReplies
-                        : AppLocalizations.of(
-                            context,
-                          )!.viewReplies(comment.replyCount),
-                    style: const TextStyle(
-                      color: AppColors.muted,
-                      fontSize: 12,
-                      fontWeight: FontWeight.w400,
-                    ),
-                  ),
-                  const SizedBox(width: 4),
-                  Icon(
-                    expanded
-                        ? Icons.keyboard_arrow_up_rounded
-                        : Icons.keyboard_arrow_down_rounded,
-                    size: 14,
-                    color: AppColors.muted,
-                  ),
-                ],
-              ),
-            ),
-          ),
-        if (expanded)
-          Padding(
-            padding: const EdgeInsets.only(left: _replyIndent),
-            child: Column(
-              children: [
-                if (controller.repliesLoading(comment.id))
-                  const Padding(
-                    padding: EdgeInsets.symmetric(vertical: 8),
-                    child: CircularProgressIndicator(),
-                  ),
-                for (final reply in replies)
-                  CommentTile(
-                    comment: reply,
-                    handlers: handlers,
-                    isReply: true,
-                  ),
-                if (controller.repliesHasMore(comment.id))
-                  TextButton(
-                    onPressed: () => controller.loadMoreReplies(comment.id),
-                    child: Text(AppLocalizations.of(context)!.loadMore),
-                  ),
-              ],
-            ),
-          ),
-      ],
-    );
-  }
-
-  Future<void> _toggleReplies(BuildContext context) async {
-    if (controller.repliesExpanded(comment.id)) {
-      controller.hideReplies(comment.id);
-      return;
-    }
-    await controller.loadReplies(comment.id);
-  }
-}

lib/pages/player/widgets/home_feed_overlay.dart

@@ -14,7 +14,7 @@ import '../../../core/theme/app_colors.dart';
 import '../../../l10n/app_localizations.dart';
 import 'home_feed_recommend_panel.dart';
 import 'loading_progress_track.dart';
-import 'player_double_tap_hearts.dart';
+import 'player_tap_gesture_region.dart';
 import 'seek_progress_bar.dart';
 import 'scrub_preview_card.dart';
 
@@ -69,6 +69,7 @@ class HomeFeedOverlay extends StatefulWidget {
     this.cancelScrubRequest = 0,
     this.thumbnailService,
     this.spriteAxisService,
+    this.suppressBufferLoading = false,
   });
 
   final AppLocalizations l10n;
@@ -104,25 +105,15 @@ class HomeFeedOverlay extends StatefulWidget {
   final int cancelScrubRequest;
   final PlaybackThumbnailService? thumbnailService;
   final SpriteThumbnailAxisService? spriteAxisService;
+  final bool suppressBufferLoading;
 
   @override
   State<HomeFeedOverlay> createState() => _HomeFeedOverlayState();
 }
 
 class _HomeFeedOverlayState extends State<HomeFeedOverlay> {
-  static const Duration _singleTapDelay = Duration(milliseconds: 400);
-
   bool _scrubbing = false;
   bool _wasVisibleBeforeScrub = true;
-  Timer? _singleTapTimer;
-  DateTime? _lastDownAt;
-  DateTime? _blockSingleTapUntil;
-  bool _doubleTapDown = false;
-  bool _likedThisPair = false;
-  int _downSerial = 0;
-  int _tapSeq = 0;
-  int _nextHeartBurstId = 0;
-  final List<({int id, Offset position})> _heartBursts = [];
 
   @override
   void didUpdateWidget(covariant HomeFeedOverlay oldWidget) {
@@ -132,35 +123,24 @@ class _HomeFeedOverlayState extends State<HomeFeedOverlay> {
     }
   }
 
-  @override
-  void dispose() {
-    _tapSeq++;
-    _singleTapTimer?.cancel();
-    super.dispose();
-  }
-
   @override
   Widget build(BuildContext context) {
     return SafeArea(
       bottom: false,
       child: Stack(
+        clipBehavior: Clip.none,
         children: [
           Positioned.fill(
-            child: LayoutBuilder(
-              builder: (context, constraints) => Listener(
-                onPointerUp: (_) => widget.onBoostEnd(),
-                onPointerCancel: (_) => widget.onBoostEnd(),
-                onPointerDown: _handlePointerDown,
-                child: GestureDetector(
-                  key: const Key('home-feed-gesture'),
-                  behavior: HitTestBehavior.opaque,
-                  onTapUp: _handleTapUp,
-                  onLongPressStart: (details) =>
-                      _handleLongPressStart(details, constraints.maxWidth),
-                  onLongPressEnd: (_) => widget.onBoostEnd(),
-                  onLongPressCancel: widget.onBoostEnd,
-                ),
-              ),
+            child: PlayerTapGestureRegion(
+              key: const ValueKey('home-feed-tap-gesture-region'),
+              gestureKey: const Key('home-feed-gesture'),
+              enabled: !_scrubbing,
+              doubleTapEnabled: !widget.locked,
+              now: widget.now,
+              onSingleTap: widget.onTogglePlay,
+              onDoubleTapLike: widget.onDoubleTapLike,
+              onLongPressStart: _handleLongPressStart,
+              onInteractionEnd: widget.onBoostEnd,
             ),
           ),
           Positioned(
@@ -217,31 +197,12 @@ class _HomeFeedOverlayState extends State<HomeFeedOverlay> {
               spriteAxisService: widget.spriteAxisService,
               thumbnailsUrl: widget.episode.thumbnailsUrl,
               episodeId: widget.episode.id,
-              posterUrl: widget.drama.posterUrl,
+              suppressBufferLoading: widget.suppressBufferLoading,
               onScrubStart: _startScrub,
               onScrubEnd: _endScrub,
               onSeek: widget.onSeek,
             ),
           ),
-          if (_heartBursts.isNotEmpty)
-            Positioned.fill(
-              child: IgnorePointer(
-                child: Stack(
-                  clipBehavior: Clip.none,
-                  children: [
-                    for (final burst in _heartBursts)
-                      Positioned(
-                        left: burst.position.dx,
-                        top: burst.position.dy - 10,
-                        child: PlayerDoubleTapHeartBurst(
-                          key: ValueKey(burst.id),
-                          onCompleted: () => _removeHeartBurst(burst.id),
-                        ),
-                      ),
-                  ],
-                ),
-              ),
-            ),
         ],
       ),
     );
@@ -263,83 +224,8 @@ class _HomeFeedOverlayState extends State<HomeFeedOverlay> {
     widget.onScrubEnd?.call(wasVisible);
   }
 
-  DateTime _now() => widget.now?.call() ?? DateTime.now();
-
-  void _handlePointerDown(PointerDownEvent event) {
-    final now = _now();
-    final previous = _lastDownAt;
-    _downSerial++;
-    _lastDownAt = now;
-    final repeated =
-        previous != null && now.difference(previous) <= _singleTapDelay;
-    if (!repeated) {
-      if (_singleTapBlocked(now)) return;
-      _doubleTapDown = false;
-      _likedThisPair = false;
-      return;
-    }
-    _doubleTapDown = true;
-    _blockSingleTapUntil = now.add(_singleTapDelay);
-    _cancelPendingSingleTap();
-  }
-
-  bool _singleTapBlocked(DateTime now) {
-    final blockedUntil = _blockSingleTapUntil;
-    return blockedUntil != null && now.isBefore(blockedUntil);
-  }
-
-  void _cancelPendingSingleTap() {
-    _tapSeq++;
-    _singleTapTimer?.cancel();
-    _singleTapTimer = null;
-  }
-
-  void _handleTapUp(TapUpDetails details) {
-    final now = _now();
-    if (_doubleTapDown || _singleTapBlocked(now)) {
-      _showDoubleTapLike(details.localPosition);
-      return;
-    }
-    final serial = _downSerial;
-    final tapSeq = ++_tapSeq;
-    _singleTapTimer?.cancel();
-    late final Timer pending;
-    pending = Timer(_singleTapDelay, () {
-      if (!identical(_singleTapTimer, pending)) return;
-      _singleTapTimer = null;
-      if (!mounted || tapSeq != _tapSeq || serial != _downSerial) return;
-      if (_doubleTapDown || _singleTapBlocked(_now())) return;
-      _lastDownAt = null;
-      widget.onTogglePlay();
-    });
-    _singleTapTimer = pending;
-  }
-
-  void _showDoubleTapLike(Offset position) {
-    if (_likedThisPair) return;
-    _likedThisPair = true;
-    _blockSingleTapUntil = _now().add(_singleTapDelay);
-    _cancelPendingSingleTap();
-    _showHearts(position);
-  }
-
-  void _showHearts(Offset position) {
-    final id = _nextHeartBurstId++;
-    setState(() => _heartBursts.add((id: id, position: position)));
-    widget.onDoubleTapLike?.call(position);
-  }
-
-  void _removeHeartBurst(int id) {
-    if (!mounted) return;
-    setState(() => _heartBursts.removeWhere((burst) => burst.id == id));
-  }
-
   void _handleLongPressStart(LongPressStartDetails details, double width) {
     final third = width / 3;
-    _tapSeq++;
-    _cancelPendingSingleTap();
-    _doubleTapDown = false;
-    _lastDownAt = null;
     final dx = details.localPosition.dx;
     if (dx < third || dx > width - third) {
       widget.onBoostStart();
@@ -383,8 +269,10 @@ class _HomeFeedOverlayState extends State<HomeFeedOverlay> {
       liked: widget.liked,
       favoriteCount: widget.favoriteCount,
       likeCount: widget.likeCount,
+      commentCount: widget.commentCount,
       onSave: widget.onSave,
       onLike: widget.onLike,
+      onComments: widget.onComments,
       onEpisodes: widget.onEpisodes ?? widget.onOpenFullPlayer,
     );
   }