Skip to content

基于自定义规则的番剧采集APP,支持流媒体在线观看,支持弹幕,支持实时超分辨率。

refactor episode comments sheet

ErBW_sd73a1432bfdf
diff --git a/lib/pages/info/comments_sheet.dart b/lib/pages/info/comments_sheet.dart
index 11e4620a..88f34859 100644
--- a/lib/pages/info/comments_sheet.dart
+++ b/lib/pages/info/comments_sheet.dart
@@ -115,7 +115,7 @@ class _CommentsBottomSheetState extends State<CommentsBottomSheet> {
Widget get charactersListBody {
return Padding(
- padding: const EdgeInsets.fromLTRB(4.0, 0, 4.0, 0),
+ padding: const EdgeInsets.fromLTRB(4.0, 4.0, 4.0, 4.0),
child: Observer(builder: (context) {
if (infoController.characterList.isEmpty && !charactersQueryTimeout) {
return const Center(
diff --git a/lib/pages/info/info_controller.dart b/lib/pages/info/info_controller.dart
index d36b5dac..37619e8f 100644
--- a/lib/pages/info/info_controller.dart
+++ b/lib/pages/info/info_controller.dart
@@ -17,6 +17,7 @@ class InfoController = _InfoController with _$InfoController;
abstract class _InfoController with Store {
late BangumiItem bangumiItem;
+ List episodeInfo = [0,' ',' '];
@observable
var pluginSearchResponseList = ObservableList<PluginSearchResponse>();
@@ -93,8 +94,8 @@ abstract class _InfoController with Store {
queryBangumiEpisodeCommentsByID(int id, int episode) async {
episodeCommentsList.clear();
- final episodeId = await BangumiHTTP.getBangumiEpisodeByID(id, episode);
- await BangumiHTTP.getBangumiCommentsByEpisodeID(episodeId).then((value) {
+ episodeInfo = await BangumiHTTP.getBangumiEpisodeByID(id, episode);
+ await BangumiHTTP.getBangumiCommentsByEpisodeID(episodeInfo[0]).then((value) {
episodeCommentsList.addAll(value.commentList);
});
KazumiLogger().log(Level.info, '已加载评论列表长度 ${episodeCommentsList.length}');
diff --git a/lib/pages/player/episode_comments_sheet.dart b/lib/pages/player/episode_comments_sheet.dart
index 00cbce30..1aed70d2 100644
--- a/lib/pages/player/episode_comments_sheet.dart
+++ b/lib/pages/player/episode_comments_sheet.dart
@@ -1,19 +1,18 @@
import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
import 'package:flutter_mobx/flutter_mobx.dart';
import 'package:flutter_modular/flutter_modular.dart';
+import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
import 'package:kazumi/pages/info/info_controller.dart';
-import 'package:kazumi/bean/card/comments_card.dart';
import 'package:kazumi/bean/card/episode_comments_card.dart';
import 'package:kazumi/request/bangumi.dart';
import 'package:kazumi/utils/logger.dart';
import 'package:logger/logger.dart';
class EpisodeCommentsSheet extends StatefulWidget {
- const EpisodeCommentsSheet(
- {super.key, required this.reload, required this.episode});
+ const EpisodeCommentsSheet({super.key, required this.episode});
final int episode;
- final bool reload;
@override
State<EpisodeCommentsSheet> createState() => _EpisodeCommentsSheetState();
@@ -28,18 +27,18 @@ class _EpisodeCommentsSheetState extends State<EpisodeCommentsSheet> {
@override
void initState() {
super.initState();
- if (widget.reload) {
+ if (infoController.episodeCommentsList.isEmpty) {
setState(() {
isLoading = true;
});
- loadComments();
+ loadComments(widget.episode);
}
scrollController = ScrollController();
}
- Future<void> loadComments() async {
+ Future<void> loadComments(int episode) async {
infoController
- .queryBangumiEpisodeCommentsByID(infoController.bangumiItem.id, widget.episode)
+ .queryBangumiEpisodeCommentsByID(infoController.bangumiItem.id, episode)
.then((_) {
if (infoController.episodeCommentsList.isEmpty && mounted) {
setState(() {
@@ -60,12 +59,12 @@ class _EpisodeCommentsSheetState extends State<EpisodeCommentsSheet> {
super.dispose();
}
- @override
- Widget build(BuildContext context) {
+ Widget get episodeCommentsBody {
return Padding(
- padding: const EdgeInsets.all(4.0),
+ padding: const EdgeInsets.fromLTRB(4, 0, 4, 4),
child: Observer(builder: (context) {
- if (infoController.episodeCommentsList.isEmpty && !commentsQueryTimeout) {
+ if (infoController.episodeCommentsList.isEmpty &&
+ !commentsQueryTimeout) {
return const Center(
child: CircularProgressIndicator(),
);
@@ -85,4 +84,112 @@ class _EpisodeCommentsSheetState extends State<EpisodeCommentsSheet> {
}),
);
}
+
+ Widget get commentsInfo {
+ return Padding(
+ padding: const EdgeInsets.all(8),
+ child: Row(
+ mainAxisAlignment: MainAxisAlignment.spaceBetween,
+ children: [
+ const Text(' 本集标题 '),
+ Expanded(
+ child: Column(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ Text(infoController.episodeInfo[1],
+ overflow: TextOverflow.ellipsis,
+ style: TextStyle(
+ fontSize: 12,
+ color: Theme.of(context).colorScheme.outline)),
+ Text(
+ (infoController.episodeInfo[2] != '')
+ ? infoController.episodeInfo[2]
+ : infoController.episodeInfo[1],
+ overflow: TextOverflow.ellipsis,
+ style: TextStyle(
+ fontSize: 12,
+ color: Theme.of(context).colorScheme.outline)),
+ ],
+ ),
+ ),
+ const SizedBox(width: 10),
+ SizedBox(
+ height: 34,
+ child: TextButton(
+ style: ButtonStyle(
+ padding: WidgetStateProperty.all(
+ const EdgeInsets.only(left: 4.0, right: 4.0)),
+ ),
+ onPressed: () {
+ showEpisodeSelection();
+ },
+ child: const Text(
+ '手动切换',
+ style: TextStyle(fontSize: 13),
+ ),
+ ),
+ ),
+ ],
+ ),
+ );
+ }
+
+ // 选择要查看评论的集数
+ void showEpisodeSelection() {
+ final TextEditingController textController = TextEditingController();
+ SmartDialog.show(
+ animationTime: const Duration(milliseconds: 100),
+ builder: (context) {
+ return AlertDialog(
+ title: const Text('输入集数'),
+ content: StatefulBuilder(
+ builder: (BuildContext context, StateSetter setState) {
+ return TextField(
+ inputFormatters: <TextInputFormatter>[
+ FilteringTextInputFormatter.digitsOnly
+ ],
+ controller: textController,
+ );
+ }),
+ actions: [
+ TextButton(
+ onPressed: () => SmartDialog.dismiss(),
+ child: Text(
+ '取消',
+ style:
+ TextStyle(color: Theme.of(context).colorScheme.outline),
+ ),
+ ),
+ TextButton(
+ onPressed: () {
+ if (textController.text.isEmpty) {
+ SmartDialog.showToast('请输入集数');
+ return;
+ }
+ final ep = int.tryParse(textController.text) ?? 0;
+ if (ep == 0) {
+ return;
+ }
+ setState(() {
+ isLoading = true;
+ });
+ loadComments(ep);
+ SmartDialog.dismiss();
+ },
+ child: const Text('刷新'),
+ ),
+ ],
+ );
+ });
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ return Scaffold(
+ body: Column(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [commentsInfo, Expanded(child: episodeCommentsBody)],
+ ),
+ );
+ }
}
diff --git a/lib/pages/player/player_item.dart b/lib/pages/player/player_item.dart
index fbb5b79a..e1edd175 100644
--- a/lib/pages/player/player_item.dart
+++ b/lib/pages/player/player_item.dart
@@ -97,7 +97,7 @@ class _PlayerItemState extends State<PlayerItem>
double lastPlayerSpeed = 1.0;
List<double> playSpeedList = defaultPlaySpeedList;
- String episodeText = "";
+ int episodeNum = 0;
/// 处理 Android/iOS 应用后台或熄屏
@override
@@ -422,82 +422,6 @@ class _PlayerItemState extends State<PlayerItem>
});
}
- // 选择要查看评论的集数
- void showEpisodeSelection() {
- final TextEditingController textController = TextEditingController(
- text: (episodeText.isNotEmpty) ? episodeText : null);
- bool needReload = true;
- bool openSheet = false;
- SmartDialog.show(
- animationTime: const Duration(milliseconds: 100),
- builder: (context) {
- return AlertDialog(
- title: const Text('查看集数'),
- content: StatefulBuilder(
- builder: (BuildContext context, StateSetter setState) {
- return TextField(
- inputFormatters: <TextInputFormatter>[
- FilteringTextInputFormatter.digitsOnly
- ],
- controller: textController,
- );
- }),
- actions: [
- TextButton(
- onPressed: () => SmartDialog.dismiss(),
- child: Text(
- '取消',
- style:
- TextStyle(color: Theme.of(context).colorScheme.outline),
- ),
- ),
- TextButton(
- onPressed: () {
- if (textController.text.isEmpty) {
- SmartDialog.showToast('请输入集数');
- return;
- }
-
- if (episodeText == textController.text) {
- needReload = false;
- }
- episodeText = textController.text;
- openSheet = true;
- SmartDialog.dismiss();
- },
- child: const Text('查看'),
- ),
- ],
- );
- },
- onDismiss: () {
- if (!openSheet) {
- return;
- }
- int ep = videoPageController.currentEpisode;
- try {
- ep = int.parse(episodeText);
- } catch (_) {
- SmartDialog.showToast('集数输入错误,正在显示第$ep集评论');
- KazumiLogger().log(Level.error, '集数输入错误,正在显示第$ep集评论');
- }
- showModalBottomSheet(
- isScrollControlled: true,
- constraints: BoxConstraints(
- maxHeight: MediaQuery.of(context).size.height * 3 / 4,
- maxWidth: (Utils.isDesktop() || Utils.isTablet())
- ? MediaQuery.of(context).size.width * 9 / 16
- : MediaQuery.of(context).size.width),
- clipBehavior: Clip.antiAlias,
- context: context,
- builder: (context) {
- return EpisodeCommentsSheet(reload: needReload, episode: ep);
- }).whenComplete(() {
- _focusNode.requestFocus();
- });
- });
- }
-
// 选择倍速
void showSetSpeedSheet() {
final double currentSpeed = playerController.playerSpeed;
@@ -774,6 +698,8 @@ class _PlayerItemState extends State<PlayerItem>
playerTimer!.cancel();
}
_animationController.dispose();
+ infoController.episodeCommentsList.clear();
+ infoController.episodeInfo = [0,' ',' '];
super.dispose();
}
@@ -1323,7 +1249,24 @@ class _PlayerItemState extends State<PlayerItem>
color: Colors.white,
icon: const Icon(Icons.comment),
onPressed: () {
- showEpisodeSelection();
+ episodeNum = Utils.extractEpisodeNumber(videoPageController.roadList[videoPageController.currentRoad].identifier[videoPageController.currentEpisode - 1]);
+ if (episodeNum == 0 || episodeNum > videoPageController.roadList[videoPageController.currentRoad].identifier.length) {
+ episodeNum = videoPageController.currentEpisode;
+ }
+ showModalBottomSheet(
+ isScrollControlled: true,
+ constraints: BoxConstraints(
+ maxHeight: MediaQuery.of(context).size.height * 3 / 4,
+ maxWidth: (Utils.isDesktop() || Utils.isTablet())
+ ? MediaQuery.of(context).size.width * 9 / 16
+ : MediaQuery.of(context).size.width),
+ clipBehavior: Clip.antiAlias,
+ context: context,
+ builder: (context) {
+ return EpisodeCommentsSheet(episode: episodeNum);
+ }).whenComplete(() {
+ _focusNode.requestFocus();
+ });
},
),
// 追番
diff --git a/lib/request/bangumi.dart b/lib/request/bangumi.dart
index 774e4af1..f2597c8e 100644
--- a/lib/request/bangumi.dart
+++ b/lib/request/bangumi.dart
@@ -185,18 +185,20 @@ class BangumiHTTP {
}
}
- static Future<int> getBangumiEpisodeByID(int id, int episode) async {
- var episodeID = 0;
+ static Future<List> getBangumiEpisodeByID(int id, int episode) async {
+ List<dynamic> episodeInfo = [0,' ',' '];
try {
final res = await Request().get('${Api.bangumiEpisodeByID}$id&offset=${episode - 1}&limit=1',
options: Options(headers: bangumiHTTPHeader));
final jsonData = res.data['data'];
- episodeID = jsonData[0]['id'];
+ episodeInfo[0] = (jsonData[0]['id']);
+ episodeInfo[1] = (jsonData[0]['name']);
+ episodeInfo[2] = (jsonData[0]['name_cn']) ?? ' ';
} catch (e) {
KazumiLogger()
.log(Level.error, 'Resolve bangumi episode failed ${e.toString()}');
}
- return episodeID;
+ return episodeInfo;
}
static Future<CommentResponse> getBangumiCommentsByID(int id, {int offset = 0}) async {