feat(cover): 支持横版封面并收紧底栏图标间距

- Drama 新增 coverLandscape，WatchProgress 新增 dramaCoverLandscape
- 继续观看横幅优先使用横版封面，缺省回退竖版
- 底部导航栏图标与文字间距由 5dp 收紧至 1dp

.gitea/workflows/ci.yml

@@ -0,0 +1,25 @@
+# Author: fruit.com.cn
+# ReelShort 客户端 CI：静态分析 + 测试门禁
+name: flutter-ci
+
+on:
+  push:
+    branches: [develop, main]
+  pull_request:
+    branches: [develop, main]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: subosito/flutter-action@v2
+        with:
+          channel: stable
+          cache: true
+      - name: 依赖
+        run: flutter pub get
+      - name: 静态分析（零告警门禁）
+        run: dart analyze --fatal-infos
+      - name: 单元测试（全绿门禁）
+        run: flutter test -r expanded

.gitignore

@@ -65,3 +65,6 @@ app.*.map.json
 .env
 .env.*
 !.env.example
+
+# IDE 的 Flutter Widget Preview 生成目录。
+.widget_preview/

README.md

@@ -1,18 +1,22 @@
 # FruitShorts（ReelShort）客户端
 
-FruitShorts 是面向印尼市场的短剧 Flutter 客户端。当前版本已连接
+FruitShorts 是面向印尼市场的短剧 Flutter 客户端，已连接 `FruitServer` 的
-`FruitServer` 的 `/app/**` 接口，支持沉浸播放、找剧、账号、观看记录、收藏、
+`/app/**` 接口。功能覆盖：四 tab 主页（推荐视频流 / 找剧 / 追剧 / 我的）、
-下载授权、评论互动、站内通知和中英印尼三语界面。
+沉浸式播放与全屏剧集播放器、清晰度切换、剧单与排行榜、新剧页、搜索、观看记录、
+收藏短剧、评论与点赞、站内通知、钱包与商品、下载落盘与离线播放、中英印尼三语，
+以及 Android / iOS 双端画中画（退到后台自动进小窗）。
 
 ## 技术栈
 
-- Flutter 3.47.7 / Dart 3.13.5
+- Flutter 3.47.7 / Dart 3.13.5（`environment.sdk: ^3.12.2`）
 - Provider 状态管理与依赖注入
 - dio 网络请求
 - video_player 播放
 - shared_preferences 与 `SharedPreferencesAsync` 本地配置
+- path_provider + dart:io 下载落盘（先写 `.part`，完成后原子改名）
 - flutter_localizations，支持 `en`、`zh`、`id`
-- Android 系统画中画
+- 画中画：Android 用 `floating` + `permission_handler`（需悬浮窗权限）；
+  iOS 用原生 `AVPictureInPictureController` + 影子播放器（`ios/Runner/AppDelegate.swift`）
 
 ## 目录结构
 
@@ -22,7 +26,7 @@ lib/
     config/       地址、语言和运行时配置
     data/         models、remote API、repository、controller
     formatting/   文案与日期格式化
-    platform/     触觉等平台能力
+    platform/     平台能力：画中画通道、设备号、触觉
     theme/        颜色与主题
     widgets/      跨页面复用组件
   l10n/           三语 ARB 与生成代码
@@ -36,20 +40,21 @@ assets/           图标、图片和本地媒体文件
 
 ## 已接接口
 
-以下接口均在 `lib/core/data/remote/` 中有实际调用，共 26 个不同路径、
+以下接口均在 `lib/core/data/remote/` 中有实际调用，共 47 个不同路径。
-31 个 HTTP 方法级调用。
 
-| 分组 | 契约 | 接口 |
+| 分组 | 接口 |
-| --- | --- | --- |
+| --- | --- |
-| 账号 | §1.1 | `POST /app/auth/register`、`/login`、`/refresh`、`/logout` |
+| 账号 | `POST /app/auth/register`、`/login`、`/refresh`、`/logout`、`/otp`；`GET /app/me`、`/app/me/devices`、`/app/me/export`；`POST /app/me/deactivate`、`/app/me/deactivate/cancel` |
-| 内容 | §1.3、§1.4 | `GET /app/home/feed`、`/app/discover/feed`、`/app/categories`、`/app/dramas/{id}`、`/app/episodes/{id}/play` |
+| 内容 | `GET /app/home/feed`、`/app/feed`、`/app/discover/feed`、`/app/categories`、`/app/categories/{id}/dramas`、`/app/drama-categories`、`/app/dramas/page`、`/app/dramas/{id}`、`/app/tags`、`/app/search`、`/app/playlists`、`/app/playlists/{id}` |
-| 观看记录 | §1.5 | `POST/GET /app/watch/progress`、`GET /app/watch/recent`、`DELETE /app/watch/progress/{dramaId}`、`DELETE /app/watch/progress` |
+| 播放 | `GET /app/episodes/{id}/play`、`/app/episodes/{id}/stats`；`POST /app/episodes/{id}/unlock` |
-| 收藏 | §1.5 | `POST /app/favorites/toggle`、`GET /app/favorites`、`DELETE /app/favorites/{dramaId}` |
+| 观看记录 | `POST/GET /app/watch/progress`、`GET /app/watch/recent`、`DELETE /app/watch/progress/{dramaId}`、`DELETE /app/watch/progress` |
-| 下载授权 | §1.6 | `GET /app/downloads/policy`、`PUT /app/downloads/settings`、`POST/GET /app/downloads`、`GET /app/downloads/{episodeId}/url`、`POST /app/downloads/{episodeId}/progress`、`DELETE /app/downloads/{episodeId}`、`DELETE /app/downloads` |
+| 收藏 | `POST /app/favorites/toggle`、`GET /app/favorites`、`DELETE /app/favorites/{dramaId}`、`POST /app/favorites/remove` |
-| 互动 | §1.7 | `GET/POST /app/comments`、`DELETE /app/comments/{id}`、`POST /app/likes/toggle`、`POST /app/reports` |
+| 下载 | `GET /app/downloads/policy`、`PUT /app/downloads/settings`、`POST/GET /app/downloads`、`GET /app/downloads/{id}/url`、`POST /app/downloads/{id}/progress`、`DELETE /app/downloads/{id}`、`DELETE /app/downloads` |
-| 公告 | §1.9.2 | `GET /app/notices` |
+| 互动 | `GET/POST /app/comments`、`DELETE /app/comments/{id}`、`GET /app/comments/count`、`POST /app/likes/toggle`、`POST /app/reports` |
+| 商业化 | `GET /app/wallet`、`/app/products`、`/app/orders` |
+| 公告 | `GET /app/notices` |
 
-客户端没有调用 `/app/config` 或创作者入驻接口。
+客户端没有调用 `/app/config` 和创作者入驻接口。
 
 ## 运行
 
@@ -66,39 +71,57 @@ flutter pub get
 ```bash
 adb devices
 adb reverse tcp:8081 tcp:8081
-flutter run -d <device> \
+flutter run -d <device>
-  --dart-define=API_BASE_URL=http://127.0.0.1:8081
 ```
 
 `adb reverse` 将手机的 `127.0.0.1:8081` 转发到电脑；USB 断开或重新连接后需要
-重新执行。
+重新执行。此时用调试条把地址改成 `http://127.0.0.1:8081`（见下节）。
 
-Android 模拟器访问宿主机时使用：
+Android 模拟器访问宿主机时，同样在调试条里填 `http://10.0.2.2:8081`。
-
-```bash
-flutter run --dart-define=API_BASE_URL=http://10.0.2.2:8081
-```
 
 ### iOS
 
 手机与 Mac 需在同一网络，首次启动允许“本地网络”权限：
 
 ```bash
-flutter run -d <udid> \
+flutter run -d <udid>
-  --dart-define=API_BASE_URL=http://<Mac局域网IP>:8081
 ```
 
-### Debug 运行时地址
+### 服务地址配置
 
-debug 版本可在「我的 → 设置 → 服务器地址」修改后端地址，保存后重启 App 生效。
+地址是代码里的一个开关，**不做任何网络探测**，也不用传构建参数。两套环境各占
-地址优先级：
+一个文件：
 
-```text
+| 文件 | 用途 | 默认值 |
-本地运行时设置 > --dart-define(API_BASE_URL) > 平台默认地址
+| --- | --- | --- |
+| `lib/core/config/dev_config.dart` | 开发 / 联调 | `http://192.168.31.243:8081` |
+| `lib/core/config/prod_config.dart` | 生产 | `http://39.162.50.99:8081` |
+
+切换环境只改 `lib/core/config/app_config.dart` 里的一个布尔值：
+
+```dart
+static const bool useDevConfig = true; // false 即用生产地址
 ```
 
-因此不带 `--dart-define` 构建的 debug APK 也可在安装后改成当前电脑 IP。
+换 Wi-Fi 或换网段时只改 `dev_config.dart` 的 `baseUrl`。打生产包前把
-release 版本不显示入口，也不会读取本地覆盖。
+`useDevConfig` 改成 `false`；release 构建若仍为 `true` 会在启动时直接报错，
+避免线上包连到开发机。
+
+debug 包在找剧页加载失败时会显示调试条，点「修改服务器地址」可临时改成当前
+电脑 IP，保存后立即重载、不需要重新打包，该覆盖保存在本地偏好里（仅 debug
+生效，release 不读取）。
+
+## 画中画
+
+| 平台 | 行为 |
+| --- | --- |
+| Android | 首次点播放页小窗按钮时申请悬浮窗权限；授权后退出 App 自动进入系统小窗。沉浸流与独立播放页共用一份引用计数，任一处活跃都算「在播」，避免互相顶掉 |
+| iOS | 原生影子播放器承载 `AVPictureInPictureController`，只有播放页处于活跃状态时退到后台才自动进小窗；停在剧单等页面退后台不会触发 |
+
+- 小窗内切集直接换源，不走页面翻页，可连续自动播放
+- iOS 从系统小窗还原时用原生过渡层盖住纹理黑帧，等首帧就绪后再淡出
+- 播放页「更多」面板里有「退出自动小窗」开关（仅支持自动小窗的平台显示），关掉后
+  退到后台不再进入小窗
 
 ## 环境注意
 
@@ -131,46 +154,56 @@ xcodebuild -resolvePackageDependencies \
 
 ```bash
 adb uninstall com.stormg.lumadrama
-flutter run -d <device> \
+flutter run -d <device>
-  --dart-define=API_BASE_URL=http://127.0.0.1:8081
 ```
 
 ## 生产打包（Android）
 
-生产包只包含以下两个 ABI，**打成一个 APK**，不做 split：
+两个渠道出两种产物，源码同一套：
 
-| ABI | 适用设备 |
+| 渠道 | 产物 | 命令 | 体积 |
-| --- | --- |
+| --- | --- | --- | --- |
-| `arm64-v8a` | 现代手机（64 位） |
+| Google Play | AAB（按设备下发） | `flutter build appbundle --release` | 上传 28MB，用户下载约 8MB |
-| `armeabi-v7a` | 老 32 位机 |
+| 国内各大市场 | 通用 APK（arm64 + v7） | `flutter build apk --release` | 约 13MB |
-
-```bash
-flutter build apk --release --target-platform android-arm64,android-arm
-# 产出单个：build/app/outputs/flutter-apk/app-release.apk（约 37MB）
-```
 
 说明：
 
 - `android/app/build.gradle.kts` 的 `release` 已配置 `abiFilters`，只保留 `arm64-v8a` 与 `armeabi-v7a`，插件也不会再带入 `x86_64` 原生库。
-- `x86_64` 只用于模拟器，不进入生产包。
+- `android/gradle.properties` 里固定了 `split-debug-info=build/symbols` 与 `dart-obfuscation=true`，**IDE 里点 Build APK / Build App Bundle 也会生效**：`libapp.so` 从 ~8MB/ABI 降到 ~1.1MB/ABI。
-- 不要直接运行 `flutter build apk --release`：默认会编译三套原生库，包体约 57MB。
+- `useLegacyPackaging = true`：原生库以压缩形式存储，这是国内 APK 从 40MB 降到 13MB 的主要原因；代价是安装时解压。
-- 只有需要进一步压缩单机下载体积时，才考虑 `--split-per-abi` 出分架构包（arm64 约 21MB、armv7 约 19MB），默认不用。
+- **每次发版都要归档 `build/symbols`**，线上崩溃栈需要它还原。
+- release 仍在用 debug 签名（`build.gradle.kts` 的 TODO），上架前必须换成正式 keystore。
+- 不要用 `--split-per-abi`：与 `abiFilters` 冲突；Play 的 AAB 已经按设备拆好。
+
+## 生产打包（iOS）
+
+```bash
+# 正式签名（需要 iOS Distribution 证书 + App Store 描述文件）
+flutter build ipa --release
+
+# 只有 Apple Development 证书时：出开发签名 IPA，只能装已注册设备
+flutter build ipa --release --export-method development
+```
+
+产物在 `build/ios/ipa/*.ipa`。画中画依赖 `UIBackgroundModes` 里的 `audio` 与
+`AVPictureInPictureController`，改动 `ios/Runner/Info.plist` 或 `AppDelegate.swift`
+后要重新构建，热重载不会生效。
 
 ## 门禁
 
 ```bash
-dart analyze lib test
+dart analyze
 flutter test
 flutter build apk --debug
 ```
 
-测试文件按模块放在 `test/` 下，用例名使用
+当前基线：`dart analyze` 仅 1 条既存 info（`intl` 未在 `pubspec.yaml` 声明）；
+`flutter test` 全量 775 例通过。测试文件按模块放在 `test/` 下，用例名使用
 `should_<期望>_when_<条件>`。真实后端联调测试在服务未启动时会跳过。
 
 ## 当前边界
 
-- 下载仅管理服务端授权，不落盘、不续传、不支持离线播放。
+- 下载会落盘并支持离线播放，但不支持断点续传：中途失败会丢弃 `.part` 重下。
-- 没有独立搜索接口，搜索能力尚未形成完整闭环。
+- 支付与金币：客户端已有钱包、商品、下单接口与页面，商店票据校验依赖服务端配置凭据。
 - 站内通知没有已读/未读和红点状态。
-- 支付、金币和会员权益尚未形成客户端闭环。
+- 播放清晰度切换会保留旧画面 500ms 掩盖闪屏，切换瞬间的进度以相对位置续播。
-- Android 支持系统画中画；iOS 画中画尚未接入。

android/.gitignore

@@ -1,4 +1,5 @@
 /.gradle
+/build/
 /captures/
 /local.properties
 GeneratedPluginRegistrant.java

android/app/build.gradle.kts

@@ -8,7 +8,9 @@ plugins {
 
 android {
     namespace = "com.stormg.lumadrama"
-    compileSdk = flutter.compileSdkVersion
+    // permission_handler_android 14 的 AAR 元数据要求依赖方 compileSdk >= 37，
+    // 固定为 37（比 Flutter 默认的 36 高一档，只影响编译期 API 可见性）。
+    compileSdk = 37
     ndkVersion = flutter.ndkVersion
 
     compileOptions {
@@ -33,6 +35,13 @@ android {
             ndk {
                 abiFilters += listOf("arm64-v8a", "armeabi-v7a")
             }
+            // R8 裁剪未使用的 Java/Kotlin 代码与资源，减小 dex 与 res。
+            isMinifyEnabled = true
+            isShrinkResources = true
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro",
+            )
             // TODO: Add your own signing config for the release build.
             // Signing with the debug keys for now, so `flutter run --release` works.
             signingConfig = signingConfigs.getByName("debug")
@@ -50,6 +59,9 @@ kotlin {
 androidComponents {
     onVariants(selector().withBuildType("release")) { variant ->
         variant.packaging.jniLibs.excludes.add("lib/x86_64/**")
+        // 原生库随 APK 压缩存储：下载体积明显小于解压后的体积，代价是安装时解压。
+        // 本包 90% 体积是 so，这一项对国内商店的 APK 分发影响最大。
+        variant.packaging.jniLibs.useLegacyPackaging = true
     }
 }
 

android/app/proguard-rules.pro

@@ -0,0 +1,11 @@
+# Author: fruit.com.cn
+#
+# R8 保号规则：Flutter 引擎与插件自带的 consumer rules 已覆盖大部分场景，
+# 这里只补本项目原生层通过反射/通道访问、裁剪后容易失效的入口。
+
+# 画中画与权限通道由 MainActivity 直接注册，保留应用包名下的入口类。
+-keep class com.stormg.lumadrama.** { *; }
+
+# Flutter 引擎在 release 下通过 JNI 回调这些类，禁止改名。
+-keep class io.flutter.** { *; }
+-dontwarn io.flutter.embedding.**

android/app/src/main/AndroidManifest.xml

@@ -2,6 +2,9 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <uses-permission
         android:name="android.permission.INTERNET"/>
+    <!-- 画中画自动触发依赖的「显示在其他应用上层」权限（部分 ROM 用它管控 PiP） -->
+    <uses-permission
+        android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
     <application
         android:label="FruitShorts"
         android:name="${applicationName}"

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
@@ -241,6 +284,7 @@ class MainActivity : FlutterActivity() {
     }
 
     companion object {
+        private const val TAG = "FruitPip"
         private const val thumbnailMaxWidth = 240
         private const val thumbnailJpegQuality = 70
         private const val thumbnailTimeoutMs = 1500L

android/gradle.properties

@@ -6,3 +6,8 @@ android.useAndroidX=true
 android.newDsl=false
 # This builtInKotlin flag was added by the Flutter template
 android.builtInKotlin=false
+
+# release 包默认剥离 Dart 调试符号并混淆：libapp.so 由 ~8MB 降到 ~1MB/ABI。
+# 符号表输出到 build/symbols，崩溃分析时用它还原堆栈，发布前务必归档。
+split-debug-info=build/symbols
+dart-obfuscation=true

ios/Runner/AppDelegate.swift

@@ -1,6 +1,7 @@
 import Flutter
 import UIKit
 import AVFoundation
+import AVKit
 
 private let thumbnailHTTPHeaderFieldsKey = "AVURLAssetHTTPHeaderFieldsKey"
 
@@ -35,6 +36,318 @@ final class RunnerFlutterViewController: FlutterViewController {
   }
 }
 
+/// iOS 影子播放器：独立 AVPlayer + AVPlayerLayer 专供画中画窗口。
+/// Flutter 的 video_player 走纹理渲染，没有 AVPlayerLayer，无法直接创建
+/// AVPictureInPictureController；小窗的画面与声音由影子接管，退出时把
+/// 影子进度回传给 Dart，由 Flutter 播放器 seek 对齐后继续。
+final class PipShadowCoordinator: NSObject, AVPictureInPictureControllerDelegate {
+  static let shared = PipShadowCoordinator()
+
+  private var player: AVPlayer?
+  private var playerLayer: AVPlayerLayer?
+  private var controller: AVPictureInPictureController?
+  private var endObserver: NSObjectProtocol?
+  private var possibleObservation: NSKeyValueObservation?
+  /// 画中画还原过渡层：原生窗口级红晕渐变，在系统还原动画开始时立即盖上，
+  /// 避免回前台瞬间 Flutter 表面未恢复显示黑帧；视频出帧后由 Dart 通知淡出。
+  private var restoreOverlay: UIView?
+  /// 系统要求 playerLayer 位于真实的 view 层级中才会判定画中画可用，
+  /// 因此用 1x1 透明宿主 view 承载，而不是直接挂在 window.layer 上。
+  private var hostView: UIView?
+  /// 影子图层就绪稍晚于创建，置位后由 KVO 自动拉起画中画。
+  private var pendingStart = false
+  private var startRetryWorkItems: [DispatchWorkItem] = []
+
+  weak var channel: FlutterMethodChannel?
+
+  /// active 变化回调；停止时把影子最终进度（毫秒）一并提供。
+  var onPipChanged: ((Bool, Int64) -> Void)?
+  /// 影子在画中画里播完当前集。
+  var onPlaybackEnded: (() -> Void)?
+
+  static var isSupported: Bool {
+    AVPictureInPictureController.isPictureInPictureSupported()
+  }
+
+  private var keyWindow: UIWindow? {
+    UIApplication.shared.connectedScenes
+      .compactMap { $0 as? UIWindowScene }
+      .flatMap { $0.windows }
+      .first { $0.isKeyWindow }
+  }
+
+  /// 首次创建影子：1x1 图层挂在 keyWindow 的宿主 view 里（肉眼不可见），静音待命。
+  /// [autoEnter] 为 true 时退后台由系统自动拉起画中画（需影子在播，见 armAutoEnter）。
+  func prepare(urlString: String, positionMs: Int64, autoEnter: Bool) {
+    teardown()
+    log("prepare begin supported=\(PipShadowCoordinator.isSupported) autoEnter=\(autoEnter)")
+    guard Self.isSupported else { return }
+    guard let url = URL(string: urlString) else {
+      log("prepare failed bad url \(urlString)")
+      return
+    }
+    guard let window = keyWindow else {
+      log("prepare failed no key window")
+      return
+    }
+    let item = AVPlayerItem(url: url)
+    let p = AVPlayer(playerItem: item)
+    p.isMuted = true
+    p.actionAtItemEnd = .pause
+    let layer = AVPlayerLayer()
+    layer.player = p
+    let host = UIView(frame: CGRect(x: 0, y: 0, width: 1, height: 1))
+    host.isUserInteractionEnabled = false
+    host.backgroundColor = .clear
+    window.addSubview(host)
+    layer.frame = host.bounds
+    host.layer.addSublayer(layer)
+    hostView = host
+    guard let c = AVPictureInPictureController(playerLayer: layer) else {
+      p.pause()
+      log("prepare failed no pip controller")
+      return
+    }
+    c.canStartPictureInPictureAutomaticallyFromInline = autoEnter
+    c.delegate = self
+    player = p
+    playerLayer = layer
+    controller = c
+    // 静音起播让 item 完成首帧解码，isPictureInPicturePossible 才会变 true。
+    p.play()
+    possibleObservation = c.observe(
+      \.isPictureInPicturePossible,
+      options: [.new, .initial]
+    ) { [weak self] controller, change in
+      let value = change.newValue ?? controller.isPictureInPicturePossible
+      self?.log("possible changed to \(value)")
+      guard let self, self.pendingStart, controller.isPictureInPicturePossible else { return }
+      self.pendingStart = false
+      // 刚翻 true 的同一 runloop 里调用会被系统静默拒绝，推到下一拍再进。
+      DispatchQueue.main.async {
+        guard self.controller === controller, controller.isPictureInPicturePossible else {
+          self.log("start via kvo aborted (shadow replaced)")
+          return
+        }
+        self.log("start via kvo")
+        controller.startPictureInPicture()
+      }
+    }
+    log("shadow ready, seeking to \(positionMs)ms")
+    if positionMs > 0 {
+      p.seek(
+        to: CMTime(value: positionMs, timescale: 1000),
+        toleranceBefore: .zero,
+        toleranceAfter: .zero
+      )
+    }
+    registerEndObserver(for: item)
+    activateAudioSession()
+  }
+
+  /// 退出 App 前（inactive）把影子对齐到当前进度并静音起播：
+  /// auto PiP 只在「player 正在播放 + 图层离屏」时由系统触发。
+  func armAutoEnter(positionMs: Int64) {
+    guard let player, let controller else {
+      log("arm failed, shadow missing")
+      return
+    }
+    guard controller.canStartPictureInPictureAutomaticallyFromInline else {
+      log("arm failed, autoEnter disabled on shadow")
+      return
+    }
+    log("arm auto enter at \(positionMs)ms")
+    if positionMs > 0 {
+      player.seek(
+        to: CMTime(value: positionMs, timescale: 1000),
+        toleranceBefore: CMTime(value: 800, timescale: 1000),
+        toleranceAfter: CMTime(value: 800, timescale: 1000)
+      )
+    }
+    player.play()
+  }
+
+  /// 回前台后取消待命：影子暂停回静音，等待下一次退后台。
+  func disarmAutoEnter() {
+    guard let player else { return }
+    log("disarm auto enter")
+    player.pause()
+    player.isMuted = true
+  }
+
+  /// 进入画中画：图层就绪则立即进入，否则 KVO/延时重试在就绪后自动进入。
+  /// 仅当影子从未创建成功（prepare 失败）时返回 false。
+  func start() -> Bool {
+    guard let controller else {
+      log("start failed, shadow not created")
+      return false
+    }
+    log("start requested possible=\(controller.isPictureInPicturePossible)")
+    pendingStart = true
+    if controller.isPictureInPicturePossible {
+      pendingStart = false
+      controller.startPictureInPicture()
+    }
+    scheduleStartRetries()
+    return true
+  }
+
+  /// KVO 偶发不触发或流加载较慢时兜底：就绪后再试两次。
+  private func scheduleStartRetries() {
+    startRetryWorkItems.forEach { $0.cancel() }
+    startRetryWorkItems.removeAll()
+    for delay in [1.0, 2.5] {
+      let item = DispatchWorkItem { [weak self] in
+        guard
+            let self,
+            self.pendingStart,
+            let controller = self.controller,
+            controller.isPictureInPicturePossible
+        else { return }
+        self.log("start via retry after \(delay)s")
+        self.pendingStart = false
+        controller.startPictureInPicture()
+      }
+      startRetryWorkItems.append(item)
+      DispatchQueue.main.asyncAfter(deadline: .now() + delay, execute: item)
+    }
+  }
+
+  /// 画中画内换集：只换 AVPlayerItem，不动 player/layer，窗口不中断。
+  func replaceItem(urlString: String, positionMs: Int64) {
+    guard let player, let url = URL(string: urlString) else { return }
+    let item = AVPlayerItem(url: url)
+    player.replaceCurrentItem(with: item)
+    registerEndObserver(for: item)
+    if positionMs > 0 {
+      player.seek(
+        to: CMTime(value: positionMs, timescale: 1000),
+        toleranceBefore: .zero,
+        toleranceAfter: .zero
+      )
+    }
+  }
+
+  /// 进入画中画后解除静音并起播（此时 Flutter 播放器已被暂停）。
+  func unmuteAndPlay() {
+    player?.isMuted = false
+    player?.play()
+  }
+
+  func positionMs() -> Int64 {
+    Int64(max(0, player?.currentTime().seconds ?? 0) * 1000)
+  }
+
+  func stopPip() {
+    controller?.stopPictureInPicture()
+  }
+
+  func teardown() {
+    startRetryWorkItems.forEach { $0.cancel() }
+    startRetryWorkItems.removeAll()
+    possibleObservation?.invalidate()
+    possibleObservation = nil
+    pendingStart = false
+    if let endObserver {
+      NotificationCenter.default.removeObserver(endObserver)
+    }
+    endObserver = nil
+    player?.pause()
+    player?.replaceCurrentItem(with: nil)
+    playerLayer?.removeFromSuperlayer()
+    playerLayer = nil
+    hostView?.removeFromSuperview()
+    hostView = nil
+    controller?.delegate = nil
+    controller = nil
+    player = nil
+  }
+
+  /// 诊断日志：NSLog 之外同步转发到 Dart，便于在 flutter run 控制台观察。
+  private func log(_ message: String) {
+    NSLog("pip: %@", message)
+    channel?.invokeMethod("pipDebug", arguments: message)
+  }
+
+  private func registerEndObserver(for item: AVPlayerItem) {
+    if let endObserver {
+      NotificationCenter.default.removeObserver(endObserver)
+    }
+    endObserver = NotificationCenter.default.addObserver(
+      forName: .AVPlayerItemDidPlayToEndTime,
+      object: item,
+      queue: .main
+    ) { [weak self] _ in
+      self?.log("item did play to end")
+      self?.onPlaybackEnded?()
+    }
+  }
+
+  /// 画中画的声音走影子播放器，需要 playback 类别的音频会话保活。
+  private func activateAudioSession() {
+    do {
+      try AVAudioSession.sharedInstance().setCategory(.playback, mode: .moviePlayback)
+      try AVAudioSession.sharedInstance().setActive(true)
+    } catch {
+      // 会话激活失败只影响后台出声，不阻断画中画。
+    }
+  }
+
+  func pictureInPictureControllerWillStartPictureInPicture(
+    _ pictureInPictureController: AVPictureInPictureController
+  ) {
+    log("will start")
+    pendingStart = false
+    onPipChanged?(true, 0)
+  }
+
+  func pictureInPictureControllerWillStopPictureInPicture(
+    _ pictureInPictureController: AVPictureInPictureController
+  ) {
+    log("will stop, showing restore overlay")
+    showRestoreOverlay()
+  }
+
+  func pictureInPictureControllerDidStopPictureInPicture(
+    _ pictureInPictureController: AVPictureInPictureController
+  ) {
+    log("did stop")
+    showRestoreOverlay()
+    onPipChanged?(false, positionMs())
+  }
+
+  /// 盖原生过渡层（幂等）：主题红晕渐变，不依赖 Flutter 渲染。
+  func showRestoreOverlay() {
+    guard let window = keyWindow else { return }
+    restoreOverlay?.removeFromSuperview()
+    let overlay = UIView(frame: window.bounds)
+    overlay.autoresizingMask = [.flexibleWidth, .flexibleHeight]
+    let gradient = CAGradientLayer()
+    gradient.frame = overlay.bounds
+    gradient.colors = [
+      UIColor(red: 0.298, green: 0.086, blue: 0.102, alpha: 1).cgColor,
+      UIColor(red: 0.118, green: 0.043, blue: 0.047, alpha: 1).cgColor,
+      UIColor(red: 0.063, green: 0.063, blue: 0.071, alpha: 1).cgColor,
+    ]
+    gradient.locations = [0, 0.22, 0.62]
+    gradient.startPoint = CGPoint(x: 0.5, y: 0)
+    gradient.endPoint = CGPoint(x: 0.5, y: 1)
+    overlay.layer.addSublayer(gradient)
+    window.addSubview(overlay)
+    restoreOverlay = overlay
+  }
+
+  /// 淡出并移除过渡层（视频首帧已确认后由 Dart 调用）。
+  func hideRestoreOverlay() {
+    guard let overlay = restoreOverlay else { return }
+    restoreOverlay = nil
+    UIView.animate(
+      withDuration: 0.25,
+      animations: { overlay.alpha = 0 }
+    ) { _ in overlay.removeFromSuperview() }
+  }
+}
+
 @main
 @objc class AppDelegate: FlutterAppDelegate, FlutterImplicitEngineDelegate {
   private let wirelessDataPrompt = WirelessDataPrompt()
@@ -63,6 +376,8 @@ final class RunnerFlutterViewController: FlutterViewController {
   func didInitializeImplicitFlutterEngine(_ engineBridge: FlutterImplicitEngineBridge) {
     GeneratedPluginRegistrant.register(with: engineBridge.pluginRegistry)
     registerWirelessDataChannel(engineBridge)
+    registerDeviceIdChannel(engineBridge)
+    registerPipChannel(engineBridge)
     let channel = FlutterMethodChannel(
       name: "com.stormg.lumadrama/share",
       binaryMessenger: engineBridge.applicationRegistrar.messenger()
@@ -144,6 +459,114 @@ final class RunnerFlutterViewController: FlutterViewController {
     }
   }
 
+  /// iOS 画中画：影子播放器通道，与 Android 共用同一 channel 名。
+  private func registerPipChannel(_ engineBridge: FlutterImplicitEngineBridge) {
+    let channel = FlutterMethodChannel(
+      name: "com.stormg.lumadrama/pip",
+      binaryMessenger: engineBridge.applicationRegistrar.messenger()
+    )
+    let pip = PipShadowCoordinator.shared
+    pip.channel = channel
+    channel.setMethodCallHandler { call, result in
+      switch call.method {
+      case "isAvailable":
+        result(PipShadowCoordinator.isSupported)
+      case "enter":
+        guard let args = call.arguments as? [String: Any],
+              let url = args["url"] as? String else {
+          result(false)
+          return
+        }
+        let positionMs = (args["positionMs"] as? NSNumber)?.int64Value ?? 0
+        pip.prepare(urlString: url, positionMs: positionMs, autoEnter: false)
+        // 等一拍让 AVPlayerLayer 完成挂载再请求进入画中画。
+        DispatchQueue.main.async {
+          result(pip.start())
+        }
+      case "prepareShadow":
+        guard let args = call.arguments as? [String: Any],
+              let url = args["url"] as? String else {
+          result(nil)
+          return
+        }
+        pip.prepare(
+          urlString: url,
+          positionMs: (args["positionMs"] as? NSNumber)?.int64Value ?? 0,
+          autoEnter: (args["autoEnter"] as? NSNumber)?.boolValue ?? false
+        )
+        result(nil)
+      case "armAutoEnter":
+        pip.armAutoEnter(
+          positionMs: (call.arguments as? [String: Any])?["positionMs"] as? Int64 ?? 0
+        )
+        result(nil)
+      case "showRestoreOverlay":
+        pip.showRestoreOverlay()
+        result(nil)
+      case "hideRestoreOverlay":
+        pip.hideRestoreOverlay()
+        result(nil)
+      case "disarmAutoEnter":
+        pip.disarmAutoEnter()
+        result(nil)
+      case "unmute":
+        pip.unmuteAndPlay()
+        result(nil)
+      case "replaceItem":
+        guard let args = call.arguments as? [String: Any],
+              let url = args["url"] as? String else {
+          result(nil)
+          return
+        }
+        pip.replaceItem(
+          urlString: url,
+          positionMs: (args["positionMs"] as? NSNumber)?.int64Value ?? 0
+        )
+        result(nil)
+      case "stop":
+        pip.stopPip()
+        result(nil)
+      case "teardown":
+        pip.teardown()
+        result(nil)
+      default:
+        result(FlutterMethodNotImplemented)
+      }
+    }
+    pip.onPipChanged = { active, positionMs in
+      channel.invokeMethod(
+        "onPipChanged",
+        arguments: ["active": active, "positionMs": positionMs]
+      )
+    }
+    pip.onPlaybackEnded = {
+      channel.invokeMethod("onPipPlaybackEnded", arguments: nil)
+    }
+  }
+
+  /// 设备标识：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,

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/>
@@ -87,6 +87,10 @@
 				</array>
 			</dict>
 		</dict>
+		<key>UIBackgroundModes</key>
+		<array>
+			<string>audio</string>
+		</array>
 		<key>UIApplicationSupportsIndirectInputEvents</key>
 		<true/>
 		<key>UILaunchStoryboardName</key>

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';
@@ -46,6 +47,7 @@ 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';
+import 'core/data/services/unlocked_episode_registry.dart';
 import 'core/data/services/video_player_port.dart';
 import 'core/data/services/wallet_controller.dart';
 import 'core/navigation/app_route_observer.dart';
@@ -117,12 +119,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(
@@ -141,17 +144,11 @@ class _LumaDramaAppState extends State<LumaDramaApp> {
 
   late final WatchHistoryRepository _watchHistory =
       widget.watchHistoryRepository ??
-      HttpWatchHistoryRepository(
+      HttpWatchHistoryRepository(WatchApi(_apiClient));
-        WatchApi(_apiClient),
-        isSignedIn: () => _auth.isSignedIn,
-      );
 
   late final FavoriteRepository _favorites =
       widget.favoriteRepository ??
-      HttpFavoriteRepository(
+      HttpFavoriteRepository(LibraryApi(_apiClient));
-        LibraryApi(_apiClient),
-        isSignedIn: () => _auth.isSignedIn,
-      );
 
   late final PlaybackRepository _playback =
       widget.playbackRepository ??
@@ -211,6 +208,10 @@ class _LumaDramaAppState extends State<LumaDramaApp> {
 
   late final LocaleController _localeController = LocaleController();
 
+  /// 登录期内共享的「已解锁收费集」：播放页进出、feed 与全屏切换都要沿用。
+  late final UnlockedEpisodeRegistry _unlockedEpisodes =
+      UnlockedEpisodeRegistry();
+
   @override
   void initState() {
     super.initState();
@@ -219,7 +220,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());
   }
@@ -230,11 +231,14 @@ class _LumaDramaAppState extends State<LumaDramaApp> {
     if (_auth.isSignedIn == _wasSignedIn) return;
     _wasSignedIn = _auth.isSignedIn;
     _interactionController.clear();
+    // 解锁结论属于账号：换人登录后不能沿用上一个人的可播判断。
+    _unlockedEpisodes.clear();
     if (_auth.isSignedIn) {
       unawaited(_favoriteController.load());
       unawaited(_walletController.load());
     } else {
       _favoriteController.clear();
+      unawaited(_favoriteController.load());
       _downloadController.reset();
       _walletController.reset();
     }
@@ -274,6 +278,7 @@ class _LumaDramaAppState extends State<LumaDramaApp> {
           Provider<CatalogApi>.value(value: _catalogApi),
         Provider<PlaybackRepository>.value(value: _playback),
         Provider<PlaybackPositionCache>.value(value: _playbackPositionCache),
+        Provider<UnlockedEpisodeRegistry>.value(value: _unlockedEpisodes),
         Provider<WatchHistoryRepository>.value(value: _watchHistory),
         Provider<FavoriteRepository>.value(value: _favorites),
         Provider<CommentRepository>.value(value: _commentRepository),
@@ -293,9 +298,7 @@ class _LumaDramaAppState extends State<LumaDramaApp> {
         ),
         ChangeNotifierProvider(create: (_) => _createCategories()),
         if (playlists != null)
-          ChangeNotifierProvider(
+          ChangeNotifierProvider(create: (_) => PlaylistController(playlists)),
-            create: (_) => PlaylistController(playlists),
-          ),
         ChangeNotifierProvider.value(value: _favoriteController),
         ChangeNotifierProvider.value(value: _downloadController),
         ChangeNotifierProvider.value(value: _walletController),

lib/core/config/app_config.dart

@@ -1,165 +1,51 @@
 // Author: fruit.com.cn
 
-import 'dart:io';
+import 'dev_config.dart';
+import 'prod_config.dart';
 
-import 'package:flutter/foundation.dart';
+/// 客户端运行时配置。
-
-/// 客户端与后端约定的运行时配置。
 ///
-/// 接口地址优先级：运行时设置 > `--dart-define=API_BASE_URL=...` > 平台默认值。
+/// 两套环境各一个文件：
-/// 开发机的局域网地址会随网络变化，换网络后改 [devHostBaseUrl] 即可。
+/// - `dev_config.dart`：[DevConfig]（本机联调）
-class AppConfig {
+/// - `prod_config.dart`：[ProdConfig]（生产）
-  const AppConfig._();
+///
-
+/// 切换环境只改下面这一个布尔值，不用传任何构建参数、也不做网络探测。
-  /// 开发调试默认服务地址，当前指向本机局域网 IP。
+abstract final class AppConfig {
+  /// **环境开关**：true 用开发环境，false 用生产环境。
   ///
-  /// 换网络时只改这一行，地址不要带结尾斜杠。
+  /// 打生产包前必须改成 false；release 构建若仍为 true 会在启动时直接报错。
-  static const String devHostBaseUrl = 'http://10.43.47.1:8081';
+  static const bool useDevConfig = true;
 
-  /// 本机后端地址：通过 `adb reverse tcp:8081 tcp:8081` 映射到开发机，
+  /// 当前选中的环境地址。
-  /// 探测可达时 App 直连本机服务；不可达时回落到公网地址。
+  static String get baseUrl =>
-  static const String lanBaseUrl = 'http://127.0.0.1:8081';
+      useDevConfig ? DevConfig.baseUrl : ProdConfig.baseUrl;
-
-  /// 公网地址（远程/移动网络访问时使用）。
-  static const String publicBaseUrl = 'http://39.162.50.99:8081';
-
-  static const String _overrideBaseUrl = String.fromEnvironment('API_BASE_URL');
 
+  /// 调试面板手改的地址（见 `ServerEndpoint`）；为空表示用上面的环境地址。
   static String _runtimeBaseUrl = '';
 
+  /// 启动期异步准备（iOS 无线数据权限弹窗），目录请求前等待它。
   static Future<void>? _ready;
 
-  /// 启动地址探测完成信号；默认已完成，避免影响既有测试与调用方。
+  /// 启动准备完成信号；默认已完成，避免影响既有测试与调用方。
   static Future<void> get ready => _ready ?? Future<void>.value();
   static set ready(Future<void> value) => _ready = value;
 
-  static const Duration _probeTimeout = Duration(seconds: 2);
+  static const Duration requestTimeout = Duration(seconds: 8);
-  static const List<String> _probeCandidates = [
-    lanBaseUrl,
-    devHostBaseUrl,
-    if (devHostBaseUrl != publicBaseUrl) publicBaseUrl,
-  ];
 
-  /// Build-time server URL supplied through `--dart-define=API_BASE_URL`.
+  /// 实际使用的服务地址：运行时手改优先，否则用环境开关选中的地址。
-  static String get compiledBaseUrl => _overrideBaseUrl;
+  static String get apiBaseUrl =>
+      _runtimeBaseUrl.isNotEmpty ? _runtimeBaseUrl : baseUrl;
 
-  /// Existing platform-aware fallback used when no runtime or build override exists.
+  /// 应用一个已经规范化的运行时地址；传 null 表示清除。
-  static String get defaultBaseUrl => _defaultBaseUrl;
-
-  /// Effective server URL, including the debug-only runtime override.
-  static String get apiBaseUrl => _runtimeBaseUrl.isNotEmpty
-      ? _runtimeBaseUrl
-      : (compiledBaseUrl.isNotEmpty ? compiledBaseUrl : defaultBaseUrl);
-
-  static final String _defaultBaseUrl = _runsOnDevMachine
-      ? lanBaseUrl
-      : devHostBaseUrl;
-
-  /// 模拟器、桌面端与开发机同机，环回地址可用；iOS 真机不满足。
-  /// Android 没有等价的探测方式，统一按真机处理（模拟器用
-  /// `--dart-define=API_BASE_URL=http://10.0.2.2:8081` 覆盖）。
-  static final bool _runsOnDevMachine =
-      kIsWeb ||
-      defaultTargetPlatform == TargetPlatform.macOS ||
-      defaultTargetPlatform == TargetPlatform.windows ||
-      defaultTargetPlatform == TargetPlatform.linux ||
-      (defaultTargetPlatform == TargetPlatform.iOS &&
-          Platform.environment.containsKey('SIMULATOR_DEVICE_NAME'));
-
-  /// Applies an already normalized runtime URL. Passing null clears it.
   static void applyRuntimeBaseUrl(String? value) {
     _runtimeBaseUrl = value ?? '';
   }
 
-  /// Clears the in-memory runtime override, mainly for tests and restarts.
+  /// 清除运行时地址，主要给测试与重启流程用。
   static void clearRuntimeBaseUrl() {
     _runtimeBaseUrl = '';
   }
 
-  static const Duration requestTimeout = Duration(seconds: 8);
-
-  /// 按环回、开发机、公网顺序探测，写入首个返回 200 的地址。
-  ///
-  /// 全部不可达时使用平台默认地址，真机保留开发机地址，避免退回公网。
-  static Future<void> probeAndApplyBaseUrl({
-    Future<bool> Function(String baseUrl)? probe,
-    String? fallbackBaseUrl,
-
-    /// 编译期地址测试注入；未传时读取 `API_BASE_URL`。
-    String? compiledOverride,
-  }) async {
-    final compiled = compiledOverride ?? compiledBaseUrl;
-    if (compiled.isNotEmpty) {
-      if (_runtimeBaseUrl.isEmpty) applyRuntimeBaseUrl(compiled);
-      return;
-    }
-    final candidates = <String>[
-      if (_runtimeBaseUrl.isNotEmpty) _runtimeBaseUrl,
-      for (final candidate in _probeCandidates)
-        if (candidate != _runtimeBaseUrl) candidate,
-    ];
-    final results = await Future.wait([
-      for (final candidate in candidates)
-        probe == null
-            ? _probeBaseUrl(candidate)
-            : _runInjectedProbe(candidate, probe),
-    ]);
-    for (var index = 0; index < candidates.length; index++) {
-      final candidate = candidates[index];
-      final result = results[index];
-      if (kDebugMode) {
-        final status = result.ok
-            ? 'ok'
-            : 'fail(${result.reason ?? 'request failed'})';
-        debugPrint('[probe] $candidate -> $status');
-      }
-      if (result.ok) {
-        applyRuntimeBaseUrl(candidate);
-        return;
-      }
-    }
-    applyRuntimeBaseUrl(fallbackBaseUrl ?? defaultBaseUrl);
-  }
-
-  static Future<_ProbeResult> _runInjectedProbe(
-    String baseUrl,
-    Future<bool> Function(String baseUrl) probe,
-  ) async {
-    try {
-      return _ProbeResult(ok: await probe(baseUrl));
-    } catch (error) {
-      return _ProbeResult(ok: false, reason: error.toString());
-    }
-  }
-
-  static Future<_ProbeResult> _probeBaseUrl(String baseUrl) async {
-    final client = HttpClient()..connectionTimeout = _probeTimeout;
-    try {
-      return await _requestCategories(
-        client,
-        Uri.parse('$baseUrl/app/categories'),
-      ).timeout(_probeTimeout);
-    } catch (error) {
-      return _ProbeResult(ok: false, reason: error.toString());
-    } finally {
-      client.close(force: true);
-    }
-  }
-
-  static Future<_ProbeResult> _requestCategories(
-    HttpClient client,
-    Uri uri,
-  ) async {
-    final request = await client.getUrl(uri);
-    final response = await request.close();
-    await response.drain<void>();
-    final ok = response.statusCode == 200;
-    return _ProbeResult(
-      ok: ok,
-      reason: ok ? null : 'HTTP ${response.statusCode}',
-    );
-  }
-
   /// 后端返回的是相对路径（/files/...），这里补上服务地址。
   static String mediaUrl(String path) {
     if (path.isEmpty) return '';
@@ -167,10 +53,3 @@ class AppConfig {
     return '$apiBaseUrl$path';
   }
 }
-
-class _ProbeResult {
-  const _ProbeResult({required this.ok, this.reason});
-
-  final bool ok;
-  final String? reason;
-}

lib/core/config/dev_config.dart

@@ -0,0 +1,9 @@
+// Author: fruit.com.cn
+
+/// 开发环境配置。
+///
+/// 本机联调用：换 Wi-Fi、换网段后只改这里的 [baseUrl]，地址不要带结尾斜杠。
+abstract final class DevConfig {
+  /// 开发机后端地址。
+  static const String baseUrl = 'http://192.168.31.243:8081';
+}

lib/core/config/prod_config.dart

@@ -0,0 +1,9 @@
+// Author: fruit.com.cn
+
+/// 生产环境配置。
+///
+/// 发版前确认这里的 [baseUrl]，地址不要带结尾斜杠。
+abstract final class ProdConfig {
+  /// 生产后端地址。
+  static const String baseUrl = 'http://39.162.50.99:8081';
+}

lib/core/config/server_endpoint.dart

@@ -22,16 +22,9 @@ abstract final class ServerEndpoint {
     return value.replaceFirst(RegExp(r'/+$'), '');
   }
 
-  /// Resolves runtime > dart-define > default using normalized valid values.
+  /// 运行时手改优先，其次构建期默认地址；两者都必须先通过规范校验。
-  static String resolve({
+  static String resolve({required String? stored, required String fallback}) {
-    required String? stored,
+    return normalize(stored) ?? normalize(fallback) ?? fallback;
-    required String compiled,
-    required String fallback,
-  }) {
-    return normalize(stored) ??
-        normalize(compiled) ??
-        normalize(fallback) ??
-        fallback;
   }
 
   /// Loads the persisted override before the app creates its ApiClient.
@@ -46,11 +39,7 @@ abstract final class ServerEndpoint {
       final prefs = preferences ?? SharedPreferencesAsync();
       final stored = await prefs.getString(preferenceKey);
       AppConfig.applyRuntimeBaseUrl(
-        resolve(
+        resolve(stored: stored, fallback: AppConfig.baseUrl),
-          stored: stored,
-          compiled: AppConfig.compiledBaseUrl,
-          fallback: AppConfig.defaultBaseUrl,
-        ),
       );
     } catch (_) {
       AppConfig.clearRuntimeBaseUrl();

lib/core/data/models/drama.dart

@@ -21,6 +21,7 @@ class Episode {
     this.likeCount,
     this.commentCount,
     this.thumbnailsUrl,
+    this.posterUrl,
   });
 
   final String id;
@@ -37,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,
@@ -54,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) {
@@ -68,6 +86,7 @@ class Episode {
       likeCount: _optionalInt(json['likeCount']),
       commentCount: _optionalInt(json['commentCount']),
       thumbnailsUrl: _optionalString(json['thumbnailsUrl']),
+      posterUrl: _optionalString(json['posterUrl']),
     );
   }
 }
@@ -78,11 +97,13 @@ class Drama {
     required this.title,
     required this.synopsis,
     required this.posterUrl,
+    this.coverLandscape = '',
     this.episodes = const [],
     this.titleLocales = const {},
     this.synopsisLocales = const {},
     this.tag = '',
     this.tagLocales = const {},
+    this.tagCode = '',
     this.tagColor = '',
     this.category = '',
     this.categoryLocales = const {},
@@ -108,8 +129,14 @@ class Drama {
   final Map<String, String> synopsisLocales;
   final String tag;
   final Map<String, String> tagLocales;
+
+  /// 标签语义码（如 `NEW_ARRIVAL`）。文案会随语言变，语义判断只认这个码。
+  final String tagCode;
   final String tagColor;
   final String posterUrl;
+
+  /// 横版封面，用于继续观看横幅等横向展示位；为空时回退竖版 `posterUrl`。
+  final String coverLandscape;
   final List<Episode> episodes;
   final String category;
   final Map<String, String> categoryLocales;
@@ -153,8 +180,10 @@ class Drama {
       synopsisLocales: text.synopsisLocales,
       tag: text.tag,
       tagLocales: text.tagLocales,
+      tagCode: (json['tagCode'] as String? ?? '').trim(),
       tagColor: json['tagColor'] as String? ?? '',
       posterUrl: json['cover'] as String? ?? '',
+      coverLandscape: json['coverLandscape'] as String? ?? '',
       episodes: preview is Map<String, dynamic>
           ? [Episode.fromJson(preview)]
           : const [],
@@ -185,8 +214,10 @@ class Drama {
       synopsisLocales: text.synopsisLocales,
       tag: text.tag,
       tagLocales: text.tagLocales,
+      tagCode: (json['tagCode'] as String? ?? '').trim(),
       tagColor: json['tagColor'] as String? ?? '',
       posterUrl: json['cover'] as String? ?? '',
+      coverLandscape: json['coverLandscape'] as String? ?? '',
       category: text.category,
       categoryLocales: text.categoryLocales,
       types: text.types,
@@ -296,7 +327,10 @@ class _DramaText {
     final category = _firstText(categoryLocales, json['category'], types);
     return _DramaText(
       title: _firstText(titleLocales, json['title']),
-      synopsis: _firstText(synopsisLocales, json['synopsis'] ?? json['description']),
+      synopsis: _firstText(
+        synopsisLocales,
+        json['synopsis'] ?? json['description'],
+      ),
       titleLocales: titleLocales,
       synopsisLocales: synopsisLocales,
       tag: _firstText(tagLocales, json['tag']),
@@ -309,7 +343,11 @@ class _DramaText {
   }
 }
 
-String _firstText(Map<String, String> locales, Object? fallback, [List<Map<String, String>>? types]) {
+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) {
@@ -320,7 +358,9 @@ String _firstText(Map<String, String> locales, Object? fallback, [List<Map<Strin
 }
 
 String _genreText(List<Map<String, String>> types, Object? fallback) {
-  final names = types.map((item) => item['zh'] ?? '').where((value) => value.isNotEmpty);
+  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/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/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/watch_progress.dart

@@ -16,6 +16,7 @@ class WatchProgress {
     this.dramaTitle,
     this.titleLocales = const {},
     this.dramaCover,
+    this.dramaCoverLandscape,
     this.episodeNumber,
     this.totalEpisodes,
     this.finished = false,
@@ -29,6 +30,9 @@ class WatchProgress {
   final String? dramaTitle;
   final Map<String, String> titleLocales;
   final String? dramaCover;
+
+  /// 横版封面，用于继续观看横幅等横向位；为空时回退 [dramaCover]。
+  final String? dramaCoverLandscape;
   final int? episodeNumber;
   final int? totalEpisodes;
   final Duration position;
@@ -60,6 +64,7 @@ class WatchProgress {
       dramaTitle: json['dramaTitle']?.toString(),
       titleLocales: localeMap(json['titleLocales']),
       dramaCover: json['dramaCover']?.toString(),
+      dramaCoverLandscape: json['dramaCoverLandscape']?.toString(),
       episodeNumber: json['episodeNumber'] == null
           ? null
           : jsonToInt(json['episodeNumber']),
@@ -83,6 +88,7 @@ class WatchProgress {
     if (dramaTitle != null) 'dramaTitle': dramaTitle,
     if (titleLocales.isNotEmpty) 'titleLocales': titleLocales,
     if (dramaCover != null) 'dramaCover': dramaCover,
+    if (dramaCoverLandscape != null) 'dramaCoverLandscape': dramaCoverLandscape,
     if (episodeNumber != null) 'episodeNumber': episodeNumber,
     if (totalEpisodes != null) 'totalEpisodes': totalEpisodes,
     'positionMs': position.inMilliseconds,

lib/core/data/models/watch_record.dart

@@ -46,6 +46,14 @@ class WatchRecord {
     return pageCover.isNotEmpty ? pageCover : drama?.posterUrl ?? '';
   }
 
+  /// 横向展示位（继续观看横幅）优先用横版封面，缺省回退竖版。
+  String get displayLandscapeCover {
+    final pageLandscape = progress.dramaCoverLandscape?.trim() ?? '';
+    if (pageLandscape.isNotEmpty) return pageLandscape;
+    final landscape = drama?.coverLandscape.trim() ?? '';
+    return landscape.isNotEmpty ? landscape : displayCover;
+  }
+
   /// 分页接口已带展示字段时无需等待详情加载。
   bool get hasDisplayMetadata =>
       displayTitle.isNotEmpty ||

lib/core/data/remote/account_api.dart

@@ -4,6 +4,7 @@ import '../models/account_device.dart';
 import '../models/account_export.dart';
 import '../models/account_profile.dart';
 import 'api_client.dart';
+import 'response_decoders.dart';
 
 /// 个人中心接口：`/app/me*`。
 class AccountApi {
@@ -23,11 +24,9 @@ class AccountApi {
 
   Future<List<AccountDevice>> devices() async {
     final data = await _client.get('/app/me/devices');
-    if (data is! List) return const [];
+    return ResponseDecoders.asMapList(
-    return [
+      data,
-      for (final item in data)
+    ).map(AccountDevice.fromJson).toList();
-        if (item is Map) AccountDevice.fromJson(item.cast<String, dynamic>()),
-    ];
   }
 
   Future<AccountExport> export() async {
@@ -47,6 +46,7 @@ class AccountApi {
     await _client.post('/app/me/deactivate/cancel');
   }
 
+  /// 个人资料允许缺失：后端未返回对象时按空对象解析，页面用默认值兜底。
   Map<String, dynamic> _map(Object? data) =>
-      data is Map ? data.cast<String, dynamic>() : const {};
+      ResponseDecoders.tryMap(data) ?? const {};
 }

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

@@ -6,6 +6,7 @@ import '../models/page_result.dart';
 import '../models/playlist_detail.dart';
 import '../models/search_result.dart';
 import 'api_client.dart';
+import 'response_decoders.dart';
 
 /// 客户端目录接口，对应后端 `/app/**`。
 class CatalogApi {
@@ -14,11 +15,15 @@ class CatalogApi {
   final ApiClient _client;
 
   Future<HomeFeed> homeFeed() async {
-    return HomeFeed.fromJson(_asMap(await _client.get('/app/home/feed')));
+    return HomeFeed.fromJson(
+      ResponseDecoders.asMap(await _client.get('/app/home/feed')),
+    );
   }
 
   Future<HomeFeed> discoverFeed() async {
-    return HomeFeed.fromJson(_asMap(await _client.get('/app/discover/feed')));
+    return HomeFeed.fromJson(
+      ResponseDecoders.asMap(await _client.get('/app/discover/feed')),
+    );
   }
 
   /// 推荐流；types/categoryId 为空表示不过滤，cursor 为上一页末条。
@@ -29,7 +34,7 @@ class CatalogApi {
     int size = 10,
   }) async {
     return FeedPage.fromJson(
-      _asMap(
+      ResponseDecoders.asMap(
         await _client.get(
           '/app/feed',
           query: {
@@ -58,7 +63,7 @@ class CatalogApi {
         'pageSize': '$pageSize',
       },
     );
-    return SearchResult.fromJson(_asMap(data));
+    return SearchResult.fromJson(ResponseDecoders.asMap(data));
   }
 
   static const int playlistPageSize = 10;
@@ -86,7 +91,7 @@ class CatalogApi {
     int pageSize = playlistDramaPageSize,
   }) async {
     return PlaylistDetail.fromJson(
-      _asMap(
+      ResponseDecoders.asMap(
         await _client.get(
           '/app/playlists/$id',
           query: {
@@ -138,20 +143,13 @@ class CatalogApi {
 
   Future<Drama> dramaDetail(String dramaId) async {
     return Drama.fromDetailJson(
-      _asMap(await _client.get('/app/dramas/$dramaId')),
+      ResponseDecoders.asMap(await _client.get('/app/dramas/$dramaId')),
     );
   }
 
   List<ContentCategory> _categories(Object? data) {
-    if (data is! List) return const [];
+    return ResponseDecoders.asMapList(
-    return [
+      data,
-      for (final item in data)
+    ).map(ContentCategory.fromJson).toList();
-        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

@@ -4,6 +4,7 @@ import '../models/content_category.dart';
 import '../models/drama.dart';
 import '../models/page_result.dart';
 import 'api_client.dart';
+import 'response_decoders.dart';
 
 /// 内容分类接口，对应契约 `GET /app/categories`。
 class CategoryApi {
@@ -16,11 +17,9 @@ class CategoryApi {
   /// 拉取已启用分类，id 全程按字符串解析。
   Future<List<ContentCategory>> list() async {
     final data = await _client.get('/app/categories');
-    if (data is! List) return const [];
+    return ResponseDecoders.asMapList(
-    return [
+      data,
-      for (final item in data)
+    ).map(ContentCategory.fromJson).toList();
-        if (item is Map<String, dynamic>) ContentCategory.fromJson(item),
-    ];
   }
 
   /// 分类下已上线短剧，pageIndex 从 1 开始。

lib/core/data/remote/commerce_api.dart

@@ -4,6 +4,7 @@ import '../models/order.dart';
 import '../models/product.dart';
 import '../models/wallet.dart';
 import 'api_client.dart';
+import 'response_decoders.dart';
 
 /// 金币与解锁接口，对应契约 §1.8。
 class CommerceApi {
@@ -13,8 +14,7 @@ class CommerceApi {
 
   Future<WalletSnapshot> wallet() async {
     final data = await _client.get('/app/wallet');
-    if (data is Map<String, dynamic>) return WalletSnapshot.fromJson(data);
+    return WalletSnapshot.fromJson(ResponseDecoders.asMap(data));
-    throw const ApiException(-1, '返回数据格式异常');
   }
 
   /// 上架商品列表；`type` 传 `COIN_PACK` 或 `VIP`。
@@ -23,13 +23,9 @@ class CommerceApi {
       '/app/products',
       query: type == null ? null : {'type': type},
     );
-    if (data is List) {
+    return ResponseDecoders.requiredMapList(
-      return data
+      data,
-          .whereType<Map<String, dynamic>>()
+    ).map(AppProduct.fromJson).toList();
-          .map(AppProduct.fromJson)
-          .toList();
-    }
-    throw const ApiException(-1, '返回数据格式异常');
   }
 
   /// 创建充值订单，返回 `CREATED` 状态订单。
@@ -38,13 +34,11 @@ class CommerceApi {
       '/app/orders',
       body: {'productId': productId},
     );
-    if (data is Map<String, dynamic>) return AppOrder.fromJson(data);
+    return AppOrder.fromJson(ResponseDecoders.asMap(data));
-    throw const ApiException(-1, '返回数据格式异常');
   }
 
   Future<UnlockResult> unlock(String episodeId) async {
     final data = await _client.post('/app/episodes/$episodeId/unlock');
-    if (data is Map<String, dynamic>) return UnlockResult.fromJson(data);
+    return UnlockResult.fromJson(ResponseDecoders.asMap(data));
-    throw const ApiException(-1, '返回数据格式异常');
   }
 }

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/download_api.dart

@@ -3,6 +3,7 @@
 import '../models/download_license.dart';
 import '../models/download_policy.dart';
 import 'api_client.dart';
+import 'response_decoders.dart';
 
 /// 离线下载授权接口，对应契约 §1.6 的全部 8 个接口。
 ///
@@ -15,7 +16,7 @@ class DownloadApi {
   /// 拉取配额和偏好策略。
   Future<DownloadPolicy> policy() async {
     return DownloadPolicy.fromJson(
-      _asMap(await _client.get('/app/downloads/policy')),
+      ResponseDecoders.asMap(await _client.get('/app/downloads/policy')),
     );
   }
 
@@ -30,7 +31,7 @@ class DownloadApi {
   /// 申请下载授权；同集重复申请由服务端保证幂等。
   Future<DownloadLicense> grant(String episodeId, {String? quality}) async {
     return DownloadLicense.fromJson(
-      _asMap(
+      ResponseDecoders.asMap(
         await _client.post(
           '/app/downloads',
           body: {'episodeId': episodeId, 'quality': ?quality},
@@ -42,17 +43,17 @@ class DownloadApi {
   /// 拉取当前设备的授权列表。
   Future<List<DownloadLicense>> list() async {
     final data = await _client.get('/app/downloads');
-    if (data is! List) return const [];
+    return ResponseDecoders.asMapList(
-    return [
+      data,
-      for (final item in data)
+    ).map(DownloadLicense.fromJson).toList();
-        if (item is Map<String, dynamic>) DownloadLicense.fromJson(item),
-    ];
   }
 
   /// 续传前刷新短时效下载地址。
   Future<DownloadLicense> refreshUrl(String episodeId) async {
     return DownloadLicense.fromJson(
-      _asMap(await _client.get('/app/downloads/$episodeId/url')),
+      ResponseDecoders.asMap(
+        await _client.get('/app/downloads/$episodeId/url'),
+      ),
     );
   }
 
@@ -67,7 +68,7 @@ class DownloadApi {
     String? errorMsg,
   }) async {
     return DownloadLicense.fromJson(
-      _asMap(
+      ResponseDecoders.asMap(
         await _client.post(
           '/app/downloads/$episodeId/progress',
           body: {
@@ -93,9 +94,4 @@ class DownloadApi {
     final data = await _client.delete('/app/downloads');
     return data is int ? data : 0;
   }
-
-  Map<String, dynamic> _asMap(Object? data) {
-    if (data is Map<String, dynamic>) return data;
-    throw const ApiException(-1, '');
-  }
 }

lib/core/data/remote/playback_api.dart

@@ -1,7 +1,9 @@
 // Author: fruit.com.cn
 
+import '../models/episode_stats.dart';
 import '../models/play_ticket.dart';
 import 'api_client.dart';
+import 'response_decoders.dart';
 
 /// 播放票据接口：`GET /app/episodes/{id}/play`（契约 §1.4）。
 ///
@@ -14,7 +16,12 @@ class PlaybackApi {
 
   Future<PlayTicket> ticket(String episodeId) async {
     final data = await _client.get('/app/episodes/$episodeId/play');
-    if (data is Map<String, dynamic>) return PlayTicket.fromJson(data);
+    return PlayTicket.fromJson(ResponseDecoders.asMap(data));
-    throw const ApiException(-1, '返回数据格式异常');
+  }
+
+  /// 轻量刷新互动计数：不签发地址，也不占用播放票据缓存。
+  Future<EpisodeStats> episodeStats(String episodeId) async {
+    final data = await _client.get('/app/episodes/$episodeId/stats');
+    return EpisodeStats.fromJson(ResponseDecoders.asMap(data));
   }
 }

lib/core/data/remote/response_decoders.dart

@@ -0,0 +1,49 @@
+// Author: fruit.com.cn
+
+import 'api_exception.dart';
+
+/// 接口响应 `data` 字段的统一解析。
+///
+/// 此前每个 `*_api.dart` 各写一份 `is Map` 判断与错误文案，还出现过抛空
+/// message 导致界面显示空白的情况；统一收口到这里，语义只有三种：
+/// 必须为对象、可为空对象、对象数组。
+abstract final class ResponseDecoders {
+  /// 业务失败码：HTTP 成功但 `data` 结构不符合约定。
+  static const int malformedCode = -1;
+
+  /// `data` 结构异常时的提示，可直接展示给用户。
+  static const String malformedMessage = '返回数据格式异常';
+
+  /// 要求 `data` 是对象，否则抛 [ApiException]。
+  static Map<String, dynamic> asMap(Object? data) {
+    final map = tryMap(data);
+    if (map == null) {
+      throw const ApiException(malformedCode, malformedMessage);
+    }
+    return map;
+  }
+
+  /// 允许缺失：`data` 为空或不是对象时返回 null。
+  static Map<String, dynamic>? tryMap(Object? data) {
+    if (data is Map<String, dynamic>) return data;
+    if (data is Map) return data.cast<String, dynamic>();
+    return null;
+  }
+
+  /// 对象数组；不是数组时按空列表处理，避免列表页因结构异常白屏。
+  static List<Map<String, dynamic>> asMapList(Object? data) {
+    if (data is! List) return const [];
+    return data
+        .whereType<Map>()
+        .map((item) => item.cast<String, dynamic>())
+        .toList();
+  }
+
+  /// 对象数组；不是数组时抛 [ApiException]，用于不能静默为空的数据（如商品）。
+  static List<Map<String, dynamic>> requiredMapList(Object? data) {
+    if (data is! List) {
+      throw const ApiException(malformedCode, malformedMessage);
+    }
+    return asMapList(data);
+  }
+}

lib/core/data/remote/watch_api.dart

@@ -3,8 +3,9 @@
 import '../models/page_result.dart';
 import '../models/watch_progress.dart';
 import 'api_client.dart';
+import 'response_decoders.dart';
 
-/// 观看进度接口：`/app/watch/*`（契约 §1.5）。全部需要登录态。
+/// 观看进度接口：`/app/watch/*`（契约 §1.5）。支持账号或设备身份。
 class WatchApi {
   const WatchApi(this._client);
 
@@ -28,7 +29,8 @@ class WatchApi {
         'source': source,
       },
     );
-    return data is Map<String, dynamic> ? WatchProgress.fromJson(data) : null;
+    final map = ResponseDecoders.tryMap(data);
+    return map == null ? null : WatchProgress.fromJson(map);
   }
 
   /// 某部剧的续看位置；没有记录时后端返回空 data。
@@ -37,7 +39,8 @@ class WatchApi {
       '/app/watch/progress',
       query: {'dramaId': dramaId},
     );
-    return data is Map<String, dynamic> ? WatchProgress.fromJson(data) : null;
+    final map = ResponseDecoders.tryMap(data);
+    return map == null ? null : WatchProgress.fromJson(map);
   }
 
   /// 最近观看分页：`pageIndex`/`pageSize`，解包 `PageResult`。
@@ -49,13 +52,9 @@ class WatchApi {
       '/app/watch/recent',
       query: {'pageIndex': '$pageIndex', 'pageSize': '$pageSize'},
     );
-    if (data is! Map) {
+    final map = ResponseDecoders.tryMap(data);
-      return const PageResult();
+    if (map == null) return const PageResult();
-    }
+    return PageResult.fromJson(map, WatchProgress.fromJson);
-    return PageResult.fromJson(
-      Map<String, dynamic>.from(data),
-      WatchProgress.fromJson,
-    );
   }
 
   /// 删除某部剧的观看记录（记录页清单条用）。

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/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

@@ -66,7 +66,7 @@ class AllDramasController {
     this.categories = const [],
     this.tags = const [],
     this.dramas = const [],
-  }) : _api = api;
+  }) : _api = api; // ignore: prefer_initializing_formals
 
   final AllDramasRemote? _api;
   List<ContentCategory> classifications;

lib/core/data/services/android_picture_in_picture.dart

@@ -3,7 +3,8 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/services.dart';
 
-/// Native Android activity PiP; the Flutter playback session keeps the player.
+/// 原生活动级画中画桥：Android 是 Activity PiP（画面即 Flutter 渲染），
+/// iOS 是影子播放器接力（画面/声音来自原生 AVPlayer，退出时进度回传）。
 class AndroidPictureInPicture {
   AndroidPictureInPicture({MethodChannel? channel})
     : _channel = channel ?? const MethodChannel('com.stormg.lumadrama/pip');
@@ -11,22 +12,147 @@ class AndroidPictureInPicture {
   final MethodChannel _channel;
 
   bool get isPlatformSupported =>
-      !kIsWeb && defaultTargetPlatform == TargetPlatform.android;
+      !kIsWeb &&
+      (defaultTargetPlatform == TargetPlatform.android ||
+          defaultTargetPlatform == TargetPlatform.iOS);
 
-  void setStateListener(ValueChanged<bool>? listener) {
+  void Function(bool active, int finalPositionMs)? _pipChangedListener;
-    _channel.setMethodCallHandler(
+  VoidCallback? _playbackEndedListener;
-      listener == null
+
-          ? null
+  /// PiP 状态回调：iOS 停止时 [finalPositionMs] 为影子最终进度（毫秒）。
-          : (call) async {
+  void setStateListener(void Function(bool active, int finalPositionMs)? listener) {
-              if (call.method == 'onPipChanged') {
+    _pipChangedListener = listener;
-                listener(call.arguments == true);
+    _refreshHandler();
-              }
-            },
-    );
   }
 
-  Future<bool> enter() async {
+  /// iOS 画中画内影子播完当前集（Android 不会触发）。
+  void setPlaybackEndedListener(VoidCallback? listener) {
+    _playbackEndedListener = listener;
+    _refreshHandler();
+  }
+
+  void _refreshHandler() {
+    if (_pipChangedListener == null && _playbackEndedListener == null) {
+      _channel.setMethodCallHandler(null);
+      return;
+    }
+    _channel.setMethodCallHandler((call) async {
+      switch (call.method) {
+        case 'pipDebug':
+          debugPrint('pip[native]: ${call.arguments}');
+        case 'onPipChanged':
+          final listener = _pipChangedListener;
+          if (listener == null) return;
+          final args = call.arguments;
+          if (args is Map) {
+            listener(
+              args['active'] == true,
+              (args['positionMs'] as num?)?.toInt() ?? 0,
+            );
+          } else {
+            // Android 只回传 bool。
+            listener(args == true, 0);
+          }
+        case 'onPipPlaybackEnded':
+          _playbackEndedListener?.call();
+      }
+    });
+  }
+
+  /// 进入画中画。Android 忽略片源参数；iOS 用 [url] 与 [positionMs]
+  /// 初始化影子播放器（对齐到当前进度、静音待命）。
+  Future<bool> enter({required String url, required int positionMs}) async {
     if (!isPlatformSupported) return false;
-    return await _channel.invokeMethod<bool>('enter') ?? false;
+    return await _channel.invokeMethod<bool>('enter', {
+          'url': url,
+          'positionMs': positionMs,
+        }) ??
+        false;
+  }
+
+  /// 创建影子播放器但不起播（仅 iOS）：
+  /// 自动小窗待命形态——静音暂停，退后台由 [armAutoEnter] 拉起。
+  Future<void> prepareShadow({
+    required String url,
+    required int positionMs,
+    bool autoEnter = false,
+  }) async {
+    if (defaultTargetPlatform != TargetPlatform.iOS || kIsWeb) return;
+    try {
+      await _channel.invokeMethod<void>('prepareShadow', {
+        'url': url,
+        'positionMs': positionMs,
+        'autoEnter': autoEnter,
+      });
+    } catch (_) {}
+  }
+
+  /// 退后台瞬间把影子对齐到当前进度并静音起播，触发系统自动画中画（仅 iOS）。
+  Future<void> armAutoEnter(int positionMs) async {
+    if (defaultTargetPlatform != TargetPlatform.iOS || kIsWeb) return;
+    try {
+      await _channel.invokeMethod<void>('armAutoEnter', {
+        'positionMs': positionMs,
+      });
+    } catch (_) {}
+  }
+
+  /// 回前台后影子回待命（暂停、静音）（仅 iOS）。
+  Future<void> disarmAutoEnter() async {
+    if (defaultTargetPlatform != TargetPlatform.iOS || kIsWeb) return;
+    try {
+      await _channel.invokeMethod<void>('disarmAutoEnter');
+    } catch (_) {}
+  }
+
+  /// 显示原生还原过渡层（仅 iOS；还原动画开始时原生侧也会自动盖上）。
+  Future<void> showRestoreOverlay() async {
+    if (defaultTargetPlatform != TargetPlatform.iOS || kIsWeb) return;
+    try {
+      await _channel.invokeMethod<void>('showRestoreOverlay');
+    } catch (_) {}
+  }
+
+  /// 淡出原生还原过渡层（仅 iOS；视频首帧确认后调用）。
+  Future<void> hideRestoreOverlay() async {
+    if (defaultTargetPlatform != TargetPlatform.iOS || kIsWeb) return;
+    try {
+      await _channel.invokeMethod<void>('hideRestoreOverlay');
+    } catch (_) {}
+  }
+
+  /// 解除影子静音并起播（仅 iOS 有意义，进入 PiP 后声音交给影子）。
+  Future<void> unmute() async {
+    if (defaultTargetPlatform != TargetPlatform.iOS || kIsWeb) return;
+    try {
+      await _channel.invokeMethod<void>('unmute');
+    } catch (_) {}
+  }
+
+  /// iOS 画中画内换集：影子只换播放项，窗口不中断。
+  Future<void> replaceItem({required String url, required int positionMs}) async {
+    if (defaultTargetPlatform != TargetPlatform.iOS || kIsWeb) return;
+    try {
+      await _channel.invokeMethod<void>('replaceItem', {
+        'url': url,
+        'positionMs': positionMs,
+      });
+    } catch (_) {}
+  }
+
+  /// 请求退出画中画（iOS；触发 onPipChanged(false) 后由 Dart 收尾）。
+  Future<void> stop() async {
+    if (defaultTargetPlatform != TargetPlatform.iOS || kIsWeb) return;
+    try {
+      await _channel.invokeMethod<void>('stop');
+    } catch (_) {}
+  }
+
+  /// 销毁影子播放器（仅 iOS）。
+  Future<void> teardown() async {
+    if (defaultTargetPlatform != TargetPlatform.iOS || kIsWeb) return;
+    try {
+      await _channel.invokeMethod<void>('teardown');
+    } catch (_) {}
   }
 }

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 到其中一套。
 ///
-/// 设备号是后端注册风控与后续"下载设备绑定"的依据，所以**首次生成后就固定下来**；
+/// 设备号优先取系统标识（Android SSAID / iOS IDFV），这样卸载重装后还是同一台设备；
-/// 不引 UUID 库（保持极简依赖），用「时间戳 + 随机数」拼一个够用的 id。
+/// 系统标识不可用时才回退到本地生成并持久化的 UUID，保证任何环境都能跑。
 class AuthSessionStore {
-  AuthSessionStore({SharedPreferencesAsync? preferences})
+  AuthSessionStore({
-    : _preferences = preferences ?? SharedPreferencesAsync();
+    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) ?? '';
+    final systemId = await _deviceIdProvider.systemDeviceId();
-    if (value.isEmpty) {
+    final value = systemId ?? await _localDeviceId();
-      final random = Random();
-      value =
-          'd-${DateTime.now().millisecondsSinceEpoch.toRadixString(36)}-'
-          '${random.nextInt(1 << 32).toRadixString(36)}';
-      await _preferences.setString(_kDeviceId, value);
-    }
     _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/catalog_retry.dart

@@ -1,12 +0,0 @@
-// Author: fruit.com.cn
-
-import '../../config/app_config.dart';
-
-/// 重新探测服务地址后再加载指定目录数据。
-Future<void> retryCatalogLoad({
-  required Future<void> Function() reload,
-  Future<void> Function()? probe,
-}) async {
-  await (probe ?? AppConfig.probeAndApplyBaseUrl)();
-  await reload();
-}

lib/core/data/services/channel_feed_controller.dart

@@ -0,0 +1,233 @@
+// Author: fruit.com.cn
+
+import 'dart:async';
+
+import 'package:flutter/foundation.dart';
+
+import '../../data/models/drama.dart';
+import '../../data/models/feed_page.dart';
+
+/// 单个分桶（频道/分类）的游标分页状态。
+class ChannelFeedState {
+  List<Drama> dramas = const [];
+  String? cursor;
+  bool hasMore = true;
+  bool loaded = false;
+  bool loading = false;
+  bool loadingMore = false;
+  String? lastError;
+  int requestSeq = 0;
+  Future<bool>? inFlight;
+  bool skipNextRefresh = false;
+
+  /// 正在持有 [loading] 的那次刷新请求的序号；被抢占时据此只由原请求复位。
+  int? loadingOwner;
+}
+
+/// 按 key 分桶的游标分页控制器基类。
+///
+/// 首页频道与剧场分类的逻辑完全同构：缓存优先渲染、请求序号防串台、
+/// 分页去重追加。两者此前各写一份，改动容易只改一边，故收口到这里，
+/// 子类只需提供分桶 key 与「如何发一次请求」。
+abstract class ChannelFeedController<K> extends ChangeNotifier {
+  ChannelFeedController(
+    K initialKey, {
+    bool initiallySelected = true,
+    this.requestTimeout = defaultRequestTimeout,
+  }) : _current = initialKey,
+       _selected = initiallySelected;
+
+  static const int pageSize = 20;
+  static const Duration defaultRequestTimeout = Duration(seconds: 10);
+
+  final Duration requestTimeout;
+  final Map<K, ChannelFeedState> _states = {};
+  K _current;
+  bool _selected;
+  bool _disposed = false;
+
+  K get currentKey => _current;
+  String? get lastError => _state(_current).lastError;
+  List<Drama> get dramas => _state(_current).dramas;
+  String? get cursor => _state(_current).cursor;
+  bool get hasMore => _state(_current).hasMore;
+  bool get loaded => _state(_current).loaded;
+  bool get isLoading => _state(_current).loading;
+  bool get loadingMore => _state(_current).loadingMore;
+  bool get loadingFirstPage => !loaded && _state(_current).loading;
+
+  /// 子类实现：按 key 拉一页；[cursor] 为空表示首屏/刷新。
+  @protected
+  Future<FeedPage> fetchPage(K key, {String? cursor});
+
+  /// 同步切换分桶；有缓存先渲染，无缓存时复用或等待在飞请求。
+  @protected
+  Future<void> selectKey(K next) async {
+    if (_selected && next == _current) return;
+    _current = next;
+    _selected = true;
+    _notify();
+    final state = _state(next);
+    if (state.dramas.isNotEmpty) {
+      if (state.skipNextRefresh) {
+        state.skipNextRefresh = false;
+      } else if (!state.loading) {
+        unawaited(_refresh(next, keepData: true));
+      }
+      return;
+    }
+    if (state.loading) {
+      final inFlight = state.inFlight;
+      if (inFlight != null) await inFlight;
+      state.skipNextRefresh = false;
+      return;
+    }
+    await _refresh(next, keepData: false);
+  }
+
+  /// 用已有数据填充某个分桶，不发起网络请求。
+  @protected
+  void seedKey(K key, List<Drama> dramas) {
+    final state = _state(key);
+    state
+      ..requestSeq = state.requestSeq + 1
+      ..dramas = List.unmodifiable(dramas)
+      ..cursor = null
+      ..hasMore = false
+      ..loaded = true
+      ..loading = false
+      ..loadingOwner = null
+      ..loadingMore = false
+      ..lastError = null
+      ..inFlight = null;
+    _notifyIfCurrent(key);
+  }
+
+  /// 后台预取某个分桶首屏；成功后标记「切过去不必再刷一次」。
+  @protected
+  Future<void> prefetchKey(K key) async {
+    final state = _state(key);
+    if (state.loaded || state.loading) return;
+    final success = await _refresh(key, keepData: false);
+    if (success && !_disposed) state.skipNextRefresh = true;
+  }
+
+  /// 刷新当前分桶，失败时保留旧数据。
+  Future<bool> refreshCurrent() async {
+    final state = _state(_current);
+    if (state.loading) {
+      return await state.inFlight ?? false;
+    }
+    return _refresh(_current, keepData: true);
+  }
+
+  /// 加载当前分桶下一页并去重追加。
+  Future<void> loadMore() async {
+    final key = _current;
+    final state = _state(key);
+    if (!state.hasMore || state.loadingMore || state.cursor == null) return;
+    final seq = ++state.requestSeq;
+    state.loadingMore = true;
+    _notifyIfCurrent(key);
+    try {
+      final page = await fetchPage(
+        key,
+        cursor: state.cursor,
+      ).timeout(requestTimeout);
+      if (!_acceptSequence(key, seq)) return;
+      final seen = state.dramas.map((drama) => drama.id).toSet();
+      final appended = page.dramas
+          .where((drama) => seen.add(drama.id))
+          .toList();
+      state
+        ..dramas = List.unmodifiable([...state.dramas, ...appended])
+        ..cursor = page.nextCursor
+        ..hasMore = page.hasMore
+        ..loaded = true
+        ..lastError = null;
+    } catch (error) {
+      if (_acceptSequence(key, seq)) {
+        state.lastError = error.toString();
+      }
+    } finally {
+      state.loadingMore = false;
+      _notifyIfCurrent(key);
+    }
+  }
+
+  Future<bool> _refresh(K key, {required bool keepData}) {
+    final state = _state(key);
+    final operation = _performRefresh(key, keepData: keepData);
+    state.inFlight = operation;
+    unawaited(_clearInFlight(state, operation));
+    return operation;
+  }
+
+  Future<bool> _performRefresh(K key, {required bool keepData}) async {
+    final state = _state(key);
+    final seq = ++state.requestSeq;
+    state
+      ..loading = true
+      ..loadingOwner = seq
+      ..lastError = null;
+    _notifyIfCurrent(key);
+    try {
+      final page = await fetchPage(key).timeout(requestTimeout);
+      if (!_acceptSequence(key, seq)) return false;
+      state
+        ..dramas = List.unmodifiable(page.dramas)
+        ..cursor = page.nextCursor
+        ..hasMore = page.hasMore
+        ..loaded = true
+        ..lastError = null;
+      _notifyIfCurrent(key);
+      return true;
+    } catch (error) {
+      if (!_acceptSequence(key, seq)) return false;
+      if (!keepData) state.dramas = const [];
+      state
+        ..loaded = true
+        ..lastError = error.toString();
+      _notifyIfCurrent(key);
+      return false;
+    } finally {
+      // 只由「真正拥有 loading 的那次请求」复位：被 loadMore 抢占时它不再
+      // 更新数据，但必须收掉自己打开的加载态，否则该分桶会一直显示加载中，
+      // 之后 refreshCurrent 也只会读到已清空的 inFlight 而永远返回 false。
+      if (!_disposed && state.loadingOwner == seq) {
+        state
+          ..loading = false
+          ..loadingOwner = null;
+        _notifyIfCurrent(key);
+      }
+    }
+  }
+
+  Future<void> _clearInFlight(
+    ChannelFeedState state,
+    Future<bool> operation,
+  ) async {
+    await operation;
+    if (identical(state.inFlight, operation)) state.inFlight = null;
+  }
+
+  ChannelFeedState _state(K key) =>
+      _states.putIfAbsent(key, ChannelFeedState.new);
+
+  bool _acceptSequence(K key, int seq) =>
+      !_disposed && _state(key).requestSeq == seq;
+
+  void _notifyIfCurrent(K key) {
+    if (!_disposed && key == _current) _notify();
+  }
+
+  void _notify() {
+    if (!_disposed) notifyListeners();
+  }
+
+  @override
+  void dispose() {
+    _disposed = true;
+    super.dispose();
+  }
+}

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,53 @@
+// 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;
+    // 只有两端原生侧实现了 region；其它平台（测试、桌面）上通道没有 handler，
+    // 调用会一直挂着，注册流程会卡在"转圈"。
+    if (!Platform.isAndroid && !Platform.isIOS) 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

@@ -1,125 +1,130 @@
 // Author: fruit.com.cn
 
-import 'package:flutter/foundation.dart';
-
 import '../models/drama.dart';
+import '../models/page_result.dart';
+import '../remote/api_client.dart';
 import '../repositories/favorite_repository.dart';
+import 'paged_list_controller.dart';
 
 /// 收藏状态：**以服务端为准**。
 ///
 /// 点击收藏先乐观更新（立刻变色），失败再回滚并给出提示 —— 网络抖动时不至于
 /// "点了没反应"或"看起来收藏了其实没有"。
-class FavoriteController extends ChangeNotifier {
+class FavoriteController extends PagedListController<Drama> {
-  FavoriteController(this._repository, {this.pageSize = defaultPageSize});
+  FavoriteController(this._repository, {this.pageSize = defaultPageSize})
+    : super(fallbackErrorKey: 'favoritesError');
 
   static const int defaultPageSize = 20;
 
   final FavoriteRepository _repository;
   final int pageSize;
   final Set<String> _saved = {};
-  List<Drama> cards = const [];
+  final Map<String, int> _favoriteCounts = {};
-  int total = 0;
+
-  bool loading = false;
+  /// 收藏列表卡片（按服务端顺序）。
-  bool loadingMore = false;
+  List<Drama> get cards => items;
-  bool hasMore = false;
-  String? error;
-  String? loadMoreError;
-  int _pageIndex = 0;
-  int _requestSeq = 0;
-  bool _disposed = false;
 
   Set<String> get savedIds => Set.unmodifiable(_saved);
 
   bool isSaved(String dramaId) => _saved.contains(dramaId);
 
-  void notify() {
+  /// 当前剧收藏数；包含本地 toggle 增量。
-    if (!_disposed) notifyListeners();
+  int? favoriteCount(String dramaId) => _favoriteCounts[dramaId];
+
+  /// 页面统一把收藏失败翻译成固定 key。
+  @override
+  String? errorKeyFor(Object failure) => 'favoritesError';
+
+  @override
+  Future<PageResult<Drama>> fetchPage(int pageIndex) {
+    return _repository.page(pageIndex: pageIndex, pageSize: pageSize);
   }
 
-  /// 拉收藏列表：列表既用于"我的"页展示，也用于校准 [savedIds]。
+  @override
-  Future<void> load() async {
+  String itemKey(Drama item) => item.id;
-    final request = ++_requestSeq;
+
-    loading = true;
+  /// 第一页到位后，用服务端列表校准收藏集合与计数。
-    loadingMore = false;
+  @override
-    error = null;
+  void onItemsReplaced() {
-    loadMoreError = null;
+    _saved
-    notify();
+      ..clear()
-    try {
+      ..addAll(items.map((drama) => drama.id));
-      final page = await _repository.page(pageIndex: 1, pageSize: pageSize);
+    _rememberCardCounts(items);
-      if (_disposed || request != _requestSeq) return;
+  }
-      final list = _uniqueCards(page.list);
+
-      cards = list;
+  @override
-      _saved
+  Future<void> onPageLoaded(List<Drama> added) async {
-        ..clear()
+    _saved.addAll(added.map((drama) => drama.id));
-        ..addAll(list.map((drama) => drama.id));
+    _rememberCardCounts(added);
-      total = page.total;
+  }
-      _pageIndex = 1;
+
-      hasMore = page.list.isNotEmpty && cards.length < total;
+  /// 首次展示时缓存卡片基数；之后统一由本控制器维护，避免页面各存一份。
-    } catch (_) {
+  int? favoriteCountFor(Drama drama) {
-      if (!_disposed && request == _requestSeq) {
+    final current = _favoriteCounts[drama.id];
-        error = 'favoritesError';
+    if (current != null) return current;
-      }
+    final fallback = drama.favoriteCount;
-    } finally {
+    if (fallback == null) return null;
-      if (!_disposed && request == _requestSeq) {
+    final normalized = fallback < 0 ? 0 : fallback;
-        loading = false;
+    _favoriteCounts[drama.id] = normalized;
-        notify();
+    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;
-  Future<void> loadMore() async {
+      _favoriteCounts[dramaId] = normalized;
-    if (loading || loadingMore || !hasMore) return;
-    final request = ++_requestSeq;
-    loadingMore = true;
-    loadMoreError = null;
-    notify();
-    try {
-      final page = await _repository.page(
-        pageIndex: _pageIndex + 1,
-        pageSize: pageSize,
-      );
-      if (_disposed || request != _requestSeq) return;
-      final known = cards.map((drama) => drama.id).toSet();
-      final appended = _uniqueCards(
-        page.list,
-      ).where((drama) => known.add(drama.id)).toList(growable: false);
-      cards = [...cards, ...appended];
-      _saved.addAll(appended.map((drama) => drama.id));
-      total = page.total;
-      _pageIndex += 1;
-      hasMore = page.list.isNotEmpty && cards.length < total;
-    } catch (_) {
-      if (!_disposed && request == _requestSeq) {
-        loadMoreError = 'favoritesError';
-      }
-    } finally {
-      if (!_disposed && request == _requestSeq) {
-        loadingMore = false;
-        notify();
-      }
     }
+    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();
+  }
+
+  /// 每次切换都以接口状态为准；匿名请求由设备号归属。
   ///
   /// [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();
+        setItems(cards.where((drama) => drama.id != dramaId).toList());
-        total = total > 0 ? total - 1 : 0;
+        setTotal(total - 1);
-        hasMore = cards.length < total;
       }
     } else {
       _saved.add(dramaId);
+      _stepCount(dramaId, 1);
     }
     notify();
     try {
@@ -128,35 +133,37 @@ class FavoriteController extends ChangeNotifier {
       if (saved) {
         _saved.add(dramaId);
         if (wasSaved) {
-          cards = previousCards;
+          _restoreCount(dramaId, previousCount);
-          total = previousTotal;
+          setItems(previousCards);
-          hasMore = previousHasMore;
+          setTotal(previousTotal);
         } else if (card != null && !cards.any((drama) => drama.id == dramaId)) {
-          cards = [card, ...cards];
+          setItems([card, ...cards]);
-          total += 1;
+          setTotal(total + 1);
-          hasMore = cards.length < total;
         }
       } else {
         _saved.remove(dramaId);
+        if (!wasSaved) {
+          _restoreCount(dramaId, previousCount);
+        }
         if (cards.any((drama) => drama.id == dramaId)) {
-          cards = cards.where((drama) => drama.id != dramaId).toList();
+          setItems(cards.where((drama) => drama.id != dramaId).toList());
-          total = total > 0 ? total - 1 : 0;
+          setTotal(total - 1);
-          hasMore = cards.length < total;
         }
       }
       notify();
       return true;
-    } catch (_) {
+    } catch (failure) {
       // 回滚
-      cards = previousCards;
+      setItems(previousCards);
-      total = previousTotal;
+      setTotal(previousTotal);
-      hasMore = previousHasMore;
       if (wasSaved) {
         _saved.add(dramaId);
       } else {
         _saved.remove(dramaId);
       }
+      _restoreCount(dramaId, previousCount);
       notify();
+      if (failure is ApiException) lastErrorCode = failure.code;
       return false;
     }
   }
@@ -167,26 +174,30 @@ class FavoriteController extends ChangeNotifier {
     if (ids.isEmpty) return true;
     final previousCards = cards;
     final previousTotal = total;
-    final previousHasMore = hasMore;
     final removed = cards.where((drama) => ids.contains(drama.id)).toList();
     if (removed.isEmpty) return true;
-    cards = cards.where((drama) => !ids.contains(drama.id)).toList();
+    final previousCounts = {
+      for (final drama in removed) drama.id: _favoriteCounts[drama.id],
+    };
+    setItems(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;
+    setTotal(total - removed.length);
-    hasMore = cards.length < total;
     notify();
     try {
       await _repository.removeMany(dramaIds);
       return true;
     } catch (_) {
-      cards = previousCards;
+      setItems(previousCards);
-      total = previousTotal;
+      setTotal(previousTotal);
-      hasMore = previousHasMore;
       for (final drama in removed) {
         _saved.add(drama.id);
       }
+      for (final entry in previousCounts.entries) {
+        _restoreCount(entry.key, entry.value);
+      }
       notify();
       return false;
     }
@@ -197,11 +208,12 @@ 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;
+    setItems(next);
-    total = total > 0 ? total - 1 : 0;
+    setTotal(total - 1);
-    hasMore = cards.length < total;
     notify();
     try {
       await _repository.remove(dramaId);
@@ -212,10 +224,10 @@ class FavoriteController extends ChangeNotifier {
         index > restored.length ? restored.length : index,
         removed,
       );
-      cards = restored;
+      setItems(restored);
       _saved.add(dramaId);
-      total += 1;
+      _restoreCount(dramaId, previousCount);
-      hasMore = cards.length < total;
+      setTotal(total + 1);
       notify();
       return false;
     }
@@ -223,30 +235,32 @@ class FavoriteController extends ChangeNotifier {
 
   /// 退出登录时清空：收藏状态属于账号，不能跨账号串联。
   void clear() {
-    _requestSeq += 1;
+    resetPaging();
     _saved.clear();
-    cards = const [];
-    total = 0;
-    loading = false;
-    hasMore = false;
-    loadingMore = false;
-    loadMoreError = null;
-    error = null;
-    _pageIndex = 0;
     notify();
   }
 
-  List<Drama> _uniqueCards(List<Drama> source) {
+  void _rememberCardCounts(List<Drama> dramas) {
-    final seen = <String>{};
+    for (final drama in dramas) {
-    return [
+      final count = drama.favoriteCount;
-      for (final drama in source)
+      if (count != null && !_favoriteCounts.containsKey(drama.id)) {
-        if (seen.add(drama.id)) drama,
+        _favoriteCounts[drama.id] = count < 0 ? 0 : count;
-    ];
+      }
+    }
   }
 
-  @override
+  void _stepCount(String dramaId, int delta) {
-  void dispose() {
+    final current = _favoriteCounts[dramaId];
-    _disposed = true;
+    if (current == null) return;
-    super.dispose();
+    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;
+    }
   }
 }

lib/core/data/services/home_feed_controller.dart

@@ -1,222 +1,41 @@
 // Author: fruit.com.cn
 
-import 'dart:async';
-
-import 'package:flutter/foundation.dart';
-
 import '../../data/models/drama.dart';
+import '../../data/models/feed_page.dart';
 import '../../data/repositories/catalog_repository.dart';
 import '../../../pages/home/home_feed_channel.dart';
+import 'channel_feed_controller.dart';
 
 /// 首页内容类型频道状态：每频道独立缓存、刷新和游标分页。
-class HomeFeedController extends ChangeNotifier {
+class HomeFeedController extends ChannelFeedController<HomeFeedChannel> {
-  HomeFeedController(
+  HomeFeedController(this._repository, {super.requestTimeout})
-    this._repository, {
+    : super(HomeFeedChannel.recommend);
-    this.requestTimeout = defaultRequestTimeout,
-  }) : _states = {
-         for (final channel in HomeFeedChannel.values)
-           channel: _ChannelFeedState(),
-       };
-
-  static const int pageSize = 20;
-  static const Duration defaultRequestTimeout = Duration(seconds: 10);
 
   final CatalogRepository _repository;
-  final Duration requestTimeout;
-  final Map<HomeFeedChannel, _ChannelFeedState> _states;
-  HomeFeedChannel _channel = HomeFeedChannel.recommend;
-  bool _disposed = false;
 
-  HomeFeedChannel get channel => _channel;
+  HomeFeedChannel get channel => currentKey;
-  String? get lastError => _state(_channel).lastError;
-  List<Drama> get dramas => _state(_channel).dramas;
-  String? get cursor => _state(_channel).cursor;
-  bool get hasMore => _state(_channel).hasMore;
-  bool get loaded => _state(_channel).loaded;
-  bool get loadingMore => _state(_channel).loadingMore;
-  bool get loadingFirstPage => !loaded && _state(_channel).loading;
 
   /// 用首页聚合接口打平的数据填充推荐首屏，不发起网络请求。
-  void seedRecommend(List<Drama> dramas) {
+  void seedRecommend(List<Drama> dramas) =>
-    final state = _state(HomeFeedChannel.recommend);
+      seedKey(HomeFeedChannel.recommend, dramas);
-    state
-      ..requestSeq = state.requestSeq + 1
-      ..dramas = List.unmodifiable(dramas)
-      ..cursor = null
-      ..hasMore = false
-      ..loaded = true
-      ..loading = false
-      ..loadingMore = false
-      ..lastError = null
-      ..inFlight = null;
-    _notifyIfCurrent(HomeFeedChannel.recommend);
-  }
 
   /// 后台预取漫剧与真人剧首屏，不切换频道，也不影响当前列表。
   Future<void> prefetchChannels() async {
     await Future.wait([
-      _prefetchChannel(HomeFeedChannel.anime),
+      prefetchKey(HomeFeedChannel.anime),
-      _prefetchChannel(HomeFeedChannel.live),
+      prefetchKey(HomeFeedChannel.live),
     ]);
   }
 
   /// 同步切到目标频道；有缓存先渲染，无缓存时复用或等待在飞请求。
-  Future<void> selectChannel(HomeFeedChannel next) async {
+  Future<void> selectChannel(HomeFeedChannel next) => selectKey(next);
-    if (next == _channel) return;
-    _channel = next;
-    _notify();
-    final state = _state(next);
-    if (state.dramas.isNotEmpty) {
-      if (state.skipNextRefresh) {
-        state.skipNextRefresh = false;
-      } else if (!state.loading) {
-        unawaited(_refresh(next, keepData: true));
-      }
-      return;
-    }
-    if (state.loading) {
-      final inFlight = state.inFlight;
-      if (inFlight != null) await inFlight;
-      state.skipNextRefresh = false;
-      return;
-    }
-    await _refresh(next, keepData: false);
-  }
-
-  /// 刷新当前频道，失败时保留旧数据。
-  Future<bool> refreshCurrent() async {
-    final state = _state(_channel);
-    if (state.loading) {
-      return await state.inFlight ?? false;
-    }
-    return _refresh(_channel, keepData: true);
-  }
-
-  /// 加载当前频道下一页并去重追加。
-  Future<void> loadMore() async {
-    final channel = _channel;
-    final state = _state(channel);
-    if (!state.hasMore || state.loadingMore || state.cursor == null) return;
-    final seq = ++state.requestSeq;
-    state.loadingMore = true;
-    _notifyIfCurrent(channel);
-    try {
-      final page = await _repository
-          .fetchFeed(
-            types: channel.apiTypes,
-            cursor: state.cursor,
-            size: pageSize,
-          )
-          .timeout(requestTimeout);
-      if (!_acceptSequence(channel, seq)) return;
-      final seen = state.dramas.map((drama) => drama.id).toSet();
-      final appended = page.dramas
-          .where((drama) => seen.add(drama.id))
-          .toList();
-      state
-        ..dramas = List.unmodifiable([...state.dramas, ...appended])
-        ..cursor = page.nextCursor
-        ..hasMore = page.hasMore
-        ..loaded = true
-        ..lastError = null;
-    } catch (error) {
-      if (_acceptSequence(channel, seq)) {
-        state.lastError = error.toString();
-      }
-    } finally {
-      state.loadingMore = false;
-      _notifyIfCurrent(channel);
-    }
-  }
-
-  Future<bool> _refresh(HomeFeedChannel channel, {required bool keepData}) {
-    final state = _state(channel);
-    final operation = _performRefresh(channel, keepData: keepData);
-    state.inFlight = operation;
-    unawaited(_clearInFlight(state, operation));
-    return operation;
-  }
-
-  Future<void> _prefetchChannel(HomeFeedChannel channel) async {
-    final state = _state(channel);
-    if (state.loaded || state.loading) return;
-    final success = await _refresh(channel, keepData: false);
-    if (success && !_disposed) state.skipNextRefresh = true;
-  }
-
-  Future<bool> _performRefresh(
-    HomeFeedChannel channel, {
-    required bool keepData,
-  }) async {
-    final state = _state(channel);
-    final seq = ++state.requestSeq;
-    state
-      ..loading = true
-      ..lastError = null;
-    _notifyIfCurrent(channel);
-    try {
-      final page = await _repository
-          .fetchFeed(types: channel.apiTypes, size: pageSize)
-          .timeout(requestTimeout);
-      if (!_acceptSequence(channel, seq)) return false;
-      state
-        ..dramas = List.unmodifiable(page.dramas)
-        ..cursor = page.nextCursor
-        ..hasMore = page.hasMore
-        ..loaded = true
-        ..loading = false
-        ..lastError = null;
-      _notifyIfCurrent(channel);
-      return true;
-    } catch (error) {
-      if (!_acceptSequence(channel, seq)) return false;
-      if (!keepData) state.dramas = const [];
-      state
-        ..loaded = true
-        ..loading = false
-        ..lastError = error.toString();
-      _notifyIfCurrent(channel);
-      return false;
-    }
-  }
-
-  Future<void> _clearInFlight(
-    _ChannelFeedState state,
-    Future<bool> operation,
-  ) async {
-    await operation;
-    if (identical(state.inFlight, operation)) state.inFlight = null;
-  }
-
-  _ChannelFeedState _state(HomeFeedChannel channel) => _states[channel]!;
-
-  bool _acceptSequence(HomeFeedChannel channel, int seq) =>
-      !_disposed && _state(channel).requestSeq == seq;
-
-  void _notifyIfCurrent(HomeFeedChannel channel) {
-    if (!_disposed && channel == _channel) _notify();
-  }
-
-  void _notify() {
-    if (!_disposed) notifyListeners();
-  }
 
   @override
-  void dispose() {
+  Future<FeedPage> fetchPage(HomeFeedChannel key, {String? cursor}) {
-    _disposed = true;
+    return _repository.fetchFeed(
-    super.dispose();
+      types: key.apiTypes,
+      cursor: cursor,
+      size: ChannelFeedController.pageSize,
+    );
   }
 }
-
-class _ChannelFeedState {
-  List<Drama> dramas = const [];
-  String? cursor;
-  bool hasMore = true;
-  bool loaded = false;
-  bool loading = false;
-  bool loadingMore = false;
-  String? lastError;
-  int requestSeq = 0;
-  Future<bool>? inFlight;
-  bool skipNextRefresh = false;
-}

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/notices_controller.dart

@@ -1,118 +1,30 @@
 // Author: fruit.com.cn
 
-import 'package:flutter/foundation.dart';
-
 import '../models/notice.dart';
-import '../remote/api_client.dart';
+import '../models/page_result.dart';
 import '../repositories/notice_repository.dart';
+import 'paged_list_controller.dart';
 
-/// Pagination and state controller for the anonymous notices page.
+/// 公告页状态：匿名可看，按页追加。
-class NoticesController extends ChangeNotifier {
+class NoticesController extends PagedListController<AppNotice> {
-  NoticesController(this._repository, {this.pageSize = 20});
+  NoticesController(this._repository, {this.pageSize = 20})
+    : super(fallbackErrorKey: 'noticesLoadFailed');
 
   final NoticeRepository _repository;
   final int pageSize;
-  final List<AppNotice> _notices = [];
-  int _pageIndex = 0;
-  int _total = 0;
-  bool _disposed = false;
-  bool loading = false;
-  bool loadingMore = false;
-  bool refreshing = false;
-  String? error;
-  String? loadMoreError;
 
-  /// Loaded notices in server order.
+  /// 当前已加载公告（服务端顺序）。
-  List<AppNotice> get notices => List.unmodifiable(_notices);
+  List<AppNotice> get notices => items;
 
-  /// Whether another page is expected from the latest total.
+  @override
-  bool get hasMore => _notices.length < _total;
+  Future<PageResult<AppNotice>> fetchPage(int pageIndex) async {
-
+    final page = await _repository.page(
-  /// Loads the first page.
+      pageIndex: pageIndex,
-  Future<void> load() async {
+      pageSize: pageSize,
-    loading = true;
+    );
-    error = null;
+    return PageResult(total: page.total, list: page.notices);
-    loadMoreError = null;
-    _notify();
-    await _replaceFirstPage();
-    loading = false;
-    _notify();
-  }
-
-  /// Refreshes from page one while keeping the current page visible.
-  Future<void> refresh() async {
-    refreshing = true;
-    error = null;
-    loadMoreError = null;
-    _notify();
-    await _replaceFirstPage();
-    refreshing = false;
-    _notify();
-  }
-
-  /// Appends the next page when loaded count is below total.
-  Future<void> loadMore() async {
-    if (loading || loadingMore || refreshing || !hasMore) return;
-    loadingMore = true;
-    loadMoreError = null;
-    _notify();
-    try {
-      final page = await _repository.page(
-        pageIndex: _pageIndex + 1,
-        pageSize: pageSize,
-      );
-      _appendUnique(page.notices);
-      _pageIndex++;
-      _total = page.total;
-    } catch (failure, stackTrace) {
-      debugPrint('[NoticesController] load more failed: $failure');
-      debugPrintStack(
-        stackTrace: stackTrace,
-        label: '[NoticesController] load more failed',
-      );
-      loadMoreError = _message(failure) ?? 'noticesLoadFailed';
-    } finally {
-      loadingMore = false;
-      _notify();
-    }
-  }
-
-  Future<void> _replaceFirstPage() async {
-    try {
-      final page = await _repository.page(pageIndex: 1, pageSize: pageSize);
-      if (_disposed) return;
-      _notices
-        ..clear()
-        ..addAll(page.notices);
-      _pageIndex = 1;
-      _total = page.total;
-    } catch (failure, stackTrace) {
-      debugPrint('[NoticesController] load failed: $failure');
-      debugPrintStack(
-        stackTrace: stackTrace,
-        label: '[NoticesController] load failed',
-      );
-      if (!_disposed) error = _message(failure) ?? 'noticesLoadFailed';
-    }
-  }
-
-  void _appendUnique(List<AppNotice> incoming) {
-    final ids = _notices.map((notice) => notice.id).toSet();
-    for (final notice in incoming) {
-      if (ids.add(notice.id)) _notices.add(notice);
-    }
-  }
-
-  String? _message(Object failure) =>
-      failure is ApiException ? failure.message : null;
-
-  void _notify() {
-    if (!_disposed) notifyListeners();
   }
 
   @override
-  void dispose() {
+  String itemKey(AppNotice item) => item.id;
-    _disposed = true;
-    super.dispose();
-  }
 }

lib/core/data/services/paged_list_controller.dart

@@ -0,0 +1,216 @@
+// Author: fruit.com.cn
+
+import 'package:flutter/foundation.dart';
+
+import '../models/page_result.dart';
+import '../remote/api_client.dart';
+
+/// 分页列表控制器基类（`pageIndex` + `total` 模式）。
+///
+/// 收藏、观看记录、剧单、公告四个页面的分页逻辑此前各写一份：请求序号防串台、
+/// loading/loadingMore 互斥、跨页去重追加、hasMore 判定 —— 修一处 bug 要同步
+/// 抄四遍。这里收口成模板方法，子类只回答两件事：怎么取一页、怎么标识一条。
+abstract class PagedListController<T> extends ChangeNotifier {
+  PagedListController({this.fallbackErrorKey, this.dedupe = true});
+
+  /// 非 [ApiException] 的失败文案 key（页面用 `errorText` 翻译）。
+  final String? fallbackErrorKey;
+
+  /// 是否跨页按 [itemKey] 去重。
+  final bool dedupe;
+
+  List<T> _items = const [];
+  int _pageIndex = 0;
+  int _total = 0;
+  int _requestSeq = 0;
+  bool _disposed = false;
+
+  bool loading = false;
+  bool loadingMore = false;
+  bool refreshing = false;
+  bool loaded = false;
+  String? error;
+  String? loadMoreError;
+  int? lastErrorCode;
+
+  /// 当前已加载条目（按服务端顺序）。
+  List<T> get items => _items;
+  int get total => _total;
+  int get pageIndex => _pageIndex;
+
+  /// 已加载数未达总数即视为还有下一页。
+  bool get hasMore => _items.length < _total;
+
+  @protected
+  bool get isDisposed => _disposed;
+
+  /// 子类实现：取第 [pageIndex] 页（从 1 开始）。
+  @protected
+  Future<PageResult<T>> fetchPage(int pageIndex);
+
+  /// 子类实现：跨页去重用的稳定标识。
+  @protected
+  String itemKey(T item);
+
+  /// 失败文案：默认优先用后端消息，其次 [fallbackErrorKey]。
+  @protected
+  String? errorKeyFor(Object failure) {
+    if (failure is ApiException && failure.message.isNotEmpty) {
+      return failure.message;
+    }
+    return fallbackErrorKey;
+  }
+
+  /// 第一页替换完成后的同步钩子（如同步收藏集合）。
+  @protected
+  void onItemsReplaced() {}
+
+  /// 每页数据写入后的异步钩子（如补取详情）。
+  @protected
+  Future<void> onPageLoaded(List<T> added) async {}
+
+  /// 子类做局部乐观更新时改写列表。
+  @protected
+  void setItems(List<T> next) => _items = next;
+
+  /// 子类做局部乐观更新时改写总数。
+  @protected
+  void setTotal(int value) => _total = value < 0 ? 0 : value;
+
+  /// 子类回滚分页游标。
+  @protected
+  void restorePageIndex(int value) => _pageIndex = value;
+
+  /// 子类清空/重置分页状态，并让在飞请求失效。
+  @protected
+  void resetPaging() {
+    _requestSeq += 1;
+    _items = const [];
+    _total = 0;
+    _pageIndex = 0;
+    loading = false;
+    loadingMore = false;
+    refreshing = false;
+    loaded = false;
+    error = null;
+    loadMoreError = null;
+    lastErrorCode = null;
+  }
+
+  /// 让在飞请求失效（切换身份、清空等）。
+  @protected
+  void invalidateRequests() => _requestSeq += 1;
+
+  /// 重新拉第一页；失败时保留旧数据。
+  Future<void> load() => _fetchFirstPage(refresh: false);
+
+  /// 刷新第一页，且不清空当前列表（滚动位置不跳）。
+  Future<void> refresh() => _fetchFirstPage(refresh: true);
+
+  /// 第一页请求会抢占在飞的分页请求：被抢占的一方不再复位标志，
+  /// 所以三个 loading 标志必须在这里统一接管，否则会永远停在 true。
+  Future<void> _fetchFirstPage({required bool refresh}) async {
+    final request = ++_requestSeq;
+    loading = !refresh;
+    refreshing = refresh;
+    loadingMore = false;
+    error = null;
+    loadMoreError = null;
+    lastErrorCode = null;
+    notify();
+    try {
+      final page = await fetchPage(1);
+      if (_stale(request)) return;
+      final list = _unique(page.list);
+      _items = list;
+      _total = page.total;
+      _pageIndex = 1;
+      loaded = true;
+      onItemsReplaced();
+      notify();
+      await onPageLoaded(list);
+    } catch (failure) {
+      if (!_stale(request)) _recordError(failure, more: false);
+    } finally {
+      if (!_stale(request)) {
+        loading = false;
+        refreshing = false;
+        notify();
+      }
+    }
+  }
+
+  /// 追加下一页；刷新中、加载中或没有更多时忽略。
+  Future<void> loadMore() async {
+    if (loading || loadingMore || refreshing || !hasMore) return;
+    final request = ++_requestSeq;
+    loadingMore = true;
+    loadMoreError = null;
+    lastErrorCode = null;
+    notify();
+    try {
+      final page = await fetchPage(_pageIndex + 1);
+      if (_stale(request)) return;
+      // 关掉去重的列表（如剧单）按服务端顺序原样追加，不做跨页过滤。
+      final appended = dedupe ? _newItems(page.list) : page.list;
+      _items = [..._items, ...appended];
+      // 服务端 total 偏大但已翻到空页时，按已加载数收口，避免反复请求空页。
+      _total = page.list.isEmpty ? _items.length : page.total;
+      _pageIndex += 1;
+      notify();
+      await onPageLoaded(appended);
+    } catch (failure) {
+      if (!_stale(request)) _recordError(failure, more: true);
+    } finally {
+      if (!_stale(request)) {
+        loadingMore = false;
+        notify();
+      }
+    }
+  }
+
+  List<T> _unique(List<T> source) {
+    if (!dedupe) return source;
+    final seen = <String>{};
+    return [
+      for (final item in source)
+        if (seen.add(itemKey(item))) item,
+    ];
+  }
+
+  /// 追加页去重：既要过滤页内重复，也要过滤与已加载条目重复。
+  List<T> _newItems(List<T> source) {
+    final known = _items.map(itemKey).toSet();
+    return [
+      for (final item in source)
+        if (known.add(itemKey(item))) item,
+    ];
+  }
+
+  void _recordError(Object failure, {required bool more}) {
+    if (kDebugMode) {
+      final phase = more ? 'load more' : 'load';
+      debugPrint('[$runtimeType] $phase failed: $failure');
+    }
+    final message = errorKeyFor(failure);
+    if (more) {
+      loadMoreError = message;
+    } else {
+      error = message;
+    }
+    if (failure is ApiException) lastErrorCode = failure.code;
+  }
+
+  bool _stale(int request) => _disposed || request != _requestSeq;
+
+  @protected
+  void notify() {
+    if (!_disposed) notifyListeners();
+  }
+
+  @override
+  void dispose() {
+    _disposed = true;
+    super.dispose();
+  }
+}

lib/core/data/services/playback_neighbors.dart

@@ -13,14 +13,40 @@ class PlaybackCoordinator {
   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) {
-        final previous = _owner;
+        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>((_) {});
@@ -49,13 +75,21 @@ Future<void> _parkNeighbors(
   _PlayerSlot? warmNext,
   _PlayerSlot? warmPrevious,
 ) async {
-  await _placeNeighbor(session, old);
+  await _placeNeighbor(session, old, roleHint: 'old-current');
-  await _placeNeighbor(session, warmNext);
+  await _placeNeighbor(session, warmNext, roleHint: 'next');
-  await _placeNeighbor(session, warmPrevious);
+  await _placeNeighbor(session, warmPrevious, roleHint: 'previous');
 }
 
-Future<void> _placeNeighbor(PlaybackSession session, _PlayerSlot? slot) async {
+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;
@@ -64,18 +98,22 @@ Future<void> _placeNeighbor(PlaybackSession session, _PlayerSlot? slot) async {
     session._previous = slot;
     return;
   }
-  await session._retire(slot);
+  await session._retire(slot, trigger: 'park-neighbor', roleHint: roleHint);
 }
 
-/// 当前集已经出画后，静默准备上一集和下一集。
+/// 当前集已经出画后，按手势方向静默准备上一集和下一集。
-void _warmNeighbors(PlaybackSession session) {
+void _warmNeighbors(PlaybackSession session, {bool preferredNext = true}) {
   final request = session._generation;
-  session._preloadTask = () async {
+  final nextTask = _warmOne(session, request, session._nextIndex, next: true);
-    await Future.wait([
+  final previousTask = _warmOne(
-      _warmOne(session, request, session._nextIndex, next: true),
+    session,
-      _warmOne(session, request, session._previousIndex, next: false),
+    request,
-    ]);
+    session._previousIndex,
-  }();
+    next: false,
+  );
+  session._preloadTask = Future.wait(
+    preferredNext ? [nextTask, previousTask] : [previousTask, nextTask],
+  ).then<void>((_) {});
 }
 
 Future<void> _warmOne(
@@ -100,7 +138,11 @@ Future<void> _warmOne(
   await session._enqueue(() async {
     if (!_stillHeld(session, candidate, next: next)) return;
     _clearNeighbor(session, next: next);
-    await session._retire(candidate);
+    await session._retire(
+      candidate,
+      trigger: 'warm-failure',
+      roleHint: next ? 'next' : 'previous',
+    );
   });
 }
 
@@ -117,7 +159,11 @@ Future<_PlayerSlot?> _allocateNeighbor(
     final current = next ? session._next : session._previous;
     if (!allowed || current?.index != index) {
       _clearNeighbor(session, next: next);
-      await session._retire(current);
+      await session._retire(
+        current,
+        trigger: 'warm-slot-invalid',
+        roleHint: next ? 'next' : 'previous',
+      );
     }
     if (!_canAllocate(session, request, allowed: allowed, next: next)) {
       return;

lib/core/data/services/playback_position_cache.dart

@@ -33,10 +33,15 @@ class PlaybackPositionCache {
   PlaybackPositionCache({
     DateTime Function()? now,
     this.maxAge = _defaultMaxAge,
+    this.maxEntries = defaultMaxEntries,
   }) : _now = now ?? DateTime.now;
 
+  /// 最多保留的集数：长会话连看几十部剧也不至于让 Map 无限增长。
+  static const int defaultMaxEntries = 100;
+
   final DateTime Function() _now;
   final Duration maxAge;
+  final int maxEntries;
   final Map<String, CachedPlaybackPosition> _positions = {};
 
   /// 保存最近有效播放位置；零位置不会覆盖已有记录。
@@ -57,6 +62,24 @@ class PlaybackPositionCache {
       duration: duration,
       updatedAt: _now(),
     );
+    _evictOverflow();
+  }
+
+  /// 超出上限时按写入时间淘汰最旧的一条，避免长会话内存只增不减。
+  void _evictOverflow() {
+    while (maxEntries > 0 && _positions.length > maxEntries) {
+      String? oldestKey;
+      DateTime? oldestAt;
+      for (final entry in _positions.entries) {
+        final at = entry.value.updatedAt;
+        if (oldestAt == null || at.isBefore(oldestAt)) {
+          oldestAt = at;
+          oldestKey = entry.key;
+        }
+      }
+      if (oldestKey == null) return;
+      _positions.remove(oldestKey);
+    }
   }
 
   /// 读取同剧同集且未过期的最近位置。

lib/core/data/services/playback_session.dart

@@ -8,14 +8,17 @@ 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);
+const Duration _qualityHandoffHold = Duration(milliseconds: 500);
 
 typedef PlayerFactory = PlayerPort Function(Episode episode);
 typedef PlayerPreparation =
     Future<void> Function(Episode episode, PlayerPort player);
 
+enum PlaybackSessionOwner { home, player }
+
 /// Owns current plus previous/next frames; allocation stays serialized.
 class PlaybackSession extends ChangeNotifier {
   PlaybackSession({
@@ -26,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;
@@ -38,6 +43,8 @@ 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;
@@ -77,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;
 
@@ -106,15 +122,6 @@ 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, int? previousIndex}) {
     if (_closed || index < 0 || index >= episodes.length) return;
@@ -136,8 +143,12 @@ class PlaybackSession extends ChangeNotifier {
     _notify();
     unawaited(
       _enqueue(() async {
-        await _retire(staleNext);
+        await _retire(staleNext, trigger: 'remap-stale-next', roleHint: 'next');
-        await _retire(stalePrevious);
+        await _retire(
+          stalePrevious,
+          trigger: 'remap-stale-previous',
+          roleHint: 'previous',
+        );
       }),
     );
     if (_visible && !_overlayOpen) _warmNeighbors(this);
@@ -165,7 +176,12 @@ class PlaybackSession extends ChangeNotifier {
     if (_live.length >= maxLivePlayers) {
       throw StateError('Playback resource limit reached');
     }
-    final slot = _PlayerSlot(index, factory(episodes[index]));
+    final slot = _PlayerSlot(
+      index,
+      factory(episodes[index]),
+      owner: owner,
+      dramaId: dramaIdAt?.call(index),
+    );
     _live.add(slot);
     slot.ready = () async {
       try {
@@ -183,8 +199,23 @@ class PlaybackSession extends ChangeNotifier {
     return slot;
   }
 
-  Future<void> _retire(_PlayerSlot? slot) async {
+  Future<void> _retire(
-    if (slot == null || !_live.contains(slot)) return;
+    _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 ||
@@ -203,6 +234,19 @@ 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',
+        );
+      }
     }
   }
 
@@ -212,11 +256,23 @@ class PlaybackSession extends ChangeNotifier {
     int index, {
     int? preloadIndex,
     int? previousIndex,
+    bool? userWantsPlay,
   }) async {
     if (_closed || index < 0 || index >= episodes.length) return;
-    // 切到另一集时，上一集按下的暂停不跟着走：滑过去就应该自动播放。
+    if (kDebugMode) {
-    // 重复选中同一集（例如页面重新可见）不在这里恢复，尊重用户按下的暂停。
+      debugPrint(
-    if (!_selected || index != _currentIndex) {
+        '[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;
@@ -247,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 &&
@@ -256,7 +312,10 @@ class PlaybackSession extends ChangeNotifier {
         target = old;
         return;
       }
-      if (old != null) await old.player.pause();
+      if (old != null) {
+        await old.player.pause();
+        old.playing = false;
+      }
       final warmNext = _next;
       final warmPrevious = _previous;
       _active = null;
@@ -266,6 +325,7 @@ class PlaybackSession extends ChangeNotifier {
           _usableWarm(this, warmNext, index) ??
           _usableWarm(this, warmPrevious, index);
       if (warm != null) {
+        warm.reusedWarm = true;
         target = _active = warm;
         _loading = !warm.prepared;
         _notify();
@@ -314,7 +374,9 @@ 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) _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(_handoff, trigger: 'replacement-handoff');
-      await _retire(warm);
+      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,27 +503,15 @@ class PlaybackSession extends ChangeNotifier {
       await slot.player.pause();
     }
     slot.playing = shouldPlay;
-  }
+    if (kDebugMode) {
-
+      debugPrint(
-  void setAppResumed(bool value) {
+        '[player-session] phase=apply-playback-result '
-    _appResumed = value;
+        'session=${identityHashCode(this)} index=${slot.index} '
-    _syncPlayback();
+        'shouldPlay=$shouldPlay '
-  }
+        'isPlaying=${video?.controller.value.isPlaying ?? '-'} '
-
+        'slotPlaying=${slot.playing}',
-  void setRouteVisible(bool value) {
+      );
-    _routeVisible = value;
+    }
-    _syncPlayback();
-  }
-
-  void setOverlayOpen(bool value) {
-    _overlayOpen = value;
-    _syncPlayback();
-  }
-
-  void setUserWantsPlay(bool value) {
-    _userWantsPlay = value;
-    _syncPlayback();
-    _notify();
   }
 
   void _syncPlayback() {
@@ -467,7 +538,7 @@ class PlaybackSession extends ChangeNotifier {
       _loading = false;
       _notify();
       for (final slot in _live.toList()) {
-        await _retire(slot);
+        await _retire(slot, trigger: 'session-release-all');
       }
     });
   }
@@ -476,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;
@@ -486,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

@@ -2,71 +2,32 @@
 
 import 'package:flutter/foundation.dart';
 
+import '../models/page_result.dart';
 import '../models/playlist_detail.dart';
 import '../remote/catalog_api.dart';
 import '../repositories/playlist_repository.dart';
+import 'paged_list_controller.dart';
 
 /// 推荐页剧单：已启用剧单及其短剧卡片。
-class PlaylistController extends ChangeNotifier {
+class PlaylistController extends PagedListController<PlaylistDetail> {
-  PlaylistController(this._repository);
+  PlaylistController(this._repository)
-
+    : super(fallbackErrorKey: 'playlistsError', dedupe: false);
-  final PlaylistRepository _repository;
 
   static const int pageSize = CatalogApi.playlistPageSize;
 
-  List<PlaylistDetail> items = const [];
+  final PlaylistRepository _repository;
-  bool loading = false;
-  bool loadingMore = false;
-  bool loaded = false;
-  bool hasMore = false;
-  String? error;
-  int _pageIndex = 1;
-  bool _disposed = false;
 
-  /// 从第一页重新拉取。失败保留错误态，成功后替换本地缓存。
+  @override
-  Future<void> load() async {
+  Future<PageResult<PlaylistDetail>> fetchPage(int pageIndex) {
-    loading = true;
+    return _repository.fetchPlaylists(pageIndex: pageIndex, pageSize: pageSize);
-    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();
-    }
   }
 
-  /// 滚到底时追加下一页。没有更多或正在请求时直接返回。
+  @override
-  Future<void> loadMore() async {
+  String itemKey(PlaylistDetail item) => item.id;
-    if (loading || loadingMore || !hasMore) return;
+
-    loadingMore = true;
+  /// 剧单页把失败统一收敛成固定 key，由页面翻译成文案。
-    _notify();
+  @override
-    try {
+  String? errorKeyFor(Object failure) => 'playlistsError';
-      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(
@@ -94,14 +55,4 @@ class PlaylistController extends ChangeNotifier {
       );
     }
   }
-
-  void _notify() {
-    if (!_disposed) notifyListeners();
-  }
-
-  @override
-  void dispose() {
-    _disposed = true;
-    super.dispose();
-  }
 }

lib/core/data/services/sprite_thumbnail_asset_loader.dart

@@ -8,7 +8,8 @@ import 'package:dio/dio.dart';
 
 import '../../config/app_config.dart';
 
-const int spriteThumbnailDecodeMaxDimension = 2048;
+/// 雪碧图解码上限：擦洗预览只占很小一块区域，2048 会让单张位图膨胀到 16MB。
+const int spriteThumbnailDecodeMaxDimension = 1024;
 
 /// VTT 资源拒绝访问，服务层据此清缓存并重试一次。
 class SpriteThumbnailForbiddenException implements Exception {

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();
+    if (_failedSprites.contains(spriteUrl)) return Future.value();
-    final existing = _spriteRequests[cue.spriteFile];
+    final existing = _spriteRequests[spriteUrl];
     if (existing != null) return existing;
-    final generation = _axisGeneration;
+    final request = _loadSprite(axis, cue, spriteUrl);
-    final request = _loadSprite(axis, cue, generation);
+    _spriteRequests[spriteUrl] = request;
-    _spriteRequests[cue.spriteFile] = 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/theater_feed_controller.dart

@@ -1,187 +1,27 @@
 // Author: fruit.com.cn
 
-import 'dart:async';
+import '../../data/models/feed_page.dart';
-
-import 'package:flutter/foundation.dart';
-
-import '../../data/models/drama.dart';
 import '../../data/repositories/catalog_repository.dart';
+import 'channel_feed_controller.dart';
 
 /// 剧场页服务端分类列表：按 categoryId 独立缓存、刷新和游标分页。
-class TheaterFeedController extends ChangeNotifier {
+class TheaterFeedController extends ChannelFeedController<String?> {
-  TheaterFeedController(
+  TheaterFeedController(this._repository, {super.requestTimeout})
-    this._repository, {
+    : super(null, initiallySelected: false);
-    this.requestTimeout = defaultRequestTimeout,
-  });
-
-  static const int pageSize = 20;
-  static const Duration defaultRequestTimeout = Duration(seconds: 10);
 
   final CatalogRepository _repository;
-  final Duration requestTimeout;
-  final Map<String?, _CategoryFeedState> _states = {};
-  String? _categoryId;
-  bool _initialized = false;
-  bool _disposed = false;
 
-  String? get categoryId => _categoryId;
+  String? get categoryId => currentKey;
-  String? get lastError => _state(_categoryId).lastError;
-  List<Drama> get dramas => _state(_categoryId).dramas;
-  String? get cursor => _state(_categoryId).cursor;
-  bool get hasMore => _state(_categoryId).hasMore;
-  bool get loaded => _state(_categoryId).loaded;
-  bool get loadingMore => _state(_categoryId).loadingMore;
-  bool get loadingFirstPage => !loaded && _state(_categoryId).loading;
 
   /// 同步切换分类；有缓存先渲染，无缓存时等待或发起首屏请求。
-  Future<void> select(String? next) async {
+  Future<void> select(String? next) => selectKey(next);
-    if (_initialized && next == _categoryId) return;
-    _categoryId = next;
-    _initialized = true;
-    _notify();
-
-    final state = _state(next);
-    if (state.dramas.isNotEmpty) {
-      if (!state.loading) {
-        unawaited(_refresh(next, keepData: true));
-      }
-      return;
-    }
-    if (state.loading) {
-      final inFlight = state.inFlight;
-      if (inFlight != null) await inFlight;
-      return;
-    }
-    await _refresh(next, keepData: false);
-  }
-
-  /// 刷新当前分类；失败时保留已有列表。
-  Future<bool> refreshCurrent() async {
-    final state = _state(_categoryId);
-    if (state.loading) {
-      return await state.inFlight ?? false;
-    }
-    return _refresh(_categoryId, keepData: true);
-  }
-
-  /// 加载当前分类下一页并去重追加。
-  Future<void> loadMore() async {
-    final categoryId = _categoryId;
-    final state = _state(categoryId);
-    if (!state.hasMore || state.loadingMore || state.cursor == null) return;
-    final sequence = ++state.requestSeq;
-    state.loadingMore = true;
-    _notifyIfCurrent(categoryId);
-    try {
-      final page = await _repository
-          .fetchFeed(
-            categoryId: categoryId,
-            cursor: state.cursor,
-            size: pageSize,
-          )
-          .timeout(requestTimeout);
-      if (!_acceptSequence(categoryId, sequence)) return;
-      final seen = state.dramas.map((drama) => drama.id).toSet();
-      final appended = page.dramas
-          .where((drama) => seen.add(drama.id))
-          .toList();
-      state
-        ..dramas = List.unmodifiable([...state.dramas, ...appended])
-        ..cursor = page.nextCursor
-        ..hasMore = page.hasMore
-        ..loaded = true
-        ..lastError = null;
-    } catch (error) {
-      if (_acceptSequence(categoryId, sequence)) {
-        state.lastError = error.toString();
-      }
-    } finally {
-      state.loadingMore = false;
-      _notifyIfCurrent(categoryId);
-    }
-  }
-
-  Future<bool> _refresh(String? categoryId, {required bool keepData}) {
-    final state = _state(categoryId);
-    final operation = _performRefresh(categoryId, keepData: keepData);
-    state.inFlight = operation;
-    unawaited(_clearInFlight(state, operation));
-    return operation;
-  }
-
-  Future<bool> _performRefresh(
-    String? categoryId, {
-    required bool keepData,
-  }) async {
-    final state = _state(categoryId);
-    final sequence = ++state.requestSeq;
-    state
-      ..loading = true
-      ..lastError = null;
-    _notifyIfCurrent(categoryId);
-    try {
-      final page = await _repository
-          .fetchFeed(categoryId: categoryId, size: pageSize)
-          .timeout(requestTimeout);
-      if (!_acceptSequence(categoryId, sequence)) return false;
-      state
-        ..dramas = List.unmodifiable(page.dramas)
-        ..cursor = page.nextCursor
-        ..hasMore = page.hasMore
-        ..loaded = true
-        ..loading = false
-        ..lastError = null;
-      _notifyIfCurrent(categoryId);
-      return true;
-    } catch (error) {
-      if (!_acceptSequence(categoryId, sequence)) return false;
-      if (!keepData) state.dramas = const [];
-      state
-        ..loaded = true
-        ..loading = false
-        ..lastError = error.toString();
-      _notifyIfCurrent(categoryId);
-      return false;
-    }
-  }
-
-  Future<void> _clearInFlight(
-    _CategoryFeedState state,
-    Future<bool> operation,
-  ) async {
-    await operation;
-    if (identical(state.inFlight, operation)) state.inFlight = null;
-  }
-
-  _CategoryFeedState _state(String? categoryId) =>
-      _states.putIfAbsent(categoryId, _CategoryFeedState.new);
-
-  bool _acceptSequence(String? categoryId, int sequence) =>
-      !_disposed && _state(categoryId).requestSeq == sequence;
-
-  void _notifyIfCurrent(String? categoryId) {
-    if (!_disposed && categoryId == _categoryId) _notify();
-  }
-
-  void _notify() {
-    if (!_disposed) notifyListeners();
-  }
 
   @override
-  void dispose() {
+  Future<FeedPage> fetchPage(String? key, {String? cursor}) {
-    _disposed = true;
+    return _repository.fetchFeed(
-    super.dispose();
+      categoryId: key,
+      cursor: cursor,
+      size: ChannelFeedController.pageSize,
+    );
   }
 }
-
-class _CategoryFeedState {
-  List<Drama> dramas = const [];
-  String? cursor;
-  bool hasMore = true;
-  bool loaded = false;
-  bool loading = false;
-  bool loadingMore = false;
-  String? lastError;
-  int requestSeq = 0;
-  Future<bool>? inFlight;
-}

lib/core/data/services/unlocked_episode_registry.dart

@@ -0,0 +1,22 @@
+// Author: fruit.com.cn
+
+/// 本次登录期内已确认可播的收费集。
+///
+/// 解锁本身是服务端行为（`POST /app/episodes/{id}/unlock` 成功即生效），
+/// 客户端只需要记住「这一集不用再挡」。若不记住，退出播放页再进来会先闪
+/// 一次锁定态，且会被 [PlaybackSession.selectLocked] 提前释放播放器。
+///
+/// 生命周期跟随账号：登录态变化时由 `app.dart` 调用 [clear]，避免换账号后
+/// 沿用上一个人的解锁结论。
+class UnlockedEpisodeRegistry {
+  final Set<String> _episodeIds = <String>{};
+
+  bool contains(String episodeId) => _episodeIds.contains(episodeId);
+
+  void markUnlocked(String episodeId) {
+    if (episodeId.isEmpty) return;
+    _episodeIds.add(episodeId);
+  }
+
+  void clear() => _episodeIds.clear();
+}

lib/core/data/services/watch_records_controller.dart

@@ -3,23 +3,26 @@
 import 'package:flutter/foundation.dart';
 
 import '../models/drama.dart';
+import '../models/page_result.dart';
 import '../models/watch_progress.dart';
 import '../models/watch_record.dart';
 import '../remote/api_client.dart';
 import '../repositories/catalog_repository.dart';
 import '../repositories/watch_history_repository.dart';
+import 'paged_list_controller.dart';
 
 /// 独立观看记录页状态。
 ///
 /// 分页接口提供标题/封面/集号；详情按 dramaId 去重后补取，供点击播放使用。
-class WatchRecordsController extends ChangeNotifier {
+class WatchRecordsController extends PagedListController<WatchRecord> {
   factory WatchRecordsController({
     required WatchHistoryRepository history,
     required CatalogRepository catalog,
     int pageSize = defaultPageSize,
   }) => WatchRecordsController._(history, catalog, pageSize);
 
-  WatchRecordsController._(this._history, this._catalog, this.pageSize);
+  WatchRecordsController._(this._history, this._catalog, this.pageSize)
+    : super(fallbackErrorKey: 'progressError');
 
   static const int defaultPageSize = 20;
   static const int detailConcurrency = 4;
@@ -29,93 +32,32 @@ class WatchRecordsController extends ChangeNotifier {
   final int pageSize;
   final Map<String, Drama> _detailCache = {};
 
-  List<WatchRecord> records = const [];
-  int total = 0;
-  bool loading = false;
-  bool loadingMore = false;
-  bool hasMore = false;
   bool clearing = false;
-  String? error;
-  String? loadMoreError;
   String? actionError;
-  int _pageIndex = 0;
-  int _requestSeq = 0;
-  bool _disposed = false;
 
-  /// 加载最近记录并补齐详情；单条详情失败不拖垮整页。
+  /// 当前已加载记录（按服务端顺序）。
-  Future<void> load() async {
+  List<WatchRecord> get records => items;
-    final request = ++_requestSeq;
+
-    loading = true;
+  @override
-    loadingMore = false;
+  Future<PageResult<WatchRecord>> fetchPage(int pageIndex) async {
-    error = null;
+    final page = await _history.recent(
-    loadMoreError = null;
+      pageIndex: pageIndex,
-    actionError = null;
+      pageSize: pageSize,
-    _notify();
+    );
-    try {
+    return PageResult(total: page.total, list: _uniqueRecords(page.list));
-      final page = await _history.recent(pageIndex: 1, pageSize: pageSize);
-      if (_disposed || request != _requestSeq) return;
-      records = _uniqueRecords(page.list);
-      total = page.total;
-      _pageIndex = 1;
-      hasMore = page.list.isNotEmpty && records.length < total;
-      _notify();
-      await _hydrate(records.map((record) => record.dramaId).toList());
-    } catch (failure, stackTrace) {
-      debugPrint(
-        '[WatchRecordsController] recent failed '
-        '${failure.runtimeType}: $failure',
-      );
-      debugPrintStack(
-        stackTrace: stackTrace,
-        label: '[WatchRecordsController] recent failed',
-      );
-      if (!_disposed && request == _requestSeq) {
-        error = failure is ApiException ? failure.message : 'progressError';
-      }
-    } finally {
-      if (!_disposed && request == _requestSeq) {
-        loading = false;
-        _notify();
-      }
-    }
   }
 
-  /// 追加下一页；刷新、加载中或无更多时忽略。
+  @override
-  Future<void> loadMore() async {
+  String itemKey(WatchRecord item) => item.dramaId;
-    if (loading || loadingMore || !hasMore) return;
+
-    final request = ++_requestSeq;
+  /// 第一页成功替换后清掉上一轮的操作错误（如删除失败提示）。
-    loadingMore = true;
+  @override
-    loadMoreError = null;
+  void onItemsReplaced() => actionError = null;
-    _notify();
+
-    try {
+  /// 只补缺标题的详情，单条失败不拖垮整页。
-      final page = await _history.recent(
+  @override
-        pageIndex: _pageIndex + 1,
+  Future<void> onPageLoaded(List<WatchRecord> added) =>
-        pageSize: pageSize,
+      _hydrate(added.map((record) => record.dramaId).toList());
-      );
-      if (_disposed || request != _requestSeq) return;
-      final known = records.map((record) => record.dramaId).toSet();
-      final appended = _uniqueRecords(
-        page.list,
-      ).where((record) => known.add(record.dramaId)).toList(growable: false);
-      records = [...records, ...appended];
-      total = page.total;
-      _pageIndex += 1;
-      hasMore = page.list.isNotEmpty && records.length < total;
-      _notify();
-      await _hydrate(appended.map((record) => record.dramaId).toList());
-    } catch (failure) {
-      if (!_disposed && request == _requestSeq) {
-        loadMoreError = failure is ApiException
-            ? failure.message
-            : 'progressError';
-      }
-    } finally {
-      if (!_disposed && request == _requestSeq) {
-        loadingMore = false;
-        _notify();
-      }
-    }
-  }
 
   /// 只重试一条详情失败记录。
   Future<void> retryDetail(String dramaId) async {
@@ -125,9 +67,9 @@ class WatchRecordsController extends ChangeNotifier {
       index,
       records[index].copyWith(detailLoading: true, detailFailed: false),
     );
-    _notify();
+    notify();
     await _loadDetail(dramaId);
-    _notify();
+    notify();
   }
 
   /// 点击有标题的记录时再按需加载详情，避免列表阶段产生 N+1。
@@ -135,67 +77,83 @@ class WatchRecordsController extends ChangeNotifier {
     final cached = _detailCache[dramaId];
     if (cached != null) return cached;
     await _loadDetail(dramaId);
-    _notify();
+    notify();
     return _detailCache[dramaId];
   }
 
+  /// 按剧集 id 找最近观看记录，供收藏网格显示「看到第n集」与继续观看横幅。
+  WatchRecord? recordForDrama(String dramaId) {
+    for (final record in records) {
+      if (record.dramaId == dramaId) return record;
+    }
+    return null;
+  }
+
   /// 删除单条记录，先更新 UI，失败按原位置回滚。
   Future<bool> remove(String dramaId) async {
     final index = _recordIndex(dramaId);
     if (index < 0) return true;
     final removed = records[index];
-    records = [...records]..removeAt(index);
+    setItems([...records]..removeAt(index));
-    total = total > 0 ? total - 1 : 0;
+    setTotal(total - 1);
-    hasMore = records.length < total;
     actionError = null;
-    _notify();
+    lastErrorCode = null;
+    notify();
     try {
       await _history.remove(dramaId);
       return true;
-    } catch (_) {
+    } catch (failure) {
-      final next = [...records];
+      final next = [...items];
       next.insert(index > next.length ? next.length : index, removed);
-      records = next;
+      setItems(next);
-      total += 1;
+      setTotal(total + 1);
-      hasMore = records.length < total;
       actionError = 'recordDeleteFailed';
+      if (failure is ApiException) lastErrorCode = failure.code;
       return false;
     } finally {
-      _notify();
+      notify();
     }
   }
 
   /// 清空全部记录，先更新 UI，失败恢复原列表。
   Future<bool> clear() async {
     if (records.isEmpty) return true;
-    _requestSeq += 1;
+    invalidateRequests();
     final previous = records;
     final previousTotal = total;
-    final previousPageIndex = _pageIndex;
+    final previousPageIndex = pageIndex;
-    records = const [];
+    setItems(const []);
-    total = 0;
+    setTotal(0);
-    hasMore = false;
+    restorePageIndex(0);
-    _pageIndex = 0;
     loadingMore = false;
     clearing = true;
     actionError = null;
-    _notify();
+    lastErrorCode = null;
+    notify();
     try {
       await _history.clear();
       return true;
-    } catch (_) {
+    } catch (failure) {
-      records = previous;
+      setItems(previous);
-      total = previousTotal;
+      setTotal(previousTotal);
-      _pageIndex = previousPageIndex;
+      restorePageIndex(previousPageIndex);
-      hasMore = records.length < total;
       actionError = 'recordClearFailed';
+      if (failure is ApiException) lastErrorCode = failure.code;
       return false;
     } finally {
       clearing = false;
-      _notify();
+      notify();
     }
   }
 
+  /// 切换账号/设备身份时清除内存数据，不删除服务端记录。
+  void reset() {
+    resetPaging();
+    clearing = false;
+    actionError = null;
+    notify();
+  }
+
   List<WatchRecord> _uniqueRecords(List<WatchProgress> recent) {
     final seen = <String>{};
     return [
@@ -222,7 +180,7 @@ class WatchRecordsController extends ChangeNotifier {
         ? queue.length
         : detailConcurrency;
     Future<void> worker() async {
-      while (queue.isNotEmpty && !_disposed) {
+      while (queue.isNotEmpty && !isDisposed) {
         await _loadDetail(queue.removeAt(0));
       }
     }
@@ -255,7 +213,7 @@ class WatchRecordsController extends ChangeNotifier {
     }
     try {
       final detail = await _catalog.fetchDrama(dramaId);
-      if (_disposed) return null;
+      if (isDisposed) return null;
       _detailCache[dramaId] = detail;
       final current = _recordIndex(dramaId);
       if (current < 0) return detail;
@@ -269,15 +227,18 @@ class WatchRecordsController extends ChangeNotifier {
       );
       return detail;
     } catch (failure, stackTrace) {
-      debugPrint(
+      // 弱网时详情会成批失败，release 下不需要逐条打堆栈。
-        '[WatchRecordsController] detail failed dramaId=$dramaId '
+      if (kDebugMode) {
-        '${failure.runtimeType}: $failure',
+        debugPrint(
-      );
+          '[WatchRecordsController] detail failed dramaId=$dramaId '
-      debugPrintStack(
+          '${failure.runtimeType}: $failure',
-        stackTrace: stackTrace,
+        );
-        label: '[WatchRecordsController] detail failed dramaId=$dramaId',
+        debugPrintStack(
-      );
+          stackTrace: stackTrace,
-      if (_disposed) return null;
+          label: '[WatchRecordsController] detail failed dramaId=$dramaId',
+        );
+      }
+      if (isDisposed) return null;
       final current = _recordIndex(dramaId);
       if (current < 0) return null;
       _replaceAt(
@@ -298,16 +259,6 @@ class WatchRecordsController extends ChangeNotifier {
   void _replaceAt(int index, WatchRecord record) {
     final next = [...records];
     next[index] = record;
-    records = next;
+    setItems(next);
-  }
-
-  void _notify() {
-    if (!_disposed) notifyListeners();
-  }
-
-  @override
-  void dispose() {
-    _disposed = true;
-    super.dispose();
   }
 }

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/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})
+  FadePageRoute({
-    : super(
+    required WidgetBuilder builder,
-        transitionDuration: const Duration(milliseconds: 220),
+    super.settings,
-        reverseTransitionDuration: const Duration(milliseconds: 180),
+    super.transitionDuration = const Duration(milliseconds: 220),
-        pageBuilder: (context, _, _) => builder(context),
+    super.reverseTransitionDuration = const Duration(milliseconds: 180),
-        transitionsBuilder: (context, animation, _, child) => FadeTransition(
+  }) : super(
-          opacity: CurvedAnimation(parent: animation, curve: Curves.easeOut),
+         pageBuilder: (context, _, _) => builder(context),
-          child: child,
+         transitionsBuilder: (context, animation, _, child) => FadeTransition(
-        ),
+           opacity: CurvedAnimation(parent: animation, curve: Curves.easeOut),
-      );
+           child: child,
+         ),
+       );
 }

lib/core/theme/app_colors.dart

@@ -27,13 +27,13 @@ abstract final class AppColors {
   static const overlaySecondary = Color(0xFFC7C7CC);
   static const overlayLabel = Color(0xFFE6E6EB);
 
-  /// 主操作、选中态、播放进度（品牌橙）。
+  /// 主操作、选中态、播放进度。旧品牌橙已全量映射为品牌红（2026-10 改版）。
-  static const blue = Color(0xFFFF6B2C);
+  static const blue = Color(0xFFF04E4E);
   static const primary = blue;
   static const actionRed = Color(0xFFFF3B30);
 
   /// 主操作按下态。
-  static const bluePressed = Color(0xFFE55A1F);
+  static const bluePressed = Color(0xFFD64040);
 
   /// 链接与次要高亮：统一改用中性浅灰，避免旧青色残留。
   static const blueSoft = Color(0xFFB0B0B0);
@@ -47,6 +47,10 @@ abstract final class AppColors {
   static const homeGiftPink = Color(0xFFFF4D8D);
   static const vipGoldStart = Color(0xFFF5D9A0);
   static const vipGoldEnd = Color(0xFFE8B65A);
+
+  /// 「我的」页 VIP 卡的浅香槟金（见设计稿，接近纯色）。
+  static const vipCardStart = Color(0xFFF6E8C6);
+  static const vipCardEnd = Color(0xFFEDD9A8);
   static const vipBadgeSurface = Color(0x1F3D2408);
   static const bronze = Color(0xFFCD7F32);
   static const bronzeDeep = Color(0xFFA9713A);
@@ -75,10 +79,24 @@ abstract final class AppColors {
   /// 首页/追剧/我的统一的纯黑内容背景。
   static const appBackground = Color(0xFF000000);
 
+  /// 追剧页顶部的暗红光晕，向下淡入纯黑（见设计稿）。
+  static const followingGlow = Color(0xFF4C161A);
+
+  /// 光晕的过渡色：让暖色维持更久再压黑。
+  static const followingGlowMid = Color(0xFF1E0B0C);
+
+  /// 继续观看横幅剧名的暖白（见设计稿，非纯白）。
+  static const bannerTitleWarm = Color(0xFFF5EFE4);
+
   /// 中性深灰卡片与控件表面。
   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);
@@ -91,7 +109,7 @@ abstract final class AppColors {
   static const mineGradientTop = Color(0xFF3A1B0E);
   static const mineGradientMiddle = Color(0xFF1A0C07);
   static const mineGradientBottom = Color(0xFF000000);
-  static const mineGradientGlow = Color(0x33FF6B2C);
+  static const mineGradientGlow = Color(0x33F04E4E);
   static const mineGridSurface = Color(0x99101010);
   static const minePanelSurface = Color(0xFF101010);
   static const mineMoreDivider = Color(0xFF1C1C1E);
@@ -106,7 +124,7 @@ abstract final class AppColors {
   static const mineIconLanguage = Color(0xFF22D3EE);
   static const mineIconSettings = Color(0xFFA1A1AA);
   static const mineIconNotices = Color(0xFFFF8A4C);
-  static const recommendPlaylistGlow = Color(0x26FF6B2C);
+  static const recommendPlaylistGlow = Color(0x26F04E4E);
 
   /// 次级文字与列表 chevron。
   static const textPrimary = Color(0xFFFFFFFF);
@@ -128,9 +146,11 @@ abstract final class AppColors {
   /// 底部导航底色。
   static const bar = ink;
 
-  /// 底部导航专用：纯黑背景、选中白与未选中灰。
+  /// 底部导航专用：纯黑背景、选中品牌红与未选中白。
   static const navBackground = Color(0xFF000000);
-  static const navSelected = Color(0xFFFFFFFF);
+  static const brandRed = Color(0xFFF04E4E);
+  static const brandRedPressed = Color(0xFFD64040);
+  static const navSelected = brandRed;
 
   /// 卡片阴影（深色几乎不用阴影）。
   static const cardShadow = Color(0x00000000);
@@ -183,8 +203,8 @@ abstract final class AppColors {
   /// 封面集数胶囊。
   static const badgeBeige = raised;
 
-  /// 导航未选中。
+  /// 导航未选中（设计稿为白色线框 + 白色文字）。
-  static const navUnselected = textSecondary;
+  static const navUnselected = Color(0xFFFFFFFF);
 
   /// 首页内容角标。
   static const badgeHot = Color(0xFFE5484D);
@@ -208,7 +228,7 @@ abstract final class AppColors {
   static const bannerScrimEnd = Color(0xE6000000);
 
   /// 票券虚线等主色描边。
-  static const primaryBorder = Color(0x66FF6B2C);
+  static const primaryBorder = Color(0x66F04E4E);
 
   static const outlineDark = border;
   static const outlineVariantDark = border;

lib/core/theme/app_dimens.dart

@@ -37,7 +37,7 @@ abstract final class AppDimens {
   static const double previewSectionTitle = 14;
   static const double chipFont = 10;
   static const double navLabel = 13;
-  static const double navLabelGap = 5;
+  static const double navLabelGap = 1;
 
   static const double buttonHeight = 48;
   static const double primaryButtonHeight = 52;
@@ -146,10 +146,12 @@ abstract final class AppDimens {
   static const double homeActionGap = 6;
 
   /// 推荐分区。
+  static const double recommendSectionGap = 12;
   static const double recommendSectionTitle = 17;
   static const double recommendSectionSubtitle = 11;
   static const double recommendSectionMore = 12;
-  static const double recommendRowHeight = 252;
+  // 封面 122*(4/3)≈163 + 间距6 + 两行标题≈42 + 间距6 + 标签≈13 ≈ 230，留 6 余量。
+  static const double recommendRowHeight = 236;
   static const double recommendCardWidth = 122;
 
   /// 首页热播榜。
@@ -169,25 +171,27 @@ abstract final class AppDimens {
 
   /// 全部短剧筛选与追剧双列。
   static const double filterChipFont = 16;
-  static const double filterChipHeight = 32;
+  static const double filterChipHeight = 28;
-  static const double filterChipRadius = 16;
+  static const double filterChipRadius = 14;
   static const double filterChipHorizontalPadding = 12;
   static const double filterRowGap = 6;
   static const double filterItemGap = 10;
   static const double allDramasHorizontal = 12;
   static const double allDramasGridGap = 6;
-  static const double allDramasGridRowGap = 12;
+  static const double allDramasGridRowGap = 6;
   static const double allDramasFilterToGridGap = 12;
   static const double followingHeaderHeight = 52;
   static const double followingTabFont = 18;
   static const double followingTabGap = 24;
   static const double followingEditIconSize = 20;
   static const double followingEditHitSize = 40;
-  static const double followingAddIconSize = 28;
+  static const double followingAddIconSize = 20;
   static const double followingAddIconStroke = 1.5;
   static const double followingGridGap = 6;
   static const double followingGridRowGap = 12;
-  static const double followingCardTextExtent = 70;
+
+  /// 追剧网格卡文字区：间距 6 + 两行剧名 16*1.3*2=41.6 ≈ 48，留 4 余量。
+  static const double followingCardTextExtent = 52;
   static const double followingSubtitleFont = 12;
   static const double followingSubtitleGap = 4;
   static const double followingProgressHeight = 2;
@@ -201,6 +205,47 @@ abstract final class AppDimens {
   static const double followingHistoryProgressGap = 8;
   static const double followingHistoryLabelGap = 4;
   static const double followingHistoryActionHeight = 28;
+
+  /// 追剧页新版头部与收藏布局。
+  static const double followingTitleFont = 26;
+  static const double followingTitleRowHeight = 42;
+  static const double followingTitleTopGap = 8;
+  static const double followingSearchIcon = 26;
+  static const double followingManageFont = 16;
+  static const double followingHeaderActionGap = 8;
+  static const double followingSegmentFont = 16;
+  static const double followingSegmentGap = 28;
+  static const double followingSegmentRowHeight = 42;
+  static const double followingSegmentIndicatorWidth = 24;
+  static const double followingSegmentIndicatorHeight = 3;
+  static const double followingSegmentIndicatorRadius = 2;
+  static const double followingSegmentIndicatorTopGap = 6;
+  static const double followingBannerHeight = 176;
+  static const double followingBannerRadius = 16;
+  static const double followingBannerEdgeGap = 16;
+  static const double followingBannerInnerGap = 16;
+  static const double followingBannerTitleFont = 22;
+  static const double followingBannerSubtitleFont = 13;
+  static const double followingBannerMetaGap = 8;
+  static const double followingBannerButtonHeight = 40;
+  static const double followingBannerButtonRadius = 20;
+  static const double followingBannerButtonFont = 15;
+  static const double followingBannerButtonIcon = 18;
+  static const double followingBannerButtonGap = 6;
+  static const double followingBannerButtonHorizontalPadding = 20;
+  static const double followingBannerButtonTopGap = 14;
+  static const double followingBannerProgressHeight = 3;
+  static const double followingSectionTitleFont = 16;
+  static const double followingSectionCountFont = 13;
+  static const double followingSectionTopGap = 20;
+  static const double followingSectionBottomGap = 12;
+  static const double followingCardTitleFontNew = 16;
+  static const double followingCardSubtitleFontNew = 13;
+  static const double followingBadgeFont = 11;
+  static const double followingBadgeRadius = 6;
+  static const double followingBadgeInset = 8;
+  static const double followingBadgePaddingH = 8;
+  static const double followingBadgePaddingV = 3;
   static const Duration followingTabAnimationDuration = Duration(
     milliseconds: 180,
   );
@@ -211,8 +256,8 @@ abstract final class AppDimens {
   /// 「我的」页中性视觉。
   static const double mineCardRadius = 16;
   static const double mineSectionTitle = 15;
-  static const double mineAvatar = 56;
+  static const double mineAvatar = 64;
-  static const double mineUserName = 20;
+  static const double mineUserName = 24;
   static const double mineUserNameLineHeight = 1.15;
   static const double mineUserNameUidGap = 2;
   static const double mineUid = 12;
@@ -227,9 +272,25 @@ abstract final class AppDimens {
   static const double mineGridDividerWidth = 1;
   static const double mineSectionTitleFont = 16;
   static const double mineSectionLinkFont = 12;
-  static const double mineSectionGap = 20;
+  static const double mineSectionGap = 12;
+
+  /// 「我的」页新版：快捷图标行与服务列表。
+  static const double mineQuickActionIcon = 28;
+  static const double mineQuickActionLabelFont = 14;
+  static const double mineQuickActionGap = 8;
+  static const double mineServiceRowHeight = 56;
+  static const double mineServiceIcon = 24;
+  static const double mineServiceTitleFont = 16;
+  static const double mineServiceValueFont = 14;
+  static const double mineVipBenefitFont = 14;
+  static const double mineVipBenefitIcon = 20;
+  static const double mineVipBenefitBox = 30;
+  static const double mineVipBenefitBoxRadius = 7;
+  static const double mineVipBenefitGlyph = 17;
+  static const double mineVipBenefitRowGap = 4;
+  static const double mineVipButtonHeight = 36;
   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/theme/app_theme.dart

@@ -40,7 +40,7 @@ abstract final class AppTheme {
   /// 全局深色主题。
   static ThemeData dark() {
     const scheme = ColorScheme.dark(
-      primary: AppColors.blue,
+      primary: AppColors.brandRed,
       onPrimary: AppColors.onPrimary,
       secondary: AppColors.secondary,
       onSecondary: AppColors.ink,
@@ -54,7 +54,7 @@ abstract final class AppTheme {
       outline: AppColors.border,
       outlineVariant: AppColors.border,
       surfaceTint: AppColors.transparent,
-      inversePrimary: AppColors.bluePressed,
+      inversePrimary: AppColors.brandRedPressed,
       error: AppColors.error,
       onError: AppColors.onPrimary,
     );
@@ -66,16 +66,16 @@ abstract final class AppTheme {
       canvasColor: AppColors.ink,
       fontFamily: 'PlusJakartaSans',
       progressIndicatorTheme: const ProgressIndicatorThemeData(
-        color: AppColors.blue,
+        color: AppColors.brandRed,
       ),
       sliderTheme: const SliderThemeData(
-        activeTrackColor: AppColors.blue,
+        activeTrackColor: AppColors.brandRed,
         inactiveTrackColor: AppColors.border,
         thumbColor: AppColors.onPrimary,
       ),
       tabBarTheme: const TabBarThemeData(
-        labelColor: AppColors.blue,
+        labelColor: AppColors.brandRed,
-        indicatorColor: AppColors.blue,
+        indicatorColor: AppColors.brandRed,
         unselectedLabelColor: AppColors.muted,
       ),
       textButtonTheme: TextButtonThemeData(
@@ -138,12 +138,12 @@ abstract final class AppTheme {
         ),
         focusedBorder: OutlineInputBorder(
           borderRadius: _inputRadius,
-          borderSide: const BorderSide(color: AppColors.blue),
+          borderSide: const BorderSide(color: AppColors.brandRed),
         ),
       ),
       chipTheme: ChipThemeData(
         backgroundColor: AppColors.raised,
-        selectedColor: AppColors.blue.withValues(alpha: 0.22),
+        selectedColor: AppColors.brandRed.withValues(alpha: 0.22),
         labelStyle: const TextStyle(color: AppColors.onSurface),
         secondaryLabelStyle: const TextStyle(color: AppColors.muted),
         side: const BorderSide(color: AppColors.border),
@@ -216,7 +216,7 @@ abstract final class AppTheme {
         ),
         trackColor: WidgetStateProperty.resolveWith(
           (states) =>
-              states.contains(WidgetState.selected) ? AppColors.blue : null,
+              states.contains(WidgetState.selected) ? AppColors.brandRed : null,
         ),
       ),
       snackBarTheme: const SnackBarThemeData(
@@ -273,8 +273,8 @@ abstract final class AppTheme {
     if (states.contains(WidgetState.pressed) ||
         states.contains(WidgetState.hovered) ||
         states.contains(WidgetState.focused)) {
-      return AppColors.bluePressed;
+      return AppColors.brandRedPressed;
     }
-    return AppColors.blue;
+    return AppColors.brandRed;
   }
 }

lib/core/widgets/app_glow_panel.dart

@@ -0,0 +1,121 @@
+// Author: fruit.com.cn
+
+import 'package:flutter/material.dart';
+
+import '../theme/app_colors.dart';
+import '../theme/app_dimens.dart';
+
+/// 主题红晕渐变容器：弹框（居中）与底部弹层（半屏）共用的外壳。
+/// 纯黑弹框统一升级为「顶部红光 → 近黑」的家族渐变。
+class AppGlowPanel extends StatelessWidget {
+  const AppGlowPanel({
+    super.key,
+    required this.child,
+    this.borderRadius = const BorderRadius.all(Radius.circular(20)),
+    this.border = true,
+  });
+
+  final Widget child;
+  final BorderRadius borderRadius;
+  final bool border;
+
+  static const _gradient = LinearGradient(
+    begin: Alignment.topCenter,
+    end: Alignment.bottomCenter,
+    colors: [
+      AppColors.followingGlow,
+      AppColors.followingGlowMid,
+      Color(0xFF101012),
+    ],
+    stops: [0, 0.22, 0.62],
+  );
+
+  @override
+  Widget build(BuildContext context) {
+    return DecoratedBox(
+      decoration: BoxDecoration(
+        gradient: _gradient,
+        borderRadius: borderRadius,
+        border: border
+            ? Border.all(color: AppColors.contentBorder)
+            : null,
+      ),
+      child: child,
+    );
+  }
+}
+
+/// 主题渐变确认弹框：替代 AlertDialog 的家族化外壳。
+/// 按钮沿用项目惯例：纯文字 TextButton，主操作品牌红。
+class AppGlowDialog extends StatelessWidget {
+  const AppGlowDialog({
+    super.key,
+    this.title,
+    this.content,
+    this.contentChild,
+    this.actions,
+    this.contentTextStyle,
+  });
+
+  final String? title;
+  final String? content;
+
+  /// 富内容（表单/滚动区），与 [content] 二选一。
+  final Widget? contentChild;
+  final List<Widget>? actions;
+  final TextStyle? contentTextStyle;
+
+  @override
+  Widget build(BuildContext context) {
+    final bodyStyle = contentTextStyle ??
+        TextStyle(
+          color: AppColors.muted,
+          fontSize: AppDimens.body,
+          fontWeight: FontWeight.w400,
+        );
+    return Dialog(
+      backgroundColor: AppColors.transparent,
+      elevation: 0,
+      child: AppGlowPanel(
+        child: Padding(
+          padding: const EdgeInsets.fromLTRB(22, 22, 22, 10),
+          child: Column(
+            mainAxisSize: MainAxisSize.min,
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              if (title != null) ...[
+                Text(
+                  title!,
+                  style: TextStyle(
+                    color: AppColors.onSurface,
+                    fontSize: AppDimens.sectionTitle,
+                    fontWeight: FontWeight.w400,
+                  ),
+                ),
+                const SizedBox(height: 14),
+              ],
+              if (content != null)
+                Text(content!, style: bodyStyle)
+              else if (contentChild != null)
+                // 必须给富内容一个有界高度，否则内部 SingleChildScrollView 拿到无界
+                // 约束会直接撑高整块内容（长文本小屏下溢出且无法滚动）。
+                Flexible(child: contentChild!),
+              if (actions != null && actions!.isNotEmpty) ...[
+                const SizedBox(height: 18),
+                Row(
+                  mainAxisAlignment: MainAxisAlignment.end,
+                  children: [
+                    for (var i = 0; i < actions!.length; i++) ...[
+                      if (i > 0) const SizedBox(width: 4),
+                      actions![i],
+                    ],
+                  ],
+                ),
+              ],
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}

lib/core/widgets/app_root_tab.dart

@@ -7,18 +7,12 @@ import 'app_bottom_nav.dart';
 
 /// 客户端根导航的固定顺序。
 enum AppRootTab {
-  home(
+  home(),
-    assetPath: 'assets/icon/film_reel.png',
-    selectedAssetPath: 'assets/icon/film_reel_filled.png',
-  ),
   recommend(),
   following(),
   mine();
 
-  const AppRootTab({this.assetPath, this.selectedAssetPath});
+  const AppRootTab();
-
-  final String? assetPath;
-  final String? selectedAssetPath;
 }
 
 extension AppRootTabUi on AppRootTab {
@@ -30,15 +24,15 @@ extension AppRootTabUi on AppRootTab {
   };
 
   IconData get icon => switch (this) {
-    AppRootTab.home => Icons.theaters_outlined,
+    AppRootTab.home => Icons.home_outlined,
-    AppRootTab.recommend => Icons.smart_display_outlined,
+    AppRootTab.recommend => Icons.celebration_outlined,
     AppRootTab.following => Icons.bookmark_border_rounded,
     AppRootTab.mine => Icons.person_outline_rounded,
   };
 
   IconData get selectedIcon => switch (this) {
-    AppRootTab.home => Icons.theaters,
+    AppRootTab.home => Icons.home_rounded,
-    AppRootTab.recommend => Icons.smart_display_rounded,
+    AppRootTab.recommend => Icons.celebration_rounded,
     AppRootTab.following => Icons.bookmark_rounded,
     AppRootTab.mine => Icons.person_rounded,
   };
@@ -75,8 +69,6 @@ class AppRootBottomNav extends StatelessWidget {
             tabKey: tab.tabKey,
             icon: tab.icon,
             selectedIcon: tab.selectedIcon,
-            assetPath: tab.assetPath,
-            selectedAssetPath: tab.selectedAssetPath,
             label: tab.label(l10n),
             selected: tab == selected,
             onTap: () => onSelected(tab),

lib/core/widgets/auth_gate.dart

@@ -5,6 +5,7 @@ import '../../l10n/app_localizations.dart';
 import '../../pages/auth/auth_view.dart';
 import '../data/services/auth_controller.dart';
 import '../theme/app_colors.dart';
+import 'app_glow_panel.dart';
 
 /// 打开登录 / 注册页（沿用现有 Navigator 风格，不引路由库）
 Future<void> openAuthPage(BuildContext context, {bool signUpMode = false}) {
@@ -15,7 +16,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;
@@ -23,11 +24,11 @@ Future<bool> ensureSignedIn(BuildContext context) async {
   final l10n = AppLocalizations.of(context)!;
   final go = await showModalBottomSheet<bool>(
     context: context,
-    backgroundColor: AppColors.card,
+    backgroundColor: AppColors.transparent,
-    shape: const RoundedRectangleBorder(
+    builder: (sheetContext) => AppGlowPanel(
-      borderRadius: BorderRadius.vertical(top: Radius.circular(18)),
+      borderRadius: const BorderRadius.vertical(top: Radius.circular(18)),
-    ),
+      border: false,
-    builder: (sheetContext) => SafeArea(
+      child: SafeArea(
       child: Padding(
         padding: const EdgeInsets.fromLTRB(20, 18, 20, 20),
         child: Column(
@@ -71,11 +72,13 @@ 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/catalog_endpoint_editor.dart

@@ -6,6 +6,7 @@ import 'package:flutter/material.dart';
 import '../config/app_config.dart';
 import '../config/server_endpoint.dart';
 import '../theme/app_colors.dart';
+import 'app_glow_panel.dart';
 
 const String _title = '设置服务地址';
 const String _save = '保存';
@@ -14,12 +15,11 @@ const String _invalid = '请输入合法地址，例如 http://192.168.1.10:8081
 const String _saveFailed = '服务地址保存失败';
 const String _localNetworkHint = '手机需与电脑同一 Wi-Fi，并在 iOS 设置-隐私与安全性-本地网络 中允许本应用';
 
-/// Debug 下编辑服务地址，保存后重新探测并加载目录。
+/// Debug 下编辑服务地址，保存后立即按新地址重新加载目录。
 Future<void> showCatalogEndpointEditor(
   BuildContext context, {
   required Future<void> Function() reload,
   Future<bool> Function(String value)? save,
-  Future<void> Function()? probe,
 }) async {
   if (!kDebugMode) return;
   final value = await showDialog<String>(
@@ -36,7 +36,6 @@ Future<void> showCatalogEndpointEditor(
     }
     return;
   }
-  await (probe ?? () => AppConfig.probeAndApplyBaseUrl())();
   await reload();
 }
 
@@ -72,9 +71,9 @@ class _CatalogEndpointDialogState extends State<_CatalogEndpointDialog> {
 
   @override
   Widget build(BuildContext context) {
-    return AlertDialog(
+    return AppGlowDialog(
-      title: const Text(_title),
+      title: _title,
-      content: SingleChildScrollView(
+      contentChild: SingleChildScrollView(
         child: Column(
           mainAxisSize: MainAxisSize.min,
           crossAxisAlignment: CrossAxisAlignment.start,

lib/core/widgets/drama_grid_skeleton.dart

@@ -11,7 +11,8 @@ const Duration _shimmerPeriod = Duration(milliseconds: 1400);
 const double _shimmerTravel = 2.4;
 const double _shimmerStart = -1.2;
 const double _subtitleWidthFactor = 0.62;
-const Color _shimmerHighlight = Color(0x38FFFFFF);
+const double _shimmerPhaseStep = 0.13;
+const Color _shimmerHighlight = Color(0x0DFFFFFF);
 
 /// 首页短剧网格的占位。行数至少铺满可视高度，并带一道扫光。
 class DramaGridSkeleton extends StatefulWidget {
@@ -53,21 +54,19 @@ class _DramaGridSkeletonState extends State<DramaGridSkeleton>
   Widget build(BuildContext context) {
     return LayoutBuilder(
       builder: (context, constraints) {
-        final grid = _grid(constraints.maxWidth, constraints.maxHeight);
         return AnimatedBuilder(
           animation: _shimmer,
-          builder: (context, child) => ShaderMask(
+          builder: (context, _) => _grid(
-            blendMode: BlendMode.srcATop,
+            constraints.maxWidth,
-            shaderCallback: (bounds) => _shader(bounds),
+            constraints.maxHeight,
-            child: child,
+            _shimmer.value,
           ),
-          child: grid,
         );
       },
     );
   }
 
-  Widget _grid(double width, double height) {
+  Widget _grid(double width, double height, double shimmerValue) {
     final itemWidth = _itemWidth(width);
     final itemExtent = _itemExtent(itemWidth);
     return GridView.builder(
@@ -85,7 +84,8 @@ class _DramaGridSkeletonState extends State<DramaGridSkeleton>
         mainAxisExtent: itemExtent,
       ),
       itemCount: _fillCount(height, itemExtent),
-      itemBuilder: (context, index) => _SkeletonCard(index: index),
+      itemBuilder: (context, index) =>
+          _SkeletonCard(index: index, shimmerValue: shimmerValue),
     );
   }
 
@@ -105,48 +105,61 @@ class _DramaGridSkeletonState extends State<DramaGridSkeleton>
     final rows = (height / rowHeight).ceil() + 1;
     return math.max(widget.itemCount, rows * widget.columns);
   }
-
-  Shader _shader(Rect bounds) {
-    final shift = _shimmerStart + _shimmerTravel * _shimmer.value;
-    return LinearGradient(
-      begin: Alignment(shift, -0.3),
-      end: Alignment(shift + 1, 0.3),
-      colors: const [
-        AppColors.skeletonSurface,
-        _shimmerHighlight,
-        AppColors.skeletonSurface,
-      ],
-    ).createShader(bounds);
-  }
 }
 
 class _SkeletonCard extends StatelessWidget {
-  const _SkeletonCard({required this.index});
+  const _SkeletonCard({required this.index, required this.shimmerValue});
 
   final int index;
+  final double shimmerValue;
 
   @override
   Widget build(BuildContext context) {
-    return Column(
+    final phase = (shimmerValue + index * _shimmerPhaseStep) % 1.0;
+    return Stack(
       key: Key('drama-grid-skeleton-$index'),
-      crossAxisAlignment: CrossAxisAlignment.start,
       children: [
-        AspectRatio(
+        Column(
-          aspectRatio: AppDimens.cardCoverAspectRatio,
+          crossAxisAlignment: CrossAxisAlignment.start,
-          child: const _SkeletonBlock(),
+          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(),
+            ),
+          ],
         ),
-        const SizedBox(height: AppDimens.cardCoverTitleGap),
+        Positioned.fill(
-        const _SkeletonBar(),
+          child: IgnorePointer(
-        const SizedBox(height: AppDimens.skeletonTitleBarGap),
+            child: ClipRRect(
-        const FractionallySizedBox(
+              borderRadius: BorderRadius.circular(AppDimens.homeCardRadius),
-          widthFactor: _subtitleWidthFactor,
+              child: DecoratedBox(
-          child: _SkeletonBar(),
+                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();
 

lib/core/widgets/plain_page_scaffold.dart

@@ -3,7 +3,6 @@
 import 'package:flutter/material.dart';
 
 import '../theme/app_colors.dart';
-import '../theme/app_theme.dart';
 import 'subpage_header.dart';
 
 /// 二级页面通用骨架：返回栏 + 标题/副标题 + 可滚动内容，无底部导航。
@@ -29,7 +28,19 @@ class PlainPageScaffold extends StatelessWidget {
       key: pageKey,
       backgroundColor: AppColors.ink,
       body: DecoratedBox(
-        decoration: const BoxDecoration(gradient: AppTheme.pageGradient),
+        // 与首页各 tab 同族：纯黑底 + 顶部暗红光晕。
+        decoration: const BoxDecoration(
+          gradient: LinearGradient(
+            begin: Alignment.topCenter,
+            end: Alignment.bottomCenter,
+            colors: [
+              AppColors.followingGlow,
+              AppColors.followingGlowMid,
+              AppColors.appBackground,
+            ],
+            stops: [0, 0.14, 0.3],
+          ),
+        ),
         child: SafeArea(
           child: Column(
             crossAxisAlignment: CrossAxisAlignment.start,

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,60 @@ 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(
+    return LayoutBuilder(
-      url,
+      builder: (context, constraints) {
-      width: width,
+        final pixelRatio = MediaQuery.devicePixelRatioOf(context);
-      height: height,
+        final layoutWidth = constraints.hasBoundedWidth
-      fit: fit,
+            ? constraints.maxWidth
-      gaplessPlayback: true,
+            : width;
-      errorBuilder: (_, _, _) => _fallback(brand: showFallbackIcon),
+        final aspectRatio =
-      frameBuilder: (context, child, frame, wasSynchronouslyLoaded) {
+            fallbackAspectRatio != null &&
-        if (wasSynchronouslyLoaded || frame != null) return child;
+                fallbackAspectRatio!.isFinite &&
-        return _fallback(brand: showFallbackIcon);
+                fallbackAspectRatio! > 0
+            ? fallbackAspectRatio
+            : null;
+        final inferredHeight = constraints.hasBoundedHeight
+            ? constraints.maxHeight
+            : height ??
+                  (layoutWidth != null && aspectRatio != null
+                      ? layoutWidth / aspectRatio
+                      : null);
+        final cacheWidth =
+            decodeWidth ?? resolveImageDecodePixels(layoutWidth, pixelRatio);
+        // cover/contain 本身会保持宽高比，此时若同时强制 cacheWidth 和
+        // cacheHeight，解码会把竖版图强行拉成横版像素。只在显式指定了
+        // decodeHeight、或 fit 不保持宽高比时才限定解码高度。
+        final keepsAspectRatio =
+            fit == BoxFit.cover || fit == BoxFit.contain;
+        final cacheHeight = decodeHeight ??
+            (keepsAspectRatio || 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/core/widgets/subpage_header.dart

@@ -8,7 +8,7 @@ const double _height = 52;
 const double _heightWithSubtitle = 64;
 const double _horizontal = 14;
 const double _backSize = 40;
-const double _backGap = 12;
+const double _backGap = 6;
 const double _titleFontSize = 18;
 const double _subtitleFontSize = 12;
 const double _actionGap = 8;
@@ -163,7 +163,7 @@ class AppSubpageHeader extends StatelessWidget {
                     style: TextStyle(
                       color: foreground,
                       fontSize: _titleFontSize,
-                      fontWeight: FontWeight.w800,
+                      fontWeight: FontWeight.w400,
                     ),
                   ),
                   if (subtitle != null) ...[

lib/l10n/app_en.arb

@@ -20,7 +20,6 @@
   "featured": "Featured",
   "recommended": "Recommended",
   "fruitShortsBrand": "FruitShorts",
-  "authLandingSubtitle": "Sign in to sync progress, favorites and coins",
   "comingSoon": "Coming soon",
   "authLegal": "By continuing, you agree to the Terms of Service and Privacy Policy.",
   "authLegalLead": "By continuing, you agree to the",
@@ -55,12 +54,24 @@
       "viewers": {"type": "String"}
     }
   },
-  "watchFullSeries": "Watch full series · {episodes} eps",
+  "watchFullSeries": "Watch full series  {episodes} eps",
   "@watchFullSeries": {
     "placeholders": {
       "episodes": {"type": "String"}
     }
   },
+  "feedEpisodePrefix": "EP{episode}",
+  "@feedEpisodePrefix": {
+    "placeholders": {
+      "episode": {"type": "int"}
+    }
+  },
+  "feedWatchingCount": "{count} watching",
+  "@feedWatchingCount": {
+    "placeholders": {
+      "count": {"type": "String"}
+    }
+  },
   "feedTabAnime": "Anime",
   "feedTabReal": "Live-action",
   "feedTabForYou": "For you",
@@ -263,8 +274,21 @@
   "shareFailed": "Could not open the share sheet.",
   "nowPlaying": "Playing now",
   "pictureInPicture": "Picture in picture",
+  "autoEnterPip": "Auto mini player on exit",
   "pipUnavailable": "Picture in picture is unavailable on this device",
   "originalTag": "Original",
+  "originalProduction": "Original",
+  "watchNowAction": "Watch Now",
+  "newArrivalBadge": "NEW",
+  "editorPick": "Editor's Pick",
+  "totalEpisodesShort": "{count} eps",
+  "@totalEpisodesShort": {
+    "placeholders": {
+      "count": {
+        "type": "int"
+      }
+    }
+  },
   "dramaTag": "Short drama",
   "episodeLabel": "Episode {number}",
   "@episodeLabel": {
@@ -292,6 +316,7 @@
     }
   },
   "episodes": "Episodes",
+  "similarDramas": "More like this",
   "synopsisTitle": "Synopsis",
   "watchEpisodeOne": "Watch episode 1",
   "continueEpisode": "Continue episode {number}",
@@ -408,7 +433,7 @@
   "joinVip": "Join VIP",
   "earnRewards": "Earn Rewards",
   "freeBonus": "Get Free Bonus",
-  "watchHistory": "Watch History",
+  "watchHistory": "History",
   "settings": "Settings",
   "serverAddress": "Server address",
   "serverSettings": "Server settings",
@@ -418,6 +443,7 @@
   "restoreDefault": "Restore default",
   "invalidServerAddress": "Enter a valid http(s) server address.",
   "signOut": "Sign Out",
+  "signOutConfirm": "Sign out of your current account?",
   "mockUserName": "Vicky sheng",
   "mockUserId": "ID: M1CZWVYE",
   "mockNotice": "Sample data only.",
@@ -467,7 +493,7 @@
   "progressError": "Your watch position could not be loaded.",
   "favoritesError": "Your favorites could not be loaded.",
   "favoriteToggleFailed": "Could not update favorites. Please retry.",
-  "myFavorites": "My favorites",
+  "myFavorites": "Favorites",
   "noFavorites": "No favorites yet.",
   "downloads": "Downloads",
   "downloadsError": "Download settings could not be loaded.",
@@ -760,11 +786,17 @@
   "visitor": "Visitor",
   "copyUid": "Copy UID",
   "uidCopied": "UID copied",
-  "offlineDownloads": "Offline downloads",
+  "offlineDownloads": "Downloads",
   "watchPreferences": "Watch preferences",
   "contactSupport": "Contact support",
-  "vipBrandName": "Netshort VIP",
+  "vipBrandName": "FruitShorts VIP",
-  "mineVipSubtitle": "Enjoy exclusive benefits",
+  "vipOpenNow": "Get VIP",
+  "vipBenefitFree": "Free full access",
+  "vipBenefitNoAds": "Ad-free viewing",
+  "vipBenefitHd": "1080P HD",
+  "vipBenefitFastCache": "Fast downloads",
+  "moreServices": "More",
+  "mineVipSubtitle": "Unlock excitement, binge freely",
   "favoriteEpisodeProgress": "Episode {episode} / {total} total",
   "@favoriteEpisodeProgress": {
     "placeholders": {
@@ -772,6 +804,44 @@
       "total": { "type": "int" }
     }
   },
+  "myFavorites": "Favorites",
+  "manage": "Manage",
+  "continueWatching": "Continue Watching",
+  "continueWatchingSubtitle": "Episode {episode} of {total}",
+  "@continueWatchingSubtitle": {
+    "placeholders": {
+      "episode": { "type": "int" },
+      "total": { "type": "int" }
+    }
+  },
+  "favoriteDramas": "Favorites",
+  "totalDramasCount": "{count} titles",
+  "@totalDramasCount": {
+    "placeholders": {
+      "count": { "type": "int" }
+    }
+  },
+  "watchedEpisodeTotal": "EP {episode} / {total}",
+  "@watchedEpisodeTotal": {
+    "placeholders": {
+      "episode": { "type": "int" },
+      "total": { "type": "int" }
+    }
+  },
+  "hasUpdateBadge": "UPDATED",
+  "updatedToEpisode": "Updated to EP {episode}",
+  "@updatedToEpisode": {
+    "placeholders": {
+      "episode": { "type": "int" }
+    }
+  },
+  "finishedAllEpisodes": "{total} eps · Completed",
+  "@finishedAllEpisodes": {
+    "placeholders": {
+      "total": { "type": "int" }
+    }
+  },
+  "noFavoritesYet": "No favorites yet",
   "watchedToEpisode": "Watched to Episode {episode}",
   "@watchedToEpisode": { "placeholders": { "episode": { "type": "int" } } },
   "homeWatchAll": "Watch all",

lib/l10n/app_id.arb

@@ -20,7 +20,6 @@
   "featured": "Unggulan",
   "recommended": "Rekomendasi",
   "fruitShortsBrand": "FruitShorts",
-  "authLandingSubtitle": "Masuk untuk menyinkronkan progres, favorit, dan koin",
   "comingSoon": "Segera hadir",
   "authLegal": "Dengan melanjutkan, Anda menyetujui Ketentuan Layanan dan Kebijakan Privasi.",
   "authLegalLead": "Dengan melanjutkan, Anda menyetujui",
@@ -49,7 +48,24 @@
   "hotBadge": "Hits",
   "filterAll": "Semua",
   "seriesMeta": "Serial · {episodes} eps | {viewers} menonton",
-  "watchFullSeries": "Tonton serial lengkap · {episodes} eps",
+  "watchFullSeries": "Tonton serial lengkap  {episodes} eps",
+  "@watchFullSeries": {
+    "placeholders": {
+      "episodes": {"type": "String"}
+    }
+  },
+  "feedEpisodePrefix": "EP{episode}",
+  "@feedEpisodePrefix": {
+    "placeholders": {
+      "episode": {"type": "int"}
+    }
+  },
+  "feedWatchingCount": "{count} menonton",
+  "@feedWatchingCount": {
+    "placeholders": {
+      "count": {"type": "String"}
+    }
+  },
   "feedTabAnime": "Anime",
   "feedTabReal": "Live-action",
   "feedTabForYou": "Untukmu",
@@ -237,8 +253,21 @@
   "shareFailed": "Tidak bisa membuka menu berbagi.",
   "nowPlaying": "Sedang diputar",
   "pictureInPicture": "Gambar dalam gambar",
+  "autoEnterPip": "Mini player otomatis saat keluar",
   "pipUnavailable": "Gambar dalam gambar tidak tersedia di perangkat ini",
   "originalTag": "Original",
+  "originalProduction": "Original",
+  "watchNowAction": "Tonton Sekarang",
+  "newArrivalBadge": "BARU",
+  "editorPick": "Pilihan Editor",
+  "totalEpisodesShort": "{count} eps",
+  "@totalEpisodesShort": {
+    "placeholders": {
+      "count": {
+        "type": "int"
+      }
+    }
+  },
   "dramaTag": "Drama pendek",
   "episodeLabel": "Episode {number}",
   "@episodeLabel": {
@@ -266,6 +295,7 @@
     }
   },
   "episodes": "Episode",
+  "similarDramas": "Rekomendasi Serupa",
   "synopsisTitle": "Sinopsis",
   "watchEpisodeOne": "Tonton episode 1",
   "continueEpisode": "Lanjut episode {number}",
@@ -382,7 +412,7 @@
   "joinVip": "Gabung VIP",
   "earnRewards": "Dapatkan Hadiah",
   "freeBonus": "Bonus Gratis",
-  "watchHistory": "Riwayat Tontonan",
+  "watchHistory": "Riwayat",
   "settings": "Pengaturan",
   "serverAddress": "Alamat server",
   "serverSettings": "Pengaturan server",
@@ -392,6 +422,7 @@
   "restoreDefault": "Pulihkan default",
   "invalidServerAddress": "Masukkan alamat server http(s) yang valid.",
   "signOut": "Keluar",
+  "signOutConfirm": "Keluar dari akun saat ini?",
   "mockUserName": "Vicky sheng",
   "mockUserId": "ID: M1CZWVYE",
   "mockNotice": "Hanya data contoh.",
@@ -441,7 +472,7 @@
   "progressError": "Posisi tonton gagal dimuat.",
   "favoritesError": "Daftar favorit gagal dimuat.",
   "favoriteToggleFailed": "Gagal memperbarui favorit. Coba lagi.",
-  "myFavorites": "Favorit saya",
+  "myFavorites": "Favorit",
   "noFavorites": "Belum ada favorit.",
   "downloads": "Unduhan",
   "downloadsError": "Pengaturan unduhan gagal dimuat.",
@@ -717,11 +748,17 @@
   "visitor": "Pengunjung",
   "copyUid": "Salin UID",
   "uidCopied": "UID disalin",
-  "offlineDownloads": "Unduhan offline",
+  "offlineDownloads": "Unduhan",
   "watchPreferences": "Preferensi tontonan",
   "contactSupport": "Hubungi dukungan",
-  "vipBrandName": "Netshort VIP",
+  "vipBrandName": "FruitShorts VIP",
-  "mineVipSubtitle": "Nikmati manfaat eksklusif",
+  "vipOpenNow": "Buka VIP",
+  "vipBenefitFree": "Nonton semua gratis",
+  "vipBenefitNoAds": "Bebas iklan",
+  "vipBenefitHd": "HD 1080P",
+  "vipBenefitFastCache": "Unduhan cepat",
+  "moreServices": "Lainnya",
+  "mineVipSubtitle": "Buka keseruan, tonton sepuasnya",
   "favoriteEpisodeProgress": "Episode {episode} / total {total}",
   "@favoriteEpisodeProgress": {
     "placeholders": {
@@ -729,6 +766,44 @@
       "total": { "type": "int" }
     }
   },
+  "myFavorites": "Favorit",
+  "manage": "Kelola",
+  "continueWatching": "Lanjutkan",
+  "continueWatchingSubtitle": "Episode {episode} dari {total}",
+  "@continueWatchingSubtitle": {
+    "placeholders": {
+      "episode": { "type": "int" },
+      "total": { "type": "int" }
+    }
+  },
+  "favoriteDramas": "Koleksi",
+  "totalDramasCount": "{count} judul",
+  "@totalDramasCount": {
+    "placeholders": {
+      "count": { "type": "int" }
+    }
+  },
+  "watchedEpisodeTotal": "EP {episode} / {total}",
+  "@watchedEpisodeTotal": {
+    "placeholders": {
+      "episode": { "type": "int" },
+      "total": { "type": "int" }
+    }
+  },
+  "hasUpdateBadge": "UPDATE",
+  "updatedToEpisode": "Diperbarui ke EP {episode}",
+  "@updatedToEpisode": {
+    "placeholders": {
+      "episode": { "type": "int" }
+    }
+  },
+  "finishedAllEpisodes": "{total} eps · Selesai",
+  "@finishedAllEpisodes": {
+    "placeholders": {
+      "total": { "type": "int" }
+    }
+  },
+  "noFavoritesYet": "Belum ada favorit",
   "watchedToEpisode": "Ditonton hingga Episode {episode}",
   "@watchedToEpisode": { "placeholders": { "episode": { "type": "int" } } },
   "homeWatchAll": "Tonton semua",

lib/l10n/app_localizations.dart

@@ -220,12 +220,6 @@ abstract class AppLocalizations {
   /// **'FruitShorts'**
   String get fruitShortsBrand;
 
-  /// No description provided for @authLandingSubtitle.
-  ///
-  /// In en, this message translates to:
-  /// **'Sign in to sync progress, favorites and coins'**
-  String get authLandingSubtitle;
-
   /// No description provided for @comingSoon.
   ///
   /// In en, this message translates to:
@@ -397,9 +391,21 @@ abstract class AppLocalizations {
   /// No description provided for @watchFullSeries.
   ///
   /// In en, this message translates to:
-  /// **'Watch full series · {episodes} eps'**
+  /// **'Watch full series  {episodes} eps'**
   String watchFullSeries(String episodes);
 
+  /// No description provided for @feedEpisodePrefix.
+  ///
+  /// In en, this message translates to:
+  /// **'EP{episode}'**
+  String feedEpisodePrefix(int episode);
+
+  /// No description provided for @feedWatchingCount.
+  ///
+  /// In en, this message translates to:
+  /// **'{count} watching'**
+  String feedWatchingCount(String count);
+
   /// No description provided for @feedTabAnime.
   ///
   /// In en, this message translates to:
@@ -1186,6 +1192,12 @@ abstract class AppLocalizations {
   /// **'Picture in picture'**
   String get pictureInPicture;
 
+  /// No description provided for @autoEnterPip.
+  ///
+  /// In en, this message translates to:
+  /// **'Auto mini player on exit'**
+  String get autoEnterPip;
+
   /// No description provided for @pipUnavailable.
   ///
   /// In en, this message translates to:
@@ -1198,6 +1210,36 @@ abstract class AppLocalizations {
   /// **'Original'**
   String get originalTag;
 
+  /// No description provided for @originalProduction.
+  ///
+  /// In en, this message translates to:
+  /// **'Original'**
+  String get originalProduction;
+
+  /// No description provided for @watchNowAction.
+  ///
+  /// In en, this message translates to:
+  /// **'Watch Now'**
+  String get watchNowAction;
+
+  /// No description provided for @newArrivalBadge.
+  ///
+  /// In en, this message translates to:
+  /// **'NEW'**
+  String get newArrivalBadge;
+
+  /// No description provided for @editorPick.
+  ///
+  /// In en, this message translates to:
+  /// **'Editor\'s Pick'**
+  String get editorPick;
+
+  /// No description provided for @totalEpisodesShort.
+  ///
+  /// In en, this message translates to:
+  /// **'{count} eps'**
+  String totalEpisodesShort(int count);
+
   /// No description provided for @dramaTag.
   ///
   /// In en, this message translates to:
@@ -1234,6 +1276,12 @@ abstract class AppLocalizations {
   /// **'Episodes'**
   String get episodes;
 
+  /// No description provided for @similarDramas.
+  ///
+  /// In en, this message translates to:
+  /// **'More like this'**
+  String get similarDramas;
+
   /// No description provided for @synopsisTitle.
   ///
   /// In en, this message translates to:
@@ -1729,7 +1777,7 @@ abstract class AppLocalizations {
   /// No description provided for @watchHistory.
   ///
   /// In en, this message translates to:
-  /// **'Watch History'**
+  /// **'History'**
   String get watchHistory;
 
   /// No description provided for @settings.
@@ -1786,6 +1834,12 @@ abstract class AppLocalizations {
   /// **'Sign Out'**
   String get signOut;
 
+  /// No description provided for @signOutConfirm.
+  ///
+  /// In en, this message translates to:
+  /// **'Sign out of your current account?'**
+  String get signOutConfirm;
+
   /// No description provided for @mockUserName.
   ///
   /// In en, this message translates to:
@@ -2083,7 +2137,7 @@ abstract class AppLocalizations {
   /// No description provided for @myFavorites.
   ///
   /// In en, this message translates to:
-  /// **'My favorites'**
+  /// **'Favorites'**
   String get myFavorites;
 
   /// No description provided for @noFavorites.
@@ -3367,7 +3421,7 @@ abstract class AppLocalizations {
   /// No description provided for @offlineDownloads.
   ///
   /// In en, this message translates to:
-  /// **'Offline downloads'**
+  /// **'Downloads'**
   String get offlineDownloads;
 
   /// No description provided for @watchPreferences.
@@ -3385,13 +3439,49 @@ abstract class AppLocalizations {
   /// No description provided for @vipBrandName.
   ///
   /// In en, this message translates to:
-  /// **'Netshort VIP'**
+  /// **'FruitShorts VIP'**
   String get vipBrandName;
 
+  /// No description provided for @vipOpenNow.
+  ///
+  /// In en, this message translates to:
+  /// **'Get VIP'**
+  String get vipOpenNow;
+
+  /// No description provided for @vipBenefitFree.
+  ///
+  /// In en, this message translates to:
+  /// **'Free full access'**
+  String get vipBenefitFree;
+
+  /// No description provided for @vipBenefitNoAds.
+  ///
+  /// In en, this message translates to:
+  /// **'Ad-free viewing'**
+  String get vipBenefitNoAds;
+
+  /// No description provided for @vipBenefitHd.
+  ///
+  /// In en, this message translates to:
+  /// **'1080P HD'**
+  String get vipBenefitHd;
+
+  /// No description provided for @vipBenefitFastCache.
+  ///
+  /// In en, this message translates to:
+  /// **'Fast downloads'**
+  String get vipBenefitFastCache;
+
+  /// No description provided for @moreServices.
+  ///
+  /// In en, this message translates to:
+  /// **'More'**
+  String get moreServices;
+
   /// No description provided for @mineVipSubtitle.
   ///
   /// In en, this message translates to:
-  /// **'Enjoy exclusive benefits'**
+  /// **'Unlock excitement, binge freely'**
   String get mineVipSubtitle;
 
   /// No description provided for @favoriteEpisodeProgress.
@@ -3400,6 +3490,60 @@ abstract class AppLocalizations {
   /// **'Episode {episode} / {total} total'**
   String favoriteEpisodeProgress(int episode, int total);
 
+  /// No description provided for @manage.
+  ///
+  /// In en, this message translates to:
+  /// **'Manage'**
+  String get manage;
+
+  /// No description provided for @continueWatchingSubtitle.
+  ///
+  /// In en, this message translates to:
+  /// **'Episode {episode} of {total}'**
+  String continueWatchingSubtitle(int episode, int total);
+
+  /// No description provided for @favoriteDramas.
+  ///
+  /// In en, this message translates to:
+  /// **'Favorites'**
+  String get favoriteDramas;
+
+  /// No description provided for @totalDramasCount.
+  ///
+  /// In en, this message translates to:
+  /// **'{count} titles'**
+  String totalDramasCount(int count);
+
+  /// No description provided for @watchedEpisodeTotal.
+  ///
+  /// In en, this message translates to:
+  /// **'EP {episode} / {total}'**
+  String watchedEpisodeTotal(int episode, int total);
+
+  /// No description provided for @hasUpdateBadge.
+  ///
+  /// In en, this message translates to:
+  /// **'UPDATED'**
+  String get hasUpdateBadge;
+
+  /// No description provided for @updatedToEpisode.
+  ///
+  /// In en, this message translates to:
+  /// **'Updated to EP {episode}'**
+  String updatedToEpisode(int episode);
+
+  /// No description provided for @finishedAllEpisodes.
+  ///
+  /// In en, this message translates to:
+  /// **'{total} eps · Completed'**
+  String finishedAllEpisodes(int total);
+
+  /// No description provided for @noFavoritesYet.
+  ///
+  /// In en, this message translates to:
+  /// **'No favorites yet'**
+  String get noFavoritesYet;
+
   /// No description provided for @watchedToEpisode.
   ///
   /// In en, this message translates to:

lib/l10n/app_localizations_en.dart

@@ -69,10 +69,6 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get fruitShortsBrand => 'FruitShorts';
 
-  @override
-  String get authLandingSubtitle =>
-      'Sign in to sync progress, favorites and coins';
-
   @override
   String get comingSoon => 'Coming soon';
 
@@ -162,7 +158,17 @@ class AppLocalizationsEn extends AppLocalizations {
 
   @override
   String watchFullSeries(String episodes) {
-    return 'Watch full series · $episodes eps';
+    return 'Watch full series  $episodes eps';
+  }
+
+  @override
+  String feedEpisodePrefix(int episode) {
+    return 'EP$episode';
+  }
+
+  @override
+  String feedWatchingCount(String count) {
+    return '$count watching';
   }
 
   @override
@@ -587,6 +593,9 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get pictureInPicture => 'Picture in picture';
 
+  @override
+  String get autoEnterPip => 'Auto mini player on exit';
+
   @override
   String get pipUnavailable =>
       'Picture in picture is unavailable on this device';
@@ -594,6 +603,23 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get originalTag => 'Original';
 
+  @override
+  String get originalProduction => 'Original';
+
+  @override
+  String get watchNowAction => 'Watch Now';
+
+  @override
+  String get newArrivalBadge => 'NEW';
+
+  @override
+  String get editorPick => 'Editor\'s Pick';
+
+  @override
+  String totalEpisodesShort(int count) {
+    return '$count eps';
+  }
+
   @override
   String get dramaTag => 'Short drama';
 
@@ -618,6 +644,9 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get episodes => 'Episodes';
 
+  @override
+  String get similarDramas => 'More like this';
+
   @override
   String get synopsisTitle => 'Synopsis';
 
@@ -877,7 +906,7 @@ class AppLocalizationsEn extends AppLocalizations {
   String get freeBonus => 'Get Free Bonus';
 
   @override
-  String get watchHistory => 'Watch History';
+  String get watchHistory => 'History';
 
   @override
   String get settings => 'Settings';
@@ -906,6 +935,9 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get signOut => 'Sign Out';
 
+  @override
+  String get signOutConfirm => 'Sign out of your current account?';
+
   @override
   String get mockUserName => 'Vicky sheng';
 
@@ -1060,7 +1092,7 @@ class AppLocalizationsEn extends AppLocalizations {
       'Could not update favorites. Please retry.';
 
   @override
-  String get myFavorites => 'My favorites';
+  String get myFavorites => 'Favorites';
 
   @override
   String get noFavorites => 'No favorites yet.';
@@ -1754,7 +1786,7 @@ class AppLocalizationsEn extends AppLocalizations {
   String get uidCopied => 'UID copied';
 
   @override
-  String get offlineDownloads => 'Offline downloads';
+  String get offlineDownloads => 'Downloads';
 
   @override
   String get watchPreferences => 'Watch preferences';
@@ -1763,16 +1795,71 @@ class AppLocalizationsEn extends AppLocalizations {
   String get contactSupport => 'Contact support';
 
   @override
-  String get vipBrandName => 'Netshort VIP';
+  String get vipBrandName => 'FruitShorts VIP';
 
   @override
-  String get mineVipSubtitle => 'Enjoy exclusive benefits';
+  String get vipOpenNow => 'Get VIP';
+
+  @override
+  String get vipBenefitFree => 'Free full access';
+
+  @override
+  String get vipBenefitNoAds => 'Ad-free viewing';
+
+  @override
+  String get vipBenefitHd => '1080P HD';
+
+  @override
+  String get vipBenefitFastCache => 'Fast downloads';
+
+  @override
+  String get moreServices => 'More';
+
+  @override
+  String get mineVipSubtitle => 'Unlock excitement, binge freely';
 
   @override
   String favoriteEpisodeProgress(int episode, int total) {
     return 'Episode $episode / $total total';
   }
 
+  @override
+  String get manage => 'Manage';
+
+  @override
+  String continueWatchingSubtitle(int episode, int total) {
+    return 'Episode $episode of $total';
+  }
+
+  @override
+  String get favoriteDramas => 'Favorites';
+
+  @override
+  String totalDramasCount(int count) {
+    return '$count titles';
+  }
+
+  @override
+  String watchedEpisodeTotal(int episode, int total) {
+    return 'EP $episode / $total';
+  }
+
+  @override
+  String get hasUpdateBadge => 'UPDATED';
+
+  @override
+  String updatedToEpisode(int episode) {
+    return 'Updated to EP $episode';
+  }
+
+  @override
+  String finishedAllEpisodes(int total) {
+    return '$total eps · Completed';
+  }
+
+  @override
+  String get noFavoritesYet => 'No favorites yet';
+
   @override
   String watchedToEpisode(int episode) {
     return 'Watched to Episode $episode';

lib/l10n/app_localizations_id.dart

@@ -69,10 +69,6 @@ class AppLocalizationsId extends AppLocalizations {
   @override
   String get fruitShortsBrand => 'FruitShorts';
 
-  @override
-  String get authLandingSubtitle =>
-      'Masuk untuk menyinkronkan progres, favorit, dan koin';
-
   @override
   String get comingSoon => 'Segera hadir';
 
@@ -162,7 +158,17 @@ class AppLocalizationsId extends AppLocalizations {
 
   @override
   String watchFullSeries(String episodes) {
-    return 'Tonton serial lengkap · $episodes eps';
+    return 'Tonton serial lengkap  $episodes eps';
+  }
+
+  @override
+  String feedEpisodePrefix(int episode) {
+    return 'EP$episode';
+  }
+
+  @override
+  String feedWatchingCount(String count) {
+    return '$count menonton';
   }
 
   @override
@@ -289,7 +295,7 @@ class AppLocalizationsId extends AppLocalizations {
   String get localDemoProfile => 'Profil demo lokal';
 
   @override
-  String get continueWatching => 'Lanjut Tonton';
+  String get continueWatching => 'Lanjutkan';
 
   @override
   String episodeRemaining(int episode, int minutes) {
@@ -588,6 +594,9 @@ class AppLocalizationsId extends AppLocalizations {
   @override
   String get pictureInPicture => 'Gambar dalam gambar';
 
+  @override
+  String get autoEnterPip => 'Mini player otomatis saat keluar';
+
   @override
   String get pipUnavailable =>
       'Gambar dalam gambar tidak tersedia di perangkat ini';
@@ -595,6 +604,23 @@ class AppLocalizationsId extends AppLocalizations {
   @override
   String get originalTag => 'Original';
 
+  @override
+  String get originalProduction => 'Original';
+
+  @override
+  String get watchNowAction => 'Tonton Sekarang';
+
+  @override
+  String get newArrivalBadge => 'BARU';
+
+  @override
+  String get editorPick => 'Pilihan Editor';
+
+  @override
+  String totalEpisodesShort(int count) {
+    return '$count eps';
+  }
+
   @override
   String get dramaTag => 'Drama pendek';
 
@@ -619,6 +645,9 @@ class AppLocalizationsId extends AppLocalizations {
   @override
   String get episodes => 'Episode';
 
+  @override
+  String get similarDramas => 'Rekomendasi Serupa';
+
   @override
   String get synopsisTitle => 'Sinopsis';
 
@@ -880,7 +909,7 @@ class AppLocalizationsId extends AppLocalizations {
   String get freeBonus => 'Bonus Gratis';
 
   @override
-  String get watchHistory => 'Riwayat Tontonan';
+  String get watchHistory => 'Riwayat';
 
   @override
   String get settings => 'Pengaturan';
@@ -910,6 +939,9 @@ class AppLocalizationsId extends AppLocalizations {
   @override
   String get signOut => 'Keluar';
 
+  @override
+  String get signOutConfirm => 'Keluar dari akun saat ini?';
+
   @override
   String get mockUserName => 'Vicky sheng';
 
@@ -1062,7 +1094,7 @@ class AppLocalizationsId extends AppLocalizations {
   String get favoriteToggleFailed => 'Gagal memperbarui favorit. Coba lagi.';
 
   @override
-  String get myFavorites => 'Favorit saya';
+  String get myFavorites => 'Favorit';
 
   @override
   String get noFavorites => 'Belum ada favorit.';
@@ -1756,7 +1788,7 @@ class AppLocalizationsId extends AppLocalizations {
   String get uidCopied => 'UID disalin';
 
   @override
-  String get offlineDownloads => 'Unduhan offline';
+  String get offlineDownloads => 'Unduhan';
 
   @override
   String get watchPreferences => 'Preferensi tontonan';
@@ -1765,16 +1797,71 @@ class AppLocalizationsId extends AppLocalizations {
   String get contactSupport => 'Hubungi dukungan';
 
   @override
-  String get vipBrandName => 'Netshort VIP';
+  String get vipBrandName => 'FruitShorts VIP';
 
   @override
-  String get mineVipSubtitle => 'Nikmati manfaat eksklusif';
+  String get vipOpenNow => 'Buka VIP';
+
+  @override
+  String get vipBenefitFree => 'Nonton semua gratis';
+
+  @override
+  String get vipBenefitNoAds => 'Bebas iklan';
+
+  @override
+  String get vipBenefitHd => 'HD 1080P';
+
+  @override
+  String get vipBenefitFastCache => 'Unduhan cepat';
+
+  @override
+  String get moreServices => 'Lainnya';
+
+  @override
+  String get mineVipSubtitle => 'Buka keseruan, tonton sepuasnya';
 
   @override
   String favoriteEpisodeProgress(int episode, int total) {
     return 'Episode $episode / total $total';
   }
 
+  @override
+  String get manage => 'Kelola';
+
+  @override
+  String continueWatchingSubtitle(int episode, int total) {
+    return 'Episode $episode dari $total';
+  }
+
+  @override
+  String get favoriteDramas => 'Koleksi';
+
+  @override
+  String totalDramasCount(int count) {
+    return '$count judul';
+  }
+
+  @override
+  String watchedEpisodeTotal(int episode, int total) {
+    return 'EP $episode / $total';
+  }
+
+  @override
+  String get hasUpdateBadge => 'UPDATE';
+
+  @override
+  String updatedToEpisode(int episode) {
+    return 'Diperbarui ke EP $episode';
+  }
+
+  @override
+  String finishedAllEpisodes(int total) {
+    return '$total eps · Selesai';
+  }
+
+  @override
+  String get noFavoritesYet => 'Belum ada favorit';
+
   @override
   String watchedToEpisode(int episode) {
     return 'Ditonton hingga Episode $episode';

lib/l10n/app_localizations_zh.dart

@@ -66,10 +66,7 @@ class AppLocalizationsZh extends AppLocalizations {
   String get recommended => '推荐';
 
   @override
-  String get fruitShortsBrand => '水果短剧';
+  String get fruitShortsBrand => 'FruitShorts';
-
-  @override
-  String get authLandingSubtitle => '登录后同步进度、收藏与金币权益';
 
   @override
   String get comingSoon => '即将上线';
@@ -159,7 +156,17 @@ class AppLocalizationsZh extends AppLocalizations {
 
   @override
   String watchFullSeries(String episodes) {
-    return '观看完整剧集 · 全$episodes集';
+    return '观看完整剧集  全$episodes集';
+  }
+
+  @override
+  String feedEpisodePrefix(int episode) {
+    return '第$episode集';
+  }
+
+  @override
+  String feedWatchingCount(String count) {
+    return '共$count人在看';
   }
 
   @override
@@ -581,12 +588,32 @@ class AppLocalizationsZh extends AppLocalizations {
   @override
   String get pictureInPicture => '画中画';
 
+  @override
+  String get autoEnterPip => '退出后自动小窗';
+
   @override
   String get pipUnavailable => '此设备无法使用画中画';
 
   @override
   String get originalTag => '原创';
 
+  @override
+  String get originalProduction => '原创出品';
+
+  @override
+  String get watchNowAction => '立即观看';
+
+  @override
+  String get newArrivalBadge => '上新';
+
+  @override
+  String get editorPick => '编辑精选';
+
+  @override
+  String totalEpisodesShort(int count) {
+    return '全$count集';
+  }
+
   @override
   String get dramaTag => '短剧';
 
@@ -611,6 +638,9 @@ class AppLocalizationsZh extends AppLocalizations {
   @override
   String get episodes => '选集';
 
+  @override
+  String get similarDramas => '相似推荐';
+
   @override
   String get synopsisTitle => '简介';
 
@@ -895,6 +925,9 @@ class AppLocalizationsZh extends AppLocalizations {
   @override
   String get signOut => '退出登录';
 
+  @override
+  String get signOutConfirm => '确定要退出当前账号吗？';
+
   @override
   String get mockUserName => 'Vicky sheng';
 
@@ -1737,16 +1770,71 @@ class AppLocalizationsZh extends AppLocalizations {
   String get contactSupport => '联系客服';
 
   @override
-  String get vipBrandName => 'Netshort VIP';
+  String get vipBrandName => 'FruitShorts VIP';
 
   @override
-  String get mineVipSubtitle => '享受专属权益';
+  String get vipOpenNow => '立即开通';
+
+  @override
+  String get vipBenefitFree => '全剧免费看';
+
+  @override
+  String get vipBenefitNoAds => '免广告打扰';
+
+  @override
+  String get vipBenefitHd => '1080P高清';
+
+  @override
+  String get vipBenefitFastCache => '极速缓存';
+
+  @override
+  String get moreServices => '更多服务';
+
+  @override
+  String get mineVipSubtitle => '解锁精彩，畅看好剧';
 
   @override
   String favoriteEpisodeProgress(int episode, int total) {
     return '第 $episode 集 / 共 $total 集';
   }
 
+  @override
+  String get manage => '管理';
+
+  @override
+  String continueWatchingSubtitle(int episode, int total) {
+    return '看到第 $episode 集 · 全 $total 集';
+  }
+
+  @override
+  String get favoriteDramas => '收藏短剧';
+
+  @override
+  String totalDramasCount(int count) {
+    return '共 $count 部';
+  }
+
+  @override
+  String watchedEpisodeTotal(int episode, int total) {
+    return '看到第 $episode 集 / 全 $total 集';
+  }
+
+  @override
+  String get hasUpdateBadge => '有更新';
+
+  @override
+  String updatedToEpisode(int episode) {
+    return '更新至第 $episode 集';
+  }
+
+  @override
+  String finishedAllEpisodes(int total) {
+    return '全 $total 集 · 已完结';
+  }
+
+  @override
+  String get noFavoritesYet => '还没有收藏的短剧';
+
   @override
   String watchedToEpisode(int episode) {
     return '已看至 第 $episode 集';

lib/l10n/app_zh.arb

@@ -19,8 +19,7 @@
   "searchCancel": "取消",
   "featured": "精选",
   "recommended": "推荐",
-  "fruitShortsBrand": "水果短剧",
+  "fruitShortsBrand": "FruitShorts",
-  "authLandingSubtitle": "登录后同步进度、收藏与金币权益",
   "comingSoon": "即将上线",
   "authLegal": "继续即代表同意《用户协议》与《隐私政策》",
   "authLegalLead": "继续即代表同意",
@@ -49,7 +48,24 @@
   "hotBadge": "爆剧",
   "filterAll": "全部",
   "seriesMeta": "系列剧 · 共{episodes}集 | 共{viewers}人在追",
-  "watchFullSeries": "观看完整剧集 · 全{episodes}集",
+  "watchFullSeries": "观看完整剧集  全{episodes}集",
+  "@watchFullSeries": {
+    "placeholders": {
+      "episodes": {"type": "String"}
+    }
+  },
+  "feedEpisodePrefix": "第{episode}集",
+  "@feedEpisodePrefix": {
+    "placeholders": {
+      "episode": {"type": "int"}
+    }
+  },
+  "feedWatchingCount": "共{count}人在看",
+  "@feedWatchingCount": {
+    "placeholders": {
+      "count": {"type": "String"}
+    }
+  },
   "feedTabAnime": "漫剧",
   "feedTabReal": "真人剧",
   "feedTabForYou": "推荐",
@@ -237,8 +253,21 @@
   "shareFailed": "无法打开系统分享面板。",
   "nowPlaying": "正在播放",
   "pictureInPicture": "画中画",
+  "autoEnterPip": "退出后自动小窗",
   "pipUnavailable": "此设备无法使用画中画",
   "originalTag": "原创",
+  "originalProduction": "原创出品",
+  "watchNowAction": "立即观看",
+  "newArrivalBadge": "上新",
+  "editorPick": "编辑精选",
+  "totalEpisodesShort": "全{count}集",
+  "@totalEpisodesShort": {
+    "placeholders": {
+      "count": {
+        "type": "int"
+      }
+    }
+  },
   "dramaTag": "短剧",
   "episodeLabel": "第 {number} 集",
   "@episodeLabel": {
@@ -252,6 +281,7 @@
   "episodeCount": "{count} 集",
   "technicalDemoCount": "免费试看 · {count} 集",
   "episodes": "选集",
+  "similarDramas": "相似推荐",
   "synopsisTitle": "简介",
   "watchEpisodeOne": "观看第 1 集",
   "continueEpisode": "续看第 {number} 集",
@@ -354,6 +384,7 @@
   "restoreDefault": "恢复默认",
   "invalidServerAddress": "请输入有效的 http(s) 服务器地址。",
   "signOut": "退出登录",
+  "signOutConfirm": "确定要退出当前账号吗？",
   "mockUserName": "Vicky sheng",
   "mockUserId": "ID: M1CZWVYE",
   "mockNotice": "当前是示例数据。",
@@ -682,8 +713,14 @@
   "offlineDownloads": "离线缓存",
   "watchPreferences": "观看偏好",
   "contactSupport": "联系客服",
-  "vipBrandName": "Netshort VIP",
+  "vipBrandName": "FruitShorts VIP",
-  "mineVipSubtitle": "享受专属权益",
+  "vipOpenNow": "立即开通",
+  "vipBenefitFree": "全剧免费看",
+  "vipBenefitNoAds": "免广告打扰",
+  "vipBenefitHd": "1080P高清",
+  "vipBenefitFastCache": "极速缓存",
+  "moreServices": "更多服务",
+  "mineVipSubtitle": "解锁精彩，畅看好剧",
   "favoriteEpisodeProgress": "第 {episode} 集 / 共 {total} 集",
   "@favoriteEpisodeProgress": {
     "placeholders": {
@@ -691,6 +728,44 @@
       "total": { "type": "int" }
     }
   },
+  "myFavorites": "我的收藏",
+  "manage": "管理",
+  "continueWatching": "继续观看",
+  "continueWatchingSubtitle": "看到第 {episode} 集 · 全 {total} 集",
+  "@continueWatchingSubtitle": {
+    "placeholders": {
+      "episode": { "type": "int" },
+      "total": { "type": "int" }
+    }
+  },
+  "favoriteDramas": "收藏短剧",
+  "totalDramasCount": "共 {count} 部",
+  "@totalDramasCount": {
+    "placeholders": {
+      "count": { "type": "int" }
+    }
+  },
+  "watchedEpisodeTotal": "看到第 {episode} 集 / 全 {total} 集",
+  "@watchedEpisodeTotal": {
+    "placeholders": {
+      "episode": { "type": "int" },
+      "total": { "type": "int" }
+    }
+  },
+  "hasUpdateBadge": "有更新",
+  "updatedToEpisode": "更新至第 {episode} 集",
+  "@updatedToEpisode": {
+    "placeholders": {
+      "episode": { "type": "int" }
+    }
+  },
+  "finishedAllEpisodes": "全 {total} 集 · 已完结",
+  "@finishedAllEpisodes": {
+    "placeholders": {
+      "total": { "type": "int" }
+    }
+  },
+  "noFavoritesYet": "还没有收藏的短剧",
   "watchedToEpisode": "已看至 第 {episode} 集",
   "@watchedToEpisode": { "placeholders": { "episode": { "type": "int" } } },
   "homeWatchAll": "观看全集",

lib/main.dart

@@ -13,10 +13,14 @@ import 'core/platform/wireless_data_prompt.dart';
 
 Future<void> main() async {
   WidgetsFlutterBinding.ensureInitialized();
+  // 生产包不能连开发机：忘了改开关时宁可启动即失败。
+  if (kReleaseMode && AppConfig.useDevConfig) {
+    throw StateError('release 构建请把 AppConfig.useDevConfig 改成 false');
+  }
   await ServerEndpoint.load();
   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

@@ -11,6 +11,7 @@ import '../../core/formatting/localized_date_time.dart';
 import '../../core/theme/app_colors.dart';
 import '../../core/theme/app_dimens.dart';
 import '../../core/theme/app_theme.dart';
+import '../../core/widgets/app_glow_panel.dart';
 import '../../core/widgets/auth_gate.dart';
 import '../../core/widgets/plain_page_scaffold.dart';
 import '../../l10n/app_localizations.dart';
@@ -172,15 +173,15 @@ class _AccountDeactivatePageState extends State<AccountDeactivatePage> {
     final l10n = AppLocalizations.of(context)!;
     final confirmed = await showDialog<bool>(
       context: context,
-      builder: (dialogContext) => AlertDialog(
+      builder: (dialogContext) => AppGlowDialog(
-        title: Text(l10n.accountConfirmDeactivateTitle),
+        title: l10n.accountConfirmDeactivateTitle,
-        content: Text(l10n.accountConfirmDeactivateMessage),
+        content: l10n.accountConfirmDeactivateMessage,
         actions: [
           TextButton(
             onPressed: () => Navigator.of(dialogContext).pop(false),
             child: Text(l10n.cancel),
           ),
-          FilledButton(
+          TextButton(
             key: const Key('account-deactivate-confirm'),
             onPressed: () => Navigator.of(dialogContext).pop(true),
             child: Text(l10n.accountConfirmDeactivate),

lib/pages/account/account_entry_card.dart

@@ -45,8 +45,7 @@ class AccountEntryCard extends StatelessWidget {
     ];
     return Material(
       key: const Key('mine-account-card'),
-      color: AppColors.card,
+      color: AppColors.contentSurface,
-      borderRadius: BorderRadius.circular(AppDimens.cardRadius),
       clipBehavior: Clip.antiAlias,
       child: Column(
         children: [
@@ -55,7 +54,7 @@ class AccountEntryCard extends StatelessWidget {
               const Divider(
                 height: AppDimens.mineGridDividerWidth,
                 thickness: AppDimens.mineGridDividerWidth,
-                color: AppColors.outlineVariantDark,
+                color: AppColors.contentBorder,
               ),
             _AccountListTile(row: rows[index]),
           ],

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(
-          _info(l10n.accountLanguage, profile.language),
+            l10n.accountStatus,
-          _info(l10n.accountTimezone, profile.timezone),
+            accountStatusText(profile.status, localeName),
-          _info(l10n.accountRegion, profile.regionCode),
+          ),
-          _info(l10n.accountVipLevel, '${profile.vipLevel}'),
+          _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/auth_form_widgets.dart

@@ -61,7 +61,7 @@ class _AuthFields extends StatelessWidget {
           onChanged: callbacks.onEmailChanged,
           onSubmitted: (_) => state.fields.passwordFocus.requestFocus(),
           style: const TextStyle(color: AppColors.onSurface, fontSize: 15),
-          cursorColor: AppColors.blue,
+          cursorColor: AppColors.brandRed,
           decoration: _decoration(
             context: context,
             hint: 'name@example.com',
@@ -93,7 +93,7 @@ class _AuthFields extends StatelessWidget {
           onChanged: callbacks.onPasswordChanged,
           onSubmitted: (_) => callbacks.onSubmit(),
           style: const TextStyle(color: AppColors.onSurface, fontSize: 15),
-          cursorColor: AppColors.blue,
+          cursorColor: AppColors.brandRed,
           decoration: _decoration(
             context: context,
             hint: l10n.authPasswordHint,
@@ -128,7 +128,7 @@ class _AuthFields extends StatelessWidget {
     style: const TextStyle(
       color: AppColors.muted,
       fontSize: 12,
-      fontWeight: FontWeight.w700,
+      fontWeight: FontWeight.w400,
     ),
   );
 
@@ -142,10 +142,7 @@ class _AuthFields extends StatelessWidget {
   }) {
     final border = OutlineInputBorder(
       borderRadius: BorderRadius.circular(_fieldRadius),
-      borderSide: const BorderSide(
+      borderSide: BorderSide.none,
-        color: AppColors.border,
-        width: _fieldBorderWidth,
-      ),
     );
     final errorColor = Theme.of(context).colorScheme.error;
     final errorBorder = OutlineInputBorder(
@@ -158,7 +155,7 @@ class _AuthFields extends StatelessWidget {
       prefixIcon: Icon(
         icon,
         size: 21,
-        color: focused ? AppColors.blue : AppColors.muted,
+        color: focused ? AppColors.brandRed : AppColors.muted,
       ),
       prefixIconConstraints: const BoxConstraints(
         minWidth: _minTapTarget,
@@ -166,7 +163,7 @@ class _AuthFields extends StatelessWidget {
       ),
       suffixIcon: suffix,
       filled: true,
-      fillColor: AppColors.card,
+      fillColor: Colors.white.withValues(alpha: 0.05),
       isDense: true,
       contentPadding: const EdgeInsets.only(right: 16),
       border: border,
@@ -175,7 +172,7 @@ class _AuthFields extends StatelessWidget {
       focusedBorder: OutlineInputBorder(
         borderRadius: BorderRadius.circular(_fieldRadius),
         borderSide: const BorderSide(
-          color: AppColors.blue,
+          color: AppColors.brandRed,
           width: _fieldBorderWidth,
         ),
       ),
@@ -204,17 +201,17 @@ class _AuthSubmitButton extends StatelessWidget {
         style: ButtonStyle(
           backgroundColor: WidgetStateProperty.resolveWith((states) {
             if (states.contains(WidgetState.disabled)) {
-              return AppColors.blue.withValues(alpha: 0.5);
+              return AppColors.brandRed.withValues(alpha: 0.5);
             }
             if (states.contains(WidgetState.pressed)) {
-              return AppColors.bluePressed;
+              return AppColors.brandRedPressed;
             }
-            return AppColors.blue;
+            return AppColors.brandRed;
           }),
           foregroundColor: const WidgetStatePropertyAll(AppColors.onPrimary),
           elevation: const WidgetStatePropertyAll(2),
           shadowColor: WidgetStatePropertyAll(
-            AppColors.blue.withValues(alpha: 0.22),
+            AppColors.brandRed.withValues(alpha: 0.22),
           ),
           padding: const WidgetStatePropertyAll(EdgeInsets.zero),
           shape: WidgetStatePropertyAll(
@@ -235,7 +232,7 @@ class _AuthSubmitButton extends StatelessWidget {
                 status.signUpMode ? l10n.signUp : l10n.signIn,
                 style: const TextStyle(
                   fontSize: 15,
-                  fontWeight: FontWeight.w800,
+                  fontWeight: FontWeight.w600,
                 ),
               ),
       ),
@@ -243,18 +240,16 @@ class _AuthSubmitButton extends StatelessWidget {
   }
 }
 
-class _ModeSegment extends StatelessWidget {
+class _ModeTab extends StatelessWidget {
-  const _ModeSegment({
+  const _ModeTab({
     required this.segmentKey,
     required this.label,
-    required this.hiddenLabel,
     required this.selected,
     required this.onTap,
   });
 
   final Key segmentKey;
   final String label;
-  final String hiddenLabel;
   final bool selected;
   final VoidCallback? onTap;
 
@@ -264,38 +259,29 @@ class _ModeSegment extends StatelessWidget {
       key: segmentKey,
       behavior: HitTestBehavior.opaque,
       onTap: onTap,
-      child: AnimatedContainer(
+      // 文字 + 指示条只有约 32px 高，补上下各 6px 把可点区域撑到 44。
-        duration: _segmentDuration,
+      child: Padding(
-        alignment: Alignment.center,
+        padding: const EdgeInsets.symmetric(vertical: 6),
-        decoration: BoxDecoration(
+        child: Column(
-          color: selected ? AppColors.blue : AppColors.transparent,
+          crossAxisAlignment: CrossAxisAlignment.start,
-          borderRadius: BorderRadius.circular(18),
+          mainAxisSize: MainAxisSize.min,
-        ),
-        child: Stack(
-          fit: StackFit.expand,
           children: [
-            Center(
+            Text(
-              child: Text(
+              label,
-                label,
+              style: TextStyle(
-                style: TextStyle(
+                color: selected ? AppColors.textPrimary : AppColors.muted,
-                  color: selected ? AppColors.onPrimary : AppColors.onSurface,
+                fontSize: AppDimens.followingSegmentFont,
-                  fontSize: 14,
+                fontWeight: FontWeight.w400,
-                  fontWeight: FontWeight.w700,
-                ),
               ),
             ),
-            Positioned.fill(
+            const SizedBox(height: AppDimens.followingSegmentIndicatorTopGap),
-              child: ExcludeSemantics(
+            Container(
-                child: Opacity(
+              width: AppDimens.followingSegmentIndicatorWidth,
-                  opacity: 0,
+              height: AppDimens.followingSegmentIndicatorHeight,
-                  child: Center(
+              decoration: BoxDecoration(
-                    child: Text(
+                color: selected ? AppColors.brandRed : AppColors.transparent,
-                      hiddenLabel,
+                borderRadius: BorderRadius.circular(
-                      maxLines: 1,
+                  AppDimens.followingSegmentIndicatorRadius,
-                      softWrap: false,
-                      style: const TextStyle(fontSize: 14),
-                    ),
-                  ),
                 ),
               ),
             ),
@@ -349,7 +335,7 @@ class _AuthBrand extends StatelessWidget {
         style: const TextStyle(
           color: AppColors.onSurface,
           fontSize: 24,
-          fontWeight: FontWeight.w900,
+          fontWeight: FontWeight.w700,
           height: 1.1,
         ),
       ),

lib/pages/auth/auth_legal_links.dart

@@ -50,7 +50,7 @@ class _AuthLegalLinksState extends State<AuthLegalLinks> {
   Widget build(BuildContext context) {
     final l10n = AppLocalizations.of(context)!;
     final muted = TextStyle(color: AppColors.muted, fontSize: _legalFontSize, height: 1.6);
-    final link = muted.copyWith(color: AppColors.blue);
+    final link = muted.copyWith(color: AppColors.brandRed);
     return Text.rich(
       TextSpan(
         style: muted,

lib/pages/auth/auth_view.dart

@@ -24,18 +24,14 @@ part 'auth_widgets.dart';
 part 'auth_form_widgets.dart';
 
 const double _minTapTarget = 44;
-const double _brandMarkSize = 72;
+const double _brandMarkSize = 88;
 const double _compactBrandMarkSize = 48;
-const double _brandMarkRadius = 20;
+const double _brandMarkRadius = 26;
 const double _compactBrandMarkRadius = 14;
-const double _landingLogoTopGap = 28;
 const String _appLogoAsset = 'assets/icon/fruitshorts.png';
 const double _contentMaxWidth = 440;
-// Auth keeps its approved 20px card silhouette.
-const double _cardRadius = AppDimens.authCardRadius;
-const double _cardPadding = 20;
 const double _fieldHeight = 52;
-const double _fieldRadius = 14;
+const double _fieldRadius = 12;
 const double _fieldBorderWidth = 1;
 const double _buttonHeight = 50;
 const double _buttonRadius = 25;
@@ -47,14 +43,11 @@ const double _bottomContentPadding = 28;
 const double _compactTopContentPadding = 40;
 const double _compactHeightBreakpoint = 720;
 const double _compactBrandGap = 16;
-const double _glowSize = 280;
+const double _entryButtonHeight = 52;
-const double _warmGlowOpacity = 0.18;
+const double _entryButtonRadius = 26;
-const double _entryButtonHeight = 50;
-const double _entryButtonRadius = 25;
 const double _entryButtonFontSize = 15;
 const double _entryIconSize = 20;
 const Duration _enterDuration = Duration(milliseconds: 220);
-const Duration _segmentDuration = Duration(milliseconds: 160);
 
 Widget _brandMarkWidget({
   Key? key,
@@ -267,45 +260,53 @@ class _AuthPageState extends State<AuthPage> {
               child: IgnorePointer(
                 child: DecoratedBox(
                   key: Key('auth-page-background'),
-                  decoration: BoxDecoration(gradient: AppTheme.pageGradient),
-                ),
-              ),
-            ),
-            Positioned(
-              top: -90,
-              right: -70,
-              width: _glowSize,
-              height: _glowSize,
-              child: IgnorePointer(
-                child: Container(
-                  key: const Key('auth-background-glow'),
                   decoration: BoxDecoration(
-                    shape: BoxShape.circle,
+                    gradient: LinearGradient(
-                    gradient: RadialGradient(
+                      begin: Alignment.topCenter,
+                      end: Alignment.bottomCenter,
                       colors: [
-                        AppColors.surfaceTop,
+                        AppColors.followingGlow,
-                        AppColors.surfaceTop.withValues(alpha: 0),
+                        AppColors.followingGlowMid,
+                        AppColors.appBackground,
                       ],
+                      stops: [0, 0.14, 0.3],
                     ),
                   ),
                 ),
               ),
             ),
-            Positioned(
+            // 全屏海报背景：压暗保证文字可读，顶部再叠品牌红光。
-              left: -110,
+            Positioned.fill(
-              bottom: -90,
+              child: IgnorePointer(child: _AuthPosterBackdrop()),
-              width: _glowSize,
+            ),
-              height: _glowSize,
+            const Positioned.fill(
               child: IgnorePointer(
-                child: Container(
+                child: DecoratedBox(
-                  key: const Key('auth-background-warm-glow'),
+                  key: Key('auth-poster-scrim'),
                   decoration: BoxDecoration(
-                    shape: BoxShape.circle,
+                    gradient: LinearGradient(
-                    gradient: RadialGradient(
+                      begin: Alignment.topCenter,
+                      end: Alignment.bottomCenter,
                       colors: [
-                        AppColors.gold.withValues(alpha: _warmGlowOpacity),
+                        Color(0x66000000),
-                        AppColors.gold.withValues(alpha: 0),
+                        Color(0x14000000),
+                        Color(0xE0000000),
                       ],
+                      stops: [0, 0.42, 1],
+                    ),
+                  ),
+                ),
+              ),
+            ),
+            const Positioned.fill(
+              child: IgnorePointer(
+                child: DecoratedBox(
+                  key: Key('auth-red-glow'),
+                  decoration: BoxDecoration(
+                    gradient: RadialGradient(
+                      center: Alignment(0, -1.15),
+                      radius: 1.3,
+                      colors: [AppColors.primaryBorder, AppColors.transparent],
                     ),
                   ),
                 ),
@@ -347,7 +348,11 @@ class _AuthPageState extends State<AuthPage> {
                               constraints: const BoxConstraints(
                                 maxWidth: _contentMaxWidth,
                               ),
-                              child: _content(l10n, compact: compact),
+                              child: _content(
+                                l10n,
+                                compact: compact,
+                                minHeight: minHeight,
+                              ),
                             ),
                           ),
                         ),
@@ -387,7 +392,11 @@ class _AuthPageState extends State<AuthPage> {
     );
   }
 
-  Widget _content(AppLocalizations l10n, {required bool compact}) =>
+  Widget _content(
+    AppLocalizations l10n, {
+    required bool compact,
+    required double minHeight,
+  }) =>
       TweenAnimationBuilder<double>(
         key: const Key('auth-enter-animation'),
         tween: Tween(begin: 0, end: 1),
@@ -409,15 +418,18 @@ class _AuthPageState extends State<AuthPage> {
                   _authCard(l10n),
                 ],
               )
-            : _landing(l10n),
+            : _landing(l10n, minHeight: minHeight),
       );
 
-  Widget _landing(AppLocalizations l10n) => Column(
+  /// 落地页内容需要有限高度才能用 Spacer 三段分割，这里显式钉住可用高度。
+  Widget _landing(AppLocalizations l10n, {required double minHeight}) =>
+      SizedBox(
+        height: minHeight,
+        child: Column(
     key: const Key('auth-landing'),
-    mainAxisAlignment: MainAxisAlignment.start,
     crossAxisAlignment: CrossAxisAlignment.stretch,
     children: [
-      const SizedBox(height: _landingLogoTopGap),
+      const Spacer(flex: 5),
       Center(
         child: _brandMarkWidget(
           key: const Key('auth-brand-logo'),
@@ -425,24 +437,19 @@ class _AuthPageState extends State<AuthPage> {
           radius: _brandMarkRadius,
         ),
       ),
-      const SizedBox(height: 16),
+      const SizedBox(height: 10),
       Text(
         l10n.fruitShortsBrand,
         textAlign: TextAlign.center,
         style: const TextStyle(
           fontFamily: 'Outfit',
           color: AppColors.onSurface,
-          fontSize: 24,
+          fontSize: 26,
-          fontWeight: FontWeight.w900,
+          fontWeight: FontWeight.w700,
+          letterSpacing: 2,
         ),
       ),
-      const SizedBox(height: 6),
+      const Spacer(flex: 3),
-      Text(
-        l10n.authLandingSubtitle,
-        textAlign: TextAlign.center,
-        style: const TextStyle(color: AppColors.muted, fontSize: 13),
-      ),
-      const SizedBox(height: 28),
       _AuthEntryButton(
         key: const Key('auth-entry-phone'),
         label: l10n.authPhoneSignIn,
@@ -458,10 +465,12 @@ class _AuthPageState extends State<AuthPage> {
         primary: false,
         onTap: () => setState(() => _emailEntryOpen = true),
       ),
-      const SizedBox(height: 18),
+      const SizedBox(height: 14),
-      const AuthLegalLinks(),
+      const Opacity(opacity: 0.75, child: AuthLegalLinks()),
-    ],
+      const Spacer(flex: 6),
-  );
+        ],
+      ),
+      );
 
   Future<void> _openPhoneSheet() async {
     final signedIn = await showPhoneAuthSheet(
@@ -526,15 +535,15 @@ class _AuthEntryButton extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final background = primary ? AppColors.blue : AppColors.card;
+    // 主按钮纯品牌红；次按钮为无边框深色玻璃（白 6%），Apple 风格。
+    final background = primary
+        ? AppColors.brandRed
+        : Colors.white.withValues(alpha: 0.06);
     final foreground = primary ? AppColors.onPrimary : AppColors.onSurface;
     return Material(
       color: background,
       shape: RoundedRectangleBorder(
         borderRadius: BorderRadius.circular(_entryButtonRadius),
-        side: primary
-            ? BorderSide.none
-            : const BorderSide(color: AppColors.border),
       ),
       clipBehavior: Clip.antiAlias,
       child: InkWell(
@@ -556,7 +565,7 @@ class _AuthEntryButton extends StatelessWidget {
                   style: TextStyle(
                     color: foreground,
                     fontSize: _entryButtonFontSize,
-                    fontWeight: FontWeight.w800,
+                    fontWeight: FontWeight.w600,
                   ),
                 ),
               ),
@@ -567,3 +576,18 @@ class _AuthEntryButton extends StatelessWidget {
     );
   }
 }
+
+/// 登录页全屏海报背景（单张，无拼缝）。
+class _AuthPosterBackdrop extends StatelessWidget {
+  const _AuthPosterBackdrop();
+
+  @override
+  Widget build(BuildContext context) {
+    return Image.asset(
+      key: const Key('auth-poster-backdrop'),
+      'assets/auth/bg_3.jpg',
+      fit: BoxFit.cover,
+      alignment: Alignment.center,
+    );
+  }
+}

lib/pages/auth/auth_widgets.dart

@@ -70,52 +70,45 @@ class _AuthCard extends StatelessWidget {
   Widget build(BuildContext context) {
     final l10n = state.l10n;
     final status = state.status;
-    return Container(
+    // 不再做卡片盒子，表单直接排在红光晕背景上。
+    return Column(
       key: const Key('auth-card'),
-      padding: const EdgeInsets.all(_cardPadding),
+      crossAxisAlignment: CrossAxisAlignment.stretch,
-      decoration: BoxDecoration(
+      children: [
-        color: AppColors.card,
+        _AuthModeSwitch(
-        borderRadius: BorderRadius.circular(_cardRadius),
+          l10n: l10n,
-        border: Border.all(color: AppColors.border),
+          signUpMode: status.signUpMode,
-      ),
+          busy: status.busy,
-      child: Column(
+          onSelected: callbacks.onModeSelected,
-        crossAxisAlignment: CrossAxisAlignment.stretch,
+        ),
-        children: [
+        const SizedBox(height: 24),
-          _AuthModeSwitch(
+        Text(
-            l10n: l10n,
+          status.signUpMode ? l10n.authSignUpTitle : l10n.authSignInTitle,
-            signUpMode: status.signUpMode,
+          style: const TextStyle(
-            busy: status.busy,
+            color: AppColors.onSurface,
-            onSelected: callbacks.onModeSelected,
+            fontSize: 24,
+            fontWeight: FontWeight.w600,
+            height: 1.2,
           ),
-          const SizedBox(height: 22),
+        ),
-          Text(
+        const SizedBox(height: 6),
-            status.signUpMode ? l10n.authSignUpTitle : l10n.authSignInTitle,
+        Text(
-            style: const TextStyle(
+          status.signUpMode ? l10n.authSignUpSubtitle : l10n.authSubtitle,
-              color: AppColors.onSurface,
+          style: const TextStyle(
-              fontSize: 25,
+            color: AppColors.muted,
-              fontWeight: FontWeight.w800,
+            fontSize: AppDimens.body,
-              height: 1.2,
+            height: 1.45,
-            ),
           ),
-          const SizedBox(height: 6),
+        ),
-          Text(
+        const SizedBox(height: 20),
-            status.signUpMode ? l10n.authSignUpSubtitle : l10n.authSubtitle,
+        _AuthFields(state: state, callbacks: callbacks),
-            style: const TextStyle(
+        if (status.errorMessage != null) ...[
-              color: AppColors.muted,
+          const SizedBox(height: 14),
-              fontSize: AppDimens.body,
+          _AuthError(message: status.errorMessage!),
-              height: 1.45,
-            ),
-          ),
-          const SizedBox(height: 22),
-          _AuthFields(state: state, callbacks: callbacks),
-          if (status.errorMessage != null) ...[
-            const SizedBox(height: 14),
-            _AuthError(message: status.errorMessage!),
-          ],
-          const SizedBox(height: 22),
-          _AuthSubmitButton(state: state, onSubmit: callbacks.onSubmit),
         ],
-      ),
+        const SizedBox(height: 22),
+        _AuthSubmitButton(state: state, onSubmit: callbacks.onSubmit),
+      ],
     );
   }
 }
@@ -135,47 +128,23 @@ class _AuthModeSwitch extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return TextButton(
+    return Row(
       key: const Key('auth-switch-mode'),
-      onPressed: busy ? null : () => onSelected(!signUpMode),
+      children: [
-      style: TextButton.styleFrom(
+        _ModeTab(
-        minimumSize: const Size(0, _minTapTarget),
+          segmentKey: const Key('auth-mode-sign-in'),
-        padding: EdgeInsets.zero,
+          label: l10n.signIn,
-        overlayColor: AppColors.transparent,
+          selected: !signUpMode,
-        splashFactory: NoSplash.splashFactory,
+          onTap: busy ? null : () => onSelected(false),
-        shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(22)),
-      ),
-      child: Container(
-        height: 36,
-        padding: const EdgeInsets.all(2),
-        decoration: BoxDecoration(
-          color: AppColors.raised,
-          borderRadius: BorderRadius.circular(18),
         ),
-        child: Row(
+        const SizedBox(width: AppDimens.followingSegmentGap),
-          children: [
+        _ModeTab(
-            Expanded(
+          segmentKey: const Key('auth-mode-sign-up'),
-              child: _ModeSegment(
+          label: l10n.signUp,
-                segmentKey: const Key('auth-mode-sign-in'),
+          selected: signUpMode,
-                label: l10n.signIn,
+          onTap: busy ? null : () => onSelected(true),
-                hiddenLabel: l10n.authSwitchToSignIn,
-                selected: !signUpMode,
-                onTap: busy ? null : () => onSelected(false),
-              ),
-            ),
-            const SizedBox(width: 4),
-            Expanded(
-              child: _ModeSegment(
-                segmentKey: const Key('auth-mode-sign-up'),
-                label: l10n.signUp,
-                hiddenLabel: l10n.authSwitchToSignUp,
-                selected: signUpMode,
-                onTap: busy ? null : () => onSelected(true),
-              ),
-            ),
-          ],
         ),
-      ),
+      ],
     );
   }
 }

lib/pages/auth/phone_auth_sheet.dart

@@ -8,10 +8,10 @@ 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';
+import '../../core/widgets/app_glow_panel.dart';
 import '../../core/widgets/centered_toast.dart';
 import '../../l10n/app_localizations.dart';
 
@@ -253,15 +253,15 @@ class _PhoneAuthSheetState extends State<PhoneAuthSheet> {
     final bottom = effectiveKeyboardInset(context, _keyboardInset);
     return Padding(
       padding: EdgeInsets.only(bottom: bottom),
-      child: Container(
+      child: AppGlowPanel(
-        key: const Key('phone-auth-sheet'),
+        borderRadius: const BorderRadius.vertical(
-        decoration: const BoxDecoration(
+          top: Radius.circular(_sheetRadius),
-          color: AppColors.card,
-          borderRadius: BorderRadius.vertical(
-            top: Radius.circular(_sheetRadius),
-          ),
         ),
-        child: SingleChildScrollView(
+        border: false,
+        child: Container(
+          key: const Key('phone-auth-sheet'),
+          decoration: const BoxDecoration(color: AppColors.transparent),
+          child: SingleChildScrollView(
           controller: _scrollController,
           padding: const EdgeInsets.fromLTRB(22, 10, 22, 26),
           child: Column(
@@ -314,6 +314,7 @@ class _PhoneAuthSheetState extends State<PhoneAuthSheet> {
             ],
           ),
         ),
+        ),
       ),
     );
   }
@@ -404,7 +405,7 @@ class _PhoneAuthSheetState extends State<PhoneAuthSheet> {
       key: const Key('auth-phone-submit'),
       onPressed: _submitting ? null : _submit,
       style: FilledButton.styleFrom(
-        backgroundColor: AppColors.blue,
+        backgroundColor: AppColors.brandRed,
         foregroundColor: AppColors.onPrimary,
         shape: RoundedRectangleBorder(
           borderRadius: BorderRadius.circular(_buttonHeight / 2),
@@ -440,7 +441,7 @@ class _PhoneAuthSheetState extends State<PhoneAuthSheet> {
     ),
     focusedBorder: OutlineInputBorder(
       borderRadius: BorderRadius.circular(_fieldRadius),
-      borderSide: const BorderSide(color: AppColors.blue, width: 1.5),
+      borderSide: const BorderSide(color: AppColors.brandRed, width: 1.5),
     ),
   );
 }

lib/pages/discover/discover_view.dart

@@ -10,7 +10,6 @@ import 'package:provider/provider.dart';
 import '../../core/data/models/drama.dart';
 import '../../core/data/repositories/catalog_repository.dart';
 import '../../core/data/repositories/search_repository.dart';
-import '../../core/data/services/catalog_retry.dart';
 import '../../core/data/services/category_controller.dart';
 import '../../core/data/services/theater_feed_controller.dart';
 import '../../core/formatting/error_text.dart';
@@ -154,14 +153,19 @@ class _DiscoverPageState extends State<DiscoverPage> {
               edgeOffset: _stickyHeaderHeight + 8,
               onRefresh: () =>
                   Future.wait([categories.load(), theater.refreshCurrent()]),
-              child: ListView(
+              child: CustomScrollView(
                 controller: logic.scroll,
                 physics: AppPullToRefresh.physics,
-                padding: EdgeInsets.only(
+                slivers: [
-                  top: showHeader ? _stickyHeaderHeight : 0,
+                  if (showHeader)
-                  bottom: AppDimens.spaceXl,
+                    const SliverToBoxAdapter(
-                ),
+                      child: SizedBox(height: _stickyHeaderHeight),
-                children: _content(l10n, categories),
+                    ),
+                  ..._content(l10n, categories),
+                  const SliverToBoxAdapter(
+                    child: SizedBox(height: AppDimens.spaceXl),
+                  ),
+                ],
               ),
             ),
           ),
@@ -229,12 +233,12 @@ class _DiscoverPageState extends State<DiscoverPage> {
       ];
     }
     if (categories.loading && categories.categories.isEmpty) {
-      return [_block(const CircularProgressIndicator(strokeWidth: 2))];
+      return [_sliverBlock(const CircularProgressIndicator(strokeWidth: 2))];
     }
     final error = categories.error;
     if (error != null) {
       return [
-        _block(
+        _sliverBlock(
           EmptyState(
             key: const Key('home-categories-error'),
             icon: Icons.cloud_off_rounded,
@@ -254,12 +258,12 @@ class _DiscoverPageState extends State<DiscoverPage> {
       ];
     }
     if (theater.loadingFirstPage) {
-      return [_block(const CircularProgressIndicator(strokeWidth: 2))];
+      return [_sliverBlock(const CircularProgressIndicator(strokeWidth: 2))];
     }
     final theaterError = theater.lastError;
     if (theaterError != null && theater.dramas.isEmpty) {
       return [
-        _block(
+        _sliverBlock(
           EmptyState(
             key: const Key('home-categories-error'),
             icon: Icons.cloud_off_rounded,
@@ -283,38 +287,49 @@ class _DiscoverPageState extends State<DiscoverPage> {
   List<Widget> _theaterBlocks(AppLocalizations l10n) {
     final dramas = theater.dramas;
     return [
-      _toolbar(),
+      SliverToBoxAdapter(child: _toolbar()),
       if (dramas.isEmpty)
-        Padding(
+        SliverToBoxAdapter(
-          padding: const EdgeInsets.symmetric(vertical: 40),
+          child: Padding(
-          child: EmptyState(
+            padding: const EdgeInsets.symmetric(vertical: 40),
-            key: const Key('discover-empty'),
+            child: EmptyState(
-            icon: Icons.movie_filter_outlined,
+              key: const Key('discover-empty'),
-            title: l10n.noStories,
+              icon: Icons.movie_filter_outlined,
-            subtitle: l10n.emptyHint,
+              title: l10n.noStories,
+              subtitle: l10n.emptyHint,
+            ),
           ),
         )
       else
-        DramaGrid(l10n: l10n, dramas: dramas, onOpen: _openDrama),
+        SliverDramaGrid(
+          key: const Key('home-all-dramas-grid'),
+          l10n: l10n,
+          dramas: dramas,
+          onOpen: _openDrama,
+        ),
       if (theater.loadingMore)
-        const Padding(
+        const SliverToBoxAdapter(
-          padding: EdgeInsets.symmetric(vertical: 20),
+          child: Padding(
-          child: Center(
+            padding: EdgeInsets.symmetric(vertical: 20),
-            child: SizedBox.square(
+            child: Center(
-              key: Key('theater-load-more'),
+              child: SizedBox.square(
-              dimension: 22,
+                key: Key('theater-load-more'),
-              child: CircularProgressIndicator(strokeWidth: 2),
+                dimension: 22,
+                child: CircularProgressIndicator(strokeWidth: 2),
+              ),
             ),
           ),
         )
       else if (dramas.isNotEmpty && !theater.hasMore)
-        Padding(
+        SliverToBoxAdapter(
-          key: const Key('paged-list-no-more'),
+          child: Padding(
-          padding: const EdgeInsets.symmetric(vertical: 16),
+            key: const Key('paged-list-no-more'),
-          child: Text(
+            padding: const EdgeInsets.symmetric(vertical: 16),
-            l10n.noMoreItems,
+            child: Text(
-            textAlign: TextAlign.center,
+              l10n.noMoreItems,
-            style: const TextStyle(color: AppColors.textHint, fontSize: 12),
+              textAlign: TextAlign.center,
+              style: const TextStyle(color: AppColors.textHint, fontSize: 12),
+            ),
           ),
         ),
     ];
@@ -402,21 +417,19 @@ class _DiscoverPageState extends State<DiscoverPage> {
     Navigator.of(context).push<void>(MaterialPageRoute(builder: (_) => page));
   }
 
+  Widget _sliverBlock(Widget child) => SliverToBoxAdapter(child: _block(child));
+
   Widget _block(Widget child) => ConstrainedBox(
     constraints: const BoxConstraints(minHeight: 280),
     child: Center(child: child),
   );
 
   Future<void> _retryCategories(CategoryController categories) {
-    return retryCatalogLoad(reload: categories.load);
+    return categories.load();
   }
 
-  Future<void> _retryTheater() async {
+  Future<void> _retryTheater() {
-    await retryCatalogLoad(
+    return theater.refreshCurrent();
-      reload: () async {
-        await theater.refreshCurrent();
-      },
-    );
   }
 
   Future<void> _editTheaterEndpoint() {

lib/pages/discover/search_page.dart

@@ -139,7 +139,7 @@ class _SearchPageState extends State<SearchPage> {
             color: AppColors.textSecondary,
             size: 18,
           ),
-          const SizedBox(width: AppDimens.spaceSm),
+          const SizedBox(width: 2),
           Expanded(
             child: TextField(
               key: const Key('discover-search'),

lib/pages/discover/widgets/discover_search_results.dart

@@ -10,6 +10,8 @@ import '../../../l10n/app_localizations.dart';
 import 'drama_grid.dart';
 
 /// 剧场搜索结果：加载、失败与空结果都留在同一页内。
+///
+/// 自身是 sliver，好让结果网格跟着剧场页一起懒加载。
 class DiscoverSearchResults extends StatelessWidget {
   const DiscoverSearchResults({
     super.key,
@@ -26,16 +28,24 @@ class DiscoverSearchResults extends StatelessWidget {
   final VoidCallback onRetry;
   final ValueChanged<Drama> onOpen;
 
+  static const EdgeInsets _topPadding = EdgeInsets.only(top: 12);
+
   @override
   Widget build(BuildContext context) {
     final l10n = AppLocalizations.of(context)!;
-    return Padding(
+    if (!loading && error == null && results.isNotEmpty) {
-      padding: const EdgeInsets.only(top: 12),
+      return SliverPadding(
-      child: _content(l10n),
+        padding: _topPadding,
+        sliver: SliverDramaGrid(l10n: l10n, dramas: results, onOpen: onOpen),
+      );
+    }
+    return SliverPadding(
+      padding: _topPadding,
+      sliver: SliverToBoxAdapter(child: _state(l10n)),
     );
   }
 
-  Widget _content(AppLocalizations l10n) {
+  Widget _state(AppLocalizations l10n) {
     if (loading) {
       return const Padding(
         padding: EdgeInsets.symmetric(vertical: 80),
@@ -61,14 +71,11 @@ class DiscoverSearchResults extends StatelessWidget {
         onAction: onRetry,
       );
     }
-    if (results.isEmpty) {
+    return EmptyState(
-      return EmptyState(
+      key: const Key('discover-search-empty'),
-        key: const Key('discover-search-empty'),
+      icon: Icons.search_off_rounded,
-        icon: Icons.search_off_rounded,
+      title: l10n.noSearchResults,
-        title: l10n.noSearchResults,
+      subtitle: l10n.emptyHint,
-        subtitle: l10n.emptyHint,
+    );
-      );
-    }
-    return DramaGrid(l10n: l10n, dramas: results, onOpen: onOpen);
   }
 }

lib/pages/discover/widgets/drama_grid.dart

@@ -7,9 +7,9 @@ import '../../../core/data/models/drama.dart';
 import '../../../core/formatting/count_format.dart';
 import '../../../core/theme/app_colors.dart';
 import '../../../core/theme/app_dimens.dart';
+import '../../../core/widgets/remote_image.dart';
 import '../../../l10n/app_localizations.dart';
 
-const int _columns = 2;
 const double _columnGap = 8;
 const double _cardGap = 14;
 const double _gridHorizontalPadding = 12;
@@ -28,8 +28,10 @@ const Color _tagChipBackground = AppColors.raised;
 final RegExp _tagSplitter = RegExp(r'[,/、·]');
 
 /// 剧场/分类页共用的双列剧目网格。
-class DramaGrid extends StatelessWidget {
+///
-  const DramaGrid({
+/// 按行懒加载：翻到第 N 页时只构建当前可见的几张卡，长列表不会把整本目录都留在树上。
+class SliverDramaGrid extends StatelessWidget {
+  const SliverDramaGrid({
     super.key,
     required this.l10n,
     required this.dramas,
@@ -42,33 +44,41 @@ class DramaGrid extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return Padding(
+    final rowCount = (dramas.length + 1) ~/ 2;
-      key: const Key('home-all-dramas-section'),
+    return SliverPadding(
       padding: const EdgeInsets.symmetric(horizontal: _gridHorizontalPadding),
-      child: Row(
+      sliver: SliverList(
-        key: const Key('home-all-dramas-grid'),
+        delegate: SliverChildBuilderDelegate((context, row) {
-        crossAxisAlignment: CrossAxisAlignment.start,
+          final left = dramas[row * 2];
-        children: [
+          final rightIndex = row * 2 + 1;
-          Expanded(child: _column(0)),
+          final right = rightIndex < dramas.length ? dramas[rightIndex] : null;
-          const SizedBox(width: _columnGap),
+          return Padding(
-          Expanded(child: _column(1)),
+            // 行间距沿用卡片间距，首行不需要。
-        ],
+            padding: EdgeInsets.only(top: row == 0 ? 0 : _cardGap),
+            child: Row(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Expanded(child: _card(left)),
+                const SizedBox(width: _columnGap),
+                Expanded(
+                  child: right == null
+                      ? const SizedBox.shrink()
+                      : _card(right),
+                ),
+              ],
+            ),
+          );
+        }, childCount: rowCount),
       ),
     );
   }
 
-  Widget _column(int start) {
+  Widget _card(Drama drama) {
-    final children = <Widget>[];
+    return DramaGridCard(
-    for (var index = start; index < dramas.length; index += _columns) {
+      l10n: l10n,
-      final drama = dramas[index];
+      drama: drama,
-      children.add(
+      onTap: () => onOpen(drama),
-        DramaGridCard(l10n: l10n, drama: drama, onTap: () => onOpen(drama)),
+    );
-      );
-      if (index + _columns < dramas.length) {
-        children.add(const SizedBox(height: _cardGap));
-      }
-    }
-    return Column(children: children);
   }
 }
 
@@ -218,16 +228,28 @@ class _DiscoverCoverImage extends StatelessWidget {
   Widget build(BuildContext context) {
     final url = AppConfig.mediaUrl(path);
     if (url.isEmpty) return _placeholder();
-    return Image.network(
+    return LayoutBuilder(
-      url,
+      builder: (context, constraints) {
-      width: double.infinity,
+        // 卡片只有半屏宽，按原图解码一张竖版海报就是数 MB，按布局宽度限一下。
-      height: double.infinity,
+        final decodeWidth = constraints.hasBoundedWidth
-      fit: BoxFit.cover,
+            ? resolveImageDecodePixels(
-      loadingBuilder: (context, child, progress) {
+                constraints.maxWidth,
-        if (progress == null) return child;
+                MediaQuery.devicePixelRatioOf(context),
-        return _placeholder();
+              )
+            : null;
+        return Image.network(
+          url,
+          width: double.infinity,
+          height: double.infinity,
+          fit: BoxFit.cover,
+          cacheWidth: decodeWidth,
+          loadingBuilder: (context, child, progress) {
+            if (progress == null) return child;
+            return _placeholder();
+          },
+          errorBuilder: (_, _, _) => _placeholder(),
+        );
       },
-      errorBuilder: (_, _, _) => _placeholder(),
     );
   }
 

lib/pages/downloads/downloads_page.dart

@@ -16,6 +16,7 @@ import '../../core/platform/haptics.dart';
 import '../../core/theme/app_colors.dart';
 import '../../core/theme/app_dimens.dart';
 import '../../core/theme/app_theme.dart';
+import '../../core/widgets/app_glow_panel.dart';
 import '../../core/widgets/app_pull_to_refresh.dart';
 import '../../core/widgets/auth_gate.dart';
 import '../../core/widgets/empty_state.dart';
@@ -181,15 +182,15 @@ class _DownloadsBody extends StatelessWidget {
     final l10n = AppLocalizations.of(context)!;
     final confirmed = await showDialog<bool>(
       context: context,
-      builder: (dialogContext) => AlertDialog(
+      builder: (dialogContext) => AppGlowDialog(
-        title: Text(l10n.clearDownloadsTitle),
+        title: l10n.clearDownloadsTitle,
-        content: Text(l10n.clearDownloadsMessage),
+        content: l10n.clearDownloadsMessage,
         actions: [
           TextButton(
             onPressed: () => Navigator.of(dialogContext).pop(false),
             child: Text(l10n.cancel),
           ),
-          FilledButton(
+          TextButton(
             onPressed: () => Navigator.of(dialogContext).pop(true),
             child: Text(l10n.confirmClear),
           ),
@@ -373,7 +374,7 @@ class _LicenseTile extends StatelessWidget {
               Expanded(
                 child: Text(
                   license.dramaTitle,
-                  maxLines: 1,
+                  maxLines: 2,
                   overflow: TextOverflow.ellipsis,
                   style: const TextStyle(
                     color: AppColors.onSurface,
@@ -435,7 +436,7 @@ class _LicenseTile extends StatelessWidget {
               minHeight: AppDimens.progressHeight,
               value: progress.clamp(0.0, 1.0),
               backgroundColor: AppColors.border,
-              valueColor: const AlwaysStoppedAnimation(AppColors.blueSoft),
+              valueColor: const AlwaysStoppedAnimation(AppColors.brandRed),
             ),
           ),
           if (license.expireAt != null) ...[

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();
   }
 
-  /// 详情页展示用的收藏数；没有服务端计数时继续保持缺省展示。
+  /// 详情页展示用的收藏数，统一从全局 FavoriteController 读取。
-  int? get adjustedFavoriteCount {
+  int? get adjustedFavoriteCount => favorites.favoriteCountFor(drama);
-    final base = drama.favoriteCount;
-    if (base == null) return null;
-    final adjusted = base + _favoriteCountDelta;
-    return adjusted < 0 ? 0 : adjusted;
-  }
 
-  /// 收藏切换：乐观状态由控制器负责回滚，这里只在成功后同步计数。
+  /// 收藏切换：状态与计数均由全局控制器维护。
   Future<bool> toggleFavorite() async {
-    final wasSaved = favorites.isSaved(drama.id);
+    return favorites.toggle(drama.id, card: drama);
-    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;
   }
 
   @override

lib/pages/drama_detail/drama_detail_view.dart

@@ -164,7 +164,9 @@ class _DramaDetailPageState extends State<DramaDetailPage> {
             ),
           ),
           if (_tagValues(context, drama).isNotEmpty)
-            SliverToBoxAdapter(child: DramaTags(tags: _tagValues(context, drama))),
+            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)));
@@ -443,7 +448,9 @@ class _DramaDetailPageState extends State<DramaDetailPage> {
   }
 
   List<String> _tagValues(BuildContext context, Drama drama) {
-    final localized = drama.localizedTypeLabels(Localizations.localeOf(context).languageCode);
+    final localized = drama.localizedTypeLabels(
+      Localizations.localeOf(context).languageCode,
+    );
     final result = <String>[];
     if (localized.isNotEmpty) {
       result.addAll(localized.take(_maxTags));

lib/pages/drama_detail/widgets/drama_detail_bottom_bar.dart

@@ -95,7 +95,7 @@ class DramaResumeBar extends StatelessWidget {
             value: fraction,
             minHeight: 3,
             backgroundColor: AppColors.border,
-            valueColor: const AlwaysStoppedAnimation(AppColors.blue),
+            valueColor: const AlwaysStoppedAnimation(AppColors.brandRed),
           ),
         ),
         if (label != null) ...[

lib/pages/drama_detail/widgets/drama_detail_header.dart

@@ -5,7 +5,6 @@ import 'package:flutter/material.dart';
 import '../../../core/data/models/drama.dart';
 import '../../../core/formatting/localized_content.dart';
 import '../../../core/theme/app_colors.dart';
-import '../../../core/theme/app_theme.dart';
 import '../../../core/widgets/remote_image.dart';
 import '../../../core/widgets/subpage_header.dart';
 import '../../../l10n/app_localizations.dart';
@@ -54,7 +53,18 @@ class DramaDetailHeader extends StatelessWidget {
   Widget build(BuildContext context) {
     return Container(
       key: const Key('detail-hero'),
-      decoration: const BoxDecoration(gradient: AppTheme.pageGradient),
+      decoration: const BoxDecoration(
+        gradient: LinearGradient(
+          begin: Alignment.topCenter,
+          end: Alignment.bottomCenter,
+          colors: [
+            AppColors.followingGlow,
+            AppColors.followingGlowMid,
+            AppColors.appBackground,
+          ],
+          stops: [0, 0.14, 0.3],
+        ),
+      ),
       child: SafeArea(
         bottom: false,
         child: Padding(

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
+            child: _FavoritesBody(
-                ? _FavoritesBody(favorites: context.watch<FavoriteController>())
+              favorites: context.watch<FavoriteController>(),
-                : const AuthGatePanel(),
+            ),
           ),
         ],
       ),
@@ -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')),