Skip to content

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

add basic bangumi comments support

Predidit1deabd517f03
diff --git a/lib/bean/comments/comments_card.dart b/lib/bean/comments/comments_card.dart
new file mode 100644
index 00000000..93fb7479
--- /dev/null
+++ b/lib/bean/comments/comments_card.dart
@@ -0,0 +1,39 @@
+import 'package:flutter/material.dart';
+import 'package:kazumi/modules/comments/comment_item.dart';
+
+class CommentsCard extends StatelessWidget{
+ const CommentsCard({
+ super.key,
+ required this.commentItem,
+ });
+
+ final CommentItem commentItem;
+
+ @override
+ Widget build(BuildContext context) {
+ return Card(
+ color: Theme.of(context).colorScheme.secondaryContainer,
+ child: Padding(
+ padding: const EdgeInsets.all(8.0),
+ child: Column(
+ children: [
+ Row(
+ children: [
+ CircleAvatar(
+ backgroundImage: NetworkImage(commentItem.user.avatar.large),
+ ),
+ Column(
+ children: [
+ Text(commentItem.user.nickname),
+ Text(commentItem.comment.updatedAt.toString()),
+ ],
+ ),
+ ],
+ ),
+ Text(commentItem.comment.comment),
+ ],
+ ),
+ ),
+ );
+ }
+}
\ No newline at end of file
diff --git a/lib/modules/comments/comment_item.dart b/lib/modules/comments/comment_item.dart
new file mode 100644
index 00000000..7bca58bc
--- /dev/null
+++ b/lib/modules/comments/comment_item.dart
@@ -0,0 +1,121 @@
+class UserAvatar {
+ final String small;
+ final String medium;
+ final String large;
+
+ UserAvatar({
+ required this.small,
+ required this.medium,
+ required this.large,
+ });
+
+ factory UserAvatar.fromJson(Map<String, dynamic> json) {
+ return UserAvatar(
+ small: json['small'] ?? '',
+ medium: json['medium'] ?? '',
+ large: json['large'] ?? '',
+ );
+ }
+
+ Map<String, dynamic> toJson() {
+ return {
+ 'small': small,
+ 'medium': medium,
+ 'large': large,
+ };
+ }
+}
+
+class User {
+ final int id;
+ final String username;
+ final String nickname;
+ final UserAvatar avatar;
+ final String sign;
+ final int joinedAt;
+
+ User({
+ required this.id,
+ required this.username,
+ required this.nickname,
+ required this.avatar,
+ required this.sign,
+ required this.joinedAt,
+ });
+
+ factory User.fromJson(Map<String, dynamic> json) {
+ return User(
+ id: json['id'] ?? 0,
+ username: json['username'] ?? '',
+ nickname: json['nickname'] ?? '',
+ avatar: UserAvatar.fromJson(json['avatar'] as Map<String, dynamic>),
+ sign: json['sign'] ?? '',
+ joinedAt: json['joinedAt'] ?? 0,
+ );
+ }
+
+ Map<String, dynamic> toJson() {
+ return {
+ 'id': id,
+ 'username': username,
+ 'nickname': nickname,
+ 'avatar': avatar.toJson(),
+ 'sign': sign,
+ 'joinedAt': joinedAt,
+ };
+ }
+}
+
+class Comment {
+ final int rate;
+ final String comment;
+ final int updatedAt;
+
+ Comment({
+ required this.rate,
+ required this.comment,
+ required this.updatedAt,
+ });
+
+
+ factory Comment.fromJson(Map<String, dynamic> json) {
+ return Comment(
+ rate: json['rate'] ?? 0,
+ comment: json['comment'] ?? '',
+ updatedAt: json['updatedAt'] ?? 0,
+ );
+ }
+
+
+ Map<String, dynamic> toJson() {
+ return {
+ 'rate': rate,
+ 'comment': comment,
+ 'updatedAt': updatedAt,
+ };
+ }
+}
+
+class CommentItem {
+ final User user;
+ final Comment comment;
+
+ CommentItem({
+ required this.user,
+ required this.comment,
+ });
+
+ factory CommentItem.fromJson(Map<String, dynamic> json) {
+ return CommentItem(
+ user: User.fromJson(json['user']),
+ comment: Comment.fromJson(json),
+ );
+ }
+
+ Map<String, dynamic> toJson() {
+ return {
+ 'user': user.toJson(),
+ 'comment': comment.toJson(),
+ };
+ }
+}
diff --git a/lib/modules/comments/comment_response.dart b/lib/modules/comments/comment_response.dart
new file mode 100644
index 00000000..abb37ea6
--- /dev/null
+++ b/lib/modules/comments/comment_response.dart
@@ -0,0 +1,35 @@
+import 'package:kazumi/modules/comments/comment_item.dart';
+
+class CommentResponse {
+ List<CommentItem> commentList;
+ int total;
+
+ CommentResponse({
+ required this.commentList,
+ required this.total,
+ });
+
+ factory CommentResponse.fromJson(Map<String, dynamic> json) {
+ var list = json['list'] as List;
+ List<CommentItem> resCommentList =
+ list.map((i) => CommentItem.fromJson(i)).toList();
+ return CommentResponse(
+ commentList: resCommentList,
+ total: json['total'],
+ );
+ }
+
+ factory CommentResponse.fromTemplate() {
+ return CommentResponse(
+ commentList: [],
+ total: 0,
+ );
+ }
+
+ Map<String, dynamic> toJson() {
+ return {
+ 'list': commentList,
+ 'total': total,
+ };
+ }
+}
diff --git a/lib/pages/info/comments_sheet.dart b/lib/pages/info/comments_sheet.dart
new file mode 100644
index 00000000..f7130f09
--- /dev/null
+++ b/lib/pages/info/comments_sheet.dart
@@ -0,0 +1,93 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_mobx/flutter_mobx.dart';
+import 'package:flutter_modular/flutter_modular.dart';
+import 'package:kazumi/pages/info/info_controller.dart';
+import 'package:kazumi/bean/comments/comments_card.dart';
+import 'package:kazumi/utils/logger.dart';
+import 'package:logger/logger.dart';
+
+class CommentsBottomSheet extends StatefulWidget {
+ const CommentsBottomSheet({super.key});
+
+ @override
+ State<CommentsBottomSheet> createState() => _CommentsBottomSheetState();
+}
+
+class _CommentsBottomSheetState extends State<CommentsBottomSheet> {
+ late ScrollController scrollController;
+ final infoController = Modular.get<InfoController>();
+ bool isLoading = false;
+ bool commentsQueryTimeout = false;
+
+ @override
+ void initState() {
+ super.initState();
+ if (infoController.commentsList.isEmpty) {
+ loadMoreComments();
+ }
+ scrollController = ScrollController();
+ scrollController.addListener(scrollListener);
+ }
+
+ void scrollListener() {
+ if (scrollController.position.pixels >=
+ scrollController.position.maxScrollExtent - 200 &&
+ !isLoading &&
+ mounted) {
+ setState(() {
+ isLoading = true;
+ });
+ loadMoreComments(offset: infoController.commentsList.length);
+ KazumiLogger().log(Level.info, 'Popular is loading more');
+ }
+ }
+
+ Future<void> loadMoreComments({int offset = 0}) async {
+ infoController
+ .queryBangumiCommentsByID(infoController.bangumiItem.id, offset: offset)
+ .then((_) {
+ if (infoController.commentsList.isEmpty && mounted) {
+ setState(() {
+ commentsQueryTimeout = true;
+ });
+ }
+ if (infoController.commentsList.isNotEmpty && mounted) {
+ setState(() {
+ isLoading = false;
+ });
+ }
+ });
+ }
+
+ @override
+ void dispose() {
+ scrollController.dispose();
+ super.dispose();
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ return Padding(
+ padding: const EdgeInsets.fromLTRB(4.0, 0, 4.0, 0),
+ child: Observer(builder: (context) {
+ if (infoController.commentsList.isEmpty && !commentsQueryTimeout) {
+ return const Center(
+ child: CircularProgressIndicator(),
+ );
+ }
+ if (commentsQueryTimeout) {
+ return const Center(
+ child: Text('空空如也'),
+ );
+ }
+ return ListView.builder(
+ controller: scrollController,
+ itemCount: infoController.commentsList.length,
+ itemBuilder: (context, index) {
+ return CommentsCard(
+ commentItem: infoController.commentsList[index]);
+ });
+ }),
+ );
+ }
+}
diff --git a/lib/pages/info/info_controller.dart b/lib/pages/info/info_controller.dart
index 8f475fb1..83872b0b 100644
--- a/lib/pages/info/info_controller.dart
+++ b/lib/pages/info/info_controller.dart
@@ -8,6 +8,7 @@ import 'package:kazumi/request/bangumi.dart';
import 'package:mobx/mobx.dart';
import 'package:logger/logger.dart';
import 'package:kazumi/utils/logger.dart';
+import 'package:kazumi/modules/comments/comment_item.dart';
part 'info_controller.g.dart';
@@ -22,6 +23,9 @@ abstract class _InfoController with Store {
@observable
var pluginSearchStatus = ObservableMap<String, String>();
+ @observable
+ var commentsList = ObservableList<CommentItem>();
+
/// 移动到 query_manager.dart 以解决可能的内存泄漏
// querySource(String keyword) async {
// final PluginsController pluginsController =
@@ -69,4 +73,14 @@ abstract class _InfoController with Store {
KazumiLogger().log(
Level.info, '第一播放列表选集数 ${videoPageController.roadList[0].data.length}');
}
+
+ queryBangumiCommentsByID(int id, {int offset = 0}) async {
+ if (offset == 0) {
+ commentsList.clear();
+ }
+ await BangumiHTTP.getBangumiCommentsByID(id).then((value) {
+ commentsList.addAll(value.commentList);
+ });
+ KazumiLogger().log(Level.info, '已加载评论列表长度 ${commentsList.length}');
+ }
}
diff --git a/lib/pages/info/info_controller.g.dart b/lib/pages/info/info_controller.g.dart
index c467cbdd..ac18976e 100644
--- a/lib/pages/info/info_controller.g.dart
+++ b/lib/pages/info/info_controller.g.dart
@@ -42,11 +42,28 @@ mixin _$InfoController on _InfoController, Store {
});
}
+ late final _$commentsListAtom =
+ Atom(name: '_InfoController.commentsList', context: context);
+
+ @override
+ ObservableList<CommentItem> get commentsList {
+ _$commentsListAtom.reportRead();
+ return super.commentsList;
+ }
+
+ @override
+ set commentsList(ObservableList<CommentItem> value) {
+ _$commentsListAtom.reportWrite(value, super.commentsList, () {
+ super.commentsList = value;
+ });
+ }
+
@override
String toString() {
return '''
pluginSearchResponseList: ${pluginSearchResponseList},
-pluginSearchStatus: ${pluginSearchStatus}
+pluginSearchStatus: ${pluginSearchStatus},
+commentsList: ${commentsList}
''';
}
}
diff --git a/lib/pages/info/info_page.dart b/lib/pages/info/info_page.dart
index 38722d10..49ca20fe 100644
--- a/lib/pages/info/info_page.dart
+++ b/lib/pages/info/info_page.dart
@@ -12,7 +12,7 @@ import 'package:kazumi/bean/appbar/sys_app_bar.dart';
import 'package:kazumi/request/query_manager.dart';
import 'package:logger/logger.dart';
import 'package:kazumi/utils/logger.dart';
-import 'package:url_launcher/url_launcher.dart';
+import 'package:kazumi/pages/info/comments_sheet.dart';
class InfoPage extends StatefulWidget {
const InfoPage({super.key});
@@ -48,6 +48,7 @@ class _InfoPageState extends State<InfoPage>
@override
void dispose() {
queryManager.cancel();
+ infoController.commentsList.clear();
videoPageController.currentEpisode = 1;
super.dispose();
}
@@ -91,129 +92,111 @@ class _InfoPageState extends State<InfoPage>
),
),
Scaffold(
- backgroundColor: Colors.transparent,
- appBar: const SysAppBar(backgroundColor: Colors.transparent),
- body: Column(
- children: [
- BangumiInfoCardV(bangumiItem: infoController.bangumiItem),
- TabBar(
- isScrollable: true,
- tabAlignment: TabAlignment.center,
- controller: tabController,
- tabs: pluginsController.pluginList
- .map((plugin) => Observer(
- builder: (context) => Row(
- mainAxisSize: MainAxisSize.min,
- children: [
- Text(
- plugin.name,
- overflow: TextOverflow.ellipsis,
- style: TextStyle(
- fontSize: Theme.of(context)
- .textTheme
- .titleMedium!
- .fontSize,
- color: Theme.of(context)
- .colorScheme
- .onSurface),
+ backgroundColor: Colors.transparent,
+ appBar: const SysAppBar(backgroundColor: Colors.transparent),
+ body: Column(
+ children: [
+ BangumiInfoCardV(bangumiItem: infoController.bangumiItem),
+ TabBar(
+ isScrollable: true,
+ tabAlignment: TabAlignment.center,
+ controller: tabController,
+ tabs: pluginsController.pluginList
+ .map((plugin) => Observer(
+ builder: (context) => Row(
+ mainAxisSize: MainAxisSize.min,
+ children: [
+ Text(
+ plugin.name,
+ overflow: TextOverflow.ellipsis,
+ style: TextStyle(
+ fontSize: Theme.of(context)
+ .textTheme
+ .titleMedium!
+ .fontSize,
+ color: Theme.of(context)
+ .colorScheme
+ .onSurface),
+ ),
+ const SizedBox(width: 5.0),
+ Container(
+ width: 8.0,
+ height: 8.0,
+ decoration: BoxDecoration(
+ color: infoController.pluginSearchStatus[
+ plugin.name] ==
+ 'success'
+ ? Colors.green
+ : (infoController.pluginSearchStatus[
+ plugin.name] ==
+ 'pending')
+ ? Colors.grey
+ : Colors.red,
+ shape: BoxShape.circle,
),
- const SizedBox(width: 5.0),
- Container(
- width: 8.0,
- height: 8.0,
- decoration: BoxDecoration(
- color: infoController.pluginSearchStatus[
- plugin.name] ==
- 'success'
- ? Colors.green
- : (infoController.pluginSearchStatus[
- plugin.name] ==
- 'pending')
- ? Colors.grey
- : Colors.red,
- shape: BoxShape.circle,
- ),
- ),
- ],
- ),
- ))
- .toList(),
- ),
- Expanded(
- child: Observer(
- builder: (context) => TabBarView(
- controller: tabController,
- children: List.generate(
- pluginsController.pluginList.length, (pluginIndex) {
- var plugin =
- pluginsController.pluginList[pluginIndex];
- var cardList = <Widget>[];
- for (var searchResponse
- in infoController.pluginSearchResponseList) {
- if (searchResponse.pluginName == plugin.name) {
- for (var searchItem in searchResponse.data) {
- cardList.add(Card(
- color: Colors.transparent,
- child: ListTile(
- tileColor: Colors.transparent,
- title: Text(searchItem.name),
- onTap: () async {
- SmartDialog.showLoading(msg: '获取中');
- videoPageController.currentPlugin =
- plugin;
- videoPageController.title =
- searchItem.name;
- videoPageController.src = searchItem.src;
- try {
- await infoController.queryRoads(
- searchItem.src, plugin.name);
- SmartDialog.dismiss();
- Modular.to.pushNamed('/video/');
- } catch (e) {
- KazumiLogger()
- .log(Level.error, e.toString());
- SmartDialog.dismiss();
- }
- },
- ),
- ));
- }
+ ),
+ ],
+ ),
+ ))
+ .toList(),
+ ),
+ Expanded(
+ child: Observer(
+ builder: (context) => TabBarView(
+ controller: tabController,
+ children: List.generate(
+ pluginsController.pluginList.length, (pluginIndex) {
+ var plugin = pluginsController.pluginList[pluginIndex];
+ var cardList = <Widget>[];
+ for (var searchResponse
+ in infoController.pluginSearchResponseList) {
+ if (searchResponse.pluginName == plugin.name) {
+ for (var searchItem in searchResponse.data) {
+ cardList.add(Card(
+ color: Colors.transparent,
+ child: ListTile(
+ tileColor: Colors.transparent,
+ title: Text(searchItem.name),
+ onTap: () async {
+ SmartDialog.showLoading(msg: '获取中');
+ videoPageController.currentPlugin = plugin;
+ videoPageController.title = searchItem.name;
+ videoPageController.src = searchItem.src;
+ try {
+ await infoController.queryRoads(
+ searchItem.src, plugin.name);
+ SmartDialog.dismiss();
+ Modular.to.pushNamed('/video/');
+ } catch (e) {
+ KazumiLogger()
+ .log(Level.error, e.toString());
+ SmartDialog.dismiss();
+ }
+ },
+ ),
+ ));
}
}
- return ListView(children: cardList);
- }),
- ),
+ }
+ return ListView(children: cardList);
+ }),
),
- )
- ],
- ),
- floatingActionButton: FloatingActionButton(
- onPressed: () {
- int currentIndex = tabController.index;
- SmartDialog.show(
- useAnimation: false,
- builder: (context) {
- return AlertDialog(
- title: const Text('退出确认'),
- content: const Text('您想要离开 Kazumi 并在浏览器中打开此视频源吗?'),
- actions: [
- TextButton(
- onPressed: () {
- SmartDialog.dismiss();
- launchUrl(Uri.parse(pluginsController
- .pluginList[currentIndex].baseUrl));
- },
- child: const Text('确认')),
- const TextButton(
- onPressed: SmartDialog.dismiss,
- child: Text('取消')),
- ],
- );
- });
- // print('Current Tab Index: $currentIndex');
- },
- child: const Icon(Icons.open_in_browser),
- )),
+ ),
+ )
+ ],
+ ),
+ floatingActionButton: FloatingActionButton(
+ child: const Icon(Icons.comment),
+ onPressed: () async {
+ showModalBottomSheet(
+ clipBehavior: Clip.antiAlias,
+ context: context,
+ builder: (context) {
+ return const CommentsBottomSheet();
+ });
+ },
+ ),
+ ),
],
),
);
diff --git a/lib/request/api.dart b/lib/request/api.dart
index 62bc143e..cbafc0ba 100644
--- a/lib/request/api.dart
+++ b/lib/request/api.dart
@@ -24,6 +24,8 @@ class Api {
static const String bangumiRankSearch = 'https://api.bgm.tv/v0/search/subjects?limit=100';
// 从条目ID获取详细信息
static const String bangumiInfoByID = 'https://api.bgm.tv/v0/subjects/';
+ // 从条目ID获取评论
+ static const String bangumiCommentsByID = 'https://next.bgm.tv/p1/subjects/';
// 弹弹Play
static const String dandanIndex = 'https://www.dandanplay.com/';
static const String dandanAPI = "https://api.dandanplay.net/api/v2/comment/";
diff --git a/lib/request/bangumi.dart b/lib/request/bangumi.dart
index 2c990f7a..58707ee4 100644
--- a/lib/request/bangumi.dart
+++ b/lib/request/bangumi.dart
@@ -1,3 +1,4 @@
+import 'dart:convert';
import 'package:logger/logger.dart';
import 'package:kazumi/utils/logger.dart';
import 'package:kazumi/utils/constants.dart';
@@ -5,6 +6,7 @@ import 'package:dio/dio.dart';
import 'package:kazumi/request/api.dart';
import 'package:kazumi/request/request.dart';
import 'package:kazumi/modules/bangumi/bangumi_item.dart';
+import 'package:kazumi/modules/comments/comment_response.dart';
class BangumiHTTP {
// why the api havn't been replaced by getCalendarBySearch?
@@ -182,4 +184,18 @@ class BangumiHTTP {
return '';
}
}
+
+ static Future<CommentResponse> getBangumiCommentsByID(int id, {int offset = 0}) async {
+ CommentResponse commentResponse = CommentResponse.fromTemplate();
+ try {
+ final res = await Request().get(Api.bangumiCommentsByID + id.toString() + '/comments?offset=$offset&limit=20',
+ options: Options(headers: bangumiHTTPHeader));
+ final jsonData = res.data;
+ commentResponse = CommentResponse.fromJson(jsonData);
+ } catch (e) {
+ KazumiLogger()
+ .log(Level.error, 'Resolve bangumi comments failed ${e.toString()}');
+ }
+ return commentResponse;
+ }
}