feat(player): 点赞与评论改为按集

This commit is contained in:
Zhou Weidong committed 2026-10-21 16:15:29 +08:00
1 parent e6f34977f5
commit 83822a0cbb
25 files changed
+337 -69

No files matched your search

+18 -9
View File
@@ -15,6 +15,8 @@ class Episode {
this.videoUrl = '',
this.durationSec = 0,
this.locked = false,
this.likeCount,
this.commentCount,
});
final String id;
@@ -28,16 +30,21 @@ class Episode {
/// 后端判定需要解锁;解锁能力(金币/VIP)在 M3 接入。
final bool locked;
final int? likeCount;
final int? commentCount;
Episode withVideoUrl(String url) => Episode(
id: id,
number: number,
title: title,
isFree: isFree,
videoUrl: url,
durationSec: durationSec,
locked: locked,
);
Episode withVideoUrl(String url, {int? likeCount, int? commentCount}) =>
Episode(
id: id,
number: number,
title: title,
isFree: isFree,
videoUrl: url,
durationSec: durationSec,
locked: locked,
likeCount: likeCount ?? this.likeCount,
commentCount: commentCount ?? this.commentCount,
);
factory Episode.fromJson(Map<String, dynamic> json) {
return Episode(
@@ -48,6 +55,8 @@ class Episode {
durationSec: (json['durationSec'] as num?)?.toInt() ?? 0,
locked: json['locked'] == true,
videoUrl: json['playUrl'] as String? ?? '',
likeCount: _optionalInt(json['likeCount']),
commentCount: _optionalInt(json['commentCount']),
);
}
}
+2 -1
View File
@@ -2,9 +2,10 @@
import 'json_numbers.dart';
/// 互动目标类型,契约只允许短剧与评论。
/// 互动目标类型。
enum InteractionTargetType {
drama('DRAMA'),
episode('EPISODE'),
comment('COMMENT');
const InteractionTargetType(this.apiValue);
+10
View File
@@ -14,6 +14,8 @@ class PlayTicket {
this.unlockCoin = 0,
this.previewSeconds = 0,
this.qualities = const [],
this.likeCount,
this.commentCount,
});
static const String free = 'FREE';
@@ -38,6 +40,8 @@ class PlayTicket {
/// 后端下发的清晰度档位(如 AUTO / 720P / 1080P),HLS 由播放器自动切换。
final List<String> qualities;
final int? likeCount;
final int? commentCount;
bool get needsUnlock =>
accessType == coinRequired || accessType == vipRequired;
@@ -58,6 +62,12 @@ class PlayTicket {
.whereType<String>()
.where((quality) => quality.isNotEmpty)
.toList(),
likeCount: json['likeCount'] == null
? null
: jsonToInt(json['likeCount']),
commentCount: json['commentCount'] == null
? null
: jsonToInt(json['commentCount']),
);
}
}
+4 -2
View File
@@ -13,6 +13,7 @@ class CommentApi {
/// 拉取游标分页;`rootId` 用于加载某一楼层的回复。
Future<CommentPage> page({
required String dramaId,
String? episodeId,
String? rootId,
String? cursor,
int size = commentPageSize,
@@ -21,6 +22,7 @@ class CommentApi {
'/app/comments',
query: {
'dramaId': dramaId,
'episodeId': ?episodeId,
'rootId': ?rootId,
'cursor': ?cursor,
'size': '$size',
@@ -31,10 +33,10 @@ class CommentApi {
}
/// 查询单部剧的有效评论总数;后端 Long 兼容数字与字符串。
Future<int> count(String dramaId) async {
Future<int> count(String dramaId, {String? episodeId}) async {
final data = await _client.get(
'/app/comments/count',
query: {'dramaId': dramaId},
query: {'dramaId': dramaId, 'episodeId': ?episodeId},
);
return jsonToInt(data);
}
@@ -8,13 +8,14 @@ abstract interface class CommentRepository {
/// 拉取评论或回复的分页。
Future<CommentPage> page({
required String dramaId,
String? episodeId,
String? rootId,
String? cursor,
int size = commentPageSize,
});
/// 查询单部剧的有效评论总数。
Future<int> count(String dramaId);
Future<int> count(String dramaId, {String? episodeId});
/// 发表评论或回复。
Future<DramaComment> publish({
@@ -37,18 +38,21 @@ class HttpCommentRepository implements CommentRepository {
@override
Future<CommentPage> page({
required String dramaId,
String? episodeId,
String? rootId,
String? cursor,
int size = commentPageSize,
}) => _api.page(
dramaId: dramaId,
episodeId: episodeId,
rootId: rootId,
cursor: cursor,
size: size,
);
@override
Future<int> count(String dramaId) => _api.count(dramaId);
Future<int> count(String dramaId, {String? episodeId}) =>
_api.count(dramaId, episodeId: episodeId);
@override
Future<DramaComment> publish({
@@ -75,6 +75,7 @@ class CommentController extends ChangeNotifier {
try {
final page = await _commentRepository.page(
dramaId: dramaId,
episodeId: episodeId,
size: commentPageSize,
);
_comments
@@ -101,6 +102,7 @@ class CommentController extends ChangeNotifier {
try {
final page = await _commentRepository.page(
dramaId: dramaId,
episodeId: episodeId,
cursor: cursor,
size: commentPageSize,
);
@@ -128,6 +130,7 @@ class CommentController extends ChangeNotifier {
try {
final page = await _commentRepository.page(
dramaId: dramaId,
episodeId: episodeId,
rootId: rootId,
size: commentPageSize,
);
@@ -157,6 +160,7 @@ class CommentController extends ChangeNotifier {
try {
final page = await _commentRepository.page(
dramaId: dramaId,
episodeId: episodeId,
rootId: rootId,
cursor: cursor,
size: commentPageSize,
@@ -17,6 +17,9 @@ class InteractionController extends ChangeNotifier {
final Set<String> _likedDramaIds = {};
final Set<String> _busyDramaIds = {};
final Map<String, int> _likeCounts = {};
final Set<String> _likedEpisodeIds = {};
final Set<String> _busyEpisodeIds = {};
final Map<String, int> _episodeLikeCounts = {};
bool _disposed = false;
/// 当前会话内该剧是否已点赞。
@@ -28,42 +31,75 @@ class InteractionController extends ChangeNotifier {
/// 服务端最新点赞数,仅在点赞接口成功返回后可用。
int? likeCount(String dramaId) => _likeCounts[dramaId];
/// 当前会话内该集是否已点赞。
bool isEpisodeLiked(String episodeId) => _likedEpisodeIds.contains(episodeId);
/// 该集点赞请求是否进行中。
bool isEpisodeBusy(String episodeId) => _busyEpisodeIds.contains(episodeId);
/// 该集服务端最新点赞数。
int? episodeLikeCount(String episodeId) => _episodeLikeCounts[episodeId];
/// 乐观切换剧集点赞,失败时回滚并以服务端返回状态校准。
Future<OperationResult<LikeToggleResult>> toggleDramaLike(
String dramaId,
) async {
if (_busyDramaIds.contains(dramaId)) {
Future<OperationResult<LikeToggleResult>> toggleDramaLike(String dramaId) =>
_toggleLike(
id: dramaId,
targetType: InteractionTargetType.drama,
likedIds: _likedDramaIds,
busyIds: _busyDramaIds,
counts: _likeCounts,
);
/// 乐观切换分集点赞,失败时回滚并以服务端返回状态校准。
Future<OperationResult<LikeToggleResult>> toggleEpisodeLike(
String episodeId,
) => _toggleLike(
id: episodeId,
targetType: InteractionTargetType.episode,
likedIds: _likedEpisodeIds,
busyIds: _busyEpisodeIds,
counts: _episodeLikeCounts,
);
Future<OperationResult<LikeToggleResult>> _toggleLike({
required String id,
required InteractionTargetType targetType,
required Set<String> likedIds,
required Set<String> busyIds,
required Map<String, int> counts,
}) async {
if (busyIds.contains(id)) {
return const OperationResult.failure(null);
}
final wasLiked = _likedDramaIds.contains(dramaId);
_busyDramaIds.add(dramaId);
final wasLiked = likedIds.contains(id);
busyIds.add(id);
if (wasLiked) {
_likedDramaIds.remove(dramaId);
likedIds.remove(id);
} else {
_likedDramaIds.add(dramaId);
likedIds.add(id);
}
_notify();
try {
final result = await _repository.toggleLike(
targetType: InteractionTargetType.drama,
targetId: dramaId,
targetType: targetType,
targetId: id,
);
if (result.liked) {
_likedDramaIds.add(dramaId);
likedIds.add(id);
} else {
_likedDramaIds.remove(dramaId);
likedIds.remove(id);
}
_likeCounts[dramaId] = result.count;
counts[id] = result.count;
return OperationResult.success(result);
} catch (failure) {
if (wasLiked) {
_likedDramaIds.add(dramaId);
likedIds.add(id);
} else {
_likedDramaIds.remove(dramaId);
likedIds.remove(id);
}
return OperationResult.failure(_errorMessage(failure));
} finally {
_busyDramaIds.remove(dramaId);
busyIds.remove(id);
_notify();
}
}
@@ -93,12 +129,18 @@ class InteractionController extends ChangeNotifier {
void clear() {
if (_likedDramaIds.isEmpty &&
_busyDramaIds.isEmpty &&
_likeCounts.isEmpty) {
_likeCounts.isEmpty &&
_likedEpisodeIds.isEmpty &&
_busyEpisodeIds.isEmpty &&
_episodeLikeCounts.isEmpty) {
return;
}
_likedDramaIds.clear();
_busyDramaIds.clear();
_likeCounts.clear();
_likedEpisodeIds.clear();
_busyEpisodeIds.clear();
_episodeLikeCounts.clear();
_notify();
}