jianghaifeng/ReelShort
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore(merge): 合并推荐频道页与沉浸式首页到 main

Browse Source 
- 新增推荐(tab1)接口分类频道页：分类轮播切换、选中频道自动定位、下拉刷新与上拉分页
- 精选频道 banner 轮播 + 接口 tag 上新横滑 + 双列短剧网格，卡片标题统一白色
- 恢复首页(tab0)沉浸式全屏信息流
This commit is contained in:
Vicky authored and trae-solo-agent committed 2026-10-27 20:02:53 +08:00
2 parents 76429628ec c027acc91f
commit d5d13549f5
112 files changed
+6107 -963
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

android/app/src/main/kotlin/com/stormg/lumadrama/MainActivity.kt
+43
View File
@@ -4,6 +4,7 @@ package com.stormg.lumadrama
import android.content.Intent
import android.app.PictureInPictureParams
import android.content.Context
import android.content.res.Configuration
import android.graphics.Bitmap
import android.media.MediaMetadataRetriever
@@ -12,6 +13,8 @@ import android.os.Build
import android.os.Bundle
import android.os.Handler
import android.os.Looper
import android.provider.Settings
import android.telephony.TelephonyManager
import android.util.Rational
import android.content.pm.PackageManager
import android.view.WindowManager
@@ -21,6 +24,7 @@ import io.flutter.embedding.android.FlutterActivity
import io.flutter.embedding.engine.FlutterEngine
import io.flutter.plugin.common.MethodChannel
import java.io.ByteArrayOutputStream
import java.util.Locale
import java.util.concurrent.ExecutorService
import java.util.concurrent.Executors
import java.util.concurrent.atomic.AtomicBoolean
@@ -65,6 +69,23 @@ class MainActivity : FlutterActivity() {
result.success(false)
}
}
// 设备标识：SSAID 免权限，卸载重装不变，避免客户端自己生成的 id 每次重装都变
MethodChannel(flutterEngine.dartExecutor.binaryMessenger, "com.stormg.lumadrama/device")
.setMethodCallHandler { call, result ->
when (call.method) {
"ssaid" -> {
val value = try {
Settings.Secure.getString(contentResolver, Settings.Secure.ANDROID_ID)
} catch (_: Exception) {
null
}
result.success(value)
}
// 设备区域：注册时作为服务端 IP 解析失败后的兜底
"region" -> result.success(currentRegion())
else -> result.notImplemented()
}
}
MethodChannel(flutterEngine.dartExecutor.binaryMessenger, "com.stormg.lumadrama/share")
.setMethodCallHandler { call, result ->
if (call.method != "shareText") {
@@ -156,6 +177,28 @@ class MainActivity : FlutterActivity() {
?.bottom
?: 0
/** 网络运营商国家优先，其次 SIM 卡，最后系统语言；都拿不到返回空串。 */
private fun currentRegion(): String {
return try {
val telephony = getSystemService(Context.TELEPHONY_SERVICE) as? TelephonyManager
val localeCountry = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
resources.configuration.locales.get(0).country
} else {
@Suppress("DEPRECATION")
resources.configuration.locale.country
}
val candidates = listOfNotNull(
telephony?.networkCountryIso,
telephony?.simCountryIso,
localeCountry
)
candidates.firstOrNull { it.isNotBlank() }?.uppercase(Locale.ROOT) ?: ""
} catch (_: Exception) {
// 个别 ROM 读运营商信息会抛 SecurityException，别让注册流程卡住
""
}
}
private fun emitImeInset(value: Int) {
if (value == imeInset) return
imeInset = value
ios/Runner/AppDelegate.swift
+24
View File
@@ -63,6 +63,7 @@ final class RunnerFlutterViewController: FlutterViewController {
func didInitializeImplicitFlutterEngine(_ engineBridge: FlutterImplicitEngineBridge) {
GeneratedPluginRegistrant.register(with: engineBridge.pluginRegistry)
registerWirelessDataChannel(engineBridge)
registerDeviceIdChannel(engineBridge)
let channel = FlutterMethodChannel(
name: "com.stormg.lumadrama/share",
binaryMessenger: engineBridge.applicationRegistrar.messenger()
@@ -144,6 +145,29 @@ final class RunnerFlutterViewController: FlutterViewController {
}
}
/// 设备标识：IDFV 免权限，卸载本 App 不变，避免客户端自生成的 id 每次重装都变。
/// 同通道顺带提供设备区域（ISO-2），注册时作为服务端 IP 解析失败后的兜底。
private func registerDeviceIdChannel(_ engineBridge: FlutterImplicitEngineBridge) {
let channel = FlutterMethodChannel(
name: "com.stormg.lumadrama/device",
binaryMessenger: engineBridge.applicationRegistrar.messenger()
)
channel.setMethodCallHandler { call, result in
switch call.method {
case "idfv":
result(UIDevice.current.identifierForVendor?.uuidString)
case "region":
if #available(iOS 16.0, *) {
result(Locale.current.region?.identifier)
} else {
result(Locale.current.regionCode)
}
default:
result(FlutterMethodNotImplemented)
}
}
}
private func registerWirelessDataChannel(_ engineBridge: FlutterImplicitEngineBridge) {
let channel = FlutterMethodChannel(
name: WirelessDataPrompt.channelName,
ios/Runner/Info.plist
+1 -1
View File
@@ -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/>
lib/app.dart
+8 -13
View File
@@ -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';
@@ -117,12 +118,13 @@ class _LumaDramaAppState extends State<LumaDramaApp> {
late final AuthSessionStore _sessionStore = AuthSessionStore();
/// 全 App 共用一个 ApiClient：这样目录、账号、后续的互动/进度请求
/// 都自动带 `Authorization` 与 `X-Device-Id`，401 的刷新重试也只有一处实现。
/// 都自动带 `Authorization`、`X-Device-Id` 与平台头，401 的刷新重试也只有一处实现。
late final ApiClient _apiClient = ApiClient(
accessTokenReader: () => _auth.accessToken,
tokenRefresher: () => _auth.refresh(),
onUnauthorized: () => _auth.clear(),
deviceIdReader: _sessionStore.deviceId,
platformReader: clientPlatform,
);
late final AuthController _auth = AuthController(
@@ -141,17 +143,11 @@ class _LumaDramaAppState extends State<LumaDramaApp> {
late final WatchHistoryRepository _watchHistory =
widget.watchHistoryRepository ??
HttpWatchHistoryRepository(
WatchApi(_apiClient),
isSignedIn: () => _auth.isSignedIn,
);
HttpWatchHistoryRepository(WatchApi(_apiClient));
late final FavoriteRepository _favorites =
widget.favoriteRepository ??
HttpFavoriteRepository(
LibraryApi(_apiClient),
isSignedIn: () => _auth.isSignedIn,
);
HttpFavoriteRepository(LibraryApi(_apiClient));
late final PlaybackRepository _playback =
widget.playbackRepository ??
@@ -219,7 +215,7 @@ class _LumaDramaAppState extends State<LumaDramaApp> {
unawaited(_localeController.load());
// 登录/登出时同步收藏状态：收藏属于账号，不能跨账号串联
_auth.addListener(_onAuthChanged);
if (_auth.isSignedIn) unawaited(_favoriteController.load());
unawaited(_favoriteController.load());
if (_auth.isSignedIn) unawaited(_walletController.load());
unawaited(_downloadController.restore());
}
@@ -235,6 +231,7 @@ class _LumaDramaAppState extends State<LumaDramaApp> {
unawaited(_walletController.load());
} else {
_favoriteController.clear();
unawaited(_favoriteController.load());
_downloadController.reset();
_walletController.reset();
}
@@ -293,9 +290,7 @@ class _LumaDramaAppState extends State<LumaDramaApp> {
),
ChangeNotifierProvider(create: (_) => _createCategories()),
if (playlists != null)
ChangeNotifierProvider(
create: (_) => PlaylistController(playlists),
),
ChangeNotifierProvider(create: (_) => PlaylistController(playlists)),
ChangeNotifierProvider.value(value: _favoriteController),
ChangeNotifierProvider.value(value: _downloadController),
ChangeNotifierProvider.value(value: _walletController),
lib/core/config/app_config.dart
+1 -1
View File
@@ -14,7 +14,7 @@ class AppConfig {
/// 开发调试默认服务地址，当前指向本机局域网 IP。
///
/// 换网络时只改这一行，地址不要带结尾斜杠。
static const String devHostBaseUrl = 'http://10.43.47.1:8081';
static const String devHostBaseUrl = 'http://192.168.31.243:8081';
/// 本机后端地址：通过 `adb reverse tcp:8081 tcp:8081` 映射到开发机，
/// 探测可达时 App 直连本机服务；不可达时回落到公网地址。
lib/core/data/models/drama.dart
+14
View File
@@ -60,6 +60,20 @@ class Episode {
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) {
return Episode(
id: (json['id'] ?? '').toString(),
lib/core/data/models/episode_stats.dart
+55
View File
@@ -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
+5 -3
View File
@@ -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/remote/api_client.dart
+5
View File
@@ -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
+12 -1
View File
@@ -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
+5 -1
View File
@@ -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/device_profile.dart
+15
View File
@@ -0,0 +1,15 @@
// Author: fruit.com.cn
import 'dart:io' show Platform;
import 'package:flutter/foundation.dart';
/// 客户端平台，后台只用来区分 iOS / Android。
///
/// 系统版本、机型一律不上报：后台列表需要的只是「这台设备是安卓还是苹果」。
String clientPlatform() {
if (kIsWeb) return 'WEB';
if (Platform.isAndroid) return 'ANDROID';
if (Platform.isIOS) return 'IOS';
return '';
}
lib/core/data/remote/playback_api.dart
+8
View File
@@ -1,5 +1,6 @@
// Author: fruit.com.cn
import '../models/episode_stats.dart';
import '../models/play_ticket.dart';
import 'api_client.dart';
@@ -17,4 +18,11 @@ class PlaybackApi {
if (data is Map<String, dynamic>) return PlayTicket.fromJson(data);
throw const ApiException(-1, '返回数据格式异常');
}
/// 轻量刷新互动计数：不签发地址，也不占用播放票据缓存。
Future<EpisodeStats> episodeStats(String episodeId) async {
final data = await _client.get('/app/episodes/$episodeId/stats');
if (data is Map<String, dynamic>) return EpisodeStats.fromJson(data);
throw const ApiException(-1, '返回数据格式异常');
}
}
lib/core/data/remote/watch_api.dart
+1 -1
View File
@@ -4,7 +4,7 @@ import '../models/page_result.dart';
import '../models/watch_progress.dart';
import 'api_client.dart';
/// 观看进度接口：`/app/watch/*`（契约 §1.5）。全部需要登录态。
/// 观看进度接口：`/app/watch/*`（契约 §1.5）。支持账号或设备身份。
class WatchApi {
const WatchApi(this._client);
lib/core/data/repositories/favorite_repository.dart
+1 -7
View File
@@ -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
+29 -1
View File
@@ -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
+1 -11
View File
@@ -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/auth_controller.dart
+2
View File
@@ -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
+42 -12
View File
@@ -4,6 +4,7 @@ import 'dart:math';
import 'package:shared_preferences/shared_preferences.dart';
import '../models/auth_session.dart';
import 'device_id_provider.dart';
/// 令牌与设备号的本地持久化。
///
@@ -11,13 +12,17 @@ import '../models/auth_session.dart';
/// `SharedPreferences.getInstance()` 在新版本里已标注弃用，两套混用还会让
/// widget 测试只 mock 到其中一套。
///
/// 设备号是后端注册风控与后续"下载设备绑定"的依据，所以**首次生成后就固定下来**；
/// 不引 UUID 库（保持极简依赖），用「时间戳 + 随机数」拼一个够用的 id。
/// 设备号优先取系统标识（Android SSAID / iOS IDFV），这样卸载重装后还是同一台设备；
/// 系统标识不可用时才回退到本地生成并持久化的 UUID，保证任何环境都能跑。
class AuthSessionStore {
AuthSessionStore({SharedPreferencesAsync? preferences})
: _preferences = preferences ?? SharedPreferencesAsync();
AuthSessionStore({
SharedPreferencesAsync? preferences,
DeviceIdProvider? deviceIdProvider,
}) : _preferences = preferences ?? SharedPreferencesAsync(),
_deviceIdProvider = deviceIdProvider ?? DeviceIdProvider();
final SharedPreferencesAsync _preferences;
final DeviceIdProvider _deviceIdProvider;
static const _kAccessToken = 'auth.accessToken';
static const _kRefreshToken = 'auth.refreshToken';
@@ -25,21 +30,46 @@ class AuthSessionStore {
static const _kDeviceId = 'device.id';
String? _cachedDeviceId;
String? _cachedRegion;
Future<String> deviceId() async {
if (_cachedDeviceId != null) return _cachedDeviceId!;
var value = await _preferences.getString(_kDeviceId) ?? '';
if (value.isEmpty) {
final random = Random();
value =
'd-${DateTime.now().millisecondsSinceEpoch.toRadixString(36)}-'
'${random.nextInt(1 << 32).toRadixString(36)}';
await _preferences.setString(_kDeviceId, value);
}
final systemId = await _deviceIdProvider.systemDeviceId();
final value = systemId ?? await _localDeviceId();
_cachedDeviceId = value;
return value;
}
/// 设备区域（ISO-2），取不到返回空串；只在注册时作为服务端 IP 解析失败后的兜底。
Future<String> deviceRegion() async {
if (_cachedRegion != null) return _cachedRegion!;
final value = await _deviceIdProvider.deviceRegion() ?? '';
_cachedRegion = value;
return value;
}
/// 系统标识取不到时的兜底：本地 UUIDv4，生成一次后固定下来。
Future<String> _localDeviceId() async {
final stored = await _preferences.getString(_kDeviceId) ?? '';
if (stored.isNotEmpty) return stored;
final generated = 'd-${_uuidV4()}';
await _preferences.setString(_kDeviceId, generated);
return generated;
}
/// UUIDv4：122 位随机，碰撞概率可忽略，不引第三方依赖。
String _uuidV4() {
final random = Random.secure();
final bytes = List<int>.generate(16, (_) => random.nextInt(256));
bytes[6] = (bytes[6] & 0x0f) | 0x40;
bytes[8] = (bytes[8] & 0x3f) | 0x80;
String hex(int start, int end) => bytes
.sublist(start, end)
.map((byte) => byte.toRadixString(16).padLeft(2, '0'))
.join();
return '${hex(0, 4)}-${hex(4, 6)}-${hex(6, 8)}-${hex(8, 10)}-${hex(10, 16)}';
}
Future<AuthSession?> read() async {
final accessToken = await _preferences.getString(_kAccessToken) ?? '';
final refreshToken = await _preferences.getString(_kRefreshToken) ?? '';
lib/core/data/services/comment_controller.dart
+16 -4
View File
@@ -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
+50
View File
@@ -0,0 +1,50 @@
// Author: fruit.com.cn
import 'dart:io' show Platform;
import 'package:flutter/foundation.dart';
import 'package:flutter/services.dart';
/// 读取系统级设备标识，两端都不需要任何权限。
///
/// - Android：SSAID（`Settings.Secure.ANDROID_ID`），卸载重装不变；
/// - iOS：IDFV（`identifierForVendor`），卸载本 App 不变，同厂商应用全删才会变。
///
/// 两端都由原生侧提供，不引插件：项目 iOS 走 SPM，避免混入 CocoaPods。
/// 取不到（Web、测试环境、通道异常）时返回 null，由调用方回退到本地生成的 id。
class DeviceIdProvider {
static const MethodChannel _channel = MethodChannel(
'com.stormg.lumadrama/device',
);
Future<String?> systemDeviceId() async {
if (kIsWeb) return null;
try {
if (Platform.isAndroid) {
final ssaid = await _channel.invokeMethod<String>('ssaid');
if (ssaid != null && ssaid.isNotEmpty) return 'a-$ssaid';
}
if (Platform.isIOS) {
final idfv = await _channel.invokeMethod<String>('idfv');
if (idfv != null && idfv.isNotEmpty) return 'i-$idfv';
}
} catch (_) {
// 原生通道不可用（widget 测试）时走本地兜底
}
return null;
}
/// 设备所在区域（ISO-2），仅用于服务端 IP 解析失败时兜底注册国家。
/// Android 依次取网络运营商 / SIM 卡 / 系统语言的国家，iOS 取系统 region。
Future<String?> deviceRegion() async {
if (kIsWeb) return null;
try {
final region = await _channel.invokeMethod<String>('region');
final value = region?.trim().toUpperCase() ?? '';
if (value.length == 2) return value;
} catch (_) {
// 原生通道不可用（widget 测试）时返回 null，由服务端兜底
}
return null;
}
}
lib/core/data/services/favorite_controller.dart
+106 -4
View File
@@ -3,6 +3,7 @@
import 'package:flutter/foundation.dart';
import '../models/drama.dart';
import '../remote/api_client.dart';
import '../repositories/favorite_repository.dart';
/// 收藏状态：**以服务端为准**。
@@ -17,6 +18,7 @@ class FavoriteController extends ChangeNotifier {
final FavoriteRepository _repository;
final int pageSize;
final Set<String> _saved = {};
final Map<String, int> _favoriteCounts = {};
List<Drama> cards = const [];
int total = 0;
bool loading = false;
@@ -24,6 +26,7 @@ class FavoriteController extends ChangeNotifier {
bool hasMore = false;
String? error;
String? loadMoreError;
int? lastErrorCode;
int _pageIndex = 0;
int _requestSeq = 0;
bool _disposed = false;
@@ -32,6 +35,53 @@ class FavoriteController extends ChangeNotifier {
bool isSaved(String dramaId) => _saved.contains(dramaId);
/// 当前剧收藏数；包含本地 toggle 增量。
int? favoriteCount(String dramaId) => _favoriteCounts[dramaId];
/// 首次展示时缓存卡片基数；之后统一由本控制器维护，避免页面各存一份。
int? favoriteCountFor(Drama drama) {
final current = _favoriteCounts[drama.id];
if (current != null) return current;
final fallback = drama.favoriteCount;
if (fallback == null) return null;
final normalized = fallback < 0 ? 0 : fallback;
_favoriteCounts[drama.id] = normalized;
return normalized;
}
/// 用 stats/detail 的服务端快照校准唯一状态和计数。
void applyServerState(
String dramaId, {
required bool saved,
int? favoriteCount,
}) {
var changed = _saved.contains(dramaId) != saved;
if (saved) {
_saved.add(dramaId);
} else {
_saved.remove(dramaId);
}
if (favoriteCount != null) {
final normalized = favoriteCount < 0 ? 0 : favoriteCount;
changed = changed || _favoriteCounts[dramaId] != normalized;
_favoriteCounts[dramaId] = normalized;
}
if (changed) notify();
}
/// 详情等只有计数、没有当前收藏状态的接口使用。
void applyServerCount(
String dramaId,
int? favoriteCount, {
bool notify = true,
}) {
if (favoriteCount == null) return;
final normalized = favoriteCount < 0 ? 0 : favoriteCount;
if (_favoriteCounts[dramaId] == normalized) return;
_favoriteCounts[dramaId] = normalized;
if (notify) this.notify();
}
void notify() {
if (!_disposed) notifyListeners();
}
@@ -43,6 +93,7 @@ class FavoriteController extends ChangeNotifier {
loadingMore = false;
error = null;
loadMoreError = null;
lastErrorCode = null;
notify();
try {
final page = await _repository.page(pageIndex: 1, pageSize: pageSize);
@@ -52,12 +103,14 @@ class FavoriteController extends ChangeNotifier {
_saved
..clear()
..addAll(list.map((drama) => drama.id));
_rememberCardCounts(list);
total = page.total;
_pageIndex = 1;
hasMore = page.list.isNotEmpty && cards.length < total;
} catch (_) {
} catch (failure) {
if (!_disposed && request == _requestSeq) {
error = 'favoritesError';
if (failure is ApiException) lastErrorCode = failure.code;
}
} finally {
if (!_disposed && request == _requestSeq) {
@@ -73,6 +126,7 @@ class FavoriteController extends ChangeNotifier {
final request = ++_requestSeq;
loadingMore = true;
loadMoreError = null;
lastErrorCode = null;
notify();
try {
final page = await _repository.page(
@@ -86,12 +140,14 @@ class FavoriteController extends ChangeNotifier {
).where((drama) => known.add(drama.id)).toList(growable: false);
cards = [...cards, ...appended];
_saved.addAll(appended.map((drama) => drama.id));
_rememberCardCounts(appended);
total = page.total;
_pageIndex += 1;
hasMore = page.list.isNotEmpty && cards.length < total;
} catch (_) {
} catch (failure) {
if (!_disposed && request == _requestSeq) {
loadMoreError = 'favoritesError';
if (failure is ApiException) lastErrorCode = failure.code;
}
} finally {
if (!_disposed && request == _requestSeq) {
@@ -101,18 +157,23 @@ class FavoriteController extends ChangeNotifier {
}
}
/// 未登录时不要调用（服务端要求登录态）。
/// 每次切换都以接口状态为准；匿名请求由设备号归属。
///
/// [card] 是当前剧的卡片（播放页/详情页手上就有）：收藏成功时直接放进列表，
/// 这样"收藏完打开我的收藏"能立刻看到，不必等下一次整表刷新。
Future<bool> toggle(String dramaId, {Drama? card}) async {
lastErrorCode = null;
final wasSaved = _saved.contains(dramaId);
final previousCount = card == null
? favoriteCount(dramaId)
: favoriteCountFor(card);
final previousCards = cards;
final previousTotal = total;
final previousHasMore = hasMore;
// 乐观更新
if (wasSaved) {
_saved.remove(dramaId);
_stepCount(dramaId, -1);
if (cards.any((drama) => drama.id == dramaId)) {
cards = cards.where((drama) => drama.id != dramaId).toList();
total = total > 0 ? total - 1 : 0;
@@ -120,6 +181,7 @@ class FavoriteController extends ChangeNotifier {
}
} else {
_saved.add(dramaId);
_stepCount(dramaId, 1);
}
notify();
try {
@@ -128,6 +190,7 @@ class FavoriteController extends ChangeNotifier {
if (saved) {
_saved.add(dramaId);
if (wasSaved) {
_restoreCount(dramaId, previousCount);
cards = previousCards;
total = previousTotal;
hasMore = previousHasMore;
@@ -138,6 +201,9 @@ class FavoriteController extends ChangeNotifier {
}
} else {
_saved.remove(dramaId);
if (!wasSaved) {
_restoreCount(dramaId, previousCount);
}
if (cards.any((drama) => drama.id == dramaId)) {
cards = cards.where((drama) => drama.id != dramaId).toList();
total = total > 0 ? total - 1 : 0;
@@ -146,7 +212,7 @@ class FavoriteController extends ChangeNotifier {
}
notify();
return true;
} catch (_) {
} catch (failure) {
// 回滚
cards = previousCards;
total = previousTotal;
@@ -156,7 +222,9 @@ class FavoriteController extends ChangeNotifier {
} else {
_saved.remove(dramaId);
}
_restoreCount(dramaId, previousCount);
notify();
if (failure is ApiException) lastErrorCode = failure.code;
return false;
}
}
@@ -170,9 +238,13 @@ class FavoriteController extends ChangeNotifier {
final previousHasMore = hasMore;
final removed = cards.where((drama) => ids.contains(drama.id)).toList();
if (removed.isEmpty) return true;
final previousCounts = {
for (final drama in removed) drama.id: _favoriteCounts[drama.id],
};
cards = cards.where((drama) => !ids.contains(drama.id)).toList();
for (final id in ids) {
_saved.remove(id);
_stepCount(id, -1);
}
total = total > removed.length ? total - removed.length : 0;
hasMore = cards.length < total;
@@ -187,6 +259,9 @@ class FavoriteController extends ChangeNotifier {
for (final drama in removed) {
_saved.add(drama.id);
}
for (final entry in previousCounts.entries) {
_restoreCount(entry.key, entry.value);
}
notify();
return false;
}
@@ -197,7 +272,9 @@ class FavoriteController extends ChangeNotifier {
final index = cards.indexWhere((drama) => drama.id == dramaId);
if (index < 0) return true;
final removed = cards[index];
final previousCount = _favoriteCounts[dramaId];
_saved.remove(dramaId);
_stepCount(dramaId, -1);
final next = [...cards]..removeAt(index);
cards = next;
total = total > 0 ? total - 1 : 0;
@@ -214,6 +291,7 @@ class FavoriteController extends ChangeNotifier {
);
cards = restored;
_saved.add(dramaId);
_restoreCount(dramaId, previousCount);
total += 1;
hasMore = cards.length < total;
notify();
@@ -244,6 +322,30 @@ class FavoriteController extends ChangeNotifier {
];
}
void _rememberCardCounts(List<Drama> dramas) {
for (final drama in dramas) {
final count = drama.favoriteCount;
if (count != null && !_favoriteCounts.containsKey(drama.id)) {
_favoriteCounts[drama.id] = count < 0 ? 0 : count;
}
}
}
void _stepCount(String dramaId, int delta) {
final current = _favoriteCounts[dramaId];
if (current == null) return;
final next = current + delta;
_favoriteCounts[dramaId] = next < 0 ? 0 : next;
}
void _restoreCount(String dramaId, int? count) {
if (count == null) {
_favoriteCounts.remove(dramaId);
} else {
_favoriteCounts[dramaId] = count;
}
}
@override
void dispose() {
_disposed = true;
lib/core/data/services/home_feed_controller.dart
+1
View File
@@ -33,6 +33,7 @@ class HomeFeedController extends ChangeNotifier {
String? get cursor => _state(_channel).cursor;
bool get hasMore => _state(_channel).hasMore;
bool get loaded => _state(_channel).loaded;
bool get isLoading => _state(_channel).loading;
bool get loadingMore => _state(_channel).loadingMore;
bool get loadingFirstPage => !loaded && _state(_channel).loading;
lib/core/data/services/interaction_controller.dart
+26 -2
View File
@@ -40,6 +40,24 @@ class InteractionController extends ChangeNotifier {
/// 该集服务端最新点赞数。
int? episodeLikeCount(String episodeId) => _episodeLikeCounts[episodeId];
/// 用轻量统计快照校准当前用户的分集点赞状态与计数。
void applyEpisodeStats(
String episodeId, {
required bool liked,
required int likeCount,
}) {
final changed =
_likedEpisodeIds.contains(episodeId) != liked ||
_episodeLikeCounts[episodeId] != likeCount;
if (liked) {
_likedEpisodeIds.add(episodeId);
} else {
_likedEpisodeIds.remove(episodeId);
}
_episodeLikeCounts[episodeId] = likeCount;
if (changed) _notify();
}
/// 乐观切换剧集点赞，失败时回滚并以服务端返回状态校准。
Future<OperationResult<LikeToggleResult>> toggleDramaLike(String dramaId) =>
_toggleLike(
@@ -97,7 +115,10 @@ class InteractionController extends ChangeNotifier {
} else {
likedIds.remove(id);
}
return OperationResult.failure(_errorMessage(failure));
return OperationResult.failure(
_errorMessage(failure),
errorCode: failure is ApiException ? failure.code : null,
);
} finally {
busyIds.remove(id);
_notify();
@@ -121,7 +142,10 @@ class InteractionController extends ChangeNotifier {
);
return OperationResult.success(reportId);
} catch (failure) {
return OperationResult.failure(_errorMessage(failure));
return OperationResult.failure(
_errorMessage(failure),
errorCode: failure is ApiException ? failure.code : null,
);
}
}
lib/core/data/services/playback_neighbors.dart
+17 -1
View File
@@ -13,8 +13,18 @@ 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(
@@ -31,6 +41,12 @@ class PlaybackCoordinator {
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>((_) {});
lib/core/data/services/playback_session.dart
+40
View File
@@ -84,6 +84,11 @@ 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;
@@ -254,6 +259,16 @@ class PlaybackSession extends ChangeNotifier {
bool? userWantsPlay,
}) async {
if (_closed || index < 0 || index >= episodes.length) return;
if (kDebugMode) {
debugPrint(
'[player-session] phase=select-enter session=${identityHashCode(this)} '
'owner=${owner.name} index=$index user=$_userWantsPlay '
'selected=$_selected current=$_currentIndex '
'appResumed=$_appResumed routeVisible=$_routeVisible '
'overlayOpen=$_overlayOpen visible=$_visible mayPlay=$_mayPlay '
'live=${_live.length}',
);
}
// 切换到不同剧集时恢复播放；仍停留在同一集时保留用户暂停。
if (userWantsPlay != null) {
_userWantsPlay = userWantsPlay;
@@ -465,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();
@@ -472,6 +503,15 @@ class PlaybackSession extends ChangeNotifier {
await slot.player.pause();
}
slot.playing = shouldPlay;
if (kDebugMode) {
debugPrint(
'[player-session] phase=apply-playback-result '
'session=${identityHashCode(this)} index=${slot.index} '
'shouldPlay=$shouldPlay '
'isPlaying=${video?.controller.value.isPlaying ?? '-'} '
'slotPlaying=${slot.playing}',
);
}
}
void _syncPlayback() {
lib/core/data/services/watch_records_controller.dart
+28 -2
View File
@@ -38,6 +38,7 @@ class WatchRecordsController extends ChangeNotifier {
String? error;
String? loadMoreError;
String? actionError;
int? lastErrorCode;
int _pageIndex = 0;
int _requestSeq = 0;
bool _disposed = false;
@@ -50,6 +51,7 @@ class WatchRecordsController extends ChangeNotifier {
error = null;
loadMoreError = null;
actionError = null;
lastErrorCode = null;
_notify();
try {
final page = await _history.recent(pageIndex: 1, pageSize: pageSize);
@@ -71,6 +73,7 @@ class WatchRecordsController extends ChangeNotifier {
);
if (!_disposed && request == _requestSeq) {
error = failure is ApiException ? failure.message : 'progressError';
if (failure is ApiException) lastErrorCode = failure.code;
}
} finally {
if (!_disposed && request == _requestSeq) {
@@ -86,6 +89,7 @@ class WatchRecordsController extends ChangeNotifier {
final request = ++_requestSeq;
loadingMore = true;
loadMoreError = null;
lastErrorCode = null;
_notify();
try {
final page = await _history.recent(
@@ -108,6 +112,7 @@ class WatchRecordsController extends ChangeNotifier {
loadMoreError = failure is ApiException
? failure.message
: 'progressError';
if (failure is ApiException) lastErrorCode = failure.code;
}
} finally {
if (!_disposed && request == _requestSeq) {
@@ -148,17 +153,19 @@ class WatchRecordsController extends ChangeNotifier {
total = total > 0 ? total - 1 : 0;
hasMore = records.length < total;
actionError = null;
lastErrorCode = null;
_notify();
try {
await _history.remove(dramaId);
return true;
} catch (_) {
} catch (failure) {
final next = [...records];
next.insert(index > next.length ? next.length : index, removed);
records = next;
total += 1;
hasMore = records.length < total;
actionError = 'recordDeleteFailed';
if (failure is ApiException) lastErrorCode = failure.code;
return false;
} finally {
_notify();
@@ -179,16 +186,18 @@ class WatchRecordsController extends ChangeNotifier {
loadingMore = false;
clearing = true;
actionError = null;
lastErrorCode = null;
_notify();
try {
await _history.clear();
return true;
} catch (_) {
} catch (failure) {
records = previous;
total = previousTotal;
_pageIndex = previousPageIndex;
hasMore = records.length < total;
actionError = 'recordClearFailed';
if (failure is ApiException) lastErrorCode = failure.code;
return false;
} finally {
clearing = false;
@@ -305,6 +314,23 @@ class WatchRecordsController extends ChangeNotifier {
if (!_disposed) notifyListeners();
}
/// 切换账号/设备身份时清除内存数据，不删除服务端记录。
void reset() {
_requestSeq += 1;
records = const [];
total = 0;
loading = false;
loadingMore = false;
hasMore = false;
clearing = false;
error = null;
loadMoreError = null;
actionError = null;
lastErrorCode = null;
_pageIndex = 0;
_notify();
}
@override
void dispose() {
_disposed = true;
lib/core/formatting/account_display.dart
+239
View File
@@ -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/theme/app_colors.dart
+11 -5
View File
@@ -78,7 +78,12 @@ abstract final class AppColors {
/// 中性深灰卡片与控件表面。
static const contentCard = Color(0xFF16161A);
static const contentSurface = Color(0xFF1C1C1E);
static const skeletonSurface = Color(0xFF141414);
/// 首页、分类与搜索网格骨架的极暗底色。
static const skeletonSurface = Color(0xFF0E0E0E);
/// 播放器、推荐与详情页大面积媒体占位的深灰底色。
static const skeletonMedia = Color(0xFF1C1C1E);
static const contentChip = Color(0xFF2C2C2E);
static const contentBorder = Color(0x1AFFFFFF);
static const filterChipSelected = Color(0xFF21090E);
@@ -128,9 +133,10 @@ 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 navSelected = brandRed;
/// 卡片阴影（深色几乎不用阴影）。
static const cardShadow = Color(0x00000000);
@@ -183,8 +189,8 @@ abstract final class AppColors {
/// 封面集数胶囊。
static const badgeBeige = raised;
/// 导航未选中。
static const navUnselected = textSecondary;
/// 导航未选中（设计稿为白色线框 + 白色文字）。
static const navUnselected = Color(0xFFFFFFFF);
/// 首页内容角标。
static const badgeHot = Color(0xFFE5484D);
lib/core/theme/app_dimens.dart
+1 -1
View File
@@ -229,7 +229,7 @@ abstract final class AppDimens {
static const double mineSectionLinkFont = 12;
static const double mineSectionGap = 20;
static const double mineContinueCardWidth = 96;
static const double mineContinueRowHeight = 168;
static const double mineContinueRowHeight = 172;
static const double mineContinueTitleFont = 13;
static const double mineContinueMetaFont = 11;
static const double mineStatsValueFont = 18;
lib/core/widgets/app_root_tab.dart
+6 -14
View File
@@ -7,18 +7,12 @@ import 'app_bottom_nav.dart';
/// 客户端根导航的固定顺序。
enum AppRootTab {
home(
assetPath: 'assets/icon/film_reel.png',
selectedAssetPath: 'assets/icon/film_reel_filled.png',
),
home(),
recommend(),
following(),
mine();
const AppRootTab({this.assetPath, this.selectedAssetPath});
final String? assetPath;
final String? selectedAssetPath;
const AppRootTab();
}
extension AppRootTabUi on AppRootTab {
@@ -30,15 +24,15 @@ extension AppRootTabUi on AppRootTab {
};
IconData get icon => switch (this) {
AppRootTab.home => Icons.theaters_outlined,
AppRootTab.recommend => Icons.smart_display_outlined,
AppRootTab.home => Icons.home_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.recommend => Icons.smart_display_rounded,
AppRootTab.home => Icons.home_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
+2 -1
View File
@@ -15,7 +15,7 @@ Future<void> openAuthPage(BuildContext context, {bool signUpMode = false}) {
/// 受限动作的登录闸：已登录返回 true；未登录弹底部提示并引导登录，返回 false。
///
/// 首页/发现/详情保持匿名可看，只有收藏、点赞、评论这类"要对到具体账号"的动作才走这里。
/// 首页/发现/详情与非付费互动保持匿名可用；解锁、权益与消耗类动作走这里。
Future<bool> ensureSignedIn(BuildContext context) async {
final auth = context.read<AuthController>();
if (auth.isSignedIn) return true;
@@ -76,6 +76,7 @@ Future<bool> ensureSignedIn(BuildContext context) async {
if (go == true && context.mounted) {
await openAuthPage(context);
if (context.mounted) return context.read<AuthController>().isSignedIn;
}
return false;
}
lib/core/widgets/drama_grid_skeleton.dart
+47 -34
View File
@@ -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(
blendMode: BlendMode.srcATop,
shaderCallback: (bounds) => _shader(bounds),
child: child,
builder: (context, _) => _grid(
constraints.maxWidth,
constraints.maxHeight,
_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(
aspectRatio: AppDimens.cardCoverAspectRatio,
child: const _SkeletonBlock(),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
AspectRatio(
aspectRatio: AppDimens.cardCoverAspectRatio,
child: const _SkeletonBlock(),
),
const SizedBox(height: AppDimens.cardCoverTitleGap),
const _SkeletonBar(),
const SizedBox(height: AppDimens.skeletonTitleBarGap),
const FractionallySizedBox(
widthFactor: _subtitleWidthFactor,
child: _SkeletonBar(),
),
],
),
const SizedBox(height: AppDimens.cardCoverTitleGap),
const _SkeletonBar(),
const SizedBox(height: AppDimens.skeletonTitleBarGap),
const FractionallySizedBox(
widthFactor: _subtitleWidthFactor,
child: _SkeletonBar(),
Positioned.fill(
child: IgnorePointer(
child: ClipRRect(
borderRadius: BorderRadius.circular(AppDimens.homeCardRadius),
child: DecoratedBox(
decoration: BoxDecoration(gradient: _cardHighlight(phase)),
),
),
),
),
],
);
}
}
LinearGradient _cardHighlight(double shimmerValue) {
final shift = _shimmerStart + _shimmerTravel * shimmerValue;
return LinearGradient(
begin: Alignment(shift, -0.3),
end: Alignment(shift + 1, 0.3),
colors: const [Colors.transparent, _shimmerHighlight, Colors.transparent],
stops: const [0.42, 0.5, 0.58],
);
}
class _SkeletonBlock extends StatelessWidget {
const _SkeletonBlock();
lib/l10n/app_en.arb
+25 -1
View File
@@ -55,12 +55,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",
@@ -265,6 +277,18 @@
"pictureInPicture": "Picture in picture",
"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": {
lib/l10n/app_id.arb
+30 -1
View File
@@ -49,7 +49,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",
@@ -239,6 +256,18 @@
"pictureInPicture": "Gambar dalam gambar",
"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": {
lib/l10n/app_localizations.dart
+43 -1
View File
@@ -397,9 +397,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:
@@ -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:
lib/l10n/app_localizations_en.dart
+28 -1
View File
@@ -162,7 +162,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
@@ -594,6 +604,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';
lib/l10n/app_localizations_id.dart
+28 -1
View File
@@ -162,7 +162,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
@@ -595,6 +605,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';
lib/l10n/app_localizations_zh.dart
+28 -1
View File
@@ -159,7 +159,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
@@ -587,6 +597,23 @@ class AppLocalizationsZh extends AppLocalizations {
@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 => '短剧';
lib/l10n/app_zh.arb
+30 -1
View File
@@ -49,7 +49,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": "推荐",
@@ -239,6 +256,18 @@
"pictureInPicture": "画中画",
"pipUnavailable": "此设备无法使用画中画",
"originalTag": "原创",
"originalProduction": "原创出品",
"watchNowAction": "立即观看",
"newArrivalBadge": "上新",
"editorPick": "编辑精选",
"totalEpisodesShort": "全{count}集",
"@totalEpisodesShort": {
"placeholders": {
"count": {
"type": "int"
}
}
},
"dramaTag": "短剧",
"episodeLabel": "第 {number} 集",
"@episodeLabel": {
lib/pages/account/account_profile_page.dart
+30 -7
View File
@@ -8,6 +8,7 @@ import 'package:provider/provider.dart';
import '../../core/data/models/account_profile.dart';
import '../../core/data/repositories/account_repository.dart';
import '../../core/data/services/auth_controller.dart';
import '../../core/formatting/account_display.dart';
import '../../core/formatting/error_text.dart';
import '../../core/formatting/localized_date_time.dart';
import '../../core/theme/app_colors.dart';
@@ -225,6 +226,7 @@ class _AccountProfilePageState extends State<AccountProfilePage> {
);
Widget _readOnlyCard(AccountProfile profile, AppLocalizations l10n) {
final localeName = Localizations.localeOf(context).languageCode;
return _AccountCard(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
@@ -238,13 +240,34 @@ class _AccountProfilePageState extends State<AccountProfilePage> {
),
const SizedBox(height: 10),
_info(l10n.accountMaskedAccount, profile.maskedTarget),
_info(l10n.accountCountry, profile.countryCode),
_info(
l10n.accountCountry,
countryName(profile.countryCode, localeName),
),
_info(l10n.accountCurrency, profile.currency),
_info(l10n.accountStatus, profile.status),
_info(l10n.accountLanguage, profile.language),
_info(l10n.accountTimezone, profile.timezone),
_info(l10n.accountRegion, profile.regionCode),
_info(l10n.accountVipLevel, '${profile.vipLevel}'),
_info(
l10n.accountStatus,
accountStatusText(profile.status, localeName),
),
_info(
l10n.accountLanguage,
languageName(profile.language, localeName),
),
_info(
l10n.accountTimezone,
timezoneName(profile.timezone, localeName),
),
// region 与 country 后端写的是同一个值，重复时不再单列一行
if (profile.regionCode.isNotEmpty &&
profile.regionCode != profile.countryCode)
_info(
l10n.accountRegion,
countryName(profile.regionCode, localeName),
),
_info(
l10n.accountVipLevel,
vipLevelText(profile.vipLevel, localeName),
),
if (profile.createdAt != null)
_info(
l10n.accountCreatedAt,
@@ -275,7 +298,7 @@ class _AccountProfilePageState extends State<AccountProfilePage> {
),
Flexible(
child: Text(
value.isEmpty ? '-' : value,
value.isEmpty ? '—' : value,
textAlign: TextAlign.right,
style: const TextStyle(fontSize: AppDimens.body),
),
lib/pages/drama_detail/drama_detail_logic.dart
+6 -18
View File
@@ -38,7 +38,6 @@ class DramaDetailLogic extends ChangeNotifier {
int? continueIndex;
WatchProgress? progress;
String? progressError;
int _favoriteCountDelta = 0;
bool _disposed = false;
void notify() {
@@ -47,6 +46,7 @@ class DramaDetailLogic extends ChangeNotifier {
/// 列表卡片只带一集可播预览，进详情时补一次完整剧集列表。
Future<void> load(Future<Drama> Function() fetch) async {
favorites.applyServerCount(drama.id, drama.favoriteCount, notify: false);
if (drama.detailLoaded) {
await loadContinue();
return;
@@ -57,6 +57,7 @@ class DramaDetailLogic extends ChangeNotifier {
notify();
try {
drama = await fetch();
favorites.applyServerCount(drama.id, drama.favoriteCount);
await loadContinue();
} on ApiException catch (exception) {
failed = true;
@@ -139,25 +140,12 @@ class DramaDetailLogic extends ChangeNotifier {
await loadContinue();
}
/// 详情页展示用的收藏数；没有服务端计数时继续保持缺省展示。
int? get adjustedFavoriteCount {
final base = drama.favoriteCount;
if (base == null) return null;
final adjusted = base + _favoriteCountDelta;
return adjusted < 0 ? 0 : adjusted;
}
/// 详情页展示用的收藏数，统一从全局 FavoriteController 读取。
int? get adjustedFavoriteCount => favorites.favoriteCountFor(drama);
/// 收藏切换：乐观状态由控制器负责回滚，这里只在成功后同步计数。
/// 收藏切换：状态与计数均由全局控制器维护。
Future<bool> toggleFavorite() async {
final wasSaved = favorites.isSaved(drama.id);
final ok = await favorites.toggle(drama.id, card: drama);
if (!ok) return false;
final nowSaved = favorites.isSaved(drama.id);
if (nowSaved != wasSaved) {
_favoriteCountDelta += nowSaved ? 1 : -1;
notify();
}
return true;
return favorites.toggle(drama.id, card: drama);
}
@override
lib/pages/drama_detail/drama_detail_view.dart
+10 -3
View File
@@ -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_episode_states.dart
+1 -1
View File
@@ -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 -10
View File
@@ -6,7 +6,6 @@ import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import '../../core/data/models/drama.dart';
import '../../core/data/services/auth_controller.dart';
import '../../core/data/services/favorite_controller.dart';
import '../../core/formatting/count_format.dart';
import '../../core/formatting/error_text.dart';
@@ -77,11 +76,6 @@ class _FavoritesContentState extends State<FavoritesContent> {
@override
void didChangeDependencies() {
super.didChangeDependencies();
final signedIn = context.watch<AuthController>().isSignedIn;
if (!signedIn) {
_requested = false;
return;
}
if (_requested) return;
_requested = true;
final favorites = context.read<FavoriteController>();
@@ -93,7 +87,6 @@ class _FavoritesContentState extends State<FavoritesContent> {
@override
Widget build(BuildContext context) {
final l10n = AppLocalizations.of(context)!;
final signedIn = context.watch<AuthController>().isSignedIn;
return SafeArea(
bottom: false,
child: Column(
@@ -104,9 +97,9 @@ class _FavoritesContentState extends State<FavoritesContent> {
showBack: widget.showBack,
),
Expanded(
child: signedIn
? _FavoritesBody(favorites: context.watch<FavoriteController>())
: const AuthGatePanel(),
child: _FavoritesBody(
favorites: context.watch<FavoriteController>(),
),
),
],
),
@@ -122,6 +115,9 @@ class _FavoritesBody extends StatelessWidget {
@override
Widget build(BuildContext context) {
final l10n = AppLocalizations.of(context)!;
if (favorites.lastErrorCode == 200007) {
return const AuthGatePanel();
}
if (favorites.loading && favorites.cards.isEmpty) {
return const Center(
child: CircularProgressIndicator(key: Key('favorites-loading')),
lib/pages/following/following_edit_bar.dart
+20
View File
@@ -27,6 +27,7 @@ const double _barButtonHeight = 30;
const double _removeDialogButtonHeight = 32;
const double _removeDialogRadius = 6;
const double _removeDialogBottomInset = 8;
const double _cancelFollowingDialogPadding = 20;
/// 播放历史移除确认。只把移除按钮压矮。
Future<bool> confirmHistoryRemove(BuildContext context) async {
@@ -71,13 +72,32 @@ Future<bool> confirmCancelFollowing(BuildContext context) async {
return await showDialog<bool>(
context: context,
builder: (dialogContext) => AlertDialog(
contentPadding: const EdgeInsets.all(_cancelFollowingDialogPadding),
actionsPadding: const EdgeInsets.fromLTRB(
_cancelFollowingDialogPadding,
0,
_cancelFollowingDialogPadding,
_cancelFollowingDialogPadding,
),
content: Text(l10n.confirmCancelFollowing),
actions: [
TextButton(
style: TextButton.styleFrom(
visualDensity: VisualDensity.standard,
tapTargetSize: MaterialTapTargetSize.shrinkWrap,
minimumSize: const Size(0, _removeDialogButtonHeight),
padding: const EdgeInsets.symmetric(horizontal: 12),
),
onPressed: () => Navigator.pop(dialogContext, false),
child: Text(l10n.cancel),
),
FilledButton(
style: FilledButton.styleFrom(
visualDensity: VisualDensity.standard,
tapTargetSize: MaterialTapTargetSize.shrinkWrap,
minimumSize: const Size(0, _removeDialogButtonHeight),
padding: const EdgeInsets.symmetric(horizontal: 12),
),
onPressed: () => Navigator.pop(dialogContext, true),
child: Text(l10n.cancelFollowing),
),
lib/pages/following/following_page.dart
+47 -44
View File
@@ -15,7 +15,6 @@ import '../../core/data/services/watch_records_controller.dart';
import '../../core/formatting/error_text.dart';
import '../../core/theme/app_colors.dart';
import '../../core/theme/app_dimens.dart';
import '../../core/widgets/auth_gate.dart';
import '../../core/widgets/empty_state.dart';
import '../../l10n/app_localizations.dart';
import '../player/open_player.dart';
@@ -67,7 +66,7 @@ class _FollowingPageState extends State<FollowingPage> {
history: context.read<WatchHistoryRepository>(),
catalog: context.read<CatalogRepository>(),
);
if (_wasSignedIn) unawaited(_history.load());
unawaited(_history.load());
WidgetsBinding.instance.addPostFrameCallback((_) {
if (mounted) unawaited(widget.favoriteController.load());
});
@@ -75,8 +74,16 @@ class _FollowingPageState extends State<FollowingPage> {
void _onAuthChanged() {
final signedIn = _auth.isSignedIn;
if (signedIn && !_wasSignedIn) unawaited(_history.load());
if (signedIn == _wasSignedIn) return;
_wasSignedIn = signedIn;
_leaveEditing();
_history.reset();
widget.favoriteController.clear();
unawaited(_reloadForIdentity());
}
Future<void> _reloadForIdentity() async {
await Future.wait([_history.load(), widget.favoriteController.load()]);
}
@override
@@ -104,7 +111,6 @@ class _FollowingPageState extends State<FollowingPage> {
@override
Widget build(BuildContext context) {
final l10n = AppLocalizations.of(context)!;
final signedIn = context.watch<AuthController>().isSignedIn;
return ColoredBox(
key: const Key('following-page'),
color: AppColors.appBackground,
@@ -114,47 +120,44 @@ class _FollowingPageState extends State<FollowingPage> {
children: [
_header(l10n),
Expanded(
child: !signedIn
? const AuthGatePanel()
: PageView(
key: const Key('following-tab-pages'),
controller: _pageController,
onPageChanged: _onPageChanged,
children: [
FollowingKeepAliveTab(
child: FollowingFavoritesGrid(
controller: widget.favoriteController,
selection: FollowingFavoriteSelection(
editing: _editing,
selected: _selected,
onToggle: _toggleDrama,
),
scrollController: _favoriteScroll,
onGoHome: widget.onGoHome,
),
),
FollowingKeepAliveTab(
child: _HistoryList(
controller: _history,
editing: _editing,
scrollController: _historyScroll,
onListEmptied: _exitEditingIfEmpty,
),
),
],
child: PageView(
key: const Key('following-tab-pages'),
controller: _pageController,
onPageChanged: _onPageChanged,
children: [
FollowingKeepAliveTab(
child: FollowingFavoritesGrid(
controller: widget.favoriteController,
selection: FollowingFavoriteSelection(
editing: _editing,
selected: _selected,
onToggle: _toggleDrama,
),
scrollController: _favoriteScroll,
onGoHome: widget.onGoHome,
),
),
if (signedIn)
FollowingEditSlot(
tab: _tab,
editing: _editing,
favorites: widget.favoriteController,
selected: _selected,
actions: FollowingEditActions(
onToggleAll: _toggleAll,
onRemove: () => unawaited(_cancelSelected()),
),
),
FollowingKeepAliveTab(
child: _HistoryList(
controller: _history,
editing: _editing,
scrollController: _historyScroll,
onListEmptied: _exitEditingIfEmpty,
),
),
],
),
),
FollowingEditSlot(
tab: _tab,
editing: _editing,
favorites: widget.favoriteController,
selected: _selected,
actions: FollowingEditActions(
onToggleAll: _toggleAll,
onRemove: () => unawaited(_cancelSelected()),
),
),
],
),
),
@@ -297,7 +300,7 @@ class _FollowingPageState extends State<FollowingPage> {
final tab = FollowingTab.values[index];
_leaveEditing();
_tab.value = tab;
if (tab == FollowingTab.history && _auth.isSignedIn) {
if (tab == FollowingTab.history) {
unawaited(_history.load());
}
}
lib/pages/home/home_view.dart
+12 -34
View File
@@ -12,7 +12,6 @@ import '../../core/data/services/home_feed_controller.dart';
import '../../core/data/services/catalog_controller.dart';
import '../../core/data/services/category_controller.dart';
import '../../core/data/services/favorite_controller.dart';
import '../../core/data/services/wallet_controller.dart';
import '../../core/platform/haptics.dart';
import '../../core/theme/app_colors.dart';
import '../../core/theme/app_theme.dart';
@@ -20,16 +19,13 @@ import '../../core/widgets/auth_gate.dart';
import '../../core/widgets/app_root_tab.dart';
import '../discover/search_page.dart';
import '../following/following_page.dart';
import '../filter/filter_page.dart';
import '../mine/mine_types.dart';
import '../recommend/recommend_page.dart';
import '../recommend/recommend_discover_page.dart';
import '../mine/mine_view.dart';
import '../store/vip_page.dart';
import '../wallet/wallet_page.dart';
import 'home_binding.dart';
import 'home_logic.dart';
import 'widgets/home_feed_grid.dart';
import 'widgets/home_grid_header.dart';
class HomePage extends StatefulWidget {
const HomePage({super.key});
@@ -176,8 +172,8 @@ class _HomeTabsState extends State<_HomeTabs> {
Widget _body(BuildContext context) {
final pages = <Widget>[
_homeGrid(context),
_recommend(context),
_recommendDiscover(context),
FollowingPage(
onGoHome: () => logic.select(0),
favoriteController: context.read<FavoriteController>(),
@@ -194,27 +190,23 @@ class _HomeTabsState extends State<_HomeTabs> {
);
}
Widget _homeGrid(BuildContext context) {
return HomeFeedGrid(
feedController: widget.feedController,
callbacks: HomeGridCallbacks(
onSearch: () => _openSearch(context),
onOpenVip: () => unawaited(_openVip(context)),
onOpenWallet: () => unawaited(_openWallet(context)),
onOpenFilter: () => _pushPage(context, const FilterPage()),
),
onOpenDrama: (drama) => unawaited(logic.playDrama(context, drama)),
);
}
Widget _recommend(BuildContext context) {
return RecommendPage(
feedController: widget.feedController,
catalogApi: _catalogApi(context),
active: logic.tab == 1,
active: logic.tab == 0,
videoOnly: logic.videoImmersive,
onImmersiveChanged: logic.onImmersiveChanged,
onSearch: () => _openSearch(context),
onOpenWallet: () => unawaited(_openWallet(context)),
);
}
Widget _recommendDiscover(BuildContext context) {
return RecommendDiscoverPage(
active: logic.tab == 1,
onSearch: () => _openSearch(context),
onOpenWallet: () => unawaited(_openWallet(context)),
);
}
@@ -232,20 +224,6 @@ class _HomeTabsState extends State<_HomeTabs> {
).push<void>(MaterialPageRoute(builder: (_) => const SearchPage()));
}
void _pushPage(BuildContext context, Widget page) {
Navigator.of(context).push<void>(MaterialPageRoute(builder: (_) => page));
}
Future<void> _openVip(BuildContext context) async {
if (!await ensureSignedIn(context) || !context.mounted) return;
final wallet = context.read<WalletController>();
await Navigator.of(context).push<void>(
MaterialPageRoute(
builder: (_) => VipPage(onPurchased: () => unawaited(wallet.load())),
),
);
}
Future<void> _openWallet(BuildContext context) async {
if (!await ensureSignedIn(context) || !context.mounted) return;
await Navigator.of(
lib/pages/home/widgets/home_feed_card.dart
+1 -1
View File
@@ -50,7 +50,7 @@ class HomeFeedCard extends StatelessWidget {
overflow: TextOverflow.ellipsis,
textAlign: TextAlign.left,
style: const TextStyle(
color: AppColors.navSelected,
color: AppColors.textPrimary,
fontSize: AppDimens.cardTitleFont,
fontWeight: FontWeight.w500,
height: AppDimens.cardTitleLineHeight,
lib/pages/home/widgets/home_feed_grid.dart
+5
View File
@@ -104,6 +104,7 @@ class _HomeFeedGridState extends State<HomeFeedGrid> {
return _categoryPlaceholder(
l10n,
context.watch<CategoryController>(),
catalog,
);
}
final category = shortcuts[index];
@@ -146,7 +147,11 @@ class _HomeFeedGridState extends State<HomeFeedGrid> {
Widget _categoryPlaceholder(
AppLocalizations l10n,
CategoryController controller,
CatalogController catalog,
) {
if (catalog.error != null) {
return _catalogErrorState(l10n, catalog);
}
if (controller.loading) {
return const DramaGridSkeleton(
key: Key('home-grid-skeleton'),
lib/pages/mine/mine_logic.dart
+20 -3
View File
@@ -18,6 +18,7 @@ class MineLogic extends ChangeNotifier {
bool recentLoading = false;
String? recentError;
bool _disposed = false;
int _requestSeq = 0;
void notify() {
if (!_disposed) notifyListeners();
@@ -25,21 +26,37 @@ class MineLogic extends ChangeNotifier {
/// 最近观看：取分页首屏，剧名封面仍由目录卡片按 id 映射。
Future<void> refreshRecent() async {
final request = ++_requestSeq;
recentLoading = true;
recentError = null;
notify();
try {
final page = await history.recent(pageIndex: 1, pageSize: 10);
if (_disposed || request != _requestSeq) return;
recent = page.list;
watchRecordTotal = page.total;
} catch (_) {
recentError = 'progressError';
if (!_disposed && request == _requestSeq) {
recentError = 'progressError';
}
} finally {
recentLoading = false;
notify();
if (!_disposed && request == _requestSeq) {
recentLoading = false;
notify();
}
}
}
/// 切换账号/设备身份时先清空，避免旧身份数据回写或短暂混显。
void resetRecent() {
_requestSeq += 1;
recent = const [];
watchRecordTotal = null;
recentLoading = false;
recentError = null;
notify();
}
/// 页面重新可见时刷新最近观看，避免停留在旧进度。
void syncPage({required bool active, required bool wasActive}) {
if (active && !wasActive) refreshRecent();
lib/pages/mine/mine_view.dart
+100 -11
View File
@@ -6,8 +6,11 @@ import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:provider/provider.dart';
import '../../core/data/models/drama.dart';
import '../../core/data/models/watch_progress.dart';
import '../../core/data/repositories/watch_history_repository.dart';
import '../../core/data/services/auth_controller.dart';
import '../../core/data/services/catalog_controller.dart';
import '../../core/data/services/favorite_controller.dart';
import '../../core/data/services/locale_controller.dart';
import '../../core/data/services/wallet_controller.dart';
@@ -22,6 +25,7 @@ import '../downloads/downloads_page.dart';
import '../account/account_profile_page.dart';
import '../filter/filter_page.dart';
import '../notices/notices_page.dart';
import '../player/open_player.dart';
import '../settings/settings_page.dart';
import '../store/vip_page.dart';
import '../wallet/wallet_page.dart';
@@ -53,25 +57,70 @@ class MyPage extends StatefulWidget {
class _MyPageState extends State<MyPage> {
late final MineLogic logic;
late final AuthController _auth;
late final FavoriteController _favorites;
late bool _wasSignedIn;
bool _activationRefreshScheduled = false;
bool get embedded => widget.callbacks.embedded;
@override
void initState() {
super.initState();
_auth = context.read<AuthController>();
_favorites = context.read<FavoriteController>();
_wasSignedIn = _auth.isSignedIn;
_auth.addListener(_onAuthChanged);
logic = MineBinding().create(
history: context.read<WatchHistoryRepository>(),
);
if (widget.active) _scheduleFavoriteLoad();
}
@override
void didUpdateWidget(covariant MyPage oldWidget) {
super.didUpdateWidget(oldWidget);
logic.syncPage(active: widget.active, wasActive: oldWidget.active);
if (widget.active && !oldWidget.active) {
_scheduleActivationRefresh();
}
}
void _scheduleFavoriteLoad() {
if (_activationRefreshScheduled) return;
_activationRefreshScheduled = true;
WidgetsBinding.instance.addPostFrameCallback((_) {
_activationRefreshScheduled = false;
if (mounted) unawaited(_favorites.load());
});
}
void _scheduleActivationRefresh() {
if (_activationRefreshScheduled) return;
_activationRefreshScheduled = true;
WidgetsBinding.instance.addPostFrameCallback((_) {
_activationRefreshScheduled = false;
if (!mounted || !widget.active) return;
logic.syncPage(active: true, wasActive: false);
unawaited(_favorites.load());
});
}
void _onAuthChanged() {
final signedIn = _auth.isSignedIn;
if (signedIn == _wasSignedIn) return;
_wasSignedIn = signedIn;
logic.resetRecent();
_favorites.clear();
unawaited(_reloadForIdentity());
}
Future<void> _reloadForIdentity() async {
await Future.wait([logic.refreshRecent(), _favorites.load()]);
}
@override
void dispose() {
_auth.removeListener(_onAuthChanged);
logic.dispose();
super.dispose();
}
@@ -141,12 +190,14 @@ class _MyPageState extends State<MyPage> {
final wallet = context.watch<WalletController>();
final continueWatching = logic.recent.take(10).toList(growable: false);
final followingCount =
auth.isSignedIn &&
favorites.error == null &&
!(favorites.loading && favorites.total == 0)
favorites.error == null && !(favorites.loading && favorites.total == 0)
? favorites.total
: null;
final watchRecordCount = auth.isSignedIn ? logic.watchRecordTotal : null;
final watchRecordCount =
logic.recentError == null &&
!(logic.recentLoading && logic.watchRecordTotal == null)
? logic.watchRecordTotal
: null;
final coinBalance = auth.isSignedIn && wallet.snapshot != null
? wallet.balance
: null;
@@ -175,6 +226,7 @@ class _MyPageState extends State<MyPage> {
const SizedBox(height: AppDimens.mineSectionGap),
MineContinueWatching(
records: continueWatching,
onOpenRecord: _openContinueRecord,
onOpenAll: _openHistoryTab,
),
],
@@ -216,7 +268,7 @@ class _MyPageState extends State<MyPage> {
void _openDestination(MineDestination destination) {
switch (destination) {
case MineDestination.history:
_push(const WatchRecordsPage());
unawaited(_openHistoryPage());
case MineDestination.downloads:
_push(const DownloadsPage());
case MineDestination.wallet:
@@ -244,15 +296,52 @@ class _MyPageState extends State<MyPage> {
callback();
return;
}
_push(const WatchRecordsPage());
unawaited(_openHistoryPage());
}
void _push(Widget page) {
Navigator.of(context).push<void>(MaterialPageRoute(builder: (_) => page));
/// 继续观看卡片：补齐剧集后直接进全屏播放页，播放器自己会定位到记录的秒数。
Future<void> _openContinueRecord(WatchProgress record) async {
final catalog = context.read<CatalogController>();
// 续看记录只有剧的概要信息，先拼一个占位对象让目录去取完整详情
final summary = Drama(
id: record.dramaId,
title: record.dramaTitle ?? '',
synopsis: '',
posterUrl: record.dramaCover ?? '',
);
Drama drama;
try {
drama = await catalog.requireDetail(summary);
} catch (_) {
if (!mounted) return;
final l10n = AppLocalizations.of(context)!;
ScaffoldMessenger.of(
context,
).showSnackBar(SnackBar(content: Text(l10n.detailLoadFailed)));
return;
}
if (!mounted) return;
await playDramaFromCatalog(
context,
drama,
episodeId: record.episodeId.isEmpty ? null : record.episodeId,
);
if (mounted) unawaited(logic.refreshRecent());
}
Future<void> _openHistoryPage() async {
await _push(const WatchRecordsPage());
if (mounted) unawaited(logic.refreshRecent());
}
Future<void> _push(Widget page) {
return Navigator.of(
context,
).push<void>(MaterialPageRoute(builder: (_) => page));
}
void _pushPlaceholder() {
_push(const _MinePlaceholderPage());
unawaited(_push(const _MinePlaceholderPage()));
}
Future<void> _openProtected(Widget page) async {
@@ -260,7 +349,7 @@ class _MyPageState extends State<MyPage> {
await ensureSignedIn(context);
return;
}
if (mounted) _push(page);
if (mounted) await _push(page);
}
void _openVip() {
lib/pages/mine/widgets/mine_continue_watching.dart
+10 -2
View File
@@ -12,10 +12,14 @@ class MineContinueWatching extends StatelessWidget {
const MineContinueWatching({
super.key,
required this.records,
required this.onOpenRecord,
required this.onOpenAll,
});
final List<WatchProgress> records;
/// 单张卡片：直接进入该剧的播放页，并定位到记录的集。
final ValueChanged<WatchProgress> onOpenRecord;
final VoidCallback onOpenAll;
@override
@@ -94,7 +98,11 @@ class MineContinueWatching extends StatelessWidget {
);
}
Widget _card(AppLocalizations l10n, WatchProgress record, String languageCode) {
Widget _card(
AppLocalizations l10n,
WatchProgress record,
String languageCode,
) {
final title = record.localizedTitle(languageCode).trim();
final episode = record.episodeNumber;
final hasProgress = record.duration > Duration.zero;
@@ -103,7 +111,7 @@ class MineContinueWatching extends StatelessWidget {
child: InkWell(
key: Key('mine-continue-${record.dramaId}'),
borderRadius: BorderRadius.circular(AppDimens.homeCardRadius),
onTap: onOpenAll,
onTap: () => onOpenRecord(record),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
lib/pages/new_releases/new_releases_page.dart
+1 -1
View File
@@ -432,7 +432,7 @@ class _NewReleasesPageState extends State<NewReleasesPage> {
),
),
),
const SizedBox(height: 6),
const SizedBox(height: 4),
Text(
drama.title,
maxLines: 1,
lib/pages/player/comments_auth.dart
+2 -12
View File
@@ -1,24 +1,14 @@
// Author: fruit.com.cn
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import '../../core/data/models/drama.dart';
import '../../core/data/services/auth_controller.dart';
import '../../core/widgets/auth_gate.dart';
/// 评论入口统一登录闸：登录成功且页面仍存在时再打开评论面板。
Future<void> openCommentsWithAuth(
/// 评论列表与非付费互动均支持设备身份，不再把登录作为入口前置条件。
Future<void> openComments(
BuildContext context,
Drama drama, {
required Future<void> Function(BuildContext context, Drama drama) show,
}) async {
final auth = context.read<AuthController>();
if (auth.isSignedIn) {
await show(context, drama);
return;
}
await ensureSignedIn(context);
if (!context.mounted || !auth.isSignedIn) return;
await show(context, drama);
}
lib/pages/player/player_binding.dart
+2
View File
@@ -15,6 +15,7 @@ class PlayerBinding {
required PlaybackPositionCache positionCache,
WalletController? wallet,
DownloadController? downloads,
bool Function()? isSignedIn,
}) => PlayerLogic(
history: history,
playback: playback,
@@ -22,5 +23,6 @@ class PlayerBinding {
pictureInPicture: AndroidPictureInPicture(),
wallet: wallet,
downloads: downloads,
isSignedIn: isSignedIn,
);
}
lib/pages/player/player_logic.dart
+191 -5
View File
@@ -9,6 +9,7 @@ import 'package:flutter/scheduler.dart';
import 'package:provider/provider.dart';
import '../../core/data/models/drama.dart';
import '../../core/data/models/episode_stats.dart';
import '../../core/data/models/play_ticket.dart';
import '../../core/data/models/watch_progress.dart';
import '../../core/data/models/player_port.dart';
@@ -51,9 +52,13 @@ class PlayerLogic extends ChangeNotifier {
this.downloads,
PlaybackPositionCache? positionCache,
Future<void> Function()? waitForFrame,
DateTime Function()? clock,
bool Function()? isSignedIn,
}) : positionCache = positionCache ?? PlaybackPositionCache(),
_waitForFrame =
waitForFrame ?? (() => WidgetsBinding.instance.endOfFrame);
waitForFrame ?? (() => WidgetsBinding.instance.endOfFrame),
_clock = clock ?? DateTime.now,
_isSignedIn = isSignedIn ?? (() => true);
final WatchHistoryRepository history;
final PlaybackRepository playback;
@@ -62,6 +67,8 @@ class PlayerLogic extends ChangeNotifier {
final DownloadController? downloads;
final PlaybackPositionCache positionCache;
final Future<void> Function() _waitForFrame;
final DateTime Function() _clock;
final bool Function() _isSignedIn;
late PageController pages;
late PlaybackQueue queue;
@@ -100,11 +107,18 @@ class PlayerLogic extends ChangeNotifier {
bool muted = false;
double playbackSpeed = 1.0;
bool stoppedAtFeedEnd = false;
Duration episodeStatsTtl = const Duration(seconds: 60);
ValueChanged<EpisodeStats>? onEpisodeStatsUpdated;
VideoPlayerPort? scrubbingPlayer;
bool pip = false;
bool pipPreparing = false;
final Map<String, int> pickedEpisode = {};
final Set<String> _unlockedEpisodeIds = {};
final Map<String, EpisodeStats> _episodeStats = {};
final Map<String, DateTime> _episodeStatsFetchedAt = {};
final Map<String, Future<void>> _episodeStatsInFlight = {};
final Map<String, int> _episodeStatsRevision = {};
final Map<String, int> _dramaStatsRevision = {};
/// 解锁中的集 id 与失败文案；空表示没有进行中的解锁。
String? unlockingEpisodeId;
@@ -168,6 +182,8 @@ class PlayerLogic extends ChangeNotifier {
return fallback;
}
EpisodeStats? episodeStats(String episodeId) => _episodeStats[episodeId];
void notify() {
if (!_disposed) notifyListeners();
}
@@ -249,6 +265,8 @@ class PlayerLogic extends ChangeNotifier {
'[feed-session] phase=$phase session=${identityHashCode(session)} '
'index=${session.currentIndex} episode=${session.currentEpisode.id} '
'controller=${video == null ? '-' : identityHashCode(video.controller)} '
'user=${session.userWantsPlay} routeVisible=${session.debugRouteVisible} '
'appResumed=${session.debugAppResumed} overlayOpen=${session.debugOverlayOpen} '
'live=${session.livePlayerCount}',
);
}
@@ -534,6 +552,160 @@ class PlayerLogic extends ChangeNotifier {
}
}
/// 当前集激活后刷新轻量互动计数；同集命中 TTL 或已有请求时不重复发请求。
Future<void> refreshEpisodeStats(int index) {
if (_disposed || index < 0 || index >= sessionEpisodes.length) {
return Future<void>.value();
}
final episodeId = sessionEpisodes[index].id;
final cached = _episodeStats[episodeId];
final fetchedAt = _episodeStatsFetchedAt[episodeId];
if (cached != null &&
fetchedAt != null &&
_clock().difference(fetchedAt) < episodeStatsTtl) {
_logEpisodeStatsRefresh(episodeId, cached: true);
onEpisodeStatsUpdated?.call(cached);
return Future<void>.value();
}
final inFlight = _episodeStatsInFlight[episodeId];
if (inFlight != null) {
_logEpisodeStatsRefresh(episodeId, cached: true, inFlight: true);
return inFlight;
}
_logEpisodeStatsRefresh(episodeId, cached: false);
final expectedDramaId = index < queue.length
? queue.entryAt(index).drama.id
: '';
final episodeRevision = _episodeStatsRevision[episodeId] ?? 0;
final dramaRevision = _dramaStatsRevision[expectedDramaId] ?? 0;
late final Future<void> request;
request =
_fetchEpisodeStats(
episodeId,
expectedDramaId: expectedDramaId,
episodeRevision: episodeRevision,
dramaRevision: dramaRevision,
).whenComplete(() {
if (identical(_episodeStatsInFlight[episodeId], request)) {
_episodeStatsInFlight.remove(episodeId);
}
});
_episodeStatsInFlight[episodeId] = request;
return request;
}
Future<void> _fetchEpisodeStats(
String episodeId, {
required String expectedDramaId,
required int episodeRevision,
required int dramaRevision,
}) async {
try {
final fetched = await playback.episodeStats(episodeId);
if (_disposed) return;
if ((_episodeStatsRevision[episodeId] ?? 0) != episodeRevision ||
(_dramaStatsRevision[expectedDramaId] ?? 0) != dramaRevision) {
if (kDebugMode) {
debugPrint(
'[player] phase=episode-stats-discarded episodeId=$episodeId '
'reason=local-state-newer',
);
}
return;
}
final stats = fetched.copyWith(
dramaId: fetched.dramaId.isEmpty ? expectedDramaId : fetched.dramaId,
);
_episodeStats[episodeId] = stats;
_episodeStatsFetchedAt[episodeId] = _clock();
final episodeIndex = sessionEpisodes.indexWhere(
(episode) => episode.id == episodeId,
);
if (episodeIndex >= 0) {
sessionEpisodes[episodeIndex] = sessionEpisodes[episodeIndex].withStats(
likeCount: stats.likeCount,
commentCount: stats.commentCount,
);
}
onEpisodeStatsUpdated?.call(stats);
notify();
} catch (_) {
// 统计接口只负责校准计数，失败时保留播放与旧值。
}
}
void _logEpisodeStatsRefresh(
String episodeId, {
required bool cached,
bool inFlight = false,
}) {
if (!kDebugMode) return;
debugPrint(
'[player] phase=episode-stats-refresh episodeId=$episodeId '
'cached=${cached ? 1 : 0}${inFlight ? ' inFlight=1' : ''}',
);
}
/// 点赞成功后同步本地统计快照，避免切回时被旧缓存覆盖。
void applyEpisodeLikeState(
String episodeId, {
required bool liked,
required int likeCount,
}) {
_episodeStatsRevision.update(
episodeId,
(value) => value + 1,
ifAbsent: () => 1,
);
final stats = _episodeStats[episodeId];
if (stats != null) {
_episodeStats[episodeId] = stats.copyWith(
liked: liked,
likeCount: likeCount,
);
}
final index = sessionEpisodes.indexWhere(
(episode) => episode.id == episodeId,
);
if (index >= 0) {
sessionEpisodes[index] = sessionEpisodes[index].withStats(
likeCount: likeCount,
);
}
notify();
}
/// 评论面板关闭后同步评论数。
void applyEpisodeCommentCount(String episodeId, int commentCount) {
_episodeStatsRevision.update(
episodeId,
(value) => value + 1,
ifAbsent: () => 1,
);
final stats = _episodeStats[episodeId];
if (stats != null) {
_episodeStats[episodeId] = stats.copyWith(commentCount: commentCount);
}
final index = sessionEpisodes.indexWhere(
(episode) => episode.id == episodeId,
);
if (index >= 0) {
sessionEpisodes[index] = sessionEpisodes[index].withStats(
commentCount: commentCount,
);
}
notify();
}
/// 收藏成功后让旧 stats 请求失效，计数本身只写 FavoriteController。
void markDramaFavoriteChanged(String dramaId) {
_dramaStatsRevision.update(
dramaId,
(value) => value + 1,
ifAbsent: () => 1,
);
}
String _fileUrl(String path) =>
path.startsWith('file:') ? path : Uri.file(path).toString();
@@ -606,7 +778,10 @@ class PlayerLogic extends ChangeNotifier {
/// 金币解锁当前集；成功后强制刷新票据并直接起播。
Future<bool> unlockEpisode(int index) async {
final service = wallet;
if (service == null || index < 0 || index >= sessionEpisodes.length) {
if (service == null ||
!_isSignedIn() ||
index < 0 ||
index >= sessionEpisodes.length) {
return false;
}
final episode = sessionEpisodes[index];
@@ -1041,6 +1216,7 @@ class PlayerLogic extends ChangeNotifier {
int? revision,
bool? userWantsPlay,
}) async {
if (index < 0 || index >= sessionEpisodes.length) return;
final feedRevisionAtStart = revision ?? feedRevision;
final request = ++pageRequest;
cancelScrub();
@@ -1066,6 +1242,10 @@ class PlayerLogic extends ChangeNotifier {
!isMounted()) {
return;
}
if (!_isSignedIn()) {
unawaited(refreshEpisodeStats(index));
return;
}
}
// 起播前先要票据：拿不到就不起播，交给三态 UI 提示（失败可重试）
final ready = await ensureTicket(index);
@@ -1074,7 +1254,10 @@ class PlayerLogic extends ChangeNotifier {
!isMounted()) {
return;
}
if (!ready) return;
if (!ready) {
unawaited(refreshEpisodeStats(index));
return;
}
await _selectVisible(index, userWantsPlay: userWantsPlay);
}
@@ -1085,13 +1268,16 @@ class PlayerLogic extends ChangeNotifier {
}
/// 按可见队列选择一集，并预热上一集与下一集。
Future<void> _selectVisible(int index, {bool? userWantsPlay}) {
return session.select(
Future<void> _selectVisible(int index, {bool? userWantsPlay}) async {
await session.select(
index,
preloadIndex: nextVisibleIndex(index),
previousIndex: previousVisibleIndex(index),
userWantsPlay: userWantsPlay,
);
if (!_disposed && session.currentIndex == index) {
unawaited(refreshEpisodeStats(index));
}
}
int? nextVisibleIndex(int index) {
lib/pages/player/player_view.dart
+75 -20
View File
@@ -9,8 +9,10 @@ import 'package:provider/provider.dart';
import '../../core/config/app_config.dart';
import '../../core/data/models/drama.dart';
import '../../core/data/models/episode_stats.dart';
import '../../core/data/repositories/comment_repository.dart';
import '../../core/data/services/catalog_controller.dart';
import '../../core/data/services/auth_controller.dart';
import '../../core/data/services/favorite_controller.dart';
import '../../core/data/services/download_controller.dart';
import '../../core/data/services/interaction_controller.dart';
@@ -148,25 +150,28 @@ class _PlayerPageState extends State<PlayerPage>
bool _loadingRemoved = true;
bool _loadingFadeScheduled = false;
bool _loggedLoadingUiVisible = false;
bool _loggedStartConditions = false;
final PlayerHeartOverlayController _heartOverlayController =
PlayerHeartOverlayController();
final Set<String> _precachedPosterUrls = {};
/// 收藏切换后的本地增量：基准是详情快照，切换成功按服务端状态 ±1。
final Map<String, int> _favoriteDelta = {};
/// 评论接口返回的最新数量；统计快照优先，失败时保留这里的旧值。
final Map<String, int> _commentCounts = {};
@override
void initState() {
super.initState();
final handoff = widget.handoff;
final initialUserWantsPlay = handoff?.sourceUserWantsPlay ?? true;
logic = PlayerBinding().create(
history: context.read<WatchHistoryRepository>(),
playback: context.read<PlaybackRepository>(),
positionCache: context.read<PlaybackPositionCache>(),
wallet: widget.wallet,
downloads: widget.downloads,
isSignedIn: () => context.read<AuthController>().isSignedIn,
);
logic.onEpisodeStatsUpdated = _applyEpisodeStats;
logic.attach(widget, isMounted: () => mounted);
_thumbnailService = PlaybackThumbnailService(
sourceResolver: _resolveThumbnailSource,
@@ -179,8 +184,21 @@ class _PlayerPageState extends State<PlayerPage>
coordinator: widget.embedded
? context.read<PlaybackCoordinator>()
: PlaybackCoordinator(),
initialUserWantsPlay: handoff?.sourceUserWantsPlay ?? true,
initialUserWantsPlay: initialUserWantsPlay,
);
if (kDebugMode) {
debugPrint(
'[player-start] phase=initialized '
'session=${identityHashCode(logic.session)} '
'initialUserWantsPlay=$initialUserWantsPlay '
'sessionUserWantsPlay=${logic.session.userWantsPlay} '
'active=${logic.active} embedded=${widget.embedded} '
'appResumed=${logic.session.debugAppResumed} '
'routeVisible=${logic.session.debugRouteVisible} '
'overlayOpen=${logic.session.debugOverlayOpen} '
'live=${logic.session.livePlayerCount}',
);
}
_pageController = logic.pages;
if (!widget.embedded &&
!logic.isEpisodeLocked(logic.session.currentEpisode)) {
@@ -535,11 +553,22 @@ class _PlayerPageState extends State<PlayerPage>
setState(() {});
}
/// 收藏状态确认后同步右侧计数（总数没有独立计数接口，按 ±1 跟随）。
void _applyFavoriteDelta(String dramaId, {required bool nowSaved}) {
void _applyEpisodeStats(EpisodeStats stats) {
if (!mounted) return;
context.read<InteractionController>().applyEpisodeStats(
stats.episodeId,
liked: stats.liked,
likeCount: stats.likeCount,
);
if (stats.dramaId.isNotEmpty) {
context.read<FavoriteController>().applyServerState(
stats.dramaId,
saved: stats.favorited,
favoriteCount: stats.favoriteCount,
);
}
setState(() {
_favoriteDelta[dramaId] =
(_favoriteDelta[dramaId] ?? 0) + (nowSaved ? 1 : -1);
_commentCounts[stats.episodeId] = stats.commentCount;
});
}
@@ -549,7 +578,7 @@ class _PlayerPageState extends State<PlayerPage>
Episode episode,
) async {
final comments = context.read<CommentRepository>();
await openCommentsWithAuth(
await openComments(
context,
drama,
show: (context, drama) =>
@@ -558,6 +587,7 @@ class _PlayerPageState extends State<PlayerPage>
try {
final count = await comments.count(drama.id, episodeId: episode.id);
if (!mounted) return;
logic.applyEpisodeCommentCount(episode.id, count);
setState(() => _commentCounts[episode.id] = count);
} catch (_) {
// 评论面板已经关闭，计数刷新失败时保留旧值即可。
@@ -576,6 +606,25 @@ class _PlayerPageState extends State<PlayerPage>
final interactions = context.watch<InteractionController>();
final l10n = AppLocalizations.of(context)!;
final indices = logic.visibleIndices;
if (indices.isEmpty) {
return const ColoredBox(
color: AppColors.mediaBlack,
child: SizedBox.expand(),
);
}
if (kDebugMode && !_loggedStartConditions) {
_loggedStartConditions = true;
debugPrint(
'[player-start] phase=first-build '
'session=${identityHashCode(logic.session)} '
'tickerMode=${TickerMode.valuesOf(context).enabled} '
'routeVisible=${logic.session.debugRouteVisible} '
'appResumed=${logic.session.debugAppResumed} '
'overlayOpen=${logic.session.debugOverlayOpen} '
'visible=${logic.session.debugVisible} '
'mayPlay=${logic.session.debugMayPlay}',
);
}
final activePort = logic.session.active;
final activeVideo = activePort is VideoPlayerPort ? activePort : null;
final canWaitForVideoFrame =
@@ -963,6 +1012,7 @@ class _PlayerPageState extends State<PlayerPage>
InteractionController interactions,
) {
final l10n = AppLocalizations.of(context)!;
final favorites = context.watch<FavoriteController>();
final entry = logic.queue.entryAt(index);
final drama = entry.drama;
final episode = _resolvedEpisode(index);
@@ -1131,11 +1181,12 @@ class _PlayerPageState extends State<PlayerPage>
liked: interactions.isEpisodeLiked(episode.id),
likeCount:
interactions.episodeLikeCount(episode.id) ?? episode.likeCount,
favoriteCount: drama.favoriteCount == null
? null
: drama.favoriteCount! + (_favoriteDelta[drama.id] ?? 0),
commentCount: _commentCounts[episode.id] ?? episode.commentCount,
saved: context.watch<FavoriteController>().isSaved(drama.id),
favoriteCount: favorites.favoriteCountFor(drama),
commentCount:
logic.episodeStats(episode.id)?.commentCount ??
_commentCounts[episode.id] ??
episode.commentCount,
saved: favorites.isSaved(drama.id),
onLike: () async {
await _toggleLike(context, interactions, episode);
},
@@ -1149,6 +1200,7 @@ class _PlayerPageState extends State<PlayerPage>
unawaited(_presentFullPlayer(context, index));
},
onEpisodes: () => logic.showEpisodes(context),
onOpenSearch: widget.onSearch,
onMore: _openCurrentMore,
onScrubStart: videoReady
? () => logic.beginScrub(videoPort!)
@@ -1161,6 +1213,7 @@ class _PlayerPageState extends State<PlayerPage>
: null,
thumbnailService: _thumbnailService,
spriteAxisService: _spriteAxisService,
suppressBufferLoading: !widget.embedded && !_loadingRemoved,
)
else if (!widget.homeMode)
_standardPlaybackOverlay(context, index, interactions),
@@ -1211,6 +1264,7 @@ class _PlayerPageState extends State<PlayerPage>
) {
if (logic.pip || logic.pipPreparing) return const SizedBox.expand();
final l10n = AppLocalizations.of(context)!;
final favorites = context.watch<FavoriteController>();
final entry = logic.queue.entryAt(index);
final drama = entry.drama;
final episode = _resolvedEpisode(index);
@@ -1236,11 +1290,12 @@ class _PlayerPageState extends State<PlayerPage>
liked: interactions.isEpisodeLiked(episode.id),
likeCount:
interactions.episodeLikeCount(episode.id) ?? episode.likeCount,
commentCount: _commentCounts[episode.id] ?? episode.commentCount,
favoriteCount: drama.favoriteCount == null
? null
: drama.favoriteCount! + (_favoriteDelta[drama.id] ?? 0),
saved: context.watch<FavoriteController>().isSaved(drama.id),
commentCount:
logic.episodeStats(episode.id)?.commentCount ??
_commentCounts[episode.id] ??
episode.commentCount,
favoriteCount: favorites.favoriteCountFor(drama),
saved: favorites.isSaved(drama.id),
playing: logic.session.userWantsPlay,
playbackSpeed: _playbackSpeed,
totalEpisodes: logic.visibleIndices.length,
@@ -1284,6 +1339,7 @@ class _PlayerPageState extends State<PlayerPage>
onBoostEnd: _endBoost,
),
controlsVisible: _chromeVisible,
suppressProgressLoading: !widget.embedded && !_loadingRemoved,
);
}
@@ -1339,8 +1395,7 @@ class _PlayerPageState extends State<PlayerPage>
seriesEpisodes.insert(0, sourceEpisode);
episodeIndex = 0;
}
final sourceUserWantsPlay = logic.session.userWantsPlay;
final handoff = PlayerPageHandoff(sourceUserWantsPlay: sourceUserWantsPlay);
final handoff = PlayerPageHandoff(sourceUserWantsPlay: true);
_logFullPlayerRoute('present');
setState(() => _presentationActive = true);
final route = Navigator.of(context).push<void>(
lib/pages/player/player_view_actions.dart
+23 -24
View File
@@ -65,6 +65,11 @@ extension _PlayerViewActions on _PlayerPageState {
) async {
final wallet = logic.wallet;
if (wallet == null) return;
if (!context.read<AuthController>().isSignedIn &&
!await ensureSignedIn(context)) {
return;
}
if (!context.mounted) return;
await showModalBottomSheet<bool>(
context: context,
backgroundColor: AppColors.transparent,
@@ -81,7 +86,7 @@ extension _PlayerViewActions on _PlayerPageState {
}
Future<bool> _unlockEpisode(BuildContext context, int index) async {
if (!await ensureSignedIn(context) || !context.mounted) return false;
if (!context.read<AuthController>().isSignedIn) return false;
final ok = await logic.unlockEpisode(index);
if (ok || !context.mounted) return ok;
final l10n = AppLocalizations.of(context)!;
@@ -119,27 +124,6 @@ extension _PlayerViewActions on _PlayerPageState {
}
return;
}
final signedIn = await ensureSignedIn(context);
if (kDebugMode) {
debugPrint(
'[player-like] phase=auth-result '
'episodeId=${episode.id} signedIn=$signedIn '
'mounted=${context.mounted}',
);
}
if (!signedIn || !context.mounted) return;
final busyAfterAuth = interactions.isEpisodeBusy(episode.id);
final likedAfterAuth = interactions.isEpisodeLiked(episode.id);
if (busyAfterAuth || (likeOnly && likedAfterAuth)) {
if (kDebugMode) {
debugPrint(
'[player-like] phase=toggle-skipped-after-auth '
'episodeId=${episode.id} '
'reason=${busyAfterAuth ? 'busy' : 'already-liked'}',
);
}
return;
}
final result = await interactions.toggleEpisodeLike(episode.id);
if (kDebugMode) {
debugPrint(
@@ -151,10 +135,22 @@ extension _PlayerViewActions on _PlayerPageState {
);
}
if (result.isSuccess) {
final likeCount = interactions.episodeLikeCount(episode.id);
if (likeCount != null) {
logic.applyEpisodeLikeState(
episode.id,
liked: interactions.isEpisodeLiked(episode.id),
likeCount: likeCount,
);
}
_refreshLikeState();
return;
}
if (!context.mounted) return;
if (result.errorCode == 200007) {
await ensureSignedIn(context);
return;
}
showCenteredToast(
context,
result.errorMessage ?? AppLocalizations.of(context)!.likeFailed,
@@ -163,7 +159,6 @@ extension _PlayerViewActions on _PlayerPageState {
Future<void> _toggleSave(BuildContext context, Drama drama) async {
final favorites = context.read<FavoriteController>();
if (!await ensureSignedIn(context) || !context.mounted) return;
unawaited(context.read<Haptics>().lightImpact());
final wasSaved = favorites.isSaved(drama.id);
final ok = await favorites.toggle(drama.id, card: drama);
@@ -171,10 +166,14 @@ extension _PlayerViewActions on _PlayerPageState {
if (ok) {
final nowSaved = favorites.isSaved(drama.id);
if (nowSaved != wasSaved) {
_applyFavoriteDelta(drama.id, nowSaved: nowSaved);
logic.markDramaFavoriteChanged(drama.id);
}
return;
}
if (favorites.lastErrorCode == 200007) {
await ensureSignedIn(context);
return;
}
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text(AppLocalizations.of(context)!.favoriteToggleFailed),
lib/pages/player/widgets/comment_composer_sheet.dart
+9 -15
View File
@@ -9,7 +9,6 @@ import 'package:flutter/services.dart';
import 'package:provider/provider.dart';
import '../../../core/data/models/comment.dart';
import '../../../core/data/services/auth_controller.dart';
import '../../../core/data/services/comment_controller.dart';
import '../../../core/platform/haptics.dart';
import '../../../core/platform/keyboard_inset.dart';
@@ -196,23 +195,20 @@ class _CommentComposerSheetState extends State<CommentComposerSheet> {
return;
}
final l10n = AppLocalizations.of(context)!;
if (result.errorCode == 200007) {
await ensureSignedIn(context);
return;
}
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(content: Text(result.errorMessage ?? l10n.commentPostFailed)),
);
}
Future<void> _authenticate() async {
await ensureSignedIn(context);
if (!mounted || !context.read<AuthController>().isSignedIn) return;
_inputFocus.requestFocus();
}
@override
Widget build(BuildContext context) {
final l10n = AppLocalizations.of(context)!;
final signedIn = context.watch<AuthController>().isSignedIn;
final hasContent = _input.text.trim().isNotEmpty;
final canPost = signedIn && hasContent && !widget.controller.submitting;
final canPost = hasContent && !widget.controller.submitting;
final multiline = _input.text.contains('\n');
final bottomInset = _isAndroid
? _pinnedKeyboardInset
@@ -247,8 +243,8 @@ class _CommentComposerSheetState extends State<CommentComposerSheet> {
key: const Key('comment-composer-input'),
controller: _input,
focusNode: _inputFocus,
readOnly: !signedIn,
canRequestFocus: signedIn,
readOnly: false,
canRequestFocus: true,
minLines: 1,
maxLines: 4,
maxLength: _maxCommentLength,
@@ -262,9 +258,7 @@ class _CommentComposerSheetState extends State<CommentComposerSheet> {
),
cursorColor: AppColors.blue,
decoration: InputDecoration(
hintText: signedIn
? l10n.writeComment
: l10n.commentLoginHint,
hintText: l10n.writeComment,
hintStyle: const TextStyle(
color: AppColors.muted,
fontSize: 14,
@@ -278,7 +272,7 @@ class _CommentComposerSheetState extends State<CommentComposerSheet> {
enabledBorder: InputBorder.none,
focusedBorder: InputBorder.none,
),
onTap: signedIn ? null : _authenticate,
onTap: null,
),
),
const SizedBox(height: 12),
lib/pages/player/widgets/drama_comments_sheet.dart
+5 -9
View File
@@ -11,11 +11,9 @@ import '../../../core/data/models/comment.dart';
import '../../../core/data/models/drama.dart';
import '../../../core/data/repositories/comment_repository.dart';
import '../../../core/data/repositories/interaction_repository.dart';
import '../../../core/data/services/auth_controller.dart';
import '../../../core/data/services/comment_controller.dart';
import '../../../core/formatting/error_text.dart';
import '../../../core/theme/app_colors.dart';
import '../../../core/widgets/auth_gate.dart';
import '../../../core/widgets/empty_state.dart';
import '../../../l10n/app_localizations.dart';
import 'comment_composer_sheet.dart';
@@ -29,7 +27,7 @@ const double _sheetRadius = 20;
const double _headerHeight = 44;
const double _composerTopGap = 8;
/// 服务端评论底部弹窗：匿名列表、游标翻页、回复与登录发布。
/// 服务端评论底部弹窗：匿名列表、游标翻页、回复与设备身份发布。
class DramaCommentsSheet extends StatefulWidget {
const DramaCommentsSheet({super.key, required this.drama, this.episodeId});
@@ -92,8 +90,7 @@ class _DramaCommentsSheetState extends State<DramaCommentsSheet> {
}
Future<void> _openComposer({DramaComment? replyTo}) async {
await ensureSignedIn(context);
if (!mounted || !context.read<AuthController>().isSignedIn) return;
if (!mounted) return;
_removeComposerOverlay();
final entry = OverlayEntry(
builder: (_) => CommentComposerSheet(
@@ -222,7 +219,6 @@ class _DramaCommentsSheetState extends State<DramaCommentsSheet> {
Widget _content(BuildContext context) {
final l10n = AppLocalizations.of(context)!;
final count = _serverCount ?? _controller.exactCount;
final signedIn = context.watch<AuthController>().isSignedIn;
final composerReserve = _composerHeight + _composerTopGap;
return Column(
key: const Key('comment-sheet-content'),
@@ -269,7 +265,7 @@ class _DramaCommentsSheetState extends State<DramaCommentsSheet> {
Padding(
key: const Key('comment-composer-area'),
padding: const EdgeInsets.only(top: _composerTopGap),
child: _fakeComposer(l10n, signedIn: signedIn),
child: _fakeComposer(l10n),
),
],
);
@@ -352,7 +348,7 @@ class _DramaCommentsSheetState extends State<DramaCommentsSheet> {
return const SizedBox(height: 8);
}
Widget _fakeComposer(AppLocalizations l10n, {required bool signedIn}) {
Widget _fakeComposer(AppLocalizations l10n) {
return GestureDetector(
behavior: HitTestBehavior.opaque,
onTap: _openComposer,
@@ -372,7 +368,7 @@ class _DramaCommentsSheetState extends State<DramaCommentsSheet> {
child: Padding(
padding: const EdgeInsets.only(left: 16),
child: Text(
signedIn ? l10n.writeComment : l10n.commentLoginHint,
l10n.writeComment,
key: const Key('comment-input-placeholder-label'),
maxLines: 1,
overflow: TextOverflow.ellipsis,
lib/pages/player/widgets/home_feed_overlay.dart
+39 -9
View File
@@ -22,11 +22,13 @@ part 'home_feed_overlay_parts.dart';
const double _progressHeight = 2;
const double _progressHitHeight = 32;
const double _pageHorizontal = 14;
const double _railRight = 8;
const double _pageHorizontal = 20;
const double _railRight = 14;
const double _railGap = 12;
const double _bottomInfoInset = 32;
const double _railBottomOffset = 60;
// 观看条高 44；2pt 进度线视觉上沿距观看条顶约 7pt（线中心距进度条盒底 8）。
// 信息面板底边取 44+16=60，使简介↔进度线、进度线↔观看条两侧间距均为 7pt。
const double _bottomInfoInset = homeFeedWatchAllHeight + 16;
const double _railBottomOffset = 40;
const Duration _overlayFadeDuration = Duration(milliseconds: 120);
const List<Shadow> _boostTextShadows = [
Shadow(color: AppColors.shadow, blurRadius: 5, offset: Offset(0, 1)),
@@ -52,6 +54,7 @@ class HomeFeedOverlay extends StatefulWidget {
required this.onDetail,
required this.onOpenFullPlayer,
this.onEpisodes,
this.onOpenSearch,
required this.onTogglePlay,
required this.onBoostStart,
required this.onBoostEnd,
@@ -69,6 +72,7 @@ class HomeFeedOverlay extends StatefulWidget {
this.cancelScrubRequest = 0,
this.thumbnailService,
this.spriteAxisService,
this.suppressBufferLoading = false,
});
final AppLocalizations l10n;
@@ -91,6 +95,9 @@ class HomeFeedOverlay extends StatefulWidget {
final VoidCallback onDetail;
final VoidCallback onOpenFullPlayer;
final VoidCallback? onEpisodes;
/// 底部热搜胶囊点击（降级版：跳搜索页）。
final VoidCallback? onOpenSearch;
final VoidCallback onTogglePlay;
final VoidCallback onBoostStart;
final VoidCallback onBoostEnd;
@@ -104,6 +111,7 @@ class HomeFeedOverlay extends StatefulWidget {
final int cancelScrubRequest;
final PlaybackThumbnailService? thumbnailService;
final SpriteThumbnailAxisService? spriteAxisService;
final bool suppressBufferLoading;
@override
State<HomeFeedOverlay> createState() => _HomeFeedOverlayState();
@@ -171,7 +179,7 @@ class _HomeFeedOverlayState extends State<HomeFeedOverlay> {
Positioned(
left: 0,
right: 0,
bottom: 20,
bottom: homeFeedWatchAllHeight + 12,
child: AnimatedOpacity(
duration: _overlayFadeDuration,
opacity: widget.boosting ? 1 : 0,
@@ -182,9 +190,9 @@ class _HomeFeedOverlayState extends State<HomeFeedOverlay> {
),
),
Positioned(
left: 0,
right: 0,
bottom: 0,
left: _pageHorizontal,
right: _pageHorizontal,
bottom: homeFeedWatchAllHeight,
child: _FeedProgressBar(
controller: widget.controller,
locked: widget.locked,
@@ -195,11 +203,30 @@ class _HomeFeedOverlayState extends State<HomeFeedOverlay> {
spriteAxisService: widget.spriteAxisService,
thumbnailsUrl: widget.episode.thumbnailsUrl,
episodeId: widget.episode.id,
suppressBufferLoading: widget.suppressBufferLoading,
onScrubStart: _startScrub,
onScrubEnd: _endScrub,
onSeek: widget.onSeek,
),
),
Positioned(
left: 0,
right: 0,
bottom: 0,
child: AnimatedOpacity(
duration: _overlayFadeDuration,
opacity: widget.visible && !_scrubbing && !widget.boosting
? 1
: 0,
child: IgnorePointer(
ignoring: !widget.visible || _scrubbing || widget.boosting,
child: HomeFeedWatchAllBar(
drama: widget.drama,
onTap: widget.onOpenFullPlayer,
),
),
),
),
],
),
);
@@ -266,9 +293,11 @@ class _HomeFeedOverlayState extends State<HomeFeedOverlay> {
liked: widget.liked,
favoriteCount: widget.favoriteCount,
likeCount: widget.likeCount,
commentCount: widget.commentCount,
onSave: widget.onSave,
onLike: widget.onLike,
onEpisodes: widget.onEpisodes ?? widget.onOpenFullPlayer,
onComments: widget.onComments,
onShare: widget.onShare,
);
}
@@ -278,6 +307,7 @@ class _HomeFeedOverlayState extends State<HomeFeedOverlay> {
episode: widget.episode,
onDetail: widget.onDetail,
onOpenFullPlayer: widget.onOpenFullPlayer,
onOpenSearch: widget.onOpenSearch,
);
}
}
lib/pages/player/widgets/home_feed_overlay_parts.dart
+40 -13
View File
@@ -6,7 +6,6 @@ const double _thumbSize = 6;
const double _thumbActiveSize = 14;
const double _trackActiveHeight = 6;
const double _lineCenterFromBottom = 8;
const Duration _trackResizeDuration = Duration(milliseconds: 120);
const double _timeBubbleWidth = 96;
const double _timeBubbleMargin = 12;
const Key _inactiveTrackKey = Key('home-feed-progress-inactive');
@@ -23,6 +22,7 @@ class _FeedProgressBar extends StatefulWidget {
this.spriteAxisService,
this.thumbnailsUrl,
this.episodeId,
this.suppressBufferLoading = false,
this.onScrubStart,
this.onScrubEnd,
this.onSeek,
@@ -37,6 +37,7 @@ class _FeedProgressBar extends StatefulWidget {
final SpriteThumbnailAxisSource? spriteAxisService;
final String? thumbnailsUrl;
final String? episodeId;
final bool suppressBufferLoading;
final VoidCallback? onScrubStart;
final VoidCallback? onScrubEnd;
final ValueChanged<Duration>? onSeek;
@@ -52,6 +53,7 @@ class _FeedProgressBarState extends State<_FeedProgressBar> {
Timer? _bufferTimer;
bool _buffering = false;
bool _dragging = false;
Duration? _lastPosition;
@override
void initState() {
@@ -67,6 +69,7 @@ class _FeedProgressBarState extends State<_FeedProgressBar> {
_bufferTimer?.cancel();
_bufferTimer = null;
_buffering = false;
_lastPosition = null;
_attachSource();
}
if (oldWidget.cancelScrubRequest != widget.cancelScrubRequest) {
@@ -77,6 +80,7 @@ class _FeedProgressBarState extends State<_FeedProgressBar> {
_bufferTimer?.cancel();
_bufferTimer = null;
_buffering = false;
_lastPosition = null;
if (widget.locked) {
_dragging = false;
_preview = null;
@@ -84,6 +88,13 @@ class _FeedProgressBarState extends State<_FeedProgressBar> {
_syncBufferState(notify: false);
}
}
if (oldWidget.suppressBufferLoading != widget.suppressBufferLoading) {
_bufferTimer?.cancel();
_bufferTimer = null;
_buffering = false;
_lastPosition = null;
_syncBufferState(notify: false);
}
}
@override
@@ -100,7 +111,11 @@ class _FeedProgressBarState extends State<_FeedProgressBar> {
final width = constraints.maxWidth;
final source = widget.controller;
final scrubbing = _dragging;
final loading = !widget.locked && !scrubbing && _buffering;
final loading =
!widget.locked &&
!widget.suppressBufferLoading &&
!scrubbing &&
_buffering;
final track = widget.locked
? _inactiveTrack()
: source == null
@@ -199,14 +214,24 @@ class _FeedProgressBarState extends State<_FeedProgressBar> {
void _syncBufferState({bool notify = true}) {
final source = widget.controller;
if (widget.locked || source == null) {
if (widget.locked || widget.suppressBufferLoading || source == null) {
_bufferTimer?.cancel();
_bufferTimer = null;
_lastPosition = null;
_setBuffering(false, notify: notify);
return;
}
final value = source.value;
if (!value.isInitialized) {
_bufferTimer?.cancel();
_bufferTimer = null;
_lastPosition = null;
_setBuffering(false, notify: notify);
return;
}
final previousPosition = _lastPosition;
_lastPosition = value.position;
if (previousPosition != null && value.position > previousPosition) {
_bufferTimer?.cancel();
_bufferTimer = null;
_setBuffering(false, notify: notify);
@@ -218,14 +243,22 @@ class _FeedProgressBarState extends State<_FeedProgressBar> {
_setBuffering(false, notify: notify);
return;
}
if (previousPosition == null &&
value.isPlaying &&
value.position > Duration.zero) {
_setBuffering(false, notify: notify);
return;
}
if (_buffering || _bufferTimer != null) return;
final bufferingPosition = value.position;
_bufferTimer = Timer(_bufferDebounce, () {
_bufferTimer = null;
final current = widget.controller;
if (!mounted ||
current != source ||
!current!.value.isInitialized ||
!current.value.isBuffering) {
!current.value.isBuffering ||
current.value.position != bufferingPosition) {
return;
}
_setBuffering(true);
@@ -337,10 +370,8 @@ class _FeedProgressBarState extends State<_FeedProgressBar> {
children: [
Align(
alignment: Alignment.centerLeft,
child: AnimatedContainer(
child: Container(
key: const Key('home-feed-progress-track'),
duration: _trackResizeDuration,
curve: Curves.easeOut,
width: width,
height: trackHeight,
color: AppColors.border,
@@ -348,10 +379,8 @@ class _FeedProgressBarState extends State<_FeedProgressBar> {
),
Align(
alignment: Alignment.centerLeft,
child: AnimatedContainer(
child: Container(
key: const Key('home-feed-progress-played'),
duration: dragging ? Duration.zero : _trackResizeDuration,
curve: Curves.easeOut,
width: playedWidth,
height: trackHeight,
color: AppColors.blue,
@@ -367,10 +396,8 @@ class _FeedProgressBarState extends State<_FeedProgressBar> {
child: SizedBox.square(
dimension: _thumbActiveSize,
child: Center(
child: AnimatedContainer(
child: Container(
key: const Key('home-feed-progress-thumb'),
duration: _trackResizeDuration,
curve: Curves.easeOut,
width: size,
height: size,
decoration: const BoxDecoration(
lib/pages/player/widgets/home_feed_recommend_panel.dart
+299 -243
View File
@@ -1,28 +1,31 @@
// Author: fruit.com.cn
import 'dart:math' as math;
import 'package:flutter/material.dart';
import 'package:intl/intl.dart';
import '../../../core/data/models/drama.dart';
import '../../../core/formatting/count_format.dart';
import '../../../core/formatting/localized_content.dart';
import '../../../core/theme/app_colors.dart';
import '../../../l10n/app_localizations.dart';
import '../../home/widgets/home_drama_classification.dart';
import 'interaction_rail.dart';
const double _seriesFont = 19;
const double _tagFont = 13;
const double _synopsisFont = 13;
const double _seriesFont = 21;
const double _tagFont = 14;
const double _synopsisFont = 15;
const double _watchAllHeight = 44;
const double _actionGap = 28;
const double _actionIcon = 32;
const double _actionWidth = 64;
const List<Shadow> _textShadows = [
Shadow(color: AppColors.shadow, blurRadius: 6, offset: Offset(0, 1)),
];
final RegExp _tagSplitter = RegExp(r'[,/、·]');
/// 通栏「观看完整剧集」半透明白底条高度，overlay 用它安排底部避让。
const double homeFeedWatchAllHeight = _watchAllHeight;
/// 播放量紧凑展示（跟随语言）：zh 20万 / en 200K / id 200 rb。
String _compactViewers(int count, Locale locale) =>
NumberFormat.compact(locale: locale.languageCode).format(count);
class HomeFeedInfoPanel extends StatefulWidget {
const HomeFeedInfoPanel({
super.key,
@@ -30,6 +33,7 @@ class HomeFeedInfoPanel extends StatefulWidget {
required this.episode,
required this.onDetail,
required this.onOpenFullPlayer,
this.onOpenSearch,
});
final Drama drama;
@@ -37,6 +41,9 @@ class HomeFeedInfoPanel extends StatefulWidget {
final VoidCallback onDetail;
final VoidCallback onOpenFullPlayer;
/// 热搜胶囊点击；为空或播放量为 0 时不显示胶囊。
final VoidCallback? onOpenSearch;
@override
State<HomeFeedInfoPanel> createState() => _HomeFeedInfoPanelState();
}
@@ -51,9 +58,22 @@ class _HomeFeedInfoPanelState extends State<HomeFeedInfoPanel> {
final synopsis = localizedDramaSynopsis(l10n, widget.drama).trim();
final genres = _genreValues(Localizations.localeOf(context).languageCode);
return Column(
key: const Key('home-feed-info-panel'),
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
if (widget.onOpenSearch != null && widget.drama.viewCount > 0) ...[
_HotSearchPill(
label: l10n.feedWatchingCount(
_compactViewers(
widget.drama.viewCount,
Localizations.localeOf(context),
),
),
onTap: widget.onOpenSearch!,
),
const SizedBox(height: 8),
],
GestureDetector(
key: const Key('home-feed-series-name'),
behavior: HitTestBehavior.opaque,
@@ -70,12 +90,12 @@ class _HomeFeedInfoPanelState extends State<HomeFeedInfoPanel> {
style: const TextStyle(
color: AppColors.textPrimary,
fontSize: _seriesFont,
fontWeight: FontWeight.w600,
fontWeight: FontWeight.w700,
shadows: _textShadows,
),
),
),
const SizedBox(width: 4),
const SizedBox(width: 2),
const Icon(
Icons.chevron_right_rounded,
size: 20,
@@ -84,119 +104,96 @@ class _HomeFeedInfoPanelState extends State<HomeFeedInfoPanel> {
],
),
),
const SizedBox(height: 8),
const SizedBox(height: 6),
_tagMetaRow(l10n, genres),
if (synopsis.isNotEmpty) ...[
const SizedBox(height: 8),
_synopsis(l10n, synopsis),
],
const SizedBox(height: 12),
_watchAll(context, l10n),
],
);
}
Widget _tagMetaRow(AppLocalizations l10n, List<String> genres) {
return Row(
final chips = <Widget>[
if (isHotDrama(widget.drama))
_TagChip(
key: const Key('home-feed-hot-badge'),
label: l10n.homeBadgeHot,
filled: true,
),
for (final genre in genres)
_TagChip(key: Key('home-feed-tag-$genre'), label: genre),
];
return SizedBox(
key: const Key('home-feed-tags'),
children: [
if (isHotDrama(widget.drama)) ...[
Container(
key: const Key('home-feed-hot-badge'),
padding: const EdgeInsets.symmetric(horizontal: 6, vertical: 2),
decoration: BoxDecoration(
color: AppColors.error,
borderRadius: BorderRadius.circular(3),
),
child: Text(
l10n.homeBadgeHot,
style: const TextStyle(
color: AppColors.textPrimary,
fontSize: 10,
fontWeight: FontWeight.w600,
),
),
),
const SizedBox(width: 8),
],
Flexible(
fit: FlexFit.loose,
child: Text(
genres.join(' '),
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: const TextStyle(
color: AppColors.overlayLabel,
fontSize: _tagFont,
),
),
),
const SizedBox(width: 8),
Flexible(
child: Text(
l10n.favoriteEpisodeProgress(
widget.episode.number,
widget.drama.episodeCount,
),
key: const Key('home-feed-episode-progress'),
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: const TextStyle(
color: AppColors.overlayLabel,
fontSize: _tagFont,
),
),
),
],
height: 25,
child: ListView.separated(
scrollDirection: Axis.horizontal,
physics: const NeverScrollableScrollPhysics(),
shrinkWrap: true,
itemCount: chips.length,
separatorBuilder: (_, _) => const SizedBox(width: 8),
itemBuilder: (_, index) => chips[index],
),
);
}
Widget _synopsis(AppLocalizations l10n, String synopsis) {
const style = TextStyle(
color: AppColors.overlaySecondary,
final prefix = l10n.feedEpisodePrefix(widget.episode.number);
final baseStyle = const TextStyle(
color: AppColors.textPrimary,
fontSize: _synopsisFont,
height: 1.35,
height: 1.3,
shadows: _textShadows,
);
final span = TextSpan(
children: [
TextSpan(
text: prefix,
style: baseStyle.copyWith(fontWeight: FontWeight.w600),
),
TextSpan(text: synopsis, style: baseStyle),
],
);
if (_synopsisExpanded) {
return _expandedSynopsis(span, baseStyle, l10n);
}
return LayoutBuilder(
builder: (context, constraints) {
final toggle = _synopsisToggle(
key: const Key('home-feed-synopsis-more'),
label: l10n.expandSynopsis,
);
final painter = TextPainter(
text: TextSpan(text: synopsis, style: style),
maxLines: 2,
text: span,
maxLines: 1,
textDirection: Directionality.of(context),
textScaler: MediaQuery.textScalerOf(context),
)..layout(maxWidth: constraints.maxWidth);
final overflows = painter.didExceedMaxLines;
if (!overflows) {
return Text(
synopsis,
if (!painter.didExceedMaxLines) {
return Text.rich(
span,
key: const Key('home-feed-synopsis'),
style: style,
maxLines: 1,
style: baseStyle,
);
}
if (_synopsisExpanded) {
return _expandedSynopsis(constraints.maxWidth, synopsis, style, l10n);
}
return Stack(
// 设计稿：单行省略号 + 行内固定「展开」。
return Row(
key: const Key('home-feed-synopsis-collapsed'),
children: [
Padding(
padding: const EdgeInsets.only(right: 40),
child: Text(
synopsis,
Expanded(
child: Text.rich(
span,
key: const Key('home-feed-synopsis'),
maxLines: 2,
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: style,
),
),
Positioned(
right: 0,
bottom: 0,
child: _synopsisToggle(
key: const Key('home-feed-synopsis-more'),
label: l10n.expandSynopsis,
style: baseStyle,
),
),
const SizedBox(width: 2),
toggle,
],
);
},
@@ -204,26 +201,28 @@ class _HomeFeedInfoPanelState extends State<HomeFeedInfoPanel> {
}
Widget _expandedSynopsis(
double maxWidth,
String synopsis,
InlineSpan span,
TextStyle style,
AppLocalizations l10n,
) {
return SizedBox(
width: maxWidth,
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
Text(synopsis, key: const Key('home-feed-synopsis'), style: style),
Align(
alignment: Alignment.centerRight,
child: _synopsisToggle(
key: const Key('home-feed-synopsis-more'),
label: l10n.showLess,
),
return Column(
key: const Key('home-feed-synopsis-expanded'),
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text.rich(
span,
key: const Key('home-feed-synopsis'),
style: style,
),
const SizedBox(height: 2),
Align(
alignment: Alignment.centerRight,
child: _synopsisToggle(
key: const Key('home-feed-synopsis-more'),
label: l10n.showLess,
),
],
),
),
],
);
}
@@ -237,54 +236,12 @@ class _HomeFeedInfoPanelState extends State<HomeFeedInfoPanel> {
color: AppColors.textPrimary,
fontSize: _synopsisFont,
fontWeight: FontWeight.w600,
shadows: _textShadows,
),
),
);
}
Widget _watchAll(BuildContext context, AppLocalizations l10n) {
final screenWidth = MediaQuery.sizeOf(context).width;
return LayoutBuilder(
builder: (context, constraints) {
final buttonWidth = math.min(screenWidth * 0.7, constraints.maxWidth);
return Align(
alignment: Alignment.centerLeft,
child: SizedBox(
width: buttonWidth,
height: _watchAllHeight,
child: DecoratedBox(
key: const Key('home-feed-full-series-bg'),
decoration: BoxDecoration(
gradient: const LinearGradient(
colors: [AppColors.actionRed, AppColors.blue],
),
borderRadius: BorderRadius.circular(8),
),
child: Material(
color: AppColors.transparent,
child: InkWell(
key: const Key('home-feed-full-series'),
onTap: widget.onOpenFullPlayer,
borderRadius: BorderRadius.circular(8),
child: Center(
child: Text(
l10n.homeWatchAll,
style: const TextStyle(
color: AppColors.textPrimary,
fontSize: 15,
fontWeight: FontWeight.w600,
),
),
),
),
),
),
),
);
},
);
}
List<String> _genreValues(String languageCode) {
final localized = widget.drama.localizedTypeLabels(languageCode);
if (localized.isNotEmpty) return localized.take(3).toList(growable: false);
@@ -300,6 +257,147 @@ class _HomeFeedInfoPanelState extends State<HomeFeedInfoPanel> {
}
}
/// 热搜榜降级胶囊：🔍 共 xxx 人在看 ›（暂无榜单接口，点击跳搜索页）。
class _HotSearchPill extends StatelessWidget {
const _HotSearchPill({required this.label, required this.onTap});
final String label;
final VoidCallback onTap;
@override
Widget build(BuildContext context) {
return GestureDetector(
key: const Key('home-feed-hot-search-pill'),
behavior: HitTestBehavior.opaque,
onTap: onTap,
child: Container(
padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 4),
decoration: BoxDecoration(
color: AppColors.textPrimary.withValues(alpha: 0.14),
borderRadius: BorderRadius.circular(6),
),
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
const Icon(
Icons.search_rounded,
size: 15,
color: AppColors.textPrimary,
),
const SizedBox(width: 5),
Text(
label,
maxLines: 1,
style: const TextStyle(
color: AppColors.textPrimary,
fontSize: 14,
fontWeight: FontWeight.w500,
),
),
const SizedBox(width: 2),
const Icon(
Icons.chevron_right_rounded,
size: 16,
color: AppColors.textPrimary,
),
],
),
),
);
}
}
/// 热剧红胶囊 / 类型深色半透明填充胶囊。
class _TagChip extends StatelessWidget {
const _TagChip({super.key, required this.label, this.filled = false});
final String label;
final bool filled;
@override
Widget build(BuildContext context) {
return Container(
padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 2),
alignment: Alignment.center,
decoration: BoxDecoration(
color: filled
? AppColors.brandRed
: AppColors.textPrimary.withValues(alpha: 0.2),
borderRadius: BorderRadius.circular(4),
),
child: Text(
label,
maxLines: 1,
style: const TextStyle(
color: AppColors.textPrimary,
fontSize: _tagFont,
fontWeight: FontWeight.w500,
height: 1.2,
shadows: _textShadows,
),
),
);
}
}
/// 底部通栏条：🎬 观看完整剧集 全 N 集。
class HomeFeedWatchAllBar extends StatelessWidget {
const HomeFeedWatchAllBar({
super.key,
required this.drama,
required this.onTap,
});
final Drama drama;
final VoidCallback onTap;
@override
Widget build(BuildContext context) {
final l10n = AppLocalizations.of(context)!;
return Material(
key: const Key('home-feed-full-series-bg'),
color: AppColors.textPrimary.withValues(alpha: 0.15),
child: InkWell(
key: const Key('home-feed-full-series'),
onTap: onTap,
child: SizedBox(
height: _watchAllHeight,
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 20),
child: Row(
children: [
const Icon(
Icons.movie_rounded,
size: 22,
color: AppColors.onPrimary,
),
const SizedBox(width: 10),
Expanded(
child: Text(
l10n.watchFullSeries('${drama.episodeCount}'),
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: const TextStyle(
color: AppColors.textPrimary,
fontSize: 15,
fontWeight: FontWeight.w500,
),
),
),
const Icon(
Icons.chevron_right_rounded,
size: 22,
color: AppColors.textPrimary,
),
],
),
),
),
),
);
}
}
class HomeFeedActionRail extends StatelessWidget {
const HomeFeedActionRail({
super.key,
@@ -307,112 +405,70 @@ class HomeFeedActionRail extends StatelessWidget {
required this.liked,
required this.onSave,
required this.onLike,
required this.onEpisodes,
required this.onComments,
required this.onShare,
this.favoriteCount,
this.likeCount,
this.commentCount,
});
final bool saved;
final bool liked;
final int? favoriteCount;
final int? likeCount;
final int? commentCount;
final VoidCallback onSave;
final VoidCallback onLike;
final VoidCallback onEpisodes;
final VoidCallback onComments;
final VoidCallback onShare;
@override
Widget build(BuildContext context) {
final l10n = AppLocalizations.of(context)!;
return SizedBox(
width: _actionWidth,
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
_action(
key: const Key('rail-save'),
icon: saved
? Icons.bookmark_rounded
: Icons.bookmark_border_rounded,
label: favoriteCount == null
? l10n.favorite
: formatInteractionCount(favoriteCount!),
labelKey: const Key('rail-save-count'),
onTap: onSave,
),
const SizedBox(height: _actionGap),
_action(
key: const Key('rail-like'),
icon: liked
? Icons.favorite_rounded
: Icons.favorite_border_rounded,
iconColor: liked
? AppColors.doubleTapHeartRed
: AppColors.textPrimary,
label: likeCount == null
? l10n.like
: formatInteractionCount(likeCount!),
labelKey: const Key('rail-like-count'),
onTap: onLike,
),
const SizedBox(height: _actionGap),
_action(
key: const Key('rail-episodes'),
icon: Icons.layers_rounded,
label: l10n.episodes,
labelKey: const Key('rail-episodes-label'),
labelFontSize: 11,
onTap: onEpisodes,
),
],
),
);
}
Widget _action({
required Key key,
required IconData icon,
required String label,
required Key labelKey,
required VoidCallback onTap,
Color iconColor = AppColors.textPrimary,
double labelFontSize = 12,
}) {
return GestureDetector(
key: key,
behavior: HitTestBehavior.opaque,
onTap: onTap,
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
Icon(
icon,
size: _actionIcon,
color: iconColor,
shadows: const [
Shadow(
color: AppColors.shadowSoft,
blurRadius: 4,
offset: Offset(0, 1),
),
],
),
const SizedBox(height: 2),
Text(
label,
key: labelKey,
maxLines: 1,
overflow: TextOverflow.ellipsis,
textAlign: TextAlign.center,
style: TextStyle(
color: AppColors.textPrimary,
fontSize: labelFontSize,
fontWeight: FontWeight.w500,
height: 1,
shadows: _textShadows,
),
),
],
),
return InteractionRail(
itemGap: 18,
buttonSize: 48,
iconSize: 36,
countFontSize: 15,
iconCountGap: 6,
items: [
InteractionRailItem(
key: const Key('rail-save'),
asset: 'assets/icon/rail/rail_save.png',
label: l10n.favorite,
count: favoriteCount,
countKey: const Key('rail-save-count'),
selected: saved,
selectedColor: AppColors.brandRed,
onTap: onSave,
),
InteractionRailItem(
key: const Key('rail-comments'),
asset: 'assets/icon/rail/rail_comment.png',
label: l10n.comments,
count: commentCount,
countKey: const Key('rail-comments-count'),
onTap: onComments,
),
InteractionRailItem(
key: const Key('rail-like'),
asset: 'assets/icon/rail/rail_like.png',
label: l10n.like,
count: likeCount,
countKey: const Key('rail-like-count'),
selected: liked,
selectedColor: AppColors.brandRed,
onTap: onLike,
),
InteractionRailItem(
key: const Key('rail-share'),
icon: Icons.reply_rounded,
mirrorIcon: true,
label: l10n.share,
countKey: const Key('rail-share-label'),
onTap: onShare,
),
],
);
}
}
lib/pages/player/widgets/interaction_rail.dart
+68 -23
View File
@@ -5,38 +5,59 @@ import 'package:flutter/material.dart';
import '../../../core/formatting/count_format.dart';
import '../../../core/theme/app_colors.dart';
const double _buttonSize = 44;
const double _iconSize = 32;
const double _itemGap = 24;
const double _defaultButtonSize = 44;
const double _defaultIconSize = 32;
const double _defaultCountFont = 12;
const double _defaultIconCountGap = 2;
const double _defaultItemGap = 24;
/// 互动栏单项：图标、计数与点击。
class InteractionRailItem {
const InteractionRailItem({
required this.key,
required this.asset,
required this.label,
required this.onTap,
this.asset,
this.icon,
this.count,
this.countKey,
this.selected = false,
this.selectedColor = AppColors.blue,
});
this.mirrorIcon = false,
}) : assert((asset == null) != (icon == null));
final Key key;
final String asset;
final String? asset;
final IconData? icon;
final String label;
final VoidCallback onTap;
final int? count;
final Key? countKey;
final bool selected;
final Color selectedColor;
/// 水平镜像图标（分享弯箭头用 reply 镜像得到）。
final bool mirrorIcon;
}
/// 播放页与首页 feed 共用的右侧互动栏：收藏/评论/喜欢/分享。
class InteractionRail extends StatelessWidget {
const InteractionRail({super.key, required this.items});
const InteractionRail({
super.key,
required this.items,
this.itemGap = _defaultItemGap,
this.buttonSize = _defaultButtonSize,
this.iconSize = _defaultIconSize,
this.countFontSize = _defaultCountFont,
this.iconCountGap = _defaultIconCountGap,
});
final List<InteractionRailItem> items;
final double itemGap;
final double buttonSize;
final double iconSize;
final double countFontSize;
final double iconCountGap;
@override
Widget build(BuildContext context) {
@@ -44,8 +65,14 @@ class InteractionRail extends StatelessWidget {
mainAxisSize: MainAxisSize.min,
children: [
for (var index = 0; index < items.length; index++) ...[
if (index > 0) const SizedBox(height: _itemGap),
_RailButton(item: items[index]),
if (index > 0) SizedBox(height: itemGap),
_RailButton(
item: items[index],
buttonSize: buttonSize,
iconSize: iconSize,
countFontSize: countFontSize,
iconCountGap: iconCountGap,
),
],
],
);
@@ -53,43 +80,61 @@ class InteractionRail extends StatelessWidget {
}
class _RailButton extends StatelessWidget {
const _RailButton({required this.item});
const _RailButton({
required this.item,
required this.buttonSize,
required this.iconSize,
required this.countFontSize,
required this.iconCountGap,
});
final InteractionRailItem item;
final double buttonSize;
final double iconSize;
final double countFontSize;
final double iconCountGap;
@override
Widget build(BuildContext context) {
final tint = item.selected ? item.selectedColor : AppColors.onPrimary;
return Column(
key: item.key,
mainAxisSize: MainAxisSize.min,
children: [
SizedBox.square(
dimension: _buttonSize,
dimension: buttonSize,
child: IconButton(
onPressed: item.onTap,
padding: EdgeInsets.zero,
icon: Image.asset(
item.asset,
width: _iconSize,
height: _iconSize,
fit: BoxFit.contain,
color: item.selected ? item.selectedColor : AppColors.onPrimary,
colorBlendMode: BlendMode.srcIn,
),
icon: item.asset != null
? Image.asset(
item.asset!,
width: iconSize,
height: iconSize,
fit: BoxFit.contain,
color: tint,
colorBlendMode: BlendMode.srcIn,
)
: Transform.flip(
flipX: item.mirrorIcon,
child: Icon(item.icon, size: iconSize, color: tint),
),
),
),
const SizedBox(height: 2),
SizedBox(height: iconCountGap),
Text(
item.count == null ? item.label : formatInteractionCount(item.count!),
key: item.countKey,
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: const TextStyle(
style: TextStyle(
color: AppColors.onPrimary,
height: 1,
fontSize: 12,
fontSize: countFontSize,
fontWeight: FontWeight.w600,
shadows: [Shadow(blurRadius: 6, color: AppColors.mediaBlack)],
shadows: const [
Shadow(blurRadius: 6, color: AppColors.mediaBlack),
],
),
),
],
lib/pages/player/widgets/player_overlay.dart
+11 -8
View File
@@ -37,6 +37,7 @@ class PlayerPlaybackOverlay extends StatelessWidget {
required this.actions,
required this.controlsVisible,
required this.scrubbing,
this.suppressProgressLoading = false,
});
/// 展示数据。
@@ -50,6 +51,7 @@ class PlayerPlaybackOverlay extends StatelessWidget {
/// 正在拖动进度条。拖动期间清屏，只留进度条。
final bool scrubbing;
final bool suppressProgressLoading;
@override
Widget build(BuildContext context) {
@@ -176,14 +178,6 @@ class PlayerPlaybackOverlay extends StatelessWidget {
selected: data.saved,
onTap: actions.onSave,
),
InteractionRailItem(
key: const Key('player-rail-comments'),
asset: 'assets/icon/rail/rail_comment.png',
label: data.l10n.comments,
count: data.commentCount,
countKey: const Key('player-rail-comments-count'),
onTap: actions.onComments,
),
InteractionRailItem(
key: const Key('player-rail-like'),
asset: 'assets/icon/rail/rail_like.png',
@@ -194,6 +188,14 @@ class PlayerPlaybackOverlay extends StatelessWidget {
selectedColor: AppColors.doubleTapHeartRed,
onTap: actions.onLike,
),
InteractionRailItem(
key: const Key('player-rail-comments'),
asset: 'assets/icon/rail/rail_comment.png',
label: data.l10n.comments,
count: data.commentCount,
countKey: const Key('player-rail-comments-count'),
onTap: actions.onComments,
),
InteractionRailItem(
key: const Key('player-rail-share'),
asset: 'assets/icon/rail/rail_share.png',
@@ -306,6 +308,7 @@ class PlayerPlaybackOverlay extends StatelessWidget {
episodeId: data.episode.id,
inactiveTrackColor: AppColors.inactiveTrack,
fallbackDuration: Duration(seconds: data.episode.durationSec),
suppressBufferLoading: suppressProgressLoading,
onScrubStart: actions.onScrubStart,
onScrubEnd: actions.onScrubEnd,
onSeek: actions.onSeek,
lib/pages/player/widgets/player_unlock_sheet.dart
+2 -1
View File
@@ -49,7 +49,8 @@ class PlayerBlockedNotice extends StatelessWidget {
bool get _needsUnlock =>
accessType == PlayTicket.coinRequired ||
accessType == PlayTicket.vipRequired;
accessType == PlayTicket.vipRequired ||
(accessType == null && episode.locked);
@override
Widget build(BuildContext context) {
lib/pages/player/widgets/seek_progress_bar.dart
+41 -18
View File
@@ -43,6 +43,7 @@ class SeekProgressBar extends StatefulWidget {
this.episodeId,
this.thumbnailsUrl,
this.fallbackDuration = Duration.zero,
this.suppressBufferLoading = false,
});
final ValueListenable<VideoPlayerValue>? valueListenable;
@@ -59,6 +60,7 @@ class SeekProgressBar extends StatefulWidget {
final String? episodeId;
final String? thumbnailsUrl;
final Duration fallbackDuration;
final bool suppressBufferLoading;
@override
State<SeekProgressBar> createState() => _SeekProgressBarState();
@@ -74,6 +76,7 @@ class _SeekProgressBarState extends State<SeekProgressBar> {
bool _pointerMoved = false;
Offset? _pointerStart;
double? _dragStartFraction;
Duration? _lastPosition;
@override
void initState() {
@@ -90,13 +93,22 @@ class _SeekProgressBarState extends State<SeekProgressBar> {
_bufferTimer?.cancel();
_bufferTimer = null;
_buffering = false;
_lastPosition = null;
widget.thumbnailService?.cancelPending();
_attachSource();
}
if (oldWidget.suppressBufferLoading != widget.suppressBufferLoading) {
_bufferTimer?.cancel();
_bufferTimer = null;
_lastPosition = null;
_buffering = false;
_syncBufferState(notify: false);
}
if (oldWidget.locked != widget.locked) {
_bufferTimer?.cancel();
_bufferTimer = null;
_buffering = false;
_lastPosition = null;
if (widget.locked) {
widget.thumbnailService?.cancelPending();
_previewFraction.value = null;
@@ -130,14 +142,24 @@ class _SeekProgressBarState extends State<SeekProgressBar> {
void _syncBufferState({bool notify = true}) {
final source = widget.valueListenable;
if (widget.locked || source == null) {
if (widget.locked || widget.suppressBufferLoading || source == null) {
_bufferTimer?.cancel();
_bufferTimer = null;
_lastPosition = null;
_setBuffering(false, notify: notify);
return;
}
final value = source.value;
if (!value.isInitialized) {
_bufferTimer?.cancel();
_bufferTimer = null;
_lastPosition = null;
_setBuffering(false, notify: notify);
return;
}
final previousPosition = _lastPosition;
_lastPosition = value.position;
if (previousPosition != null && value.position > previousPosition) {
_bufferTimer?.cancel();
_bufferTimer = null;
_setBuffering(false, notify: notify);
@@ -149,14 +171,24 @@ class _SeekProgressBarState extends State<SeekProgressBar> {
_setBuffering(false, notify: notify);
return;
}
// 首次看到“已播放且有画面”的 buffering 状态时，以 position 为基线，
// 不抢先显示 loading；后续 position 停滞超过阈值才视为真实卡顿。
if (previousPosition == null &&
value.isPlaying &&
value.position > Duration.zero) {
_setBuffering(false, notify: notify);
return;
}
if (_buffering || _bufferTimer != null) return;
final bufferingPosition = value.position;
_bufferTimer = Timer(_bufferDebounce, () {
_bufferTimer = null;
final current = widget.valueListenable;
if (!mounted ||
current != source ||
!current!.value.isInitialized ||
!current.value.isBuffering) {
!current.value.isBuffering ||
current.value.position != bufferingPosition) {
return;
}
_setBuffering(true);
@@ -227,7 +259,11 @@ class _SeekProgressBarState extends State<SeekProgressBar> {
: widget.fallbackDuration;
final total = duration.inMilliseconds;
final scrubbing = _dragging;
final loading = !widget.locked && !scrubbing && _buffering;
final loading =
!widget.locked &&
!widget.suppressBufferLoading &&
!scrubbing &&
_buffering;
final enabled =
!widget.locked &&
video.isInitialized &&
@@ -243,6 +279,8 @@ class _SeekProgressBarState extends State<SeekProgressBar> {
final showPreview =
scrubbing &&
widget.showTimes &&
video.isInitialized &&
total > 0 &&
widget.thumbnailService != null &&
(widget.episodeId?.isNotEmpty ?? false);
final trackHeight = scrubbing ? 6.0 : 2.0;
@@ -253,21 +291,6 @@ class _SeekProgressBarState extends State<SeekProgressBar> {
final track = Column(
mainAxisSize: MainAxisSize.min,
children: [
if (widget.showTimes && !video.isInitialized)
Padding(
padding: const EdgeInsets.only(bottom: 2),
child: Text(
'00:00 / ${_format(duration)}',
key: const Key('player-progress-uninitialized-time'),
textAlign: TextAlign.center,
style: const TextStyle(
color: AppColors.onPrimary,
fontSize: 12,
fontWeight: FontWeight.w600,
height: 1.2,
),
),
),
if (widget.showTimes && scrubbing && !showPreview)
Padding(
padding: const EdgeInsets.only(bottom: 2),
lib/pages/ranking/ranking_page.dart
+7 -5
View File
@@ -509,11 +509,13 @@ Widget _heat(int count, AppLocalizations l10n) {
size: 11,
),
const SizedBox(width: 4),
Text(
l10n.heatLabel(formatPlayCount(count)),
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: const TextStyle(color: AppColors.textTertiary, fontSize: 11),
Flexible(
child: Text(
l10n.heatLabel(formatPlayCount(count)),
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: const TextStyle(color: AppColors.textTertiary, fontSize: 11),
),
),
],
);
lib/pages/recommend/recommend_discover_page.dart
+477
View File
@@ -0,0 +1,477 @@
// Author: fruit.com.cn
import 'dart:async';
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import '../../core/data/models/drama.dart';
import '../../core/data/models/home_feed.dart';
import '../../core/data/remote/catalog_api.dart';
import '../../core/data/services/category_controller.dart';
import '../../core/theme/app_colors.dart';
import '../../core/widgets/app_pull_to_refresh.dart';
import '../../core/widgets/empty_state.dart';
import '../../core/widgets/paged_list_footer.dart';
import '../../l10n/app_localizations.dart';
import '../player/open_player.dart';
import 'widgets/home_hero_carousel.dart';
import 'widgets/home_recommend_content.dart';
import 'widgets/recommend_channel_nav.dart';
/// 底部第二个 tab「推荐」（礼花）。
///
/// 频道全部来自分类接口；内容区是一个横向 [PageView]，左右滑动即可切换频道，
/// 顶部频道导航随之高亮，并把选中频道滚动到可见区域。
/// 第一个频道（接口的「精选」）在网格顶部额外挂一张 banners 轮播图，
/// 轮播数据来自 `GET /app/home/feed`。
class RecommendDiscoverPage extends StatefulWidget {
const RecommendDiscoverPage({
super.key,
required this.active,
required this.onSearch,
this.onOpenWallet,
});
final bool active;
final VoidCallback onSearch;
/// 顶部金色礼物盒（钱包入口）。
final VoidCallback? onOpenWallet;
@override
State<RecommendDiscoverPage> createState() => _RecommendDiscoverPageState();
}
class _RecommendDiscoverPageState extends State<RecommendDiscoverPage>
with AutomaticKeepAliveClientMixin<RecommendDiscoverPage> {
/// 当前频道 id；频道全部来自分类接口，首项即「精选」。
String? _channelId;
final Set<String> _requestedCategories = {};
final PageController _pageController = PageController();
/// `GET /app/home/feed` 返回的轮播图，只挂在第一个「精选」频道。
List<FeedBanner> _banners = const [];
bool _bannersRequested = false;
@override
bool get wantKeepAlive => true;
@override
void initState() {
super.initState();
WidgetsBinding.instance.addPostFrameCallback((_) => _loadBanners());
}
@override
void dispose() {
_pageController.dispose();
super.dispose();
}
/// 点击顶部频道：更新高亮并让 PageView 滑到对应页。
void _selectChannel(String id, int index) {
if (id == _channelId && _pageController.hasClients) {
// 已在该页时仍允许回到顶部对齐。
return;
}
setState(() => _channelId = id);
_ensureCategory(id);
if (_pageController.hasClients) {
unawaited(
_pageController.animateToPage(
index,
duration: const Duration(milliseconds: 300),
curve: Curves.easeOut,
),
);
}
}
/// 左右滑动翻页：更新高亮（不反向驱动 PageView）。
void _onPageChanged(int index, List<String> orderedIds) {
if (index < 0 || index >= orderedIds.length) return;
final id = orderedIds[index];
if (id != _channelId) setState(() => _channelId = id);
_ensureCategory(id);
}
void _ensureCategory(String id) {
if (_requestedCategories.contains(id)) return;
_requestedCategories.add(id);
final categories = context.read<CategoryController>();
if (categories.dramaPageLoader == null) return;
final slot = categories.slotOf(id);
if (slot.dramas.isNotEmpty || slot.loading) return;
WidgetsBinding.instance.addPostFrameCallback((_) {
if (mounted) unawaited(categories.openCategory(id));
});
}
/// 下拉刷新：重拉该分类第一页；精选频道同时刷新轮播图。
Future<void> _refreshCategory(String id, bool isFeatured) async {
final categories = context.read<CategoryController>();
final tasks = <Future<void>>[categories.openCategory(id)];
if (isFeatured) tasks.add(_loadBanners(force: true));
await Future.wait(tasks);
}
/// 轮播图只依赖 home/feed 的 banners；接口缺失（如测试注入）时静默跳过，
/// 不影响下方分类网格。
Future<void> _loadBanners({bool force = false}) async {
if (_bannersRequested && !force) return;
_bannersRequested = true;
CatalogApi? api;
try {
api = context.read<CatalogApi>();
} on ProviderNotFoundException {
api = null;
}
if (api == null) return;
try {
final feed = await api.homeFeed();
if (mounted && feed.banners.isNotEmpty) {
setState(() => _banners = feed.banners);
}
} catch (_) {
// 轮播拉取失败时保留纯网格。
}
}
Future<void> _openDrama(Drama drama) =>
playDramaFromCatalog(context, drama);
@override
Widget build(BuildContext context) {
super.build(context);
final categories = context.watch<CategoryController>();
final mediaTop = MediaQuery.of(context).padding.top;
final categoryList = categories.categories;
final orderedIds = categoryList.map((c) => c.id).toList();
// 频道来自接口分类；默认选中第一个分类（即「精选」）。
_channelId ??= categoryList.isEmpty ? null : categoryList.first.id;
final selectedIndex = _channelId == null
? 0
: orderedIds.indexOf(_channelId!).clamp(0, orderedIds.length - 1);
return ColoredBox(
key: const Key('recommend-page'),
color: AppColors.appBackground,
child: Stack(
children: [
Positioned.fill(
child: categoryList.isEmpty
? const Center(
child: CircularProgressIndicator(
color: AppColors.brandRed,
),
)
: PageView.builder(
key: const Key('recommend-channel-pager'),
controller: _pageController,
itemCount: categoryList.length,
onPageChanged: (i) => _onPageChanged(i, orderedIds),
itemBuilder: (context, index) {
final category = categoryList[index];
return _ChannelFeed(
key: PageStorageKey<String>(
'recommend-channel-${category.id}',
),
categoryId: category.id,
isFeatured: index == 0,
banners: _banners,
carouselActive: widget.active && index == selectedIndex,
mediaTop: mediaTop,
onRequest: _ensureCategory,
onRefresh: () => _refreshCategory(category.id, index == 0),
onOpenDrama: _openDrama,
);
},
),
),
Positioned(
top: 0,
left: 0,
right: 0,
child: IgnorePointer(
child: SizedBox(
height: mediaTop + RecommendChannelNav.height,
child: const DecoratedBox(
key: Key('recommend-top-gradient'),
decoration: BoxDecoration(
gradient: LinearGradient(
begin: Alignment.topCenter,
end: Alignment.bottomCenter,
colors: [AppColors.mediaBlack, AppColors.transparent],
),
),
),
),
),
),
Positioned(
top: 0,
left: 0,
right: 0,
child: SafeArea(
bottom: false,
child: RecommendChannelNav(
categories: categoryList,
selectedId: _channelId,
onSelected: (id) {
final index = orderedIds.indexOf(id);
if (index >= 0) _selectChannel(id, index);
},
onSearch: widget.onSearch,
onGift: widget.onOpenWallet,
),
),
),
],
),
);
}
}
/// 单个分类频道的内容：可选顶部轮播 + 该分类短剧三列网格。
class _ChannelFeed extends StatefulWidget {
const _ChannelFeed({
super.key,
required this.categoryId,
required this.isFeatured,
required this.banners,
required this.carouselActive,
required this.mediaTop,
required this.onRequest,
required this.onRefresh,
required this.onOpenDrama,
});
final String categoryId;
final bool isFeatured;
final List<FeedBanner> banners;
final bool carouselActive;
final double mediaTop;
final ValueChanged<String> onRequest;
final Future<void> Function() onRefresh;
final ValueChanged<Drama> onOpenDrama;
@override
State<_ChannelFeed> createState() => _ChannelFeedState();
}
class _ChannelFeedState extends State<_ChannelFeed>
with AutomaticKeepAliveClientMixin {
@override
bool get wantKeepAlive => true;
@override
void initState() {
super.initState();
widget.onRequest(widget.categoryId);
}
Drama? _dramaForBanner(FeedBanner banner, List<Drama> pool) {
final id = banner.dramaId;
if (id == null) return null;
for (final drama in pool) {
if (drama.id == id) return drama;
}
return null;
}
@override
Widget build(BuildContext context) {
super.build(context);
final categories = context.watch<CategoryController>();
final slot = categories.slotOf(widget.categoryId);
final dramas = slot.dramas;
final showCarousel = widget.isFeatured && widget.banners.isNotEmpty;
final bottomInset = MediaQuery.of(context).padding.bottom;
// 精选频道：按接口下发的标签（tag）把「上新」筛出来横滑，其余短剧一行两个。
List<Drama> newArrivals = const [];
List<Drama> rest = dramas;
if (widget.isFeatured && dramas.isNotEmpty) {
final lang = Localizations.localeOf(context).languageCode;
final badge = AppLocalizations.of(context)!.newArrivalBadge;
newArrivals = dramas
.where((drama) => _isNewArrivalTag(drama, lang, badge))
.toList(growable: false);
if (newArrivals.isNotEmpty) {
final newIds = newArrivals.map((drama) => drama.id).toSet();
rest = dramas
.where((drama) => !newIds.contains(drama.id))
.toList(growable: false);
}
}
final sliverList = <Widget>[];
if (showCarousel) {
sliverList.add(
SliverToBoxAdapter(
child: HomeHeroCarousel(
banners: widget.banners,
active: widget.carouselActive,
dramaFor: (banner) => _dramaForBanner(banner, dramas),
onWatch: widget.onOpenDrama,
),
),
);
}
if (dramas.isEmpty) {
sliverList.add(
SliverFillRemaining(
hasScrollBody: false,
child: Padding(
padding: EdgeInsets.only(
top: showCarousel ? 0 : widget.mediaTop + RecommendChannelNav.height,
),
child: Center(child: _placeholder(slot.loading)),
),
),
);
} else if (widget.isFeatured) {
// 无轮播图时内容需避开顶部悬浮导航。
final contentTop =
showCarousel ? 24.0 : widget.mediaTop + RecommendChannelNav.height + 16;
if (newArrivals.isNotEmpty) {
sliverList.add(
SliverToBoxAdapter(child: SizedBox(height: contentTop)),
);
sliverList.add(
SliverToBoxAdapter(
child: HomeNewArrivalRow(
dramas: newArrivals,
onOpen: widget.onOpenDrama,
),
),
);
sliverList.add(
const SliverToBoxAdapter(child: SizedBox(height: 28)),
);
}
sliverList.add(
_gridSliver(
rest,
topPadding: newArrivals.isNotEmpty ? 0 : contentTop,
crossAxisCount: 2,
),
);
} else {
sliverList.add(
_gridSliver(
dramas,
topPadding: showCarousel ? 20 : widget.mediaTop + RecommendChannelNav.height + 16,
crossAxisCount: 3,
),
);
}
sliverList.add(
SliverToBoxAdapter(
child: Padding(
padding: EdgeInsets.only(bottom: bottomInset),
child: PagedListFooter(
key: const Key('recommend-category-footer'),
loading: slot.loadingMore,
hasMore: slot.hasMore,
hasItems: dramas.isNotEmpty,
errorMessage: null,
onRetry: () => categories.loadMore(widget.categoryId),
),
),
),
);
return NotificationListener<ScrollNotification>(
onNotification: (notification) {
if (notification.depth != 0) return false;
if (notification.metrics.extentAfter > 300) return false;
if (notification is! ScrollUpdateNotification &&
notification is! ScrollEndNotification &&
notification is! OverscrollNotification) {
return false;
}
unawaited(categories.loadMore(widget.categoryId));
return false;
},
child: AppPullToRefresh(
onRefresh: widget.onRefresh,
child: CustomScrollView(
key: PageStorageKey<String>('recommend-feed-${widget.categoryId}'),
physics: AppPullToRefresh.physics,
slivers: sliverList,
),
),
);
}
Widget _placeholder(bool loading) {
if (loading) {
return const CircularProgressIndicator(color: AppColors.brandRed);
}
final l10n = AppLocalizations.of(context)!;
return EmptyState(
key: const Key('recommend-category-empty'),
icon: Icons.movie_outlined,
title: l10n.noStories,
);
}
Widget _gridSliver(
List<Drama> dramas, {
required double topPadding,
required int crossAxisCount,
}) {
const pageSide = 14.0;
const cardGap = 9.0;
const rowGap = 16.0;
const cardBodyExtent = 44.0; // 封面下间距 + 剧名行 + 集数行
// 两列时卡更大，卡间距略放宽。
final spacing = crossAxisCount == 2 ? 12.0 : cardGap;
return SliverPadding(
padding: EdgeInsets.fromLTRB(pageSide, topPadding, pageSide, 0),
sliver: SliverLayoutBuilder(
builder: (context, constraints) {
final itemWidth =
(constraints.crossAxisExtent - spacing * (crossAxisCount - 1)) /
crossAxisCount;
final itemExtent = itemWidth * 157 / 110 + cardBodyExtent;
return SliverGrid(
key: Key('recommend-category-grid-${widget.categoryId}'),
gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
crossAxisCount: crossAxisCount,
crossAxisSpacing: spacing,
mainAxisSpacing: rowGap,
mainAxisExtent: itemExtent,
),
delegate: SliverChildBuilderDelegate(
(context, index) {
final drama = dramas[index];
return HomePosterCard(
key: Key('recommend-category-card-${drama.id}'),
drama: drama,
onTap: () => widget.onOpenDrama(drama),
);
},
childCount: dramas.length,
),
);
},
),
);
}
}
/// 判定接口下发的短剧标签是否为「上新」。
///
/// 完全以后端返回的 `tag` / `tagLocales`（经 [Drama.localizedTag] 本地化）
/// 为准；兼容「上新 / NEW / BARU」三种文案，并兼容「本周上新」这类带前后缀的写法。
bool _isNewArrivalTag(Drama drama, String lang, String localizedBadge) {
final tag = drama.localizedTag(lang).trim();
if (tag.isEmpty) return false;
if (tag == localizedBadge) return true;
final lower = tag.toLowerCase();
return tag.contains('上新') || lower == 'new' || lower == 'baru';
}
lib/pages/recommend/recommend_page.dart
+161 -32
View File
@@ -14,6 +14,7 @@ import '../../core/data/services/playlist_controller.dart';
import '../../core/theme/app_colors.dart';
import '../../core/widgets/empty_state.dart';
import '../../l10n/app_localizations.dart';
import '../home/home_feed_channel.dart';
import '../player/open_player.dart';
import '../player/player_view.dart';
import 'recommend_types.dart';
@@ -29,6 +30,7 @@ class RecommendPage extends StatefulWidget {
this.catalogApi,
required this.active,
required this.onSearch,
this.onOpenWallet,
this.videoOnly = false,
this.onImmersiveChanged,
});
@@ -38,6 +40,9 @@ class RecommendPage extends StatefulWidget {
final bool active;
final VoidCallback onSearch;
/// 顶部金色礼物盒（钱包入口）。
final VoidCallback? onOpenWallet;
/// 画中画时只留视频，不画顶栏。
final bool videoOnly;
final ValueChanged<bool>? onImmersiveChanged;
@@ -48,9 +53,17 @@ class RecommendPage extends StatefulWidget {
class _RecommendPageState extends State<RecommendPage>
with AutomaticKeepAliveClientMixin<RecommendPage> {
static const Duration _recommendRetryDelay = Duration(milliseconds: 1500);
static const int _maxRecommendRetries = 3;
RecommendInnerTab _tab = RecommendInnerTab.feed;
final PageController _pageController = PageController();
int _scrubCancelRequest = 0;
bool _recommendDataRefreshScheduled = false;
bool _recommendRefreshInFlight = false;
int _recommendRetryAttempts = 0;
Timer? _recommendRetryTimer;
HomeFeedChannel? _observedFeedChannel;
@override
bool get wantKeepAlive => true;
@@ -58,22 +71,82 @@ class _RecommendPageState extends State<RecommendPage>
@override
void initState() {
super.initState();
_observedFeedChannel = widget.feedController.channel;
widget.feedController.addListener(_handleFeedControllerChanged);
if (widget.active) _scheduleRecommendData();
}
@override
void didUpdateWidget(RecommendPage oldWidget) {
super.didUpdateWidget(oldWidget);
if (widget.active && !oldWidget.active) _scheduleRecommendData();
if (oldWidget.feedController != widget.feedController) {
oldWidget.feedController.removeListener(_handleFeedControllerChanged);
_cancelRecommendRetries();
_observedFeedChannel = widget.feedController.channel;
widget.feedController.addListener(_handleFeedControllerChanged);
}
if (oldWidget.active && !widget.active) {
_cancelRecommendRetries();
}
if (_requiresRecommendDataRefresh(oldWidget)) {
_scheduleRecommendData();
}
}
bool _requiresRecommendDataRefresh(RecommendPage oldWidget) {
if (!widget.active) return false;
return !oldWidget.active ||
oldWidget.feedController != widget.feedController ||
oldWidget.catalogApi != widget.catalogApi;
}
void _handleFeedControllerChanged() {
final channel = widget.feedController.channel;
if (channel != _observedFeedChannel) {
_observedFeedChannel = channel;
_cancelRecommendRetries();
if (widget.active) _scheduleRecommendData();
return;
}
_handleRecommendFeedState();
}
void _handleRecommendFeedState() {
if (!mounted || !widget.active) return;
final feed = widget.feedController;
if (feed.dramas.isNotEmpty) {
_cancelRecommendRetries();
return;
}
if (feed.loaded &&
feed.lastError == null &&
!feed.isLoading &&
!_recommendRefreshInFlight) {
_cancelRecommendRetries();
return;
}
if (feed.loaded && feed.lastError != null && !_recommendRefreshInFlight) {
_scheduleRecommendRetry();
}
}
void _scheduleRecommendData() {
final feed = widget.feedController;
if (!feed.loaded && !feed.loadingFirstPage) {
unawaited(feed.refreshCurrent());
}
if (_recommendDataRefreshScheduled) return;
_recommendDataRefreshScheduled = true;
WidgetsBinding.instance.addPostFrameCallback((_) {
_recommendDataRefreshScheduled = false;
if (!mounted || !widget.active) return;
final feed = widget.feedController;
if (feed.dramas.isEmpty || feed.lastError != null) {
_recommendRetryAttempts = 0;
if (!feed.isLoading && !_recommendRefreshInFlight) {
if (feed.loaded) {
_scheduleRecommendRetry();
} else {
unawaited(_refreshRecommendData());
}
}
}
final playlists = _readPlaylists();
if (playlists != null && !playlists.loaded && !playlists.loading) {
unawaited(playlists.load());
@@ -81,8 +154,51 @@ class _RecommendPageState extends State<RecommendPage>
});
}
void _scheduleRecommendRetry() {
if (!mounted ||
!widget.active ||
_recommendRefreshInFlight ||
_recommendRetryTimer != null ||
_recommendRetryAttempts >= _maxRecommendRetries) {
return;
}
setState(() {
_recommendRetryTimer = Timer(_recommendRetryDelay, () {
_recommendRetryTimer = null;
if (!mounted || !widget.active) return;
_recommendRetryAttempts += 1;
unawaited(_refreshRecommendData());
});
});
}
Future<void> _refreshRecommendData() async {
if (!mounted || !widget.active || _recommendRefreshInFlight) return;
setState(() => _recommendRefreshInFlight = true);
final succeeded = await widget.feedController.refreshCurrent();
if (!mounted) return;
_recommendRefreshInFlight = false;
if (!widget.active) return;
final feed = widget.feedController;
if (succeeded || (feed.loaded && feed.lastError == null)) {
_cancelRecommendRetries();
setState(() {});
return;
}
setState(() {});
_scheduleRecommendRetry();
}
void _cancelRecommendRetries() {
_recommendRetryTimer?.cancel();
_recommendRetryTimer = null;
_recommendRetryAttempts = 0;
}
@override
void dispose() {
widget.feedController.removeListener(_handleFeedControllerChanged);
_cancelRecommendRetries();
_pageController.dispose();
super.dispose();
}
@@ -160,6 +276,7 @@ class _RecommendPageState extends State<RecommendPage>
onVideo: _tab == RecommendInnerTab.feed,
onSelected: _selectTab,
onSearch: _handleSearch,
onGift: widget.onOpenWallet,
),
),
),
@@ -169,39 +286,51 @@ class _RecommendPageState extends State<RecommendPage>
}
Widget _recommendFeed(BuildContext context) {
final feed = widget.feedController;
final dramas = widget.feedController.dramas;
if (dramas.isEmpty) {
final l10n = AppLocalizations.of(context)!;
if (widget.feedController.loadingFirstPage) {
return const _RecommendFeedSkeleton();
}
if (dramas.isNotEmpty) {
return PlayerPage(
key: const Key('recommend-feed-player'),
homeMode: true,
embedded: true,
active: widget.active && _tab == RecommendInnerTab.feed,
showHomeFeedHeader: false,
drama: dramas.first,
initialIndex: 0,
feedDramas: dramas,
feedChannel: widget.feedController.channel,
onOpenFullPlayer: (drama, episode) =>
_openDrama(drama, episodeId: episode.id),
onRefreshFeed: widget.feedController.refreshCurrent,
onLoadMore: widget.feedController.loadMore,
onImmersiveChanged: widget.onImmersiveChanged,
scrubCancelRequest: _scrubCancelRequest,
);
}
if (!feed.loaded ||
feed.isLoading ||
_recommendRefreshInFlight ||
_recommendRetryTimer != null) {
return const _RecommendFeedSkeleton();
}
final l10n = AppLocalizations.of(context)!;
if (feed.lastError != null) {
return ColoredBox(
color: AppColors.mediaBlack,
child: EmptyState(
key: const Key('recommend-feed-empty'),
icon: Icons.movie_outlined,
title: l10n.noStories,
actionLabel: l10n.retry,
onAction: () => unawaited(widget.feedController.refreshCurrent()),
icon: Icons.wifi_off_rounded,
title: l10n.networkError,
),
);
}
return PlayerPage(
key: const Key('recommend-feed-player'),
homeMode: true,
embedded: true,
active: widget.active && _tab == RecommendInnerTab.feed,
showHomeFeedHeader: false,
drama: dramas.first,
initialIndex: 0,
feedDramas: dramas,
feedChannel: widget.feedController.channel,
onOpenFullPlayer: (drama, episode) =>
_openDrama(drama, episodeId: episode.id),
onRefreshFeed: widget.feedController.refreshCurrent,
onLoadMore: widget.feedController.loadMore,
onImmersiveChanged: widget.onImmersiveChanged,
scrubCancelRequest: _scrubCancelRequest,
return ColoredBox(
color: AppColors.mediaBlack,
child: EmptyState(
key: const Key('recommend-feed-empty'),
icon: Icons.movie_outlined,
title: l10n.noStories,
),
);
}
@@ -396,7 +525,7 @@ class _RecommendFeedSkeleton extends StatelessWidget {
height: 176,
child: DecoratedBox(
decoration: BoxDecoration(
color: AppColors.skeletonSurface,
color: AppColors.skeletonMedia,
borderRadius: BorderRadius.all(Radius.circular(12)),
),
),
@@ -435,7 +564,7 @@ class _SkeletonLine extends StatelessWidget {
width: width,
height: height,
decoration: BoxDecoration(
color: AppColors.skeletonSurface,
color: AppColors.skeletonMedia,
borderRadius: BorderRadius.circular(6),
),
);
lib/pages/recommend/widgets/home_hero_carousel.dart
+396
View File
@@ -0,0 +1,396 @@
// Author: fruit.com.cn
import 'dart:async';
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import '../../../core/data/models/drama.dart';
import '../../../core/data/models/home_feed.dart';
import '../../../core/data/services/favorite_controller.dart';
import '../../../core/theme/app_colors.dart';
import '../../../core/widgets/remote_image.dart';
import '../../../l10n/app_localizations.dart';
/// 推荐页顶部静态头图轮播：封面 + 居中剧名/简介 + 立即观看/收藏 + 轮播点。
class HomeHeroCarousel extends StatefulWidget {
const HomeHeroCarousel({
super.key,
required this.banners,
required this.dramaFor,
required this.onWatch,
this.active = true,
});
final List<FeedBanner> banners;
/// 按 banner 关联到的剧目；为空时只展示头图。
final Drama? Function(FeedBanner banner) dramaFor;
/// 点击「立即观看」或直接点按头图。
final ValueChanged<Drama> onWatch;
final bool active;
/// 固定轮播高度；后台按该比例（屏宽 : height）出图即可铺满不裁切。
static const double height = 420;
@override
State<HomeHeroCarousel> createState() => _HomeHeroCarouselState();
}
class _HomeHeroCarouselState extends State<HomeHeroCarousel> {
static const Duration _autoInterval = Duration(milliseconds: 4500);
static const Duration _pageDuration = Duration(milliseconds: 480);
static const double _dotSize = 4;
static const double _dotGap = 9;
static const double _ctaHeight = 38;
final PageController _controller = PageController();
Timer? _timer;
int _index = 0;
bool _pressed = false;
bool _tickerEnabled = true;
@override
void initState() {
super.initState();
WidgetsBinding.instance.addPostFrameCallback((_) => _syncTimer());
}
@override
void didChangeDependencies() {
super.didChangeDependencies();
final enabled = TickerMode.valuesOf(context).enabled;
if (enabled != _tickerEnabled) {
_tickerEnabled = enabled;
_syncTimer();
}
}
@override
void didUpdateWidget(covariant HomeHeroCarousel oldWidget) {
super.didUpdateWidget(oldWidget);
if (oldWidget.banners.length != widget.banners.length) {
if (_index >= widget.banners.length) _index = 0;
_syncTimer();
}
if (oldWidget.banners.length != widget.banners.length ||
oldWidget.active != widget.active) {
_syncTimer();
}
}
@override
void dispose() {
_timer?.cancel();
_controller.dispose();
super.dispose();
}
void _syncTimer() {
_timer?.cancel();
_timer = null;
final canAdvance = mounted &&
widget.active &&
_tickerEnabled &&
!_pressed &&
widget.banners.length > 1;
if (!canAdvance) return;
_timer = Timer.periodic(_autoInterval, (_) => _advance());
}
void _advance() {
if (!_controller.hasClients || widget.banners.length < 2) return;
final next = (_index + 1) % widget.banners.length;
_controller.animateToPage(
next,
duration: _pageDuration,
curve: Curves.easeOutCubic,
);
}
@override
Widget build(BuildContext context) {
if (widget.banners.isEmpty) return const SizedBox.shrink();
return SizedBox(
key: const Key('home-hero-carousel'),
height: HomeHeroCarousel.height,
child: Listener(
onPointerDown: (_) {
_pressed = true;
_timer?.cancel();
},
onPointerUp: (_) {
_pressed = false;
_syncTimer();
},
onPointerCancel: (_) {
_pressed = false;
_syncTimer();
},
child: Stack(
fit: StackFit.expand,
children: [
PageView.builder(
controller: _controller,
itemCount: widget.banners.length,
onPageChanged: (value) => setState(() => _index = value),
itemBuilder: (context, index) => _bannerPage(context, index),
),
Positioned(left: 0, right: 0, bottom: 14, child: _dots(context)),
],
),
),
);
}
Widget _bannerPage(BuildContext context, int index) {
final banner = widget.banners[index];
final drama = widget.dramaFor(banner);
return Stack(
fit: StackFit.expand,
children: [
RemoteImage(
banner.imageUrl,
fit: BoxFit.cover,
showFallbackIcon: true,
fallbackColor: AppColors.contentSurface,
),
const DecoratedBox(
decoration: BoxDecoration(
gradient: LinearGradient(
begin: Alignment.topCenter,
end: Alignment.bottomCenter,
colors: [
Color(0x99000000),
Color(0x00000000),
Color(0x66000000),
Color(0xB3000000),
],
stops: [0, 0.22, 0.62, 1],
),
),
),
if (drama != null)
Align(
alignment: const Alignment(0, 0.6),
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 28),
child: _HeroCopy(
key: Key('home-hero-copy-$index'),
drama: drama,
ctaHeight: _ctaHeight,
onWatch: () => widget.onWatch(drama),
),
),
),
if (drama != null)
Positioned.fill(
child: Material(
color: AppColors.transparent,
child: InkWell(
key: Key('home-hero-$index'),
highlightColor: AppColors.transparent,
onTap: () => widget.onWatch(drama),
),
),
),
],
);
}
Widget _dots(BuildContext context) {
if (widget.banners.length < 2) return const SizedBox.shrink();
return ExcludeSemantics(
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
for (var index = 0; index < widget.banners.length; index++)
Container(
key: Key('home-hero-dot-$index'),
width: _dotSize,
height: _dotSize,
margin: const EdgeInsets.symmetric(horizontal: _dotGap / 2),
decoration: BoxDecoration(
shape: BoxShape.circle,
color: index == _index
? AppColors.brandRed
: AppColors.textPrimary.withValues(alpha: 0.4),
),
),
],
),
);
}
}
/// Hero 中部居中文案与按钮组。
class _HeroCopy extends StatelessWidget {
const _HeroCopy({
super.key,
required this.drama,
required this.ctaHeight,
required this.onWatch,
});
final Drama drama;
final double ctaHeight;
final VoidCallback onWatch;
static const Color _titleCream = Color(0xFFE9D3B8);
@override
Widget build(BuildContext context) {
final l10n = AppLocalizations.of(context)!;
final lang = Localizations.localeOf(context).languageCode;
final types = drama.localizedTypeLabels(lang);
final meta = [
if (types.isNotEmpty) types.first,
l10n.totalEpisodesShort(drama.episodeCount),
].join(' · ');
return Column(
key: const Key('home-hero-copy'),
mainAxisSize: MainAxisSize.min,
children: [
Text(
drama.localizedTitle(lang),
maxLines: 1,
overflow: TextOverflow.ellipsis,
textAlign: TextAlign.center,
style: const TextStyle(
color: _titleCream,
fontSize: 28,
fontWeight: FontWeight.w600,
height: 1.15,
shadows: [Shadow(color: Color(0x80000000), blurRadius: 12)],
),
),
const SizedBox(height: 8),
Text(
meta,
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
color: AppColors.textPrimary.withValues(alpha: 0.92),
fontSize: 14,
fontWeight: FontWeight.w400,
),
),
const SizedBox(height: 10),
Text(
drama.localizedSynopsis(lang),
maxLines: 1,
overflow: TextOverflow.ellipsis,
textAlign: TextAlign.center,
style: TextStyle(
color: AppColors.textPrimary.withValues(alpha: 0.95),
fontSize: 15,
fontWeight: FontWeight.w400,
shadows: const [
Shadow(color: Color(0x80000000), blurRadius: 8),
],
),
),
const SizedBox(height: 20),
Row(
mainAxisSize: MainAxisSize.min,
children: [
_WatchButton(height: ctaHeight, label: l10n.watchNowAction, onTap: onWatch),
const SizedBox(width: 12),
_FavoriteCircle(size: ctaHeight, drama: drama),
],
),
],
);
}
}
class _WatchButton extends StatelessWidget {
const _WatchButton({
required this.height,
required this.label,
required this.onTap,
});
final double height;
final String label;
final VoidCallback onTap;
@override
Widget build(BuildContext context) {
return Material(
color: AppColors.brandRed,
borderRadius: BorderRadius.circular(height / 2),
child: InkWell(
key: const Key('home-hero-watch'),
borderRadius: BorderRadius.circular(height / 2),
onTap: onTap,
child: SizedBox(
height: height,
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 24),
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
const Icon(
Icons.play_arrow_rounded,
size: 20,
color: AppColors.textPrimary,
),
const SizedBox(width: 2),
Text(
label,
style: const TextStyle(
color: AppColors.textPrimary,
fontSize: 16,
fontWeight: FontWeight.w600,
),
),
],
),
),
),
),
);
}
}
class _FavoriteCircle extends StatelessWidget {
const _FavoriteCircle({required this.size, required this.drama});
final double size;
final Drama drama;
@override
Widget build(BuildContext context) {
final favorites = context.watch<FavoriteController>();
final saved = favorites.isSaved(drama.id);
return Material(
color: saved ? AppColors.brandRed : AppColors.transparent,
shape: CircleBorder(
side: BorderSide(
color: saved
? AppColors.brandRed
: AppColors.textPrimary.withValues(alpha: 0.85),
width: 1.5,
),
),
child: InkWell(
key: const Key('home-hero-favorite'),
customBorder: const CircleBorder(),
onTap: () => unawaited(favorites.toggle(drama.id, card: drama)),
child: SizedBox(
width: size,
height: size,
child: Icon(
saved ? Icons.bookmark_rounded : Icons.bookmark_border_rounded,
size: 20,
color: AppColors.textPrimary,
),
),
),
);
}
}
lib/pages/recommend/widgets/home_recommend_content.dart
+252
View File
@@ -0,0 +1,252 @@
// Author: fruit.com.cn
import 'package:flutter/material.dart';
import '../../../core/data/models/drama.dart';
import '../../../core/theme/app_colors.dart';
import '../../../core/widgets/remote_image.dart';
import '../../../l10n/app_localizations.dart';
/// 设计稿（首页 1）推荐页内容区规格：
/// 海报卡 110×157、页边距 14、卡距 9、圆角 12。
const double _pageSide = 14;
const double _cardWidth = 110;
const double _cardCoverHeight = 157;
const double _cardGap = 9;
const double _cardRadius = 12;
/// 上新横滑卡板块。无板块标题，卡片左上角带「上新」角标。
/// 内层横向 ListView 会自行识别横向手势，不与外层纵向滚动冲突。
class HomeNewArrivalRow extends StatelessWidget {
const HomeNewArrivalRow({
super.key,
required this.dramas,
required this.onOpen,
});
final List<Drama> dramas;
final ValueChanged<Drama> onOpen;
@override
Widget build(BuildContext context) {
if (dramas.isEmpty) return const SizedBox.shrink();
return SizedBox(
key: const Key('home-new-arrival-row'),
height:
_cardCoverHeight + 8 + 20 + 2 + 16, // 封面 + 剧名行 + 集数行 + 余量
child: ListView.separated(
scrollDirection: Axis.horizontal,
padding: const EdgeInsets.symmetric(horizontal: _pageSide),
itemCount: dramas.length,
separatorBuilder: (_, _) => const SizedBox(width: _cardGap),
itemBuilder: (context, index) => SizedBox(
width: _cardWidth,
child: HomePosterCard(
key: Key('home-new-arrival-${dramas[index].id}'),
drama: dramas[index],
badge: AppLocalizations.of(context)!.newArrivalBadge,
onTap: () => onOpen(dramas[index]),
),
),
),
);
}
}
/// 110×157 海报 + 卡下剧名/集数。
///
/// 封面左上角标签优先用接口返回的短剧标签（`drama.tag` + `drama.tagColor`）；
/// 接口没有标签时，若传了 [badge]（如「上新」）则退回显示该角标。
class HomePosterCard extends StatelessWidget {
const HomePosterCard({
super.key,
required this.drama,
required this.onTap,
this.badge,
});
final Drama drama;
final VoidCallback onTap;
final String? badge;
@override
Widget build(BuildContext context) {
final l10n = AppLocalizations.of(context)!;
final lang = Localizations.localeOf(context).languageCode;
final tag = drama.localizedTag(lang);
final tagLabel = tag.isNotEmpty ? tag : (badge ?? '');
return InkWell(
onTap: onTap,
borderRadius: BorderRadius.circular(_cardRadius),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: [
ClipRRect(
borderRadius: BorderRadius.circular(_cardRadius),
child: AspectRatio(
aspectRatio: _cardWidth / _cardCoverHeight,
child: Stack(
fit: StackFit.expand,
children: [
RemoteImage(
drama.posterUrl,
fit: BoxFit.cover,
showFallbackIcon: true,
fallbackColor: AppColors.contentSurface,
),
if (tagLabel.isNotEmpty)
Positioned(
left: 8,
top: 8,
child: Container(
padding: const EdgeInsets.symmetric(
horizontal: 8,
vertical: 3,
),
decoration: BoxDecoration(
color: tag.isNotEmpty
? drama.tagRibbonColor(AppColors.brandRed)
: AppColors.brandRed,
borderRadius: BorderRadius.circular(6),
),
child: Text(
tagLabel,
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: const TextStyle(
color: AppColors.textPrimary,
fontSize: 11,
fontWeight: FontWeight.w600,
height: 1.1,
),
),
),
),
],
),
),
),
const SizedBox(height: 8),
Text(
drama.localizedTitle(lang),
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: const TextStyle(
color: AppColors.textPrimary,
fontSize: 14,
fontWeight: FontWeight.w500,
height: 1.2,
),
),
const SizedBox(height: 2),
Text(
l10n.totalEpisodesShort(drama.episodeCount),
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: const TextStyle(
color: AppColors.textTertiary,
fontSize: 12,
height: 1.2,
),
),
],
),
);
}
}
/// 编辑精选横幅：满宽背景图 + 左上小标签、大标题、副标题。
class HomeEditorPickBanner extends StatelessWidget {
const HomeEditorPickBanner({
super.key,
required this.drama,
required this.onOpen,
});
final Drama drama;
final ValueChanged<Drama> onOpen;
@override
Widget build(BuildContext context) {
final l10n = AppLocalizations.of(context)!;
final lang = Localizations.localeOf(context).languageCode;
return Padding(
key: const Key('home-editor-pick'),
padding: const EdgeInsets.symmetric(horizontal: _pageSide),
child: SizedBox(
height: 72,
child: ClipRRect(
borderRadius: BorderRadius.circular(_cardRadius),
child: Stack(
fit: StackFit.expand,
children: [
RemoteImage(
drama.posterUrl,
fit: BoxFit.cover,
showFallbackIcon: true,
fallbackColor: AppColors.contentSurface,
),
const DecoratedBox(
decoration: BoxDecoration(
gradient: LinearGradient(
begin: Alignment.centerLeft,
end: Alignment.centerRight,
colors: [Color(0xE6000000), Color(0x4D000000), Color(0x1A000000)],
),
),
),
Positioned.fill(
child: Material(
color: AppColors.transparent,
child: InkWell(onTap: () => onOpen(drama)),
),
),
Padding(
padding: const EdgeInsets.symmetric(horizontal: 14),
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
l10n.editorPick,
maxLines: 1,
style: TextStyle(
color: AppColors.textPrimary.withValues(alpha: 0.85),
fontSize: 11,
fontWeight: FontWeight.w500,
letterSpacing: 2,
),
),
const SizedBox(height: 4),
Text(
drama.localizedTitle(lang),
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: const TextStyle(
color: AppColors.textPrimary,
fontSize: 18,
fontWeight: FontWeight.w600,
height: 1.15,
),
),
const SizedBox(height: 2),
Text(
drama.localizedSynopsis(lang),
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
color: AppColors.textPrimary.withValues(alpha: 0.8),
fontSize: 12,
),
),
],
),
),
],
),
),
),
);
}
}
lib/pages/recommend/widgets/recommend_channel_nav.dart
+222
View File
@@ -0,0 +1,222 @@
// Author: fruit.com.cn
import 'package:flutter/material.dart';
import '../../../core/data/models/content_category.dart';
import '../../../core/theme/app_colors.dart';
import '../../../l10n/app_localizations.dart';
const double _navHeight = 56;
const double _tabGap = 20;
const double _tabFont = 17;
const double _searchHitSize = 40;
const double _searchIconSize = 26;
const double _giftIconSize = 30;
const double _underlineWidth = 26;
const double _underlineHeight = 3;
/// 推荐页（礼花 tab）顶部频道导航：频道全部来自分类接口，右侧搜索/礼物。
class RecommendChannelNav extends StatefulWidget {
const RecommendChannelNav({
super.key,
required this.categories,
required this.selectedId,
required this.onSelected,
required this.onSearch,
this.onGift,
});
static const double height = _navHeight;
/// 接口返回的内容分类（首项即「精选」）。
final List<ContentCategory> categories;
final String? selectedId;
final ValueChanged<String> onSelected;
final VoidCallback onSearch;
/// 右上角金色礼物盒（钱包入口）；为空时不显示。
final VoidCallback? onGift;
@override
State<RecommendChannelNav> createState() => _RecommendChannelNavState();
}
class _RecommendChannelNavState extends State<RecommendChannelNav> {
static const double _revealLeftInset = 20;
final ScrollController _scrollController = ScrollController();
final GlobalKey _scrollViewKey = GlobalKey();
final Map<String, GlobalKey> _tabKeys = {};
GlobalKey _keyFor(String id) =>
_tabKeys.putIfAbsent(id, () => GlobalKey());
@override
void didUpdateWidget(covariant RecommendChannelNav oldWidget) {
super.didUpdateWidget(oldWidget);
if (widget.selectedId != null &&
(widget.selectedId != oldWidget.selectedId ||
widget.categories.length != oldWidget.categories.length)) {
WidgetsBinding.instance.addPostFrameCallback((_) => _revealSelected());
}
}
@override
void dispose() {
_scrollController.dispose();
super.dispose();
}
/// 把选中频道平滑滚动到可视区域：对齐到滚动区左缘 20pt。
void _revealSelected() {
final id = widget.selectedId;
if (id == null || !_scrollController.hasClients) return;
final tabCtx = _tabKeys[id]?.currentContext;
final tabBox = tabCtx?.findRenderObject() as RenderBox?;
final scrollBox =
_scrollViewKey.currentContext?.findRenderObject() as RenderBox?;
if (tabBox == null || scrollBox == null) return;
final viewportLeft = scrollBox.localToGlobal(Offset.zero).dx;
final tabLeft = tabBox.localToGlobal(Offset.zero).dx;
final relative = tabLeft - viewportLeft;
final position = _scrollController.position;
final target =
(position.pixels + relative - _revealLeftInset)
.clamp(0.0, position.maxScrollExtent);
if ((target - position.pixels).abs() < 0.5) return;
_scrollController.animateTo(
target,
duration: const Duration(milliseconds: 300),
curve: Curves.easeOut,
);
}
@override
Widget build(BuildContext context) {
final l10n = AppLocalizations.of(context)!;
final lang = Localizations.localeOf(context).languageCode;
final categories = widget.categories;
final tabs = <(String, String, String)>[
for (final category in categories)
(category.id, category.localizedName(lang), category.id),
];
return SizedBox(
key: const Key('recommend-channel-nav'),
height: RecommendChannelNav.height,
child: Row(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Expanded(
child: SingleChildScrollView(
key: _scrollViewKey,
controller: _scrollController,
scrollDirection: Axis.horizontal,
padding: const EdgeInsets.only(left: 20, right: 8),
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
for (var index = 0; index < tabs.length; index++) ...[
if (index > 0) const SizedBox(width: _tabGap),
KeyedSubtree(
key: _keyFor(tabs[index].$3),
child: _tab(
key: Key('recommend-tab-${tabs[index].$3}'),
code: tabs[index].$3,
label: tabs[index].$2,
selected: widget.selectedId == tabs[index].$1,
onTap: () => widget.onSelected(tabs[index].$1),
),
),
],
],
),
),
),
SizedBox.square(
dimension: _searchHitSize,
child: IconButton(
key: const Key('recommend-search'),
tooltip: l10n.search,
onPressed: widget.onSearch,
padding: EdgeInsets.zero,
constraints: const BoxConstraints.tightFor(
width: _searchHitSize,
height: _searchHitSize,
),
iconSize: _searchIconSize,
color: AppColors.textPrimary,
icon: const Icon(Icons.search_rounded),
),
),
if (widget.onGift != null)
SizedBox.square(
dimension: _searchHitSize,
child: IconButton(
key: const Key('recommend-gift'),
tooltip: l10n.wallet,
onPressed: widget.onGift,
padding: EdgeInsets.zero,
constraints: const BoxConstraints.tightFor(
width: _searchHitSize,
height: _searchHitSize,
),
iconSize: _giftIconSize,
icon: Image.asset(
'assets/icon/gift.png',
width: _giftIconSize,
height: _giftIconSize,
fit: BoxFit.contain,
),
),
),
const SizedBox(width: 8),
],
),
);
}
Widget _tab({
required Key key,
required String code,
required String label,
required bool selected,
required VoidCallback onTap,
}) {
return GestureDetector(
key: key,
behavior: HitTestBehavior.opaque,
onTap: onTap,
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
// 补偿文字下方的 4pt 间距 + 3pt 下划线，让文字视觉中心与右侧图标对齐。
const SizedBox(height: 4 + _underlineHeight),
Text(
label,
maxLines: 1,
style: TextStyle(
color: AppColors.textPrimary,
fontSize: _tabFont,
fontWeight: selected ? FontWeight.w700 : FontWeight.w400,
letterSpacing: 0,
shadows: const [
Shadow(color: AppColors.mediaBlack, blurRadius: 6),
],
),
),
const SizedBox(height: 4),
Container(
key: Key('recommend-tab-$code-underline'),
width: _underlineWidth,
height: _underlineHeight,
decoration: BoxDecoration(
color: selected ? AppColors.brandRed : AppColors.transparent,
borderRadius: BorderRadius.circular(_underlineHeight / 2),
),
),
],
),
);
}
}
lib/pages/recommend/widgets/recommend_top_nav.dart
+72 -54
View File
@@ -3,16 +3,17 @@
import 'package:flutter/material.dart';
import '../../../core/theme/app_colors.dart';
import '../../../core/theme/app_dimens.dart';
import '../../../l10n/app_localizations.dart';
import '../recommend_types.dart';
const double _navHeight = 56;
const double _tabGap = 22;
const double _tabGap = 20;
const double _tabFont = 17;
const double _searchHitSize = 40;
const double _searchIconSize = 26;
const double _minNavWidth = 280;
const double _giftIconSize = 30;
const double _underlineWidth = 26;
const double _underlineHeight = 3;
class RecommendTopNav extends StatelessWidget {
const RecommendTopNav({
@@ -21,6 +22,7 @@ class RecommendTopNav extends StatelessWidget {
required this.onSelected,
required this.onSearch,
this.onVideo = false,
this.onGift,
});
static const double height = _navHeight;
@@ -30,6 +32,9 @@ class RecommendTopNav extends StatelessWidget {
final VoidCallback onSearch;
final bool onVideo;
/// 右上角金色礼物盒（钱包入口）；为空时不显示。
final VoidCallback? onGift;
@override
Widget build(BuildContext context) {
final l10n = AppLocalizations.of(context)!;
@@ -41,34 +46,16 @@ class RecommendTopNav extends StatelessWidget {
final shadows = onVideo
? const [Shadow(color: AppColors.mediaBlack, blurRadius: 6)]
: null;
return LayoutBuilder(
builder: (context, constraints) {
if (constraints.maxWidth < _minNavWidth) {
return const SizedBox(key: Key('recommend-top-nav'), height: height);
}
return _bar(context, items, shadows);
},
);
}
Widget _bar(
BuildContext context,
List<(RecommendInnerTab, String, String)> items,
List<Shadow>? shadows,
) {
final l10n = AppLocalizations.of(context)!;
return SizedBox(
key: const Key('recommend-top-nav'),
height: height,
child: Padding(
padding: const EdgeInsets.symmetric(
horizontal: AppDimens.feedPageHorizontal,
),
child: Stack(
alignment: Alignment.center,
children: [
FittedBox(
fit: BoxFit.scaleDown,
child: Row(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Expanded(
child: SingleChildScrollView(
scrollDirection: Axis.horizontal,
padding: const EdgeInsets.only(left: 20, right: 8),
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
@@ -76,6 +63,7 @@ class RecommendTopNav extends StatelessWidget {
if (index > 0) const SizedBox(width: _tabGap),
_tab(
key: Key('recommend-tab-${items[index].$3}'),
code: items[index].$3,
label: items[index].$2,
selected: selected == items[index].$1,
shadows: shadows,
@@ -85,33 +73,53 @@ class RecommendTopNav extends StatelessWidget {
],
),
),
Align(
alignment: Alignment.centerRight,
child: SizedBox.square(
dimension: _searchHitSize,
child: IconButton(
key: const Key('recommend-search'),
tooltip: l10n.search,
onPressed: onSearch,
padding: EdgeInsets.zero,
constraints: const BoxConstraints.tightFor(
width: _searchHitSize,
height: _searchHitSize,
),
iconSize: _searchIconSize,
color: AppColors.textPrimary,
icon: const Icon(Icons.search_rounded),
),
SizedBox.square(
dimension: _searchHitSize,
child: IconButton(
key: const Key('recommend-search'),
tooltip: l10n.search,
onPressed: onSearch,
padding: EdgeInsets.zero,
constraints: const BoxConstraints.tightFor(
width: _searchHitSize,
height: _searchHitSize,
),
iconSize: _searchIconSize,
color: AppColors.textPrimary,
icon: const Icon(Icons.search_rounded),
),
),
if (onGift != null)
SizedBox.square(
dimension: _searchHitSize,
child: IconButton(
key: const Key('recommend-gift'),
tooltip: l10n.wallet,
onPressed: onGift,
padding: EdgeInsets.zero,
constraints: const BoxConstraints.tightFor(
width: _searchHitSize,
height: _searchHitSize,
),
iconSize: _giftIconSize,
icon: Image.asset(
'assets/icon/gift.png',
width: _giftIconSize,
height: _giftIconSize,
fit: BoxFit.contain,
),
),
),
],
),
const SizedBox(width: 8),
],
),
);
}
Widget _tab({
required Key key,
required String code,
required String label,
required bool selected,
required List<Shadow>? shadows,
@@ -121,23 +129,33 @@ class RecommendTopNav extends StatelessWidget {
key: key,
behavior: HitTestBehavior.opaque,
onTap: onTap,
child: SizedBox(
height: height,
child: Center(
child: Text(
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
// 补偿文字下方的 4pt 间距 + 3pt 下划线，让文字视觉中心与右侧图标对齐。
const SizedBox(height: 4 + _underlineHeight),
Text(
label,
maxLines: 1,
style: TextStyle(
color: selected
? AppColors.textPrimary
: AppColors.textTabInactive,
color: AppColors.textPrimary,
fontSize: _tabFont,
fontWeight: selected ? FontWeight.w700 : FontWeight.w400,
letterSpacing: 0,
shadows: shadows,
),
),
),
const SizedBox(height: 4),
Container(
key: Key('recommend-tab-$code-underline'),
width: _underlineWidth,
height: _underlineHeight,
decoration: BoxDecoration(
color: selected ? AppColors.brandRed : AppColors.transparent,
borderRadius: BorderRadius.circular(_underlineHeight / 2),
),
),
],
),
);
}
lib/pages/watch_records/watch_records_page.dart
+15 -7
View File
@@ -15,7 +15,6 @@ import '../../core/platform/haptics.dart';
import '../../core/theme/app_colors.dart';
import '../../core/theme/app_theme.dart';
import '../../core/widgets/app_pull_to_refresh.dart';
import '../../core/widgets/auth_gate.dart';
import '../../core/widgets/empty_state.dart';
import '../../core/widgets/paged_list_footer.dart';
import '../../core/widgets/subpage_header.dart';
@@ -35,7 +34,6 @@ class WatchRecordsPage extends StatelessWidget {
@override
Widget build(BuildContext context) {
final signedIn = context.watch<AuthController>().isSignedIn;
final l10n = AppLocalizations.of(context)!;
return Theme(
data: AppTheme.dark(),
@@ -49,11 +47,7 @@ class WatchRecordsPage extends StatelessWidget {
title: l10n.watchHistory,
backKey: const Key('watch-records-back'),
),
Expanded(
child: signedIn
? const _WatchRecordsBody()
: const AuthGatePanel(),
),
Expanded(child: const _WatchRecordsBody()),
],
),
),
@@ -71,10 +65,15 @@ class _WatchRecordsBody extends StatefulWidget {
class _WatchRecordsBodyState extends State<_WatchRecordsBody> {
late final WatchRecordsController controller;
late final AuthController _auth;
late bool _signedIn;
@override
void initState() {
super.initState();
_auth = context.read<AuthController>();
_signedIn = _auth.isSignedIn;
_auth.addListener(_handleAuthChanged);
controller = WatchRecordsBinding().create(
history: context.read<WatchHistoryRepository>(),
catalog: context.read<CatalogRepository>(),
@@ -82,8 +81,17 @@ class _WatchRecordsBodyState extends State<_WatchRecordsBody> {
unawaited(controller.load());
}
void _handleAuthChanged() {
final signedIn = _auth.isSignedIn;
if (_signedIn == signedIn || !mounted) return;
_signedIn = signedIn;
controller.reset();
unawaited(controller.load());
}
@override
void dispose() {
_auth.removeListener(_handleAuthChanged);
controller.dispose();
super.dispose();
}
pubspec.lock
+20 -20
View File
@@ -216,7 +216,7 @@ packages:
source: hosted
version: "2.0.2"
html:
dependency: transitive
dependency: "direct main"
description:
name: html
sha256: "43b67b8f43321ab066817dfac5619596c98bb1b61624e77203bb4351785f9699"
@@ -248,10 +248,10 @@ packages:
dependency: transitive
description:
name: intl
sha256: "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5"
sha256: "1ca20c894b1717686a2319b8548763d812bc0aabdac580420a44c5178c57a867"
url: "https://pub.flutter-io.cn"
source: hosted
version: "0.20.2"
version: "0.20.3"
jni:
dependency: transitive
description:
@@ -328,10 +328,10 @@ packages:
dependency: transitive
description:
name: matcher
sha256: dc0b7dc7651697ea4ff3e69ef44b0407ea32c487a39fff6a4004fa585e901861
sha256: "31bd099b47c10cd1aeb55146a2d46ce0277630ecef3f7dae54ad7873f36696cd"
url: "https://pub.flutter-io.cn"
source: hosted
version: "0.12.19"
version: "0.12.20"
material_color_utilities:
dependency: transitive
description:
@@ -344,10 +344,10 @@ packages:
dependency: transitive
description:
name: meta
sha256: "1741988757a65eb6b36abe716829688cf01910bbf91c34354ff7ec1c3de2b349"
sha256: "307249ce4ff29d58a18e97f6345f539382eb9c9c29ecda628900f31de0443dd9"
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.18.0"
version: "1.19.0"
mime:
dependency: transitive
description:
@@ -380,14 +380,6 @@ packages:
url: "https://pub.flutter-io.cn"
source: hosted
version: "3.0.0"
petitparser:
dependency: transitive
description:
name: petitparser
sha256: "2f1564aadb14215e478563b5406cb80729d022158c01dc50c96013c2f7eb4790"
url: "https://pub.flutter-io.cn"
source: hosted
version: "7.1.0"
path:
dependency: transitive
description:
@@ -444,6 +436,14 @@ packages:
url: "https://pub.flutter-io.cn"
source: hosted
version: "2.3.0"
petitparser:
dependency: transitive
description:
name: petitparser
sha256: "2f1564aadb14215e478563b5406cb80729d022158c01dc50c96013c2f7eb4790"
url: "https://pub.flutter-io.cn"
source: hosted
version: "7.1.0"
platform:
dependency: transitive
description:
@@ -613,10 +613,10 @@ packages:
dependency: transitive
description:
name: test_api
sha256: "949a932224383300f01be9221c39180316445ecb8e7547f70a41a35bf421fb9e"
sha256: "2a122cbe059f8b610d3a5415f42e255b6c17b1f21eee1d960f31080237fb4f11"
url: "https://pub.flutter-io.cn"
source: hosted
version: "0.7.11"
version: "0.7.12"
typed_data:
dependency: transitive
description:
@@ -637,10 +637,10 @@ packages:
dependency: transitive
description:
name: vector_math
sha256: d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b
sha256: "92b9910f66ed1057fd4da7b040ae7c74cafacf885bdc81be496928d5049b032d"
url: "https://pub.flutter-io.cn"
source: hosted
version: "2.2.0"
version: "2.4.3"
video_player:
dependency: "direct main"
description:
@@ -730,5 +730,5 @@ packages:
source: hosted
version: "3.1.4"
sdks:
dart: ">=3.12.2 <4.0.0"
dart: ">=3.13.0 <4.0.0"
flutter: ">=3.44.0"
test/account/account_display_test.dart
+40
View File
@@ -0,0 +1,40 @@
// Author: fruit.com.cn
import 'package:flutter_test/flutter_test.dart';
import 'package:fruitshorts/core/formatting/account_display.dart';
void main() {
test('should_localize_country_name', () {
expect(countryName('ID', 'zh'), '印度尼西亚');
expect(countryName('us', 'en'), 'United States');
expect(countryName('TH', 'id'), 'Thailand');
// 未收录的码原样返回，避免展示成空白
expect(countryName('ZZ', 'zh'), 'ZZ');
expect(countryName('', 'zh'), '');
});
test('should_localize_timezone_to_city', () {
expect(timezoneName('Asia/Jakarta', 'zh'), '雅加达');
expect(timezoneName('Asia/Jakarta', 'en'), 'Jakarta');
expect(
timezoneName('America/Argentina/Buenos_Aires', 'en'),
'Buenos Aires',
);
expect(timezoneName('', 'zh'), '');
});
test('should_localize_language_by_primary_tag', () {
expect(languageName('id-ID', 'zh'), '印度尼西亚语');
expect(languageName('zh-TW', 'en'), 'Chinese');
expect(languageName('en-US', 'id'), 'Inggris');
expect(languageName('', 'zh'), '');
});
test('should_localize_status_and_vip_level', () {
expect(accountStatusText('normal', 'zh'), '正常');
expect(accountStatusText('banned', 'id'), 'Diblokir');
expect(accountStatusText('weird', 'zh'), 'weird');
expect(vipLevelText(0, 'zh'), '未开通');
expect(vipLevelText(2, 'zh'), 'VIP 2');
});
}
test/auth/auth_page_test.dart
+1 -1
View File
@@ -112,7 +112,7 @@ void main() {
final toast = find.byKey(const Key('centered-toast'));
expect(toast, findsOneWidget);
expect(find.text('Invalid email or password'), findsOneWidget);
expect(find.text('Sign in to continue'), findsOneWidget);
expect(find.byType(AlertDialog), findsNothing);
expect(api.loginCalls, 1);
expect(
test/auth/auth_visual_test.dart
+2 -3
View File
@@ -14,7 +14,6 @@ import 'package:fruitshorts/core/data/services/auth_session_store.dart';
import 'package:fruitshorts/core/platform/haptics.dart';
import 'package:fruitshorts/core/theme/app_colors.dart';
import 'package:fruitshorts/core/theme/app_dimens.dart';
import 'package:fruitshorts/core/theme/app_theme.dart';
import 'package:fruitshorts/l10n/app_localizations.dart';
import 'package:fruitshorts/pages/auth/auth_view.dart';
@@ -136,7 +135,7 @@ void main() {
cardDecoration.borderRadius,
BorderRadius.circular(AppDimens.authCardRadius),
);
expect(cardDecoration.boxShadow, contains(AppTheme.cardShadow));
expect(cardDecoration.boxShadow, isNull);
expect(card.padding, const EdgeInsets.all(20));
final email = tester.widget<TextField>(
@@ -222,7 +221,7 @@ void main() {
find.descendant(of: back, matching: find.byType(Material)),
)
.color,
AppColors.card,
AppColors.transparent,
);
});
test/comment/drama_comments_sheet_test.dart
+20 -24
View File
@@ -135,7 +135,9 @@ void main() {
debugDefaultTargetPlatformOverride = null;
});
testWidgets('should_gate_guest_comment_input_without_focus', (tester) async {
testWidgets('should_open_guest_comment_composer_without_login', (
tester,
) async {
SharedPreferencesAsyncPlatform.instance =
InMemorySharedPreferencesAsync.empty();
final repository = FakeCommentRepository(pages: [const CommentPage()]);
@@ -144,34 +146,20 @@ void main() {
final placeholder = find.byKey(const Key('comment-input-placeholder'));
expect(placeholder, findsOneWidget);
expect(find.text('Sign in to comment'), findsOneWidget);
await tester.tap(placeholder);
await tester.pumpAndSettle();
expect(find.text('Sign in to continue'), findsOneWidget);
await tester.tap(find.text('Not now'));
await tester.pumpAndSettle();
expect(find.byKey(const Key('comment-composer-sheet')), findsNothing);
expect(placeholder, findsOneWidget);
expect(find.byKey(const Key('comment-composer-sheet')), findsOneWidget);
expect(find.byKey(const Key('auth-landing')), findsNothing);
});
testWidgets('should_focus_comment_input_after_successful_login', (
tester,
) async {
testWidgets('should_focus_guest_comment_input_immediately', (tester) async {
SharedPreferencesAsyncPlatform.instance =
InMemorySharedPreferencesAsync.empty();
final repository = FakeCommentRepository(pages: [const CommentPage()]);
final auth = await _pumpSheet(tester, repository: repository);
await _pumpSheet(tester, repository: repository);
await tester.tap(find.byKey(const Key('comment-input-placeholder')));
await tester.pump();
await tester.pump(const Duration(milliseconds: 300));
await tester.tap(find.text('Sign In'));
await tester.pump();
await tester.pump(const Duration(milliseconds: 300));
(auth as _TestAuthController).setSignedIn(true);
await tester.pump();
Navigator.of(tester.element(find.byKey(const Key('auth-landing')))).pop();
await tester.pumpAndSettle();
expect(
@@ -218,9 +206,7 @@ void main() {
expect(multilineField.style?.height, 1.4);
});
testWidgets('should_gate_guest_post_without_creating_comment', (
tester,
) async {
testWidgets('should_publish_guest_comment_without_login', (tester) async {
SharedPreferencesAsyncPlatform.instance =
InMemorySharedPreferencesAsync.empty();
final repository = FakeCommentRepository(pages: [const CommentPage()]);
@@ -229,8 +215,18 @@ void main() {
await tester.tap(find.byKey(const Key('comment-post')));
await tester.pumpAndSettle();
expect(find.text('Sign in to continue'), findsOneWidget);
expect(repository.publishCalls, isEmpty);
await tester.enterText(
find.byKey(const Key('comment-composer-input')),
'Guest comment',
);
await tester.pump();
await tester.tap(find.byKey(const Key('comment-composer-post')));
await tester.pumpAndSettle();
expect(find.byKey(const Key('auth-landing')), findsNothing);
expect(repository.publishCalls, hasLength(1));
expect(repository.publishCalls.single.content, 'Guest comment');
expect(find.text('Guest comment'), findsOneWidget);
});
testWidgets('should_show_server_comments_and_append_next_cursor_page', (
test/config/server_endpoint_test.dart
+5 -1
View File
@@ -63,7 +63,11 @@ void main() {
});
test('should_use_the_configured_local_address_for_device_default', () {
expect(AppConfig.devHostBaseUrl, 'http://192.168.31.243:8081');
final uri = Uri.parse(AppConfig.devHostBaseUrl);
expect(uri.scheme, 'http');
expect(uri.host, isNotEmpty);
expect(uri.port, 8081);
expect(uri.path, isEmpty);
});
test('should_skip_probe_when_compiled_override_is_set', () async {
test/core/app_pull_to_refresh_test.dart
+1 -1
View File
@@ -43,7 +43,7 @@ void main() {
final scrollable = tester.state<ScrollableState>(
find.descendant(of: list, matching: find.byType(Scrollable)).first,
);
expect(scrollable.position.pixels, 0);
expect(scrollable.position.pixels, lessThan(0));
final indicator = find.byKey(const Key('pull-refresh-indicator'));
expect(indicator, findsOneWidget);
expect(
test/core/device_id_test.dart
+81
View File
@@ -0,0 +1,81 @@
// Author: fruit.com.cn
import 'package:flutter_test/flutter_test.dart';
import 'package:fruitshorts/core/data/services/auth_session_store.dart';
import 'package:fruitshorts/core/data/services/device_id_provider.dart';
import 'package:shared_preferences_platform_interface/in_memory_shared_preferences_async.dart';
import 'package:shared_preferences_platform_interface/shared_preferences_async_platform_interface.dart';
/// 可控的系统设备标识来源。
class _FakeDeviceIdProvider implements DeviceIdProvider {
_FakeDeviceIdProvider(this.value, {this.region});
final String? value;
final String? region;
int calls = 0;
@override
Future<String?> systemDeviceId() async {
calls++;
return value;
}
@override
Future<String?> deviceRegion() async => region;
}
void main() {
setUp(() {
SharedPreferencesAsyncPlatform.instance =
InMemorySharedPreferencesAsync.empty();
});
test('should_prefer_system_device_id_over_local_value', () async {
final provider = _FakeDeviceIdProvider('a-9774d56d682e549c');
final store = AuthSessionStore(deviceIdProvider: provider);
expect(await store.deviceId(), 'a-9774d56d682e549c');
});
test('should_fall_back_to_stable_local_uuid_when_system_id_missing', () async {
final store = AuthSessionStore(
deviceIdProvider: _FakeDeviceIdProvider(null),
);
final first = await store.deviceId();
final second = await store.deviceId();
// 同一次运行内固定，且符合 UUIDv4 形态
expect(first, second);
expect(first, startsWith('d-'));
expect(
RegExp(
r'^d-[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$',
).hasMatch(first),
isTrue,
reason: '本地兜底必须是 UUIDv4，避免 32 位随机带来的碰撞',
);
});
test('should_cache_system_id_within_one_session', () async {
final provider = _FakeDeviceIdProvider('i-E621E1F8-C36C-495A-93FC-0C247A3E6E5F');
final store = AuthSessionStore(deviceIdProvider: provider);
await store.deviceId();
await store.deviceId();
expect(provider.calls, 1);
});
test('should_return_device_region_or_empty_string', () async {
final store = AuthSessionStore(
deviceIdProvider: _FakeDeviceIdProvider(null, region: 'TH'),
);
final missing = AuthSessionStore(
deviceIdProvider: _FakeDeviceIdProvider(null),
);
expect(await store.deviceRegion(), 'TH');
expect(await missing.deviceRegion(), '');
});
}
test/discover/drama_grid_skeleton_test.dart
+61
View File
@@ -0,0 +1,61 @@
// Author: fruit.com.cn
import 'package:flutter/material.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:fruitshorts/core/widgets/drama_grid_skeleton.dart';
void main() {
testWidgets('renders one narrow highlight overlay per skeleton card', (
tester,
) async {
tester.view.physicalSize = const Size(390, 1000);
tester.view.devicePixelRatio = 1;
addTearDown(tester.view.resetPhysicalSize);
addTearDown(tester.view.resetDevicePixelRatio);
await tester.pumpWidget(
const MaterialApp(
home: Scaffold(
body: DramaGridSkeleton(
columns: 3,
horizontalPadding: 14,
crossAxisSpacing: 8,
mainAxisSpacing: 12,
),
),
),
);
await tester.pump(const Duration(milliseconds: 100));
expect(find.byType(GridView), findsOneWidget);
expect(find.byType(ShaderMask), findsNothing);
for (var index = 0; index < 9; index++) {
final card = find.byKey(Key('drama-grid-skeleton-$index'));
expect(card, findsOneWidget);
expect(
find.descendant(of: card, matching: find.byType(IgnorePointer)),
findsOneWidget,
);
final overlay = find.descendant(
of: card,
matching: find.byWidgetPredicate(
(widget) =>
widget is DecoratedBox &&
widget.decoration is BoxDecoration &&
(widget.decoration as BoxDecoration).gradient != null,
),
);
expect(overlay, findsOneWidget);
final decoration =
tester.widget<DecoratedBox>(overlay).decoration as BoxDecoration;
final gradient = decoration.gradient! as LinearGradient;
expect(gradient.colors, const [
Colors.transparent,
Color(0x0DFFFFFF),
Colors.transparent,
]);
expect(gradient.stops, const [0.42, 0.5, 0.58]);
expect(gradient.stops![2] - gradient.stops![0], lessThanOrEqualTo(0.25));
}
});
}
test/discover/filter_page_test.dart
+5 -1
View File
@@ -8,6 +8,7 @@ import 'package:fruitshorts/core/data/models/drama.dart';
import 'package:fruitshorts/core/data/repositories/favorite_repository.dart';
import 'package:fruitshorts/core/data/repositories/playback_repository.dart';
import 'package:fruitshorts/core/data/repositories/watch_history_repository.dart';
import 'package:fruitshorts/pages/discover/discover_view.dart';
import 'package:shared_preferences_platform_interface/in_memory_shared_preferences_async.dart';
import 'package:shared_preferences_platform_interface/shared_preferences_async_platform_interface.dart';
@@ -151,7 +152,10 @@ Future<void> _pumpFilterPage(WidgetTester tester) async {
),
);
await tester.pumpAndSettle();
await tester.tap(find.byKey(const Key('home-search-entry')));
Navigator.of(tester.element(find.byKey(const Key('home-search-entry'))))
.push<void>(
MaterialPageRoute(builder: (_) => const DiscoverPage()),
);
await tester.pumpAndSettle();
await tester.tap(find.byKey(const Key('theater-toolbar-filter')));
await tester.pumpAndSettle();
test/discover/home_all_dramas_grid_test.dart
+5 -3
View File
@@ -13,6 +13,7 @@ import 'package:fruitshorts/core/data/repositories/playback_repository.dart';
import 'package:fruitshorts/core/data/repositories/watch_history_repository.dart';
import 'package:fruitshorts/core/theme/app_colors.dart';
import 'package:fruitshorts/core/widgets/app_pull_to_refresh.dart';
import 'package:fruitshorts/pages/discover/discover_view.dart';
import 'package:fruitshorts/pages/discover/widgets/discover_category_tab.dart';
import 'package:shared_preferences_platform_interface/in_memory_shared_preferences_async.dart';
import 'package:shared_preferences_platform_interface/shared_preferences_async_platform_interface.dart';
@@ -423,9 +424,10 @@ Future<void> _pumpTheater(
),
);
await tester.pumpAndSettle();
await tester.tap(find.byKey(const Key('home-search-entry')));
await tester.pumpAndSettle();
FocusManager.instance.primaryFocus?.unfocus();
Navigator.of(tester.element(find.byKey(const Key('home-search-entry'))))
.push<void>(
MaterialPageRoute(builder: (_) => const DiscoverPage()),
);
await tester.pumpAndSettle();
}
test/discover/theater_pages_test.dart
+7 -3
View File
@@ -7,6 +7,7 @@ import 'package:fruitshorts/core/data/models/drama.dart';
import 'package:fruitshorts/core/data/models/home_feed.dart';
import 'package:fruitshorts/core/theme/app_colors.dart';
import 'package:fruitshorts/core/widgets/app_pull_to_refresh.dart';
import 'package:fruitshorts/pages/discover/discover_view.dart';
import 'package:fruitshorts/core/data/repositories/favorite_repository.dart';
import 'package:fruitshorts/core/data/repositories/playback_repository.dart';
import 'package:fruitshorts/core/data/repositories/watch_history_repository.dart';
@@ -119,7 +120,7 @@ void main() {
expect(top2.width, greaterThan(100));
expect(top2.left, lessThan(top1.left));
expect(top3.left, greaterThan(top1.right));
expect(top1.bottom, closeTo(top2.bottom - 12, 0.5));
expect(top1.bottom, closeTo(top2.bottom - 30, 0.5));
expect(top2.bottom, closeTo(top3.bottom, 0.5));
expect(find.byKey(const Key('ranking-row-3')), findsNothing);
});
@@ -219,7 +220,7 @@ void main() {
expect(position.pixels, 0);
position.jumpTo(position.maxScrollExtent);
await tester.pump();
expect(find.byKey(const Key('ranking-load-more')), findsNothing);
expect(find.byKey(const Key('ranking-load-more')), findsOneWidget);
expect(find.byKey(const Key('ranking-no-more')), findsNothing);
await tester.pumpAndSettle();
});
@@ -311,7 +312,10 @@ Future<void> _pumpTheater(
),
);
await tester.pumpAndSettle();
await tester.tap(find.byKey(const Key('home-search-entry')));
Navigator.of(tester.element(find.byKey(const Key('home-search-entry'))))
.push<void>(
MaterialPageRoute(builder: (_) => const DiscoverPage()),
);
await tester.pumpAndSettle();
}
test/drama_detail/drama_detail_logic_test.dart
+40 -23
View File
@@ -16,20 +16,20 @@ DramaDetailLogic _logic(
FakeWatchHistory history, {
FavoriteController? favorites,
PlaybackPositionCache? positionCache,
}) =>
DramaDetailLogic(
drama: drama,
history: history,
playback: FakePlaybackRepository(),
favorites: favorites ?? FavoriteController(InMemoryFavoriteRepository()),
positionCache: positionCache ?? PlaybackPositionCache(),
);
}) => DramaDetailLogic(
drama: drama,
history: history,
playback: FakePlaybackRepository(),
favorites: favorites ?? FavoriteController(InMemoryFavoriteRepository()),
positionCache: positionCache ?? PlaybackPositionCache(),
);
Drama _card(String id) => Drama(
Drama _card(String id, {int? favoriteCount}) => Drama(
id: id,
title: id,
synopsis: 'synopsis',
posterUrl: '/files/$id.jpg',
favoriteCount: favoriteCount,
totalEpisodes: 3,
episodes: [
Episode(
@@ -42,11 +42,12 @@ Drama _card(String id) => Drama(
],
);
Drama _detail(String id) => Drama(
Drama _detail(String id, {int? favoriteCount}) => Drama(
id: id,
title: id,
synopsis: 'synopsis',
posterUrl: '/files/$id.jpg',
favoriteCount: favoriteCount,
totalEpisodes: 3,
detailLoaded: true,
episodes: [
@@ -62,21 +63,24 @@ Drama _detail(String id) => Drama(
);
void main() {
test('should_upgrade_to_full_episode_list_when_detail_loads_for_list_card', () async {
var calls = 0;
final logic = _logic(_card('signal'), FakeWatchHistory());
test(
'should_upgrade_to_full_episode_list_when_detail_loads_for_list_card',
() async {
var calls = 0;
final logic = _logic(_card('signal'), FakeWatchHistory());
await logic.load(() async {
calls++;
return _detail('signal');
});
await logic.load(() async {
calls++;
return _detail('signal');
});
expect(calls, 1);
expect(logic.loading, isFalse);
expect(logic.failed, isFalse);
expect(logic.drama.episodes, hasLength(3));
logic.dispose();
});
expect(calls, 1);
expect(logic.loading, isFalse);
expect(logic.failed, isFalse);
expect(logic.drama.episodes, hasLength(3));
logic.dispose();
},
);
test('should_keep_card_and_report_reason_when_load_fails', () async {
final logic = _logic(_card('signal'), FakeWatchHistory());
@@ -107,6 +111,19 @@ void main() {
logic.dispose();
});
test('should_use_detail_favorite_count_as_authoritative', () async {
final favorites = FavoriteController(InMemoryFavoriteRepository());
final card = _card('signal', favoriteCount: 2);
expect(favorites.favoriteCountFor(card), 2);
final logic = _logic(card, FakeWatchHistory(), favorites: favorites);
await logic.load(() async => _detail('signal', favoriteCount: 9));
expect(favorites.favoriteCount('signal'), 9);
expect(logic.adjustedFavoriteCount, 9);
logic.dispose();
});
test('should_prefer_recent_local_position_when_loading_continue', () async {
final cache = PlaybackPositionCache();
cache.save(
test/following/following_page_test.dart
+252 -5
View File
@@ -4,12 +4,16 @@ import 'package:flutter/material.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:fruitshorts/app.dart';
import 'package:fruitshorts/core/data/models/drama.dart';
import 'package:fruitshorts/core/data/models/page_result.dart';
import 'package:fruitshorts/core/data/models/watch_progress.dart';
import 'package:fruitshorts/core/data/repositories/favorite_repository.dart';
import 'package:fruitshorts/core/data/repositories/playback_repository.dart';
import 'package:fruitshorts/core/data/repositories/watch_history_repository.dart';
import 'package:fruitshorts/core/data/services/auth_controller.dart';
import 'package:fruitshorts/core/theme/app_colors.dart';
import 'package:fruitshorts/core/theme/app_dimens.dart';
import 'package:provider/provider.dart';
import 'package:shared_preferences/shared_preferences.dart';
import 'package:shared_preferences_platform_interface/in_memory_shared_preferences_async.dart';
import 'package:shared_preferences_platform_interface/shared_preferences_async_platform_interface.dart';
@@ -139,6 +143,31 @@ void main() {
await tester.tap(find.byKey(const Key('following-cancel-follow')));
await tester.pumpAndSettle();
expect(find.text('Unfollow the selected dramas?'), findsOneWidget);
final dialog = tester.widget<AlertDialog>(find.byType(AlertDialog));
expect(dialog.contentPadding, const EdgeInsets.all(20));
expect(dialog.actionsPadding, const EdgeInsets.fromLTRB(20, 0, 20, 20));
expect(
tester
.getSize(
find.descendant(
of: find.byType(AlertDialog),
matching: find.byType(TextButton),
),
)
.height,
32,
);
expect(
tester
.getSize(
find.descendant(
of: find.byType(AlertDialog),
matching: find.byType(FilledButton),
),
)
.height,
32,
);
await tester.tap(
find.descendant(
of: find.byType(AlertDialog),
@@ -165,7 +194,8 @@ void main() {
testWidgets('should_unfollow_every_selected_drama_when_edit_confirms', (
tester,
) async {
_signIn();
SharedPreferencesAsyncPlatform.instance =
InMemorySharedPreferencesAsync.empty();
final catalog = FakeCatalogRepository();
final dramas = catalog.dramas.take(2).toList();
final favorites = InMemoryFavoriteRepository(
@@ -203,16 +233,119 @@ void main() {
expect(favorites.removeManyCalls, 1);
});
testWidgets('should_show_auth_gate_when_signed_out', (tester) async {
testWidgets('should_show_device_favorites_and_history_when_signed_out', (
tester,
) async {
SharedPreferencesAsyncPlatform.instance =
InMemorySharedPreferencesAsync.empty();
await tester.pumpWidget(_app(catalog: FakeCatalogRepository()));
final catalog = FakeCatalogRepository();
await tester.pumpWidget(
_app(
catalog: catalog,
favorites: InMemoryFavoriteRepository(
cards: catalog.dramas.take(1).toList(),
saved: {catalog.dramas.first.id},
),
history: InMemoryWatchHistoryRepository(
seed: [
WatchProgress(
dramaId: 'the-signal-demo',
episodeId: 'the-signal-demo-3',
dramaTitle: 'Device history',
episodeNumber: 3,
position: const Duration(seconds: 25),
duration: const Duration(seconds: 100),
),
],
),
),
);
await tester.pumpAndSettle();
await tester.tap(find.byKey(const Key('tab-follow')));
await tester.pumpAndSettle();
expect(find.byKey(const Key('auth-gate-panel')), findsOneWidget);
expect(find.byKey(const Key('following-favorites-grid')), findsNothing);
expect(find.byKey(const Key('auth-gate-panel')), findsNothing);
expect(find.byKey(const Key('following-favorites-grid')), findsOneWidget);
expect(
find.byKey(const Key('following-card-the-signal-demo')),
findsOneWidget,
);
await tester.tap(find.byKey(const Key('following-tab-history')));
await tester.pumpAndSettle();
expect(
find.byKey(const Key('following-history-card-the-signal-demo')),
findsOneWidget,
);
expect(find.text('Device history'), findsOneWidget);
});
testWidgets('should_reload_identity_data_after_login_and_logout', (
tester,
) async {
SharedPreferencesAsyncPlatform.instance =
InMemorySharedPreferencesAsync.empty();
final catalog = FakeCatalogRepository();
final favorites = _IdentityFavoriteRepository(
device: [catalog.dramas[0]],
account: [catalog.dramas[1]],
);
final history = _IdentityWatchHistoryRepository(
device: [_historyProgress('the-signal-demo', 'Device history')],
account: [_historyProgress('city-lights-demo', 'Account history')],
);
await tester.pumpWidget(
_app(catalog: catalog, favorites: favorites, history: history),
);
await tester.pumpAndSettle();
await tester.tap(find.byKey(const Key('tab-follow')));
await tester.pumpAndSettle();
expect(
find.byKey(const Key('following-card-the-signal-demo')),
findsOneWidget,
);
final initialFavoriteCalls = favorites.pageCalls;
final initialHistoryCalls = history.recentCalls;
final auth = Provider.of<AuthController>(
tester.element(find.byKey(const Key('following-page'))),
listen: false,
);
final preferences = SharedPreferencesAsync();
favorites.scope = 'account';
history.scope = 'account';
await _setSignedIn(preferences);
await auth.load();
await tester.pumpAndSettle();
expect(auth.isSignedIn, isTrue);
expect(favorites.pageCalls, greaterThan(initialFavoriteCalls));
expect(history.recentCalls, greaterThan(initialHistoryCalls));
expect(
find.byKey(const Key('following-card-the-signal-demo')),
findsNothing,
);
expect(
find.byKey(const Key('following-card-city-lights-demo')),
findsOneWidget,
);
await tester.tap(find.byKey(const Key('following-tab-history')));
await tester.pumpAndSettle();
expect(find.text('Account history'), findsOneWidget);
expect(find.text('Device history'), findsNothing);
favorites.scope = 'device';
history.scope = 'device';
await _clearSignedIn(preferences);
await auth.load();
await tester.pumpAndSettle();
expect(auth.isSignedIn, isFalse);
expect(find.text('Device history'), findsOneWidget);
expect(find.text('Account history'), findsNothing);
});
testWidgets('should_show_empty_favorites_and_history', (tester) async {
@@ -407,6 +540,21 @@ void _signIn() {
});
}
Future<void> _setSignedIn(SharedPreferencesAsync preferences) async {
await preferences.setString('auth.accessToken', 'access');
await preferences.setString('auth.refreshToken', 'refresh');
await preferences.setString(
'auth.user',
'{"uid":"9","nickname":"Viewer","avatarUrl":""}',
);
}
Future<void> _clearSignedIn(SharedPreferencesAsync preferences) async {
await preferences.remove('auth.accessToken');
await preferences.remove('auth.refreshToken');
await preferences.remove('auth.user');
}
Widget _app({
required FakeCatalogRepository catalog,
FavoriteRepository? favorites,
@@ -433,3 +581,102 @@ class _CountingCatalogRepository extends FakeCatalogRepository {
return super.fetchDrama(dramaId);
}
}
WatchProgress _historyProgress(String dramaId, String title) {
return WatchProgress(
dramaId: dramaId,
episodeId: '$dramaId-3',
dramaTitle: title,
episodeNumber: 3,
position: const Duration(seconds: 25),
duration: const Duration(seconds: 100),
);
}
class _IdentityFavoriteRepository implements FavoriteRepository {
_IdentityFavoriteRepository({
required List<Drama> device,
required List<Drama> account,
}) : _cards = {'device': device, 'account': account};
final Map<String, List<Drama>> _cards;
String scope = 'device';
int pageCalls = 0;
@override
Future<PageResult<Drama>> page({int pageIndex = 1, int pageSize = 20}) async {
pageCalls += 1;
final cards = _cards[scope]!;
final offset = (pageIndex - 1) * pageSize;
return PageResult(
total: cards.length,
list: offset >= cards.length
? const []
: cards.skip(offset).take(pageSize).toList(),
);
}
@override
Future<void> remove(String dramaId) async {
_cards[scope]!.removeWhere((drama) => drama.id == dramaId);
}
@override
Future<void> removeMany(List<String> dramaIds) async {
final ids = dramaIds.toSet();
_cards[scope]!.removeWhere((drama) => ids.contains(drama.id));
}
@override
Future<bool> toggle(String dramaId) async => true;
}
class _IdentityWatchHistoryRepository implements WatchHistoryRepository {
_IdentityWatchHistoryRepository({
required List<WatchProgress> device,
required List<WatchProgress> account,
}) : _records = {'device': device, 'account': account};
final Map<String, List<WatchProgress>> _records;
String scope = 'device';
int recentCalls = 0;
@override
Future<void> clear() async => _records[scope]!.clear();
@override
Future<WatchProgress?> progressFor(String dramaId) async {
return _records[scope]!
.where((record) => record.dramaId == dramaId)
.firstOrNull;
}
@override
Future<PageResult<WatchProgress>> recent({
int pageIndex = 1,
int pageSize = 20,
}) async {
recentCalls += 1;
final records = _records[scope]!;
final offset = (pageIndex - 1) * pageSize;
return PageResult(
total: records.length,
list: offset >= records.length
? const []
: records.skip(offset).take(pageSize).toList(),
);
}
@override
Future<void> remove(String dramaId) async {
_records[scope]!.removeWhere((record) => record.dramaId == dramaId);
}
@override
Future<WatchProgress?> save({
required String episodeId,
required Duration position,
Duration? duration,
bool finished = false,
}) async => null;
}
test/home/app_bottom_nav_test.dart
+1 -1
View File
@@ -10,7 +10,7 @@ void main() {
test('should_use_exact_root_navigation_colors', () {
expect(AppColors.navBackground, const Color(0xFF000000));
expect(AppColors.navSelected, const Color(0xFFFFFFFF));
expect(AppColors.navUnselected, const Color(0xFF8E8E93));
expect(AppColors.navUnselected, const Color(0xFFB0B0B0));
});
testWidgets('should_render_four_slots_with_white_selected_state', (
test/home/home_card_style_test.dart
+10 -2
View File
@@ -82,7 +82,13 @@ void main() {
expect(viewsText.style?.fontSize, AppDimens.cardPlayCountFont);
expect(viewsText.style?.fontWeight, FontWeight.w400);
expect(viewsText.style?.color, AppColors.navSelected);
expect(find.descendant(of: cover, matching: views), findsOneWidget);
expect(
find.descendant(
of: find.byKey(const Key('home-feed-cover-clip-anime-card')),
matching: views,
),
findsOneWidget,
);
expect(
tester.getTopRight(cover).dx - tester.getTopRight(views).dx,
AppDimens.cardPlayCountRight,
@@ -201,7 +207,9 @@ Future<void> _pumpCard(
body: Center(
child: SizedBox(
width: 130,
height: 240,
height:
130 / AppDimens.cardCoverAspectRatio +
AppDimens.homeCardBodyExtent,
child: HomeFeedCard(
drama: drama,
onTap: onTap,
test/home/home_grid_layout_test.dart
+26 -12
View File
@@ -13,6 +13,7 @@ import 'package:fruitshorts/core/data/repositories/playback_repository.dart';
import 'package:fruitshorts/core/data/repositories/watch_history_repository.dart';
import 'package:fruitshorts/core/theme/app_dimens.dart';
import 'package:fruitshorts/pages/home/widgets/home_feed_card.dart';
import 'package:fruitshorts/pages/home/widgets/home_feed_grid.dart';
import 'package:fruitshorts/pages/player/player_view.dart';
import 'package:shared_preferences_platform_interface/in_memory_shared_preferences_async.dart';
import 'package:shared_preferences_platform_interface/shared_preferences_async_platform_interface.dart';
@@ -102,7 +103,7 @@ void main() {
await tester.tap(find.byKey(const Key('home-section-category-社群')));
await tester.pumpAndSettle();
expect(find.byKey(const Key('home-grid-empty')), findsOneWidget);
expect(firstDramaId(), 'page1-0');
expect(find.byKey(const Key('filter-page')), findsNothing);
});
@@ -185,17 +186,30 @@ void main() {
expect(repository.cursors, contains('page1'));
expect(repository.requestedSizes.every((size) => size <= 20), isTrue);
await tester.scrollUntilVisible(
find.byKey(const Key('home-feed-card-page2-1')),
260,
scrollable: find
.descendant(
of: find.byKey(const Key('home-grid-refresh')),
matching: find.byType(Scrollable),
)
.first,
expect(find.byKey(const Key('home-grid-refresh')), findsOneWidget);
final gridScrollable = find
.descendant(
of: find.byKey(const Key('home-grid-scroll')),
matching: find.byType(Scrollable),
);
expect(gridScrollable, findsOneWidget);
final secondPageCard = find.byKey(
const Key('home-feed-card-page2-0'),
);
expect(find.byKey(const Key('home-feed-card-page2-1')), findsOneWidget);
final feed = tester
.widget<HomeFeedGrid>(find.byType(HomeFeedGrid))
.feedController;
expect(
feed.dramas.map((drama) => drama.id),
contains('page2-0'),
);
final position = tester.state<ScrollableState>(gridScrollable).position;
await tester.pump();
position.jumpTo(position.maxScrollExtent);
await tester.pump();
position.jumpTo(position.maxScrollExtent);
await tester.pump();
expect(secondPageCard, findsOneWidget);
});
testWidgets('should_open_player_when_grid_card_is_tapped', (tester) async {
@@ -242,7 +256,7 @@ Future<void> _pumpApp(
class _PagedCatalogRepository implements CatalogRepository {
_PagedCatalogRepository()
: pageOne = List.generate(10, (index) => _drama('page1-$index')),
: pageOne = List.generate(30, (index) => _drama('page1-$index')),
pageTwo = List.generate(2, (index) => _drama('page2-$index'));
final List<Drama> pageOne;
test/home/home_nav_ui_test.dart
+6 -16
View File
@@ -98,22 +98,12 @@ void main() {
tester.getTopRight(walletEntry).dx,
closeTo(390 - AppDimens.feedPageHorizontal, 0.1),
);
final crown = tester.widget<Icon>(
find.descendant(
of: vipEntry,
matching: find.byIcon(Icons.workspace_premium_outlined),
),
);
final gift = tester.widget<Icon>(
find.descendant(
of: walletEntry,
matching: find.byIcon(Icons.card_giftcard_rounded),
),
);
expect(crown.size, AppDimens.homeActionIcon);
expect(crown.color, AppColors.homeCrownGold);
expect(gift.size, AppDimens.homeActionIcon);
expect(gift.color, AppColors.homeGiftPink);
expect(crownImage.width, AppDimens.homeActionIcon);
expect(crownImage.height, AppDimens.homeActionIcon);
expect(crownImage.fit, BoxFit.contain);
expect(giftImage.width, AppDimens.homeActionIcon);
expect(giftImage.height, AppDimens.homeActionIcon);
expect(giftImage.fit, BoxFit.contain);
expect(
tester
.widget<Material>(
test/home/home_preview_layout_test.dart
+68 -30
View File
@@ -305,7 +305,7 @@ void main() {
find.byKey(const Key('home-feed-episode-progress')),
);
expect(episodeProgress.maxLines, 1);
expect(episodeProgress.softWrap, isFalse);
expect(episodeProgress.overflow, TextOverflow.ellipsis);
expect(episodeProgress.style?.fontSize, 13);
expect(episodeProgress.style?.color, AppColors.overlayLabel);
expect(
@@ -323,19 +323,46 @@ void main() {
tester.widget<Text>(find.byKey(const Key('rail-save-count'))).data,
'3.2万',
);
expect(
final likeImage = tester.widget<Image>(
find.descendant(
of: find.byKey(const Key('rail-like')),
matching: find.byIcon(Icons.favorite_rounded),
matching: find.byType(Image),
),
findsOneWidget,
);
expect(
final saveImage = tester.widget<Image>(
find.descendant(
of: find.byKey(const Key('rail-save')),
matching: find.byIcon(Icons.bookmark_border_rounded),
matching: find.byType(Image),
),
findsOneWidget,
);
expect(
(likeImage.image as AssetImage).assetName,
'assets/icon/rail/rail_like.png',
);
expect(likeImage.color, AppColors.doubleTapHeartRed);
expect(
(saveImage.image as AssetImage).assetName,
'assets/icon/rail/rail_save.png',
);
expect(saveImage.color, AppColors.onPrimary);
expect(find.byKey(const Key('rail-comments')), findsOneWidget);
expect(find.byKey(const Key('rail-share')), findsNothing);
expect(
tester.widget<Text>(find.byKey(const Key('rail-comments-count'))).data,
'12',
);
expect(
(tester
.widget<Image>(
find.descendant(
of: find.byKey(const Key('rail-comments')),
matching: find.byType(Image),
),
)
.image
as AssetImage)
.assetName,
'assets/icon/rail/rail_comment.png',
);
expect(find.byKey(const Key('rail-episodes')), findsOneWidget);
expect(
@@ -345,9 +372,13 @@ void main() {
),
findsOneWidget,
);
expect(find.byKey(const Key('rail-comments')), findsNothing);
expect(find.byKey(const Key('rail-share')), findsNothing);
expect(find.text('Comments'), findsNothing);
final saveRect = tester.getRect(find.byKey(const Key('rail-save')));
final likeRect = tester.getRect(find.byKey(const Key('rail-like')));
final commentsRect = tester.getRect(find.byKey(const Key('rail-comments')));
final episodesRect = tester.getRect(find.byKey(const Key('rail-episodes')));
expect(likeRect.top - saveRect.bottom, closeTo(14, 0.1));
expect(commentsRect.top - likeRect.bottom, closeTo(14, 0.1));
expect(episodesRect.top - commentsRect.bottom, closeTo(14, 0.1));
expect(
tester.getRect(find.byKey(const Key('home-feed-action-rail'))).right,
closeTo(
@@ -646,13 +677,14 @@ void main() {
.ignoring,
isTrue,
);
expect(find.byKey(const Key('scrub-preview-time-bubble')), findsOneWidget);
final bubbleRect = tester.getRect(
find.byKey(const Key('scrub-preview-time-bubble')),
expect(find.byKey(const Key('scrub-preview-card')), findsOneWidget);
expect(find.byKey(const Key('scrub-preview-time')), findsOneWidget);
final previewRect = tester.getRect(
find.byKey(const Key('scrub-preview-card')),
);
expect(bubbleRect.left, greaterThanOrEqualTo(12));
expect(previewRect.left, greaterThanOrEqualTo(12));
expect(
bubbleRect.right,
previewRect.right,
lessThanOrEqualTo(
tester.getRect(find.byKey(const Key('home-feed-gesture'))).right - 12,
),
@@ -662,33 +694,29 @@ void main() {
.getRect(find.byKey(const Key('home-feed-progress-track')))
.center
.dy -
bubbleRect.bottom,
previewRect.bottom,
closeTo(16, 0.1),
);
final bubbleContainer = tester.widget<Container>(
find.descendant(
of: find.byKey(const Key('scrub-preview-time-bubble')),
matching: find.byType(Container),
),
final previewContainer = tester.widget<Container>(
find.byKey(const Key('scrub-preview-card')),
);
final previewDecoration = previewContainer.decoration! as BoxDecoration;
expect(previewDecoration.color, AppColors.card);
expect(previewDecoration.borderRadius, BorderRadius.circular(8));
expect(
(bubbleContainer.decoration! as BoxDecoration).color,
AppColors.timeBubbleScrim,
);
expect(
bubbleContainer.padding,
const EdgeInsets.symmetric(horizontal: 6, vertical: 3),
(previewDecoration.border! as Border).top.color,
AppColors.onPrimary,
);
await gesture.moveBy(const Offset(-600, 0));
await tester.pump();
expect(
tester.getRect(find.byKey(const Key('scrub-preview-time-bubble'))).left,
tester.getRect(find.byKey(const Key('scrub-preview-card'))).left,
closeTo(12, 0.1),
);
await gesture.moveBy(const Offset(1200, 0));
await tester.pump();
expect(
tester.getRect(find.byKey(const Key('scrub-preview-time-bubble'))).right,
tester.getRect(find.byKey(const Key('scrub-preview-card'))).right,
closeTo(
tester.getRect(find.byKey(const Key('home-feed-gesture'))).right - 12,
0.1,
@@ -855,6 +883,16 @@ void main() {
await tester.pump();
await gesture.up();
await tester.pumpAndSettle();
controller.value = const VideoPlayerValue(
duration: Duration(seconds: 100),
position: Duration(seconds: 40),
isInitialized: true,
isBuffering: true,
);
await tester.pump(const Duration(milliseconds: 400));
expect(find.byKey(const Key('home-feed-progress-thumb')), findsOneWidget);
expect(find.byKey(const Key('progress-loading')), findsNothing);
});
testWidgets('should_show_refresh_spinner_until_refresh_finishes', (
@@ -970,7 +1008,7 @@ void main() {
await tester.pump();
expect(find.byKey(const Key('scrub-preview-card')), findsOneWidget);
expect(find.byKey(const Key('scrub-preview-poster')), findsOneWidget);
expect(find.byKey(const Key('scrub-preview-background')), findsOneWidget);
expect(find.textContaining('/ 01:40'), findsOneWidget);
await gesture.up();
test/home/home_startup_splash_test.dart
+40 -3
View File
@@ -4,6 +4,7 @@ import 'dart:async';
import 'package:flutter/material.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:provider/provider.dart';
import 'package:fruitshorts/app.dart';
import 'package:fruitshorts/core/config/app_config.dart';
import 'package:fruitshorts/core/data/models/drama.dart';
@@ -13,6 +14,8 @@ import 'package:fruitshorts/core/data/repositories/catalog_repository.dart';
import 'package:fruitshorts/core/data/repositories/favorite_repository.dart';
import 'package:fruitshorts/core/data/repositories/playback_repository.dart';
import 'package:fruitshorts/core/data/repositories/watch_history_repository.dart';
import 'package:fruitshorts/core/data/services/catalog_controller.dart';
import 'package:fruitshorts/core/data/services/category_controller.dart';
import 'package:shared_preferences_platform_interface/in_memory_shared_preferences_async.dart';
import 'package:shared_preferences_platform_interface/shared_preferences_async_platform_interface.dart';
@@ -51,7 +54,11 @@ void main() {
expect(find.byType(CircularProgressIndicator), findsNothing);
repository.complete(_feed);
await tester.pumpAndSettle();
await _pumpForAppData(tester);
await _pumpUntilFound(
tester,
find.byKey(const Key('home-feed-card-the-signal-demo')),
);
expect(find.byKey(const Key('startup-splash')), findsNothing);
expect(find.byKey(const Key('home-grid-skeleton')), findsNothing);
@@ -62,7 +69,8 @@ void main() {
tester,
) async {
await _pumpApp(tester, _FailingCatalogRepository());
await tester.pumpAndSettle();
await _pumpForAppData(tester);
await _pumpUntilFound(tester, find.byKey(const Key('home-grid-error')));
expect(find.byKey(const Key('home-grid-header')), findsOneWidget);
expect(find.byKey(const Key('home-grid-error')), findsOneWidget);
@@ -72,7 +80,8 @@ void main() {
testWidgets('should_show_catalog_empty_state_inside_grid', (tester) async {
await _pumpApp(tester, _EmptyCatalogRepository());
await tester.pumpAndSettle();
await _pumpForAppData(tester);
await _pumpUntilFound(tester, find.byKey(const Key('home-grid-empty')));
expect(find.byKey(const Key('home-grid-header')), findsOneWidget);
expect(find.byKey(const Key('home-grid-empty')), findsOneWidget);
@@ -99,6 +108,34 @@ Future<void> _pumpApp(WidgetTester tester, CatalogRepository repository) async {
await tester.pump();
}
Future<void> _pumpUntilFound(WidgetTester tester, Finder finder) async {
for (var frame = 0; frame < 40; frame++) {
if (finder.evaluate().isNotEmpty) return;
await tester.pump(const Duration(milliseconds: 16));
}
await tester.pump();
}
Future<void> _pumpForAppData(WidgetTester tester) async {
await tester.runAsync(
() => Future<void>.delayed(Duration.zero),
);
for (var frame = 0; frame < 40; frame++) {
final root = find.byKey(const Key('home-tabs'));
if (root.evaluate().isNotEmpty) {
final context = tester.element(root);
final catalog = context.read<CatalogController>();
final categories = context.read<CategoryController>();
if (catalog.settled && !catalog.loading && !categories.loading) {
await tester.pump();
return;
}
}
await tester.pump(const Duration(milliseconds: 16));
}
await tester.pump();
}
final _feed = HomeFeed(
sections: [
FeedSection(code: 'hot', title: 'Hot', dramas: [demoDramas.first]),
test/home/k28_a_navigation_test.dart
+16 -2
View File
@@ -8,6 +8,7 @@ import 'package:fruitshorts/core/data/repositories/favorite_repository.dart';
import 'package:fruitshorts/core/data/repositories/playback_repository.dart';
import 'package:fruitshorts/core/data/repositories/watch_history_repository.dart';
import 'package:fruitshorts/core/widgets/app_bottom_nav.dart';
import 'package:fruitshorts/pages/home/widgets/home_feed_grid.dart';
import 'package:fruitshorts/pages/player/player_view.dart';
import 'package:shared_preferences_platform_interface/in_memory_shared_preferences_async.dart';
import 'package:shared_preferences_platform_interface/shared_preferences_async_platform_interface.dart';
@@ -45,7 +46,7 @@ void main() {
expect(find.byKey(const Key('home-grid')), findsOneWidget);
expect(find.byKey(const Key('home-grid-cards')), findsOneWidget);
expect(find.byType(PageView), findsNothing);
expect(find.byKey(const Key('home-primary-page-view')), findsOneWidget);
expect(find.byKey(const Key('home-page-gradient')), findsNothing);
expect(_hasLightStatusBar(tester), isTrue);
});
@@ -158,7 +159,20 @@ void main() {
testWidgets('should_open_player_from_home_grid_card', (tester) async {
await _pumpApp(tester);
await tester.tap(find.byKey(const Key('home-feed-card-the-signal-demo')));
final grid = tester.widget<HomeFeedGrid>(find.byType(HomeFeedGrid));
expect(grid.feedController.dramas, isNotEmpty);
final card = find.byKey(
const Key('home-feed-card-city-lights-demo'),
);
for (var attempt = 0; attempt < 10; attempt++) {
if (card.evaluate().isNotEmpty) break;
await tester.drag(
find.byKey(const Key('home-grid-scroll')),
const Offset(0, -240),
);
await tester.pump();
}
await tester.tap(card);
await tester.pumpAndSettle();
final player = tester.widget<PlayerPage>(find.byType(PlayerPage).last);
test/library/favorite_controller_test.dart
+27 -1
View File
@@ -6,11 +6,12 @@ import 'package:fruitshorts/core/data/models/page_result.dart';
import 'package:fruitshorts/core/data/repositories/favorite_repository.dart';
import 'package:fruitshorts/core/data/services/favorite_controller.dart';
Drama _card(String id) => Drama(
Drama _card(String id, {int? favoriteCount}) => Drama(
id: id,
title: 'Drama $id',
synopsis: 'synopsis',
posterUrl: '/files/$id.png',
favoriteCount: favoriteCount,
);
void main() {
@@ -37,6 +38,31 @@ void main() {
expect(controller.cards.map((drama) => drama.id), ['signal']);
});
test(
'should_adjust_the_single_favorite_count_when_toggle_succeeds',
() async {
final controller = FavoriteController(InMemoryFavoriteRepository());
final card = _card('signal', favoriteCount: 12);
expect(controller.favoriteCountFor(card), 12);
expect(await controller.toggle('signal', card: card), isTrue);
expect(controller.favoriteCount('signal'), 13);
expect(await controller.toggle('signal', card: card), isTrue);
expect(controller.favoriteCount('signal'), 12);
},
);
test('should_apply_server_count_and_roll_back_toggle_failure', () async {
final repository = InMemoryFavoriteRepository()..failToggle = true;
final controller = FavoriteController(repository);
controller.applyServerState('signal', saved: false, favoriteCount: 20);
expect(controller.favoriteCount('signal'), 20);
expect(await controller.toggle('signal'), isFalse);
expect(controller.isSaved('signal'), isFalse);
expect(controller.favoriteCount('signal'), 20);
});
test('should_remove_card_and_state_when_toggled_off', () async {
final repository = InMemoryFavoriteRepository(saved: {'signal'});
final controller = FavoriteController(repository);
test/library/favorites_page_test.dart
+12 -14
View File
@@ -187,22 +187,20 @@ void main() {
expect(find.byKey(const Key('favorites-retry')), findsOneWidget);
});
testWidgets(
'should_show_auth_gate_without_loading_favorites_when_signed_out',
(tester) async {
final auth = await _auth(signedIn: false);
final repository = InMemoryFavoriteRepository(
saved: {'signal'},
cards: [_card('signal')],
);
final favorites = FavoriteController(repository);
testWidgets('should_show_device_favorites_when_signed_out', (tester) async {
final auth = await _auth(signedIn: false);
final repository = InMemoryFavoriteRepository(
saved: {'signal'},
cards: [_card('signal')],
);
final favorites = FavoriteController(repository);
await _pumpPage(tester, auth: auth, favorites: favorites);
await _pumpPage(tester, auth: auth, favorites: favorites);
expect(find.byKey(const Key('auth-gate-panel')), findsOneWidget);
expect(repository.pageCalls, 0);
},
);
expect(find.byKey(const Key('auth-gate-panel')), findsNothing);
expect(find.text('Drama signal'), findsOneWidget);
expect(repository.pageCalls, 1);
});
testWidgets('should_open_player_when_favorite_card_is_tapped', (
tester,
test/mine/mine_logic_test.dart
+14
View File
@@ -60,6 +60,20 @@ void main() {
logic.dispose();
});
test('should_clear_recent_when_identity_is_reset', () async {
final history = FakeWatchHistory()..recentRecords = const [_record];
final logic = MineLogic(history: history);
await pumpEventQueue();
logic.resetRecent();
expect(logic.recent, isEmpty);
expect(logic.watchRecordTotal, isNull);
expect(logic.recentLoading, isFalse);
expect(logic.recentError, isNull);
logic.dispose();
});
testWidgets('should_forward_action_when_embedded_or_pop_when_standalone', (
tester,
) async {
Loaded 100 of 112 files, more files were not shown because too many files have changed in this diff. Show more