From 41ddeab41aeecca0b1bb966c0e734110db487566 Mon Sep 17 00:00:00 2001 From: orz12 Date: Sat, 20 Jan 2024 15:14:52 +0800 Subject: [PATCH 001/220] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=A8=A1=E6=8B=9F?= =?UTF-8?q?=E6=9C=AA=E7=99=BB=E5=BD=95=E6=8E=A8=E8=8D=90=EF=BC=8C=E7=8B=AC?= =?UTF-8?q?=E7=AB=8B=E6=8E=A8=E8=8D=90=E8=AE=BE=E7=BD=AE=EF=BC=8C=E6=96=B0?= =?UTF-8?q?=E5=A2=9Eaccesskey=E9=A3=8E=E6=8E=A7=E8=AD=A6=E5=91=8A=EF=BC=8C?= =?UTF-8?q?=E7=BB=9F=E4=B8=80=E6=8E=A8=E8=8D=90=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/http/video.dart | 18 ++- lib/models/common/rcmd_type.dart | 6 +- lib/pages/rcmd/controller.dart | 91 ++++++--------- lib/pages/rcmd/view.dart | 60 ++-------- lib/pages/setting/extra_setting.dart | 62 ---------- lib/pages/setting/recommend_setting.dart | 137 +++++++++++++++++++++++ lib/pages/setting/view.dart | 5 + lib/router/app_pages.dart | 4 +- lib/utils/storage.dart | 8 +- 9 files changed, 210 insertions(+), 181 deletions(-) create mode 100644 lib/pages/setting/recommend_setting.dart diff --git a/lib/http/video.dart b/lib/http/video.dart index 923e93a2..39c961cd 100644 --- a/lib/http/video.dart +++ b/lib/http/video.dart @@ -46,7 +46,9 @@ class VideoHttp { setting.get(SettingBoxKey.blackMidsList, defaultValue: [-1]); for (var i in res.data['data']['item']) { //过滤掉live与ad，以及拉黑用户 - if (i['goto'] == 'av' && !blackMidsList.contains(i['owner']['mid'])) { + if (i['goto'] == 'av' && + (i['owner'] != null && + !blackMidsList.contains(i['owner']['mid']))) { list.add(RecVideoItemModel.fromJson(i)); } } @@ -59,7 +61,9 @@ class VideoHttp { } } - static Future rcmdVideoListApp({int? ps, required int freshIdx}) async { + // 添加额外的loginState变量模拟未登录状态 + static Future rcmdVideoListApp( + {bool loginStatus = true, required int freshIdx}) async { try { var res = await Request().get( Api.recommendListApp, @@ -72,9 +76,11 @@ class VideoHttp { 'device_name': 'vivo', 'pull': freshIdx == 0 ? 'true' : 'false', 'appkey': Constants.appKey, - 'access_key': localCache - .get(LocalCacheKey.accessKey, defaultValue: {})['value'] ?? - '' + 'access_key': loginStatus + ? (localCache.get(LocalCacheKey.accessKey, + defaultValue: {})['value'] ?? + '') + : '' }, ); if (res.data['code'] == 0) { @@ -92,7 +98,7 @@ class VideoHttp { } return {'status': true, 'data': list}; } else { - return {'status': false, 'data': [], 'msg': ''}; + return {'status': false, 'data': [], 'msg': res.data['message']}; } } catch (err) { return {'status': false, 'data': [], 'msg': err.toString()}; diff --git a/lib/models/common/rcmd_type.dart b/lib/models/common/rcmd_type.dart index dbb64b15..5af18d77 100644 --- a/lib/models/common/rcmd_type.dart +++ b/lib/models/common/rcmd_type.dart @@ -1,7 +1,7 @@ // 首页推荐类型 -enum RcmdType { web, app } +enum RcmdType { web, app, notLogin } extension RcmdTypeExtension on RcmdType { - String get values => ['web', 'app'][index]; - String get labels => ['web端', 'app端'][index]; + String get values => ['web', 'app', 'notLogin'][index]; + String get labels => ['web端', 'app端', '模拟未登录'][index]; } diff --git a/lib/pages/rcmd/controller.dart b/lib/pages/rcmd/controller.dart index 4ed1ade1..ed98606a 100644 --- a/lib/pages/rcmd/controller.dart +++ b/lib/pages/rcmd/controller.dart @@ -9,8 +9,8 @@ import 'package:pilipala/utils/storage.dart'; class RcmdController extends GetxController { final ScrollController scrollController = ScrollController(); int _currentPage = 0; - RxList appVideoList = [].obs; - RxList webVideoList = [].obs; + // RxList appVideoList = [].obs; + // RxList webVideoList = [].obs; bool isLoadingMore = true; OverlayEntry? popupDialog; Box recVideo = GStrorage.recVideo; @@ -18,6 +18,7 @@ class RcmdController extends GetxController { RxInt crossAxisCount = 2.obs; late bool enableSaveLastData; late String defaultRcmdType = 'web'; + late RxList videoList; @override void onInit() { @@ -37,85 +38,59 @@ class RcmdController extends GetxController { setting.get(SettingBoxKey.enableSaveLastData, defaultValue: false); defaultRcmdType = setting.get(SettingBoxKey.defaultRcmdType, defaultValue: 'web'); + if (defaultRcmdType == 'web'){ + videoList = [].obs; + } else { + videoList = [].obs; + } } // 获取推荐 Future queryRcmdFeed(type) async { - print(defaultRcmdType); - if (defaultRcmdType == 'app') { - return await queryRcmdFeedApp(type); - } - if (defaultRcmdType == 'web') { - return await queryRcmdFeedWeb(type); - } - } - - // 获取app端推荐 - Future queryRcmdFeedApp(type) async { if (isLoadingMore == false) { return; } if (type == 'onRefresh') { _currentPage = 0; } - var res = await VideoHttp.rcmdVideoListApp( - freshIdx: _currentPage, - ); + late final Map res; + switch (defaultRcmdType) { + case 'app': case 'notLogin': + res = await VideoHttp.rcmdVideoListApp( + loginStatus: defaultRcmdType != 'notLogin', + freshIdx: _currentPage, + ); + break; + default: //'web' + res = await VideoHttp.rcmdVideoList( + freshIdx: _currentPage, + ps: 20, + ); + } if (res['status']) { if (type == 'init') { - if (appVideoList.isNotEmpty) { - appVideoList.addAll(res['data']); + if (videoList.isNotEmpty) { + videoList.addAll(res['data']); } else { - appVideoList.value = res['data']; + videoList.value = res['data']; } } else if (type == 'onRefresh') { if (enableSaveLastData) { - appVideoList.insertAll(0, res['data']); + videoList.insertAll(0, res['data']); } else { - appVideoList.value = res['data']; + videoList.value = res['data']; } } else if (type == 'onLoad') { - appVideoList.addAll(res['data']); + videoList.addAll(res['data']); } - recVideo.put('cacheList', res['data']); - _currentPage += 1; - } - isLoadingMore = false; - return res; - } - - // 获取web端推荐 - Future queryRcmdFeedWeb(type) async { - if (isLoadingMore == false) { - return; - } - if (type == 'onRefresh') { - _currentPage = 0; - } - var res = await VideoHttp.rcmdVideoList( - ps: 20, - freshIdx: _currentPage, - ); - if (res['status']) { - if (type == 'init') { - if (webVideoList.isNotEmpty) { - webVideoList.addAll(res['data']); - } else { - webVideoList.value = res['data']; - } - } else if (type == 'onRefresh') { - if (enableSaveLastData) { - webVideoList.insertAll(0, res['data']); - } else { - webVideoList.value = res['data']; - } - } else if (type == 'onLoad') { - webVideoList.addAll(res['data']); + if (defaultRcmdType != 'web') { + recVideo.put('cacheList', res['data']); } _currentPage += 1; + } else { + Get.snackbar('提示', res['msg']); } isLoadingMore = false; - return res; } // 下拉刷新 @@ -129,7 +104,7 @@ class RcmdController extends GetxController { queryRcmdFeed('onLoad'); } - // 返回顶部并刷新 + // 返回顶部 void animateToTop() async { if (scrollController.offset >= MediaQuery.of(Get.context!).size.height * 5) { diff --git a/lib/pages/rcmd/view.dart b/lib/pages/rcmd/view.dart index bc3c4a00..0a345511 100644 --- a/lib/pages/rcmd/view.dart +++ b/lib/pages/rcmd/view.dart @@ -91,54 +91,18 @@ class _RcmdPageState extends State SliverPadding( padding: const EdgeInsets.fromLTRB(0, StyleString.safeSpace, 0, 0), - sliver: FutureBuilder( - future: _futureBuilderFuture, - builder: (context, snapshot) { - if (snapshot.connectionState == ConnectionState.done) { - Map data = snapshot.data as Map; - if (data['status']) { - return Platform.isAndroid || Platform.isIOS - ? Obx( - () => contentGrid( - _rcmdController, - _rcmdController.defaultRcmdType == 'web' - ? _rcmdController.webVideoList - : _rcmdController.appVideoList), - ) - : SliverLayoutBuilder( - builder: (context, boxConstraints) { - return Obx( - () => contentGrid( - _rcmdController, - _rcmdController.defaultRcmdType == 'web' - ? _rcmdController.webVideoList - : _rcmdController.appVideoList), - ); - }); - } else { - return HttpError( - errMsg: data['msg'], - fn: () { - setState(() { - _futureBuilderFuture = - _rcmdController.queryRcmdFeed('init'); - }); - }, - ); - } - } else { - // 缓存数据 - // if (_rcmdController.videoList.isNotEmpty) { - // return contentGrid( - // _rcmdController, _rcmdController.videoList); - // } - // // 骨架屏 - // else { - return contentGrid(_rcmdController, []); - // } - } - }, - ), + sliver: Obx(() { + // 使用Obx来监听数据的变化 + if (_rcmdController.isLoadingMore) { + // 如果正在加载，则显示骨架屏 + return contentGrid(_rcmdController, []); + } else { + // 显示视频列表 + return contentGrid( + _rcmdController, + _rcmdController.videoList); + } + }), ), LoadingMore(ctr: _rcmdController) ], diff --git a/lib/pages/setting/extra_setting.dart b/lib/pages/setting/extra_setting.dart index b4275815..b32a06f5 100644 --- a/lib/pages/setting/extra_setting.dart +++ b/lib/pages/setting/extra_setting.dart @@ -1,9 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:hive/hive.dart'; -import 'package:pilipala/http/member.dart'; import 'package:pilipala/models/common/dynamics_type.dart'; -import 'package:pilipala/models/common/rcmd_type.dart'; import 'package:pilipala/models/common/reply_sort_type.dart'; import 'package:pilipala/pages/setting/widgets/select_dialog.dart'; import 'package:pilipala/utils/storage.dart'; @@ -20,23 +18,16 @@ class ExtraSetting extends StatefulWidget { class _ExtraSettingState extends State { Box setting = GStrorage.setting; static Box localCache = GStrorage.localCache; - late dynamic defaultRcmdType; late dynamic defaultReplySort; late dynamic defaultDynamicType; late dynamic enableSystemProxy; late String defaultSystemProxyHost; late String defaultSystemProxyPort; - Box userInfoCache = GStrorage.userInfo; - var userInfo; bool userLogin = false; - var accessKeyInfo; @override void initState() { super.initState(); - // 首页默认推荐类型 - defaultRcmdType = - setting.get(SettingBoxKey.defaultRcmdType, defaultValue: 'web'); // 默认优先显示最新评论 defaultReplySort = setting.get(SettingBoxKey.replySortType, defaultValue: 0); @@ -49,9 +40,6 @@ class _ExtraSettingState extends State { localCache.get(LocalCacheKey.systemProxyHost, defaultValue: ''); defaultSystemProxyPort = localCache.get(LocalCacheKey.systemProxyPort, defaultValue: ''); - userInfo = userInfoCache.get('userInfoCache'); - userLogin = userInfo != null; - accessKeyInfo = localCache.get(LocalCacheKey.accessKey, defaultValue: null); } // 设置代理 @@ -159,12 +147,6 @@ class _ExtraSettingState extends State { setKey: SettingBoxKey.enableSearchWord, defaultVal: true, ), - const SetSwitchItem( - title: '推荐动态', - subTitle: '是否在推荐内容中展示动态', - setKey: SettingBoxKey.enableRcmdDynamic, - defaultVal: true, - ), const SetSwitchItem( title: '快速收藏', subTitle: '点按收藏至默认，长按选择文件夹', @@ -177,50 +159,6 @@ class _ExtraSettingState extends State { setKey: SettingBoxKey.enableWordRe, defaultVal: false, ), - const SetSwitchItem( - title: '首页推荐刷新', - subTitle: '下拉刷新时保留上次内容', - setKey: SettingBoxKey.enableSaveLastData, - defaultVal: false, - ), - ListTile( - dense: false, - title: Text('首页推荐类型', style: titleStyle), - subtitle: Text( - '当前使用「$defaultRcmdType端」推荐', - style: subTitleStyle, - ), - onTap: () async { - String? result = await showDialog( - context: context, - builder: (context) { - return SelectDialog( - title: '推荐类型', - value: defaultRcmdType, - values: RcmdType.values.map((e) { - return {'title': e.labels, 'value': e.values}; - }).toList(), - ); - }, - ); - if (result != null) { - if (result == 'app') { - // app端推荐需要access_key - if (accessKeyInfo == null) { - if (!userLogin) { - SmartDialog.showToast('请先登录'); - return; - } - await MemberHttp.cookieToKey(); - } - } - defaultRcmdType = result; - setting.put(SettingBoxKey.defaultRcmdType, result); - SmartDialog.showToast('下次启动时生效'); - setState(() {}); - } - }, - ), const SetSwitchItem( title: '启用ai总结', subTitle: '视频详情页开启ai总结', diff --git a/lib/pages/setting/recommend_setting.dart b/lib/pages/setting/recommend_setting.dart new file mode 100644 index 00000000..8e049bc4 --- /dev/null +++ b/lib/pages/setting/recommend_setting.dart @@ -0,0 +1,137 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; +import 'package:hive/hive.dart'; +import 'package:pilipala/http/member.dart'; +import 'package:pilipala/models/common/rcmd_type.dart'; +import 'package:pilipala/pages/setting/widgets/select_dialog.dart'; +import 'package:pilipala/utils/storage.dart'; + +import 'widgets/switch_item.dart'; + +class RecommendSetting extends StatefulWidget { + const RecommendSetting({super.key}); + + @override + State createState() => _RecommendSettingState(); +} + +class _RecommendSettingState extends State { + Box setting = GStrorage.setting; + static Box localCache = GStrorage.localCache; + late dynamic defaultRcmdType; + Box userInfoCache = GStrorage.userInfo; + late dynamic userInfo; + bool userLogin = false; + late dynamic accessKeyInfo; + + @override + void initState() { + super.initState(); + // 首页默认推荐类型 + defaultRcmdType = + setting.get(SettingBoxKey.defaultRcmdType, defaultValue: 'web'); + userInfo = userInfoCache.get('userInfoCache'); + userLogin = userInfo != null; + accessKeyInfo = localCache.get(LocalCacheKey.accessKey, defaultValue: null); + } + + @override + Widget build(BuildContext context) { + TextStyle titleStyle = Theme.of(context).textTheme.titleMedium!; + TextStyle subTitleStyle = Theme.of(context) + .textTheme + .labelMedium! + .copyWith(color: Theme.of(context).colorScheme.outline); + return Scaffold( + appBar: AppBar( + centerTitle: false, + titleSpacing: 0, + title: Text( + '推荐设置', + style: Theme.of(context).textTheme.titleMedium, + ), + ), + body: ListView( + children: [ + const SetSwitchItem( + title: '推荐动态', + subTitle: '是否在推荐内容中展示动态', + setKey: SettingBoxKey.enableRcmdDynamic, + defaultVal: true, + ), + const SetSwitchItem( + title: '首页推荐刷新', + subTitle: '下拉刷新时保留上次内容', + setKey: SettingBoxKey.enableSaveLastData, + defaultVal: false, + ), + ListTile( + dense: false, + title: Text('首页推荐类型', style: titleStyle), + subtitle: Text( + '当前使用「$defaultRcmdType端」推荐', + style: subTitleStyle, + ), + onTap: () async { + String? result = await showDialog( + context: context, + builder: (context) { + return SelectDialog( + title: '推荐类型', + value: defaultRcmdType, + values: RcmdType.values.map((e) { + return {'title': e.labels, 'value': e.values}; + }).toList(), + ); + }, + ); + if (result != null) { + if (result == 'app') { + // app端推荐需要access_key + if (accessKeyInfo == null) { + if (!userLogin) { + SmartDialog.showToast('请先登录'); + return; + } + // 显示一个确认框，告知用户可能会导致账号被风控 + SmartDialog.show( + animationType: SmartAnimationType.centerFade_otherSlide, + builder: (context) { + return AlertDialog( + title: const Text('提示'), + content: const Text( + '使用app端推荐需获取access_key，有小概率触发风控导致账号退出（在官方app重新登录即可解除），是否继续？'), + actions: [ + TextButton( + onPressed: () { + result = null; + SmartDialog.dismiss(); + }, + child: const Text('取消'), + ), + TextButton( + onPressed: () async { + SmartDialog.dismiss(); + await MemberHttp.cookieToKey(); + }, + child: const Text('确定'), + ), + ], + ); + }); + } + } + if (result != null) { + defaultRcmdType = result; + setting.put(SettingBoxKey.defaultRcmdType, result); + SmartDialog.showToast('下次启动时生效'); + setState(() {}); + } + } + }, + ), + ], + ), + ); + } +} diff --git a/lib/pages/setting/view.dart b/lib/pages/setting/view.dart index 677a4546..19cdedaf 100644 --- a/lib/pages/setting/view.dart +++ b/lib/pages/setting/view.dart @@ -24,6 +24,11 @@ class SettingPage extends StatelessWidget { dense: false, title: const Text('隐私设置'), ), + ListTile( + onTap: () => Get.toNamed('/recommendSetting'), + dense: false, + title: const Text('推荐设置'), + ), ListTile( onTap: () => Get.toNamed('/playSetting'), dense: false, diff --git a/lib/router/app_pages.dart b/lib/router/app_pages.dart index 996869be..d6b2f9a9 100644 --- a/lib/router/app_pages.dart +++ b/lib/router/app_pages.dart @@ -37,6 +37,7 @@ import '../pages/setting/pages/color_select.dart'; import '../pages/setting/pages/display_mode.dart'; import '../pages/setting/pages/font_size_select.dart'; import '../pages/setting/pages/play_speed_set.dart'; +import '../pages/setting/recommend_setting.dart'; import '../pages/setting/play_setting.dart'; import '../pages/setting/privacy_setting.dart'; import '../pages/setting/style_setting.dart'; @@ -100,7 +101,8 @@ class Routes { // 二级回复 CustomGetPage( name: '/replyReply', page: () => const VideoReplyReplyPanel()), - + // 推荐设置 + CustomGetPage(name: '/recommendSetting', page: () => const RecommendSetting()), // 播放设置 CustomGetPage(name: '/playSetting', page: () => const PlaySetting()), // 外观设置 diff --git a/lib/utils/storage.dart b/lib/utils/storage.dart index f59a7bc1..c412606f 100644 --- a/lib/utils/storage.dart +++ b/lib/utils/storage.dart @@ -120,17 +120,19 @@ class SettingBoxKey { /// 隐私 blackMidsList = 'blackMidsList', + /// 推荐 + enableRcmdDynamic = 'enableRcmdDynamic', + defaultRcmdType = 'defaultRcmdType', + enableSaveLastData = 'enableSaveLastData', + /// 其他 autoUpdate = 'autoUpdate', - defaultRcmdType = 'defaultRcmdType', replySortType = 'replySortType', defaultDynamicType = 'defaultDynamicType', enableHotKey = 'enableHotKey', enableQuickFav = 'enableQuickFav', enableWordRe = 'enableWordRe', enableSearchWord = 'enableSearchWord', - enableRcmdDynamic = 'enableRcmdDynamic', - enableSaveLastData = 'enableSaveLastData', enableSystemProxy = 'enableSystemProxy', enableAi = 'enableAi'; From 9122dd7f3a16c3259b262ee52558fb9b0ca426df Mon Sep 17 00:00:00 2001 From: orz12 Date: Sat, 20 Jan 2024 17:07:10 +0800 Subject: [PATCH 002/220] =?UTF-8?q?mod:=20=E6=96=B0=E5=A2=9E=E6=8E=A8?= =?UTF-8?q?=E8=8D=90=E8=BF=87=E6=BB=A4=E5=99=A8=EF=BC=8C=E5=9B=9E=E9=80=80?= =?UTF-8?q?model=E8=BD=AC=E6=8D=A2=E4=BF=AE=E6=94=B9=EF=BC=8C=E7=A7=BB?= =?UTF-8?q?=E9=99=A4=E4=B8=8D=E5=BF=85=E8=A6=81=E7=9A=84futureBuilder?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/common/widgets/video_card_h.dart | 5 +- lib/common/widgets/video_card_v.dart | 12 +- lib/http/video.dart | 16 ++- lib/main.dart | 2 + lib/models/home/rcmd/result.dart | 20 ++- lib/models/home/rcmd/result.g.dart | 2 +- lib/models/model_rec_video_item.dart | 11 +- lib/models/model_rec_video_item.g.dart | 4 +- lib/pages/rcmd/controller.dart | 19 ++- lib/pages/rcmd/view.dart | 24 ++-- lib/pages/setting/recommend_setting.dart | 151 ++++++++++++++++++++--- lib/utils/recommend_filter.dart | 52 ++++++++ lib/utils/storage.dart | 5 + lib/utils/utils.dart | 11 +- 14 files changed, 274 insertions(+), 60 deletions(-) create mode 100644 lib/utils/recommend_filter.dart diff --git a/lib/common/widgets/video_card_h.dart b/lib/common/widgets/video_card_h.dart index b00f1759..5d39bc65 100644 --- a/lib/common/widgets/video_card_h.dart +++ b/lib/common/widgets/video_card_h.dart @@ -324,8 +324,9 @@ class VideoContent extends StatelessWidget { reSrc: 11, ); SmartDialog.dismiss(); - SmartDialog.showToast( - res['msg'] ?? '成功'); + SmartDialog.showToast(res['code'] == 0 + ? '成功' + : res['msg']); }, child: const Text('确认'), ) diff --git a/lib/common/widgets/video_card_v.dart b/lib/common/widgets/video_card_v.dart index c5577af3..dfc7eb94 100644 --- a/lib/common/widgets/video_card_v.dart +++ b/lib/common/widgets/video_card_v.dart @@ -158,12 +158,12 @@ class VideoCardV extends StatelessWidget { height: maxHeight, ), ), - if (videoItem.duration != null) + if (videoItem.duration > 0) if (crossAxisCount == 1) ...[ PBadge( bottom: 10, right: 10, - text: videoItem.duration, + text: Utils.timeFormat(videoItem.duration), ) ] else ...[ PBadge( @@ -171,7 +171,7 @@ class VideoCardV extends StatelessWidget { right: 7, size: 'small', type: 'gray', - text: videoItem.duration, + text: Utils.timeFormat(videoItem.duration), ) ], ], @@ -330,10 +330,8 @@ class VideoStat extends StatelessWidget { color: Theme.of(context).colorScheme.outline, ), children: [ - if (videoItem.stat.view != '-') - TextSpan(text: '${videoItem.stat.view}观看'), - if (videoItem.stat.danmu != '-') - TextSpan(text: ' • ${videoItem.stat.danmu}弹幕'), + TextSpan(text: '${Utils.numFormat(videoItem.stat.view)}观看'), + TextSpan(text: ' • ${Utils.numFormat(videoItem.stat.danmu)}弹幕'), ], ), ); diff --git a/lib/http/video.dart b/lib/http/video.dart index 39c961cd..a48dd11b 100644 --- a/lib/http/video.dart +++ b/lib/http/video.dart @@ -9,6 +9,7 @@ import '../models/user/fav_folder.dart'; import '../models/video/ai.dart'; import '../models/video/play/url.dart'; import '../models/video_detail_res.dart'; +import '../utils/recommend_filter.dart'; import '../utils/storage.dart'; import '../utils/wbi_sign.dart'; import 'api.dart'; @@ -49,7 +50,10 @@ class VideoHttp { if (i['goto'] == 'av' && (i['owner'] != null && !blackMidsList.contains(i['owner']['mid']))) { - list.add(RecVideoItemModel.fromJson(i)); + RecVideoItemModel videoItem = RecVideoItemModel.fromJson(i); + if (!RecommendFilter.filter(videoItem)){ + list.add(videoItem); + } } } return {'status': true, 'data': list}; @@ -93,7 +97,10 @@ class VideoHttp { (!enableRcmdDynamic ? i['card_goto'] != 'picture' : true) && (i['args'] != null && !blackMidsList.contains(i['args']['up_mid']))) { - list.add(RecVideoItemAppModel.fromJson(i)); + RecVideoItemAppModel videoItem = RecVideoItemAppModel.fromJson(i); + if (!RecommendFilter.filter(videoItem)){ + list.add(videoItem); + } } } return {'status': true, 'data': list}; @@ -209,7 +216,10 @@ class VideoHttp { if (res.data['code'] == 0) { List list = []; for (var i in res.data['data']) { - list.add(HotVideoItemModel.fromJson(i)); + HotVideoItemModel videoItem = HotVideoItemModel.fromJson(i); + if (!RecommendFilter.filter(videoItem, relatedVideos: true)){ + list.add(videoItem); + } } return {'status': true, 'data': list}; } else { diff --git a/lib/main.dart b/lib/main.dart index 4e1482d7..29b8d118 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -21,6 +21,7 @@ import 'package:pilipala/utils/app_scheme.dart'; import 'package:pilipala/utils/data.dart'; import 'package:pilipala/utils/storage.dart'; import 'package:media_kit/media_kit.dart'; // Provides [Player], [Media], [Playlist] etc. +import 'package:pilipala/utils/recommend_filter.dart'; void main() async { WidgetsFlutterBinding.ensureInitialized(); @@ -32,6 +33,7 @@ void main() async { await setupServiceLocator(); Request(); await Request.setCookie(); + RecommendFilter(); runApp(const MyApp()); // 小白条、导航栏沉浸 SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge); diff --git a/lib/models/home/rcmd/result.dart b/lib/models/home/rcmd/result.dart index a2a8006d..4e810491 100644 --- a/lib/models/home/rcmd/result.dart +++ b/lib/models/home/rcmd/result.dart @@ -40,7 +40,7 @@ class RecVideoItemAppModel { @HiveField(5) RcmdStat? stat; @HiveField(6) - String? duration; + int? duration; @HiveField(7) String? title; @HiveField(8) @@ -79,13 +79,27 @@ class RecVideoItemAppModel { cid = json['player_args'] != null ? json['player_args']['cid'] : -1; pic = json['cover']; stat = RcmdStat.fromJson(json); - duration = json['cover_right_text']; + // 改用player_args中的duration作为原始数据（秒数） + duration = json['player_args'] != null + ? json['player_args']['duration'] + : -1; + //duration = json['cover_right_text']; title = json['title']; - isFollowed = 0; owner = RcmdOwner.fromJson(json); rcmdReason = json['rcmd_reason_style'] != null ? RcmdReason.fromJson(json['rcmd_reason_style']) : null; + // 由于app端api并不会直接返回与owner的关注状态 + // 所以借用推荐原因是否为“已关注”、“新关注”等判别关注状态，从而与web端接口等效 + isFollowed = rcmdReason != null && + rcmdReason!.content != null && + rcmdReason!.content!.contains('关注') + ? 1 + : 0; + // 如果是，就无需再显示推荐原因，交由view统一处理即可 + if (isFollowed == 1) { + rcmdReason = null; + } goto = json['goto']; param = int.parse(json['param']); uri = json['uri']; diff --git a/lib/models/home/rcmd/result.g.dart b/lib/models/home/rcmd/result.g.dart index 43bf4bcf..f46886e8 100644 --- a/lib/models/home/rcmd/result.g.dart +++ b/lib/models/home/rcmd/result.g.dart @@ -23,7 +23,7 @@ class RecVideoItemAppModelAdapter extends TypeAdapter { cid: fields[3] as int?, pic: fields[4] as String?, stat: fields[5] as RcmdStat?, - duration: fields[6] as String?, + duration: fields[6] as int?, title: fields[7] as String?, isFollowed: fields[8] as int?, owner: fields[9] as RcmdOwner?, diff --git a/lib/models/model_rec_video_item.dart b/lib/models/model_rec_video_item.dart index bd42fd82..1503f192 100644 --- a/lib/models/model_rec_video_item.dart +++ b/lib/models/model_rec_video_item.dart @@ -1,5 +1,3 @@ -import 'package:pilipala/utils/utils.dart'; - import './model_owner.dart'; import 'package:hive/hive.dart'; @@ -38,7 +36,7 @@ class RecVideoItemModel { @HiveField(6) String? title = ''; @HiveField(7) - String? duration = ''; + int? duration = -1; @HiveField(8) int? pubdate = -1; @HiveField(9) @@ -58,7 +56,7 @@ class RecVideoItemModel { uri = json["uri"]; pic = json["pic"]; title = json["title"]; - duration = Utils.tampToSeektime(json["duration"]); + duration = json["duration"]; pubdate = json["pubdate"]; owner = Owner.fromJson(json["owner"]); stat = Stat.fromJson(json["stat"]); @@ -77,14 +75,15 @@ class Stat { this.danmu, }); @HiveField(0) - String? view; + int? view; @HiveField(1) int? like; @HiveField(2) int? danmu; Stat.fromJson(Map json) { - view = Utils.numFormat(json["view"]); + // 无需在model中转换以保留原始数据，在view层处理即可 + view = json["view"]; like = json["like"]; danmu = json['danmaku']; } diff --git a/lib/models/model_rec_video_item.g.dart b/lib/models/model_rec_video_item.g.dart index 1de6ab03..dc614354 100644 --- a/lib/models/model_rec_video_item.g.dart +++ b/lib/models/model_rec_video_item.g.dart @@ -24,7 +24,7 @@ class RecVideoItemModelAdapter extends TypeAdapter { uri: fields[4] as String?, pic: fields[5] as String?, title: fields[6] as String?, - duration: fields[7] as String?, + duration: fields[7] as int?, pubdate: fields[8] as int?, owner: fields[9] as Owner?, stat: fields[10] as Stat?, @@ -87,7 +87,7 @@ class StatAdapter extends TypeAdapter { for (int i = 0; i < numOfFields; i++) reader.readByte(): reader.read(), }; return Stat( - view: fields[0] as String?, + view: fields[0] as int?, like: fields[1] as int?, danmu: fields[2] as int?, ); diff --git a/lib/pages/rcmd/controller.dart b/lib/pages/rcmd/controller.dart index ed98606a..54cb8c14 100644 --- a/lib/pages/rcmd/controller.dart +++ b/lib/pages/rcmd/controller.dart @@ -55,12 +55,13 @@ class RcmdController extends GetxController { } late final Map res; switch (defaultRcmdType) { - case 'app': case 'notLogin': - res = await VideoHttp.rcmdVideoListApp( - loginStatus: defaultRcmdType != 'notLogin', - freshIdx: _currentPage, - ); - break; + case 'app': + case 'notLogin': + res = await VideoHttp.rcmdVideoListApp( + loginStatus: defaultRcmdType != 'notLogin', + freshIdx: _currentPage, + ); + break; default: //'web' res = await VideoHttp.rcmdVideoList( freshIdx: _currentPage, @@ -83,10 +84,16 @@ class RcmdController extends GetxController { } else if (type == 'onLoad') { videoList.addAll(res['data']); } + // 目前仅支持app端系列保存缓存 if (defaultRcmdType != 'web') { recVideo.put('cacheList', res['data']); } _currentPage += 1; + // 若videoList数量太小，可能会影响翻页，此时再次请求 + // 为避免请求到的数据太少时还在反复请求，要求本次返回数据大于1条才触发 + if (res['data'].length > 1 && videoList.length < 10){ + queryRcmdFeed('onLoad'); + } } else { Get.snackbar('提示', res['msg']); } diff --git a/lib/pages/rcmd/view.dart b/lib/pages/rcmd/view.dart index 0a345511..687eacd1 100644 --- a/lib/pages/rcmd/view.dart +++ b/lib/pages/rcmd/view.dart @@ -1,5 +1,4 @@ import 'dart:async'; -import 'dart:io'; import 'package:easy_debounce/easy_throttle.dart'; import 'package:flutter/material.dart'; @@ -8,7 +7,7 @@ import 'package:get/get.dart'; import 'package:pilipala/common/constants.dart'; import 'package:pilipala/common/skeleton/video_card_v.dart'; import 'package:pilipala/common/widgets/animated_dialog.dart'; -import 'package:pilipala/common/widgets/http_error.dart'; +// import 'package:pilipala/common/widgets/http_error.dart'; import 'package:pilipala/common/widgets/overlay_pop.dart'; import 'package:pilipala/common/widgets/video_card_v.dart'; import 'package:pilipala/pages/home/index.dart'; @@ -26,7 +25,6 @@ class RcmdPage extends StatefulWidget { class _RcmdPageState extends State with AutomaticKeepAliveClientMixin { final RcmdController _rcmdController = Get.put(RcmdController()); - late Future _futureBuilderFuture; @override bool get wantKeepAlive => true; @@ -34,7 +32,7 @@ class _RcmdPageState extends State @override void initState() { super.initState(); - _futureBuilderFuture = _rcmdController.queryRcmdFeed('init'); + _rcmdController.queryRcmdFeed('init'); ScrollController scrollController = _rcmdController.scrollController; StreamController mainStream = Get.find().bottomBarStream; @@ -90,21 +88,21 @@ class _RcmdPageState extends State slivers: [ SliverPadding( padding: - const EdgeInsets.fromLTRB(0, StyleString.safeSpace, 0, 0), - sliver: Obx(() { - // 使用Obx来监听数据的变化 - if (_rcmdController.isLoadingMore) { - // 如果正在加载，则显示骨架屏 + const EdgeInsets.fromLTRB(0, StyleString.safeSpace, 0, 0), + sliver: Obx(() { // 使用Obx来监听数据的变化 + if (_rcmdController.isLoadingMore && _rcmdController.videoList.isEmpty) { return contentGrid(_rcmdController, []); + // 如果正在加载并且列表为空，则显示加载指示器 + // return const SliverToBoxAdapter( + // child: Center(child: CircularProgressIndicator()), + // ); } else { // 显示视频列表 - return contentGrid( - _rcmdController, - _rcmdController.videoList); + return contentGrid(_rcmdController, _rcmdController.videoList); } }), ), - LoadingMore(ctr: _rcmdController) + LoadingMore(ctr: _rcmdController), ], ), ), diff --git a/lib/pages/setting/recommend_setting.dart b/lib/pages/setting/recommend_setting.dart index 8e049bc4..ab8ec063 100644 --- a/lib/pages/setting/recommend_setting.dart +++ b/lib/pages/setting/recommend_setting.dart @@ -4,6 +4,7 @@ import 'package:hive/hive.dart'; import 'package:pilipala/http/member.dart'; import 'package:pilipala/models/common/rcmd_type.dart'; import 'package:pilipala/pages/setting/widgets/select_dialog.dart'; +import 'package:pilipala/utils/recommend_filter.dart'; import 'package:pilipala/utils/storage.dart'; import 'widgets/switch_item.dart'; @@ -23,6 +24,9 @@ class _RecommendSettingState extends State { late dynamic userInfo; bool userLogin = false; late dynamic accessKeyInfo; + // late int filterUnfollowedRatio; + late int minDurationForRcmd; + late int minLikeRatioForRecommend; @override void initState() { @@ -33,6 +37,12 @@ class _RecommendSettingState extends State { userInfo = userInfoCache.get('userInfoCache'); userLogin = userInfo != null; accessKeyInfo = localCache.get(LocalCacheKey.accessKey, defaultValue: null); + // filterUnfollowedRatio = setting + // .get(SettingBoxKey.filterUnfollowedRatio, defaultValue: 0); + minDurationForRcmd = + setting.get(SettingBoxKey.minDurationForRcmd, defaultValue: 0); + minLikeRatioForRecommend = + setting.get(SettingBoxKey.minLikeRatioForRecommend, defaultValue: 0); } @override @@ -53,23 +63,11 @@ class _RecommendSettingState extends State { ), body: ListView( children: [ - const SetSwitchItem( - title: '推荐动态', - subTitle: '是否在推荐内容中展示动态', - setKey: SettingBoxKey.enableRcmdDynamic, - defaultVal: true, - ), - const SetSwitchItem( - title: '首页推荐刷新', - subTitle: '下拉刷新时保留上次内容', - setKey: SettingBoxKey.enableSaveLastData, - defaultVal: false, - ), ListTile( dense: false, title: Text('首页推荐类型', style: titleStyle), subtitle: Text( - '当前使用「$defaultRcmdType端」推荐', + '当前使用「$defaultRcmdType端」推荐¹', style: subTitleStyle, ), onTap: () async { @@ -100,7 +98,7 @@ class _RecommendSettingState extends State { return AlertDialog( title: const Text('提示'), content: const Text( - '使用app端推荐需获取access_key，有小概率触发风控导致账号退出（在官方app重新登录即可解除），是否继续？'), + '使用app端推荐需获取access_key，有小概率触发风控导致账号退出（在官方版本app重新登录即可解除），是否继续？'), actions: [ TextButton( onPressed: () { @@ -130,6 +128,131 @@ class _RecommendSettingState extends State { } }, ), + const SetSwitchItem( + title: '推荐动态', + subTitle: '是否在推荐内容中展示动态(仅app端)', + setKey: SettingBoxKey.enableRcmdDynamic, + defaultVal: true, + ), + const SetSwitchItem( + title: '首页推荐刷新', + subTitle: '下拉刷新时保留上次内容', + setKey: SettingBoxKey.enableSaveLastData, + defaultVal: false, + ), + // 分割线 + const Divider(height: 1), + ListTile( + dense: false, + title: Text('点赞率过滤', style: titleStyle), + subtitle: Text( + '过滤掉点赞数/播放量「小于$minLikeRatioForRecommend%」的推荐视频(仅web端)', + style: subTitleStyle, + ), + onTap: () async { + int? result = await showDialog( + context: context, + builder: (context) { + return SelectDialog( + title: '选择点赞率（0即不过滤）', + value: minLikeRatioForRecommend, + values: [0, 1, 2, 3, 4].map((e) { + return {'title': '$e %', 'value': e}; + }).toList()); + }, + ); + if (result != null) { + minLikeRatioForRecommend = result; + setting.put(SettingBoxKey.minLikeRatioForRecommend, result); + RecommendFilter.update(); + setState(() {}); + } + }, + ), + ListTile( + dense: false, + title: Text('视频时长过滤', style: titleStyle), + subtitle: Text( + '过滤掉时长「小于$minDurationForRcmd秒」的推荐视频', + style: subTitleStyle, + ), + onTap: () async { + int? result = await showDialog( + context: context, + builder: (context) { + return SelectDialog( + title: '选择时长（0即不过滤）', + value: minDurationForRcmd, + values: [0, 30, 60, 90, 120].map((e) { + return {'title': '$e 秒', 'value': e}; + }).toList()); + }, + ); + if (result != null) { + minDurationForRcmd = result; + setting.put(SettingBoxKey.minDurationForRcmd, result); + RecommendFilter.update(); + setState(() {}); + } + }, + ), + SetSwitchItem( + title: '已关注Up豁免推荐过滤', + subTitle: '推荐中已关注用户发布的内容不会被过滤', + setKey: SettingBoxKey.exemptFilterForFollowed, + defaultVal: true, + callFn: (_) => {RecommendFilter.update}, + ), + // ListTile( + // dense: false, + // title: Text('按比例过滤未关注Up', style: titleStyle), + // subtitle: Text( + // '滤除推荐中占比「$filterUnfollowedRatio%」的未关注用户发布的内容', + // style: subTitleStyle, + // ), + // onTap: () async { + // int? result = await showDialog( + // context: context, + // builder: (context) { + // return SelectDialog( + // title: '选择滤除比例（0即不过滤）', + // value: filterUnfollowedRatio, + // values: [0, 16, 32, 48, 64].map((e) { + // return {'title': '$e %', 'value': e}; + // }).toList()); + // }, + // ); + // if (result != null) { + // filterUnfollowedRatio = result; + // setting.put( + // SettingBoxKey.filterUnfollowedRatio, result); + // RecommendFilter.update(); + // setState(() {}); + // } + // }, + // ), + SetSwitchItem( + title: '过滤器也应用于相关视频', + subTitle: '视频详情页的相关视频也进行过滤²', + setKey: SettingBoxKey.applyFilterToRelatedVideos, + defaultVal: true, + callFn: (_) => {RecommendFilter.update}, + ), + ListTile( + dense: true, + subtitle: Text( + '¹ 若默认web端推荐不太符合预期，可尝试切换至app端。\n' + '¹ 选择“模拟未登录(notLogin)”，将以空的key请求推荐接口，但播放页仍会携带用户信息，保证账号能正常记录进度、点赞投币等。\n\n' + '² 由于接口未提供关注信息，无法豁免相关视频中的已关注Up。\n\n' + '* 其它（如热门视频、手动搜索、链接跳转等）均不受过滤器影响。\n' + '* 设定较严苛的条件可导致推荐项数锐减或多次请求，请酌情选择。\n' + '* 后续可能会增加更多过滤条件，敬请期待。', + style: Theme.of(context) + .textTheme + .labelSmall! + .copyWith(color: Theme.of(context).colorScheme.outline.withOpacity(0.7)), + ), + ) ], ), ); diff --git a/lib/utils/recommend_filter.dart b/lib/utils/recommend_filter.dart new file mode 100644 index 00000000..113e2261 --- /dev/null +++ b/lib/utils/recommend_filter.dart @@ -0,0 +1,52 @@ +import 'dart:math'; + +import 'storage.dart'; + +class RecommendFilter { + // static late int filterUnfollowedRatio; + static late int minDurationForRcmd; + static late int minLikeRatioForRecommend; + static late bool exemptFilterForFollowed; + static late bool applyFilterToRelatedVideos; + RecommendFilter() { + update(); + } + + static void update() { + var setting = GStrorage.setting; + // filterUnfollowedRatio = + // setting.get(SettingBoxKey.filterUnfollowedRatio, defaultValue: 0); + minDurationForRcmd = + setting.get(SettingBoxKey.minDurationForRcmd, defaultValue: 0); + minLikeRatioForRecommend = + setting.get(SettingBoxKey.minLikeRatioForRecommend, defaultValue: 0); + exemptFilterForFollowed = + setting.get(SettingBoxKey.exemptFilterForFollowed, defaultValue: true); + applyFilterToRelatedVideos = setting + .get(SettingBoxKey.applyFilterToRelatedVideos, defaultValue: true); + } + + static bool filter(dynamic videoItem, {bool relatedVideos = false}) { + if (relatedVideos && !applyFilterToRelatedVideos) { + return false; + } + //由于相关视频中没有已关注标签，只能视为非关注视频 + if (!relatedVideos && + videoItem.isFollowed == 1 && + exemptFilterForFollowed) { + return false; + } + if (videoItem.duration > 0 && videoItem.duration < minDurationForRcmd) { + return true; + } + if (videoItem.stat.view is int && + videoItem.stat.view > -1 && + videoItem.stat.like is int && + videoItem.stat.like > -1 && + videoItem.stat.like * 100 < + minLikeRatioForRecommend * videoItem.stat.view) { + return true; + } + return false; + } +} diff --git a/lib/utils/storage.dart b/lib/utils/storage.dart index c412606f..fdb9ee02 100644 --- a/lib/utils/storage.dart +++ b/lib/utils/storage.dart @@ -124,6 +124,11 @@ class SettingBoxKey { enableRcmdDynamic = 'enableRcmdDynamic', defaultRcmdType = 'defaultRcmdType', enableSaveLastData = 'enableSaveLastData', + minDurationForRcmd = 'minDurationForRcmd', + minLikeRatioForRecommend = 'minLikeRatioForRecommend', + exemptFilterForFollowed = 'exemptFilterForFollowed', + //filterUnfollowedRatio = 'filterUnfollowedRatio', + applyFilterToRelatedVideos = 'applyFilterToRelatedVideos', /// 其他 autoUpdate = 'autoUpdate', diff --git a/lib/utils/utils.dart b/lib/utils/utils.dart index 08693d24..f0b56fc4 100644 --- a/lib/utils/utils.dart +++ b/lib/utils/utils.dart @@ -9,7 +9,6 @@ import 'package:crypto/crypto.dart'; import 'package:device_info_plus/device_info_plus.dart'; import 'package:flutter/material.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; -import 'package:get/get_utils/get_utils.dart'; import 'package:package_info_plus/package_info_plus.dart'; import 'package:path_provider/path_provider.dart'; import 'package:url_launcher/url_launcher.dart'; @@ -28,10 +27,16 @@ class Utils { return tempPath; } - static String numFormat(int number) { + static String numFormat(dynamic number) { + if (number == null){ + return '0'; + } + if (number is String) { + return number; + } final String res = (number / 10000).toString(); if (int.parse(res.split('.')[0]) >= 1) { - return '${(number / 10000).toPrecision(1)}万'; + return '${(number / 10000).toStringAsFixed(1)}万'; } else { return number.toString(); } From e052c6eafeafad06f1d3e13edc3d854f4eff64e6 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sun, 21 Jan 2024 23:49:32 +0800 Subject: [PATCH 003/220] =?UTF-8?q?feat:=20=E9=A6=96=E9=A1=B5tabbar=20?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/models/common/tab_type.dart | 1 + lib/pages/home/controller.dart | 69 +++++++++------ lib/pages/home/view.dart | 59 ++++++------- lib/pages/setting/pages/home_tabbar_set.dart | 90 ++++++++++++++++++++ lib/pages/setting/style_setting.dart | 5 ++ lib/router/app_pages.dart | 3 + lib/utils/storage.dart | 3 +- 7 files changed, 168 insertions(+), 62 deletions(-) create mode 100644 lib/pages/setting/pages/home_tabbar_set.dart diff --git a/lib/models/common/tab_type.dart b/lib/models/common/tab_type.dart index 90d19029..e530d7e5 100644 --- a/lib/models/common/tab_type.dart +++ b/lib/models/common/tab_type.dart @@ -9,6 +9,7 @@ enum TabType { live, rcmd, hot, bangumi } extension TabTypeDesc on TabType { String get description => ['直播', '推荐', '热门', '番剧'][index]; + String get id => ['live', 'rcmd', 'hot', 'bangumi'][index]; } List tabsConfig = [ diff --git a/lib/pages/home/controller.dart b/lib/pages/home/controller.dart index 614d103a..64510ee1 100644 --- a/lib/pages/home/controller.dart +++ b/lib/pages/home/controller.dart @@ -8,12 +8,13 @@ import 'package:pilipala/utils/storage.dart'; class HomeController extends GetxController with GetTickerProviderStateMixin { bool flag = false; - late List tabs; + late RxList tabs = [].obs; RxInt initialIndex = 1.obs; late TabController tabController; late List tabsCtrList; late List tabsPageList; Box userInfoCache = GStrorage.userInfo; + Box settingStorage = GStrorage.setting; RxBool userLogin = false.obs; RxString userFace = ''.obs; var userInfo; @@ -21,6 +22,8 @@ class HomeController extends GetxController with GetTickerProviderStateMixin { late final StreamController searchBarStream = StreamController.broadcast(); late bool hideSearchBar; + late List defaultTabs; + late List tabbarSort; @override void onInit() { @@ -28,34 +31,10 @@ class HomeController extends GetxController with GetTickerProviderStateMixin { userInfo = userInfoCache.get('userInfoCache'); userLogin.value = userInfo != null; userFace.value = userInfo != null ? userInfo.face : ''; - // 进行tabs配置 - tabs = tabsConfig; - tabsCtrList = tabsConfig.map((e) => e['ctr']).toList(); - tabsPageList = tabsConfig.map((e) => e['page']).toList(); - - tabController = TabController( - initialIndex: initialIndex.value, - length: tabs.length, - vsync: this, - ); + setTabConfig(); hideSearchBar = setting.get(SettingBoxKey.hideSearchBar, defaultValue: true); - - // 监听 tabController 切换 - tabController.animation!.addListener(() { - if (tabController.indexIsChanging) { - if (initialIndex.value != tabController.index) { - initialIndex.value = tabController.index; - } - } else { - final int temp = tabController.animation!.value.round(); - if (initialIndex.value != temp) { - initialIndex.value = temp; - tabController.index = initialIndex.value; - } - } - }); } void onRefresh() { @@ -77,4 +56,42 @@ class HomeController extends GetxController with GetTickerProviderStateMixin { if (val) return; userFace.value = userInfo != null ? userInfo.face : ''; } + + void setTabConfig() async { + defaultTabs = tabsConfig; + tabbarSort = settingStorage.get(SettingBoxKey.tabbarSort, + defaultValue: ['live', 'rcmd', 'hot', 'bangumi']); + + tabs.value = defaultTabs + .where((i) => tabbarSort.contains((i['type'] as TabType).id)) + .toList(); + + if (tabbarSort.contains(TabType.rcmd.id)) { + initialIndex.value = tabbarSort.indexOf(TabType.rcmd.id); + } else { + initialIndex.value = 0; + } + tabsCtrList = tabs.map((e) => e['ctr']).toList(); + tabsPageList = tabs.map((e) => e['page']).toList(); + + tabController = TabController( + initialIndex: initialIndex.value, + length: tabs.length, + vsync: this, + ); + // 监听 tabController 切换 + tabController.animation!.addListener(() { + if (tabController.indexIsChanging) { + if (initialIndex.value != tabController.index) { + initialIndex.value = tabController.index; + } + } else { + final int temp = tabController.animation!.value.round(); + if (initialIndex.value != temp) { + initialIndex.value = temp; + tabController.index = initialIndex.value; + } + } + }); + } } diff --git a/lib/pages/home/view.dart b/lib/pages/home/view.dart index f9823334..c31460fb 100644 --- a/lib/pages/home/view.dart +++ b/lib/pages/home/view.dart @@ -90,7 +90,11 @@ class _HomePageState extends State ctr: _homeController, callback: showUserBottomSheet, ), - const CustomTabs(), + if (_homeController.tabs.length > 1) ...[ + const CustomTabs(), + ] else ...[ + const SizedBox(height: 6), + ], Expanded( child: TabBarView( controller: _homeController.tabController, @@ -250,17 +254,6 @@ class CustomTabs extends StatefulWidget { class _CustomTabsState extends State { final HomeController _homeController = Get.put(HomeController()); - int currentTabIndex = 1; - - @override - void initState() { - super.initState(); - _homeController.tabController.addListener(listen); - } - - void listen() { - _homeController.initialIndex.value = _homeController.tabController.index; - } void onTap(int index) { feedBack(); @@ -271,34 +264,30 @@ class _CustomTabsState extends State { _homeController.tabController.index = index; } - @override - void dispose() { - super.dispose(); - _homeController.tabController.removeListener(listen); - } - @override Widget build(BuildContext context) { return Container( height: 44, margin: const EdgeInsets.only(top: 4), - child: ListView.separated( - padding: const EdgeInsets.symmetric(horizontal: 14.0), - scrollDirection: Axis.horizontal, - itemCount: _homeController.tabs.length, - separatorBuilder: (BuildContext context, int index) { - return const SizedBox(width: 10); - }, - itemBuilder: (BuildContext context, int index) { - String label = _homeController.tabs[index]['label']; - return Obx( - () => CustomChip( - onTap: () => onTap(index), - label: label, - selected: index == _homeController.initialIndex.value, - ), - ); - }, + child: Obx( + () => ListView.separated( + padding: const EdgeInsets.symmetric(horizontal: 14.0), + scrollDirection: Axis.horizontal, + itemCount: _homeController.tabs.length, + separatorBuilder: (BuildContext context, int index) { + return const SizedBox(width: 10); + }, + itemBuilder: (BuildContext context, int index) { + String label = _homeController.tabs[index]['label']; + return Obx( + () => CustomChip( + onTap: () => onTap(index), + label: label, + selected: index == _homeController.initialIndex.value, + ), + ); + }, + ), ), ); } diff --git a/lib/pages/setting/pages/home_tabbar_set.dart b/lib/pages/setting/pages/home_tabbar_set.dart new file mode 100644 index 00000000..445ca4f5 --- /dev/null +++ b/lib/pages/setting/pages/home_tabbar_set.dart @@ -0,0 +1,90 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; +import 'package:hive/hive.dart'; +import 'package:pilipala/models/common/tab_type.dart'; +import 'package:pilipala/utils/storage.dart'; + +class TabbarSetPage extends StatefulWidget { + const TabbarSetPage({super.key}); + + @override + State createState() => _TabbarSetPageState(); +} + +class _TabbarSetPageState extends State { + Box settingStorage = GStrorage.setting; + late List defaultTabs; + late List tabbarSort; + + @override + void initState() { + super.initState(); + defaultTabs = tabsConfig; + tabbarSort = settingStorage.get(SettingBoxKey.tabbarSort, + defaultValue: ['live', 'rcmd', 'hot', 'bangumi']); + } + + void saveEdit() { + List sortedTabbar = defaultTabs + .where((i) => tabbarSort.contains((i['type'] as TabType).id)) + .map((i) => (i['type'] as TabType).id) + .toList(); + if (sortedTabbar.isEmpty) { + SmartDialog.showToast('请至少设置一项！'); + return; + } + settingStorage.put(SettingBoxKey.tabbarSort, sortedTabbar); + SmartDialog.showToast('保存成功，下次启动时生效'); + } + + void onReorder(int oldIndex, int newIndex) { + setState(() { + if (newIndex > oldIndex) { + newIndex -= 1; + } + final tabsItem = defaultTabs.removeAt(oldIndex); + defaultTabs.insert(newIndex, tabsItem); + }); + } + + @override + Widget build(BuildContext context) { + final listTiles = [ + for (int i = 0; i < defaultTabs.length; i++) ...[ + CheckboxListTile( + key: Key(defaultTabs[i]['label']), + value: tabbarSort.contains((defaultTabs[i]['type'] as TabType).id), + onChanged: (bool? newValue) { + String tabTypeId = (defaultTabs[i]['type'] as TabType).id; + if (!newValue!) { + tabbarSort.remove(tabTypeId); + } else { + tabbarSort.add(tabTypeId); + } + setState(() {}); + }, + title: Text(defaultTabs[i]['label']), + secondary: const Icon(Icons.drag_indicator_rounded), + ) + ] + ]; + + return Scaffold( + appBar: AppBar( + title: const Text('Tabbar编辑'), + actions: [ + TextButton(onPressed: () => saveEdit(), child: const Text('保存')), + const SizedBox(width: 12) + ], + ), + body: ReorderableListView( + onReorder: onReorder, + physics: const NeverScrollableScrollPhysics(), + footer: SizedBox( + height: MediaQuery.of(context).padding.bottom + 30, + ), + children: listTiles, + ), + ); + } +} diff --git a/lib/pages/setting/style_setting.dart b/lib/pages/setting/style_setting.dart index a4e39aa0..57ec110a 100644 --- a/lib/pages/setting/style_setting.dart +++ b/lib/pages/setting/style_setting.dart @@ -254,6 +254,11 @@ class _StyleSettingState extends State { onTap: () => Get.toNamed('/fontSizeSetting'), title: Text('字体大小', style: titleStyle), ), + ListTile( + dense: false, + onTap: () => Get.toNamed('/tabbarSetting'), + title: Text('首页tabbar', style: titleStyle), + ), if (Platform.isAndroid) ListTile( dense: false, diff --git a/lib/router/app_pages.dart b/lib/router/app_pages.dart index 996869be..64d8da31 100644 --- a/lib/router/app_pages.dart +++ b/lib/router/app_pages.dart @@ -36,6 +36,7 @@ import '../pages/setting/index.dart'; import '../pages/setting/pages/color_select.dart'; import '../pages/setting/pages/display_mode.dart'; import '../pages/setting/pages/font_size_select.dart'; +import '../pages/setting/pages/home_tabbar_set.dart'; import '../pages/setting/pages/play_speed_set.dart'; import '../pages/setting/play_setting.dart'; import '../pages/setting/privacy_setting.dart'; @@ -112,6 +113,8 @@ class Routes { // CustomGetPage(name: '/blackListPage', page: () => const BlackListPage()), CustomGetPage(name: '/colorSetting', page: () => const ColorSelectPage()), + // 首页tabbar + CustomGetPage(name: '/tabbarSetting', page: () => const TabbarSetPage()), CustomGetPage( name: '/fontSizeSetting', page: () => const FontSizeSelectPage()), // 屏幕帧率 diff --git a/lib/utils/storage.dart b/lib/utils/storage.dart index f59a7bc1..99037611 100644 --- a/lib/utils/storage.dart +++ b/lib/utils/storage.dart @@ -144,7 +144,8 @@ class SettingBoxKey { customRows = 'customRows', // 自定义列 enableMYBar = 'enableMYBar', hideSearchBar = 'hideSearchBar', // 收起顶栏 - hideTabBar = 'hideTabBar'; // 收起底栏 + hideTabBar = 'hideTabBar', // 收起底栏 + tabbarSort = 'tabbarSort'; // 首页tabbar } class LocalCacheKey { From 569184a507c9233fb0bb5c599e61d6dd76ab9f8d Mon Sep 17 00:00:00 2001 From: orz12 Date: Mon, 22 Jan 2024 12:03:17 +0800 Subject: [PATCH 004/220] =?UTF-8?q?opt:=20=E5=88=87=E6=8D=A2=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E6=97=B6=E9=94=80=E6=AF=81=E6=92=AD=E6=94=BE=E5=99=A8?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E6=8F=90=E5=8D=87=E6=80=A7=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/video/detail/view.dart | 78 ++++++++++++++++---------------- 1 file changed, 40 insertions(+), 38 deletions(-) diff --git a/lib/pages/video/detail/view.dart b/lib/pages/video/detail/view.dart index 59fa39b2..3d3c1c30 100644 --- a/lib/pages/video/detail/view.dart +++ b/lib/pages/video/detail/view.dart @@ -61,6 +61,7 @@ class _VideoDetailPageState extends State final Floating floating = Floating(); // 生命周期监听 late final AppLifecycleListener _lifecycleListener; + bool isShowing = true; @override void initState() { @@ -216,15 +217,15 @@ class _VideoDetailPageState extends State videoIntroController.isPaused = true; plPlayerController!.removeStatusLister(playerListener); plPlayerController!.pause(); - plPlayerController!.danmakuController?.pause(); - plPlayerController!.danmakuController?.clear(); } + setState(() => isShowing = false); super.didPushNext(); } @override // 返回当前页面时 void didPopNext() async { + setState(() => isShowing = true); videoDetailController.isFirstTime = false; final bool autoplay = autoPlayEnable; videoDetailController.playerInit(autoplay: autoplay); @@ -354,44 +355,45 @@ class _VideoDetailPageState extends State boxConstraints.maxHeight; return Stack( children: [ - FutureBuilder( - future: _futureBuilderFuture, - builder: (BuildContext context, - AsyncSnapshot snapshot) { - if (snapshot.hasData && - snapshot.data['status']) { - return Obx( - () => !videoDetailController - .autoPlay.value - ? const SizedBox() - : PLVideoPlayer( - controller: - plPlayerController!, - headerControl: - videoDetailController - .headerControl, - danmuWidget: Obx( - () => PlDanmaku( - key: Key( - videoDetailController - .danmakuCid - .value - .toString()), - cid: - videoDetailController - .danmakuCid - .value, - playerController: - plPlayerController!, + if (isShowing) + FutureBuilder( + future: _futureBuilderFuture, + builder: (BuildContext context, + AsyncSnapshot snapshot) { + if (snapshot.hasData && + snapshot.data['status']) { + return Obx( + () => !videoDetailController + .autoPlay.value + ? nil + : PLVideoPlayer( + controller: + plPlayerController!, + headerControl: + videoDetailController + .headerControl, + danmuWidget: Obx( + () => PlDanmaku( + key: Key( + videoDetailController + .danmakuCid + .value + .toString()), + cid: + videoDetailController + .danmakuCid + .value, + playerController: + plPlayerController!, + ), ), ), - ), - ); - } else { - return const SizedBox(); - } - }, - ), + ); + } else { + return const SizedBox(); + } + }, + ), /// 关闭自动播放时 手动播放 if (!videoDetailController From 103423abf7503e376a79039a74c56b82e5b5633d Mon Sep 17 00:00:00 2001 From: orz12 Date: Mon, 22 Jan 2024 12:04:00 +0800 Subject: [PATCH 005/220] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=83=A8?= =?UTF-8?q?=E5=88=86=E6=89=8B=E6=9C=BA=E6=A8=AA=E5=B1=8F=E4=B8=A4=E4=BE=A7?= =?UTF-8?q?=E4=B8=8D=E7=AD=89=E5=AE=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/video/detail/view.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/pages/video/detail/view.dart b/lib/pages/video/detail/view.dart index 3d3c1c30..278e2c64 100644 --- a/lib/pages/video/detail/view.dart +++ b/lib/pages/video/detail/view.dart @@ -292,8 +292,8 @@ class _VideoDetailPageState extends State plPlayerController?.isFullScreen.value == true, bottom: MediaQuery.of(context).orientation == Orientation.portrait && plPlayerController?.isFullScreen.value == true, - left: plPlayerController?.isFullScreen.value != true, - right: plPlayerController?.isFullScreen.value != true, + left: false,//plPlayerController?.isFullScreen.value != true, + right: false, //plPlayerController?.isFullScreen.value != true, child: Stack( children: [ Scaffold( From 1dd70f482fb2162992aeeb27f37a99e24698a7ab Mon Sep 17 00:00:00 2001 From: orz12 Date: Mon, 22 Jan 2024 12:54:32 +0800 Subject: [PATCH 006/220] =?UTF-8?q?fix:=20=E6=97=8B=E8=BD=AC=E6=A8=AA?= =?UTF-8?q?=E5=B1=8F=E4=BB=8D=E6=9C=89=E7=8A=B6=E6=80=81=E6=A0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/video/detail/view.dart | 362 ++++++++++++++++--------------- 1 file changed, 184 insertions(+), 178 deletions(-) diff --git a/lib/pages/video/detail/view.dart b/lib/pages/video/detail/view.dart index 278e2c64..507ea66e 100644 --- a/lib/pages/video/detail/view.dart +++ b/lib/pages/video/detail/view.dart @@ -281,18 +281,12 @@ class _VideoDetailPageState extends State final double videoHeight = MediaQuery.sizeOf(context).width * 9 / 16; final double pinnedHeaderHeight = statusBarHeight + kToolbarHeight + videoHeight; - if (MediaQuery.of(context).orientation == Orientation.landscape || - plPlayerController?.isFullScreen.value == true) { - enterFullScreen(); - } else { - exitFullScreen(); - } Widget childWhenDisabled = SafeArea( top: MediaQuery.of(context).orientation == Orientation.portrait && plPlayerController?.isFullScreen.value == true, bottom: MediaQuery.of(context).orientation == Orientation.portrait && plPlayerController?.isFullScreen.value == true, - left: false,//plPlayerController?.isFullScreen.value != true, + left: false, //plPlayerController?.isFullScreen.value != true, right: false, //plPlayerController?.isFullScreen.value != true, child: Stack( children: [ @@ -313,185 +307,197 @@ class _VideoDetailPageState extends State (BuildContext context, bool innerBoxIsScrolled) { return [ Obx( - () => SliverAppBar( - automaticallyImplyLeading: false, - // 假装使用一个非空变量，避免Obx检测不到而罢工 - pinned: videoDetailController.autoPlay.value ^ - false ^ - videoDetailController.autoPlay.value, - elevation: 0, - scrolledUnderElevation: 0, - forceElevated: innerBoxIsScrolled, - expandedHeight: MediaQuery.of(context).orientation == - Orientation.landscape || - plPlayerController?.isFullScreen.value == true - ? MediaQuery.sizeOf(context).height - - (MediaQuery.of(context).orientation == - Orientation.landscape - ? 0 - : MediaQuery.of(context).padding.top) - : videoHeight, - backgroundColor: Colors.black, - flexibleSpace: FlexibleSpaceBar( - background: PopScope( - canPop: - plPlayerController?.isFullScreen.value != true, - onPopInvoked: (bool didPop) { - if (plPlayerController?.isFullScreen.value == - true) { - plPlayerController! - .triggerFullScreen(status: false); - } - if (MediaQuery.of(context).orientation == - Orientation.landscape) { - verticalScreen(); - } - }, - child: LayoutBuilder( - builder: (BuildContext context, - BoxConstraints boxConstraints) { - final double maxWidth = boxConstraints.maxWidth; - final double maxHeight = - boxConstraints.maxHeight; - return Stack( - children: [ - if (isShowing) - FutureBuilder( - future: _futureBuilderFuture, - builder: (BuildContext context, - AsyncSnapshot snapshot) { - if (snapshot.hasData && - snapshot.data['status']) { - return Obx( - () => !videoDetailController - .autoPlay.value - ? nil - : PLVideoPlayer( - controller: - plPlayerController!, - headerControl: - videoDetailController - .headerControl, - danmuWidget: Obx( - () => PlDanmaku( - key: Key( - videoDetailController - .danmakuCid - .value - .toString()), - cid: - videoDetailController - .danmakuCid - .value, - playerController: - plPlayerController!, - ), - ), - ), - ); - } else { - return const SizedBox(); - } - }, - ), + () { + if (MediaQuery.of(context).orientation == + Orientation.landscape || + plPlayerController?.isFullScreen.value == true) { + enterFullScreen(); + } else { + exitFullScreen(); + } + return SliverAppBar( + automaticallyImplyLeading: false, + // 假装使用一个非空变量，避免Obx检测不到而罢工 + pinned: videoDetailController.autoPlay.value ^ + false ^ + videoDetailController.autoPlay.value, + elevation: 0, + scrolledUnderElevation: 0, + forceElevated: innerBoxIsScrolled, + expandedHeight: MediaQuery.of(context).orientation == + Orientation.landscape || + plPlayerController?.isFullScreen.value == true + ? MediaQuery.sizeOf(context).height - + (MediaQuery.of(context).orientation == + Orientation.landscape + ? 0 + : MediaQuery.of(context).padding.top) + : videoHeight, + backgroundColor: Colors.black, + flexibleSpace: FlexibleSpaceBar( + background: PopScope( + canPop: plPlayerController?.isFullScreen.value != + true, + onPopInvoked: (bool didPop) { + if (plPlayerController?.isFullScreen.value == + true) { + plPlayerController! + .triggerFullScreen(status: false); + } + if (MediaQuery.of(context).orientation == + Orientation.landscape) { + verticalScreen(); + } + }, + child: LayoutBuilder( + builder: (BuildContext context, + BoxConstraints boxConstraints) { + final double maxWidth = + boxConstraints.maxWidth; + final double maxHeight = + boxConstraints.maxHeight; + return Stack( + children: [ + if (isShowing) + FutureBuilder( + future: _futureBuilderFuture, + builder: (BuildContext context, + AsyncSnapshot snapshot) { + if (snapshot.hasData && + snapshot.data['status']) { + return Obx( + () => + !videoDetailController + .autoPlay.value + ? nil + : PLVideoPlayer( + controller: + plPlayerController!, + headerControl: + videoDetailController + .headerControl, + danmuWidget: Obx( + () => PlDanmaku( + key: Key(videoDetailController + .danmakuCid + .value + .toString()), + cid: videoDetailController + .danmakuCid + .value, + playerController: + plPlayerController!, + ), + ), + ), + ); + } else { + return const SizedBox(); + } + }, + ), - /// 关闭自动播放时 手动播放 - if (!videoDetailController - .autoPlay.value) ...[ - Obx( - () => Visibility( - visible: videoDetailController - .isShowCover.value, - child: Positioned( - top: 0, - left: 0, - right: 0, - child: GestureDetector( - onTap: () { - handlePlay(); - }, - child: NetworkImgLayer( - type: 'emote', - src: videoDetailController - .videoItem['pic'], - width: maxWidth, - height: maxHeight, + /// 关闭自动播放时 手动播放 + if (!videoDetailController + .autoPlay.value) ...[ + Obx( + () => Visibility( + visible: videoDetailController + .isShowCover.value, + child: Positioned( + top: 0, + left: 0, + right: 0, + child: GestureDetector( + onTap: () { + handlePlay(); + }, + child: NetworkImgLayer( + type: 'emote', + src: videoDetailController + .videoItem['pic'], + width: maxWidth, + height: maxHeight, + ), ), ), ), ), - ), - Obx( - () => Visibility( - visible: videoDetailController - .isShowCover.value && - videoDetailController - .isEffective.value, - child: Stack( - children: [ - Positioned( - top: 0, - left: 0, - right: 0, - child: AppBar( - primary: false, - foregroundColor: - Colors.white, - elevation: 0, - scrolledUnderElevation: 0, - backgroundColor: - Colors.transparent, - actions: [ - IconButton( - tooltip: '稍后再看', - onPressed: () async { - var res = await UserHttp - .toViewLater( - bvid: - videoDetailController - .bvid); - SmartDialog.showToast( - res['msg']); - }, - icon: const Icon(Icons - .history_outlined), - ), - const SizedBox(width: 14) - ], - ), - ), - Positioned( - right: 12, - bottom: 10, - child: TextButton.icon( - style: ButtonStyle( + Obx( + () => Visibility( + visible: videoDetailController + .isShowCover.value && + videoDetailController + .isEffective.value, + child: Stack( + children: [ + Positioned( + top: 0, + left: 0, + right: 0, + child: AppBar( + primary: false, + foregroundColor: + Colors.white, + elevation: 0, + scrolledUnderElevation: 0, backgroundColor: - MaterialStateProperty - .resolveWith( - (states) { - return Colors.white - .withOpacity(0.8); - }), + Colors.transparent, + actions: [ + IconButton( + tooltip: '稍后再看', + onPressed: () async { + var res = await UserHttp + .toViewLater( + bvid: videoDetailController + .bvid); + SmartDialog + .showToast( + res['msg']); + }, + icon: const Icon(Icons + .history_outlined), + ), + const SizedBox( + width: 14) + ], ), - onPressed: () => - handlePlay(), - icon: const Icon( - Icons.play_circle_outline, - size: 20, - ), - label: const Text('轻触封面播放'), ), - ), - ], - )), - ), - ] - ], - ); - }, - )), - ), - ), + Positioned( + right: 12, + bottom: 10, + child: TextButton.icon( + style: ButtonStyle( + backgroundColor: + MaterialStateProperty + .resolveWith( + (states) { + return Colors.white + .withOpacity(0.8); + }), + ), + onPressed: () => + handlePlay(), + icon: const Icon( + Icons + .play_circle_outline, + size: 20, + ), + label: + const Text('轻触封面播放'), + ), + ), + ], + )), + ), + ] + ], + ); + }, + )), + ), + ); + }, ), ]; }, From a68c04001b883636cce6c432bc86f6f8c427aa3a Mon Sep 17 00:00:00 2001 From: orz12 Date: Mon, 22 Jan 2024 13:19:29 +0800 Subject: [PATCH 007/220] =?UTF-8?q?fix:=20=E7=AB=96=E5=B1=8F=E5=85=A8?= =?UTF-8?q?=E5=B1=8F=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/video/detail/view.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/pages/video/detail/view.dart b/lib/pages/video/detail/view.dart index 507ea66e..dec474ba 100644 --- a/lib/pages/video/detail/view.dart +++ b/lib/pages/video/detail/view.dart @@ -304,7 +304,7 @@ class _VideoDetailPageState extends State body: ExtendedNestedScrollView( controller: _extendNestCtr, headerSliverBuilder: - (BuildContext context, bool innerBoxIsScrolled) { + (BuildContext context2, bool innerBoxIsScrolled) { return [ Obx( () { From 16895b5c32a2e26522323f4d40cc62c7f7a7a17f Mon Sep 17 00:00:00 2001 From: orz12 Date: Tue, 23 Jan 2024 15:12:52 +0800 Subject: [PATCH 008/220] =?UTF-8?q?fix:=20=E7=82=B9=E5=87=BB=E8=A7=86?= =?UTF-8?q?=E9=A2=91=E8=AF=84=E8=AE=BA=E5=8C=BA=E7=94=A8=E6=88=B7=E5=A4=B4?= =?UTF-8?q?=E5=83=8F=E5=90=8E=E8=BF=94=E5=9B=9E=E8=AF=A6=E6=83=85=E9=A1=B5?= =?UTF-8?q?=E7=81=B0=E5=B1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/video/detail/related/controller.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/pages/video/detail/related/controller.dart b/lib/pages/video/detail/related/controller.dart index eb1a14d5..f7042871 100644 --- a/lib/pages/video/detail/related/controller.dart +++ b/lib/pages/video/detail/related/controller.dart @@ -4,7 +4,7 @@ import 'package:pilipala/http/video.dart'; class ReleatedController extends GetxController { // 视频aid - String bvid = Get.parameters['bvid']!; + String bvid = Get.parameters['bvid'] ?? ""; // 推荐视频列表 List relatedVideoList = []; From aaeecc9e531d3340bce5a02074286e79d4015d6a Mon Sep 17 00:00:00 2001 From: orz12 Date: Wed, 24 Jan 2024 11:01:54 +0800 Subject: [PATCH 009/220] =?UTF-8?q?fix:=20=E9=87=8D=E5=8A=9B=E6=97=8B?= =?UTF-8?q?=E8=BD=AC=E5=90=8E=E5=88=92=E5=87=BA=E4=B8=8B=E6=96=B9=E7=9A=84?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/video/detail/view.dart | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/pages/video/detail/view.dart b/lib/pages/video/detail/view.dart index dec474ba..1ce78b3c 100644 --- a/lib/pages/video/detail/view.dart +++ b/lib/pages/video/detail/view.dart @@ -508,7 +508,9 @@ class _VideoDetailPageState extends State // }, /// 不收回 pinnedHeaderSliverHeightBuilder: () { - return plPlayerController?.isFullScreen.value == true + return MediaQuery.of(context).orientation == + Orientation.landscape || + plPlayerController?.isFullScreen.value == true ? MediaQuery.sizeOf(context).height : pinnedHeaderHeight; }, From 545def36e6a6b8ec64fcbc038712f86099041308 Mon Sep 17 00:00:00 2001 From: orz12 Date: Thu, 25 Jan 2024 12:59:21 +0800 Subject: [PATCH 010/220] =?UTF-8?q?mod:=20=E8=87=AA=E5=8A=A8=E6=92=AD?= =?UTF-8?q?=E6=94=BE=E6=8C=89=E9=92=AE=E6=94=B9=E4=B8=BA=E5=AE=98=E6=96=B9?= =?UTF-8?q?=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/video/detail/view.dart | 29 +++++++++-------------------- 1 file changed, 9 insertions(+), 20 deletions(-) diff --git a/lib/pages/video/detail/view.dart b/lib/pages/video/detail/view.dart index 1ce78b3c..3644fa41 100644 --- a/lib/pages/video/detail/view.dart +++ b/lib/pages/video/detail/view.dart @@ -466,26 +466,15 @@ class _VideoDetailPageState extends State Positioned( right: 12, bottom: 10, - child: TextButton.icon( - style: ButtonStyle( - backgroundColor: - MaterialStateProperty - .resolveWith( - (states) { - return Colors.white - .withOpacity(0.8); - }), - ), - onPressed: () => - handlePlay(), - icon: const Icon( - Icons - .play_circle_outline, - size: 20, - ), - label: - const Text('轻触封面播放'), - ), + child: IconButton( + tooltip: '播放', + onPressed: () => + handlePlay(), + icon: Image.asset( + 'assets/images/play.png', + width: 60, + height: 60, + )), ), ], )), From bf8ae0f3172c77e234e1512eb32715a3e8e27bf3 Mon Sep 17 00:00:00 2001 From: orz12 Date: Thu, 25 Jan 2024 11:36:20 +0800 Subject: [PATCH 011/220] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E5=BC=B9?= =?UTF-8?q?=E5=B9=95=E6=8F=8F=E8=BE=B9=E7=B2=97=E7=BB=86=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=EF=BC=8C=E9=BB=98=E8=AE=A4=E5=80=BC=E9=99=8D=E4=BD=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/danmaku/view.dart | 3 ++ .../video/detail/widgets/header_control.dart | 41 +++++++++++++++++++ lib/plugin/pl_player/controller.dart | 5 +++ lib/utils/storage.dart | 3 +- 4 files changed, 51 insertions(+), 1 deletion(-) diff --git a/lib/pages/danmaku/view.dart b/lib/pages/danmaku/view.dart index 83d6020e..109f0206 100644 --- a/lib/pages/danmaku/view.dart +++ b/lib/pages/danmaku/view.dart @@ -35,6 +35,7 @@ class _PlDanmakuState extends State { late double opacityVal; late double fontSizeVal; late double danmakuDurationVal; + late double strokeWidth; int latestAddedPosition = -1; @override @@ -65,6 +66,7 @@ class _PlDanmakuState extends State { showArea = playerController.showArea; opacityVal = playerController.opacityVal; fontSizeVal = playerController.fontSizeVal; + strokeWidth = playerController.strokeWidth; danmakuDurationVal = playerController.danmakuDurationVal; } @@ -136,6 +138,7 @@ class _PlDanmakuState extends State { hideBottom: blockTypes.contains(4), duration: danmakuDurationVal / playerController.playbackSpeed, + strokeWidth: strokeWidth, // initDuration / // (danmakuSpeedVal * widget.playerController.playbackSpeed), ), diff --git a/lib/pages/video/detail/widgets/header_control.dart b/lib/pages/video/detail/widgets/header_control.dart index f2e38870..3af35efd 100644 --- a/lib/pages/video/detail/widgets/header_control.dart +++ b/lib/pages/video/detail/widgets/header_control.dart @@ -1,4 +1,5 @@ import 'dart:io'; +import 'dart:math'; import 'package:floating/floating.dart'; import 'package:flutter/material.dart'; @@ -724,6 +725,8 @@ class _HeaderControlState extends State { double fontSizeVal = widget.controller!.fontSizeVal; // 弹幕速度 double danmakuDurationVal = widget.controller!.danmakuDurationVal; + // 弹幕描边 + double strokeWidth = widget.controller!.strokeWidth; final DanmakuController danmakuController = widget.controller!.danmakuController!; @@ -857,6 +860,44 @@ class _HeaderControlState extends State { ), ), ), + Text('描边粗细 $strokeWidth'), + Padding( + padding: const EdgeInsets.only( + top: 0, + bottom: 6, + left: 10, + right: 10, + ), + child: SliderTheme( + data: SliderThemeData( + trackShape: MSliderTrackShape(), + thumbColor: Theme.of(context).colorScheme.primary, + activeTrackColor: Theme.of(context).colorScheme.primary, + trackHeight: 10, + thumbShape: const RoundSliderThumbShape( + enabledThumbRadius: 6.0), + ), + child: Slider( + min: 0, + max: 3, + value: strokeWidth, + divisions: 6, + label: '$strokeWidth', + onChanged: (double val) { + strokeWidth = val; + widget.controller!.strokeWidth = val; + setState(() {}); + try { + final DanmakuOption currentOption = + danmakuController.option; + final DanmakuOption updatedOption = + currentOption.copyWith(strokeWidth: val); + danmakuController.updateOption(updatedOption); + } catch (_) {} + }, + ), + ), + ), Text('字体大小 ${(fontSizeVal * 100).toStringAsFixed(1)}%'), Padding( padding: const EdgeInsets.only( diff --git a/lib/plugin/pl_player/controller.dart b/lib/plugin/pl_player/controller.dart index d35987f8..dfa580ab 100644 --- a/lib/plugin/pl_player/controller.dart +++ b/lib/plugin/pl_player/controller.dart @@ -221,6 +221,7 @@ class PlPlayerController { late double showArea; late double opacityVal; late double fontSizeVal; + late double strokeWidth; late double danmakuDurationVal; late List speedsList; // 缓存 @@ -275,6 +276,9 @@ class PlPlayerController { // 弹幕时间 danmakuDurationVal = localCache.get(LocalCacheKey.danmakuDuration, defaultValue: 4.0); + // 描边粗细 + strokeWidth = + localCache.get(LocalCacheKey.strokeWidth, defaultValue: 1.5); playRepeat = PlayRepeat.values.toList().firstWhere( (e) => e.value == @@ -1086,6 +1090,7 @@ class PlPlayerController { localCache.put(LocalCacheKey.danmakuOpacity, opacityVal); localCache.put(LocalCacheKey.danmakuFontScale, fontSizeVal); localCache.put(LocalCacheKey.danmakuDuration, danmakuDurationVal); + localCache.put(LocalCacheKey.strokeWidth, strokeWidth); if (_videoPlayerController != null) { var pp = _videoPlayerController!.platform as NativePlayer; await pp.setProperty('audio-files', ''); diff --git a/lib/utils/storage.dart b/lib/utils/storage.dart index 99037611..e4bc8048 100644 --- a/lib/utils/storage.dart +++ b/lib/utils/storage.dart @@ -158,12 +158,13 @@ class LocalCacheKey { wbiKeys = 'wbiKeys', timeStamp = 'timeStamp', - // 弹幕相关设置 屏蔽类型 显示区域 透明度 字体大小 弹幕时间 + // 弹幕相关设置 屏蔽类型 显示区域 透明度 字体大小 弹幕时间 描边粗细 danmakuBlockType = 'danmakuBlockType', danmakuShowArea = 'danmakuShowArea', danmakuOpacity = 'danmakuOpacity', danmakuFontScale = 'danmakuFontScale', danmakuDuration = 'danmakuDuration', + strokeWidth = 'strokeWidth', // 代理host port systemProxyHost = 'systemProxyHost', From a73f2974e175f89448311a80567a8618b8e57fd9 Mon Sep 17 00:00:00 2001 From: orz12 Date: Tue, 23 Jan 2024 15:11:48 +0800 Subject: [PATCH 012/220] fix: typo --- lib/http/api.dart | 2 +- lib/http/interceptor.dart | 4 ++-- lib/http/search.dart | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/http/api.dart b/lib/http/api.dart index 1731519b..532ca341 100644 --- a/lib/http/api.dart +++ b/lib/http/api.dart @@ -185,7 +185,7 @@ class Api { static const String searchDefault = '/x/web-interface/wbi/search/default'; // 搜索关键词 - static const String serachSuggest = + static const String searchSuggest = 'https://s.search.bilibili.com/main/suggest'; // 分类搜索 diff --git a/lib/http/interceptor.dart b/lib/http/interceptor.dart index 68f5742d..48ba7e60 100644 --- a/lib/http/interceptor.dart +++ b/lib/http/interceptor.dart @@ -70,14 +70,14 @@ class ApiInterceptor extends Interceptor { case DioExceptionType.sendTimeout: return '发送请求超时，请检查网络设置'; case DioExceptionType.unknown: - final String res = await checkConect(); + final String res = await checkConnect(); return '$res \n 网络异常，请稍后重试！'; // default: // return 'Dio异常'; } } - static Future checkConect() async { + static Future checkConnect() async { final ConnectivityResult connectivityResult = await Connectivity().checkConnectivity(); if (connectivityResult == ConnectivityResult.mobile) { diff --git a/lib/http/search.dart b/lib/http/search.dart index 7239f435..18481ea8 100644 --- a/lib/http/search.dart +++ b/lib/http/search.dart @@ -36,7 +36,7 @@ class SearchHttp { // 获取搜索建议 static Future searchSuggest({required term}) async { - var res = await Request().get(Api.serachSuggest, + var res = await Request().get(Api.searchSuggest, data: {'term': term, 'main_ver': 'v1', 'highlight': term}); if (res.data is String) { Map resultMap = json.decode(res.data); From 1b03f3f31ffd594eb3bb50411219c91e5a575de7 Mon Sep 17 00:00:00 2001 From: orz12 Date: Wed, 24 Jan 2024 21:43:02 +0800 Subject: [PATCH 013/220] =?UTF-8?q?mod:=20AI=E8=A7=86=E9=A2=91=E6=80=BB?= =?UTF-8?q?=E7=BB=93=E6=9C=AA=E6=94=AF=E6=8C=81=E6=8F=90=E9=86=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/http/video.dart | 7 ++++++- lib/pages/video/detail/introduction/controller.dart | 4 +++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/lib/http/video.dart b/lib/http/video.dart index 923e93a2..e7b09801 100644 --- a/lib/http/video.dart +++ b/lib/http/video.dart @@ -447,11 +447,16 @@ class VideoHttp { 'up_mid': upMid, }); var res = await Request().get(Api.aiConclusion, data: params); - if (res.data['code'] == 0) { + if (res.data['code'] == 0 && res.data['data']['code'] == 0) { return { 'status': true, 'data': AiConclusionModel.fromJson(res.data['data']), }; + } else { + return { + 'status': false, + 'data': [] + }; } } } diff --git a/lib/pages/video/detail/introduction/controller.dart b/lib/pages/video/detail/introduction/controller.dart index 1230a94b..1deadb07 100644 --- a/lib/pages/video/detail/introduction/controller.dart +++ b/lib/pages/video/detail/introduction/controller.dart @@ -570,10 +570,12 @@ class VideoIntroController extends GetxController { cid: lastPlayCid.value, upMid: videoDetail.value.owner!.mid!, ); + SmartDialog.dismiss(); if (res['status']) { modelResult = res['data'].modelResult; + } else { + SmartDialog.showToast("当前视频可能暂不支持AI视频总结"); } - SmartDialog.dismiss(); return res; } } From 9663278916014376f4142d557c0d328bf5ee3825 Mon Sep 17 00:00:00 2001 From: orz12 Date: Thu, 25 Jan 2024 20:24:13 +0800 Subject: [PATCH 014/220] =?UTF-8?q?feat:=20=E7=A7=81=E4=BF=A1=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=88=86=E4=BA=AB=E8=A7=86=E9=A2=91=E5=86=85=E5=AE=B9?= =?UTF-8?q?=E3=80=81=E5=AF=8C=E6=96=87=E6=9C=AC=E8=A1=A8=E6=83=85=EF=BC=8C?= =?UTF-8?q?=E8=A1=A5=E5=85=85=E4=BF=A1=E6=81=AF=E7=B1=BB=E5=9E=8B=E6=9E=9A?= =?UTF-8?q?=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/models/msg/session.dart | 2 +- lib/pages/whisper_detail/controller.dart | 6 + lib/pages/whisper_detail/view.dart | 8 +- .../whisper_detail/widget/chat_item.dart | 206 +++++++++++++++--- 4 files changed, 187 insertions(+), 35 deletions(-) diff --git a/lib/models/msg/session.dart b/lib/models/msg/session.dart index 1fa05cb0..ea241249 100644 --- a/lib/models/msg/session.dart +++ b/lib/models/msg/session.dart @@ -166,7 +166,7 @@ class SessionMsgDataModel { int? hasMore; int? minSeqno; int? maxSeqno; - List? eInfos; + List? eInfos; SessionMsgDataModel.fromJson(Map json) { messages = json['messages'] diff --git a/lib/pages/whisper_detail/controller.dart b/lib/pages/whisper_detail/controller.dart index 52a70c49..71dd4c03 100644 --- a/lib/pages/whisper_detail/controller.dart +++ b/lib/pages/whisper_detail/controller.dart @@ -1,3 +1,4 @@ +import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:get/get.dart'; import 'package:pilipala/http/msg.dart'; import 'package:pilipala/models/msg/session.dart'; @@ -8,6 +9,8 @@ class WhisperDetailController extends GetxController { late String face; late String mid; RxList messageList = [].obs; + //表情转换图片规则 + List? eInfos; @override void onInit() { @@ -22,6 +25,9 @@ class WhisperDetailController extends GetxController { var res = await MsgHttp.sessionMsg(talkerId: talkerId); if (res['status']) { messageList.value = res['data'].messages; + if (messageList.isNotEmpty && res['data'].eInfos != null) { + eInfos = res['data'].eInfos; + } } return res; } diff --git a/lib/pages/whisper_detail/view.dart b/lib/pages/whisper_detail/view.dart index 5d108037..8d2297c4 100644 --- a/lib/pages/whisper_detail/view.dart +++ b/lib/pages/whisper_detail/view.dart @@ -110,12 +110,16 @@ class _WhisperDetailPageState extends State { if (i == 0) { return Column( children: [ - ChatItem(item: messageList[i]), + ChatItem( + item: messageList[i], + e_infos: _whisperDetailController.eInfos), const SizedBox(height: 12), ], ); } else { - return ChatItem(item: messageList[i]); + return ChatItem( + item: messageList[i], + e_infos: _whisperDetailController.eInfos); } }, ), diff --git a/lib/pages/whisper_detail/widget/chat_item.dart b/lib/pages/whisper_detail/widget/chat_item.dart index 9ea6bf2a..9f0e191b 100644 --- a/lib/pages/whisper_detail/widget/chat_item.dart +++ b/lib/pages/whisper_detail/widget/chat_item.dart @@ -1,38 +1,200 @@ // ignore_for_file: must_be_immutable +import 'dart:convert'; + import 'package:flutter/material.dart'; +import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; +import 'package:get/get.dart'; +import 'package:get/get_core/src/get_main.dart'; import 'package:pilipala/common/widgets/network_img_layer.dart'; import 'package:pilipala/utils/utils.dart'; import 'package:pilipala/utils/storage.dart'; +import '../../../http/search.dart'; + +enum MsgType { + invalid(value: 0, label: "空空的~"), + text(value: 1, label: "文本消息"), + pic(value: 2, label: "图片消息"), + audio(value: 3, label: "语音消息"), + share(value: 4, label: "分享消息"), + revoke(value: 5, label: "撤回消息"), + custom_face(value: 6, label: "自定义表情"), + share_v2(value: 7, label: "分享v2消息"), + sys_cancel(value: 8, label: "系统撤销"), + mini_program(value: 9, label: "小程序"), + notify_msg(value: 10, label: "业务通知"), + archive_card(value: 11, label: "投稿卡片"), + article_card(value: 12, label: "专栏卡片"), + pic_card(value: 13, label: "图片卡片"), + common_share(value: 14, label: "异形卡片"), + notify_text(value: 18, label: "文本提示"); + + final int value; + final String label; + const MsgType({required this.value, required this.label}); + static MsgType parse(int value) { + return MsgType.values + .firstWhere((e) => e.value == value, orElse: () => MsgType.invalid); + } +} + class ChatItem extends StatelessWidget { dynamic item; + List? e_infos; ChatItem({ super.key, this.item, + this.e_infos, }); @override Widget build(BuildContext context) { bool isOwner = item.senderUid == GStrorage.userInfo.get('userInfoCache').mid; - bool isPic = item.msgType == 2; // 图片 - bool isText = item.msgType == 1; // 文本 - // bool isAchive = item.msgType == 11; // 投稿 + bool isPic = item.msgType == MsgType.pic; // 图片 + bool isText = item.msgType == MsgType.text; // 文本 + // bool isArchive = item.msgType == 11; // 投稿 // bool isArticle = item.msgType == 12; // 专栏 - bool isRevoke = item.msgType == 5; // 撤回消息 - + bool isRevoke = item.msgType == MsgType.revoke; // 撤回消息 + bool isShareV2 = item.msgType == MsgType.share_v2; bool isSystem = item.msgType == 18 || item.msgType == 10 || item.msgType == 13; - int msgType = item.msgType; dynamic content = item.content ?? ''; + Color textColor(BuildContext context) { + return isOwner + ? Theme.of(context).colorScheme.onPrimary + : Theme.of(context).colorScheme.onSecondaryContainer; + } + + Widget richTextMessage(BuildContext context) { + var text = content['content']; + if (e_infos != null) { + final List children = []; + Map emojiMap = {}; + for (var e in e_infos!) { + emojiMap[e['text']] = e['url']; + } + text.splitMapJoin( + RegExp(r"\[.+?\]"), + onMatch: (Match match) { + final String emojiKey = match[0]!; + if (emojiMap.containsKey(emojiKey)) { + children.add(WidgetSpan( + child: NetworkImgLayer( + width: 18, height: 18, + src: emojiMap[emojiKey]!,), + )); + } + return ''; + }, + onNonMatch: (String text) { + children.add(TextSpan(text: text, style: TextStyle( + color: textColor(context), + letterSpacing: 0.6, + height: 1.5, + ))); + return ''; + }, + ); + return RichText( + text: TextSpan( + children: children, + ), + ); + } else { + return Text( + text, + style: TextStyle( + letterSpacing: 0.6, + color: textColor(context), + height: 1.5, + ), + ); + } + } + + Widget messageContent(BuildContext context) { + switch (MsgType.parse(item.msgType)) { + case MsgType.notify_msg: + return SystemNotice(item: item); + case MsgType.pic_card: + return SystemNotice2(item: item); + case MsgType.notify_text: + return Text( + jsonDecode(content['content']).map((m) => m['text'] as String).join("\n"), + style: TextStyle( + letterSpacing: 0.6, + height: 5, + color: Theme.of(context).colorScheme.outline.withOpacity(0.8) + ), + ); + case MsgType.text: + return richTextMessage(context); + case MsgType.pic: + return NetworkImgLayer( + width: 220, + height: 220 * content['height'] / content['width'], + src: content['url'], + ); + case MsgType.share_v2: + return Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + GestureDetector( + onTap: () async { + SmartDialog.showLoading(); + var bvid = content["bvid"]; + final int cid = await SearchHttp.ab2c(bvid: bvid); + final String heroTag = Utils.makeHeroTag(bvid); + SmartDialog.dismiss().then( + (e) => Get.toNamed('/video?bvid=$bvid&cid=$cid', + arguments: { + 'pic': content['thumb'], + 'heroTag': heroTag, + }), + ); + }, + child: NetworkImgLayer( + width: 220, + height: 220 * 9 / 16, + src: content['thumb'], + ), + ), + const SizedBox(height: 6), + Text( + content['title'], + style: TextStyle( + letterSpacing: 0.6, + height: 1.5, + color: textColor(context), fontWeight: FontWeight.bold), + ), + const SizedBox(height: 1), + Text( + content['author'], + style: TextStyle( + letterSpacing: 0.6, + height: 1.5, + color: textColor(context).withOpacity(0.6), + fontSize: 12, + ), + ), + ], + ); + default: + return Text( + content['content'] ?? content.toString(), + style: TextStyle( + letterSpacing: 0.6, + height: 1.5, + color: textColor(context), fontWeight: FontWeight.bold), + ); + } + } + return isSystem - ? (msgType == 10 - ? SystemNotice(item: item) - : msgType == 13 - ? SystemNotice2(item: item) - : const SizedBox()) + ? messageContent(context) : isRevoke ? const SizedBox() : Row( @@ -66,27 +228,7 @@ class ChatItem extends StatelessWidget { ? CrossAxisAlignment.end : CrossAxisAlignment.start, children: [ - isText - ? Text( - content['content'], - style: TextStyle( - color: isOwner - ? Theme.of(context) - .colorScheme - .onPrimary - : Theme.of(context) - .colorScheme - .onSecondaryContainer), - ) - : isPic - ? NetworkImgLayer( - width: 220, - height: 220 * - content['height'] / - content['width'], - src: content['url'], - ) - : const SizedBox(), + messageContent(context), SizedBox(height: isPic ? 7 : 2), Row( mainAxisSize: MainAxisSize.min, From 01fa3c1cb39cec388e6259dc75e0bc258001d5e0 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Thu, 25 Jan 2024 23:13:16 +0800 Subject: [PATCH 015/220] =?UTF-8?q?mod:=20=E5=85=B3=E4=BA=8E=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=A2=9E=E5=8A=A0=E5=AE=98=E7=BD=91=E9=93=BE=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/about/index.dart | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/lib/pages/about/index.dart b/lib/pages/about/index.dart index 5acfb7f3..997adbfe 100644 --- a/lib/pages/about/index.dart +++ b/lib/pages/about/index.dart @@ -86,6 +86,14 @@ class _AboutPageState extends State { style: subTitleStyle, ), ), + ListTile( + onTap: () => _aboutController.webSiteUrl(), + title: const Text('访问官网'), + trailing: Text( + 'https://pilipalanet.mysxl.cn', + style: subTitleStyle, + ), + ), ListTile( onTap: () => _aboutController.panDownload(), title: const Text('网盘下载'), @@ -244,4 +252,12 @@ class AboutController extends GetxController { print(e); } } + + // 官网 + webSiteUrl() { + launchUrl( + Uri.parse('https://pilipalanet.mysxl.cn'), + mode: LaunchMode.externalApplication, + ); + } } From e791210039689295236581b7a0acad04b5f47625 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Thu, 25 Jan 2024 23:16:10 +0800 Subject: [PATCH 016/220] =?UTF-8?q?v1.0.17=20=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- change_log/1.0.17.0125.md | 39 +++++++++++++++++++++++++++++++++++++++ pubspec.yaml | 2 +- 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 change_log/1.0.17.0125.md diff --git a/change_log/1.0.17.0125.md b/change_log/1.0.17.0125.md new file mode 100644 index 00000000..dc8bcb62 --- /dev/null +++ b/change_log/1.0.17.0125.md @@ -0,0 +1,39 @@ +## 1.0.17 + + +### 功能 ++ 视频全屏时隐藏进度条 ++ 动态内容增加投稿跳转 ++ 未开启自动播放时点击封面播放 ++ 弹幕发送标识 ++ 定时关闭 ++ 推荐视频卡片拉黑up功能 ++ 首页tabbar编辑排序 + +### 修复 ++ 连续跳转搜索页未刷新 ++ 搜索结果为空时页面异常 ++ 评论区链接解析 ++ 视频全屏状态栏背景色 ++ 私信对话气泡位置 ++ 设置up关注分组样式 ++ 每次推荐请求数据相同 ++ iOS代理网络异常 ++ 双击切换播放状态无声 ++ 设置自定义倍速白屏 ++ 免登录查看1080p + +### 优化 ++ 首页web端推荐观看数展示 ++ 首页web端推荐接口更新 ++ 首页样式 ++ 搜索页跳转 ++ 弹幕资源优化 ++ 图片渲染占用内存优化（部分） ++ 两次返回退出应用 ++ schame 补充 + + + +更多更新日志可在Github上查看 +问题反馈、功能建议请查看「关于」页面。 diff --git a/pubspec.yaml b/pubspec.yaml index e808367a..5f22a7de 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -16,7 +16,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html # In Windows, build-name is used as the major, minor, and patch parts # of the product and file versions while build-number is used as the build suffix. -version: 1.0.16+1016 +version: 1.0.17+1017 environment: sdk: ">=2.19.6 <3.0.0" From 932be48125f6c2340a0c78eac6eccec2e8e3e122 Mon Sep 17 00:00:00 2001 From: orz12 Date: Sat, 20 Jan 2024 21:05:01 +0800 Subject: [PATCH 017/220] =?UTF-8?q?mod:=20=E6=8E=A8=E8=8D=90=E3=80=81?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E9=A1=B5=E6=B7=BB=E5=8A=A0=E6=97=B6=E9=97=B4?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E5=A4=8D=E8=A7=86=E9=A2=91=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E9=A1=B5=E6=97=A0=E6=B3=95=E7=AD=9B=E9=80=89=E5=92=8C=E5=9B=9E?= =?UTF-8?q?=E9=A1=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/common/widgets/video_card_v.dart | 39 ++++++++++++------- lib/pages/search_panel/view.dart | 2 +- .../search_panel/widgets/video_panel.dart | 6 +-- lib/utils/utils.dart | 28 ++++++++++++- 4 files changed, 56 insertions(+), 19 deletions(-) diff --git a/lib/common/widgets/video_card_v.dart b/lib/common/widgets/video_card_v.dart index 0bbd5377..c40d439c 100644 --- a/lib/common/widgets/video_card_v.dart +++ b/lib/common/widgets/video_card_v.dart @@ -1,6 +1,8 @@ import 'package:flutter/material.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:get/get.dart'; +import 'stat/danmu.dart'; +import 'stat/view.dart'; import '../../http/dynamics.dart'; import '../../http/search.dart'; import '../../http/user.dart'; @@ -322,21 +324,30 @@ class VideoStat extends StatelessWidget { @override Widget build(BuildContext context) { - return RichText( - maxLines: 1, - text: TextSpan( - style: TextStyle( - fontSize: MediaQuery.textScalerOf(context) - .scale(Theme.of(context).textTheme.labelSmall!.fontSize!), - color: Theme.of(context).colorScheme.outline, + return Row( + children: [ + StatView( + theme: 'gray', + view: videoItem.stat.view as int, ), - children: [ - if (videoItem.stat.view != '-') - TextSpan(text: '${videoItem.stat.view}观看'), - if (videoItem.stat.danmu != '-') - TextSpan(text: ' • ${videoItem.stat.danmu}弹幕'), - ], - ), + const SizedBox(width: 8), + StatDanMu( + theme: 'gray', + danmu: videoItem.stat.danmu as int, + ), + const Spacer(), + RichText( + maxLines: 1, + text: TextSpan( + style: TextStyle( + fontSize: Theme.of(context).textTheme.labelSmall!.fontSize, + color: Theme.of(context).colorScheme.outline, + ), + text: Utils.formatTimestampToRelativeTime(videoItem.pubdate) + ), + ), + const SizedBox(width: 4), + ], ); } } diff --git a/lib/pages/search_panel/view.dart b/lib/pages/search_panel/view.dart index f7392c88..182fbea0 100644 --- a/lib/pages/search_panel/view.dart +++ b/lib/pages/search_panel/view.dart @@ -43,7 +43,7 @@ class _SearchPanelState extends State keyword: widget.keyword, searchType: widget.searchType, ), - tag: widget.searchType!.type + widget.keyword!, + tag: widget.searchType!.type, ); scrollController = _searchPanelController.scrollController; scrollController.addListener(() async { diff --git a/lib/pages/search_panel/widgets/video_panel.dart b/lib/pages/search_panel/widgets/video_panel.dart index 0b5d5eb8..3debcfb9 100644 --- a/lib/pages/search_panel/widgets/video_panel.dart +++ b/lib/pages/search_panel/widgets/video_panel.dart @@ -35,7 +35,7 @@ class SearchVideoPanel extends StatelessWidget { padding: index == 0 ? const EdgeInsets.only(top: 2) : EdgeInsets.zero, - child: VideoCardH(videoItem: i), + child: VideoCardH(videoItem: i, showPubdate: true), ); }, ), @@ -70,7 +70,7 @@ class SearchVideoPanel extends StatelessWidget { controller.selectedType.value = i['type']; ctr!.order.value = i['type'].toString().split('.').last; - SmartDialog.showLoading(msg: 'loooad'); + SmartDialog.showLoading(msg: 'loading'); await ctr!.onRefresh(); SmartDialog.dismiss(); }, @@ -201,7 +201,7 @@ class VideoPanelController extends GetxController { SearchPanelController ctr = Get.find(tag: 'video'); ctr.duration.value = i['value']; - SmartDialog.showLoading(msg: 'loooad'); + SmartDialog.showLoading(msg: 'loading'); await ctr.onRefresh(); SmartDialog.dismiss(); }, diff --git a/lib/utils/utils.dart b/lib/utils/utils.dart index 08693d24..7ef0e53f 100644 --- a/lib/utils/utils.dart +++ b/lib/utils/utils.dart @@ -28,7 +28,13 @@ class Utils { return tempPath; } - static String numFormat(int number) { + static String numFormat(dynamic number) { + if (number == null) { + return '0'; + } + if (number is String) { + return number; + } final String res = (number / 10000).toString(); if (int.parse(res.split('.')[0]) >= 1) { return '${(number / 10000).toPrecision(1)}万'; @@ -58,6 +64,26 @@ class Utils { } } + // 完全相对时间显示 + static String formatTimestampToRelativeTime(timeStamp) { + var difference = DateTime.now() + .difference(DateTime.fromMillisecondsSinceEpoch(timeStamp * 1000)); + + if (difference.inDays > 365) { + return '${difference.inDays ~/ 365}年前'; + } else if (difference.inDays > 30) { + return '${difference.inDays ~/ 30}个月前'; + } else if (difference.inDays > 0) { + return '${difference.inDays}天前'; + } else if (difference.inHours > 0) { + return '${difference.inHours}小时前'; + } else if (difference.inMinutes > 0) { + return '${difference.inMinutes}分钟前'; + } else { + return '刚刚'; + } + } + // 时间显示，刚刚，x分钟前 static String dateFormat(timeStamp, {formatType = 'list'}) { // 当前时间 From 23c8b3418971e8d0c36217e6cc1508125027ef5b Mon Sep 17 00:00:00 2001 From: orz12 Date: Sat, 20 Jan 2024 21:43:01 +0800 Subject: [PATCH 018/220] =?UTF-8?q?fix:=20app=E7=AB=AF=E6=8E=A8=E8=8D=90?= =?UTF-8?q?=E5=B1=8F=E8=94=BD=E6=97=B6=E9=97=B4=E6=98=BE=E7=A4=BA=EF=BC=8C?= =?UTF-8?q?=E6=92=AD=E6=94=BE=E9=87=8F=E4=B8=8E=E5=BC=B9=E5=B9=95=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E6=94=B9=E4=B8=BA=E5=8A=A8=E6=80=81=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/common/widgets/stat/danmu.dart | 2 +- lib/common/widgets/stat/view.dart | 2 +- lib/common/widgets/video_card_v.dart | 28 +++++++++++++++------------- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/lib/common/widgets/stat/danmu.dart b/lib/common/widgets/stat/danmu.dart index 44f662a9..c1c439db 100644 --- a/lib/common/widgets/stat/danmu.dart +++ b/lib/common/widgets/stat/danmu.dart @@ -3,7 +3,7 @@ import 'package:pilipala/utils/utils.dart'; class StatDanMu extends StatelessWidget { final String? theme; - final int? danmu; + final dynamic danmu; final String? size; const StatDanMu({Key? key, this.theme, this.danmu, this.size}) diff --git a/lib/common/widgets/stat/view.dart b/lib/common/widgets/stat/view.dart index 8b97b605..2665e2d4 100644 --- a/lib/common/widgets/stat/view.dart +++ b/lib/common/widgets/stat/view.dart @@ -3,7 +3,7 @@ import 'package:pilipala/utils/utils.dart'; class StatView extends StatelessWidget { final String? theme; - final int? view; + final dynamic view; final String? size; const StatView({Key? key, this.theme, this.view, this.size}) diff --git a/lib/common/widgets/video_card_v.dart b/lib/common/widgets/video_card_v.dart index c40d439c..86ea2a5a 100644 --- a/lib/common/widgets/video_card_v.dart +++ b/lib/common/widgets/video_card_v.dart @@ -1,6 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:get/get.dart'; +import '../../models/model_rec_video_item.dart'; import 'stat/danmu.dart'; import 'stat/view.dart'; import '../../http/dynamics.dart'; @@ -328,25 +329,26 @@ class VideoStat extends StatelessWidget { children: [ StatView( theme: 'gray', - view: videoItem.stat.view as int, + view: videoItem.stat.view, ), const SizedBox(width: 8), StatDanMu( theme: 'gray', - danmu: videoItem.stat.danmu as int, + danmu: videoItem.stat.danmu, ), - const Spacer(), - RichText( - maxLines: 1, - text: TextSpan( - style: TextStyle( - fontSize: Theme.of(context).textTheme.labelSmall!.fontSize, - color: Theme.of(context).colorScheme.outline, - ), - text: Utils.formatTimestampToRelativeTime(videoItem.pubdate) + if (videoItem is RecVideoItemModel) ...[ + const Spacer(), + RichText( + maxLines: 1, + text: TextSpan( + style: TextStyle( + fontSize: Theme.of(context).textTheme.labelSmall!.fontSize, + color: Theme.of(context).colorScheme.outline, + ), + text: Utils.formatTimestampToRelativeTime(videoItem.pubdate)), ), - ), - const SizedBox(width: 4), + const SizedBox(width: 4), + ] ], ); } From 0595648f4cb79a4bc3eb62b9ac4fea97c81de1c6 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Fri, 26 Jan 2024 23:25:06 +0800 Subject: [PATCH 019/220] =?UTF-8?q?fix:=20=E6=90=9C=E7=B4=A2=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E6=97=B6=E9=95=BF=E7=AD=9B=E9=80=89=E3=80=81=E5=BF=AB?= =?UTF-8?q?=E9=80=9F=E5=9B=9E=E9=A1=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/search_panel/widgets/video_panel.dart | 7 ++++--- lib/pages/search_result/view.dart | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/pages/search_panel/widgets/video_panel.dart b/lib/pages/search_panel/widgets/video_panel.dart index 0b5d5eb8..2f1a3a0f 100644 --- a/lib/pages/search_panel/widgets/video_panel.dart +++ b/lib/pages/search_panel/widgets/video_panel.dart @@ -90,7 +90,7 @@ class SearchVideoPanel extends StatelessWidget { style: ButtonStyle( padding: MaterialStateProperty.all(EdgeInsets.zero), ), - onPressed: () => controller.onShowFilterDialog(), + onPressed: () => controller.onShowFilterDialog(ctr), icon: Icon( Icons.filter_list_outlined, size: 18, @@ -175,7 +175,7 @@ class VideoPanelController extends GetxController { super.onInit(); } - onShowFilterDialog() { + onShowFilterDialog(searchPanelCtr) { SmartDialog.show( animationType: SmartAnimationType.centerFade_otherSlide, builder: (BuildContext context) { @@ -199,7 +199,8 @@ class VideoPanelController extends GetxController { SmartDialog.dismiss(); SmartDialog.showToast("「${i['label']}」的筛选结果"); SearchPanelController ctr = - Get.find(tag: 'video'); + Get.find( + tag: 'video${searchPanelCtr.keyword!}'); ctr.duration.value = i['value']; SmartDialog.showLoading(msg: 'loooad'); await ctr.onRefresh(); diff --git a/lib/pages/search_result/view.dart b/lib/pages/search_result/view.dart index 054e2a78..ff5bf780 100644 --- a/lib/pages/search_result/view.dart +++ b/lib/pages/search_result/view.dart @@ -86,7 +86,8 @@ class _SearchResultPageState extends State onTap: (index) { if (index == _searchResultController!.tabIndex) { Get.find( - tag: SearchType.values[index].type) + tag: SearchType.values[index].type + + _searchResultController!.keyword!) .animateToTop(); } From d1bacf89504d96e72f407c61733dee6359deea50 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sat, 27 Jan 2024 00:24:54 +0800 Subject: [PATCH 020/220] =?UTF-8?q?fix:=20=E9=80=80=E5=87=BA=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E9=A1=B5=E9=9D=A2=E6=8E=A7=E5=88=B6=E5=99=A8=E6=9C=AA?= =?UTF-8?q?=E9=94=80=E6=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/home/controller.dart | 12 ++++++++++++ lib/pages/home/view.dart | 33 +++++++++++++++++++------------- lib/pages/search/controller.dart | 12 ------------ 3 files changed, 32 insertions(+), 25 deletions(-) diff --git a/lib/pages/home/controller.dart b/lib/pages/home/controller.dart index 64510ee1..e6fafba6 100644 --- a/lib/pages/home/controller.dart +++ b/lib/pages/home/controller.dart @@ -5,6 +5,7 @@ import 'package:get/get.dart'; import 'package:hive/hive.dart'; import 'package:pilipala/models/common/tab_type.dart'; import 'package:pilipala/utils/storage.dart'; +import '../../http/index.dart'; class HomeController extends GetxController with GetTickerProviderStateMixin { bool flag = false; @@ -24,6 +25,7 @@ class HomeController extends GetxController with GetTickerProviderStateMixin { late bool hideSearchBar; late List defaultTabs; late List tabbarSort; + RxString defaultSearch = ''.obs; @override void onInit() { @@ -35,6 +37,9 @@ class HomeController extends GetxController with GetTickerProviderStateMixin { setTabConfig(); hideSearchBar = setting.get(SettingBoxKey.hideSearchBar, defaultValue: true); + if (setting.get(SettingBoxKey.enableSearchWord, defaultValue: true)) { + searchDefault(); + } } void onRefresh() { @@ -94,4 +99,11 @@ class HomeController extends GetxController with GetTickerProviderStateMixin { } }); } + + void searchDefault() async { + var res = await Request().get(Api.searchDefault); + if (res.data['code'] == 0) { + defaultSearch.value = res.data['data']['name']; + } + } } diff --git a/lib/pages/home/view.dart b/lib/pages/home/view.dart index c31460fb..ce7b46c6 100644 --- a/lib/pages/home/view.dart +++ b/lib/pages/home/view.dart @@ -5,7 +5,6 @@ import 'package:flutter/services.dart'; import 'package:get/get.dart'; import 'package:pilipala/common/widgets/network_img_layer.dart'; import 'package:pilipala/pages/mine/index.dart'; -import 'package:pilipala/pages/search/index.dart'; import 'package:pilipala/utils/feed_back.dart'; import './controller.dart'; @@ -144,6 +143,7 @@ class CustomAppBar extends StatelessWidget implements PreferredSizeWidget { padding: EdgeInsets.fromLTRB(14, top + 6, 14, 0), child: UserInfoWidget( top: top, + ctr: ctr, userLogin: isUserLoggedIn, userFace: ctr?.userFace.value, callback: () => callback!(), @@ -162,18 +162,20 @@ class UserInfoWidget extends StatelessWidget { required this.userLogin, required this.userFace, required this.callback, + required this.ctr, }) : super(key: key); final double top; final RxBool userLogin; final String? userFace; final VoidCallback? callback; + final HomeController? ctr; @override Widget build(BuildContext context) { return Row( children: [ - const SearchBar(), + SearchBar(ctr: ctr), if (userLogin.value) ...[ const SizedBox(width: 4), ClipRect( @@ -335,11 +337,15 @@ class CustomChip extends StatelessWidget { } class SearchBar extends StatelessWidget { - const SearchBar({super.key}); + const SearchBar({ + Key? key, + required this.ctr, + }) : super(key: key); + + final HomeController? ctr; @override Widget build(BuildContext context) { - final SSearchController searchController = Get.put(SSearchController()); final ColorScheme colorScheme = Theme.of(context).colorScheme; return Expanded( child: Container( @@ -353,7 +359,10 @@ class SearchBar extends StatelessWidget { color: colorScheme.onSecondaryContainer.withOpacity(0.05), child: InkWell( splashColor: colorScheme.primaryContainer.withOpacity(0.3), - onTap: () => Get.toNamed('/search'), + onTap: () => Get.toNamed( + '/search', + parameters: {'hintText': ctr!.defaultSearch.value}, + ), child: Row( children: [ const SizedBox(width: 14), @@ -362,14 +371,12 @@ class SearchBar extends StatelessWidget { color: colorScheme.onSecondaryContainer, ), const SizedBox(width: 10), - Expanded( - child: Obx( - () => Text( - searchController.defaultSearch.value, - maxLines: 1, - overflow: TextOverflow.ellipsis, - style: TextStyle(color: colorScheme.outline), - ), + Obx( + () => Text( + ctr!.defaultSearch.value, + maxLines: 1, + overflow: TextOverflow.ellipsis, + style: TextStyle(color: colorScheme.outline), ), ), ], diff --git a/lib/pages/search/controller.dart b/lib/pages/search/controller.dart index 52a521e2..5ec1710a 100644 --- a/lib/pages/search/controller.dart +++ b/lib/pages/search/controller.dart @@ -2,7 +2,6 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:get/get_rx/src/rx_workers/utils/debouncer.dart'; import 'package:hive/hive.dart'; -import 'package:pilipala/http/index.dart'; import 'package:pilipala/http/search.dart'; import 'package:pilipala/models/search/hot.dart'; import 'package:pilipala/models/search/suggest.dart'; @@ -27,9 +26,6 @@ class SSearchController extends GetxController { @override void onInit() { super.onInit(); - if (setting.get(SettingBoxKey.enableSearchWord, defaultValue: true)) { - searchDefault(); - } // 其他页面跳转过来 if (Get.parameters.keys.isNotEmpty) { if (Get.parameters['keyword'] != null) { @@ -130,12 +126,4 @@ class SSearchController extends GetxController { historyList.refresh(); histiryWord.put('cacheList', []); } - - void searchDefault() async { - var res = await Request().get(Api.searchDefault); - if (res.data['code'] == 0) { - searchKeyWord.value = - hintText = defaultSearch.value = res.data['data']['name']; - } - } } From 1014c26d293458ce0b4080e6286a737d1487b293 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sat, 27 Jan 2024 01:11:29 +0800 Subject: [PATCH 021/220] mod: make headers eid issues #435 --- lib/http/init.dart | 4 +++- lib/utils/id_utils.dart | 16 ++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/lib/http/init.dart b/lib/http/init.dart index 7840499f..6244df04 100644 --- a/lib/http/init.dart +++ b/lib/http/init.dart @@ -8,6 +8,7 @@ import 'package:dio/io.dart'; import 'package:dio_cookie_manager/dio_cookie_manager.dart'; // import 'package:dio_http2_adapter/dio_http2_adapter.dart'; import 'package:hive/hive.dart'; +import 'package:pilipala/utils/id_utils.dart'; import '../utils/storage.dart'; import '../utils/utils.dart'; import 'constants.dart'; @@ -77,10 +78,11 @@ class Request { static setOptionsHeaders(userInfo, bool status) { if (status) { dio.options.headers['x-bili-mid'] = userInfo.mid.toString(); + dio.options.headers['x-bili-aurora-eid'] = + IdUtils.genAuroraEid(userInfo.mid); } dio.options.headers['env'] = 'prod'; dio.options.headers['app-key'] = 'android64'; - dio.options.headers['x-bili-aurora-eid'] = 'UlMFQVcABlAH'; dio.options.headers['x-bili-aurora-zone'] = 'sh001'; dio.options.headers['referer'] = 'https://www.bilibili.com/'; } diff --git a/lib/utils/id_utils.dart b/lib/utils/id_utils.dart index e3814df6..a68bfb40 100644 --- a/lib/utils/id_utils.dart +++ b/lib/utils/id_utils.dart @@ -1,5 +1,6 @@ // ignore_for_file: constant_identifier_names +import 'dart:convert'; import 'dart:math'; import 'package:flutter/material.dart'; @@ -72,4 +73,19 @@ class IdUtils { } return result; } + + // eid生成 + static String? genAuroraEid(int uid) { + if (uid == 0) { + return null; + } + String uidString = uid.toString(); + List resultBytes = List.generate( + uidString.length, + (i) => uidString.codeUnitAt(i) ^ "ad1va46a7lza".codeUnitAt(i % 12), + ); + String auroraEid = base64Url.encode(resultBytes); + auroraEid = auroraEid.replaceAll(RegExp(r'=*$', multiLine: true), ''); + return auroraEid; + } } From 349de75dfd9569e03b3438146fb17ee2191c4711 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sat, 27 Jan 2024 10:12:21 +0800 Subject: [PATCH 022/220] =?UTF-8?q?mod:=20=E7=A7=BB=E9=99=A4=E9=A6=96?= =?UTF-8?q?=E9=A1=B5=E6=8E=A8=E8=8D=90=E8=A7=86=E9=A2=91=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/models/home/rcmd/result.dart | 34 ----- lib/models/home/rcmd/result.g.dart | 209 ----------------------------- lib/pages/rcmd/controller.dart | 11 -- lib/utils/storage.dart | 15 --- 4 files changed, 269 deletions(-) delete mode 100644 lib/models/home/rcmd/result.g.dart diff --git a/lib/models/home/rcmd/result.dart b/lib/models/home/rcmd/result.dart index a2a8006d..d5bc7d89 100644 --- a/lib/models/home/rcmd/result.dart +++ b/lib/models/home/rcmd/result.dart @@ -1,8 +1,3 @@ -import 'package:hive/hive.dart'; - -part 'result.g.dart'; - -@HiveType(typeId: 0) class RecVideoItemAppModel { RecVideoItemAppModel({ this.id, @@ -27,47 +22,27 @@ class RecVideoItemAppModel { this.adInfo, }); - @HiveField(0) int? id; - @HiveField(1) int? aid; - @HiveField(2) String? bvid; - @HiveField(3) int? cid; - @HiveField(4) String? pic; - @HiveField(5) RcmdStat? stat; - @HiveField(6) String? duration; - @HiveField(7) String? title; - @HiveField(8) int? isFollowed; - @HiveField(9) RcmdOwner? owner; - @HiveField(10) RcmdReason? rcmdReason; - @HiveField(11) String? goto; - @HiveField(12) int? param; - @HiveField(13) String? uri; - @HiveField(14) String? talkBack; // 番剧 - @HiveField(15) String? bangumiView; - @HiveField(16) String? bangumiFollow; - @HiveField(17) String? bangumiBadge; - @HiveField(18) String? cardType; - @HiveField(19) Map? adInfo; RecVideoItemAppModel.fromJson(Map json) { @@ -102,18 +77,14 @@ class RecVideoItemAppModel { } } -@HiveType(typeId: 1) class RcmdStat { RcmdStat({ this.view, this.like, this.danmu, }); - @HiveField(0) String? view; - @HiveField(1) String? like; - @HiveField(2) String? danmu; RcmdStat.fromJson(Map json) { @@ -122,13 +93,10 @@ class RcmdStat { } } -@HiveType(typeId: 2) class RcmdOwner { RcmdOwner({this.name, this.mid}); - @HiveField(0) String? name; - @HiveField(1) int? mid; RcmdOwner.fromJson(Map json) { @@ -141,13 +109,11 @@ class RcmdOwner { } } -@HiveType(typeId: 8) class RcmdReason { RcmdReason({ this.content, }); - @HiveField(0) String? content; RcmdReason.fromJson(Map json) { diff --git a/lib/models/home/rcmd/result.g.dart b/lib/models/home/rcmd/result.g.dart deleted file mode 100644 index 43bf4bcf..00000000 --- a/lib/models/home/rcmd/result.g.dart +++ /dev/null @@ -1,209 +0,0 @@ -// GENERATED CODE - DO NOT MODIFY BY HAND - -part of 'result.dart'; - -// ************************************************************************** -// TypeAdapterGenerator -// ************************************************************************** - -class RecVideoItemAppModelAdapter extends TypeAdapter { - @override - final int typeId = 0; - - @override - RecVideoItemAppModel read(BinaryReader reader) { - final numOfFields = reader.readByte(); - final fields = { - for (int i = 0; i < numOfFields; i++) reader.readByte(): reader.read(), - }; - return RecVideoItemAppModel( - id: fields[0] as int?, - aid: fields[1] as int?, - bvid: fields[2] as String?, - cid: fields[3] as int?, - pic: fields[4] as String?, - stat: fields[5] as RcmdStat?, - duration: fields[6] as String?, - title: fields[7] as String?, - isFollowed: fields[8] as int?, - owner: fields[9] as RcmdOwner?, - rcmdReason: fields[10] as RcmdReason?, - goto: fields[11] as String?, - param: fields[12] as int?, - uri: fields[13] as String?, - talkBack: fields[14] as String?, - bangumiView: fields[15] as String?, - bangumiFollow: fields[16] as String?, - bangumiBadge: fields[17] as String?, - cardType: fields[18] as String?, - adInfo: (fields[19] as Map?)?.cast(), - ); - } - - @override - void write(BinaryWriter writer, RecVideoItemAppModel obj) { - writer - ..writeByte(20) - ..writeByte(0) - ..write(obj.id) - ..writeByte(1) - ..write(obj.aid) - ..writeByte(2) - ..write(obj.bvid) - ..writeByte(3) - ..write(obj.cid) - ..writeByte(4) - ..write(obj.pic) - ..writeByte(5) - ..write(obj.stat) - ..writeByte(6) - ..write(obj.duration) - ..writeByte(7) - ..write(obj.title) - ..writeByte(8) - ..write(obj.isFollowed) - ..writeByte(9) - ..write(obj.owner) - ..writeByte(10) - ..write(obj.rcmdReason) - ..writeByte(11) - ..write(obj.goto) - ..writeByte(12) - ..write(obj.param) - ..writeByte(13) - ..write(obj.uri) - ..writeByte(14) - ..write(obj.talkBack) - ..writeByte(15) - ..write(obj.bangumiView) - ..writeByte(16) - ..write(obj.bangumiFollow) - ..writeByte(17) - ..write(obj.bangumiBadge) - ..writeByte(18) - ..write(obj.cardType) - ..writeByte(19) - ..write(obj.adInfo); - } - - @override - int get hashCode => typeId.hashCode; - - @override - bool operator ==(Object other) => - identical(this, other) || - other is RecVideoItemAppModelAdapter && - runtimeType == other.runtimeType && - typeId == other.typeId; -} - -class RcmdStatAdapter extends TypeAdapter { - @override - final int typeId = 1; - - @override - RcmdStat read(BinaryReader reader) { - final numOfFields = reader.readByte(); - final fields = { - for (int i = 0; i < numOfFields; i++) reader.readByte(): reader.read(), - }; - return RcmdStat( - view: fields[0] as String?, - like: fields[1] as String?, - danmu: fields[2] as String?, - ); - } - - @override - void write(BinaryWriter writer, RcmdStat obj) { - writer - ..writeByte(3) - ..writeByte(0) - ..write(obj.view) - ..writeByte(1) - ..write(obj.like) - ..writeByte(2) - ..write(obj.danmu); - } - - @override - int get hashCode => typeId.hashCode; - - @override - bool operator ==(Object other) => - identical(this, other) || - other is RcmdStatAdapter && - runtimeType == other.runtimeType && - typeId == other.typeId; -} - -class RcmdOwnerAdapter extends TypeAdapter { - @override - final int typeId = 2; - - @override - RcmdOwner read(BinaryReader reader) { - final numOfFields = reader.readByte(); - final fields = { - for (int i = 0; i < numOfFields; i++) reader.readByte(): reader.read(), - }; - return RcmdOwner( - name: fields[0] as String?, - mid: fields[1] as int?, - ); - } - - @override - void write(BinaryWriter writer, RcmdOwner obj) { - writer - ..writeByte(2) - ..writeByte(0) - ..write(obj.name) - ..writeByte(1) - ..write(obj.mid); - } - - @override - int get hashCode => typeId.hashCode; - - @override - bool operator ==(Object other) => - identical(this, other) || - other is RcmdOwnerAdapter && - runtimeType == other.runtimeType && - typeId == other.typeId; -} - -class RcmdReasonAdapter extends TypeAdapter { - @override - final int typeId = 8; - - @override - RcmdReason read(BinaryReader reader) { - final numOfFields = reader.readByte(); - final fields = { - for (int i = 0; i < numOfFields; i++) reader.readByte(): reader.read(), - }; - return RcmdReason( - content: fields[0] as String?, - ); - } - - @override - void write(BinaryWriter writer, RcmdReason obj) { - writer - ..writeByte(1) - ..writeByte(0) - ..write(obj.content); - } - - @override - int get hashCode => typeId.hashCode; - - @override - bool operator ==(Object other) => - identical(this, other) || - other is RcmdReasonAdapter && - runtimeType == other.runtimeType && - typeId == other.typeId; -} diff --git a/lib/pages/rcmd/controller.dart b/lib/pages/rcmd/controller.dart index 4ed1ade1..d6dab1b1 100644 --- a/lib/pages/rcmd/controller.dart +++ b/lib/pages/rcmd/controller.dart @@ -13,7 +13,6 @@ class RcmdController extends GetxController { RxList webVideoList = [].obs; bool isLoadingMore = true; OverlayEntry? popupDialog; - Box recVideo = GStrorage.recVideo; Box setting = GStrorage.setting; RxInt crossAxisCount = 2.obs; late bool enableSaveLastData; @@ -24,15 +23,6 @@ class RcmdController extends GetxController { super.onInit(); crossAxisCount.value = setting.get(SettingBoxKey.customRows, defaultValue: 2); - // 读取app端缓存内容 - // if (recVideo.get('cacheList') != null && - // recVideo.get('cacheList').isNotEmpty) { - // List list = []; - // for (var i in recVideo.get('cacheList')) { - // list.add(i); - // } - // videoList.value = list; - // } enableSaveLastData = setting.get(SettingBoxKey.enableSaveLastData, defaultValue: false); defaultRcmdType = @@ -77,7 +67,6 @@ class RcmdController extends GetxController { } else if (type == 'onLoad') { appVideoList.addAll(res['data']); } - recVideo.put('cacheList', res['data']); _currentPage += 1; } isLoadingMore = false; diff --git a/lib/utils/storage.dart b/lib/utils/storage.dart index 99037611..ff8e7d63 100644 --- a/lib/utils/storage.dart +++ b/lib/utils/storage.dart @@ -3,13 +3,11 @@ import 'dart:io'; import 'package:hive_flutter/hive_flutter.dart'; import 'package:path_provider/path_provider.dart'; -import 'package:pilipala/models/home/rcmd/result.dart'; import 'package:pilipala/models/model_owner.dart'; import 'package:pilipala/models/search/hot.dart'; import 'package:pilipala/models/user/info.dart'; class GStrorage { - static late final Box recVideo; static late final Box userInfo; static late final Box historyword; static late final Box localCache; @@ -21,13 +19,6 @@ class GStrorage { final String path = dir.path; await Hive.initFlutter('$path/hive'); regAdapter(); - // 首页推荐视频 - recVideo = await Hive.openBox( - 'recVideo', - compactionStrategy: (int entries, int deletedEntries) { - return deletedEntries > 12; - }, - ); // 登录用户信息 userInfo = await Hive.openBox( 'userInfo', @@ -54,10 +45,6 @@ class GStrorage { } static void regAdapter() { - Hive.registerAdapter(RecVideoItemAppModelAdapter()); - Hive.registerAdapter(RcmdReasonAdapter()); - Hive.registerAdapter(RcmdStatAdapter()); - Hive.registerAdapter(RcmdOwnerAdapter()); Hive.registerAdapter(OwnerAdapter()); Hive.registerAdapter(UserInfoDataAdapter()); Hive.registerAdapter(LevelInfoAdapter()); @@ -73,8 +60,6 @@ class GStrorage { static Future close() async { // user.compact(); // user.close(); - recVideo.compact(); - recVideo.close(); userInfo.compact(); userInfo.close(); historyword.compact(); From 10d2995429bb20a9cc51e6b46e56d6bcf69665c8 Mon Sep 17 00:00:00 2001 From: orz12 Date: Sat, 27 Jan 2024 12:05:04 +0800 Subject: [PATCH 023/220] =?UTF-8?q?mod:=20=E5=AF=B9=E9=BD=90=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E6=A0=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/search_panel/view.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/pages/search_panel/view.dart b/lib/pages/search_panel/view.dart index 182fbea0..f7392c88 100644 --- a/lib/pages/search_panel/view.dart +++ b/lib/pages/search_panel/view.dart @@ -43,7 +43,7 @@ class _SearchPanelState extends State keyword: widget.keyword, searchType: widget.searchType, ), - tag: widget.searchType!.type, + tag: widget.searchType!.type + widget.keyword!, ); scrollController = _searchPanelController.scrollController; scrollController.addListener(() async { From c0162892ef310a4d34daaf9c370bc2ba6017f84f Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sat, 27 Jan 2024 13:05:59 +0800 Subject: [PATCH 024/220] =?UTF-8?q?mod:=20=E9=95=BF=E5=9B=BE=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E6=98=BE=E7=A4=BA=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/dynamics/widgets/content_panel.dart | 3 ++- lib/pages/dynamics/widgets/pic_panel.dart | 3 ++- lib/pages/video/detail/reply/widgets/reply_item.dart | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/pages/dynamics/widgets/content_panel.dart b/lib/pages/dynamics/widgets/content_panel.dart index eee4255c..d10804d7 100644 --- a/lib/pages/dynamics/widgets/content_panel.dart +++ b/lib/pages/dynamics/widgets/content_panel.dart @@ -1,5 +1,6 @@ // 内容 import 'package:flutter/material.dart'; +import 'package:get/get.dart'; import 'package:pilipala/common/widgets/badge.dart'; import 'package:pilipala/common/widgets/network_img_layer.dart'; import 'package:pilipala/models/dynamics/result.dart'; @@ -80,7 +81,7 @@ class _ContentState extends State { height: height, ), ), - height > maxHeight + height > Get.size.height * 0.9 ? const PBadge( text: '长图', right: 8, diff --git a/lib/pages/dynamics/widgets/pic_panel.dart b/lib/pages/dynamics/widgets/pic_panel.dart index 25b22c21..4e94e6fd 100644 --- a/lib/pages/dynamics/widgets/pic_panel.dart +++ b/lib/pages/dynamics/widgets/pic_panel.dart @@ -1,4 +1,5 @@ import 'package:flutter/material.dart'; +import 'package:get/get.dart'; import 'package:pilipala/common/constants.dart'; import 'package:pilipala/common/widgets/badge.dart'; import 'package:pilipala/common/widgets/network_img_layer.dart'; @@ -87,7 +88,7 @@ Widget picWidget(item, context) { childAspectRatio: aspectRatio, children: list, ), - if (len == 1 && origAspectRatio < 0.4) + if (len == 1 && height > Get.size.height * 0.9) const PBadge( text: '长图', top: null, diff --git a/lib/pages/video/detail/reply/widgets/reply_item.dart b/lib/pages/video/detail/reply/widgets/reply_item.dart index 475c0939..48518bee 100644 --- a/lib/pages/video/detail/reply/widgets/reply_item.dart +++ b/lib/pages/video/detail/reply/widgets/reply_item.dart @@ -880,7 +880,7 @@ InlineSpan buildContent( height: height, ), ), - height > maxHeight + height > Get.size.height * 0.9 ? const PBadge( text: '长图', right: 8, From 0c4bad406ea2b8620b131a45a059dec57e84969b Mon Sep 17 00:00:00 2001 From: orz12 Date: Sat, 27 Jan 2024 14:28:15 +0800 Subject: [PATCH 025/220] =?UTF-8?q?fix:=20=E8=AF=84=E8=AE=BA=E5=8C=BA?= =?UTF-8?q?=E8=AF=86=E5=88=AB=E9=80=BB=E8=BE=91=E9=87=8D=E6=9E=84=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=AB=E6=9C=89=E5=85=B3=E9=94=AE=E8=AF=8D?= =?UTF-8?q?=E7=9A=84=E8=AF=84=E8=AE=BA=E9=87=8D=E5=A4=8D=E5=87=BA=E7=8E=B0?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../detail/reply/widgets/reply_item.dart | 363 +++++++----------- 1 file changed, 131 insertions(+), 232 deletions(-) diff --git a/lib/pages/video/detail/reply/widgets/reply_item.dart b/lib/pages/video/detail/reply/widgets/reply_item.dart index 48518bee..6ecf3983 100644 --- a/lib/pages/video/detail/reply/widgets/reply_item.dart +++ b/lib/pages/video/detail/reply/widgets/reply_item.dart @@ -1,5 +1,6 @@ import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; +import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; import 'package:get/get.dart'; import 'package:hive/hive.dart'; @@ -585,255 +586,153 @@ InlineSpan buildContent( if (content.message.contains('&')) { content.message = content.message.replaceAll('&', '&'); } - // 匹配表情 + print("content.jumpUrl.keys:" + content.jumpUrl.keys.toString()); + // 构建正则表达式 + final List specialTokens = [ + ...content.emote.keys, + ...content.atNameToMid.keys.map((e) => '@$e'), + ...content.jumpUrl.keys.map((e) => + e.replaceAll('?', '\\?').replaceAll('+', '\\+').replaceAll('*', '\\*')), + r'\b\d{2}:\d{2}\b' + ]; + + final String patternStr = specialTokens.map(RegExp.escape).join('|'); + final RegExp pattern = RegExp(patternStr); + List matchedStrs = []; + // 分割文本并处理每个部分 content.message.splitMapJoin( - RegExp(r"\[.*?\]"), + pattern, onMatch: (Match match) { - final String matchStr = match[0]!; - if (content.emote.isNotEmpty && - matchStr.indexOf('[') == matchStr.lastIndexOf('[') && - matchStr.indexOf(']') == matchStr.lastIndexOf(']')) { + String matchStr = match[0]!; + if (content.emote.containsKey(matchStr)) { + // 处理表情 final int size = content.emote[matchStr]['meta']['size']; - if (content.emote.keys.contains(matchStr)) { + spanChilds.add(WidgetSpan( + child: NetworkImgLayer( + src: content.emote[matchStr]['url'], + type: 'emote', + width: size * 20, + height: size * 20, + ), + )); + } else if (matchStr.startsWith("@") && + content.atNameToMid.containsKey(matchStr.substring(1))) { + // 处理@用户 + final String userName = matchStr.substring(1); + final int userId = content.atNameToMid[userName]; + spanChilds.add( + TextSpan( + text: matchStr, + style: TextStyle( + color: Theme.of(context).colorScheme.primary, + ), + recognizer: TapGestureRecognizer() + ..onTap = () { + final String heroTag = Utils.makeHeroTag(userId); + Get.toNamed( + '/member?mid=$userId', + arguments: {'face': '', 'heroTag': heroTag}, + ); + }, + ), + ); + } else if (matchStr.contains(':')) { + spanChilds.add( + TextSpan( + text: ' $matchStr ', + style: TextStyle( + color: Theme.of(context).colorScheme.primary, + ), + recognizer: TapGestureRecognizer() + ..onTap = () { + // 跳转到指定位置 + try { + Get.find(tag: Get.arguments['heroTag']) + .plPlayerController + .seekTo( + Duration(seconds: Utils.duration(matchStr)), + ); + } catch (_) {} + }, + ), + ); + } else { + print("matchStr=$matchStr"); + String appUrlSchema = ''; + final bool enableWordRe = setting.get(SettingBoxKey.enableWordRe, + defaultValue: false) as bool; + if (enableWordRe && content.jumpUrl[matchStr] != null && !matchedStrs.contains(matchStr)) { + appUrlSchema = content.jumpUrl[matchStr]['app_url_schema']; spanChilds.add( - WidgetSpan( - child: NetworkImgLayer( - src: content.emote[matchStr]['url'], - type: 'emote', - width: size * 20, - height: size * 20, + TextSpan( + text: content.jumpUrl[matchStr]['title'], + style: TextStyle( + color: Theme.of(context).colorScheme.primary, ), + recognizer: TapGestureRecognizer() + ..onTap = () { + if (appUrlSchema == '') { + final String str = Uri.parse(matchStr).pathSegments[0]; + final Map matchRes = IdUtils.matchAvorBv(input: str); + final List matchKeys = matchRes.keys.toList(); + if (matchKeys.isNotEmpty) { + if (matchKeys.first == 'BV') { + Get.toNamed( + '/searchResult', + parameters: {'keyword': matchRes['BV']}, + ); + } + } else { + Get.toNamed( + '/webview', + parameters: { + 'url': matchStr, + 'type': 'url', + 'pageTitle': '' + }, + ); + } + } else { + if (appUrlSchema.startsWith('bilibili://search')) { + Get.toNamed('/searchResult', parameters: { + 'keyword': content.jumpUrl[matchStr]['title'] + }); + } + } + }, ), ); + if (appUrlSchema.startsWith('bilibili://search') && enableWordRe) { + spanChilds.add( + WidgetSpan( + child: Icon( + FontAwesomeIcons.magnifyingGlass, + size: 9, + color: Theme.of(context).colorScheme.primary, + ), + alignment: PlaceholderAlignment.top, + ), + ); + } + // 只显示一次 + matchedStrs.add(matchStr); } else { spanChilds.add(TextSpan( text: matchStr, recognizer: TapGestureRecognizer() ..onTap = () => replyReply(replyItem.root == 0 ? replyItem : fReplyItem))); - return matchStr; } - } else { - spanChilds.add(TextSpan( - text: matchStr, - recognizer: TapGestureRecognizer() - ..onTap = () => - replyReply(replyItem.root == 0 ? replyItem : fReplyItem))); - return matchStr; } return ''; }, - onNonMatch: (String str) { - // 匹配@用户 - String matchMember = str; - if (content.atNameToMid.isNotEmpty) { - final List atNameToMidKeys = content.atNameToMid.keys.toList(); - RegExp reg = RegExp(atNameToMidKeys.map((key) => key).join('|')); - // if (!content.message.contains(':')) { - // reg = RegExp(r"@.*( |:)"); - // } - - // 只@用户没有内容 - if (!content.message.contains(':') || - (content.atNameToMid.length == 1 && - content.message == '@${content.members.first.uname}')) { - reg = RegExp(r"@.*( |:|$)"); - } - matchMember = str.splitMapJoin( - reg, - onMatch: (Match match) { - if (match[0] != null) { - hasMatchMember = true; - content.atNameToMid.forEach((key, value) { - if (str.contains('回复')) { - spanChilds.add( - TextSpan( - text: '回复 ', - style: TextStyle( - fontSize: - Theme.of(context).textTheme.titleSmall!.fontSize, - ), - ), - ); - } - spanChilds.add( - TextSpan( - text: '@$key', - style: TextStyle( - fontSize: - Theme.of(context).textTheme.titleSmall!.fontSize, - color: Theme.of(context).colorScheme.primary, - ), - recognizer: TapGestureRecognizer() - ..onTap = () { - final String heroTag = Utils.makeHeroTag(value); - Get.toNamed( - '/member?mid=$value', - arguments: {'face': '', 'heroTag': heroTag}, - ); - }, - ), - ); - }); - } - return ''; - }, - onNonMatch: (String str) { - if (!str.contains('@')) { - spanChilds.add(TextSpan(text: str)); - } - print(str); - return str; - }, - ); - } else { - matchMember = str; - } - - // 匹配 jumpUrl - String matchUrl = matchMember; - if (content.jumpUrl.isNotEmpty) { - final List urlKeys = content.jumpUrl.keys.toList().reversed.toList(); - for (int index = 0; index < urlKeys.length; index++) { - var i = urlKeys[index]; - if (i.contains('?')) { - urlKeys[index] = i.replaceAll('?', '\\?'); - } - if (i.contains('+')) { - urlKeys[index] = i.replaceAll('+', '\\+'); - } - if (i.contains('*')) { - urlKeys[index] = i.replaceAll('*', '\\*'); - } - } - if (hasMatchMember) { - matchMember = matchMember.split('回复 @ :').length > 1 - ? matchMember.split('回复 @ :')[1] - : matchMember; - } - matchUrl = matchMember.splitMapJoin( - /// RegExp.escape() 转义特殊字符 - RegExp(urlKeys.map((key) => key).join("|")), - // RegExp('What does the fox say\\?'), - onMatch: (Match match) { - final String matchStr = match[0]!; - String appUrlSchema = ''; - if (content.jumpUrl[matchStr] != null) { - appUrlSchema = content.jumpUrl[matchStr]['app_url_schema']; - } - // 默认不显示关键词 - final bool enableWordRe = setting.get(SettingBoxKey.enableWordRe, - defaultValue: false) as bool; - if (content.jumpUrl[matchStr] != null) { - spanChilds.add( - TextSpan( - text: content.jumpUrl[matchStr]['title'], - style: TextStyle( - color: enableWordRe - ? Theme.of(context).colorScheme.primary - : null, - ), - recognizer: TapGestureRecognizer() - ..onTap = () { - if (appUrlSchema == '') { - final String str = Uri.parse(matchStr).pathSegments[0]; - final Map matchRes = IdUtils.matchAvorBv(input: str); - final List matchKeys = matchRes.keys.toList(); - if (matchKeys.isNotEmpty) { - if (matchKeys.first == 'BV') { - Get.toNamed( - '/searchResult', - parameters: {'keyword': matchRes['BV']}, - ); - } - } else { - Get.toNamed( - '/webview', - parameters: { - 'url': matchStr, - 'type': 'url', - 'pageTitle': '' - }, - ); - } - } else { - if (appUrlSchema.startsWith('bilibili://search') && - enableWordRe) { - Get.toNamed('/searchResult', parameters: { - 'keyword': content.jumpUrl[matchStr]['title'] - }); - } - } - }, - ), - ); - } - - if (appUrlSchema.startsWith('bilibili://search') && enableWordRe) { - spanChilds.add( - WidgetSpan( - child: Icon( - FontAwesomeIcons.magnifyingGlass, - size: 9, - color: Theme.of(context).colorScheme.primary, - ), - alignment: PlaceholderAlignment.top, - ), - ); - } - return ''; - }, - onNonMatch: (String str) { - spanChilds.add(TextSpan( - text: str, - recognizer: TapGestureRecognizer() - ..onTap = () => replyReply( - replyItem.root == 0 ? replyItem : fReplyItem))); - return str; - }, - ); - } - str = matchUrl.splitMapJoin( - RegExp(r'\b\d{2}:\d{2}\b'), - onMatch: (Match match) { - String matchStr = match[0]!; - spanChilds.add( - TextSpan( - text: ' $matchStr ', - style: TextStyle( - color: Theme.of(context).colorScheme.primary, - ), - recognizer: TapGestureRecognizer() - ..onTap = () { - // 跳转到指定位置 - try { - Get.find( - tag: Get.arguments['heroTag']) - .plPlayerController - .seekTo( - Duration(seconds: Utils.duration(matchStr)), - ); - } catch (_) {} - }, - ), - ); - return ''; - }, - onNonMatch: (str) { - return str; - }, - ); - - if (content.atNameToMid.isEmpty && content.jumpUrl.isEmpty) { - if (str != '') { - spanChilds.add(TextSpan( - text: str, - recognizer: TapGestureRecognizer() - ..onTap = () => - replyReply(replyItem.root == 0 ? replyItem : fReplyItem))); - } - } - return str; + onNonMatch: (String nonMatchStr) { + spanChilds.add(TextSpan( + text: nonMatchStr, + recognizer: TapGestureRecognizer() + ..onTap = () => + replyReply(replyItem.root == 0 ? replyItem : fReplyItem))); + return nonMatchStr; }, ); From e603942b5fae5813ace24c4df50ca728f7c6c46c Mon Sep 17 00:00:00 2001 From: orz12 Date: Sat, 27 Jan 2024 15:49:34 +0800 Subject: [PATCH 026/220] =?UTF-8?q?fix:=20=E8=AF=84=E8=AE=BA=E5=8C=BA?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=AD=A3=E5=88=99=E6=8B=BC=E6=8E=A5=E9=A1=BA?= =?UTF-8?q?=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../video/detail/reply/widgets/reply_item.dart | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/lib/pages/video/detail/reply/widgets/reply_item.dart b/lib/pages/video/detail/reply/widgets/reply_item.dart index 6ecf3983..98d8ba6a 100644 --- a/lib/pages/video/detail/reply/widgets/reply_item.dart +++ b/lib/pages/video/detail/reply/widgets/reply_item.dart @@ -593,10 +593,10 @@ InlineSpan buildContent( ...content.atNameToMid.keys.map((e) => '@$e'), ...content.jumpUrl.keys.map((e) => e.replaceAll('?', '\\?').replaceAll('+', '\\+').replaceAll('*', '\\*')), - r'\b\d{2}:\d{2}\b' ]; - final String patternStr = specialTokens.map(RegExp.escape).join('|'); + final String patternStr = + specialTokens.map(RegExp.escape).join('|') + r'|\b[0-9]{1,2}:[0-9]{2}\b'; final RegExp pattern = RegExp(patternStr); List matchedStrs = []; // 分割文本并处理每个部分 @@ -647,12 +647,15 @@ InlineSpan buildContent( ..onTap = () { // 跳转到指定位置 try { + SmartDialog.showToast('跳转至：$matchStr'); Get.find(tag: Get.arguments['heroTag']) .plPlayerController .seekTo( Duration(seconds: Utils.duration(matchStr)), ); - } catch (_) {} + } catch (e) { + SmartDialog.showToast('跳转失败: $e'); + } }, ), ); @@ -661,7 +664,9 @@ InlineSpan buildContent( String appUrlSchema = ''; final bool enableWordRe = setting.get(SettingBoxKey.enableWordRe, defaultValue: false) as bool; - if (enableWordRe && content.jumpUrl[matchStr] != null && !matchedStrs.contains(matchStr)) { + if (enableWordRe && + content.jumpUrl[matchStr] != null && + !matchedStrs.contains(matchStr)) { appUrlSchema = content.jumpUrl[matchStr]['app_url_schema']; spanChilds.add( TextSpan( From e972d17f1ca94361c72499a76b5910aa9771b3b6 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sat, 27 Jan 2024 22:37:16 +0800 Subject: [PATCH 027/220] =?UTF-8?q?mod:=20=E4=BC=98=E5=8C=96=E8=AF=B7?= =?UTF-8?q?=E6=B1=82=E5=BC=82=E5=B8=B8=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/http/init.dart | 20 ++++++++++++++++---- lib/http/interceptor.dart | 40 ++++++++++++++++----------------------- 2 files changed, 32 insertions(+), 28 deletions(-) diff --git a/lib/http/init.dart b/lib/http/init.dart index 6244df04..dcc9f402 100644 --- a/lib/http/init.dart +++ b/lib/http/init.dart @@ -179,8 +179,14 @@ class Request { ); return response; } on DioException catch (e) { - print('get error: $e'); - return Future.error(await ApiInterceptor.dioError(e)); + Response errResponse = Response( + data: { + 'message': await ApiInterceptor.dioError(e) + }, // 将自定义 Map 数据赋值给 Response 的 data 属性 + statusCode: 200, + requestOptions: RequestOptions(), + ); + return errResponse; } } @@ -201,8 +207,14 @@ class Request { // print('post success: ${response.data}'); return response; } on DioException catch (e) { - print('post error: $e'); - return Future.error(await ApiInterceptor.dioError(e)); + Response errResponse = Response( + data: { + 'message': await ApiInterceptor.dioError(e) + }, // 将自定义 Map 数据赋值给 Response 的 data 属性 + statusCode: 200, + requestOptions: RequestOptions(), + ); + return errResponse; } } diff --git a/lib/http/interceptor.dart b/lib/http/interceptor.dart index 48ba7e60..362ff17a 100644 --- a/lib/http/interceptor.dart +++ b/lib/http/interceptor.dart @@ -5,7 +5,6 @@ import 'package:dio/dio.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:hive/hive.dart'; import '../utils/storage.dart'; -// import 'package:get/get.dart' hide Response; class ApiInterceptor extends Interceptor { @override @@ -71,35 +70,28 @@ class ApiInterceptor extends Interceptor { return '发送请求超时，请检查网络设置'; case DioExceptionType.unknown: final String res = await checkConnect(); - return '$res \n 网络异常，请稍后重试！'; - // default: - // return 'Dio异常'; + return '$res，网络异常！'; } } static Future checkConnect() async { final ConnectivityResult connectivityResult = await Connectivity().checkConnectivity(); - if (connectivityResult == ConnectivityResult.mobile) { - return 'connected with mobile network'; - } else if (connectivityResult == ConnectivityResult.wifi) { - return 'connected with wifi network'; - } else if (connectivityResult == ConnectivityResult.ethernet) { - // I am connected to a ethernet network. - return ''; - } else if (connectivityResult == ConnectivityResult.vpn) { - // I am connected to a vpn network. - // Note for iOS and macOS: - // There is no separate network interface type for [vpn]. - // It returns [other] on any device (also simulator) - return ''; - } else if (connectivityResult == ConnectivityResult.other) { - // I am connected to a network which is not in the above mentioned networks. - return ''; - } else if (connectivityResult == ConnectivityResult.none) { - return 'not connected to any network'; - } else { - return ''; + switch (connectivityResult) { + case ConnectivityResult.mobile: + return '正在使用移动流量'; + case ConnectivityResult.wifi: + return '正在使用wifi'; + case ConnectivityResult.ethernet: + return '正在使用局域网'; + case ConnectivityResult.vpn: + return '正在使用代理网络'; + case ConnectivityResult.other: + return '正在使用其他网络'; + case ConnectivityResult.none: + return '未连接到任何网络'; + default: + return ''; } } } From 22a2628513e65606bf84fe026392c4c54a25af25 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sat, 27 Jan 2024 22:42:04 +0800 Subject: [PATCH 028/220] =?UTF-8?q?fix:=20=E8=AF=84=E8=AE=BA=E5=8C=BA?= =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E8=B6=85=E6=97=B6=E5=AF=BC=E8=87=B4=E8=A7=86?= =?UTF-8?q?=E5=9B=BE=E5=B4=A9=E6=BA=83=20issues=20#389?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/video/detail/reply/view.dart | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/pages/video/detail/reply/view.dart b/lib/pages/video/detail/reply/view.dart index 7232ebab..b2c67b1e 100644 --- a/lib/pages/video/detail/reply/view.dart +++ b/lib/pages/video/detail/reply/view.dart @@ -256,7 +256,12 @@ class _VideoReplyPanelState extends State // 请求错误 return HttpError( errMsg: data['msg'], - fn: () => setState(() {}), + fn: () { + setState(() { + _futureBuilderFuture = + _videoReplyController.queryReplyList(); + }); + }, ); } } else { From a78ce4f6d456d1a5a99e35fafd051d35b1a39b5b Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sun, 28 Jan 2024 15:52:30 +0800 Subject: [PATCH 029/220] =?UTF-8?q?feat:=20=E9=94=99=E8=AF=AF=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- android/app/build.gradle | 3 +- ios/Podfile.lock | 16 +++ lib/main.dart | 29 ++++- lib/pages/about/index.dart | 10 ++ lib/pages/setting/pages/logs.dart | 201 ++++++++++++++++++++++++++++++ lib/router/app_pages.dart | 3 + lib/services/loggeer.dart | 56 +++++++++ pubspec.lock | 50 +++++++- pubspec.yaml | 3 + 9 files changed, 367 insertions(+), 4 deletions(-) create mode 100644 lib/pages/setting/pages/logs.dart create mode 100644 lib/services/loggeer.dart diff --git a/android/app/build.gradle b/android/app/build.gradle index 0e87d789..3dc4f82a 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -58,11 +58,10 @@ android { applicationId "com.guozhigq.pilipala" // You can update the following values to match your application needs. // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration. - // minSdkVersion flutter.minSdkVersion targetSdkVersion flutter.targetSdkVersion versionCode flutterVersionCode.toInteger() versionName flutterVersionName - minSdkVersion 19 + minSdkVersion 21 multiDexEnabled true } diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 5f855b9d..8db59815 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -13,8 +13,13 @@ PODS: - device_info_plus (0.0.1): - Flutter - Flutter (1.0.0) + - flutter_mailer (0.0.1): + - Flutter - flutter_volume_controller (0.0.1): - Flutter + - fluttertoast (0.0.2): + - Flutter + - Toast - FMDB (2.7.5): - FMDB/standard (= 2.7.5) - FMDB/standard (2.7.5) @@ -49,6 +54,7 @@ PODS: - Flutter - system_proxy (0.0.1): - Flutter + - Toast (4.1.0) - url_launcher_ios (0.0.1): - Flutter - volume_controller (0.0.1): @@ -68,7 +74,9 @@ DEPENDENCIES: - connectivity_plus (from `.symlinks/plugins/connectivity_plus/ios`) - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`) - Flutter (from `Flutter`) + - flutter_mailer (from `.symlinks/plugins/flutter_mailer/ios`) - flutter_volume_controller (from `.symlinks/plugins/flutter_volume_controller/ios`) + - fluttertoast (from `.symlinks/plugins/fluttertoast/ios`) - gt3_flutter_plugin (from `.symlinks/plugins/gt3_flutter_plugin/ios`) - media_kit_libs_ios_video (from `.symlinks/plugins/media_kit_libs_ios_video/ios`) - media_kit_native_event_loop (from `.symlinks/plugins/media_kit_native_event_loop/ios`) @@ -93,6 +101,7 @@ SPEC REPOS: - FMDB - GT3Captcha-iOS - ReachabilitySwift + - Toast EXTERNAL SOURCES: appscheme: @@ -109,8 +118,12 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/device_info_plus/ios" Flutter: :path: Flutter + flutter_mailer: + :path: ".symlinks/plugins/flutter_mailer/ios" flutter_volume_controller: :path: ".symlinks/plugins/flutter_volume_controller/ios" + fluttertoast: + :path: ".symlinks/plugins/fluttertoast/ios" gt3_flutter_plugin: :path: ".symlinks/plugins/gt3_flutter_plugin/ios" media_kit_libs_ios_video: @@ -156,7 +169,9 @@ SPEC CHECKSUMS: connectivity_plus: 07c49e96d7fc92bc9920617b83238c4d178b446a device_info_plus: c6fb39579d0f423935b0c9ce7ee2f44b71b9fce6 Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854 + flutter_mailer: 2ef5a67087bc8c6c4cefd04a178bf1ae2c94cd83 flutter_volume_controller: e4d5832f08008180f76e30faf671ffd5a425e529 + fluttertoast: 31b00dabfa7fb7bacd9e7dbee580d7a2ff4bf265 FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a gt3_flutter_plugin: bfa1f26e9a09dc00401514be5ed437f964cabf23 GT3Captcha-iOS: 5e3b1077834d8a9d6f4d64a447a30af3e14affe6 @@ -173,6 +188,7 @@ SPEC CHECKSUMS: sqflite: 31f7eba61e3074736dff8807a9b41581e4f7f15a status_bar_control: 7c84146799e6a076315cc1550f78ef53aae3e446 system_proxy: bec1a5c5af67dd3e3ebf43979400a8756c04cc44 + Toast: ec33c32b8688982cecc6348adeae667c1b9938da url_launcher_ios: bf5ce03e0e2088bad9cc378ea97fa0ed5b49673b volume_controller: 531ddf792994285c9b17f9d8a7e4dcdd29b3eae9 wakelock_plus: 8b09852c8876491e4b6d179e17dfe2a0b5f60d47 diff --git a/lib/main.dart b/lib/main.dart index 2c7ef1ee..bdf3f6b7 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -21,6 +21,8 @@ import 'package:pilipala/utils/app_scheme.dart'; import 'package:pilipala/utils/data.dart'; import 'package:pilipala/utils/storage.dart'; import 'package:media_kit/media_kit.dart'; // Provides [Player], [Media], [Playlist] etc. +import 'package:catcher_2/catcher_2.dart'; +import './services/loggeer.dart'; void main() async { WidgetsFlutterBinding.ensureInitialized(); @@ -32,7 +34,32 @@ void main() async { await setupServiceLocator(); Request(); await Request.setCookie(); - runApp(const MyApp()); + + // 异常捕获 logo记录 + final Catcher2Options debugConfig = Catcher2Options( + SilentReportMode(), + [ + FileHandler(await getLogsPath()), + ConsoleHandler( + enableDeviceParameters: false, + enableApplicationParameters: false, + ) + ], + ); + + final Catcher2Options releaseConfig = Catcher2Options( + SilentReportMode(), + [FileHandler(await getLogsPath())], + ); + + Catcher2( + debugConfig: debugConfig, + releaseConfig: releaseConfig, + runAppFunction: () { + runApp(const MyApp()); + }, + ); + // 小白条、导航栏沉浸 SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge); SystemChrome.setSystemUIOverlayStyle(const SystemUiOverlayStyle( diff --git a/lib/pages/about/index.dart b/lib/pages/about/index.dart index 997adbfe..5df05d31 100644 --- a/lib/pages/about/index.dart +++ b/lib/pages/about/index.dart @@ -133,6 +133,11 @@ class _AboutPageState extends State { title: const Text('赞助'), trailing: Icon(Icons.arrow_forward_ios, size: 16, color: outline), ), + ListTile( + onTap: () => _aboutController.logs(), + title: const Text('错误日志'), + trailing: Icon(Icons.arrow_forward_ios, size: 16, color: outline), + ), ], ), ), @@ -260,4 +265,9 @@ class AboutController extends GetxController { mode: LaunchMode.externalApplication, ); } + + // 日志 + logs() { + Get.toNamed('/logs'); + } } diff --git a/lib/pages/setting/pages/logs.dart b/lib/pages/setting/pages/logs.dart new file mode 100644 index 00000000..0958edb8 --- /dev/null +++ b/lib/pages/setting/pages/logs.dart @@ -0,0 +1,201 @@ +import 'dart:io'; +import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; +import 'package:pilipala/common/widgets/no_data.dart'; +import 'package:url_launcher/url_launcher.dart'; +import '../../../services/loggeer.dart'; + +class LogsPage extends StatefulWidget { + const LogsPage({super.key}); + + @override + State createState() => _LogsPageState(); +} + +class _LogsPageState extends State { + late File logsPath; + late String fileContent; + List logsContent = []; + + @override + void initState() { + getPath(); + super.initState(); + } + + void getPath() async { + logsPath = await getLogsPath(); + fileContent = await logsPath.readAsString(); + logsContent = await parseLogs(fileContent); + setState(() {}); + } + + Future>> parseLogs(String fileContent) async { + const String splitToken = + '======================================================================'; + List contentList = fileContent.split(splitToken).map((item) { + return item + .replaceAll( + '============================== CATCHER 2 LOG ==============================', + 'Pilipala错误日志 \n ********************') + .replaceAll('DEVICE INFO', '设备信息') + .replaceAll('APP INFO', '应用信息') + .replaceAll('ERROR', '错误信息') + .replaceAll('STACK TRACE', '错误堆栈'); + }).toList(); + List> result = []; + for (String i in contentList) { + DateTime? date; + String body = i + .split("\n") + .map((l) { + if (l.startsWith("Crash occurred on")) { + date = DateTime.parse( + l.split("Crash occurred on")[1].trim().split('.')[0], + ); + return ""; + } + return l; + }) + .where((dynamic l) => l.replaceAll("\n", "").trim().isNotEmpty) + .join("\n"); + if (date != null || body != '') { + result.add({'date': date, 'body': body, 'expand': false}); + } + } + return result.reversed.toList(); + } + + void copyLogs() async { + await Clipboard.setData(ClipboardData(text: fileContent)); + if (context.mounted) { + ScaffoldMessenger.of(context).showSnackBar( + const SnackBar(content: Text('复制成功')), + ); + } + } + + void feedback() { + launchUrl( + Uri.parse('https://github.com/guozhigq/pilipala/issues'), + // 系统自带浏览器打开 + mode: LaunchMode.externalApplication, + ); + } + + void clearLogsHandle() async { + if (await clearLogs()) { + if (context.mounted) { + ScaffoldMessenger.of(context).showSnackBar( + const SnackBar(content: Text('已清空')), + ); + logsContent = []; + setState(() {}); + } + } + } + + @override + Widget build(BuildContext context) { + return Scaffold( + appBar: AppBar( + centerTitle: false, + titleSpacing: 0, + title: Text('日志', style: Theme.of(context).textTheme.titleMedium), + actions: [ + PopupMenuButton( + onSelected: (String type) { + // 处理菜单项选择的逻辑 + switch (type) { + case 'copy': + copyLogs(); + break; + case 'feedback': + feedback(); + break; + case 'clear': + clearLogsHandle(); + break; + default: + } + }, + itemBuilder: (BuildContext context) => >[ + const PopupMenuItem( + value: 'copy', + child: Text('复制日志'), + ), + const PopupMenuItem( + value: 'feedback', + child: Text('错误反馈'), + ), + const PopupMenuItem( + value: 'clear', + child: Text('清空日志'), + ), + ], + ), + const SizedBox(width: 6), + ], + ), + body: logsContent.isNotEmpty + ? ListView.builder( + itemCount: logsContent.length, + itemBuilder: (context, index) { + final log = logsContent[index]; + return Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.min, + children: [ + Row( + children: [ + Padding( + padding: const EdgeInsets.all(8.0), + child: Text( + log['date'].toString(), + style: Theme.of(context).textTheme.titleMedium, + ), + ), + TextButton.icon( + onPressed: () async { + await Clipboard.setData( + ClipboardData(text: log['body']), + ); + if (context.mounted) { + ScaffoldMessenger.of(context).showSnackBar( + SnackBar( + content: Text( + '已将 ${log['date'].toString()} 复制至剪贴板', + ), + ), + ); + } + }, + icon: const Icon(Icons.copy_outlined, size: 16), + label: const Text('复制'), + ) + ], + ), + Padding( + padding: const EdgeInsets.all(8.0), + child: Card( + elevation: 1, + clipBehavior: Clip.antiAliasWithSaveLayer, + child: Padding( + padding: const EdgeInsets.all(12.0), + child: SelectableText(log['body']), + ), + ), + ), + const Divider(indent: 12, endIndent: 12), + ], + ); + }, + ) + : const CustomScrollView( + slivers: [ + NoData(), + ], + ), + ); + } +} diff --git a/lib/router/app_pages.dart b/lib/router/app_pages.dart index 64d8da31..23172d3c 100644 --- a/lib/router/app_pages.dart +++ b/lib/router/app_pages.dart @@ -3,6 +3,7 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:hive/hive.dart'; +import 'package:pilipala/pages/setting/pages/logs.dart'; import '../pages/about/index.dart'; import '../pages/blacklist/index.dart'; @@ -151,6 +152,8 @@ class Routes { // 用户专栏 CustomGetPage( name: '/memberSeasons', page: () => const MemberSeasonsPage()), + // 日志 + CustomGetPage(name: '/logs', page: () => const LogsPage()), ]; } diff --git a/lib/services/loggeer.dart b/lib/services/loggeer.dart new file mode 100644 index 00000000..5555432c --- /dev/null +++ b/lib/services/loggeer.dart @@ -0,0 +1,56 @@ +// final _loggerFactory = + +import 'dart:io'; + +import 'package:logger/logger.dart'; +import 'package:path_provider/path_provider.dart'; +import 'package:path/path.dart' as p; + +final _loggerFactory = PiliLogger(); + +PiliLogger getLogger() { + return _loggerFactory; +} + +class PiliLogger extends Logger { + PiliLogger() : super(); + + @override + void log(Level level, dynamic message, + {Object? error, StackTrace? stackTrace, DateTime? time}) async { + if (level == Level.error) { + String dir = (await getApplicationDocumentsDirectory()).path; + // 创建logo文件 + final String filename = p.join(dir, ".pili_logs"); + // 添加至文件末尾 + await File(filename).writeAsString( + "**${DateTime.now()}** \n $message \n $stackTrace", + mode: FileMode.writeOnlyAppend, + ); + } + super.log(level, "$message", error: error, stackTrace: stackTrace); + } +} + +Future getLogsPath() async { + String dir = (await getApplicationDocumentsDirectory()).path; + final String filename = p.join(dir, ".pili_logs"); + final file = File(filename); + if (!await file.exists()) { + await file.create(); + } + return file; +} + +Future clearLogs() async { + String dir = (await getApplicationDocumentsDirectory()).path; + final String filename = p.join(dir, ".pili_logs"); + final file = File(filename); + try { + await file.writeAsString(''); + } catch (e) { + print('Error clearing file: $e'); + return false; + } + return true; +} diff --git a/pubspec.lock b/pubspec.lock index b8f7aff8..d9b6a01d 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -209,6 +209,14 @@ packages: url: "https://pub.flutter-io.cn" source: hosted version: "1.1.0" + catcher_2: + dependency: "direct main" + description: + name: catcher_2 + sha256: ca94d45ffb52bf4b16a425cdff6734ae8443d36d5f06c276f1c2a593120b11ed + url: "https://pub.flutter-io.cn" + source: hosted + version: "1.1.0" characters: dependency: transitive description: @@ -547,6 +555,14 @@ packages: description: flutter source: sdk version: "0.0.0" + flutter_mailer: + dependency: transitive + description: + name: flutter_mailer + sha256: "4fffaa35e911ff5ec2e5a4ebbca62c372e99a154eb3bb2c0bf79f09adf6ecf4c" + url: "https://pub.flutter-io.cn" + source: hosted + version: "2.1.2" flutter_plugin_android_lifecycle: dependency: transitive description: @@ -589,6 +605,14 @@ packages: description: flutter source: sdk version: "0.0.0" + fluttertoast: + dependency: transitive + description: + name: fluttertoast + sha256: dfdde255317af381bfc1c486ed968d5a43a2ded9c931e87cbecd88767d6a71c1 + url: "https://pub.flutter-io.cn" + source: hosted + version: "8.2.4" font_awesome_flutter: dependency: "direct main" description: @@ -781,6 +805,14 @@ packages: url: "https://pub.flutter-io.cn" source: hosted version: "3.0.0" + logger: + dependency: "direct main" + description: + name: logger + sha256: "6bbb9d6f7056729537a4309bda2e74e18e5d9f14302489cc1e93f33b3fe32cac" + url: "https://pub.flutter-io.cn" + source: hosted + version: "2.0.2+1" logging: dependency: transitive description: @@ -789,6 +821,14 @@ packages: url: "https://pub.flutter-io.cn" source: hosted version: "1.2.0" + mailer: + dependency: transitive + description: + name: mailer + sha256: "57f6dd1496699999a7bfd0aa6be0645384f477f4823e16d4321c40a434346382" + url: "https://pub.flutter-io.cn" + source: hosted + version: "6.0.1" matcher: dependency: transitive description: @@ -951,7 +991,7 @@ packages: source: hosted version: "2.0.1" path: - dependency: transitive + dependency: "direct main" description: name: path sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" @@ -1214,6 +1254,14 @@ packages: url: "https://pub.flutter-io.cn" source: hosted version: "0.3.8" + sentry: + dependency: transitive + description: + name: sentry + sha256: "5686ed515bb620dc52b4ae99a6586fe720d443591183cf1f620ec5d1f0eec100" + url: "https://pub.flutter-io.cn" + source: hosted + version: "7.15.0" share_plus: dependency: "direct main" description: diff --git a/pubspec.yaml b/pubspec.yaml index 5f22a7de..d81781c8 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -134,6 +134,9 @@ dependencies: uuid: ^3.0.7 scrollable_positioned_list: ^0.3.8 nil: ^1.1.1 + catcher_2: ^1.1.0 + logger: ^2.0.2+1 + path: 1.8.3 dev_dependencies: From 127c6734f89a12332d6c8406cb4ae4d2c1d9fe8f Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sun, 28 Jan 2024 23:15:34 +0800 Subject: [PATCH 030/220] =?UTF-8?q?feat:=20=E8=87=AA=E5=8A=A8=E6=89=93?= =?UTF-8?q?=E5=8C=85ipa=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/main.yml | 201 +++++++++++++++++++++++++------------ 1 file changed, 137 insertions(+), 64 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 90fa6311..e7f09f96 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,84 +1,157 @@ -name: build_apk +name: Pilipala Release # action事件触发 on: push: # push tag时触发 tags: - - 'v*.*.*' + - "v*.*.*" # 可以有多个jobs jobs: - build_apk: - # 运行环境 ubuntu-latest window-latest mac-latest - runs-on: ubuntu-latest + android: + # 运行环境 ubuntu-latest window-latest mac-latest + runs-on: ubuntu-latest - # 每个jobs中可以有多个steps - steps: - - name: 代码迁出 - uses: actions/checkout@v3 + # 每个jobs中可以有多个steps + steps: + - name: 代码迁出 + uses: actions/checkout@v3 - - name: 构建Java环境 - uses: actions/setup-java@v3 - with: - distribution: "zulu" - java-version: "17" - token: ${{secrets.GIT_TOKEN}} + - name: 构建Java环境 + uses: actions/setup-java@v3 + with: + distribution: "zulu" + java-version: "17" + token: ${{secrets.GIT_TOKEN}} - - name: 检查缓存 - uses: actions/cache@v2 - id: cache-flutter - with: - path: /root/flutter-sdk # Flutter SDK 的路径 - key: ${{ runner.os }}-flutter-${{ hashFiles('**/pubspec.lock') }} + - name: 检查缓存 + uses: actions/cache@v2 + id: cache-flutter + with: + path: /root/flutter-sdk # Flutter SDK 的路径 + key: ${{ runner.os }}-flutter-${{ hashFiles('**/pubspec.lock') }} - - name: 安装Flutter - if: steps.cache-flutter.outputs.cache-hit != 'true' - uses: subosito/flutter-action@v2 - with: - flutter-version: 3.16.5 - channel: any + - name: 安装Flutter + if: steps.cache-flutter.outputs.cache-hit != 'true' + uses: subosito/flutter-action@v2 + with: + flutter-version: 3.16.5 + channel: any - - name: 下载项目依赖 - run: flutter pub get + - name: 下载项目依赖 + run: flutter pub get - - name: 解码生成 jks - run: echo $KEYSTORE_BASE64 | base64 -di > android/app/vvex.jks - env: - KEYSTORE_BASE64: ${{ secrets.KEYSTORE_BASE64 }} + - name: 解码生成 jks + run: echo $KEYSTORE_BASE64 | base64 -di > android/app/vvex.jks + env: + KEYSTORE_BASE64: ${{ secrets.KEYSTORE_BASE64 }} - - name: flutter build apk - # 对应 android/app/build.gradle signingConfigs中的配置项 - run: flutter build apk --release --split-per-abi - env: - KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }} - KEY_ALIAS: ${{ secrets.KEY_ALIAS }} - KEY_PASSWORD: ${{ secrets.KEY_PASSWORD}} + - name: flutter build apk + run: flutter build apk --release --split-per-abi + env: + KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }} + KEY_ALIAS: ${{ secrets.KEY_ALIAS }} + KEY_PASSWORD: ${{ secrets.KEY_PASSWORD}} - - name: 获取版本号 - id: version - run: echo "version=${GITHUB_REF#refs/tags/v}" >>$GITHUB_OUTPUT + - name: flutter build apk + run: flutter build apk --release + env: + KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }} + KEY_ALIAS: ${{ secrets.KEY_ALIAS }} + KEY_PASSWORD: ${{ secrets.KEY_PASSWORD}} - # - name: 获取当前日期 - # id: date - # run: echo "date=$(date +'%m%d')" >>$GITHUB_OUTPUT + - name: 获取版本号 + id: version + run: echo "version=${GITHUB_REF#refs/tags/v}" >>$GITHUB_OUTPUT - - name: 重命名应用 Pili-arm64-v8a-*.*.*.0101.apk - run: | - # DATE=${{ steps.date.outputs.date }} - for file in build/app/outputs/flutter-apk/app-*-release.apk; do - if [[ $file =~ app-(.*)-release.apk ]]; then - new_file_name="build/app/outputs/flutter-apk/Pili-${BASH_REMATCH[1]}-${{ steps.version.outputs.version }}.apk" - mv "$file" "$new_file_name" - fi - done + # - name: 获取当前日期 + # id: date + # run: echo "date=$(date +'%m%d')" >>$GITHUB_OUTPUT - - name: 构建和发布release - uses: ncipollo/release-action@v1 - with: - # release title - name: v${{ steps.version.outputs.version }} - artifacts: "build/app/outputs/flutter-apk/Pili-*.apk" - bodyFile: "change_log/${{steps.version.outputs.version}}.md" - token: ${{ secrets.GIT_TOKEN }} - allowUpdates: true + - name: 重命名应用 + run: | + # DATE=${{ steps.date.outputs.date }} + for file in build/app/outputs/flutter-apk/app-*.apk; do + if [[ $file =~ app-(.?*)release.apk ]]; then + new_file_name="build/app/outputs/flutter-apk/Pili-${BASH_REMATCH[1]}${{ steps.version.outputs.version }}.apk" + mv "$file" "$new_file_name" + fi + done + + - name: 上传 + uses: actions/upload-artifact@v3 + with: + name: Pilipala-Release + path: | + build/app/outputs/flutter-apk/Pili-*.apk + + iOS: + runs-on: macos-latest + + steps: + - name: 代码迁出 + uses: actions/checkout@v4 + + - name: 安装Flutter + if: steps.cache-flutter.outputs.cache-hit != 'true' + uses: subosito/flutter-action@v2.10.0 + with: + cache: true + flutter-version: 3.10.6 + + - name: flutter build ipa + run: | + flutter build ios --release --no-codesign + ln -sf ./build/ios/iphoneos Payload + zip -r9 app.ipa Payload/runner.app + + - name: 获取版本号 + id: version + run: echo "version=${GITHUB_REF#refs/tags/v}" >>$GITHUB_OUTPUT + + - name: 重命名应用 + run: | + DATE=${{ steps.date.outputs.date }} + for file in app.ipa; do + new_file_name="build/Pili-${{ steps.version.outputs.version }}.ipa" + mv "$file" "$new_file_name" + done + + - name: 上传 + uses: actions/upload-artifact@v3 + with: + if-no-files-found: error + name: Pilipala-Release + path: | + build/Pili-*.ipa + + upload: + runs-on: ubuntu-latest + + needs: + - android + - iOS + steps: + - uses: actions/download-artifact@v3 + with: + name: Pilipala-Release + path: ./Pilipala-Release + + - name: Install dependencies + run: sudo apt-get install tree -y + + - name: Get version + id: version + run: echo "version=${GITHUB_REF#refs/tags/v}" >>$GITHUB_OUTPUT + + - name: Upload Release + uses: ncipollo/release-action@v1 + with: + name: v${{ steps.version.outputs.version }} + token: ${{ secrets.GIT_TOKEN }} + omitBodyDuringUpdate: true + omitNameDuringUpdate: true + omitPrereleaseDuringUpdate: true + allowUpdates: true + artifacts: Pilipala-Release/* From 8169f5739cdc68765c8fc8b00b95d1bf9694afa8 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sun, 28 Jan 2024 23:44:41 +0800 Subject: [PATCH 031/220] =?UTF-8?q?fix:=20=E9=A6=96=E9=A1=B5tabbar?= =?UTF-8?q?=E6=8E=92=E5=BA=8F=E6=97=A0=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/home/controller.dart | 11 +++++++---- lib/pages/setting/pages/home_tabbar_set.dart | 11 +++++++++++ 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/lib/pages/home/controller.dart b/lib/pages/home/controller.dart index e6fafba6..685ff5c3 100644 --- a/lib/pages/home/controller.dart +++ b/lib/pages/home/controller.dart @@ -63,13 +63,16 @@ class HomeController extends GetxController with GetTickerProviderStateMixin { } void setTabConfig() async { - defaultTabs = tabsConfig; + defaultTabs = [...tabsConfig]; tabbarSort = settingStorage.get(SettingBoxKey.tabbarSort, defaultValue: ['live', 'rcmd', 'hot', 'bangumi']); + defaultTabs.retainWhere( + (item) => tabbarSort.contains((item['type'] as TabType).id)); + defaultTabs.sort((a, b) => tabbarSort + .indexOf((a['type'] as TabType).id) + .compareTo(tabbarSort.indexOf((b['type'] as TabType).id))); - tabs.value = defaultTabs - .where((i) => tabbarSort.contains((i['type'] as TabType).id)) - .toList(); + tabs.value = defaultTabs; if (tabbarSort.contains(TabType.rcmd.id)) { initialIndex.value = tabbarSort.indexOf(TabType.rcmd.id); diff --git a/lib/pages/setting/pages/home_tabbar_set.dart b/lib/pages/setting/pages/home_tabbar_set.dart index 445ca4f5..4cb3944c 100644 --- a/lib/pages/setting/pages/home_tabbar_set.dart +++ b/lib/pages/setting/pages/home_tabbar_set.dart @@ -22,6 +22,17 @@ class _TabbarSetPageState extends State { defaultTabs = tabsConfig; tabbarSort = settingStorage.get(SettingBoxKey.tabbarSort, defaultValue: ['live', 'rcmd', 'hot', 'bangumi']); + // 对 tabData 进行排序 + defaultTabs.sort((a, b) { + int indexA = tabbarSort.indexOf((a['type'] as TabType).id); + int indexB = tabbarSort.indexOf((b['type'] as TabType).id); + + // 如果类型在 sortOrder 中不存在，则放在末尾 + if (indexA == -1) indexA = tabbarSort.length; + if (indexB == -1) indexB = tabbarSort.length; + + return indexA.compareTo(indexB); + }); } void saveEdit() { From 699361e04c6e6df69a8090f2db31353d1d784b5f Mon Sep 17 00:00:00 2001 From: guozhigq Date: Tue, 30 Jan 2024 23:11:54 +0800 Subject: [PATCH 032/220] fix: aid --- lib/http/reply.dart | 4 ++-- lib/http/video.dart | 2 +- lib/pages/bangumi/introduction/controller.dart | 2 +- lib/pages/dynamics/detail/view.dart | 4 ++-- lib/pages/html/view.dart | 3 ++- lib/pages/video/detail/introduction/controller.dart | 2 +- lib/pages/video/detail/reply/controller.dart | 6 +++--- lib/pages/video/detail/reply/view.dart | 7 ++++--- lib/pages/video/detail/reply/widgets/reply_item.dart | 2 +- lib/pages/video/detail/reply_new/view.dart | 2 +- 10 files changed, 18 insertions(+), 16 deletions(-) diff --git a/lib/http/reply.dart b/lib/http/reply.dart index fab433fc..4c165b3b 100644 --- a/lib/http/reply.dart +++ b/lib/http/reply.dart @@ -4,7 +4,7 @@ import 'init.dart'; class ReplyHttp { static Future replyList({ - required int oid, + required dynamic oid, required int pageNum, required int type, int? ps, @@ -76,7 +76,7 @@ class ReplyHttp { // 评论点赞 static Future likeReply({ required int type, - required int oid, + required dynamic oid, required int rpid, required int action, }) async { diff --git a/lib/http/video.dart b/lib/http/video.dart index 923e93a2..7929be63 100644 --- a/lib/http/video.dart +++ b/lib/http/video.dart @@ -331,7 +331,7 @@ class VideoHttp { // plat num 发送平台标识 非必要 1：web端 2：安卓客户端 3：ios客户端 4：wp客户端 static Future replyAdd({ required ReplyType type, - required int oid, + required dynamic oid, required String message, int? root, int? parent, diff --git a/lib/pages/bangumi/introduction/controller.dart b/lib/pages/bangumi/introduction/controller.dart index 13dd50c0..695bca3a 100644 --- a/lib/pages/bangumi/introduction/controller.dart +++ b/lib/pages/bangumi/introduction/controller.dart @@ -266,7 +266,7 @@ class BangumiIntroController extends GetxController { /// 未渲染回复组件时可能异常 VideoReplyController videoReplyCtr = Get.find(tag: Get.arguments['heroTag']); - videoReplyCtr.aid = aid; + videoReplyCtr.oid = bvid; videoReplyCtr.queryReplyList(type: 'init'); } catch (_) {} } diff --git a/lib/pages/dynamics/detail/view.dart b/lib/pages/dynamics/detail/view.dart index 840cd33f..9489346f 100644 --- a/lib/pages/dynamics/detail/view.dart +++ b/lib/pages/dynamics/detail/view.dart @@ -385,8 +385,8 @@ class _DynamicDetailPageState extends State isScrollControlled: true, builder: (BuildContext context) { return VideoReplyNewDialog( - oid: _dynamicDetailController.oid ?? - IdUtils.bv2av(Get.parameters['bvid']!), + oid: _dynamicDetailController.oid?.toString() ?? + Get.parameters['bvid'], root: 0, parent: 0, replyType: ReplyType.values[replyType], diff --git a/lib/pages/html/view.dart b/lib/pages/html/view.dart index 9f0c865c..7625306f 100644 --- a/lib/pages/html/view.dart +++ b/lib/pages/html/view.dart @@ -13,6 +13,7 @@ import 'package:pilipala/pages/video/detail/reply/widgets/reply_item.dart'; import 'package:pilipala/pages/video/detail/reply_new/index.dart'; import 'package:pilipala/pages/video/detail/reply_reply/index.dart'; import 'package:pilipala/utils/feed_back.dart'; +import 'package:pilipala/utils/id_utils.dart'; import 'controller.dart'; @@ -427,7 +428,7 @@ class _HtmlRenderPageState extends State isScrollControlled: true, builder: (BuildContext context) { return VideoReplyNewDialog( - oid: _htmlRenderCtr.oid.value, + oid: IdUtils.av2bv(_htmlRenderCtr.oid.value), root: 0, parent: 0, replyType: ReplyType.values[type], diff --git a/lib/pages/video/detail/introduction/controller.dart b/lib/pages/video/detail/introduction/controller.dart index 1230a94b..73165117 100644 --- a/lib/pages/video/detail/introduction/controller.dart +++ b/lib/pages/video/detail/introduction/controller.dart @@ -478,7 +478,7 @@ class VideoIntroController extends GetxController { /// 未渲染回复组件时可能异常 final VideoReplyController videoReplyCtr = Get.find(tag: heroTag); - videoReplyCtr.aid = aid; + videoReplyCtr.oid = bvid; videoReplyCtr.queryReplyList(type: 'init'); } catch (_) {} this.bvid = bvid; diff --git a/lib/pages/video/detail/reply/controller.dart b/lib/pages/video/detail/reply/controller.dart index 9e05542b..03c5fb0e 100644 --- a/lib/pages/video/detail/reply/controller.dart +++ b/lib/pages/video/detail/reply/controller.dart @@ -11,13 +11,13 @@ import 'package:pilipala/utils/storage.dart'; class VideoReplyController extends GetxController { VideoReplyController( - this.aid, + this.oid, this.rpid, this.replyLevel, ); final ScrollController scrollController = ScrollController(); // 视频aid 请求时使用的oid - int? aid; + String? oid; // 层级 2为楼中楼 String? replyLevel; // rpid 请求楼中楼回复 @@ -57,7 +57,7 @@ class VideoReplyController extends GetxController { return; } final res = await ReplyHttp.replyList( - oid: aid!, + oid: oid!, pageNum: currentPage + 1, ps: ps, type: ReplyType.video.index, diff --git a/lib/pages/video/detail/reply/view.dart b/lib/pages/video/detail/reply/view.dart index b2c67b1e..474615fc 100644 --- a/lib/pages/video/detail/reply/view.dart +++ b/lib/pages/video/detail/reply/view.dart @@ -40,6 +40,7 @@ class _VideoReplyPanelState extends State bool _isFabVisible = true; String replyLevel = '1'; late String heroTag; + late String oid; // 添加页面缓存 @override @@ -48,7 +49,7 @@ class _VideoReplyPanelState extends State @override void initState() { super.initState(); - int oid = widget.bvid != null ? IdUtils.bv2av(widget.bvid!) : 0; + oid = widget.bvid != null ? widget.bvid! : '0'; heroTag = Get.arguments['heroTag']; replyLevel = widget.replyLevel ?? '1'; if (replyLevel == '2') { @@ -297,8 +298,8 @@ class _VideoReplyPanelState extends State isScrollControlled: true, builder: (BuildContext context) { return VideoReplyNewDialog( - oid: _videoReplyController.aid ?? - IdUtils.bv2av(Get.parameters['bvid']!), + oid: + _videoReplyController.oid ?? Get.parameters['bvid'], root: 0, parent: 0, replyType: ReplyType.video, diff --git a/lib/pages/video/detail/reply/widgets/reply_item.dart b/lib/pages/video/detail/reply/widgets/reply_item.dart index 48518bee..3352cdc3 100644 --- a/lib/pages/video/detail/reply/widgets/reply_item.dart +++ b/lib/pages/video/detail/reply/widgets/reply_item.dart @@ -353,7 +353,7 @@ class ReplyItem extends StatelessWidget { isScrollControlled: true, builder: (builder) { return VideoReplyNewDialog( - oid: replyItem!.oid, + oid: IdUtils.av2bv(replyItem!.oid!), root: replyItem!.rpid, parent: replyItem!.rpid, replyType: replyType, diff --git a/lib/pages/video/detail/reply_new/view.dart b/lib/pages/video/detail/reply_new/view.dart index 01c95adc..61a78869 100644 --- a/lib/pages/video/detail/reply_new/view.dart +++ b/lib/pages/video/detail/reply_new/view.dart @@ -8,7 +8,7 @@ import 'package:pilipala/models/video/reply/item.dart'; import 'package:pilipala/utils/feed_back.dart'; class VideoReplyNewDialog extends StatefulWidget { - final int? oid; + final String? oid; final int? root; final int? parent; final ReplyType? replyType; From 163bb3c8da88ab843c8afef5526bad2d105a74b6 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Tue, 30 Jan 2024 23:17:00 +0800 Subject: [PATCH 033/220] =?UTF-8?q?v1.0.18=20=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- change_log/1.0.18.0130.md | 16 ++++++++++++++++ pubspec.yaml | 18 ++++++++---------- 2 files changed, 24 insertions(+), 10 deletions(-) create mode 100644 change_log/1.0.18.0130.md diff --git a/change_log/1.0.18.0130.md b/change_log/1.0.18.0130.md new file mode 100644 index 00000000..2f0b80ca --- /dev/null +++ b/change_log/1.0.18.0130.md @@ -0,0 +1,16 @@ +## 1.0.18 + + +### 功能 + + +### 修复 + + +### 优化 + + + + +更多更新日志可在Github上查看 +问题反馈、功能建议请查看「关于」页面。 diff --git a/pubspec.yaml b/pubspec.yaml index d81781c8..81e6ca9f 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -16,7 +16,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html # In Windows, build-name is used as the major, minor, and patch parts # of the product and file versions while build-number is used as the build suffix. -version: 1.0.17+1017 +version: 1.0.18+1018 environment: sdk: ">=2.19.6 <3.0.0" @@ -51,7 +51,7 @@ dependencies: cached_network_image: ^3.3.0 extended_image: ^8.2.0 saver_gallery: ^3.0.1 - + # 存储 path_provider: ^2.1.1 hive: ^2.2.3 @@ -85,14 +85,14 @@ dependencies: encrypt: ^5.0.3 # 视频播放器 - media_kit: ^1.1.10 # Primary package. - media_kit_video: ^1.2.4 # For video rendering. + media_kit: ^1.1.10 # Primary package. + media_kit_video: ^1.2.4 # For video rendering. media_kit_libs_video: ^1.0.4 # 媒体通知 audio_service: ^0.18.12 audio_session: ^0.1.16 - + # 音量、亮度、屏幕控制 flutter_volume_controller: ^1.3.1 screen_brightness: ^0.2.2+1 @@ -103,7 +103,7 @@ dependencies: auto_orientation: ^2.3.1 protobuf: ^3.0.0 animations: ^2.0.8 - + # 获取appx信息 package_info_plus: ^4.1.0 url_launcher: ^6.1.14 @@ -116,7 +116,7 @@ dependencies: appscheme: ^1.0.8 # 弹幕 ns_danmaku: - git: + git: url: https://github.com/guozhigq/flutter_ns_danmaku.git ref: master # 状态栏图标控制 @@ -138,7 +138,6 @@ dependencies: logger: ^2.0.2+1 path: 1.8.3 - dev_dependencies: flutter_test: sdk: flutter @@ -207,7 +206,6 @@ flutter: # - family: HarmonyOS # fonts: # - asset: assets/fonts/HarmonyOS_Sans_SC_Regular.ttf - - + # For details regarding fonts from package dependencies, # see https://flutter.dev/custom-fonts/#from-packages From 7157f892457ae35f46058b2d849a4f800f1506e7 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Tue, 30 Jan 2024 23:23:12 +0800 Subject: [PATCH 034/220] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e7f09f96..78230645 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -98,7 +98,7 @@ jobs: uses: subosito/flutter-action@v2.10.0 with: cache: true - flutter-version: 3.10.6 + flutter-version: 3.16.5 - name: flutter build ipa run: | From 9e93b50860ac997d789fe963dc4113fec5168a71 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Wed, 31 Jan 2024 22:33:04 +0800 Subject: [PATCH 035/220] =?UTF-8?q?mod:=20=E8=BF=98=E5=8E=9Faid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/http/reply.dart | 4 ++-- lib/http/video.dart | 2 +- lib/pages/bangumi/introduction/controller.dart | 2 +- lib/pages/dynamics/detail/view.dart | 4 ++-- lib/pages/html/view.dart | 3 +-- lib/pages/video/detail/introduction/controller.dart | 2 +- lib/pages/video/detail/reply/controller.dart | 6 +++--- lib/pages/video/detail/reply/view.dart | 7 +++---- lib/pages/video/detail/reply/widgets/reply_item.dart | 2 +- lib/pages/video/detail/reply_new/view.dart | 2 +- 10 files changed, 16 insertions(+), 18 deletions(-) diff --git a/lib/http/reply.dart b/lib/http/reply.dart index 4c165b3b..fab433fc 100644 --- a/lib/http/reply.dart +++ b/lib/http/reply.dart @@ -4,7 +4,7 @@ import 'init.dart'; class ReplyHttp { static Future replyList({ - required dynamic oid, + required int oid, required int pageNum, required int type, int? ps, @@ -76,7 +76,7 @@ class ReplyHttp { // 评论点赞 static Future likeReply({ required int type, - required dynamic oid, + required int oid, required int rpid, required int action, }) async { diff --git a/lib/http/video.dart b/lib/http/video.dart index 7929be63..923e93a2 100644 --- a/lib/http/video.dart +++ b/lib/http/video.dart @@ -331,7 +331,7 @@ class VideoHttp { // plat num 发送平台标识 非必要 1：web端 2：安卓客户端 3：ios客户端 4：wp客户端 static Future replyAdd({ required ReplyType type, - required dynamic oid, + required int oid, required String message, int? root, int? parent, diff --git a/lib/pages/bangumi/introduction/controller.dart b/lib/pages/bangumi/introduction/controller.dart index 695bca3a..13dd50c0 100644 --- a/lib/pages/bangumi/introduction/controller.dart +++ b/lib/pages/bangumi/introduction/controller.dart @@ -266,7 +266,7 @@ class BangumiIntroController extends GetxController { /// 未渲染回复组件时可能异常 VideoReplyController videoReplyCtr = Get.find(tag: Get.arguments['heroTag']); - videoReplyCtr.oid = bvid; + videoReplyCtr.aid = aid; videoReplyCtr.queryReplyList(type: 'init'); } catch (_) {} } diff --git a/lib/pages/dynamics/detail/view.dart b/lib/pages/dynamics/detail/view.dart index 9489346f..840cd33f 100644 --- a/lib/pages/dynamics/detail/view.dart +++ b/lib/pages/dynamics/detail/view.dart @@ -385,8 +385,8 @@ class _DynamicDetailPageState extends State isScrollControlled: true, builder: (BuildContext context) { return VideoReplyNewDialog( - oid: _dynamicDetailController.oid?.toString() ?? - Get.parameters['bvid'], + oid: _dynamicDetailController.oid ?? + IdUtils.bv2av(Get.parameters['bvid']!), root: 0, parent: 0, replyType: ReplyType.values[replyType], diff --git a/lib/pages/html/view.dart b/lib/pages/html/view.dart index 7625306f..9f0c865c 100644 --- a/lib/pages/html/view.dart +++ b/lib/pages/html/view.dart @@ -13,7 +13,6 @@ import 'package:pilipala/pages/video/detail/reply/widgets/reply_item.dart'; import 'package:pilipala/pages/video/detail/reply_new/index.dart'; import 'package:pilipala/pages/video/detail/reply_reply/index.dart'; import 'package:pilipala/utils/feed_back.dart'; -import 'package:pilipala/utils/id_utils.dart'; import 'controller.dart'; @@ -428,7 +427,7 @@ class _HtmlRenderPageState extends State isScrollControlled: true, builder: (BuildContext context) { return VideoReplyNewDialog( - oid: IdUtils.av2bv(_htmlRenderCtr.oid.value), + oid: _htmlRenderCtr.oid.value, root: 0, parent: 0, replyType: ReplyType.values[type], diff --git a/lib/pages/video/detail/introduction/controller.dart b/lib/pages/video/detail/introduction/controller.dart index 73165117..1230a94b 100644 --- a/lib/pages/video/detail/introduction/controller.dart +++ b/lib/pages/video/detail/introduction/controller.dart @@ -478,7 +478,7 @@ class VideoIntroController extends GetxController { /// 未渲染回复组件时可能异常 final VideoReplyController videoReplyCtr = Get.find(tag: heroTag); - videoReplyCtr.oid = bvid; + videoReplyCtr.aid = aid; videoReplyCtr.queryReplyList(type: 'init'); } catch (_) {} this.bvid = bvid; diff --git a/lib/pages/video/detail/reply/controller.dart b/lib/pages/video/detail/reply/controller.dart index 03c5fb0e..9e05542b 100644 --- a/lib/pages/video/detail/reply/controller.dart +++ b/lib/pages/video/detail/reply/controller.dart @@ -11,13 +11,13 @@ import 'package:pilipala/utils/storage.dart'; class VideoReplyController extends GetxController { VideoReplyController( - this.oid, + this.aid, this.rpid, this.replyLevel, ); final ScrollController scrollController = ScrollController(); // 视频aid 请求时使用的oid - String? oid; + int? aid; // 层级 2为楼中楼 String? replyLevel; // rpid 请求楼中楼回复 @@ -57,7 +57,7 @@ class VideoReplyController extends GetxController { return; } final res = await ReplyHttp.replyList( - oid: oid!, + oid: aid!, pageNum: currentPage + 1, ps: ps, type: ReplyType.video.index, diff --git a/lib/pages/video/detail/reply/view.dart b/lib/pages/video/detail/reply/view.dart index 474615fc..b2c67b1e 100644 --- a/lib/pages/video/detail/reply/view.dart +++ b/lib/pages/video/detail/reply/view.dart @@ -40,7 +40,6 @@ class _VideoReplyPanelState extends State bool _isFabVisible = true; String replyLevel = '1'; late String heroTag; - late String oid; // 添加页面缓存 @override @@ -49,7 +48,7 @@ class _VideoReplyPanelState extends State @override void initState() { super.initState(); - oid = widget.bvid != null ? widget.bvid! : '0'; + int oid = widget.bvid != null ? IdUtils.bv2av(widget.bvid!) : 0; heroTag = Get.arguments['heroTag']; replyLevel = widget.replyLevel ?? '1'; if (replyLevel == '2') { @@ -298,8 +297,8 @@ class _VideoReplyPanelState extends State isScrollControlled: true, builder: (BuildContext context) { return VideoReplyNewDialog( - oid: - _videoReplyController.oid ?? Get.parameters['bvid'], + oid: _videoReplyController.aid ?? + IdUtils.bv2av(Get.parameters['bvid']!), root: 0, parent: 0, replyType: ReplyType.video, diff --git a/lib/pages/video/detail/reply/widgets/reply_item.dart b/lib/pages/video/detail/reply/widgets/reply_item.dart index 3352cdc3..48518bee 100644 --- a/lib/pages/video/detail/reply/widgets/reply_item.dart +++ b/lib/pages/video/detail/reply/widgets/reply_item.dart @@ -353,7 +353,7 @@ class ReplyItem extends StatelessWidget { isScrollControlled: true, builder: (builder) { return VideoReplyNewDialog( - oid: IdUtils.av2bv(replyItem!.oid!), + oid: replyItem!.oid, root: replyItem!.rpid, parent: replyItem!.rpid, replyType: replyType, diff --git a/lib/pages/video/detail/reply_new/view.dart b/lib/pages/video/detail/reply_new/view.dart index 61a78869..01c95adc 100644 --- a/lib/pages/video/detail/reply_new/view.dart +++ b/lib/pages/video/detail/reply_new/view.dart @@ -8,7 +8,7 @@ import 'package:pilipala/models/video/reply/item.dart'; import 'package:pilipala/utils/feed_back.dart'; class VideoReplyNewDialog extends StatefulWidget { - final String? oid; + final int? oid; final int? root; final int? parent; final ReplyType? replyType; From d703e38c3fd9599f08cd37f31a22f0e8fcd5afb3 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Wed, 31 Jan 2024 22:43:40 +0800 Subject: [PATCH 036/220] =?UTF-8?q?fix:=20avbv=E8=BD=AC=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/utils/id_utils.dart | 79 +++++++++++++++++++++-------------------- 1 file changed, 40 insertions(+), 39 deletions(-) diff --git a/lib/utils/id_utils.dart b/lib/utils/id_utils.dart index a68bfb40..d0451b17 100644 --- a/lib/utils/id_utils.dart +++ b/lib/utils/id_utils.dart @@ -1,51 +1,52 @@ -// ignore_for_file: constant_identifier_names +// ignore_for_file: constant_identifier_names, non_constant_identifier_names import 'dart:convert'; -import 'dart:math'; - -import 'package:flutter/material.dart'; class IdUtils { - static const String TABLE = - 'fZodR9XQDSUm21yCkr6zBqiveYah8bt4xsWpHnJE7jL5VG3guMTKNPAwcF'; - static const List S = [11, 10, 3, 8, 4, 6]; // 位置编码表 - static const int XOR = 177451812; // 固定异或值 - static const int ADD = 8728348608; // 固定加法值 - static const List r = [ - 'B', - 'V', - '1', - '', - '', - '4', - '', - '1', - '', - '7', - '', - '' - ]; + static final XOR_CODE = BigInt.parse('23442827791579'); + static final MASK_CODE = BigInt.parse('2251799813685247'); + static final MAX_AID = BigInt.one << (BigInt.from(51)).toInt(); + static final BASE = BigInt.from(58); + + static const data = + 'FcwAPNKTMug3GV5Lj7EJnHpWsx4tb8haYeviqBz6rkCy12mUSDQX9RdoZf'; /// av转bv - static String av2bv(int av) { - int x_ = (av ^ XOR) + ADD; - List newR = []; - newR.addAll(r); - for (int i = 0; i < S.length; i++) { - newR[S[i]] = - TABLE.characters.elementAt((x_ / pow(58, i).toInt() % 58).toInt()); + static String av2bv(int aid) { + List bytes = List.filled(12, '0', growable: false); + int bvIndex = bytes.length - 1; + BigInt tmp = (MAX_AID | BigInt.from(aid)) ^ XOR_CODE; + while (tmp > BigInt.zero) { + bytes[bvIndex] = data[(tmp % BASE).toInt()]; + tmp = tmp ~/ BASE; + bvIndex -= 1; } - return newR.join(); + final tmpValue = bytes[3]; + bytes[3] = bytes[9]; + bytes[9] = tmpValue; + + final tmpValue2 = bytes[4]; + bytes[4] = bytes[7]; + bytes[7] = tmpValue2; + + return bytes.join(); } - /// bv转bv - static int bv2av(String bv) { - int r = 0; - for (int i = 0; i < S.length; i++) { - r += (TABLE.indexOf(bv.characters.elementAt(S[i])).toInt()) * - pow(58, i).toInt(); - } - return (r - ADD) ^ XOR; + /// bv转av + static int bv2av(String bvid) { + List bvidArr = bvid.split(''); + final tmpValue = bvidArr[3]; + bvidArr[3] = bvidArr[9]; + bvidArr[9] = tmpValue; + + final tmpValue2 = bvidArr[4]; + bvidArr[4] = bvidArr[7]; + bvidArr[7] = tmpValue2; + + bvidArr.removeRange(0, 3); + BigInt tmp = bvidArr.fold(BigInt.zero, + (pre, bvidChar) => pre * BASE + BigInt.from(data.indexOf(bvidChar))); + return ((tmp & MASK_CODE) ^ XOR_CODE).toInt(); } // 匹配 From 8a2c0233430a2c5e31498b4fa14943131df85fd4 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Wed, 31 Jan 2024 23:03:45 +0800 Subject: [PATCH 037/220] fix: magType value --- .../whisper_detail/widget/chat_item.dart | 56 +++++++++++-------- 1 file changed, 33 insertions(+), 23 deletions(-) diff --git a/lib/pages/whisper_detail/widget/chat_item.dart b/lib/pages/whisper_detail/widget/chat_item.dart index 9f0e191b..41df23ab 100644 --- a/lib/pages/whisper_detail/widget/chat_item.dart +++ b/lib/pages/whisper_detail/widget/chat_item.dart @@ -5,7 +5,6 @@ import 'dart:convert'; import 'package:flutter/material.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:get/get.dart'; -import 'package:get/get_core/src/get_main.dart'; import 'package:pilipala/common/widgets/network_img_layer.dart'; import 'package:pilipala/utils/utils.dart'; import 'package:pilipala/utils/storage.dart'; @@ -53,12 +52,13 @@ class ChatItem extends StatelessWidget { Widget build(BuildContext context) { bool isOwner = item.senderUid == GStrorage.userInfo.get('userInfoCache').mid; - bool isPic = item.msgType == MsgType.pic; // 图片 - bool isText = item.msgType == MsgType.text; // 文本 + + bool isPic = item.msgType == MsgType.pic.value; // 图片 + bool isText = item.msgType == MsgType.text.value; // 文本 // bool isArchive = item.msgType == 11; // 投稿 // bool isArticle = item.msgType == 12; // 专栏 - bool isRevoke = item.msgType == MsgType.revoke; // 撤回消息 - bool isShareV2 = item.msgType == MsgType.share_v2; + bool isRevoke = item.msgType == MsgType.revoke.value; // 撤回消息 + bool isShareV2 = item.msgType == MsgType.share_v2.value; bool isSystem = item.msgType == 18 || item.msgType == 10 || item.msgType == 13; dynamic content = item.content ?? ''; @@ -72,7 +72,7 @@ class ChatItem extends StatelessWidget { var text = content['content']; if (e_infos != null) { final List children = []; - Map emojiMap = {}; + Map emojiMap = {}; for (var e in e_infos!) { emojiMap[e['text']] = e['url']; } @@ -83,18 +83,22 @@ class ChatItem extends StatelessWidget { if (emojiMap.containsKey(emojiKey)) { children.add(WidgetSpan( child: NetworkImgLayer( - width: 18, height: 18, - src: emojiMap[emojiKey]!,), + width: 18, + height: 18, + src: emojiMap[emojiKey]!, + ), )); } return ''; }, onNonMatch: (String text) { - children.add(TextSpan(text: text, style: TextStyle( - color: textColor(context), - letterSpacing: 0.6, - height: 1.5, - ))); + children.add(TextSpan( + text: text, + style: TextStyle( + color: textColor(context), + letterSpacing: 0.6, + height: 1.5, + ))); return ''; }, ); @@ -123,11 +127,13 @@ class ChatItem extends StatelessWidget { return SystemNotice2(item: item); case MsgType.notify_text: return Text( - jsonDecode(content['content']).map((m) => m['text'] as String).join("\n"), + jsonDecode(content['content']) + .map((m) => m['text'] as String) + .join("\n"), style: TextStyle( - letterSpacing: 0.6, - height: 5, - color: Theme.of(context).colorScheme.outline.withOpacity(0.8) + letterSpacing: 0.6, + height: 5, + color: Theme.of(context).colorScheme.outline.withOpacity(0.8), ), ); case MsgType.text: @@ -166,9 +172,11 @@ class ChatItem extends StatelessWidget { Text( content['title'], style: TextStyle( - letterSpacing: 0.6, - height: 1.5, - color: textColor(context), fontWeight: FontWeight.bold), + letterSpacing: 0.6, + height: 1.5, + color: textColor(context), + fontWeight: FontWeight.bold, + ), ), const SizedBox(height: 1), Text( @@ -186,9 +194,11 @@ class ChatItem extends StatelessWidget { return Text( content['content'] ?? content.toString(), style: TextStyle( - letterSpacing: 0.6, - height: 1.5, - color: textColor(context), fontWeight: FontWeight.bold), + letterSpacing: 0.6, + height: 1.5, + color: textColor(context), + fontWeight: FontWeight.bold, + ), ); } } From ea8af288289a3d45203e3eec4e32a1eec8f86600 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Wed, 31 Jan 2024 23:11:03 +0800 Subject: [PATCH 038/220] =?UTF-8?q?fix:=20=E4=B8=93=E6=A0=8F=E5=B0=81?= =?UTF-8?q?=E9=9D=A2=E5=9B=BE=E5=B0=BA=E5=AF=B8=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/search_panel/widgets/article_panel.dart | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/pages/search_panel/widgets/article_panel.dart b/lib/pages/search_panel/widgets/article_panel.dart index 35e39640..c7074229 100644 --- a/lib/pages/search_panel/widgets/article_panel.dart +++ b/lib/pages/search_panel/widgets/article_panel.dart @@ -25,16 +25,17 @@ Widget searchArticlePanel(BuildContext context, ctr, list) { padding: const EdgeInsets.fromLTRB( StyleString.safeSpace, 5, StyleString.safeSpace, 5), child: LayoutBuilder(builder: (context, boxConstraints) { - double width = (boxConstraints.maxWidth - - StyleString.cardSpace * - 6 / - MediaQuery.textScalerOf(context).scale(2.0)); + final double width = (boxConstraints.maxWidth - + StyleString.cardSpace * + 6 / + MediaQuery.textScalerOf(context).scale(1.0)) / + 2; return Container( constraints: const BoxConstraints(minHeight: 88), height: width / StyleString.aspectRatio, child: Row( crossAxisAlignment: CrossAxisAlignment.start, - children: [ + children: [ if (list[index].imageUrls != null && list[index].imageUrls.isNotEmpty) AspectRatio( From 89a43b1285b66a7caacdc46bcfc2217f820cf8ce Mon Sep 17 00:00:00 2001 From: guozhigq Date: Wed, 31 Jan 2024 23:28:51 +0800 Subject: [PATCH 039/220] =?UTF-8?q?v1.0.19=20=E6=9B=B4=E6=96=B0=E6=97=A5?= =?UTF-8?q?=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- change_log/1.0.19.0131.md | 15 +++++++++++++++ pubspec.yaml | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 change_log/1.0.19.0131.md diff --git a/change_log/1.0.19.0131.md b/change_log/1.0.19.0131.md new file mode 100644 index 00000000..1fd3071b --- /dev/null +++ b/change_log/1.0.19.0131.md @@ -0,0 +1,15 @@ +## 1.0.19 + + +### 修复 ++ 视频404、评论加载错误 ++ bvav转换 + +### 优化 ++ 视频详情页内存占用 + + + + +更多更新日志可在Github上查看 +问题反馈、功能建议请查看「关于」页面。 diff --git a/pubspec.yaml b/pubspec.yaml index 81e6ca9f..f4b8fe61 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -16,7 +16,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html # In Windows, build-name is used as the major, minor, and patch parts # of the product and file versions while build-number is used as the build suffix. -version: 1.0.18+1018 +version: 1.0.19+1019 environment: sdk: ">=2.19.6 <3.0.0" From e24ccc16fae4cb252c65c8188a4f096a94cc44d2 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Thu, 1 Feb 2024 00:32:52 +0800 Subject: [PATCH 040/220] =?UTF-8?q?mod:=20av2bv=E6=96=B9=E6=B3=95=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/utils/id_utils.dart | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/lib/utils/id_utils.dart b/lib/utils/id_utils.dart index d0451b17..906f6348 100644 --- a/lib/utils/id_utils.dart +++ b/lib/utils/id_utils.dart @@ -13,7 +13,20 @@ class IdUtils { /// av转bv static String av2bv(int aid) { - List bytes = List.filled(12, '0', growable: false); + List bytes = [ + 'B', + 'V', + '1', + '0', + '0', + '0', + '0', + '0', + '0', + '0', + '0', + '0' + ]; int bvIndex = bytes.length - 1; BigInt tmp = (MAX_AID | BigInt.from(aid)) ^ XOR_CODE; while (tmp > BigInt.zero) { @@ -21,13 +34,13 @@ class IdUtils { tmp = tmp ~/ BASE; bvIndex -= 1; } - final tmpValue = bytes[3]; + String tmpSwap = bytes[3]; bytes[3] = bytes[9]; - bytes[9] = tmpValue; + bytes[9] = tmpSwap; - final tmpValue2 = bytes[4]; + tmpSwap = bytes[4]; bytes[4] = bytes[7]; - bytes[7] = tmpValue2; + bytes[7] = tmpSwap; return bytes.join(); } From 85a59e11b961de26d781308619b3386619439507 Mon Sep 17 00:00:00 2001 From: orz12 Date: Thu, 1 Feb 2024 22:56:29 +0800 Subject: [PATCH 041/220] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E5=85=B3=E9=94=AE=E8=AF=8D=E6=97=B6=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E5=8C=B9=E9=85=8D=E6=97=B6=E9=97=B4=E3=80=81=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E5=85=B3=E9=94=AE=E8=AF=8D=E6=97=B6?= =?UTF-8?q?=E4=B8=8D=E6=9B=BF=E6=8D=A2=E8=B6=85=E9=93=BE=E6=8E=A5=E3=80=81?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=B7=BB=E5=8A=A0=E4=B8=AD=E6=96=87=E5=86=92?= =?UTF-8?q?=E5=8F=B7=E5=8C=B9=E9=85=8D=E5=B9=B6=E6=8F=90=E5=8D=87=E5=88=86?= =?UTF-8?q?=E6=94=AF=E5=88=A4=E5=AE=9A=E4=B8=A5=E6=A0=BC=E7=A8=8B=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../detail/reply/widgets/reply_item.dart | 39 +++++++++++-------- 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/lib/pages/video/detail/reply/widgets/reply_item.dart b/lib/pages/video/detail/reply/widgets/reply_item.dart index 98d8ba6a..cab9d420 100644 --- a/lib/pages/video/detail/reply/widgets/reply_item.dart +++ b/lib/pages/video/detail/reply/widgets/reply_item.dart @@ -595,10 +595,21 @@ InlineSpan buildContent( e.replaceAll('?', '\\?').replaceAll('+', '\\+').replaceAll('*', '\\*')), ]; - final String patternStr = - specialTokens.map(RegExp.escape).join('|') + r'|\b[0-9]{1,2}:[0-9]{2}\b'; + String patternStr = + specialTokens.map(RegExp.escape).join('|'); + if (patternStr.isNotEmpty) { + patternStr += "|"; + } + patternStr += r'(\b\d{1,2}[:：]\d{2}\b)'; final RegExp pattern = RegExp(patternStr); List matchedStrs = []; + void addPlainTextSpan(str){ + spanChilds.add(TextSpan( + text: str, + recognizer: TapGestureRecognizer() + ..onTap = () => + replyReply(replyItem.root == 0 ? replyItem : fReplyItem))); + } // 分割文本并处理每个部分 content.message.splitMapJoin( pattern, @@ -636,7 +647,7 @@ InlineSpan buildContent( }, ), ); - } else if (matchStr.contains(':')) { + } else if (RegExp(r'^\b[0-9]{1,2}[:：][0-9]{2}\b$').hasMatch(matchStr)) { spanChilds.add( TextSpan( text: ' $matchStr ', @@ -647,6 +658,7 @@ InlineSpan buildContent( ..onTap = () { // 跳转到指定位置 try { + matchStr = matchStr.replaceAll('：', ':'); SmartDialog.showToast('跳转至：$matchStr'); Get.find(tag: Get.arguments['heroTag']) .plPlayerController @@ -664,10 +676,13 @@ InlineSpan buildContent( String appUrlSchema = ''; final bool enableWordRe = setting.get(SettingBoxKey.enableWordRe, defaultValue: false) as bool; - if (enableWordRe && - content.jumpUrl[matchStr] != null && + if (content.jumpUrl[matchStr] != null && !matchedStrs.contains(matchStr)) { appUrlSchema = content.jumpUrl[matchStr]['app_url_schema']; + if (appUrlSchema.startsWith('bilibili://search') && !enableWordRe) { + addPlainTextSpan(matchStr); + return ""; + } spanChilds.add( TextSpan( text: content.jumpUrl[matchStr]['title'], @@ -707,7 +722,7 @@ InlineSpan buildContent( }, ), ); - if (appUrlSchema.startsWith('bilibili://search') && enableWordRe) { + if (appUrlSchema.startsWith('bilibili://search')) { spanChilds.add( WidgetSpan( child: Icon( @@ -722,21 +737,13 @@ InlineSpan buildContent( // 只显示一次 matchedStrs.add(matchStr); } else { - spanChilds.add(TextSpan( - text: matchStr, - recognizer: TapGestureRecognizer() - ..onTap = () => - replyReply(replyItem.root == 0 ? replyItem : fReplyItem))); + addPlainTextSpan(matchStr); } } return ''; }, onNonMatch: (String nonMatchStr) { - spanChilds.add(TextSpan( - text: nonMatchStr, - recognizer: TapGestureRecognizer() - ..onTap = () => - replyReply(replyItem.root == 0 ? replyItem : fReplyItem))); + addPlainTextSpan(nonMatchStr); return nonMatchStr; }, ); From 81371c5a31538425af93c020943cc0782b92da4d Mon Sep 17 00:00:00 2001 From: orz12 Date: Fri, 2 Feb 2024 00:06:46 +0800 Subject: [PATCH 042/220] =?UTF-8?q?fix:=20=E5=8F=AA=E6=9C=89=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E7=9A=84=E8=AF=84=E8=AE=BA=E5=8C=BA=E4=B8=8D=E9=AB=98?= =?UTF-8?q?=E4=BA=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/video/detail/reply/widgets/reply_item.dart | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/pages/video/detail/reply/widgets/reply_item.dart b/lib/pages/video/detail/reply/widgets/reply_item.dart index cab9d420..48503d30 100644 --- a/lib/pages/video/detail/reply/widgets/reply_item.dart +++ b/lib/pages/video/detail/reply/widgets/reply_item.dart @@ -544,7 +544,9 @@ InlineSpan buildContent( content.atNameToMid.isEmpty && content.jumpUrl.isEmpty && content.vote.isEmpty && - content.pictures.isEmpty) { + content.pictures.isEmpty && + content.message.isNotEmpty && + !RegExp(r'\b[0-9]{1,2}[:：][0-9]{2}\b').hasMatch(content.message)) { return TextSpan( text: content.message, recognizer: TapGestureRecognizer() From 0b349e102ebf77467205d4f298b9cef6b81f250e Mon Sep 17 00:00:00 2001 From: orz12 Date: Fri, 2 Feb 2024 00:34:52 +0800 Subject: [PATCH 043/220] =?UTF-8?q?fix=EF=BC=9A=E8=AF=84=E8=AE=BA=E5=8C=BA?= =?UTF-8?q?HTML=E5=AE=9E=E4=BD=93=E8=BD=AC=E4=B9=89=EF=BC=9B=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E9=94=99=E8=AF=AF=E7=9F=AD=E8=B7=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../detail/reply/widgets/reply_item.dart | 27 ++++++------------- 1 file changed, 8 insertions(+), 19 deletions(-) diff --git a/lib/pages/video/detail/reply/widgets/reply_item.dart b/lib/pages/video/detail/reply/widgets/reply_item.dart index 48503d30..2867474e 100644 --- a/lib/pages/video/detail/reply/widgets/reply_item.dart +++ b/lib/pages/video/detail/reply/widgets/reply_item.dart @@ -540,20 +540,6 @@ InlineSpan buildContent( // replyReply 查看二楼回复（回复详情）回调 // fReplyItem 父级回复内容，用作二楼回复（回复详情）展示 final content = replyItem.content; - if (content.emote.isEmpty && - content.atNameToMid.isEmpty && - content.jumpUrl.isEmpty && - content.vote.isEmpty && - content.pictures.isEmpty && - content.message.isNotEmpty && - !RegExp(r'\b[0-9]{1,2}[:：][0-9]{2}\b').hasMatch(content.message)) { - return TextSpan( - text: content.message, - recognizer: TapGestureRecognizer() - ..onTap = - () => replyReply(replyItem.root == 0 ? replyItem : fReplyItem), - ); - } final List spanChilds = []; bool hasMatchMember = false; @@ -585,10 +571,13 @@ InlineSpan buildContent( }); } // content.message = content.message.replaceAll(RegExp(r"\{vote:.*?\}"), ' '); - if (content.message.contains('&')) { - content.message = content.message.replaceAll('&', '&'); - } - print("content.jumpUrl.keys:" + content.jumpUrl.keys.toString()); + content.message = content.message.replaceAll('&', '&') + .replaceAll('<', '<') + .replaceAll('>', '>') + .replaceAll('"', '"') + .replaceAll(''', "'") + .replaceAll(' ', ' '); + // print("content.jumpUrl.keys:" + content.jumpUrl.keys.toString()); // 构建正则表达式 final List specialTokens = [ ...content.emote.keys, @@ -674,7 +663,7 @@ InlineSpan buildContent( ), ); } else { - print("matchStr=$matchStr"); + // print("matchStr=$matchStr"); String appUrlSchema = ''; final bool enableWordRe = setting.get(SettingBoxKey.enableWordRe, defaultValue: false) as bool; From 33f61ac0faca92f4932c9dda30a62660c5d96f8f Mon Sep 17 00:00:00 2001 From: orz12 Date: Fri, 2 Feb 2024 01:16:02 +0800 Subject: [PATCH 044/220] =?UTF-8?q?fix:=20=E6=9F=A5=E8=AF=A2=E5=9C=A8?= =?UTF-8?q?=E7=BA=BF=E4=BA=BA=E6=95=B0=E9=94=99=E8=AF=AF=E6=97=B6=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E8=BF=94=E5=9B=9Estatus?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/http/video.dart | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/http/video.dart b/lib/http/video.dart index e7b09801..0e869512 100644 --- a/lib/http/video.dart +++ b/lib/http/video.dart @@ -433,6 +433,8 @@ class VideoHttp { }); if (res.data['code'] == 0) { return {'status': true, 'data': res.data['data']}; + } else { + return {'status': false, 'data': null, 'msg': res.data['message']}; } } From 5b1022628cd0d2c208da1c1db10e2bdfe9c6a053 Mon Sep 17 00:00:00 2001 From: orz12 Date: Fri, 2 Feb 2024 02:34:14 +0800 Subject: [PATCH 045/220] =?UTF-8?q?fix:=20=E4=B9=9D=E5=9B=BE=E9=83=A8?= =?UTF-8?q?=E5=88=86=E4=BD=8D=E7=BD=AE=E6=97=A0=E6=B3=95=E7=82=B9=E5=87=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/video/detail/reply/widgets/reply_item.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/pages/video/detail/reply/widgets/reply_item.dart b/lib/pages/video/detail/reply/widgets/reply_item.dart index 2867474e..5e5a5828 100644 --- a/lib/pages/video/detail/reply/widgets/reply_item.dart +++ b/lib/pages/video/detail/reply/widgets/reply_item.dart @@ -743,10 +743,10 @@ InlineSpan buildContent( if (content.pictures.isNotEmpty) { final List picList = []; final int len = content.pictures.length; + spanChilds.add(const TextSpan(text: '\n')); if (len == 1) { Map pictureItem = content.pictures.first; picList.add(pictureItem['img_src']); - spanChilds.add(const TextSpan(text: '\n')); spanChilds.add( WidgetSpan( child: LayoutBuilder( From eb1e2ca5f4920c025f9b39976659a9c327a52f27 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Fri, 2 Feb 2024 23:24:36 +0800 Subject: [PATCH 046/220] =?UTF-8?q?fix:=20=E4=B8=AA=E4=BA=BA=E9=9D=A2?= =?UTF-8?q?=E6=9D=BF=E6=97=A0=E6=B3=95=E8=B7=B3=E8=BD=AC=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/mine/view.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/pages/mine/view.dart b/lib/pages/mine/view.dart index 06c375da..091b2149 100644 --- a/lib/pages/mine/view.dart +++ b/lib/pages/mine/view.dart @@ -64,7 +64,7 @@ class _MinePageState extends State { ), ), IconButton( - onPressed: () => Get.toNamed('/setting'), + onPressed: () => Get.toNamed('/setting', preventDuplicates: false), icon: const Icon( CupertinoIcons.slider_horizontal_3, ), From 1da84508d8f6b6fb7e5060e9972e97c6915f0464 Mon Sep 17 00:00:00 2001 From: orz12 Date: Sat, 3 Feb 2024 00:22:58 +0800 Subject: [PATCH 047/220] =?UTF-8?q?feat:=20=E8=87=AA=E5=8A=A8=E6=8E=A8?= =?UTF-8?q?=E9=80=81=E5=9B=9E=E5=A4=8D=E7=A7=81=E4=BF=A1=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../whisper_detail/widget/chat_item.dart | 164 +++++++++++++++++- 1 file changed, 162 insertions(+), 2 deletions(-) diff --git a/lib/pages/whisper_detail/widget/chat_item.dart b/lib/pages/whisper_detail/widget/chat_item.dart index 41df23ab..0925d569 100644 --- a/lib/pages/whisper_detail/widget/chat_item.dart +++ b/lib/pages/whisper_detail/widget/chat_item.dart @@ -27,6 +27,7 @@ enum MsgType { article_card(value: 12, label: "专栏卡片"), pic_card(value: 13, label: "图片卡片"), common_share(value: 14, label: "异形卡片"), + auto_reply_push(value: 16, label: "自动回复推送"), notify_text(value: 18, label: "文本提示"); final int value; @@ -59,8 +60,10 @@ class ChatItem extends StatelessWidget { // bool isArticle = item.msgType == 12; // 专栏 bool isRevoke = item.msgType == MsgType.revoke.value; // 撤回消息 bool isShareV2 = item.msgType == MsgType.share_v2.value; - bool isSystem = - item.msgType == 18 || item.msgType == 10 || item.msgType == 13; + bool isSystem = item.msgType == MsgType.notify_text.value || + item.msgType == MsgType.notify_msg.value || + item.msgType == MsgType.pic_card.value || + item.msgType == MsgType.auto_reply_push.value; dynamic content = item.content ?? ''; Color textColor(BuildContext context) { return isOwner @@ -190,6 +193,163 @@ class ChatItem extends StatelessWidget { ), ], ); + case MsgType.archive_card: + return Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + GestureDetector( + onTap: () async { + SmartDialog.showLoading(); + var bvid = content["bvid"]; + final int cid = await SearchHttp.ab2c(bvid: bvid); + final String heroTag = Utils.makeHeroTag(bvid); + SmartDialog.dismiss().then( + (e) => Get.toNamed('/video?bvid=$bvid&cid=$cid', + arguments: { + 'pic': content['thumb'], + 'heroTag': heroTag, + }), + ); + }, + child: NetworkImgLayer( + width: 220, + height: 220 * 9 / 16, + src: content['cover'], + ), + ), + const SizedBox(height: 6), + Text( + content['title'], + style: TextStyle( + letterSpacing: 0.6, + height: 1.5, + color: textColor(context), + fontWeight: FontWeight.bold, + ), + ), + const SizedBox(height: 1), + Text( + Utils.timeFormat(content['times']), + style: TextStyle( + letterSpacing: 0.6, + height: 1.5, + color: textColor(context).withOpacity(0.6), + fontSize: 12, + ), + ), + ], + ); + case MsgType.auto_reply_push: + return Container( + constraints: const BoxConstraints( + maxWidth: 300.0, // 设置最大宽度为200.0 + ), + decoration: BoxDecoration( + color: Theme.of(context) + .colorScheme + .secondaryContainer + .withOpacity(0.4), + borderRadius: const BorderRadius.only( + topLeft: Radius.circular(16), + topRight: Radius.circular(16), + bottomLeft: Radius.circular(6), + bottomRight: Radius.circular(16), + ), + ), + margin: const EdgeInsets.all(12), + padding: const EdgeInsets.all(12), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + content['main_title'], + style: TextStyle( + letterSpacing: 0.6, + height: 1.5, + color: textColor(context), + fontWeight: FontWeight.bold, + ), + ), + for (var i in content['sub_cards']) ...[ + const SizedBox(height: 6), + GestureDetector( + onTap: () async { + RegExp bvRegex = RegExp(r'BV[0-9A-Za-z]{10}', + caseSensitive: false); + Iterable matches = + bvRegex.allMatches(i['jump_url']); + if (matches.isNotEmpty) { + Match match = matches.first; + String bvid = match.group(0)!; + try { + SmartDialog.showLoading(); + final int cid = await SearchHttp.ab2c(bvid: bvid); + final String heroTag = Utils.makeHeroTag(bvid); + SmartDialog.dismiss().then( + (e) => Get.toNamed( + '/video?bvid=$bvid&cid=$cid', + arguments: { + 'pic': i['cover_url'], + 'heroTag': heroTag, + }), + ); + } catch (err) { + SmartDialog.dismiss(); + SmartDialog.showToast(err.toString()); + } + } else { + SmartDialog.showToast('未匹配到 BV 号'); + Get.toNamed('/webview', + arguments: {'url': i['jump_url']}); + } + }, + child: Row( + children: [ + NetworkImgLayer( + width: 130, + height: 130 * 9 / 16, + src: i['cover_url'], + ), + const SizedBox(width: 6), + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + i['field1'], + maxLines: 2, + style: TextStyle( + letterSpacing: 0.6, + height: 1.5, + color: textColor(context), + fontWeight: FontWeight.bold, + ), + ), + Text( + i['field2'], + style: TextStyle( + letterSpacing: 0.6, + height: 1.5, + color: textColor(context).withOpacity(0.6), + fontSize: 12, + ), + ), + Text( + Utils.timeFormat(int.parse(i['field3'])), + style: TextStyle( + letterSpacing: 0.6, + height: 1.5, + color: textColor(context).withOpacity(0.6), + fontSize: 12, + ), + ), + ], + )), + ], + )), + ], + ], + )); default: return Text( content['content'] ?? content.toString(), From b5315998938faf3047849c44dde3b9e8cb97e79a Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sat, 3 Feb 2024 00:29:47 +0800 Subject: [PATCH 048/220] =?UTF-8?q?mod:=20floating=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pubspec.lock | 9 +++++---- pubspec.yaml | 5 ++++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index d9b6a01d..f5d63ca9 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -500,10 +500,11 @@ packages: floating: dependency: "direct main" description: - name: floating - sha256: d9d563089e34fbd714ffdcdd2df447ec41b40c9226dacae6b4f78847aef8b991 - url: "https://pub.flutter-io.cn" - source: hosted + path: "." + ref: main + resolved-ref: d2d8421c4d80f6113f832404109853684721e11a + url: "https://github.com/guozhigq/floating.git" + source: git version: "2.0.1" flutter: dependency: "direct main" diff --git a/pubspec.yaml b/pubspec.yaml index f4b8fe61..16df4ad7 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -124,7 +124,10 @@ dependencies: # 代理 system_proxy: ^0.1.0 # pip - floating: ^2.0.1 + floating: + git: + url: https://github.com/guozhigq/floating.git + ref: main # html解析 html: ^0.15.4 # html渲染 From 045186b3c8370e1f4da0280959834b44023762e8 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sat, 3 Feb 2024 00:33:29 +0800 Subject: [PATCH 049/220] =?UTF-8?q?mod:=20=E8=A7=86=E9=A2=91=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E9=A1=B5=E5=93=8D=E5=BA=94status?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/http/video.dart | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/lib/http/video.dart b/lib/http/video.dart index 0e869512..6ffbde21 100644 --- a/lib/http/video.dart +++ b/lib/http/video.dart @@ -361,7 +361,7 @@ class VideoHttp { if (res.data['code'] == 0) { return {'status': true, 'data': res.data['data']}; } else { - return {'status': true, 'data': []}; + return {'status': false, 'data': []}; } } @@ -377,7 +377,7 @@ class VideoHttp { if (res.data['code'] == 0) { return {'status': true, 'data': res.data['data']}; } else { - return {'status': true, 'data': []}; + return {'status': false, 'data': []}; } } @@ -455,10 +455,7 @@ class VideoHttp { 'data': AiConclusionModel.fromJson(res.data['data']), }; } else { - return { - 'status': false, - 'data': [] - }; + return {'status': false, 'data': []}; } } } From 18bb58d293ed48bf84f5590d540ec92328b35142 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sat, 3 Feb 2024 00:43:38 +0800 Subject: [PATCH 050/220] =?UTF-8?q?mod:=20=E6=8A=95=E5=B8=81=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E5=93=8D=E5=BA=94status?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/http/video.dart | 3 ++- lib/pages/video/detail/introduction/controller.dart | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/http/video.dart b/lib/http/video.dart index 6ffbde21..eaa131f3 100644 --- a/lib/http/video.dart +++ b/lib/http/video.dart @@ -224,10 +224,11 @@ class VideoHttp { // 获取投币状态 static Future hasCoinVideo({required String bvid}) async { var res = await Request().get(Api.hasCoinVideo, data: {'bvid': bvid}); + print('res: $res'); if (res.data['code'] == 0) { return {'status': true, 'data': res.data['data']}; } else { - return {'status': true, 'data': []}; + return {'status': false, 'data': []}; } } diff --git a/lib/pages/video/detail/introduction/controller.dart b/lib/pages/video/detail/introduction/controller.dart index 1deadb07..b1b02420 100644 --- a/lib/pages/video/detail/introduction/controller.dart +++ b/lib/pages/video/detail/introduction/controller.dart @@ -148,7 +148,9 @@ class VideoIntroController extends GetxController { // 获取投币状态 Future queryHasCoinVideo() async { var result = await VideoHttp.hasCoinVideo(bvid: bvid); - hasCoin.value = result["data"]['multiply'] == 0 ? false : true; + if (result['status']) { + hasCoin.value = result["data"]['multiply'] == 0 ? false : true; + } } // 获取收藏状态 From 6a844da259cb707696282fe398f80289891da4fc Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sat, 3 Feb 2024 00:53:18 +0800 Subject: [PATCH 051/220] =?UTF-8?q?mod:=20=E7=82=B9=E8=B5=9E=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E7=99=BB=E5=BD=95=E6=8B=A6=E6=88=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/video/detail/introduction/controller.dart | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/pages/video/detail/introduction/controller.dart b/lib/pages/video/detail/introduction/controller.dart index b1b02420..d1298fcc 100644 --- a/lib/pages/video/detail/introduction/controller.dart +++ b/lib/pages/video/detail/introduction/controller.dart @@ -210,6 +210,10 @@ class VideoIntroController extends GetxController { // （取消）点赞 Future actionLikeVideo() async { + if (userInfo == null) { + SmartDialog.showToast('账号未登录'); + return; + } var result = await VideoHttp.likeVideo(bvid: bvid, type: !hasLike.value); if (result['status']) { // hasLike.value = result["data"] == 1 ? true : false; From 47bdfec8c2c3446f178861002bb10e2da6493067 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sat, 3 Feb 2024 01:07:12 +0800 Subject: [PATCH 052/220] fix: github assets null error --- lib/models/github/latest.dart | 5 +++-- lib/utils/utils.dart | 18 ++++++++++-------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/lib/models/github/latest.dart b/lib/models/github/latest.dart index 8730a4ba..c4b88b63 100644 --- a/lib/models/github/latest.dart +++ b/lib/models/github/latest.dart @@ -17,8 +17,9 @@ class LatestDataModel { url = json['url']; tagName = json['tag_name']; createdAt = json['created_at']; - assets = - json['assets'].map((e) => AssetItem.fromJson(e)).toList(); + assets = json['assets'] != null + ? json['assets'].map((e) => AssetItem.fromJson(e)).toList() + : []; body = json['body']; } } diff --git a/lib/utils/utils.dart b/lib/utils/utils.dart index 08693d24..e17ed5ef 100644 --- a/lib/utils/utils.dart +++ b/lib/utils/utils.dart @@ -276,16 +276,18 @@ class Utils { // [arm64-v8a] String abi = androidInfo.supportedAbis.first; late String downloadUrl; - for (var i in data.assets) { - if (i.downloadUrl.contains(abi)) { - downloadUrl = i.downloadUrl; + if (data.assets.isNotEmpty) { + for (var i in data.assets) { + if (i.downloadUrl.contains(abi)) { + downloadUrl = i.downloadUrl; + } } + // 应用外下载 + launchUrl( + Uri.parse(downloadUrl), + mode: LaunchMode.externalApplication, + ); } - // 应用外下载 - launchUrl( - Uri.parse(downloadUrl), - mode: LaunchMode.externalApplication, - ); } } From 230dd813427e692151cdf9bb8dc8b719dcc6d9d8 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sat, 3 Feb 2024 01:13:36 +0800 Subject: [PATCH 053/220] =?UTF-8?q?fix:=20List=20=E8=B6=8A=E7=95=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/services/audio_handler.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/services/audio_handler.dart b/lib/services/audio_handler.dart index 61b32b96..ad510e7d 100644 --- a/lib/services/audio_handler.dart +++ b/lib/services/audio_handler.dart @@ -147,8 +147,8 @@ class VideoPlayerServiceHandler extends BaseAudioHandler with SeekHandler { processingState: AudioProcessingState.idle, playing: false, )); - _item.removeLast(); if (_item.isNotEmpty) { + _item.removeLast(); setMediaItem(_item.last); } if (_item.isEmpty) { From 387c799de1d86a580d750bf67beb256e87c72134 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sat, 3 Feb 2024 16:59:54 +0800 Subject: [PATCH 054/220] =?UTF-8?q?feat:=20=E5=8A=A8=E6=80=81=E6=9C=AA?= =?UTF-8?q?=E8=AF=BB=E6=A0=87=E8=AE=B0=20issues=20#459?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/models/common/dynamic_badge_mode.dart | 9 +++++ lib/pages/main/controller.dart | 9 ++++- lib/pages/main/view.dart | 41 +++++++++++++++++------ lib/pages/setting/controller.dart | 34 +++++++++++++++++++ lib/pages/setting/style_setting.dart | 9 +++++ lib/utils/storage.dart | 3 +- 6 files changed, 93 insertions(+), 12 deletions(-) create mode 100644 lib/models/common/dynamic_badge_mode.dart diff --git a/lib/models/common/dynamic_badge_mode.dart b/lib/models/common/dynamic_badge_mode.dart new file mode 100644 index 00000000..2609c5e2 --- /dev/null +++ b/lib/models/common/dynamic_badge_mode.dart @@ -0,0 +1,9 @@ +enum DynamicBadgeMode { hidden, point, number } + +extension DynamicBadgeModeDesc on DynamicBadgeMode { + String get description => ['隐藏', '红点', '数字'][index]; +} + +extension DynamicBadgeModeCode on DynamicBadgeMode { + int get code => [0, 1, 2][index]; +} diff --git a/lib/pages/main/controller.dart b/lib/pages/main/controller.dart index a55c143e..6f33d9cd 100644 --- a/lib/pages/main/controller.dart +++ b/lib/pages/main/controller.dart @@ -11,6 +11,7 @@ import 'package:pilipala/pages/home/view.dart'; import 'package:pilipala/pages/media/index.dart'; import 'package:pilipala/utils/storage.dart'; import 'package:pilipala/utils/utils.dart'; +import '../../models/common/dynamic_badge_mode.dart'; class MainController extends GetxController { List pages = [ @@ -65,6 +66,7 @@ class MainController extends GetxController { int selectedIndex = 0; Box userInfoCache = GStrorage.userInfo; RxBool userLogin = false.obs; + late Rx dynamicBadgeType = DynamicBadgeMode.number.obs; @override void onInit() { @@ -75,7 +77,12 @@ class MainController extends GetxController { hideTabBar = setting.get(SettingBoxKey.hideTabBar, defaultValue: true); var userInfo = userInfoCache.get('userInfoCache'); userLogin.value = userInfo != null; - getUnreadDynamic(); + dynamicBadgeType.value = DynamicBadgeMode.values[setting.get( + SettingBoxKey.dynamicBadgeMode, + defaultValue: DynamicBadgeMode.number.code)]; + if (dynamicBadgeType.value != DynamicBadgeMode.hidden) { + getUnreadDynamic(); + } } void onBackPressed(BuildContext context) { diff --git a/lib/pages/main/view.dart b/lib/pages/main/view.dart index 5a570a8f..04e0f087 100644 --- a/lib/pages/main/view.dart +++ b/lib/pages/main/view.dart @@ -3,6 +3,7 @@ import 'dart:async'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:hive/hive.dart'; +import 'package:pilipala/models/common/dynamic_badge_mode.dart'; import 'package:pilipala/pages/dynamics/index.dart'; import 'package:pilipala/pages/home/index.dart'; import 'package:pilipala/pages/media/index.dart'; @@ -127,11 +128,21 @@ class _MainAppState extends State with SingleTickerProviderStateMixin { destinations: [ ..._mainController.navigationBars.map((e) { return NavigationDestination( - icon: Badge( - label: Text(e['count'].toString()), - padding: const EdgeInsets.fromLTRB(6, 0, 6, 0), - isLabelVisible: e['count'] > 0, - child: e['icon'], + icon: Obx( + () => Badge( + label: + _mainController.dynamicBadgeType.value == + DynamicBadgeMode.number + ? Text(e['count'].toString()) + : null, + padding: + const EdgeInsets.fromLTRB(6, 0, 6, 0), + isLabelVisible: + _mainController.dynamicBadgeType.value != + DynamicBadgeMode.hidden && + e['count'] > 0, + child: e['icon'], + ), ), selectedIcon: e['selectIcon'], label: e['label'], @@ -148,11 +159,21 @@ class _MainAppState extends State with SingleTickerProviderStateMixin { items: [ ..._mainController.navigationBars.map((e) { return BottomNavigationBarItem( - icon: Badge( - label: Text(e['count'].toString()), - padding: const EdgeInsets.fromLTRB(6, 0, 6, 0), - isLabelVisible: e['count'] > 0, - child: e['icon'], + icon: Obx( + () => Badge( + label: + _mainController.dynamicBadgeType.value == + DynamicBadgeMode.number + ? Text(e['count'].toString()) + : null, + padding: + const EdgeInsets.fromLTRB(6, 0, 6, 0), + isLabelVisible: + _mainController.dynamicBadgeType.value != + DynamicBadgeMode.hidden && + e['count'] > 0, + child: e['icon'], + ), ), activeIcon: e['selectIcon'], label: e['label'], diff --git a/lib/pages/setting/controller.dart b/lib/pages/setting/controller.dart index afd14156..2e6680e5 100644 --- a/lib/pages/setting/controller.dart +++ b/lib/pages/setting/controller.dart @@ -7,6 +7,9 @@ import 'package:pilipala/models/common/theme_type.dart'; import 'package:pilipala/utils/feed_back.dart'; import 'package:pilipala/utils/login.dart'; import 'package:pilipala/utils/storage.dart'; +import '../../models/common/dynamic_badge_mode.dart'; +import '../main/index.dart'; +import 'widgets/select_dialog.dart'; class SettingController extends GetxController { Box userInfoCache = GStrorage.userInfo; @@ -19,6 +22,7 @@ class SettingController extends GetxController { RxInt picQuality = 10.obs; Rx themeType = ThemeType.system.obs; var userInfo; + Rx dynamicBadgeType = DynamicBadgeMode.number.obs; @override void onInit() { @@ -33,6 +37,9 @@ class SettingController extends GetxController { setting.get(SettingBoxKey.defaultPicQa, defaultValue: 10); themeType.value = ThemeType.values[setting.get(SettingBoxKey.themeMode, defaultValue: ThemeType.system.code)]; + dynamicBadgeType.value = DynamicBadgeMode.values[setting.get( + SettingBoxKey.dynamicBadgeMode, + defaultValue: DynamicBadgeMode.number.code)]; } loginOut() async { @@ -76,4 +83,31 @@ class SettingController extends GetxController { feedBackEnable.value = !feedBackEnable.value; setting.put(SettingBoxKey.feedBackEnable, feedBackEnable.value); } + + // 设置动态未读标记 + setDynamicBadgeMode(BuildContext context) async { + DynamicBadgeMode? result = await showDialog( + context: context, + builder: (context) { + return SelectDialog( + title: '动态未读标记', + value: dynamicBadgeType.value, + values: DynamicBadgeMode.values.map((e) { + return {'title': e.description, 'value': e}; + }).toList(), + ); + }, + ); + if (result != null) { + dynamicBadgeType.value = result; + setting.put(SettingBoxKey.dynamicBadgeMode, result.code); + MainController mainController = Get.put(MainController()); + mainController.dynamicBadgeType.value = + DynamicBadgeMode.values[result.code]; + if (mainController.dynamicBadgeType.value != DynamicBadgeMode.hidden) { + mainController.getUnreadDynamic(); + } + SmartDialog.showToast('设置成功'); + } + } } diff --git a/lib/pages/setting/style_setting.dart b/lib/pages/setting/style_setting.dart index 57ec110a..fb3c780a 100644 --- a/lib/pages/setting/style_setting.dart +++ b/lib/pages/setting/style_setting.dart @@ -10,6 +10,7 @@ import 'package:pilipala/pages/setting/widgets/select_dialog.dart'; import 'package:pilipala/pages/setting/widgets/slide_dialog.dart'; import 'package:pilipala/utils/storage.dart'; +import '../../models/common/dynamic_badge_mode.dart'; import 'controller.dart'; import 'widgets/switch_item.dart'; @@ -241,6 +242,14 @@ class _StyleSettingState extends State { '当前模式：${settingController.themeType.value.description}', style: subTitleStyle)), ), + ListTile( + dense: false, + onTap: () => settingController.setDynamicBadgeMode(context), + title: Text('动态未读标记', style: titleStyle), + subtitle: Obx(() => Text( + '当前标记样式：${settingController.dynamicBadgeType.value.description}', + style: subTitleStyle)), + ), ListTile( dense: false, onTap: () => Get.toNamed('/colorSetting'), diff --git a/lib/utils/storage.dart b/lib/utils/storage.dart index d408cc1c..89dae3e7 100644 --- a/lib/utils/storage.dart +++ b/lib/utils/storage.dart @@ -130,7 +130,8 @@ class SettingBoxKey { enableMYBar = 'enableMYBar', hideSearchBar = 'hideSearchBar', // 收起顶栏 hideTabBar = 'hideTabBar', // 收起底栏 - tabbarSort = 'tabbarSort'; // 首页tabbar + tabbarSort = 'tabbarSort', // 首页tabbar + dynamicBadgeMode = 'dynamicBadgeMode'; } class LocalCacheKey { From 5f92a0c293b51a0d6255aaaf38e01742d0d802da Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sun, 4 Feb 2024 00:32:01 +0800 Subject: [PATCH 055/220] =?UTF-8?q?mod:=20=E7=94=A8=E6=88=B7=E6=8A=95?= =?UTF-8?q?=E7=A8=BF=E6=98=BE=E7=A4=BA=E5=BC=B9=E5=B9=95=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/models/member/archive.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/models/member/archive.dart b/lib/models/member/archive.dart index 5d2ea77e..d735ab7c 100644 --- a/lib/models/member/archive.dart +++ b/lib/models/member/archive.dart @@ -142,7 +142,7 @@ class Stat { Stat.fromJson(Map json) { view = json["play"]; - danmaku = json['comment']; + danmaku = json['video_review']; } } From fb32388536146f57c0b6e8236ad4f2d014c9ec56 Mon Sep 17 00:00:00 2001 From: orz12 Date: Sun, 4 Feb 2024 16:41:44 +0800 Subject: [PATCH 056/220] =?UTF-8?q?fix:=20=E5=B0=9D=E8=AF=95=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E7=84=A6=E7=82=B9=E6=81=A2=E5=A4=8D=E6=97=B6=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E6=92=AD=E6=94=BE=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/services/audio_session.dart | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/lib/services/audio_session.dart b/lib/services/audio_session.dart index 98707652..57c42e05 100644 --- a/lib/services/audio_session.dart +++ b/lib/services/audio_session.dart @@ -20,11 +20,15 @@ class AudioSessionHandler { session.interruptionEventStream.listen((event) { final player = PlPlayerController.getInstance(); if (event.begin) { + if (player.playerStatus != PlayerStatus.playing) return; switch (event.type) { case AudioInterruptionType.duck: player.setVolume(player.volume.value * 0.5); break; case AudioInterruptionType.pause: + player.pause(isInterrupt: true); + _playInterrupted = true; + break; case AudioInterruptionType.unknown: player.pause(isInterrupt: true); _playInterrupted = true; @@ -36,7 +40,7 @@ class AudioSessionHandler { player.setVolume(player.volume.value * 2); break; case AudioInterruptionType.pause: - if (_playInterrupted) PlPlayerController.getInstance().play(); + if (_playInterrupted) player.play(); break; case AudioInterruptionType.unknown: break; @@ -47,7 +51,10 @@ class AudioSessionHandler { // 耳机拔出暂停 session.becomingNoisyEventStream.listen((_) { - PlPlayerController.getInstance().pause(); + final player = PlPlayerController.getInstance(); + if (player.playerStatus == PlayerStatus.playing) { + player.pause(); + } }); } } From 80b39daaff4fbaa122b71f387ab0c1cfaadca0d9 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sun, 4 Feb 2024 22:06:45 +0800 Subject: [PATCH 057/220] =?UTF-8?q?mod:=20jumpUrl=E5=A2=9E=E5=8A=A0icon?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=20issues=20#471?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../detail/reply/widgets/reply_item.dart | 102 +++++++++--------- 1 file changed, 51 insertions(+), 51 deletions(-) diff --git a/lib/pages/video/detail/reply/widgets/reply_item.dart b/lib/pages/video/detail/reply/widgets/reply_item.dart index 5e5a5828..7991a366 100644 --- a/lib/pages/video/detail/reply/widgets/reply_item.dart +++ b/lib/pages/video/detail/reply/widgets/reply_item.dart @@ -571,7 +571,8 @@ InlineSpan buildContent( }); } // content.message = content.message.replaceAll(RegExp(r"\{vote:.*?\}"), ' '); - content.message = content.message.replaceAll('&', '&') + content.message = content.message + .replaceAll('&', '&') .replaceAll('<', '<') .replaceAll('>', '>') .replaceAll('"', '"') @@ -586,21 +587,21 @@ InlineSpan buildContent( e.replaceAll('?', '\\?').replaceAll('+', '\\+').replaceAll('*', '\\*')), ]; - String patternStr = - specialTokens.map(RegExp.escape).join('|'); + String patternStr = specialTokens.map(RegExp.escape).join('|'); if (patternStr.isNotEmpty) { patternStr += "|"; } patternStr += r'(\b\d{1,2}[:：]\d{2}\b)'; final RegExp pattern = RegExp(patternStr); List matchedStrs = []; - void addPlainTextSpan(str){ + void addPlainTextSpan(str) { spanChilds.add(TextSpan( text: str, recognizer: TapGestureRecognizer() - ..onTap = () => - replyReply(replyItem.root == 0 ? replyItem : fReplyItem))); + ..onTap = + () => replyReply(replyItem.root == 0 ? replyItem : fReplyItem))); } + // 分割文本并处理每个部分 content.message.splitMapJoin( pattern, @@ -674,57 +675,56 @@ InlineSpan buildContent( addPlainTextSpan(matchStr); return ""; } - spanChilds.add( - TextSpan( - text: content.jumpUrl[matchStr]['title'], - style: TextStyle( - color: Theme.of(context).colorScheme.primary, - ), - recognizer: TapGestureRecognizer() - ..onTap = () { - if (appUrlSchema == '') { - final String str = Uri.parse(matchStr).pathSegments[0]; - final Map matchRes = IdUtils.matchAvorBv(input: str); - final List matchKeys = matchRes.keys.toList(); - if (matchKeys.isNotEmpty) { - if (matchKeys.first == 'BV') { + spanChilds.addAll( + [ + if (content.jumpUrl[matchStr]?['prefix_icon'] != null) ...[ + WidgetSpan( + child: Image.network( + content.jumpUrl[matchStr]['prefix_icon'], + height: 19, + color: Theme.of(context).colorScheme.primary, + ), + ) + ], + TextSpan( + text: content.jumpUrl[matchStr]['title'], + style: TextStyle( + color: Theme.of(context).colorScheme.primary, + ), + recognizer: TapGestureRecognizer() + ..onTap = () { + if (appUrlSchema == '') { + final String str = Uri.parse(matchStr).pathSegments[0]; + final Map matchRes = IdUtils.matchAvorBv(input: str); + final List matchKeys = matchRes.keys.toList(); + if (matchKeys.isNotEmpty) { + if (matchKeys.first == 'BV') { + Get.toNamed( + '/searchResult', + parameters: {'keyword': matchRes['BV']}, + ); + } + } else { Get.toNamed( - '/searchResult', - parameters: {'keyword': matchRes['BV']}, + '/webview', + parameters: { + 'url': matchStr, + 'type': 'url', + 'pageTitle': '' + }, ); } } else { - Get.toNamed( - '/webview', - parameters: { - 'url': matchStr, - 'type': 'url', - 'pageTitle': '' - }, - ); + if (appUrlSchema.startsWith('bilibili://search')) { + Get.toNamed('/searchResult', parameters: { + 'keyword': content.jumpUrl[matchStr]['title'] + }); + } } - } else { - if (appUrlSchema.startsWith('bilibili://search')) { - Get.toNamed('/searchResult', parameters: { - 'keyword': content.jumpUrl[matchStr]['title'] - }); - } - } - }, - ), + }, + ) + ], ); - if (appUrlSchema.startsWith('bilibili://search')) { - spanChilds.add( - WidgetSpan( - child: Icon( - FontAwesomeIcons.magnifyingGlass, - size: 9, - color: Theme.of(context).colorScheme.primary, - ), - alignment: PlaceholderAlignment.top, - ), - ); - } // 只显示一次 matchedStrs.add(matchStr); } else { From a560d66567891afc376a03acf95013fcc8fa8d40 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sun, 4 Feb 2024 23:03:24 +0800 Subject: [PATCH 058/220] mod: rcmd FutureBuilder --- lib/models/common/rcmd_type.dart | 2 +- lib/pages/rcmd/controller.dart | 7 +++-- lib/pages/rcmd/view.dart | 53 +++++++++++++++++++++++--------- 3 files changed, 43 insertions(+), 19 deletions(-) diff --git a/lib/models/common/rcmd_type.dart b/lib/models/common/rcmd_type.dart index 5af18d77..2dfdad1c 100644 --- a/lib/models/common/rcmd_type.dart +++ b/lib/models/common/rcmd_type.dart @@ -3,5 +3,5 @@ enum RcmdType { web, app, notLogin } extension RcmdTypeExtension on RcmdType { String get values => ['web', 'app', 'notLogin'][index]; - String get labels => ['web端', 'app端', '模拟未登录'][index]; + String get labels => ['web端', 'app端', '游客模式'][index]; } diff --git a/lib/pages/rcmd/controller.dart b/lib/pages/rcmd/controller.dart index 6ecc9d63..b7e58f44 100644 --- a/lib/pages/rcmd/controller.dart +++ b/lib/pages/rcmd/controller.dart @@ -28,7 +28,7 @@ class RcmdController extends GetxController { setting.get(SettingBoxKey.enableSaveLastData, defaultValue: false); defaultRcmdType = setting.get(SettingBoxKey.defaultRcmdType, defaultValue: 'web'); - if (defaultRcmdType == 'web'){ + if (defaultRcmdType == 'web') { videoList = [].obs; } else { videoList = [].obs; @@ -43,7 +43,7 @@ class RcmdController extends GetxController { if (type == 'onRefresh') { _currentPage = 0; } - late final Map res; + late final Map res; switch (defaultRcmdType) { case 'app': case 'notLogin': @@ -77,13 +77,14 @@ class RcmdController extends GetxController { _currentPage += 1; // 若videoList数量太小，可能会影响翻页，此时再次请求 // 为避免请求到的数据太少时还在反复请求，要求本次返回数据大于1条才触发 - if (res['data'].length > 1 && videoList.length < 10){ + if (res['data'].length > 1 && videoList.length < 10) { queryRcmdFeed('onLoad'); } } else { Get.snackbar('提示', res['msg']); } isLoadingMore = false; + return res; } // 下拉刷新 diff --git a/lib/pages/rcmd/view.dart b/lib/pages/rcmd/view.dart index 687eacd1..42b66364 100644 --- a/lib/pages/rcmd/view.dart +++ b/lib/pages/rcmd/view.dart @@ -7,7 +7,7 @@ import 'package:get/get.dart'; import 'package:pilipala/common/constants.dart'; import 'package:pilipala/common/skeleton/video_card_v.dart'; import 'package:pilipala/common/widgets/animated_dialog.dart'; -// import 'package:pilipala/common/widgets/http_error.dart'; +import 'package:pilipala/common/widgets/http_error.dart'; import 'package:pilipala/common/widgets/overlay_pop.dart'; import 'package:pilipala/common/widgets/video_card_v.dart'; import 'package:pilipala/pages/home/index.dart'; @@ -25,6 +25,7 @@ class RcmdPage extends StatefulWidget { class _RcmdPageState extends State with AutomaticKeepAliveClientMixin { final RcmdController _rcmdController = Get.put(RcmdController()); + late Future _futureBuilderFuture; @override bool get wantKeepAlive => true; @@ -32,7 +33,7 @@ class _RcmdPageState extends State @override void initState() { super.initState(); - _rcmdController.queryRcmdFeed('init'); + _futureBuilderFuture = _rcmdController.queryRcmdFeed('init'); ScrollController scrollController = _rcmdController.scrollController; StreamController mainStream = Get.find().bottomBarStream; @@ -88,19 +89,41 @@ class _RcmdPageState extends State slivers: [ SliverPadding( padding: - const EdgeInsets.fromLTRB(0, StyleString.safeSpace, 0, 0), - sliver: Obx(() { // 使用Obx来监听数据的变化 - if (_rcmdController.isLoadingMore && _rcmdController.videoList.isEmpty) { - return contentGrid(_rcmdController, []); - // 如果正在加载并且列表为空，则显示加载指示器 - // return const SliverToBoxAdapter( - // child: Center(child: CircularProgressIndicator()), - // ); - } else { - // 显示视频列表 - return contentGrid(_rcmdController, _rcmdController.videoList); - } - }), + const EdgeInsets.fromLTRB(0, StyleString.safeSpace, 0, 0), + sliver: FutureBuilder( + future: _futureBuilderFuture, + builder: (context, snapshot) { + if (snapshot.connectionState == ConnectionState.done) { + Map data = snapshot.data as Map; + if (data['status']) { + return Obx( + () { + if (_rcmdController.isLoadingMore && + _rcmdController.videoList.isEmpty) { + return contentGrid(_rcmdController, []); + } else { + // 显示视频列表 + return contentGrid( + _rcmdController, _rcmdController.videoList); + } + }, + ); + } else { + return HttpError( + errMsg: data['msg'], + fn: () { + setState(() { + _futureBuilderFuture = + _rcmdController.queryRcmdFeed('init'); + }); + }, + ); + } + } else { + return contentGrid(_rcmdController, []); + } + }, + ), ), LoadingMore(ctr: _rcmdController), ], From 9e471b83d992755d23764c7e24228949c9b75cd4 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Mon, 5 Feb 2024 00:19:03 +0800 Subject: [PATCH 059/220] mod: cancel Get.snackbar --- lib/pages/rcmd/controller.dart | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/pages/rcmd/controller.dart b/lib/pages/rcmd/controller.dart index b7e58f44..28ff055b 100644 --- a/lib/pages/rcmd/controller.dart +++ b/lib/pages/rcmd/controller.dart @@ -80,8 +80,6 @@ class RcmdController extends GetxController { if (res['data'].length > 1 && videoList.length < 10) { queryRcmdFeed('onLoad'); } - } else { - Get.snackbar('提示', res['msg']); } isLoadingMore = false; return res; From 78ade4a1936c47327e6b7d01648edf66b81e3f55 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Mon, 5 Feb 2024 23:41:40 +0800 Subject: [PATCH 060/220] =?UTF-8?q?mod:=20=E7=A7=BB=E9=99=A4=E8=AF=84?= =?UTF-8?q?=E8=AE=BA=E6=8C=89=E3=80=90=E6=9C=80=E5=A4=9A=E5=9B=9E=E5=A4=8D?= =?UTF-8?q?=E3=80=91=E6=8E=92=E5=BA=8F=20issues=20#298?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/models/common/reply_sort_type.dart | 6 +++--- lib/pages/dynamics/detail/controller.dart | 7 ++++--- lib/pages/html/controller.dart | 3 --- lib/pages/setting/extra_setting.dart | 4 ++++ lib/pages/video/detail/reply/controller.dart | 9 +++++---- 5 files changed, 16 insertions(+), 13 deletions(-) diff --git a/lib/models/common/reply_sort_type.dart b/lib/models/common/reply_sort_type.dart index 7c203c13..89da82b3 100644 --- a/lib/models/common/reply_sort_type.dart +++ b/lib/models/common/reply_sort_type.dart @@ -1,6 +1,6 @@ -enum ReplySortType { time, like, reply } +enum ReplySortType { time, like } extension ReplySortTypeExtension on ReplySortType { - String get titles => ['最新评论', '最热评论', '回复最多'][index]; - String get labels => ['最新', '最热', '最多回复'][index]; + String get titles => ['最新评论', '最热评论'][index]; + String get labels => ['最新', '最热'][index]; } diff --git a/lib/pages/dynamics/detail/controller.dart b/lib/pages/dynamics/detail/controller.dart index 1520377e..4c5f35d6 100644 --- a/lib/pages/dynamics/detail/controller.dart +++ b/lib/pages/dynamics/detail/controller.dart @@ -37,6 +37,10 @@ class DynamicDetailController extends GetxController { } int deaultReplySortIndex = setting.get(SettingBoxKey.replySortType, defaultValue: 0); + if (deaultReplySortIndex == 2) { + setting.put(SettingBoxKey.replySortType, 0); + deaultReplySortIndex = 0; + } _sortType = ReplySortType.values[deaultReplySortIndex]; sortTypeTitle.value = _sortType.titles; sortTypeLabel.value = _sortType.labels; @@ -92,9 +96,6 @@ class DynamicDetailController extends GetxController { _sortType = ReplySortType.like; break; case ReplySortType.like: - _sortType = ReplySortType.reply; - break; - case ReplySortType.reply: _sortType = ReplySortType.time; break; default: diff --git a/lib/pages/html/controller.dart b/lib/pages/html/controller.dart index f3187828..1175ce29 100644 --- a/lib/pages/html/controller.dart +++ b/lib/pages/html/controller.dart @@ -96,9 +96,6 @@ class HtmlRenderController extends GetxController { _sortType = ReplySortType.like; break; case ReplySortType.like: - _sortType = ReplySortType.reply; - break; - case ReplySortType.reply: _sortType = ReplySortType.time; break; default: diff --git a/lib/pages/setting/extra_setting.dart b/lib/pages/setting/extra_setting.dart index b32a06f5..1580ad8b 100644 --- a/lib/pages/setting/extra_setting.dart +++ b/lib/pages/setting/extra_setting.dart @@ -31,6 +31,10 @@ class _ExtraSettingState extends State { // 默认优先显示最新评论 defaultReplySort = setting.get(SettingBoxKey.replySortType, defaultValue: 0); + if (defaultReplySort == 2) { + setting.put(SettingBoxKey.replySortType, 0); + defaultReplySort = 0; + } // 优先展示全部动态 all defaultDynamicType = setting.get(SettingBoxKey.defaultDynamicType, defaultValue: 0); diff --git a/lib/pages/video/detail/reply/controller.dart b/lib/pages/video/detail/reply/controller.dart index 9e05542b..5781cbba 100644 --- a/lib/pages/video/detail/reply/controller.dart +++ b/lib/pages/video/detail/reply/controller.dart @@ -41,8 +41,12 @@ class VideoReplyController extends GetxController { @override void onInit() { super.onInit(); - final int deaultReplySortIndex = + int deaultReplySortIndex = setting.get(SettingBoxKey.replySortType, defaultValue: 0) as int; + if (deaultReplySortIndex == 2) { + setting.put(SettingBoxKey.replySortType, 0); + deaultReplySortIndex = 0; + } _sortType = ReplySortType.values[deaultReplySortIndex]; sortTypeTitle.value = _sortType.titles; sortTypeLabel.value = _sortType.labels; @@ -115,9 +119,6 @@ class VideoReplyController extends GetxController { _sortType = ReplySortType.like; break; case ReplySortType.like: - _sortType = ReplySortType.reply; - break; - case ReplySortType.reply: _sortType = ReplySortType.time; break; default: From 4a5f4ca2caaa34c7157db4241c410c98038bf3fc Mon Sep 17 00:00:00 2001 From: guozhigq Date: Tue, 6 Feb 2024 00:14:46 +0800 Subject: [PATCH 061/220] =?UTF-8?q?fix:=20=E9=99=90=E6=97=B6=E5=85=8D?= =?UTF-8?q?=E8=B4=B9=E6=97=A0=E6=B3=95=E6=92=AD=E6=94=BE=20issues=20#457?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/bangumi/widgets/bangumi_panel.dart | 25 +++++++++++++++----- 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/lib/pages/bangumi/widgets/bangumi_panel.dart b/lib/pages/bangumi/widgets/bangumi_panel.dart index b5ec4efe..5996d6c8 100644 --- a/lib/pages/bangumi/widgets/bangumi_panel.dart +++ b/lib/pages/bangumi/widgets/bangumi_panel.dart @@ -151,7 +151,7 @@ class _BangumiPanelState extends State { } void changeFucCall(item, i) async { - if (item.badge != null && vipStatus != 1) { + if (item.badge != null && item.badge == '会员' && vipStatus != 1) { SmartDialog.showToast('需要大会员'); return; } @@ -255,11 +255,24 @@ class _BangumiPanelState extends State { ), const SizedBox(width: 2), if (widget.pages[i].badge != null) ...[ - Image.asset( - 'assets/images/big-vip.png', - height: 16, - ), - ], + if (widget.pages[i].badge == '会员') ...[ + Image.asset( + 'assets/images/big-vip.png', + height: 16, + ), + ], + if (widget.pages[i].badge != '会员') ...[ + const Spacer(), + Text( + widget.pages[i].badge!, + style: TextStyle( + fontSize: 11, + color: + Theme.of(context).colorScheme.primary, + ), + ), + ], + ] ], ), const SizedBox(height: 3), From 71ccb9c0e51dce5437a14e7311f36b13f0f2ac8a Mon Sep 17 00:00:00 2001 From: guozhigq Date: Tue, 6 Feb 2024 11:01:36 +0800 Subject: [PATCH 062/220] =?UTF-8?q?fix:=20=E6=94=B6=E8=97=8F=E5=9B=BD?= =?UTF-8?q?=E5=88=9B=E8=B7=B3=E8=BD=AC=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/fav_detail/widget/fav_video_card.dart | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/pages/fav_detail/widget/fav_video_card.dart b/lib/pages/fav_detail/widget/fav_video_card.dart index 9394fbe3..d988a0e1 100644 --- a/lib/pages/fav_detail/widget/fav_video_card.dart +++ b/lib/pages/fav_detail/widget/fav_video_card.dart @@ -27,7 +27,9 @@ class FavVideoCardH extends StatelessWidget { onTap: () async { // int? seasonId; String? epId; - if (videoItem.ogv != null && videoItem.ogv['type_name'] == '番剧') { + if (videoItem.ogv != null && + (videoItem.ogv['type_name'] == '番剧' || + videoItem.ogv['type_name'] == '国创')) { videoItem.cid = await SearchHttp.ab2c(bvid: bvid); // seasonId = videoItem.ogv['season_id']; epId = videoItem.epId; From 083739e562a5ec3d40c4597d79103611f264796a Mon Sep 17 00:00:00 2001 From: guozhigq Date: Tue, 6 Feb 2024 11:13:33 +0800 Subject: [PATCH 063/220] =?UTF-8?q?mod:=20=E6=94=B6=E8=97=8F=E5=8D=A1?= =?UTF-8?q?=E7=89=87=E5=86=85=E5=AE=B9=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fav_detail/widget/fav_video_card.dart | 55 +++++++++++-------- 1 file changed, 33 insertions(+), 22 deletions(-) diff --git a/lib/pages/fav_detail/widget/fav_video_card.dart b/lib/pages/fav_detail/widget/fav_video_card.dart index d988a0e1..a4f22f6b 100644 --- a/lib/pages/fav_detail/widget/fav_video_card.dart +++ b/lib/pages/fav_detail/widget/fav_video_card.dart @@ -9,6 +9,7 @@ import 'package:pilipala/models/common/search_type.dart'; import 'package:pilipala/utils/id_utils.dart'; import 'package:pilipala/utils/utils.dart'; import 'package:pilipala/common/widgets/network_img_layer.dart'; +import '../../../common/widgets/badge.dart'; // 收藏视频卡片 - 水平布局 class FavVideoCardH extends StatelessWidget { @@ -86,22 +87,21 @@ class FavVideoCardH extends StatelessWidget { height: maxHeight, ), ), - Positioned( - right: 4, - bottom: 4, - child: Container( - padding: const EdgeInsets.symmetric( - vertical: 1, horizontal: 6), - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(4), - color: Colors.black54.withOpacity(0.4)), - child: Text( - Utils.timeFormat(videoItem.duration!), - style: const TextStyle( - fontSize: 11, color: Colors.white), - ), + PBadge( + text: Utils.timeFormat(videoItem.duration!), + right: 6.0, + bottom: 6.0, + type: 'gray', + ), + if (videoItem.ogv != null) ...[ + PBadge( + text: videoItem.ogv['type_name'], + top: 6.0, + right: 6.0, + bottom: null, + left: null, ), - ) + ], ], ); }, @@ -143,19 +143,30 @@ class VideoContent extends StatelessWidget { maxLines: 2, overflow: TextOverflow.ellipsis, ), + if (videoItem.ogv != null) ...[ + Text( + videoItem.intro, + style: TextStyle( + fontSize: Theme.of(context).textTheme.labelMedium!.fontSize, + color: Theme.of(context).colorScheme.outline, + ), + ), + ], const Spacer(), Text( - Utils.dateFormat(videoItem.ctime!), + Utils.dateFormat(videoItem.favTime), style: TextStyle( fontSize: 11, color: Theme.of(context).colorScheme.outline), ), - Text( - videoItem.owner.name, - style: TextStyle( - fontSize: Theme.of(context).textTheme.labelMedium!.fontSize, - color: Theme.of(context).colorScheme.outline, + if (videoItem.owner.name != '') ...[ + Text( + videoItem.owner.name, + style: TextStyle( + fontSize: Theme.of(context).textTheme.labelMedium!.fontSize, + color: Theme.of(context).colorScheme.outline, + ), ), - ), + ], Row( children: [ StatView( From ebdeec67303b6e60268a6ae80903c8f4be3a8803 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Tue, 6 Feb 2024 12:23:07 +0800 Subject: [PATCH 064/220] =?UTF-8?q?fix:=20up=E4=B8=BB=E9=A1=B5=E8=B7=B3?= =?UTF-8?q?=E8=BD=AC=E6=90=9C=E7=B4=A2mid=E5=8F=96=E5=80=BC=E5=BC=82?= =?UTF-8?q?=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/member/view.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/pages/member/view.dart b/lib/pages/member/view.dart index 1d3cd5c4..0663e94e 100644 --- a/lib/pages/member/view.dart +++ b/lib/pages/member/view.dart @@ -105,7 +105,7 @@ class _MemberPageState extends State actions: [ IconButton( onPressed: () => Get.toNamed( - '/memberSearch?mid=${Get.parameters['mid']}&uname=${_memberController.memberInfo.value.name!}'), + '/memberSearch?mid=$mid&uname=${_memberController.memberInfo.value.name!}'), icon: const Icon(Icons.search_outlined), ), PopupMenuButton( From 63d600070b628424039807837f2b9a4679641ac1 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Tue, 6 Feb 2024 15:27:39 +0800 Subject: [PATCH 065/220] =?UTF-8?q?fix:=20=E6=94=B6=E8=97=8F=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E9=A1=B5=E8=B7=B3=E8=BD=AC=E6=90=9C=E7=B4=A2mediaId?= =?UTF-8?q?=E5=8F=96=E5=80=BC=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/fav_detail/view.dart | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/pages/fav_detail/view.dart b/lib/pages/fav_detail/view.dart index f5897550..27d7182b 100644 --- a/lib/pages/fav_detail/view.dart +++ b/lib/pages/fav_detail/view.dart @@ -24,10 +24,12 @@ class _FavDetailPageState extends State { Get.put(FavDetailController()); late StreamController titleStreamC; // a Future? _futureBuilderFuture; + late String mediaId; @override void initState() { super.initState(); + mediaId = Get.parameters['mediaId']!; _futureBuilderFuture = _favDetailController.queryUserFavFolderDetail(); titleStreamC = StreamController(); _controller.addListener( @@ -94,8 +96,8 @@ class _FavDetailPageState extends State { ), actions: [ IconButton( - onPressed: () => Get.toNamed( - '/favSearch?searchType=0&mediaId=${Get.parameters['mediaId']!}'), + onPressed: () => + Get.toNamed('/favSearch?searchType=0&mediaId=$mediaId'), icon: const Icon(Icons.search_outlined), ), // IconButton( From 40c666e3d1112269f01a9b877bdabfe7d69883ab Mon Sep 17 00:00:00 2001 From: guozhigq Date: Wed, 7 Feb 2024 00:52:25 +0800 Subject: [PATCH 066/220] =?UTF-8?q?mod:=20=E7=BD=91=E7=BB=9C=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E7=BB=84=E4=BB=B6=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/common/widgets/http_error.dart | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/lib/common/widgets/http_error.dart b/lib/common/widgets/http_error.dart index b02182c6..cbc6659b 100644 --- a/lib/common/widgets/http_error.dart +++ b/lib/common/widgets/http_error.dart @@ -22,20 +22,27 @@ class HttpError extends StatelessWidget { "assets/images/error.svg", height: 200, ), - const SizedBox(height: 20), + const SizedBox(height: 30), Text( errMsg ?? '请求异常', textAlign: TextAlign.center, style: Theme.of(context).textTheme.titleSmall, ), - const SizedBox(height: 30), - OutlinedButton.icon( + const SizedBox(height: 20), + FilledButton.tonal( onPressed: () { fn!(); }, - icon: const Icon(Icons.arrow_forward_outlined, size: 20), - label: Text(btnText ?? '点击重试'), - ) + style: ButtonStyle( + backgroundColor: MaterialStateProperty.resolveWith((states) { + return Theme.of(context).colorScheme.primary.withAlpha(20); + }), + ), + child: Text( + btnText ?? '点击重试', + style: TextStyle(color: Theme.of(context).colorScheme.primary), + ), + ), ], ), ), From 191472d0c42c3cd09f9701ccd828e7fb13e21aa8 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Wed, 7 Feb 2024 01:17:35 +0800 Subject: [PATCH 067/220] =?UTF-8?q?mod:=20=E7=BD=91=E7=BB=9C=E8=AF=B7?= =?UTF-8?q?=E6=B1=82=E5=BC=82=E5=B8=B8=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/http/video.dart | 8 +++---- lib/pages/dynamics/view.dart | 28 ++---------------------- lib/pages/dynamics/widgets/up_panel.dart | 7 ++++++ lib/pages/search/view.dart | 10 ++++++--- lib/pages/search_panel/view.dart | 12 ++++++++-- 5 files changed, 30 insertions(+), 35 deletions(-) diff --git a/lib/http/video.dart b/lib/http/video.dart index d0faabaa..b311bfa1 100644 --- a/lib/http/video.dart +++ b/lib/http/video.dart @@ -51,7 +51,7 @@ class VideoHttp { (i['owner'] != null && !blackMidsList.contains(i['owner']['mid']))) { RecVideoItemModel videoItem = RecVideoItemModel.fromJson(i); - if (!RecommendFilter.filter(videoItem)){ + if (!RecommendFilter.filter(videoItem)) { list.add(videoItem); } } @@ -98,7 +98,7 @@ class VideoHttp { (i['args'] != null && !blackMidsList.contains(i['args']['up_mid']))) { RecVideoItemAppModel videoItem = RecVideoItemAppModel.fromJson(i); - if (!RecommendFilter.filter(videoItem)){ + if (!RecommendFilter.filter(videoItem)) { list.add(videoItem); } } @@ -130,7 +130,7 @@ class VideoHttp { } return {'status': true, 'data': list}; } else { - return {'status': false, 'data': []}; + return {'status': false, 'data': [], 'msg': res.data['message']}; } } catch (err) { return {'status': false, 'data': [], 'msg': err}; @@ -217,7 +217,7 @@ class VideoHttp { List list = []; for (var i in res.data['data']) { HotVideoItemModel videoItem = HotVideoItemModel.fromJson(i); - if (!RecommendFilter.filter(videoItem, relatedVideos: true)){ + if (!RecommendFilter.filter(videoItem, relatedVideos: true)) { list.add(videoItem); } } diff --git a/lib/pages/dynamics/view.dart b/lib/pages/dynamics/view.dart index 575c8767..4a92cdfb 100644 --- a/lib/pages/dynamics/view.dart +++ b/lib/pages/dynamics/view.dart @@ -192,22 +192,6 @@ class _DynamicsPageState extends State ) ], ), - // Obx( - // () => Visibility( - // visible: _dynamicsController.userLogin.value, - // child: Positioned( - // right: 4, - // top: 0, - // bottom: 0, - // child: IconButton( - // padding: EdgeInsets.zero, - // onPressed: () => - // {feedBack(), _dynamicsController.resetSearch()}, - // icon: const Icon(Icons.history, size: 21), - // ), - // ), - // ), - // ), ], ), ), @@ -229,7 +213,8 @@ class _DynamicsPageState extends State return Obx(() => UpPanel(_dynamicsController.upData.value)); } else { return const SliverToBoxAdapter( - child: SizedBox(height: 80)); + child: SizedBox(height: 80), + ); } } else { return const SliverToBoxAdapter( @@ -240,15 +225,6 @@ class _DynamicsPageState extends State } }, ), - SliverToBoxAdapter( - child: Container( - height: 6, - color: Theme.of(context) - .colorScheme - .onInverseSurface - .withOpacity(0.5), - ), - ), FutureBuilder( future: _futureBuilderFuture, builder: (context, snapshot) { diff --git a/lib/pages/dynamics/widgets/up_panel.dart b/lib/pages/dynamics/widgets/up_panel.dart index ba4a562d..f1043fd8 100644 --- a/lib/pages/dynamics/widgets/up_panel.dart +++ b/lib/pages/dynamics/widgets/up_panel.dart @@ -121,6 +121,13 @@ class _UpPanelState extends State { ], ), ), + Container( + height: 6, + color: Theme.of(context) + .colorScheme + .onInverseSurface + .withOpacity(0.5), + ), ], )), ); diff --git a/lib/pages/search/view.dart b/lib/pages/search/view.dart index c262df38..95d3134e 100644 --- a/lib/pages/search/view.dart +++ b/lib/pages/search/view.dart @@ -187,9 +187,13 @@ class _SearchPageState extends State with RouteAware { ), ); } else { - return HttpError( - errMsg: data['msg'], - fn: () => setState(() {}), + return CustomScrollView( + slivers: [ + HttpError( + errMsg: data['msg'], + fn: () => setState(() {}), + ) + ], ); } } else { diff --git a/lib/pages/search_panel/view.dart b/lib/pages/search_panel/view.dart index f7392c88..c5824d70 100644 --- a/lib/pages/search_panel/view.dart +++ b/lib/pages/search_panel/view.dart @@ -105,7 +105,11 @@ class _SearchPanelState extends State slivers: [ HttpError( errMsg: data['msg'], - fn: () => setState(() {}), + fn: () { + setState(() { + _searchPanelController.onSearch(); + }); + }, ), ], ); @@ -116,7 +120,11 @@ class _SearchPanelState extends State slivers: [ HttpError( errMsg: '没有相关数据', - fn: () => setState(() {}), + fn: () { + setState(() { + _searchPanelController.onSearch(); + }); + }, ), ], ); From b0c56feef5c6169eb088aa257005f2863009e3b8 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Wed, 7 Feb 2024 02:47:11 +0800 Subject: [PATCH 068/220] =?UTF-8?q?mod:=20=E9=A6=96=E9=A1=B5=E7=BD=91?= =?UTF-8?q?=E7=BB=9C=E5=BC=82=E5=B8=B8=E8=AF=B7=E6=B1=82=E9=87=8D=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/main.dart | 16 +++++++--------- lib/pages/bangumi/view.dart | 7 ++++--- lib/pages/hot/view.dart | 10 +++++++--- lib/pages/live/controller.dart | 4 +--- lib/pages/live/view.dart | 23 +++++++++-------------- lib/pages/rcmd/view.dart | 34 ++-------------------------------- 6 files changed, 30 insertions(+), 64 deletions(-) diff --git a/lib/main.dart b/lib/main.dart index 5c467722..64559ffd 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -25,7 +25,6 @@ import 'package:pilipala/utils/recommend_filter.dart'; import 'package:catcher_2/catcher_2.dart'; import './services/loggeer.dart'; - void main() async { WidgetsFlutterBinding.ensureInitialized(); MediaKit.ensureInitialized(); @@ -55,14 +54,13 @@ void main() async { [FileHandler(await getLogsPath())], ); - Catcher2( - debugConfig: debugConfig, - releaseConfig: releaseConfig, - runAppFunction: () { - runApp(const MyApp()); - }, - ); - + // Catcher2( + // debugConfig: debugConfig, + // releaseConfig: releaseConfig, + // runAppFunction: () { + runApp(const MyApp()); + // }, + // ); // 小白条、导航栏沉浸 SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge); diff --git a/lib/pages/bangumi/view.dart b/lib/pages/bangumi/view.dart index 560f09a5..f59f94a2 100644 --- a/lib/pages/bangumi/view.dart +++ b/lib/pages/bangumi/view.dart @@ -9,7 +9,6 @@ import 'package:pilipala/common/constants.dart'; import 'package:pilipala/common/widgets/http_error.dart'; import 'package:pilipala/pages/home/index.dart'; import 'package:pilipala/pages/main/index.dart'; -import 'package:pilipala/pages/rcmd/view.dart'; import 'controller.dart'; import 'widgets/bangumu_card_v.dart'; @@ -199,7 +198,10 @@ class _BangumiPageState extends State } else { return HttpError( errMsg: data['msg'], - fn: () => {}, + fn: () { + _futureBuilderFuture = + _bangumidController.queryBangumiListFeed(); + }, ); } } else { @@ -208,7 +210,6 @@ class _BangumiPageState extends State }, ), ), - const LoadingMore() ], ), ); diff --git a/lib/pages/hot/view.dart b/lib/pages/hot/view.dart index 2673e84c..7a0a57ea 100644 --- a/lib/pages/hot/view.dart +++ b/lib/pages/hot/view.dart @@ -89,8 +89,7 @@ class _HotPageState extends State with AutomaticKeepAliveClientMixin { if (data['status']) { return Obx( () => SliverList( - delegate: - SliverChildBuilderDelegate((context, index) { + delegate: SliverChildBuilderDelegate((context, index) { return VideoCardH( videoItem: _hotController.videoList[index], showPubdate: true, @@ -110,7 +109,12 @@ class _HotPageState extends State with AutomaticKeepAliveClientMixin { } else { return HttpError( errMsg: data['msg'], - fn: () => setState(() {}), + fn: () { + setState(() { + _futureBuilderFuture = + _hotController.queryHotFeed('init'); + }); + }, ); } } else { diff --git a/lib/pages/live/controller.dart b/lib/pages/live/controller.dart index 6a26f0d2..74fb6e9a 100644 --- a/lib/pages/live/controller.dart +++ b/lib/pages/live/controller.dart @@ -10,8 +10,7 @@ class LiveController extends GetxController { int count = 12; int _currentPage = 1; RxInt crossAxisCount = 2.obs; - RxList liveList = [LiveItemModel()].obs; - bool isLoadingMore = false; + RxList liveList = [].obs; bool flag = false; OverlayEntry? popupDialog; Box setting = GStrorage.setting; @@ -39,7 +38,6 @@ class LiveController extends GetxController { } _currentPage += 1; } - isLoadingMore = false; return res; } diff --git a/lib/pages/live/view.dart b/lib/pages/live/view.dart index f693acf1..f3f91c9e 100644 --- a/lib/pages/live/view.dart +++ b/lib/pages/live/view.dart @@ -11,7 +11,6 @@ import 'package:pilipala/common/widgets/http_error.dart'; import 'package:pilipala/common/widgets/overlay_pop.dart'; import 'package:pilipala/pages/home/index.dart'; import 'package:pilipala/pages/main/index.dart'; -import 'package:pilipala/pages/rcmd/index.dart'; import 'controller.dart'; import 'widgets/live_item.dart'; @@ -45,8 +44,8 @@ class _LivePageState extends State () { if (scrollController.position.pixels >= scrollController.position.maxScrollExtent - 200) { - EasyThrottle.throttle('liveList', const Duration(seconds: 1), () { - _liveController.isLoadingMore = true; + EasyThrottle.throttle('liveList', const Duration(milliseconds: 200), + () { _liveController.onLoad(); }); } @@ -108,24 +107,20 @@ class _LivePageState extends State } else { return HttpError( errMsg: data['msg'], - fn: () => {}, + fn: () { + setState(() { + _futureBuilderFuture = + _liveController.queryLiveList('init'); + }); + }, ); } } else { - // 缓存数据 - if (_liveController.liveList.length > 1) { - return contentGrid( - _liveController, _liveController.liveList); - } - // 骨架屏 - else { - return contentGrid(_liveController, []); - } + return contentGrid(_liveController, []); } }, ), ), - LoadingMore(ctr: _liveController) ], ), ), diff --git a/lib/pages/rcmd/view.dart b/lib/pages/rcmd/view.dart index 42b66364..d732f370 100644 --- a/lib/pages/rcmd/view.dart +++ b/lib/pages/rcmd/view.dart @@ -44,7 +44,7 @@ class _RcmdPageState extends State if (scrollController.position.pixels >= scrollController.position.maxScrollExtent - 200) { EasyThrottle.throttle( - 'my-throttler', const Duration(milliseconds: 500), () { + 'my-throttler', const Duration(milliseconds: 200), () { _rcmdController.isLoadingMore = true; _rcmdController.onLoad(); }); @@ -113,6 +113,7 @@ class _RcmdPageState extends State errMsg: data['msg'], fn: () { setState(() { + _rcmdController.isLoadingMore = true; _futureBuilderFuture = _rcmdController.queryRcmdFeed('init'); }); @@ -125,7 +126,6 @@ class _RcmdPageState extends State }, ), ), - LoadingMore(ctr: _rcmdController), ], ), ), @@ -188,33 +188,3 @@ class _RcmdPageState extends State ); } } - -class LoadingMore extends StatelessWidget { - final dynamic ctr; - const LoadingMore({super.key, this.ctr}); - - @override - Widget build(BuildContext context) { - return SliverToBoxAdapter( - child: Container( - height: MediaQuery.of(context).padding.bottom + 80, - padding: EdgeInsets.only(bottom: MediaQuery.of(context).padding.bottom), - child: GestureDetector( - onTap: () { - if (ctr != null) { - ctr!.isLoadingMore = true; - ctr!.onLoad(); - } - }, - child: Center( - child: Text( - '点击加载更多 👇', - style: TextStyle( - color: Theme.of(context).colorScheme.outline, fontSize: 13), - ), - ), - ), - ), - ); - } -} From d258474a5a69b75542ae040830c3cd9b7343b873 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Wed, 7 Feb 2024 22:23:29 +0800 Subject: [PATCH 069/220] =?UTF-8?q?mod:=20=E7=9B=B4=E6=92=AD=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=86=85=E5=AE=B9=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/images/live/default_bg.webp | Bin 0 -> 16312 bytes lib/http/api.dart | 4 + lib/http/live.dart | 19 +++ lib/main.dart | 2 - lib/models/live/room_info_h5.dart | 130 +++++++++++++++++++ lib/pages/live_room/controller.dart | 19 ++- lib/pages/live_room/view.dart | 193 +++++++++++++++------------- lib/plugin/pl_player/view.dart | 3 +- pubspec.yaml | 1 + 9 files changed, 279 insertions(+), 92 deletions(-) create mode 100644 assets/images/live/default_bg.webp create mode 100644 lib/models/live/room_info_h5.dart diff --git a/assets/images/live/default_bg.webp b/assets/images/live/default_bg.webp new file mode 100644 index 0000000000000000000000000000000000000000..a58259dea48887982df1f1be955cf73c489bf232 GIT binary patch literal 16312 zcmY+qb3mov7d3vfZJU#uCfjbZZM(_lWZQO4HYeM*t*MFcZ9d=khrgccp68r>Hr8Hi z-xMXq#A^8g05wq|1yuzO;zHohwQ*osAhagnK`?xA5;-zOh4fXq^X8njs4y0`ud?xB zsQ_{49xgtO=6v6+0`~k%u)JR?e3#-=Li`V<5W>|+Jo4(ua3?vT&lqhf=_am=$)Tek zJ0D3=uB^USA0TJo(8$CB{-EH{xP;Cpb0uvPe`jzShf- zbS{3M*o$_CH)^?P<<=73f{BI!DLOLbYXx|ezzI-!$6Oi z7~cknab|lydSH6%WOKOS_E4wyOPkwIcc#49>}_xBnIJ)bu*X+CY&@yCYL=#}UD+vH z1)@qH<-V7S%hb{}XR?Ujci(TF%dvF?nVorZYUK7S^5>f9u~p~68|4Pw~q zN@I&{a&zA2O$d&0OLX1{o(8Zjl+%JxBsbpZ$1)-k2%JY2dYrhi8wZ348q^1g&8A$z ziIF7Rl_KA)x+QUv?%6r&o4sL@+&UvSh~yb~%rGc;xt7b?Cvg1r^cT(ZfNg&FYjS*N zxm?>5RF~-Rxv~NIzk3r-1Ef%@&Cy4aB0WqZXGld{t8t{_#@5Snzt)Kok9=Av!2Z^y zMjnAzs12@^O)jr!Swja-Qk$OdUae$?zssjlbeV#VoT5`1&*h3_f~ZevH|<-cv1nI2 z_uWP@u(lTVD(efPaCuhBvKWsfIF(w8gcC%U|6!kZMvkL#0g3cS?T>P84P+;` zDYX02pQ7$zKjVeh@Mq-71`LJcJRFtccl^();ob9Bb$effv}g#2K@cA);Rl&)cbcjK z((UT+bIx9{A&B#z!EPrqXtBG?4uDm}={sKVvQ0murXl&Dlxbv9Mn~&JtDMTzrR5$m z9!<@JdlDjB&x5EYH0#bY=p!qADNI|*j*j#iR`e`9W%eY-i08xe^sZ?P!M9*pv zp=9Eq04g<_=Cn%~&=$lOJ-`YTaOdhC?c^#F(V2B+g;wH%x#V#%o~|x~xqsp-N@@MI zdnw%>9gRUTin0!a5C@pfxe6li(ywa@azl;pE_o-xO(kZ)n`$3v1p4b!&fS_xqiIBd z!?>7$>ttaZJq*cD3%n#BG`qYx9}c3`6yOegmPGpqC8!j%L|iZKp+2gF{sO6}9-giX zSUu~JPlp(LV02?v0&C+mJrlpVbsh)m!ptmjwr=*q< zL?Y1+aKn<~FJFxK6m-gDF4Fvoi1{b`Z-zm2U-{^ezlxNWO2~MEC=H7nm7#KwM}TSf z$)9GE_FI;WU{sE*w&|oBD^t+ZN;q)cjGm&P*in?fP*j#Wmm#Ic)OcZk@ zFKL)th5S}s#YY){y~ovsd`cxskf*9?Us8`G`?cfTE+GMz({_W~6dPKBk*#@4@WI5G zc2g{y@~v2I`@4+=`r~>Ui!T$E(aRU_FvFK+%(Gt_-XooGUS|?gkIv2+9rBY6@_4sc zTaIRgAT_XTo$hcAUAW-2c|yUuzXJv%u_MTEYu?{1a%&)$rZLmRQ33mxW0y`*ye{?j z#}Gzk0UE&lf$2=CkYxEs-gh%$b+tBYMF1%@1CCOwL;dF*%v_mA_Y|s~;co*>*bHB7 zXWhqZasn2Mx}eSm&G{X|ec-$9>Znh|f|hLXEG%|Wrp6YSg`a4JuH!rAVTHZ6DVVv6 z4^=`BTqu(!M1a1F`VEb%;Pn(XK>31@=f_6laYGvb}s|(VgIVGOV{^k#`CIhp*Ra%rjihAKLi5*RO|7 zC?Axh{{vnZ`14P%#Kd<{E9416T9?Aj~1wlt>Q65OQ`y#Yjo@1;e6K zD-^OTisgyN0DXNk(QdC^tc0xh<=+RuBtdN45&HaD5yiMQ!OpWaPS7ZE(&`gd9isp9 zE8^7uETyAbx!D^_;wqMcm19z`GaUR0Jp1#}{w>kon@u8)R3wb@ZfMSD4!_13+??k) zV@THg<{HWMKZmgv%N{KIi=zb$#_QJ^KnDb4Q4{C_t;-W$5)IUEGyOai=sht`^k^!% zc3?=4g(J6QrBs0K!iZkOBKWedIaLw4J!GYF;$6$2KzsMHxEn1}y$=6{h^m-}3tp#w<~1-yV9Mj6Q|<2YMnL*&lfss~L;kA)PnN*c zKp~j#hL_X&11_nxdj4`6v$d9{7uV`_X`kkBIiEqyWGCBxF7KS4jy!xk9Hqfojm6rk zk1vxd{sa!0G*$w>wluD1c$9Q63XYqdt!8k3w`vZkwCb4+JUDG${7ulutF3OI_nb$H zODSYxYAmSQ{l_L@#M9IdXY@g4eu2b&e)pDEkdCuW;Pr^+m#G|nI8 zB9h${B-k@WP?` z^E9GRalVFA9f_Q@wEbYxhw4@1g!K(3fmrZYr0kmo?oJa9MCai~MRM_FS#hYaoVAUs zt)Z_)(1aKqTz_ik450vsAb3w56&?awZ}?Q%`H-JosiA@Z6CRF_U{(*-EG<|!S7}$4 zy|gUGxc)bMP#KOC?0Sc!gz-~?4-(Px)w(Nz`@t43J69U8WVk|k7-Jkn=I*PkD9I88+gelVjv_!w4whhM?kE(v%25Cf>afJ;zIt!+T*naI;j64ExU!9E%?$*7Y$(% z5DO4|Hm|&MVTr-4Eoxf+essQk7~c@FYC8kLLV#gDTy3SlkHMbq`{Ks}V#{!+z2O}j zu)Qo0LSkU5q-@ElAYm93yX`HH-tTDg@u;^Ry>Qa{dW_zgmN%aHOH zuF;W6pD=vw2fxylww+J%ad4I8Pw)?mQ)WLi`#An0g<|k+`vb-C2Xc%5i)DIgxEb%< zDph+Y5(Sb0gFm?qVMv$+L(!E&*Ln5v1oj{mXxfClFjc{1Cq7DNlu@yUCsDO}d+6?a$C zNBMng5@+A)$Mj({y8`{Ep zNIK^_3Vs8eF#;7KdlGKtG>2S3yMw=TvO_r>CY{FNRE*-{kNA2f``7YFhXdD04wpJE zJIt)p)8=i^g4PE_Ns9K(M54A`P}zCLVy>gzza5L%#7R9?47f0-NPGNbigeDUJJG#L zK&VbAbvjZVn~o*f;QES(lQTw#2CGxvWhU%3dKN(K0wQ({O|Z0iakHh3DCcQ}9=hVP z3)0mQaZMS`;93LZkV^z;CFT&TiGyeYl{a_6Fq4^;dQGr5iaKLae@eq80F-{HW+q+H zHh8xbiD+|J_=36R9u~d-y{E8Zsx@yB1)j_9IplO&-&c*=9E^xApCckyOST5;Pbe5S z5Wb5l+3qWcA#c|Wn*`m-RFQ%7k3Q7biGn8EswCWwJh0ls7kz&o+lM5HJk6)S9Zjqw zdN+vd)^&VX2Dq-j8*@Hrtuq#Vb4dPV3{&5NFpCN=+=A;xl{iQPP$`zAtvYof^v}eG z?^E1&gdF;pHf&t)zu9<4HUnD(SExweF;+bDwZr|kb z<8vM%)oTD~EHBJ_=6E-yWDw|x!5%WwKVG;%5028%(eag3up!Qb31X|ln1Tm-3nMep zPb)ywn1&OcdqgDy!Vv4yz^yo2!fOgjd^Z|9^^0>M?=E~%s@BqRF2qb0Q45&5t^!<# zVrv9Yqzh>*Mc!%!s`IHSN5Hjup~FdDgk`42ZLN25ha@F1iyW+yQwhPBicTATyOoYL z_A@Kkx*bqT6P#rDNtZo^u!5f#H4hNHA2XQ@l4Ga}`SxH8K5}Q+5Kw1k6nd zCwEx_xgBU(T?s;bEuraH1aL!^9eqt|XYAwrNC=NTi0_G0I^#9-auswBA$}m@Y(WI% z7Ge09XPV}bg2CSF8OLi;T-I37oi?xS#r@=?ylp_5vM=12&D75ikSmas>{NoOXe1W; zO>KeFHAXz^N?H)*O*G7dTvDJx)PPx$Gr-?>Ws8VS@(ZFplIarCuEsfni{44nQMISC zfD}OYWYT3n@EG0MA6AA|X`GV;92$muL3 z9edPmk;c2(62osIH6i8WzefHJ*R8IlbsCndnuB7z*8nnX>wUhL43R>0vtwL!QlPtqWX_lv5HM{jYJQ9D$ zx*&b*tkV}iFlJJprfGmeD2nPZNWwUQg?9Lq=(}Tipb+EQC-2CO$3j7ruvjdg)yY}8 z8JEZMz=S378&wH_9N@z|n{0#UC(n@NPVz&T@@v%y!$j}>xt<8USr!Y{{;TH{?p|H>8Co*iU;`=Ca#QaMl-hF0a^^N!v-YcI}4rBjIogfh7-cI*&^c{P?L-}oNw#Ce_{9#{EtL}-jVoQ^pW z3P2&rocTGbfEeJbLtq#noy5j_6)>TD?h8Hx%9-FoINJU{L5k{YkGFTvdqA!+uiQmP zdslkMc84o>BsEpdMWgJi%}ZvyHzGgU=_www>iVc|`IP{0O7jd)simR8;RJ>R+I4MTHjI8sY5@0L; zJUf;FC<@E`ZlFfOs-wJ9gSRTe+^&4ydc|gp&@NTljsLTb`rm3vfy`UxgY>;$shMd* z)jgJJ*WPz(fODc2j88#`sY=Nwb)6?%WwM#G%t*-DbW^Kg^`&;C>&>cVg6vq)t2MuyOch~R}$Ak>2;#^OBGolzn7QU{v2q2&NY2oK?EN#*nfGiB*;8} zda8Bnv++?%&x)f_MtL^h-rc0Cc@ZHG3b@|0JM8N))NxT|RAoVx^-eKu?stU1{By1n z+NI3GrB-ru02(B!^L97*3QybYL`fKwd}#XbTveej)=xL*tC;dr{1E2+vdBdViS#(>=vHQ@El$ZYO=S+P`yW!>j|U=_r*Q2P#| zl_dx}4akcbC&|6fzSo6y961UJ&d#98c(!~oaPeRV^0j|E4^~`eEBOHkp6xWt4~dxm7N?!iVyj`j~@$dP&vfGH|dTg$`L+S z3b*qa3fiZCvub2w5fuGyt`x76QIRkYs4HU%a}qF6;3VR+`(Eh)+2oq2B9N5-R~wIY z1}<+SSX|V!*GhK11LXmE8$U<<#!nhie;CPsW`j(cu=uC%1{ofP;eqK2BkyfM#-}=c1C!+7GAB;tCmK z|3#_Qe6`iJsv0ic7kq0N)@|aDM)8+TViAN>o*j#YRvca5q$f-zy>Ziwdia$9XGtC6 z2T+&?GzwO&gSp|qCe6HzH2{U>AvymF`sI_43zzNoP4;uR0F32q;_p3I!#RL@tr#A-lme8VOOr+k2nEdiF?}QU zM_TP8e`Jo%)cOpN_mP)0YB-7{)Yd(zH)i)>03Wq?v@@^8Wk-7Vj+){4+`S^`L)kf zSWNBDf#E|dkYU$vSd1eg5V1pP17Q?I6pPHe6_{W!dxp62U}z{tS!UmI+J$wW5q}zk zZfth-`T&clv|9JMgN_{YsJ@k9+|2`B!r18J@9g#!Qn;%t;QF*cpJA{BV#=e$Lv+~2 zs1{{IB!bPJ*E{a}urylxQu-ZL`G_|jl72c6K~8bnMxT4FN*%jvRff@YJuaC&Amrqg zVSRL!A;C?E_l70q1hXtU*g7%xbjL!=g9s&AFO*c}?x`T+jw8Pd?}GI*x-8GW|0l}g z^X+xTvK@(JLi+&Y*8+m`p|sUB;i6k~%7Xm&d6+Vg^?|Av$@Ciyw4m2`!_r6|Ohn_K zRaW%?wwMVrtZs_kL z2{@HR4X4kSH|{F#Q$OM8AH?zbPuPFy147Bc$$jyNr}jHd5Jdq*k<`j_p3Y_o_g$BG z_TTL#cA=q{{j|nF1!SvkfVfCQ%4fmX#$}YqrIRiHhA$yF8Z8ZPC0-=mOihV-`iZ_zb12AlLFhL-Y_{9jMxS_+0GXeyD* z$n&w0E2C~*_5*M!od25&8`iNEO!icH=c#r({ z74f9(f0|MxoSLK(9#hzSUsS944@mRZSe?qi?7o2sU9;<1Lm%tp3^?h21Btt0pYWrJ zRHw&}qsyvUiO(eeSsnlm0XkJ8m#-Onoq8;@Qqf+BLuu%5jxwoE6~0=l+i52-)O<&T z4qfqgBk~zB%-Ihe?r^6!(pTSl?{juF82LHMYa2M3>)OQ->5=OCk~+M0Ngq-H_C0g= z2?eAw?I38kd4QCLrAz~C8I;%Il>_kpqVRET-SF+GQ-J;l3n!i!2`#$a{SJLrBK+?W ztY=zPJ){#aymb|&IJrK9P{DO^1tW1%&8Bw9y2>V@a&Q|=@3<)29jY8jJd-)cSf>gI)y6SVPsi&k%}v!{zTEdl^}tM4kR)J zUNh3i+Iu9z*X7W7|Cio6*+LeYgg9IDL$*Q#?_-Ky8I$4HEEs4v!`QbE{!V<`7*Rlc z>}A%9&Ezxv(p~5Bw|;DIdF~M;{T0>>pW3Ns-jiaH0( zy85DD@*C;yT#HQ@$+W(xuL8d}tAkX^goXg59XJ^NZ3U<`vC7xcE}`$WcsPg^WS#hS zI=;|oZ#?RDXnJLq>mB8N$ie=;Dq8}etz~f?_e=2?=dF%k7IHZhp#I}geQ)IX@vn7Xlm?}+kGfd@e9>{29q5pj3VClBz+{X@c;+VsZ zb$OQaM@3s?cx>5JF%XQBdt*T2{-z9>l`z}*9k+T3Miy#_Fe#x_*jJ7W4wwu4c zg{s!%FR!-S^s;l$sSrGr6q%5Y^NLjf7aos?fFKn*Wt#p$-<@2Y0x{t+h?6fy;N|`f zc-!-so4|TUyhnWZD~elgG)=@pX-&fLMF#SIh&1U=^D#L1F5%B@m#cHXokI4!K;aA3d8IBj)>20~2jZtHshb!P~sSpcy7^ind&pJ0l^7Ev~4O2D~4 z`>TEMPe&n1(}Ae8WP(A$_bj*X)Zdx2H_e+9hNTXOW2h}a>b z_xCd@U-TG68==Ku0uyyO!uHo(jKwXW$TtIBZxlh6zK?c8{^IVwC$(_xOLhB3I)z>r zL9i<;O)jHEi)v=5mHg#6@l1`(;QqE@p2~h;OKQGIAXPL|bEoU{am&b#G(SX^KyVOAU33F1 zy7_`I>OVoze=!43_6b{4GQ8b;E|Gl)YWjuLm3oveN3;?QQV;2quuo?Z4A$}oYEW?) z8bKrFF-@V4Qs%+*i$#r4i@gKg_@7UizQgK$!+)~}Tj`ar(YoNlLWN5_$R6S$p)BA0 z3)kb=kaN@5PG%LfM#x5cRW~V<|1oeULNo_Lvfp}gr2_uuxSI|$gW32C{@7d+>*c`Q zdK*A=o^-H7J#Ng~dcKwXha7x|KS?bBmn=M3RNoKPIHOIgf#D!j_9~l8S~dzM*EAOqh0dU6*$c%aRl?@G22JF7?01N1e`PbHjBi7I^U%Jl ze2H_4CCTZBsOaqq&=l=nun@a)I4$!Di!)G($G98 zVyL-U&_e)}qeIa#Gk@;_R^-SbgbO2&YOWg`rvv~%$OP60a1=nJ{Hg#zoCrhrgDIC;vMp(lC%M23P;Q7jH^rK-qQ>D^C&x;YJULo6A z))^R5DgcVZJ}lVF>PKZ~hEP!P1(T$H*j8o7+$>9w%xlOwV3%TCsZpcwIbdtyn@!sg z(_CRhoGi`#l=Z><7J;)L06^E+@qoGB;Zl3T(pf7jL+@8O_4?%@7hn|9hv-ky3mg7H zX8Y!dtrN{N2|YZg3;;k(hxMhB4g~I+TcH_;TuW1dEp)nD_hf?V8%aMj37f&B_yG`q z1MoqxpZeT2V(3DHH;mZo%o(;e^l?}39TjApDjkZp~x+Bc-v)_ddvwLsDaLw zj##OzG!p(I`y)6QtYD|YzyVti6ek{k+k6h9kb;H_3tkv)mE+23+43ueMU`zJ6cg1Y zG2(A|TTaE8?3j-G73BLnw{`vs9*%ukBp>~?6yXu5QIQ-QN4dGIlxD9w07RRL#kPQH z8T`f*R+8Q#e?DRy0F~a!Q>hh2IS6fWbmQl4 z!ot>uAYVA-cZX*l(3tQCbp-C3Z?Of}L4b2uma}w4pB%0S69C5xF3{g{{g;u5;JXwN zhLT+jV{=RD(!G;Mvn}XPlV3J)-syuq!U#unA75_2pEyMu(*XdI_$-J?7qmH=0z$sG zho{E4!EI?etL9K_-8-`+*+~(o?znY}N5S@ne3r@Tu>h*UVlwibInrgWJgB40M~sqt z>qO4KGncVY>ft>Jyr{exy^>ur#`zD5l++=>{EI}jcKCV8E>e2dp$W(u7{t%dGK+)_ zOvOV|+S^ZP;I}_%Hj17hSeSk|K!XMVxGmIHmF^gwm$Gj%Nmw_9?-l?$sRs>I!59dg zjjVvomM&RuR&x3a7m-uXc_mZXGb@-4eB$H)492eY)$b=Qte44zh4|VS^mI@X-LvV@ zdQsg__l3WHUu{4!l`+Wer%GC03=PHHao38X`W zIPvfBTR-I`Kf_U$4McpWW{7a5FaJ_(_Klg`z+=~S-^e}ENH3SH%sYj)6@QZ7Tgw$ zo3Xfj4?qkOd+B*Bph9h<0U!nb9X(X>56PVJQ4mGiJMVFrq^_GEh=Pz1)+8(zxT5=( z;%{{jc1hAro(cfyp zk3|E{$+Y6hz6$6rfacO`ra{VpJt!qUDQUZ%;??P}2`i0oBQ85c+`T$8Gsz#T`K+WB zJSi@4Kuq9FH(RnK2DW`E?EEh7iD5ue)d2mby^;6c1R1E5Og6a6ooeOc`uHGF*~TQj zoc^dL#g{FVfi>dXaxJFxhYGOXknvc9Zb`18);ctz z9FFPucJ!{C3;rAV_;7$=3`lbo1!?B|kZwA02@d>u(t|&2itBTwu+$04km_rh)vC}n zuscFramnm2q@@l;auw*mFST-FAJ{wNjSSu1I>w6f=kWtH$ddypOJUY|C6Xtb7%xg$ zZY|3qn@hxL1XweTd2NOHj zf%m;Im&$VZT1f#y!a_Vg?q?KpH5Hd3rV~>1(%~Sr97&eVjn30jM88~`72k$WRNbFe zdg{+v98l-pN?HY&zLv}sQ^ErO2}tjdhZO(Hv+ugVhYyTnE50k!#UR#0bKaq~kbwyFLGok#7k z+Us4T8*jP0pcbu~HvW6eDACcdE@}^YaKH)UmP0UBNqLoEPjV58A#I;GppWo$(&sY7 zKlSB9Px{6JB9_$<27sz8kbEzIbUh>LVF$H4=yMv0$fLS&N})n;7uG7cV1zNZ5|`+k;l)i`V`k`v2Xpz_f*eE{JR zdGY~*7gyk;hQ3Z&NZwmfBr%S?0A1_z*$}Ee=!dz3+LWiA%7r5Aq~yoJ;WR@Nx$o^# zNK$J6fa`3FW3t0Iatju@inRr_?MTq5otgkCS?$k8?@Z#lCxrMY_{$W1qT&W=R^N&R z`}Z`OFS)H#Az#&JNec1cUYRXTkMA&R>1k#%JxiXl$iuMhnj*!djR)^Fh)ZsjeZ(Gv zMrkQ3T(pV7q*gu}+aDpg(lH%-6+>r*)p4q_Et!vg#1YTwqg9%r3><-Yjd}=UKRHY2 zgU!}%^Q+dMb(qxKE*#ml` zYJFh;v3E7F(y6BMvRnqQcXpDm43BeTo zcK0BVLTeQzUf!Eeh06_~3(gzfQU)R*j)4M#uFy^LBp{Rssc`$V0f&y%MnAq&?O`o$ z$ON3nO=xB`FB$jvH&_cG@Av2O^LU9tT?j7@VB^hMTKbkk+-bvn4=U=x*bLS2d1%$A z%*Y^|GR0bWEwB*mQ&CnJHDEr+1NjRR61L97cY;~;RMhq%)m%SQ%*!H{dlE!w?!NOU^9bpnhu#9b zO}N6T{FI@h1`LU9(QBX8;4hy)wszuISXKt9j_y0`UWin;`Jk^5H6wYIq$J#MSV2f zs3~gPR12Hw-0raVW#L;JzVE0VyA1XL z7cxu*wWq?kP>=VwjJR2aEJXm9Uzmp^Zmx3V`=d3(()wlC)8T&ldn_kBJdAGwZ z(7V%-az&d1bagHpIYY{QXvL>y2k+?pAZ=Wvr6bq;b0)!HxAK~TGm!O14K+^>XRCfv zY(KqE`0#4qUyfZT6J4kv*4VZr!17e>N;h8lIm0p;^;zm^q#d0(0kG4(xE1_|U|{FE zo-}+PRoT8kCl((~Jt`fJ>crqm;<9_u9Mi*w^^7*j{4s$zT5VA(fa2FOoZv0^N;`um zgtg0k9 zz9D5d69_iPZ3Vp&_t)QNc)nGoR$G6`6DU|jigjvWp6Ae}cx~9QmM&3grY)piGPVNV zV&fkIuUrCWjr7wJ1N$lkH`qg}gSDwKeQdAYA00-`c)J?5VtDJI04Ntjlosj^-(MOF z*lN<4zwU}_0&ox{c(3hG)>ubUp|)~IR~_q+9dh=KXxVIQ>SxdVy&=`25E(sGy=^YB z?*)iMCMEeMp6i+C$`drLoiCvGTL_j<-%tjXICH;%lSTGvRl>Cv55CCnUZu^f3XfB6 z_4TJJy%g5%ChGg<{ld5}fqV!tv0eM^x>Ea8;@y*<8>9vumP(xq<9#@%5)okY#a6@l z17`qcxrkNvU}+=&1-s?O7*Q{a+`p;cgHX;@R(=k1R#@Z;l zO*9h}w7Yo-Y5R|XZGQp*b_F9^(=%^nW*Mp>b9*ljJ>0s}6C%U{{Su}fIfoTjw}m9} zwrhEZqY}&Y05|Lp>Ls?Y)VhOKmbpcR(JyO)1*S<^x8lzqvh)d%etB3{XUDXuRnyjRf5H;y$O#GTujj7gEa&6)BN%LB&M?lWD73TYxNG(_w?R;79STWbeI>Q1E7 zn=zEcfc-ZEWU4qJKVGd6#|O@~CvM?Q^D_KfMq^t?6A5320$)>il@kU~5`Gz&#=5(6 zR4aCv7LdjA>WPp^aW^a)GVe}0MY?NHI9>L+(P^o}?n~F7GPNn9;vhesNplTZ%WFun z%w$UehG-XBW&Q1$rk!>je|6e2k;w3`PQBl+O_P==(WIbsA8D|8gy@x=R=+IY{kLVjzSgahpsm{4}X1%3Bur@~=XwF*fo#o<;flHL3!)IIi zh-c5i23uxJ@-}HaCSj9z0}zAALme4gwnWPhM%ZX!;Xjyc(2RJYUBs5~)HxaQEOIz;ter z7Kk#wy#(9cKvk3hDOn;|fY@me#A{fdI*EG^^#<;w*@1fq-LNPC;fRm;*n$Z)#wyd; z>^|kxyy%@Erx9w0ZFbOmT+`+_Gj-k0iKLI6MFb}*4u!81Ra$UDlQ8( zt2&51aU?u<%?rF^8)}QAitxou@7^hu$jnkbBzi5tNJA(GWYcrI&ArY%QzgtD9b!Gs zsVvN^Hz;eiY7Jmo3!l_gB}*3R2CLAW&D2&?(d7mnWhCfA3hxIxh_$1f5;hU@%m09Y zpEuc!rYtr+^A9P(wVfv4Q6hpz$s=Z2KRZlx0HZ=`XZGfNy5Dq!ds(p^R}3iDkfo0( z_HTfI{zXXYIVg9o!XNDw07DH}xPxh{CjU4<>Hr&F?59{;gxF6n=`yBF#mYKmmizl^ zdt@Ini$YPXQr0<9l8pSb5=>M}xo znHfOIgZUt8@Yv%Q~ZfCr2yjYVsQ395u2{ylY~6K}0~nCe)e& zINMYRO4U2^mDW%8ZJWE}OsLCaEea3c3A<49WcHDeQ&1wu=1o!r0D#>dzg1c?s$?0l za{ooGb^y4?FTAFQd4{HD@OsXLY;{Ns6A|D{3@jmzdtqpx;CFk>SXr9U@AADK zu|bM+qWB^`o^wmEC{qCdq)aJRyXXEW+W7R}lICw!j4=M^zst9})%a$W!;B3QwhA1K zUlFKufA|4V-C266_Ug#k%Vjf+5AJ62>@Suj^vDi@hZ#VVWTkJPuv?-BxY5jvzBGJH z0LOrI5?m-kyZ8n!b8EhwT5WA9-oNB0zE-G3P>+3|VX=!^450;>K`Pbadzf9&;7%rKvu&v^c~(@+!}szWW)q< z^2{?sP63oTS?tYai(*;;vxypAld))#jcR!FOZ->DbCZu>D>u5h0x@~Kydogg&ok2$ zr1Bb!=CP3V!rW#8kon2`1a%SeGgB)L$mHZf;dJLmVpQYBa?^_2uhmF^&AnRr%Y7fU zvMEP3KN8iLf&-6UkphfGb^P-4J9vm6e^)YCkV?cxU|sbOzDVQBq?K*#l^B$9O6$Di zKl31lmmb(5qk%$RswaR*f>3qz$%7CMIzn?d?daHQSSByOaZ^# z?Ha%fXsK&J9(Tq*9L-idE*do#b8wW{Wn_CO5b=+;CC+8_pNTBuR>h~$nA3-(FXt4}LAUe2JHoHqS_}0TWuqGJn>QrMtnr@eT2(sKP%)D3bnu^KxNyA# z-4J+$l3bMBK~rtQ;%}NpKXx+#ypdR@(8BgvQ+a==OpGjdOBqSP%^p{>@#Kl)i|aMy z2eefWM)?F-^h2J4St^uw<$RXCbiqsd;Pi*&soO;<>~ku+LvFF`DBLQjxv?0=*#=Ns zISBm#Am0`O8L?}WU!io&o0>)Z`;0PmTdyJ{o-N;3#{G_mh?8k#3)ol%QhZd+Bj>L? z2}QRfjV8}xV>LBd%HpxaLXUBY%qo@Fs$?juIZbA+g))M%Yt*oGMVq#aDiCtfHK!pG z{g4=B`QxaRrCD&IJ!2~$6gkXHWNG_1t~kdvk0(QE#yCTF#T3g95gV5>E}su4jwW$^ zY{als#utqk*n59_rXyq|&P;kAO8~1@bI|815`ad`K5C=cr)AZZP^8ApEVKn-bPbDbC(?1Z1OVN+ zpwO){%BKB;;cxcFZo1n6qMJG%uveF&g;8E9BrYIbjwciIuybm}*c`b|nr0Hzrq)Nh zWEUz^8c{4G;T!3+C)80dEKMT+qge8sopBKal&E({~LpdA4Ysv`p%^HWN8@p{g_0a+a_ozRYcbS z^R@`s)nTUHm^wp8a&ron7>Ay4wb;sN4kdX json) { + roomInfo = RoomInfo.fromJson(json['room_info']); + anchorInfo = AnchorInfo.fromJson(json['anchor_info']); + isRoomFeed = json['is_room_feed']; + watchedShow = json['watched_show']; + likeInfoV3 = LikeInfoV3.fromJson(json['like_info_v3']); + blockInfo = json['block_info']; + } +} + +class RoomInfo { + RoomInfo({ + this.uid, + this.roomId, + this.title, + this.cover, + this.description, + this.liveStatus, + this.liveStartTime, + this.areaId, + this.areaName, + this.parentAreaId, + this.parentAreaName, + this.online, + this.background, + this.appBackground, + this.liveId, + }); + + int? uid; + int? roomId; + String? title; + String? cover; + String? description; + int? liveStatus; + int? liveStartTime; + int? areaId; + String? areaName; + int? parentAreaId; + String? parentAreaName; + int? online; + String? background; + String? appBackground; + String? liveId; + + RoomInfo.fromJson(Map json) { + uid = json['uid']; + roomId = json['room_id']; + title = json['title']; + cover = json['cover']; + description = json['description']; + liveStatus = json['liveS_satus']; + liveStartTime = json['live_start_time']; + areaId = json['area_id']; + areaName = json['area_name']; + parentAreaId = json['parent_area_id']; + parentAreaName = json['parent_area_name']; + online = json['online']; + background = json['background']; + appBackground = json['app_background']; + liveId = json['live_id']; + } +} + +class AnchorInfo { + AnchorInfo({ + this.baseInfo, + this.relationInfo, + }); + + BaseInfo? baseInfo; + RelationInfo? relationInfo; + + AnchorInfo.fromJson(Map json) { + baseInfo = BaseInfo.fromJson(json['base_info']); + relationInfo = RelationInfo.fromJson(json['relation_info']); + } +} + +class BaseInfo { + BaseInfo({ + this.uname, + this.face, + }); + + String? uname; + String? face; + + BaseInfo.fromJson(Map json) { + uname = json['uname']; + face = json['face']; + } +} + +class RelationInfo { + RelationInfo({this.attention}); + + int? attention; + + RelationInfo.fromJson(Map json) { + attention = json['attention']; + } +} + +class LikeInfoV3 { + LikeInfoV3({this.totalLikes}); + + int? totalLikes; + + LikeInfoV3.fromJson(Map json) { + totalLikes = json['total_likes']; + } +} diff --git a/lib/pages/live_room/controller.dart b/lib/pages/live_room/controller.dart index 2f489fec..56da0a78 100644 --- a/lib/pages/live_room/controller.dart +++ b/lib/pages/live_room/controller.dart @@ -4,6 +4,8 @@ import 'package:pilipala/http/live.dart'; import 'package:pilipala/models/live/room_info.dart'; import 'package:pilipala/plugin/pl_player/index.dart'; +import '../../models/live/room_info_h5.dart'; + class LiveRoomController extends GetxController { String cover = ''; late int roomId; @@ -21,6 +23,7 @@ class LiveRoomController extends GetxController { // controlsStyle: ControlsStyle.live, // enabledButtons: const EnabledButtons(pip: true), // ); + Rx roomInfoH5 = RoomInfoH5Model().obs; @override void onInit() { @@ -37,10 +40,11 @@ class LiveRoomController extends GetxController { } } queryLiveInfo(); + queryLiveInfoH5(); } - playerInit(source) { - plPlayerController.setDataSource( + playerInit(source) async { + await plPlayerController.setDataSource( DataSource( videoSource: source, audioSource: null, @@ -66,7 +70,8 @@ class LiveRoomController extends GetxController { String videoUrl = (item.urlInfo?.first.host)! + item.baseUrl! + item.urlInfo!.first.extra!; - playerInit(videoUrl); + await playerInit(videoUrl); + return res; } } @@ -80,4 +85,12 @@ class LiveRoomController extends GetxController { volumeOff.value = true; } } + + Future queryLiveInfoH5() async { + var res = await LiveHttp.liveRoomInfoH5(roomId: roomId); + if (res['status']) { + roomInfoH5.value = res['data']; + } + return res; + } } diff --git a/lib/pages/live_room/view.dart b/lib/pages/live_room/view.dart index 5ac382e6..f727bfd0 100644 --- a/lib/pages/live_room/view.dart +++ b/lib/pages/live_room/view.dart @@ -19,6 +19,8 @@ class LiveRoomPage extends StatefulWidget { class _LiveRoomPageState extends State { final LiveRoomController _liveRoomController = Get.put(LiveRoomController()); PlPlayerController? plPlayerController; + late Future? _futureBuilder; + late Future? _futureBuilderFuture; bool isShowCover = true; bool isPlay = true; @@ -39,6 +41,8 @@ class _LiveRoomPageState extends State { if (Platform.isAndroid) { floating = Floating(); } + _futureBuilder = _liveRoomController.queryLiveInfoH5(); + _futureBuilderFuture = _liveRoomController.queryLiveInfo(); } @override @@ -52,57 +56,110 @@ class _LiveRoomPageState extends State { @override Widget build(BuildContext context) { + Widget videoPlayerPanel = FutureBuilder( + future: _futureBuilderFuture, + builder: (BuildContext context, AsyncSnapshot snapshot) { + if (snapshot.hasData && snapshot.data['status']) { + return PLVideoPlayer( + controller: plPlayerController!, + bottomControl: BottomControl( + controller: plPlayerController, + liveRoomCtr: _liveRoomController, + floating: floating, + ), + ); + } else { + return const SizedBox(); + } + }, + ); + Widget childWhenDisabled = Scaffold( primary: true, - appBar: PreferredSize( - preferredSize: Size.fromHeight( - MediaQuery.of(context).orientation == Orientation.portrait ? 56 : 0, - ), - child: AppBar( - centerTitle: false, - titleSpacing: 0, - title: _liveRoomController.liveItem != null - ? Row( - children: [ - NetworkImgLayer( - width: 34, - height: 34, - type: 'avatar', - src: _liveRoomController.liveItem.face, - ), - const SizedBox(width: 10), - Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - _liveRoomController.liveItem.uname, - style: const TextStyle(fontSize: 14), - ), - const SizedBox(height: 1), - if (_liveRoomController.liveItem.watchedShow != null) - Text( - _liveRoomController - .liveItem.watchedShow['text_large'] ?? - '', - style: const TextStyle(fontSize: 12)), - ], - ), - ], - ) - : const SizedBox(), - // actions: [ - // SizedBox( - // height: 34, - // child: ElevatedButton(onPressed: () {}, child: const Text('关注')), - // ), - // const SizedBox(width: 12), - // ], - ), - ), - body: Column( + backgroundColor: Colors.black, + body: Stack( children: [ - Stack( + Obx( + () => + _liveRoomController.roomInfoH5.value.roomInfo?.appBackground != + '' + ? Positioned.fill( + child: Opacity( + opacity: 0.8, + child: NetworkImgLayer( + width: Get.width, + height: Get.height, + src: _liveRoomController + .roomInfoH5.value.roomInfo?.appBackground ?? + '', + ), + ), + ) + : Image.asset( + 'assets/images/live/default_bg.webp', + width: Get.width, + height: Get.height, + ), + ), + Column( children: [ + AppBar( + centerTitle: false, + titleSpacing: 0, + backgroundColor: Colors.transparent, + foregroundColor: Colors.white, + toolbarHeight: + MediaQuery.of(context).orientation == Orientation.portrait + ? 56 + : 0, + title: FutureBuilder( + future: _futureBuilder, + builder: (context, snapshot) { + if (snapshot.data == null) { + return const SizedBox(); + } + Map data = snapshot.data as Map; + if (data['status']) { + return Obx( + () => Row( + children: [ + NetworkImgLayer( + width: 34, + height: 34, + type: 'avatar', + src: _liveRoomController + .roomInfoH5.value.anchorInfo!.baseInfo!.face, + ), + const SizedBox(width: 10), + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + _liveRoomController.roomInfoH5.value + .anchorInfo!.baseInfo!.uname!, + style: const TextStyle(fontSize: 14), + ), + const SizedBox(height: 1), + if (_liveRoomController + .roomInfoH5.value.watchedShow != + null) + Text( + _liveRoomController.roomInfoH5.value + .watchedShow!['text_large'] ?? + '', + style: const TextStyle(fontSize: 12), + ), + ], + ), + ], + ), + ); + } else { + return const SizedBox(); + } + }, + ), + ), PopScope( canPop: plPlayerController?.isFullScreen.value != true, onPopInvoked: (bool didPop) { @@ -120,55 +177,19 @@ class _LiveRoomPageState extends State { Orientation.landscape ? Get.size.height : Get.size.width * 9 / 16, - child: plPlayerController!.videoPlayerController != null - ? PLVideoPlayer( - controller: plPlayerController!, - bottomControl: BottomControl( - controller: plPlayerController, - liveRoomCtr: _liveRoomController, - floating: floating, - ), - ) - : const SizedBox(), + child: videoPlayerPanel, ), ), - // if (_liveRoomController.liveItem != null && - // _liveRoomController.liveItem.cover != null) - // Visibility( - // visible: isShowCover, - // child: Positioned( - // top: 0, - // left: 0, - // right: 0, - // child: NetworkImgLayer( - // type: 'emote', - // src: _liveRoomController.liveItem.cover, - // width: Get.size.width, - // height: videoHeight, - // ), - // ), - // ), ], ), ], ), ); - Widget childWhenEnabled = AspectRatio( - aspectRatio: 16 / 9, - child: plPlayerController!.videoPlayerController != null - ? PLVideoPlayer( - controller: plPlayerController!, - bottomControl: BottomControl( - controller: plPlayerController, - liveRoomCtr: _liveRoomController, - ), - ) - : const SizedBox(), - ); if (Platform.isAndroid) { return PiPSwitcher( childWhenDisabled: childWhenDisabled, - childWhenEnabled: childWhenEnabled, + childWhenEnabled: videoPlayerPanel, + floating: floating, ); } else { return childWhenDisabled; diff --git a/lib/plugin/pl_player/view.dart b/lib/plugin/pl_player/view.dart index 3980453b..d073945b 100644 --- a/lib/plugin/pl_player/view.dart +++ b/lib/plugin/pl_player/view.dart @@ -586,6 +586,7 @@ class _PLVideoPlayerState extends State ), /// 进度条 live模式下禁用 + Obx( () { final int value = _.sliderPositionSeconds.value; @@ -609,7 +610,7 @@ class _PLVideoPlayerState extends State } if (_.videoType.value == 'live') { - return nil; + return const SizedBox(); } if (value > max || max <= 0) { return nil; diff --git a/pubspec.yaml b/pubspec.yaml index 16df4ad7..9597eab7 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -188,6 +188,7 @@ flutter: - assets/images/ - assets/images/lv/ - assets/images/logo/ + - assets/images/live/ # An image asset can refer to one or more resolution-specific "variants", see # https://flutter.dev/assets-and-images/#resolution-aware From c39e91073b616626d4b8109443b9d877bc1ba782 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Wed, 7 Feb 2024 22:57:30 +0800 Subject: [PATCH 070/220] =?UTF-8?q?feat:=20=E5=BA=94=E7=94=A8=E5=86=85?= =?UTF-8?q?=E7=BC=93=E5=AD=98=E6=B8=85=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/about/index.dart | 25 ++++++ lib/utils/cache_manage.dart | 154 ++++++++++++++++++++++++++++++++++++ 2 files changed, 179 insertions(+) create mode 100644 lib/utils/cache_manage.dart diff --git a/lib/pages/about/index.dart b/lib/pages/about/index.dart index 5df05d31..0f159ce7 100644 --- a/lib/pages/about/index.dart +++ b/lib/pages/about/index.dart @@ -7,6 +7,7 @@ import 'package:pilipala/http/index.dart'; import 'package:pilipala/models/github/latest.dart'; import 'package:pilipala/utils/utils.dart'; import 'package:url_launcher/url_launcher.dart'; +import '../../utils/cache_manage.dart'; class AboutPage extends StatefulWidget { const AboutPage({super.key}); @@ -17,6 +18,19 @@ class AboutPage extends StatefulWidget { class _AboutPageState extends State { final AboutController _aboutController = Get.put(AboutController()); + String cacheSize = ''; + + @override + void initState() { + super.initState(); + // 读取缓存占用 + getCacheSize(); + } + + Future getCacheSize() async { + final res = await CacheManage().loadApplicationCache(); + setState(() => cacheSize = res); + } @override Widget build(BuildContext context) { @@ -138,6 +152,17 @@ class _AboutPageState extends State { title: const Text('错误日志'), trailing: Icon(Icons.arrow_forward_ios, size: 16, color: outline), ), + ListTile( + onTap: () async { + var cleanStatus = await CacheManage().clearCacheAll(); + if (cleanStatus) { + getCacheSize(); + } + }, + title: const Text('清除缓存'), + subtitle: Text('图片及网络缓存 $cacheSize', style: subTitleStyle), + trailing: Icon(Icons.arrow_forward_ios, size: 16, color: outline), + ), ], ), ), diff --git a/lib/utils/cache_manage.dart b/lib/utils/cache_manage.dart new file mode 100644 index 00000000..e250ab70 --- /dev/null +++ b/lib/utils/cache_manage.dart @@ -0,0 +1,154 @@ +import 'dart:async'; +import 'dart:io'; +import 'package:flutter/material.dart'; +import 'package:path_provider/path_provider.dart'; +import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; + +class CacheManage { + CacheManage._internal(); + + static final CacheManage cacheManage = CacheManage._internal(); + + factory CacheManage() => cacheManage; + + // 获取缓存目录 + Future loadApplicationCache() async { + /// clear all of image in memory + // clearMemoryImageCache(); + /// get ImageCache + // var res = getMemoryImageCache(); + + // 缓存大小 + double cacheSize = 0; + // cached_network_image directory + Directory tempDirectory = await getTemporaryDirectory(); + // get_storage directory + Directory docDirectory = await getApplicationDocumentsDirectory(); + + // 获取缓存大小 + if (tempDirectory.existsSync()) { + double value = await getTotalSizeOfFilesInDir(tempDirectory); + cacheSize += value; + } + + /// 获取缓存大小 dioCache + if (docDirectory.existsSync()) { + double value = 0; + String dioCacheFileName = + '${docDirectory.path}${Platform.pathSeparator}DioCache.db'; + var dioCacheFile = File(dioCacheFileName); + if (dioCacheFile.existsSync()) { + value = await getTotalSizeOfFilesInDir(dioCacheFile); + } + cacheSize += value; + } + + return formatSize(cacheSize); + } + + // 循环计算文件的大小（递归） + Future getTotalSizeOfFilesInDir(final FileSystemEntity file) async { + if (file is File) { + int length = await file.length(); + return double.parse(length.toString()); + } + if (file is Directory) { + final List children = file.listSync(); + double total = 0; + for (final FileSystemEntity child in children) { + total += await getTotalSizeOfFilesInDir(child); + } + return total; + } + return 0; + } + + // 缓存大小格式转换 + String formatSize(double value) { + List unitArr = ['B', 'K', 'M', 'G']; + int index = 0; + while (value > 1024) { + index++; + value = value / 1024; + } + String size = value.toStringAsFixed(2); + return size + unitArr[index]; + } + + // 清除缓存 + Future clearCacheAll() async { + bool cleanStatus = await SmartDialog.show( + useSystem: true, + animationType: SmartAnimationType.centerFade_otherSlide, + builder: (BuildContext context) { + return AlertDialog( + title: const Text('提示'), + content: const Text('该操作将清除图片及网络请求缓存数据，确认清除？'), + actions: [ + TextButton( + onPressed: (() => {SmartDialog.dismiss()}), + child: Text( + '取消', + style: TextStyle(color: Theme.of(context).colorScheme.outline), + ), + ), + TextButton( + onPressed: () async { + SmartDialog.dismiss(); + SmartDialog.showLoading(msg: '正在清除...'); + try { + // 清除缓存 图片缓存 + await clearLibraryCache(); + Timer(const Duration(milliseconds: 500), () { + SmartDialog.dismiss().then((res) { + SmartDialog.showToast('清除完成'); + }); + }); + } catch (err) { + SmartDialog.dismiss(); + SmartDialog.showToast(err.toString()); + } + }, + child: const Text('确认'), + ) + ], + ); + }, + ).then((res) { + return true; + }); + return cleanStatus; + } + + /// 清除 Documents 目录下的 DioCache.db + Future clearApplicationCache() async { + Directory directory = await getApplicationDocumentsDirectory(); + if (directory.existsSync()) { + String dioCacheFileName = + '${directory.path}${Platform.pathSeparator}DioCache.db'; + var dioCacheFile = File(dioCacheFileName); + if (dioCacheFile.existsSync()) { + dioCacheFile.delete(); + } + } + } + + // 清除 Library/Caches 目录及文件缓存 + Future clearLibraryCache() async { + var appDocDir = await getTemporaryDirectory(); + if (appDocDir.existsSync()) { + await appDocDir.delete(recursive: true); + } + } + + /// 递归方式删除目录及文件 + Future deleteDirectory(FileSystemEntity file) async { + if (file is Directory) { + final List children = file.listSync(); + for (final FileSystemEntity child in children) { + await deleteDirectory(child); + } + } + await file.delete(); + } +} From 0d5d33a365a4b103fe886865bc890ce0c9976976 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Thu, 8 Feb 2024 10:29:26 +0800 Subject: [PATCH 071/220] =?UTF-8?q?feat:=20up=E6=8A=95=E7=A8=BF=E6=8E=92?= =?UTF-8?q?=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/member_archive/controller.dart | 14 +++++--- lib/pages/member_archive/view.dart | 44 ++++++------------------ 2 files changed, 21 insertions(+), 37 deletions(-) diff --git a/lib/pages/member_archive/controller.dart b/lib/pages/member_archive/controller.dart index 785cd764..4c41de4c 100644 --- a/lib/pages/member_archive/controller.dart +++ b/lib/pages/member_archive/controller.dart @@ -25,7 +25,7 @@ class MemberArchiveController extends GetxController { // 获取用户投稿 Future getMemberArchive(type) async { - if (type == 'onRefresh') { + if (type == 'init') { pn = 1; } var res = await MemberHttp.memberArchive( @@ -34,7 +34,12 @@ class MemberArchiveController extends GetxController { order: currentOrder['type']!, ); if (res['status']) { - archivesList.addAll(res['data'].list.vlist); + if (type == 'init') { + archivesList.value = res['data'].list.vlist; + } + if (type == 'onLoad') { + archivesList.addAll(res['data'].list.vlist); + } count = res['data'].page['count']; pn += 1; } @@ -42,13 +47,14 @@ class MemberArchiveController extends GetxController { } toggleSort() async { - pn = 1; - int index = orderList.indexOf(currentOrder); + List typeList = orderList.map((e) => e['type']!).toList(); + int index = typeList.indexOf(currentOrder['type']!); if (index == orderList.length - 1) { currentOrder.value = orderList.first; } else { currentOrder.value = orderList[index + 1]; } + getMemberArchive('init'); } // 上拉加载 diff --git a/lib/pages/member_archive/view.dart b/lib/pages/member_archive/view.dart index 5091026e..0b5417b4 100644 --- a/lib/pages/member_archive/view.dart +++ b/lib/pages/member_archive/view.dart @@ -3,6 +3,7 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:pilipala/common/widgets/video_card_h.dart'; import 'package:pilipala/utils/utils.dart'; +import '../../common/constants.dart'; import 'controller.dart'; class MemberArchivePage extends StatefulWidget { @@ -48,39 +49,16 @@ class _MemberArchivePageState extends State { titleSpacing: 0, centerTitle: false, title: Text('他的投稿', style: Theme.of(context).textTheme.titleMedium), - // actions: [ - // Obx( - // () => PopupMenuButton( - // padding: EdgeInsets.zero, - // tooltip: '投稿排序', - // icon: Icon( - // Icons.more_vert_outlined, - // color: Theme.of(context).colorScheme.outline, - // ), - // position: PopupMenuPosition.under, - // onSelected: (String type) {}, - // itemBuilder: (BuildContext context) => >[ - // for (var i in _memberArchivesController.orderList) ...[ - // PopupMenuItem( - // onTap: () {}, - // value: _memberArchivesController.currentOrder['label'], - // child: Row( - // mainAxisSize: MainAxisSize.min, - // children: [ - // Text(i['label']!), - // if (_memberArchivesController.currentOrder['label'] == - // i['label']) ...[ - // const SizedBox(width: 10), - // const Icon(Icons.done, size: 20), - // ], - // ], - // ), - // ), - // ] - // ], - // ), - // ), - // ], + actions: [ + Obx( + () => TextButton.icon( + icon: const Icon(Icons.sort, size: 20), + onPressed: _memberArchivesController.toggleSort, + label: Text(_memberArchivesController.currentOrder['label']!), + ), + ), + const SizedBox(width: 6), + ], ), body: CustomScrollView( controller: _memberArchivesController.scrollController, From fb8b2de115a1ebb84a583500e5e7e0561f74922b Mon Sep 17 00:00:00 2001 From: guozhigq Date: Thu, 8 Feb 2024 21:27:22 +0800 Subject: [PATCH 072/220] =?UTF-8?q?feat:=20up=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/http/api.dart | 3 + lib/http/member.dart | 37 +++++++ lib/pages/follow/view.dart | 42 ++++++++ lib/pages/follow/widgets/follow_item.dart | 2 +- lib/pages/follow_search/controller.dart | 73 +++++++++++++ lib/pages/follow_search/index.dart | 4 + lib/pages/follow_search/view.dart | 121 ++++++++++++++++++++++ lib/router/app_pages.dart | 6 +- 8 files changed, 286 insertions(+), 2 deletions(-) create mode 100644 lib/pages/follow_search/controller.dart create mode 100644 lib/pages/follow_search/index.dart create mode 100644 lib/pages/follow_search/view.dart diff --git a/lib/http/api.dart b/lib/http/api.dart index 532ca341..77694de7 100644 --- a/lib/http/api.dart +++ b/lib/http/api.dart @@ -214,6 +214,9 @@ class Api { // https://api.bilibili.com/x/relation/tags static const String followingsClass = '/x/relation/tags'; + // 搜索follow + static const followSearch = '/x/relation/followings/search'; + // 粉丝 // vmid 用户id pn 页码 ps 每页个数，最大50 order: desc // order_type 排序规则 最近访问传空，最常访问传 attention diff --git a/lib/http/member.dart b/lib/http/member.dart index bf84b6eb..6b6df7fe 100644 --- a/lib/http/member.dart +++ b/lib/http/member.dart @@ -461,4 +461,41 @@ class MemberHttp { }; } } + + // 搜索follow + static Future getfollowSearch({ + required int mid, + required int ps, + required int pn, + required String name, + }) async { + Map data = { + 'vmid': mid, + 'pn': pn, + 'ps': ps, + 'order': 'desc', + 'order_type': 'attention', + 'gaia_source': 'main_web', + 'name': name, + 'web_location': 333.999, + }; + Map params = await WbiSign().makSign(data); + var res = await Request().get(Api.followSearch, data: { + ...data, + 'w_rid': params['w_rid'], + 'wts': params['wts'], + }); + if (res.data['code'] == 0) { + return { + 'status': true, + 'data': FollowDataModel.fromJson(res.data['data']) + }; + } else { + return { + 'status': false, + 'data': [], + 'msg': res.data['message'], + }; + } + } } diff --git a/lib/pages/follow/view.dart b/lib/pages/follow/view.dart index a9fcab4e..9633e7f0 100644 --- a/lib/pages/follow/view.dart +++ b/lib/pages/follow/view.dart @@ -37,6 +37,29 @@ class _FollowPageState extends State { : '${_followController.name}的关注', style: Theme.of(context).textTheme.titleMedium, ), + actions: [ + IconButton( + onPressed: () => Get.toNamed('/followSearch?mid=$mid'), + icon: const Icon(Icons.search_outlined), + ), + PopupMenuButton( + icon: const Icon(Icons.more_vert), + itemBuilder: (BuildContext context) => [ + PopupMenuItem( + onTap: () => Get.toNamed('/blackListPage'), + child: const Row( + mainAxisSize: MainAxisSize.min, + children: [ + Icon(Icons.block, size: 19), + SizedBox(width: 10), + Text('黑名单管理'), + ], + ), + ) + ], + ), + const SizedBox(width: 6), + ], ), body: Obx( () => !_followController.isOwner.value @@ -87,3 +110,22 @@ class _FollowPageState extends State { ); } } + +class _FakeAPI { + static const List _kOptions = [ + 'aardvark', + 'bobcat', + 'chameleon', + ]; + // Searches the options, but injects a fake "network" delay. + static Future> search(String query) async { + await Future.delayed( + const Duration(seconds: 1)); // Fake 1 second delay. + if (query == '') { + return const Iterable.empty(); + } + return _kOptions.where((String option) { + return option.contains(query.toLowerCase()); + }); + } +} diff --git a/lib/pages/follow/widgets/follow_item.dart b/lib/pages/follow/widgets/follow_item.dart index ac9cc01b..d21a89bc 100644 --- a/lib/pages/follow/widgets/follow_item.dart +++ b/lib/pages/follow/widgets/follow_item.dart @@ -42,7 +42,7 @@ class FollowItem extends StatelessWidget { overflow: TextOverflow.ellipsis, ), dense: true, - trailing: ctr!.isOwner.value + trailing: ctr != null && ctr!.isOwner.value ? SizedBox( height: 34, child: TextButton( diff --git a/lib/pages/follow_search/controller.dart b/lib/pages/follow_search/controller.dart new file mode 100644 index 00000000..9fd1590d --- /dev/null +++ b/lib/pages/follow_search/controller.dart @@ -0,0 +1,73 @@ +import 'package:flutter/material.dart'; +import 'package:get/get.dart'; +import 'package:pilipala/http/member.dart'; + +import '../../models/follow/result.dart'; + +class FollowSearchController extends GetxController { + Rx controller = TextEditingController().obs; + final FocusNode searchFocusNode = FocusNode(); + RxString searchKeyWord = ''.obs; + String hintText = '搜索'; + RxString loadingStatus = 'init'.obs; + late int mid = 1; + RxString uname = ''.obs; + int ps = 20; + int pn = 1; + RxList followList = [].obs; + RxInt total = 0.obs; + + @override + void onInit() { + super.onInit(); + mid = int.parse(Get.parameters['mid']!); + } + + // 清空搜索 + void onClear() { + if (searchKeyWord.value.isNotEmpty && controller.value.text != '') { + controller.value.clear(); + searchKeyWord.value = ''; + } else { + Get.back(); + } + } + + void onChange(value) { + searchKeyWord.value = value; + } + + // 提交搜索内容 + void submit() { + loadingStatus.value = 'loading'; + searchFollow(); + } + + Future searchFollow({type = 'init'}) async { + if (controller.value.text == '') { + return {'status': true, 'data': [].obs}; + } + if (type == 'init') { + ps = 1; + } + var res = await MemberHttp.getfollowSearch( + mid: mid, + ps: ps, + pn: pn, + name: controller.value.text, + ); + if (res['status']) { + if (type == 'init') { + followList.value = res['data'].list; + } else { + followList.addAll(res['data'].list); + } + total.value = res['data'].total; + } + return res; + } + + void onLoad() { + searchFollow(type: 'onLoad'); + } +} diff --git a/lib/pages/follow_search/index.dart b/lib/pages/follow_search/index.dart new file mode 100644 index 00000000..805d8c47 --- /dev/null +++ b/lib/pages/follow_search/index.dart @@ -0,0 +1,4 @@ +library follow_search; + +export './controller.dart'; +export './view.dart'; diff --git a/lib/pages/follow_search/view.dart b/lib/pages/follow_search/view.dart new file mode 100644 index 00000000..6be42676 --- /dev/null +++ b/lib/pages/follow_search/view.dart @@ -0,0 +1,121 @@ +import 'package:easy_debounce/easy_throttle.dart'; +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; +import 'package:get/get.dart'; +import 'package:pilipala/common/widgets/http_error.dart'; +import 'package:pilipala/pages/follow_search/index.dart'; + +import '../follow/widgets/follow_item.dart'; + +class FollowSearchPage extends StatefulWidget { + const FollowSearchPage({super.key}); + + @override + State createState() => _FollowSearchPageState(); +} + +class _FollowSearchPageState extends State { + final FollowSearchController _followSearchController = + Get.put(FollowSearchController()); + late Future? _futureBuilder; + final ScrollController scrollController = ScrollController(); + + @override + void initState() { + super.initState(); + _futureBuilder = _followSearchController.searchFollow(); + scrollController.addListener( + () { + if (scrollController.position.pixels >= + scrollController.position.maxScrollExtent - 200) { + EasyThrottle.throttle( + 'my-throttler', const Duration(milliseconds: 500), () { + _followSearchController.onLoad(); + }); + } + }, + ); + } + + void reRequest() { + setState(() { + _futureBuilder = _followSearchController.searchFollow(); + }); + } + + @override + Widget build(BuildContext context) { + return Scaffold( + appBar: AppBar( + titleSpacing: 0, + actions: [ + IconButton( + onPressed: reRequest, + icon: const Icon(CupertinoIcons.search, size: 22), + ), + const SizedBox(width: 6), + ], + title: TextField( + autofocus: true, + focusNode: _followSearchController.searchFocusNode, + controller: _followSearchController.controller.value, + textInputAction: TextInputAction.search, + onChanged: (value) => _followSearchController.onChange(value), + decoration: InputDecoration( + hintText: _followSearchController.hintText, + border: InputBorder.none, + suffixIcon: IconButton( + icon: Icon( + Icons.clear, + size: 22, + color: Theme.of(context).colorScheme.outline, + ), + onPressed: () => _followSearchController.onClear(), + ), + ), + onSubmitted: (String value) => reRequest(), + ), + ), + body: FutureBuilder( + future: _futureBuilder, + builder: (BuildContext context, AsyncSnapshot snapshot) { + if (snapshot.connectionState == ConnectionState.done) { + var data = snapshot.data; + if (data == null) { + return CustomScrollView( + slivers: [ + HttpError(errMsg: snapshot.data['msg'], fn: reRequest) + ], + ); + } + if (data['status']) { + RxList followList = _followSearchController.followList; + return Obx( + () => followList.isNotEmpty + ? ListView.builder( + controller: scrollController, + itemCount: followList.length, + itemBuilder: ((context, index) { + return FollowItem( + item: followList[index], + ); + }), + ) + : CustomScrollView( + slivers: [HttpError(errMsg: '未搜索到结果', fn: reRequest)], + ), + ); + } else { + return CustomScrollView( + slivers: [ + HttpError(errMsg: snapshot.data['msg'], fn: reRequest) + ], + ); + } + } else { + return const SizedBox(); + } + }), + ); + } +} diff --git a/lib/router/app_pages.dart b/lib/router/app_pages.dart index ff506630..45d7cad1 100644 --- a/lib/router/app_pages.dart +++ b/lib/router/app_pages.dart @@ -3,6 +3,7 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:hive/hive.dart'; +import 'package:pilipala/pages/follow_search/view.dart'; import 'package:pilipala/pages/setting/pages/logs.dart'; import '../pages/about/index.dart'; @@ -104,7 +105,8 @@ class Routes { CustomGetPage( name: '/replyReply', page: () => const VideoReplyReplyPanel()), // 推荐设置 - CustomGetPage(name: '/recommendSetting', page: () => const RecommendSetting()), + CustomGetPage( + name: '/recommendSetting', page: () => const RecommendSetting()), // 播放设置 CustomGetPage(name: '/playSetting', page: () => const PlaySetting()), // 外观设置 @@ -156,6 +158,8 @@ class Routes { name: '/memberSeasons', page: () => const MemberSeasonsPage()), // 日志 CustomGetPage(name: '/logs', page: () => const LogsPage()), + // 搜索关注 + CustomGetPage(name: '/followSearch', page: () => const FollowSearchPage()), ]; } From 94f3b7c1e4797fbf04f3ee7124af5e5a50ea2481 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Thu, 8 Feb 2024 21:33:02 +0800 Subject: [PATCH 073/220] =?UTF-8?q?fix:=20minePage=20=E8=B7=AF=E7=94=B1?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/mine/controller.dart | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/pages/mine/controller.dart b/lib/pages/mine/controller.dart index d1e17a83..5ad9e852 100644 --- a/lib/pages/mine/controller.dart +++ b/lib/pages/mine/controller.dart @@ -119,7 +119,7 @@ class MineController extends GetxController { SmartDialog.showToast('账号未登录'); return; } - Get.toNamed('/follow?mid=${userInfo.value.mid}'); + Get.toNamed('/follow?mid=${userInfo.value.mid}', preventDuplicates: false); } pushFans() { @@ -127,7 +127,7 @@ class MineController extends GetxController { SmartDialog.showToast('账号未登录'); return; } - Get.toNamed('/fan?mid=${userInfo.value.mid}'); + Get.toNamed('/fan?mid=${userInfo.value.mid}', preventDuplicates: false); } pushDynamic() { @@ -135,6 +135,7 @@ class MineController extends GetxController { SmartDialog.showToast('账号未登录'); return; } - Get.toNamed('/memberDynamics?mid=${userInfo.value.mid}'); + Get.toNamed('/memberDynamics?mid=${userInfo.value.mid}', + preventDuplicates: false); } } From 10b928474bfc96ccc32fd33d0a6b3b1ad5c1eea6 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Thu, 8 Feb 2024 22:46:39 +0800 Subject: [PATCH 074/220] mod --- lib/pages/live/widgets/live_item.dart | 36 ++++++++++++------ lib/pages/live_room/view.dart | 55 +++++++++++++++++---------- 2 files changed, 59 insertions(+), 32 deletions(-) diff --git a/lib/pages/live/widgets/live_item.dart b/lib/pages/live/widgets/live_item.dart index 8fa797fb..9218d4fb 100644 --- a/lib/pages/live/widgets/live_item.dart +++ b/lib/pages/live/widgets/live_item.dart @@ -184,18 +184,32 @@ class VideoStat extends StatelessWidget { tileMode: TileMode.mirror, ), ), - child: RichText( - maxLines: 1, - textAlign: TextAlign.justify, - softWrap: false, - text: TextSpan( - style: const TextStyle(fontSize: 11, color: Colors.white), - children: [ - TextSpan(text: liveItem!.areaName!), - TextSpan(text: liveItem!.watchedShow!['text_small']), - ], - ), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Text( + liveItem!.areaName!, + style: const TextStyle(fontSize: 11, color: Colors.white), + ), + Text( + liveItem!.watchedShow!['text_small'], + style: const TextStyle(fontSize: 11, color: Colors.white), + ), + ], ), + + // child: RichText( + // maxLines: 1, + // textAlign: TextAlign.justify, + // softWrap: false, + // text: TextSpan( + // style: const TextStyle(fontSize: 11, color: Colors.white), + // children: [ + // TextSpan(text: liveItem!.areaName!), + // TextSpan(text: liveItem!.watchedShow!['text_small']), + // ], + // ), + // ), ); } } diff --git a/lib/pages/live_room/view.dart b/lib/pages/live_room/view.dart index f727bfd0..20dfe403 100644 --- a/lib/pages/live_room/view.dart +++ b/lib/pages/live_room/view.dart @@ -79,27 +79,40 @@ class _LiveRoomPageState extends State { backgroundColor: Colors.black, body: Stack( children: [ - Obx( - () => - _liveRoomController.roomInfoH5.value.roomInfo?.appBackground != - '' - ? Positioned.fill( - child: Opacity( - opacity: 0.8, - child: NetworkImgLayer( - width: Get.width, - height: Get.height, - src: _liveRoomController - .roomInfoH5.value.roomInfo?.appBackground ?? - '', - ), - ), - ) - : Image.asset( - 'assets/images/live/default_bg.webp', - width: Get.width, - height: Get.height, - ), + // Obx( + // () => Positioned.fill( + // child: Opacity( + // opacity: 0.8, + // child: _liveRoomController + // .roomInfoH5.value.roomInfo?.appBackground != + // '' && + // _liveRoomController + // .roomInfoH5.value.roomInfo?.appBackground != + // null + // ? NetworkImgLayer( + // width: Get.width, + // height: Get.height, + // src: _liveRoomController + // .roomInfoH5.value.roomInfo?.appBackground ?? + // '', + // ) + // : Image.asset( + // 'assets/images/live/default_bg.webp', + // width: Get.width, + // height: Get.height, + // ), + // ), + // ), + // ), + Positioned.fill( + child: Opacity( + opacity: 0.8, + child: Image.asset( + 'assets/images/live/default_bg.webp', + width: Get.width, + height: Get.height, + ), + ), ), Column( children: [ From d0f036ec35a20f30b09b87d89cec0d813081c368 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Fri, 9 Feb 2024 09:32:28 +0800 Subject: [PATCH 075/220] =?UTF-8?q?fix:=20=E8=AF=84=E8=AE=BA=E5=9B=9E?= =?UTF-8?q?=E5=A4=8D=E5=A4=9A=E5=BC=A0=E5=9B=BE=E7=89=87=E6=8B=89=E4=BC=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/video/detail/reply/widgets/reply_item.dart | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/pages/video/detail/reply/widgets/reply_item.dart b/lib/pages/video/detail/reply/widgets/reply_item.dart index 7991a366..d6778293 100644 --- a/lib/pages/video/detail/reply/widgets/reply_item.dart +++ b/lib/pages/video/detail/reply/widgets/reply_item.dart @@ -797,8 +797,7 @@ InlineSpan buildContent( ), ), ); - } - if (len > 1) { + } else if (len > 1) { List list = []; for (var i = 0; i < len; i++) { picList.add(content.pictures[i]['img_src']); @@ -816,10 +815,11 @@ InlineSpan buildContent( ); }, child: NetworkImgLayer( - src: content.pictures[i]['img_src'], - width: box.maxWidth, - height: box.maxWidth, - ), + src: content.pictures[i]['img_src'], + width: box.maxWidth, + height: box.maxWidth, + origAspectRatio: content.pictures[i]['img_width'] / + content.pictures[i]['img_height']), ); }, ), From 44a162762cc134ec2b752021d05c89096fd8f2e6 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Fri, 9 Feb 2024 23:24:26 +0800 Subject: [PATCH 076/220] =?UTF-8?q?fix:=20=E8=AF=84=E8=AE=BA=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E8=B7=AF=E7=94=B1=E8=B7=B3=E8=BD=AC=20issues=20#405?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../detail/reply/widgets/reply_item.dart | 74 +++++++++++++------ lib/utils/url_utils.dart | 61 +++++++++++++++ 2 files changed, 113 insertions(+), 22 deletions(-) create mode 100644 lib/utils/url_utils.dart diff --git a/lib/pages/video/detail/reply/widgets/reply_item.dart b/lib/pages/video/detail/reply/widgets/reply_item.dart index 7991a366..fb76f4d4 100644 --- a/lib/pages/video/detail/reply/widgets/reply_item.dart +++ b/lib/pages/video/detail/reply/widgets/reply_item.dart @@ -1,7 +1,6 @@ import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; -import 'package:font_awesome_flutter/font_awesome_flutter.dart'; import 'package:get/get.dart'; import 'package:hive/hive.dart'; import 'package:pilipala/common/widgets/badge.dart'; @@ -12,10 +11,9 @@ import 'package:pilipala/pages/preview/index.dart'; import 'package:pilipala/pages/video/detail/index.dart'; import 'package:pilipala/pages/video/detail/reply_new/index.dart'; import 'package:pilipala/utils/feed_back.dart'; -import 'package:pilipala/utils/id_utils.dart'; import 'package:pilipala/utils/storage.dart'; +import 'package:pilipala/utils/url_utils.dart'; import 'package:pilipala/utils/utils.dart'; - import 'zan.dart'; Box setting = GStrorage.setting; @@ -541,7 +539,6 @@ InlineSpan buildContent( // fReplyItem 父级回复内容，用作二楼回复（回复详情）展示 final content = replyItem.content; final List spanChilds = []; - bool hasMatchMember = false; // 投票 if (content.vote.isNotEmpty) { @@ -591,7 +588,7 @@ InlineSpan buildContent( if (patternStr.isNotEmpty) { patternStr += "|"; } - patternStr += r'(\b\d{1,2}[:：]\d{2}\b)'; + patternStr += r'(\b\d{1,2}[:：]\d{2}(?:[:：]\d{2})?\b)'; final RegExp pattern = RegExp(patternStr); List matchedStrs = []; void addPlainTextSpan(str) { @@ -639,7 +636,9 @@ InlineSpan buildContent( }, ), ); - } else if (RegExp(r'^\b[0-9]{1,2}[:：][0-9]{2}\b$').hasMatch(matchStr)) { + } else if (RegExp(r'^\b\d{1,2}[:：]\d{2}(?:[:：]\d{2})?\b$') + .hasMatch(matchStr)) { + matchStr = matchStr.replaceAll('：', ':'); spanChilds.add( TextSpan( text: ' $matchStr ', @@ -650,7 +649,6 @@ InlineSpan buildContent( ..onTap = () { // 跳转到指定位置 try { - matchStr = matchStr.replaceAll('：', ':'); SmartDialog.showToast('跳转至：$matchStr'); Get.find(tag: Get.arguments['heroTag']) .plPlayerController @@ -692,16 +690,54 @@ InlineSpan buildContent( color: Theme.of(context).colorScheme.primary, ), recognizer: TapGestureRecognizer() - ..onTap = () { + ..onTap = () async { + final String title = content.jumpUrl[matchStr]['title']; if (appUrlSchema == '') { - final String str = Uri.parse(matchStr).pathSegments[0]; - final Map matchRes = IdUtils.matchAvorBv(input: str); - final List matchKeys = matchRes.keys.toList(); - if (matchKeys.isNotEmpty) { - if (matchKeys.first == 'BV') { + final String redirectUrl = + await UrlUtils.parseRedirectUrl(matchStr); + final String pathSegment = Uri.parse(redirectUrl).path; + final String lastPathSegment = + pathSegment.split('/').last; + if (lastPathSegment.startsWith('BV')) { + UrlUtils.matchUrlPush( + lastPathSegment, + title, + redirectUrl, + ); + } else { + Get.toNamed( + '/webview', + parameters: { + 'url': redirectUrl, + 'type': 'url', + 'pageTitle': title + }, + ); + } + } else { + if (appUrlSchema.startsWith('bilibili://search')) { + Get.toNamed('/searchResult', + parameters: {'keyword': title}); + } else if (matchStr.startsWith('https://b23.tv')) { + final String redirectUrl = + await UrlUtils.parseRedirectUrl(matchStr); + final String pathSegment = Uri.parse(redirectUrl).path; + final String lastPathSegment = + pathSegment.split('/').last; + if (lastPathSegment.startsWith('BV')) { + UrlUtils.matchUrlPush( + lastPathSegment, + title, + redirectUrl, + ); + } else { Get.toNamed( - '/searchResult', - parameters: {'keyword': matchRes['BV']}, + '/webview', + parameters: { + 'url': redirectUrl, + 'type': 'url', + 'pageTitle': title + }, ); } } else { @@ -710,16 +746,10 @@ InlineSpan buildContent( parameters: { 'url': matchStr, 'type': 'url', - 'pageTitle': '' + 'pageTitle': title }, ); } - } else { - if (appUrlSchema.startsWith('bilibili://search')) { - Get.toNamed('/searchResult', parameters: { - 'keyword': content.jumpUrl[matchStr]['title'] - }); - } } }, ) diff --git a/lib/utils/url_utils.dart b/lib/utils/url_utils.dart new file mode 100644 index 00000000..bac6cdfa --- /dev/null +++ b/lib/utils/url_utils.dart @@ -0,0 +1,61 @@ +import 'package:dio/dio.dart'; +import 'package:get/get.dart'; + +import '../http/search.dart'; +import 'id_utils.dart'; +import 'utils.dart'; + +class UrlUtils { + // 302重定向路由截取 + static Future parseRedirectUrl(String url) async { + late String redirectUrl; + final dio = Dio(); + dio.options.followRedirects = false; + dio.options.validateStatus = (status) { + return status == 200 || status == 301 || status == 302; + }; + final response = await dio.get(url); + if (response.statusCode == 302) { + redirectUrl = response.headers['location']?.first as String; + if (redirectUrl.endsWith('/')) { + redirectUrl = redirectUrl.substring(0, redirectUrl.length - 1); + } + } else { + if (url.endsWith('/')) { + url = url.substring(0, url.length - 1); + } + return url; + } + return redirectUrl; + } + + // 匹配url路由跳转 + static matchUrlPush( + String pathSegment, + String title, + String redirectUrl, + ) async { + final Map matchRes = IdUtils.matchAvorBv(input: pathSegment); + if (matchRes.containsKey('BV')) { + final String bv = matchRes['BV']; + final int cid = await SearchHttp.ab2c(bvid: bv); + final String heroTag = Utils.makeHeroTag(bv); + await Get.toNamed( + '/video?bvid=$bv&cid=$cid', + arguments: { + 'pic': '', + 'heroTag': heroTag, + }, + ); + } else { + await Get.toNamed( + '/webview', + parameters: { + 'url': redirectUrl, + 'type': 'url', + 'pageTitle': title, + }, + ); + } + } +} From 3d5ebe7e99a1340e14618ca934d5600ee591a3b8 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sat, 10 Feb 2024 19:57:10 +0800 Subject: [PATCH 077/220] =?UTF-8?q?fix:=20=E8=A7=86=E9=A2=91=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E9=A1=B5=E8=AF=84=E8=AE=BA=E9=87=8D=E5=A4=8D=E8=AF=B7?= =?UTF-8?q?=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/video/detail/reply/controller.dart | 3 +++ lib/pages/video/detail/reply/view.dart | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/pages/video/detail/reply/controller.dart b/lib/pages/video/detail/reply/controller.dart index 5781cbba..bfcd0e80 100644 --- a/lib/pages/video/detail/reply/controller.dart +++ b/lib/pages/video/detail/reply/controller.dart @@ -53,6 +53,9 @@ class VideoReplyController extends GetxController { } Future queryReplyList({type = 'init'}) async { + if (isLoadingMore) { + return; + } isLoadingMore = true; if (type == 'init') { currentPage = 0; diff --git a/lib/pages/video/detail/reply/view.dart b/lib/pages/video/detail/reply/view.dart index b2c67b1e..9b7546af 100644 --- a/lib/pages/video/detail/reply/view.dart +++ b/lib/pages/video/detail/reply/view.dart @@ -75,7 +75,8 @@ class _VideoReplyPanelState extends State () { if (scrollController.position.pixels >= scrollController.position.maxScrollExtent - 300) { - EasyThrottle.throttle('replylist', const Duration(seconds: 2), () { + EasyThrottle.throttle('replylist', const Duration(milliseconds: 200), + () { _videoReplyController.onLoad(); }); } From 289cc99bc2a88cce0b0f6596a78ee0c40594bdb6 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sun, 11 Feb 2024 09:10:45 +0800 Subject: [PATCH 078/220] mod --- lib/pages/member_archive/view.dart | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/pages/member_archive/view.dart b/lib/pages/member_archive/view.dart index 0b5417b4..43867323 100644 --- a/lib/pages/member_archive/view.dart +++ b/lib/pages/member_archive/view.dart @@ -3,7 +3,6 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:pilipala/common/widgets/video_card_h.dart'; import 'package:pilipala/utils/utils.dart'; -import '../../common/constants.dart'; import 'controller.dart'; class MemberArchivePage extends StatefulWidget { @@ -26,8 +25,7 @@ class _MemberArchivePageState extends State { final String heroTag = Utils.makeHeroTag(mid); _memberArchivesController = Get.put(MemberArchiveController(), tag: heroTag); - _futureBuilderFuture = - _memberArchivesController.getMemberArchive('onRefresh'); + _futureBuilderFuture = _memberArchivesController.getMemberArchive('init'); scrollController = _memberArchivesController.scrollController; scrollController.addListener( () { From e2fd01a6d5154d3f068a60b0bbecad3420447c04 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sun, 11 Feb 2024 18:47:51 +0800 Subject: [PATCH 079/220] =?UTF-8?q?fix:=20video=20Storage=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/main.dart | 1 - lib/utils/storage.dart | 7 ++----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/lib/main.dart b/lib/main.dart index 5849f8a3..fc2149de 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -70,7 +70,6 @@ void main() async { statusBarColor: Colors.transparent, )); Data.init(); - GStrorage.lazyInit(); PiliSchame.init(); }); } diff --git a/lib/utils/storage.dart b/lib/utils/storage.dart index 1b0b0c37..41ec0ce8 100644 --- a/lib/utils/storage.dart +++ b/lib/utils/storage.dart @@ -42,6 +42,8 @@ class GStrorage { return deletedEntries > 10; }, ); + // 视频设置 + video = await Hive.openBox('video'); } static void regAdapter() { @@ -52,11 +54,6 @@ class GStrorage { Hive.registerAdapter(HotSearchItemAdapter()); } - static Future lazyInit() async { - // 视频设置 - video = await Hive.openBox('video'); - } - static Future close() async { // user.compact(); // user.close(); From b264427be603759271d954535cfb12bfbd05eb16 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sun, 11 Feb 2024 23:07:44 +0800 Subject: [PATCH 080/220] =?UTF-8?q?fix:=20=E5=88=87=E6=8D=A2=E5=90=88?= =?UTF-8?q?=E9=9B=86=E8=AF=84=E8=AE=BA=E4=B8=8D=E5=88=B7=E6=96=B0=20issues?= =?UTF-8?q?=20#326=20#525?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/video/detail/controller.dart | 6 ++++-- lib/pages/video/detail/introduction/controller.dart | 1 + lib/pages/video/detail/reply/controller.dart | 1 + lib/pages/video/detail/reply/view.dart | 11 +++++++---- lib/pages/video/detail/view.dart | 7 +++++-- 5 files changed, 18 insertions(+), 8 deletions(-) diff --git a/lib/pages/video/detail/controller.dart b/lib/pages/video/detail/controller.dart index f36eb589..0162654f 100644 --- a/lib/pages/video/detail/controller.dart +++ b/lib/pages/video/detail/controller.dart @@ -19,6 +19,7 @@ import 'package:pilipala/utils/utils.dart'; import 'package:pilipala/utils/video_utils.dart'; import 'package:screen_brightness/screen_brightness.dart'; +import '../../../utils/id_utils.dart'; import 'widgets/header_control.dart'; class VideoDetailController extends GetxController @@ -61,7 +62,7 @@ class VideoDetailController extends GetxController Box localCache = GStrorage.localCache; Box setting = GStrorage.setting; - int oid = 0; + RxInt oid = 0.obs; // 评论id 请求楼中楼评论使用 int fRpid = 0; @@ -135,13 +136,14 @@ class VideoDetailController extends GetxController defaultValue: VideoDecodeFormats.values.last.code); cacheAudioQa = setting.get(SettingBoxKey.defaultAudioQa, defaultValue: AudioQuality.hiRes.code); + oid.value = IdUtils.bv2av(Get.parameters['bvid']!); } showReplyReplyPanel() { PersistentBottomSheetController? ctr = scaffoldKey.currentState?.showBottomSheet((BuildContext context) { return VideoReplyReplyPanel( - oid: oid, + oid: oid.value, rpid: fRpid, closePanel: () => { fRpid = 0, diff --git a/lib/pages/video/detail/introduction/controller.dart b/lib/pages/video/detail/introduction/controller.dart index d1298fcc..fc92fb56 100644 --- a/lib/pages/video/detail/introduction/controller.dart +++ b/lib/pages/video/detail/introduction/controller.dart @@ -476,6 +476,7 @@ class VideoIntroController extends GetxController { final VideoDetailController videoDetailCtr = Get.find(tag: heroTag); videoDetailCtr.bvid = bvid; + videoDetailCtr.oid.value = aid; videoDetailCtr.cid.value = cid; videoDetailCtr.danmakuCid.value = cid; videoDetailCtr.queryVideoUrl(); diff --git a/lib/pages/video/detail/reply/controller.dart b/lib/pages/video/detail/reply/controller.dart index bfcd0e80..e564ef02 100644 --- a/lib/pages/video/detail/reply/controller.dart +++ b/lib/pages/video/detail/reply/controller.dart @@ -59,6 +59,7 @@ class VideoReplyController extends GetxController { isLoadingMore = true; if (type == 'init') { currentPage = 0; + noMore.value = ''; } if (noMore.value == '没有更多了') { return; diff --git a/lib/pages/video/detail/reply/view.dart b/lib/pages/video/detail/reply/view.dart index 9b7546af..8489cbb1 100644 --- a/lib/pages/video/detail/reply/view.dart +++ b/lib/pages/video/detail/reply/view.dart @@ -16,11 +16,13 @@ import 'widgets/reply_item.dart'; class VideoReplyPanel extends StatefulWidget { final String? bvid; + final int? oid; final int rpid; final String? replyLevel; const VideoReplyPanel({ this.bvid, + this.oid, this.rpid = 0, this.replyLevel, super.key, @@ -48,16 +50,17 @@ class _VideoReplyPanelState extends State @override void initState() { super.initState(); - int oid = widget.bvid != null ? IdUtils.bv2av(widget.bvid!) : 0; + // int oid = widget.bvid != null ? IdUtils.bv2av(widget.bvid!) : 0; heroTag = Get.arguments['heroTag']; replyLevel = widget.replyLevel ?? '1'; if (replyLevel == '2') { _videoReplyController = Get.put( - VideoReplyController(oid, widget.rpid.toString(), replyLevel), + VideoReplyController(widget.oid, widget.rpid.toString(), replyLevel), tag: widget.rpid.toString()); } else { - _videoReplyController = - Get.put(VideoReplyController(oid, '', replyLevel), tag: heroTag); + _videoReplyController = Get.put( + VideoReplyController(widget.oid, '', replyLevel), + tag: heroTag); } fabAnimationCtr = AnimationController( diff --git a/lib/pages/video/detail/view.dart b/lib/pages/video/detail/view.dart index 3644fa41..14311cc9 100644 --- a/lib/pages/video/detail/view.dart +++ b/lib/pages/video/detail/view.dart @@ -570,8 +570,11 @@ class _VideoDetailPageState extends State ); }, ), - VideoReplyPanel( - bvid: videoDetailController.bvid, + Obx( + () => VideoReplyPanel( + bvid: videoDetailController.bvid, + oid: videoDetailController.oid.value, + ), ) ], ), From 89026e671c01b4b6d8fc686c44fa01b47c6d87dd Mon Sep 17 00:00:00 2001 From: guozhigq Date: Mon, 12 Feb 2024 10:07:29 +0800 Subject: [PATCH 081/220] =?UTF-8?q?mod:=20=E6=94=B6=E8=97=8F=E8=A7=86?= =?UTF-8?q?=E9=A2=91=E7=9B=B8=E5=85=B3=20issues=20#51=20#534?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/http/video.dart | 8 +- .../fav_detail/widget/fav_video_card.dart | 174 +++++++++--------- .../video/detail/introduction/controller.dart | 5 +- 3 files changed, 100 insertions(+), 87 deletions(-) diff --git a/lib/http/video.dart b/lib/http/video.dart index d0faabaa..0df814be 100644 --- a/lib/http/video.dart +++ b/lib/http/video.dart @@ -51,7 +51,7 @@ class VideoHttp { (i['owner'] != null && !blackMidsList.contains(i['owner']['mid']))) { RecVideoItemModel videoItem = RecVideoItemModel.fromJson(i); - if (!RecommendFilter.filter(videoItem)){ + if (!RecommendFilter.filter(videoItem)) { list.add(videoItem); } } @@ -98,7 +98,7 @@ class VideoHttp { (i['args'] != null && !blackMidsList.contains(i['args']['up_mid']))) { RecVideoItemAppModel videoItem = RecVideoItemAppModel.fromJson(i); - if (!RecommendFilter.filter(videoItem)){ + if (!RecommendFilter.filter(videoItem)) { list.add(videoItem); } } @@ -217,7 +217,7 @@ class VideoHttp { List list = []; for (var i in res.data['data']) { HotVideoItemModel videoItem = HotVideoItemModel.fromJson(i); - if (!RecommendFilter.filter(videoItem, relatedVideos: true)){ + if (!RecommendFilter.filter(videoItem, relatedVideos: true)) { list.add(videoItem); } } @@ -322,7 +322,7 @@ class VideoHttp { if (res.data['code'] == 0) { return {'status': true, 'data': res.data['data']}; } else { - return {'status': false, 'data': []}; + return {'status': false, 'data': [], 'msg': res.data['message']}; } } diff --git a/lib/pages/fav_detail/widget/fav_video_card.dart b/lib/pages/fav_detail/widget/fav_video_card.dart index a4f22f6b..a3c1e8e5 100644 --- a/lib/pages/fav_detail/widget/fav_video_card.dart +++ b/lib/pages/fav_detail/widget/fav_video_card.dart @@ -130,97 +130,107 @@ class VideoContent extends StatelessWidget { return Expanded( child: Padding( padding: const EdgeInsets.fromLTRB(10, 2, 6, 0), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, + child: Stack( children: [ - Text( - videoItem.title, - textAlign: TextAlign.start, - style: const TextStyle( - fontWeight: FontWeight.w500, - letterSpacing: 0.3, - ), - maxLines: 2, - overflow: TextOverflow.ellipsis, - ), - if (videoItem.ogv != null) ...[ - Text( - videoItem.intro, - style: TextStyle( - fontSize: Theme.of(context).textTheme.labelMedium!.fontSize, - color: Theme.of(context).colorScheme.outline, - ), - ), - ], - const Spacer(), - Text( - Utils.dateFormat(videoItem.favTime), - style: TextStyle( - fontSize: 11, color: Theme.of(context).colorScheme.outline), - ), - if (videoItem.owner.name != '') ...[ - Text( - videoItem.owner.name, - style: TextStyle( - fontSize: Theme.of(context).textTheme.labelMedium!.fontSize, - color: Theme.of(context).colorScheme.outline, - ), - ), - ], - Row( + Column( + crossAxisAlignment: CrossAxisAlignment.start, children: [ - StatView( - theme: 'gray', - view: videoItem.cntInfo['play'], + Text( + videoItem.title, + textAlign: TextAlign.start, + style: const TextStyle( + fontWeight: FontWeight.w500, + letterSpacing: 0.3, + ), + maxLines: 2, + overflow: TextOverflow.ellipsis, ), - const SizedBox(width: 8), - StatDanMu(theme: 'gray', danmu: videoItem.cntInfo['danmaku']), - const Spacer(), - SizedBox( - width: 26, - height: 26, - child: IconButton( - style: ButtonStyle( - padding: MaterialStateProperty.all(EdgeInsets.zero), - ), - onPressed: () { - showDialog( - context: Get.context!, - builder: (context) { - return AlertDialog( - title: const Text('提示'), - content: const Text('要取消收藏吗?'), - actions: [ - TextButton( - onPressed: () => Get.back(), - child: Text( - '取消', - style: TextStyle( - color: Theme.of(context) - .colorScheme - .outline), - )), - TextButton( - onPressed: () async { - await callFn!(); - Get.back(); - }, - child: const Text('确定取消'), - ) - ], - ); - }, - ); - }, - icon: Icon( - Icons.clear_outlined, + if (videoItem.ogv != null) ...[ + Text( + videoItem.intro, + style: TextStyle( + fontSize: + Theme.of(context).textTheme.labelMedium!.fontSize, color: Theme.of(context).colorScheme.outline, - size: 18, ), ), + ], + const Spacer(), + Text( + Utils.dateFormat(videoItem.favTime), + style: TextStyle( + fontSize: 11, + color: Theme.of(context).colorScheme.outline), + ), + if (videoItem.owner.name != '') ...[ + Text( + videoItem.owner.name, + style: TextStyle( + fontSize: + Theme.of(context).textTheme.labelMedium!.fontSize, + color: Theme.of(context).colorScheme.outline, + ), + ), + ], + Padding( + padding: const EdgeInsets.only(top: 2), + child: Row( + children: [ + StatView( + theme: 'gray', + view: videoItem.cntInfo['play'], + ), + const SizedBox(width: 8), + StatDanMu( + theme: 'gray', danmu: videoItem.cntInfo['danmaku']), + const Spacer(), + ], + ), ), ], ), + Positioned( + right: 0, + bottom: -4, + child: IconButton( + style: ButtonStyle( + padding: MaterialStateProperty.all(EdgeInsets.zero), + ), + onPressed: () { + showDialog( + context: Get.context!, + builder: (context) { + return AlertDialog( + title: const Text('提示'), + content: const Text('要取消收藏吗?'), + actions: [ + TextButton( + onPressed: () => Get.back(), + child: Text( + '取消', + style: TextStyle( + color: + Theme.of(context).colorScheme.outline), + )), + TextButton( + onPressed: () async { + await callFn!(); + Get.back(); + }, + child: const Text('确定取消'), + ) + ], + ); + }, + ); + }, + icon: Icon( + Icons.clear_outlined, + color: Theme.of(context).colorScheme.outline, + size: 18, + ), + ), + ), ], ), ), diff --git a/lib/pages/video/detail/introduction/controller.dart b/lib/pages/video/detail/introduction/controller.dart index fc92fb56..4672b4bd 100644 --- a/lib/pages/video/detail/introduction/controller.dart +++ b/lib/pages/video/detail/introduction/controller.dart @@ -298,7 +298,6 @@ class VideoIntroController extends GetxController { await queryVideoInFolder(); int defaultFolderId = favFolderData.value.list!.first.id!; int favStatus = favFolderData.value.list!.first.favState!; - print('favStatus: $favStatus'); var result = await VideoHttp.favVideo( aid: IdUtils.bv2av(bvid), addIds: favStatus == 0 ? '$defaultFolderId' : '', @@ -310,6 +309,8 @@ class VideoIntroController extends GetxController { await queryHasFavVideo(); SmartDialog.showToast('✅ 操作成功'); } + } else { + SmartDialog.showToast(result['msg']); } return; } @@ -340,6 +341,8 @@ class VideoIntroController extends GetxController { await queryHasFavVideo(); SmartDialog.showToast('✅ 操作成功'); } + } else { + SmartDialog.showToast(result['msg']); } } From 5e59db85be3ccfd7a3ee9ad6cc50c97021f507e5 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Mon, 12 Feb 2024 16:51:05 +0800 Subject: [PATCH 082/220] =?UTF-8?q?fix:=20=E8=AF=84=E8=AE=BA=E7=AC=94?= =?UTF-8?q?=E8=AE=B0=E8=B7=B3=E8=BD=AC=20issues=20#472?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/video/detail/reply/view.dart | 2 +- .../detail/reply/widgets/reply_item.dart | 55 +++++++++++++++++-- 2 files changed, 51 insertions(+), 6 deletions(-) diff --git a/lib/pages/video/detail/reply/view.dart b/lib/pages/video/detail/reply/view.dart index 8489cbb1..df8c75b1 100644 --- a/lib/pages/video/detail/reply/view.dart +++ b/lib/pages/video/detail/reply/view.dart @@ -114,7 +114,7 @@ class _VideoReplyPanelState extends State final VideoDetailController videoDetailCtr = Get.find(tag: heroTag); if (replyItem != null) { - videoDetailCtr.oid = replyItem.oid; + videoDetailCtr.oid.value = replyItem.oid; videoDetailCtr.fRpid = replyItem.rpid!; videoDetailCtr.firstFloor = replyItem; videoDetailCtr.showReplyReplyPanel(); diff --git a/lib/pages/video/detail/reply/widgets/reply_item.dart b/lib/pages/video/detail/reply/widgets/reply_item.dart index 7991a366..a9e1044e 100644 --- a/lib/pages/video/detail/reply/widgets/reply_item.dart +++ b/lib/pages/video/detail/reply/widgets/reply_item.dart @@ -739,6 +739,47 @@ InlineSpan buildContent( }, ); + if (content.jumpUrl.keys.isNotEmpty) { + List unmatchedItems = content.jumpUrl.keys + .toList() + .where((item) => !content.message.contains(item)) + .toList(); + if (unmatchedItems.isNotEmpty) { + for (int i = 0; i < unmatchedItems.length; i++) { + String patternStr = unmatchedItems[i]; + spanChilds.addAll( + [ + if (content.jumpUrl[patternStr]?['prefix_icon'] != null) ...[ + WidgetSpan( + child: Image.network( + content.jumpUrl[patternStr]['prefix_icon'], + height: 19, + color: Theme.of(context).colorScheme.primary, + ), + ) + ], + TextSpan( + text: content.jumpUrl[patternStr]['title'], + style: TextStyle( + color: Theme.of(context).colorScheme.primary, + ), + recognizer: TapGestureRecognizer() + ..onTap = () { + Get.toNamed( + '/webview', + parameters: { + 'url': patternStr, + 'type': 'url', + 'pageTitle': content.jumpUrl[patternStr]['title'] + }, + ); + }, + ) + ], + ); + } + } + } // 图片渲染 if (content.pictures.isNotEmpty) { final List picList = []; @@ -753,11 +794,15 @@ InlineSpan buildContent( builder: (BuildContext context, BoxConstraints box) { double maxHeight = box.maxWidth * 0.6; // 设置最大高度 // double width = (box.maxWidth / 2).truncateToDouble(); - double height = ((box.maxWidth / - 2 * - pictureItem['img_height'] / - pictureItem['img_width'])) - .truncateToDouble(); + double height = 100; + try { + height = ((box.maxWidth / + 2 * + pictureItem['img_height'] / + pictureItem['img_width'])) + .truncateToDouble(); + } catch (_) {} + return GestureDetector( onTap: () { showDialog( From b817a0c80775c9ab5d7ca1521d98afc7e988f4da Mon Sep 17 00:00:00 2001 From: KoolShow <51787949+KoolShow@users.noreply.github.com> Date: Mon, 12 Feb 2024 17:20:18 +0800 Subject: [PATCH 083/220] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=AD=A3=E5=88=99?= =?UTF-8?q?=E8=A1=A8=E8=BE=BE=E5=BC=8F=E4=BB=A5=E5=8C=B9=E9=85=8D=E5=90=AB?= =?UTF-8?q?=E5=B0=8F=E6=97=B6=E7=9A=84=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/video/detail/reply/widgets/reply_item.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/pages/video/detail/reply/widgets/reply_item.dart b/lib/pages/video/detail/reply/widgets/reply_item.dart index 929d9c03..773ad3b1 100644 --- a/lib/pages/video/detail/reply/widgets/reply_item.dart +++ b/lib/pages/video/detail/reply/widgets/reply_item.dart @@ -591,7 +591,7 @@ InlineSpan buildContent( if (patternStr.isNotEmpty) { patternStr += "|"; } - patternStr += r'(\b\d{1,2}[:：]\d{2}\b)'; + patternStr += r'(\b(?:\d+[:：])?[0-5]?[0-9][:：][0-5]?[0-9]\b)'; final RegExp pattern = RegExp(patternStr); List matchedStrs = []; void addPlainTextSpan(str) { @@ -639,7 +639,7 @@ InlineSpan buildContent( }, ), ); - } else if (RegExp(r'^\b[0-9]{1,2}[:：][0-9]{2}\b$').hasMatch(matchStr)) { + } else if (RegExp(r'^\b(?:\d+[:：])?[0-5]?[0-9][:：][0-5]?[0-9]\b$').hasMatch(matchStr)) { spanChilds.add( TextSpan( text: ' $matchStr ', From cdf800c49f41731240ae9657c8dcb7fd88104c92 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Tue, 13 Feb 2024 23:33:51 +0800 Subject: [PATCH 084/220] =?UTF-8?q?mod:=20=E8=AF=84=E8=AE=BA=E5=A4=8D?= =?UTF-8?q?=E5=88=B6=E9=80=BB=E8=BE=91=20issues=20#420=20#331=20#297=20=20?= =?UTF-8?q?#152?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../detail/reply/widgets/reply_item.dart | 259 ++++++++++-------- 1 file changed, 142 insertions(+), 117 deletions(-) diff --git a/lib/pages/video/detail/reply/widgets/reply_item.dart b/lib/pages/video/detail/reply/widgets/reply_item.dart index 46efc4f9..d0bcbaec 100644 --- a/lib/pages/video/detail/reply/widgets/reply_item.dart +++ b/lib/pages/video/detail/reply/widgets/reply_item.dart @@ -1,5 +1,6 @@ import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:get/get.dart'; import 'package:hive/hive.dart'; @@ -46,6 +47,17 @@ class ReplyItem extends StatelessWidget { replyReply!(replyItem); } }, + onLongPress: () { + feedBack(); + showModalBottomSheet( + context: context, + useRootNavigator: true, + isScrollControlled: true, + builder: (context) { + return MorePanel(item: replyItem); + }, + ); + }, child: Column( children: [ Padding( @@ -121,98 +133,6 @@ class ReplyItem extends StatelessWidget { return Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - // 头像、昵称 - // SizedBox( - // width: double.infinity, - // child: Stack( - // children: [ - // GestureDetector( - // behavior: HitTestBehavior.opaque, - // onTap: () { - // feedBack(); - // Get.toNamed('/member?mid=${replyItem!.mid}', arguments: { - // 'face': replyItem!.member!.avatar!, - // 'heroTag': heroTag - // }); - // }, - // child: Row( - // crossAxisAlignment: CrossAxisAlignment.center, - // mainAxisSize: MainAxisSize.min, - // children: [ - // lfAvtar(context, heroTag), - // const SizedBox(width: 12), - // Text( - // replyItem!.member!.uname!, - // style: TextStyle( - // color: replyItem!.member!.vip!['vipStatus'] > 0 - // ? const Color.fromARGB(255, 251, 100, 163) - // : Theme.of(context).colorScheme.outline, - // fontSize: 13, - // ), - // ), - // const SizedBox(width: 6), - // Image.asset( - // 'assets/images/lv/lv${replyItem!.member!.level}.png', - // height: 11, - // ), - // const SizedBox(width: 6), - // if (replyItem!.isUp!) - // const PBadge( - // text: 'UP', - // size: 'small', - // stack: 'normal', - // fs: 9, - // ), - // ], - // ), - // ), - // Positioned( - // top: 0, - // left: 0, - // right: 0, - // child: Container( - // width: double.infinity, - // height: 45, - // decoration: BoxDecoration( - // image: replyItem!.member!.userSailing!.cardbg != null - // ? DecorationImage( - // alignment: Alignment.centerRight, - // fit: BoxFit.fitHeight, - // image: NetworkImage( - // replyItem!.member!.userSailing!.cardbg!['image'], - // ), - // ) - // : null, - // ), - // ), - // ), - // if (replyItem!.member!.userSailing!.cardbg != null && - // replyItem!.member!.userSailing!.cardbg!['fan']['number'] > 0) - // Positioned( - // top: 10, - // left: Get.size.width / 7 * 5.8, - // child: DefaultTextStyle( - // style: TextStyle( - // fontFamily: 'fansCard', - // fontSize: 9, - // color: Theme.of(context).colorScheme.primary, - // ), - // child: Column( - // crossAxisAlignment: CrossAxisAlignment.start, - // mainAxisAlignment: MainAxisAlignment.center, - // children: [ - // const Text('NO.'), - // Text( - // replyItem!.member!.userSailing!.cardbg!['fan'] - // ['num_desc'], - // ), - // ], - // ), - // ), - // ), - // ], - // ), - // ), /// fix Stack内GestureDetector onTap无效 GestureDetector( behavior: HitTestBehavior.opaque, @@ -289,30 +209,26 @@ class ReplyItem extends StatelessWidget { // title Container( margin: const EdgeInsets.only(top: 10, left: 45, right: 6, bottom: 4), - child: SelectableRegion( - focusNode: FocusNode(), - selectionControls: MaterialTextSelectionControls(), - child: Text.rich( - style: const TextStyle(height: 1.75), - maxLines: - replyItem!.content!.isText! && replyLevel == '1' ? 3 : 999, - overflow: TextOverflow.ellipsis, - TextSpan( - children: [ - if (replyItem!.isTop!) - const WidgetSpan( - alignment: PlaceholderAlignment.top, - child: PBadge( - text: 'TOP', - size: 'small', - stack: 'normal', - type: 'line', - fs: 9, - ), + child: Text.rich( + style: const TextStyle(height: 1.75), + maxLines: + replyItem!.content!.isText! && replyLevel == '1' ? 3 : 999, + overflow: TextOverflow.ellipsis, + TextSpan( + children: [ + if (replyItem!.isTop!) + const WidgetSpan( + alignment: PlaceholderAlignment.top, + child: PBadge( + text: 'TOP', + size: 'small', + stack: 'normal', + type: 'line', + fs: 9, ), - buildContent(context, replyItem!, replyReply, null), - ], - ), + ), + buildContent(context, replyItem!, replyReply, null), + ], ), ), ), @@ -445,6 +361,17 @@ class ReplyItemRow extends StatelessWidget { InkWell( // 一楼点击评论展开评论详情 onTap: () => replyReply!(replyItem), + onLongPress: () { + feedBack(); + showModalBottomSheet( + context: context, + useRootNavigator: true, + isScrollControlled: true, + builder: (context) { + return MorePanel(item: replies![i]); + }, + ); + }, child: Container( width: double.infinity, padding: EdgeInsets.fromLTRB( @@ -636,8 +563,8 @@ InlineSpan buildContent( }, ), ); - - } else if (RegExp(r'^\b(?:\d+[:：])?[0-5]?[0-9][:：][0-5]?[0-9]\b$').hasMatch(matchStr)) { + } else if (RegExp(r'^\b(?:\d+[:：])?[0-5]?[0-9][:：][0-5]?[0-9]\b$') + .hasMatch(matchStr)) { matchStr = matchStr.replaceAll('：', ':'); spanChilds.add( TextSpan( @@ -955,3 +882,101 @@ InlineSpan buildContent( // spanChilds.add(TextSpan(text: matchMember)); return TextSpan(children: spanChilds); } + +class MorePanel extends StatelessWidget { + final dynamic item; + const MorePanel({super.key, required this.item}); + + Future menuActionHandler(String type) async { + String message = item.content.message ?? item.content; + switch (type) { + case 'copyAll': + await Clipboard.setData(ClipboardData(text: message)); + SmartDialog.showToast('已复制'); + Get.back(); + break; + case 'copyFreedom': + Get.back(); + showDialog( + context: Get.context!, + builder: (context) { + return AlertDialog( + title: const Text('自由复制'), + content: SelectableText(message), + ); + }, + ); + break; + // case 'block': + // SmartDialog.showToast('加入黑名单'); + // break; + // case 'report': + // SmartDialog.showToast('举报'); + // break; + // case 'delete': + // SmartDialog.showToast('删除'); + // break; + default: + } + } + + @override + Widget build(BuildContext context) { + Color errorColor = Theme.of(context).colorScheme.error; + return Container( + padding: EdgeInsets.only(bottom: MediaQuery.of(context).padding.bottom), + // clipBehavior: Clip.hardEdge, + child: Column( + mainAxisSize: MainAxisSize.min, + children: [ + InkWell( + onTap: () => Get.back(), + child: Container( + height: 48, + padding: const EdgeInsets.only(bottom: 2), + child: Center( + child: Container( + width: 32, + height: 3, + decoration: BoxDecoration( + color: Theme.of(context).colorScheme.outline, + borderRadius: const BorderRadius.all(Radius.circular(3))), + ), + ), + ), + ), + ListTile( + onTap: () async => await menuActionHandler('copyAll'), + minLeadingWidth: 0, + leading: const Icon(Icons.copy_all_outlined), + title: const Text('复制全部'), + ), + ListTile( + onTap: () async => await menuActionHandler('copyFreedom'), + minLeadingWidth: 0, + leading: const Icon(Icons.copy_outlined), + title: const Text('自由复制'), + ), + // ListTile( + // onTap: () async => await menuActionHandler('block'), + // minLeadingWidth: 0, + // leading: Icon(Icons.block_outlined, color: errorColor), + // title: Text('加入黑名单', style: TextStyle(color: errorColor)), + // ), + // ListTile( + // onTap: () async => await menuActionHandler('report'), + // minLeadingWidth: 0, + // leading: Icon(Icons.report_outlined, color: errorColor), + // title: Text('举报', style: TextStyle(color: errorColor)), + // ), + // ListTile( + // onTap: () async => await menuActionHandler('del'), + // minLeadingWidth: 0, + // leading: Icon(Icons.delete_outline, color: errorColor), + // title: Text('删除', style: TextStyle(color: errorColor)), + // ), + ], + ), + ); + } +} From 42ad9591558df4bfd0cbe34575f60ce2cee04b12 Mon Sep 17 00:00:00 2001 From: orz12 Date: Wed, 14 Feb 2024 08:38:01 +0800 Subject: [PATCH 085/220] =?UTF-8?q?fix:=20=E9=80=9F=E5=BA=A6=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E6=97=A0=E6=B3=95=E5=8F=96=E6=B6=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/video/detail/widgets/header_control.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/pages/video/detail/widgets/header_control.dart b/lib/pages/video/detail/widgets/header_control.dart index 3af35efd..8bc7d84e 100644 --- a/lib/pages/video/detail/widgets/header_control.dart +++ b/lib/pages/video/detail/widgets/header_control.dart @@ -438,7 +438,7 @@ class _HeaderControlState extends State { }), actions: [ TextButton( - onPressed: () => SmartDialog.dismiss(), + onPressed: () => Get.back(), child: Text( '取消', style: TextStyle(color: Theme.of(context).colorScheme.outline), From 3efad736aeefb10f3047b9e8e988be0be34b1138 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Wed, 14 Feb 2024 19:38:55 +0800 Subject: [PATCH 086/220] =?UTF-8?q?fix:=20=E7=9B=B4=E6=92=AD=E9=97=AA?= =?UTF-8?q?=E9=80=80=20issues=20#540?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/live_room/controller.dart | 10 ---------- lib/pages/live_room/view.dart | 16 ++++++---------- 2 files changed, 6 insertions(+), 20 deletions(-) diff --git a/lib/pages/live_room/controller.dart b/lib/pages/live_room/controller.dart index 56da0a78..ee7b8214 100644 --- a/lib/pages/live_room/controller.dart +++ b/lib/pages/live_room/controller.dart @@ -3,7 +3,6 @@ import 'package:pilipala/http/constants.dart'; import 'package:pilipala/http/live.dart'; import 'package:pilipala/models/live/room_info.dart'; import 'package:pilipala/plugin/pl_player/index.dart'; - import '../../models/live/room_info_h5.dart'; class LiveRoomController extends GetxController { @@ -16,13 +15,6 @@ class LiveRoomController extends GetxController { RxBool volumeOff = false.obs; PlPlayerController plPlayerController = PlPlayerController.getInstance(videoType: 'live'); - - // MeeduPlayerController meeduPlayerController = MeeduPlayerController( - // colorTheme: Theme.of(Get.context!).colorScheme.primary, - // pipEnabled: true, - // controlsStyle: ControlsStyle.live, - // enabledButtons: const EnabledButtons(pip: true), - // ); Rx roomInfoH5 = RoomInfoH5Model().obs; @override @@ -39,8 +31,6 @@ class LiveRoomController extends GetxController { cover = liveItem.cover; } } - queryLiveInfo(); - queryLiveInfoH5(); } playerInit(source) async { diff --git a/lib/pages/live_room/view.dart b/lib/pages/live_room/view.dart index 20dfe403..39800b90 100644 --- a/lib/pages/live_room/view.dart +++ b/lib/pages/live_room/view.dart @@ -29,22 +29,18 @@ class _LiveRoomPageState extends State { @override void initState() { super.initState(); - plPlayerController = _liveRoomController.plPlayerController; - plPlayerController!.onPlayerStatusChanged.listen( - (PlayerStatus status) { - if (status == PlayerStatus.playing) { - isShowCover = false; - setState(() {}); - } - }, - ); if (Platform.isAndroid) { floating = Floating(); } - _futureBuilder = _liveRoomController.queryLiveInfoH5(); + videoSourceInit(); _futureBuilderFuture = _liveRoomController.queryLiveInfo(); } + Future videoSourceInit() async { + _futureBuilder = _liveRoomController.queryLiveInfoH5(); + plPlayerController = _liveRoomController.plPlayerController; + } + @override void dispose() { plPlayerController!.dispose(); From d95fe9fe14465da7cce7faa36de973ce09d5d21a Mon Sep 17 00:00:00 2001 From: guozhigq Date: Thu, 15 Feb 2024 21:07:23 +0800 Subject: [PATCH 087/220] =?UTF-8?q?mod:=20MorePanel=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/video/detail/reply/widgets/reply_item.dart | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/lib/pages/video/detail/reply/widgets/reply_item.dart b/lib/pages/video/detail/reply/widgets/reply_item.dart index d0bcbaec..dc242216 100644 --- a/lib/pages/video/detail/reply/widgets/reply_item.dart +++ b/lib/pages/video/detail/reply/widgets/reply_item.dart @@ -925,14 +925,13 @@ class MorePanel extends StatelessWidget { Color errorColor = Theme.of(context).colorScheme.error; return Container( padding: EdgeInsets.only(bottom: MediaQuery.of(context).padding.bottom), - // clipBehavior: Clip.hardEdge, child: Column( mainAxisSize: MainAxisSize.min, children: [ InkWell( onTap: () => Get.back(), child: Container( - height: 48, + height: 35, padding: const EdgeInsets.only(bottom: 2), child: Center( child: Container( @@ -948,14 +947,14 @@ class MorePanel extends StatelessWidget { ListTile( onTap: () async => await menuActionHandler('copyAll'), minLeadingWidth: 0, - leading: const Icon(Icons.copy_all_outlined), - title: const Text('复制全部'), + leading: const Icon(Icons.copy_all_outlined, size: 19), + title: Text('复制全部', style: Theme.of(context).textTheme.titleSmall), ), ListTile( onTap: () async => await menuActionHandler('copyFreedom'), minLeadingWidth: 0, - leading: const Icon(Icons.copy_outlined), - title: const Text('自由复制'), + leading: const Icon(Icons.copy_outlined, size: 19), + title: Text('自由复制', style: Theme.of(context).textTheme.titleSmall), ), // ListTile( // onTap: () async => await menuActionHandler('block'), From d57f84a1d7ca10b50e733f18a9a6a2e70a90cf94 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Thu, 15 Feb 2024 21:59:28 +0800 Subject: [PATCH 088/220] =?UTF-8?q?fix:=20=E8=B7=AF=E7=94=B1=E8=B7=B3?= =?UTF-8?q?=E8=BD=AC=E4=BC=A0=E5=8F=82=E4=B8=A2=E5=A4=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/fav_detail/view.dart | 6 ++++-- lib/pages/member/view.dart | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/pages/fav_detail/view.dart b/lib/pages/fav_detail/view.dart index f5897550..7f3435ef 100644 --- a/lib/pages/fav_detail/view.dart +++ b/lib/pages/fav_detail/view.dart @@ -24,11 +24,13 @@ class _FavDetailPageState extends State { Get.put(FavDetailController()); late StreamController titleStreamC; // a Future? _futureBuilderFuture; + late String mediaId; @override void initState() { super.initState(); _futureBuilderFuture = _favDetailController.queryUserFavFolderDetail(); + mediaId = Get.parameters['mediaId']!; titleStreamC = StreamController(); _controller.addListener( () { @@ -94,8 +96,8 @@ class _FavDetailPageState extends State { ), actions: [ IconButton( - onPressed: () => Get.toNamed( - '/favSearch?searchType=0&mediaId=${Get.parameters['mediaId']!}'), + onPressed: () => + Get.toNamed('/favSearch?searchType=0&mediaId=$mediaId'), icon: const Icon(Icons.search_outlined), ), // IconButton( diff --git a/lib/pages/member/view.dart b/lib/pages/member/view.dart index 1d3cd5c4..0663e94e 100644 --- a/lib/pages/member/view.dart +++ b/lib/pages/member/view.dart @@ -105,7 +105,7 @@ class _MemberPageState extends State actions: [ IconButton( onPressed: () => Get.toNamed( - '/memberSearch?mid=${Get.parameters['mid']}&uname=${_memberController.memberInfo.value.name!}'), + '/memberSearch?mid=$mid&uname=${_memberController.memberInfo.value.name!}'), icon: const Icon(Icons.search_outlined), ), PopupMenuButton( From 5bf7b69d790e8fd4f42114c15a0c4a93b14501a0 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Fri, 16 Feb 2024 09:33:59 +0800 Subject: [PATCH 089/220] =?UTF-8?q?feat:=20=E6=94=B6=E8=97=8F=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E7=BB=93=E6=9E=9C=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fav_detail/widget/fav_video_card.dart | 110 ++++++++++-------- lib/pages/fav_search/controller.dart | 20 ++++ lib/pages/fav_search/view.dart | 13 ++- 3 files changed, 92 insertions(+), 51 deletions(-) diff --git a/lib/pages/fav_detail/widget/fav_video_card.dart b/lib/pages/fav_detail/widget/fav_video_card.dart index a3c1e8e5..1c4008ff 100644 --- a/lib/pages/fav_detail/widget/fav_video_card.dart +++ b/lib/pages/fav_detail/widget/fav_video_card.dart @@ -15,9 +15,14 @@ import '../../../common/widgets/badge.dart'; class FavVideoCardH extends StatelessWidget { final dynamic videoItem; final Function? callFn; + final int? searchType; - const FavVideoCardH({Key? key, required this.videoItem, this.callFn}) - : super(key: key); + const FavVideoCardH({ + Key? key, + required this.videoItem, + this.callFn, + this.searchType, + }) : super(key: key); @override Widget build(BuildContext context) { @@ -107,7 +112,11 @@ class FavVideoCardH extends StatelessWidget { }, ), ), - VideoContent(videoItem: videoItem, callFn: callFn) + VideoContent( + videoItem: videoItem, + callFn: callFn, + searchType: searchType, + ) ], ), ); @@ -123,7 +132,13 @@ class FavVideoCardH extends StatelessWidget { class VideoContent extends StatelessWidget { final dynamic videoItem; final Function? callFn; - const VideoContent({super.key, required this.videoItem, this.callFn}); + final int? searchType; + const VideoContent({ + super.key, + required this.videoItem, + this.callFn, + this.searchType, + }); @override Widget build(BuildContext context) { @@ -189,48 +204,51 @@ class VideoContent extends StatelessWidget { ), ], ), - Positioned( - right: 0, - bottom: -4, - child: IconButton( - style: ButtonStyle( - padding: MaterialStateProperty.all(EdgeInsets.zero), - ), - onPressed: () { - showDialog( - context: Get.context!, - builder: (context) { - return AlertDialog( - title: const Text('提示'), - content: const Text('要取消收藏吗?'), - actions: [ - TextButton( - onPressed: () => Get.back(), - child: Text( - '取消', - style: TextStyle( - color: - Theme.of(context).colorScheme.outline), - )), - TextButton( - onPressed: () async { - await callFn!(); - Get.back(); - }, - child: const Text('确定取消'), - ) - ], - ); - }, - ); - }, - icon: Icon( - Icons.clear_outlined, - color: Theme.of(context).colorScheme.outline, - size: 18, - ), - ), - ), + searchType != 1 + ? Positioned( + right: 0, + bottom: -4, + child: IconButton( + style: ButtonStyle( + padding: MaterialStateProperty.all(EdgeInsets.zero), + ), + onPressed: () { + showDialog( + context: Get.context!, + builder: (context) { + return AlertDialog( + title: const Text('提示'), + content: const Text('要取消收藏吗?'), + actions: [ + TextButton( + onPressed: () => Get.back(), + child: Text( + '取消', + style: TextStyle( + color: Theme.of(context) + .colorScheme + .outline), + )), + TextButton( + onPressed: () async { + await callFn!(); + Get.back(); + }, + child: const Text('确定取消'), + ) + ], + ); + }, + ); + }, + icon: Icon( + Icons.clear_outlined, + color: Theme.of(context).colorScheme.outline, + size: 18, + ), + ), + ) + : const SizedBox(), ], ), ), diff --git a/lib/pages/fav_search/controller.dart b/lib/pages/fav_search/controller.dart index 642fea6b..abd25e0b 100644 --- a/lib/pages/fav_search/controller.dart +++ b/lib/pages/fav_search/controller.dart @@ -1,8 +1,11 @@ import 'package:flutter/material.dart'; +import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:get/get.dart'; import 'package:pilipala/http/user.dart'; import 'package:pilipala/models/user/fav_detail.dart'; +import '../../http/video.dart'; + class FavSearchController extends GetxController { final ScrollController scrollController = ScrollController(); Rx controller = TextEditingController().obs; @@ -72,4 +75,21 @@ class FavSearchController extends GetxController { if (!hasMore) return; searchFav(type: 'onLoad'); } + + onCancelFav(int id) async { + var result = await VideoHttp.favVideo( + aid: id, addIds: '', delIds: mediaId.toString()); + if (result['status']) { + if (result['data']['prompt']) { + List dataList = favList; + for (var i in dataList) { + if (i.id == id) { + dataList.remove(i); + break; + } + } + SmartDialog.showToast('取消收藏'); + } + } + } } diff --git a/lib/pages/fav_search/view.dart b/lib/pages/fav_search/view.dart index 37e3046f..9b2ab15d 100644 --- a/lib/pages/fav_search/view.dart +++ b/lib/pages/fav_search/view.dart @@ -8,9 +8,7 @@ import 'package:pilipala/pages/fav_detail/widget/fav_video_card.dart'; import 'controller.dart'; class FavSearchPage extends StatefulWidget { - final int? sourceType; - final int? mediaId; - const FavSearchPage({super.key, this.sourceType, this.mediaId}); + const FavSearchPage({super.key}); @override State createState() => _FavSearchPageState(); @@ -19,11 +17,12 @@ class FavSearchPage extends StatefulWidget { class _FavSearchPageState extends State { final FavSearchController _favSearchCtr = Get.put(FavSearchController()); late ScrollController scrollController; + late int searchType; @override void initState() { super.initState(); - + searchType = int.parse(Get.parameters['searchType']!); scrollController = _favSearchCtr.scrollController; scrollController.addListener( () { @@ -100,7 +99,11 @@ class _FavSearchPageState extends State { } else { return FavVideoCardH( videoItem: _favSearchCtr.favList[index], - callFn: () => null, + searchType: searchType, + callFn: () => searchType != 1 + ? _favSearchCtr + .onCancelFav(_favSearchCtr.favList[index].id!) + : {}, ); } }, From 3d5c578fefcf581b83ec0aa6377dcddc1dcfe90e Mon Sep 17 00:00:00 2001 From: guozhigq Date: Fri, 16 Feb 2024 11:00:23 +0800 Subject: [PATCH 090/220] =?UTF-8?q?mod:=20=E5=8A=A8=E6=80=81=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2upPanel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/dynamics/widgets/up_panel.dart | 35 ++++++++++++++---------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/lib/pages/dynamics/widgets/up_panel.dart b/lib/pages/dynamics/widgets/up_panel.dart index f1043fd8..84753ff9 100644 --- a/lib/pages/dynamics/widgets/up_panel.dart +++ b/lib/pages/dynamics/widgets/up_panel.dart @@ -36,8 +36,7 @@ class _UpPanelState extends State { } upList.insert( 0, - UpItem( - face: 'https://files.catbox.moe/8uc48f.png', uname: '全部动态', mid: -1), + UpItem(face: '', uname: '全部动态', mid: -1), ); userInfo = userInfoCache.get('userInfoCache'); upList.insert( @@ -56,7 +55,7 @@ class _UpPanelState extends State { floating: true, pinned: false, delegate: _SliverHeaderDelegate( - height: 124, + height: 126, child: Column( mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start, @@ -178,6 +177,9 @@ class _UpPanelState extends State { }, onLongPress: () { feedBack(); + if (data.mid == -1) { + return; + } String heroTag = Utils.makeHeroTag(data.mid); Get.toNamed('/member?mid=${data.mid}', arguments: {'face': data.face, 'heroTag': heroTag}); @@ -205,12 +207,19 @@ class _UpPanelState extends State { backgroundColor: data.type == 'live' ? Theme.of(context).colorScheme.secondaryContainer : Theme.of(context).colorScheme.primary, - child: NetworkImgLayer( - width: 49, - height: 49, - src: data.face, - type: 'avatar', - ), + child: data.face != '' + ? NetworkImgLayer( + width: 50, + height: 50, + src: data.face, + type: 'avatar', + ) + : const CircleAvatar( + radius: 25, + backgroundImage: AssetImage( + 'assets/images/noface.jpeg', + ), + ), ), Padding( padding: const EdgeInsets.only(top: 4), @@ -278,13 +287,11 @@ class UpPanelSkeleton extends StatelessWidget { mainAxisAlignment: MainAxisAlignment.center, children: [ Container( - width: 49, - height: 49, + width: 50, + height: 50, decoration: BoxDecoration( color: Theme.of(context).colorScheme.onInverseSurface, - borderRadius: const BorderRadius.all( - Radius.circular(24), - ), + borderRadius: BorderRadius.circular(50), ), ), Container( From 7a78729a4436416ef32aab0049a6ff79f79a4ed5 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Fri, 16 Feb 2024 18:23:34 +0800 Subject: [PATCH 091/220] =?UTF-8?q?fix:=20=E5=90=88=E9=9B=86=E5=88=87?= =?UTF-8?q?=E6=8D=A2=E6=8E=A8=E8=8D=90=E8=A7=86=E9=A2=91=E6=9C=AA=E5=88=B7?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../video/detail/introduction/controller.dart | 5 ++ .../video/detail/related/controller.dart | 12 ++- lib/pages/video/detail/related/view.dart | 87 ++++++++++++------- 3 files changed, 71 insertions(+), 33 deletions(-) diff --git a/lib/pages/video/detail/introduction/controller.dart b/lib/pages/video/detail/introduction/controller.dart index 4672b4bd..723e1355 100644 --- a/lib/pages/video/detail/introduction/controller.dart +++ b/lib/pages/video/detail/introduction/controller.dart @@ -18,6 +18,7 @@ import 'package:pilipala/utils/id_utils.dart'; import 'package:pilipala/utils/storage.dart'; import 'package:share_plus/share_plus.dart'; +import '../related/index.dart'; import 'widgets/group_panel.dart'; class VideoIntroController extends GetxController { @@ -478,11 +479,15 @@ class VideoIntroController extends GetxController { // 重新获取视频资源 final VideoDetailController videoDetailCtr = Get.find(tag: heroTag); + final ReleatedController releatedCtr = + Get.find(tag: heroTag); videoDetailCtr.bvid = bvid; videoDetailCtr.oid.value = aid; videoDetailCtr.cid.value = cid; videoDetailCtr.danmakuCid.value = cid; videoDetailCtr.queryVideoUrl(); + releatedCtr.bvid = bvid; + releatedCtr.queryRelatedVideo(); // 重新请求评论 try { /// 未渲染回复组件时可能异常 diff --git a/lib/pages/video/detail/related/controller.dart b/lib/pages/video/detail/related/controller.dart index f7042871..0578bba2 100644 --- a/lib/pages/video/detail/related/controller.dart +++ b/lib/pages/video/detail/related/controller.dart @@ -1,14 +1,22 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:pilipala/http/video.dart'; +import '../../../../models/model_hot_video_item.dart'; class ReleatedController extends GetxController { // 视频aid String bvid = Get.parameters['bvid'] ?? ""; // 推荐视频列表 - List relatedVideoList = []; + RxList relatedVideoList = [].obs; OverlayEntry? popupDialog; - Future queryRelatedVideo() => VideoHttp.relatedVideoList(bvid: bvid); + Future queryRelatedVideo() async { + return VideoHttp.relatedVideoList(bvid: bvid).then((value) { + if (value['status']) { + relatedVideoList.value = value['data']; + } + return value; + }); + } } diff --git a/lib/pages/video/detail/related/view.dart b/lib/pages/video/detail/related/view.dart index 51c296f3..0912724e 100644 --- a/lib/pages/video/detail/related/view.dart +++ b/lib/pages/video/detail/related/view.dart @@ -7,48 +7,73 @@ import 'package:pilipala/common/widgets/overlay_pop.dart'; import 'package:pilipala/common/widgets/video_card_h.dart'; import './controller.dart'; -class RelatedVideoPanel extends StatelessWidget { - final ReleatedController _releatedController = - Get.put(ReleatedController(), tag: Get.arguments?['heroTag']); - RelatedVideoPanel({super.key}); +class RelatedVideoPanel extends StatefulWidget { + const RelatedVideoPanel({super.key}); + + @override + State createState() => _RelatedVideoPanelState(); +} + +class _RelatedVideoPanelState extends State + with AutomaticKeepAliveClientMixin { + late ReleatedController _releatedController; + late Future _futureBuilder; + + @override + bool get wantKeepAlive => true; + + @override + void initState() { + super.initState(); + _releatedController = + Get.put(ReleatedController(), tag: Get.arguments?['heroTag']); + _futureBuilder = _releatedController.queryRelatedVideo(); + } @override Widget build(BuildContext context) { + super.build(context); return FutureBuilder( - future: _releatedController.queryRelatedVideo(), + future: _futureBuilder, builder: (BuildContext context, AsyncSnapshot snapshot) { if (snapshot.connectionState == ConnectionState.done) { if (snapshot.data == null) { return const SliverToBoxAdapter(child: SizedBox()); } - if (snapshot.data!['status']) { + if (snapshot.data!['status'] && snapshot.data != null) { + RxList relatedVideoList = _releatedController.relatedVideoList; // 请求成功 - return SliverList( + return Obx( + () => SliverList( delegate: SliverChildBuilderDelegate((context, index) { - if (index == snapshot.data['data'].length) { - return SizedBox(height: MediaQuery.of(context).padding.bottom); - } else { - return Material( - child: VideoCardH( - videoItem: snapshot.data['data'][index], - showPubdate: true, - longPress: () { - try { - _releatedController.popupDialog = - _createPopupDialog(snapshot.data['data'][index]); - Overlay.of(context) - .insert(_releatedController.popupDialog!); - } catch (err) { - return {}; - } - }, - longPressEnd: () { - _releatedController.popupDialog?.remove(); - }, - ), - ); - } - }, childCount: snapshot.data['data'].length + 1)); + if (index == relatedVideoList.length) { + return SizedBox( + height: MediaQuery.of(context).padding.bottom); + } else { + return Material( + child: VideoCardH( + videoItem: relatedVideoList[index], + showPubdate: true, + longPress: () { + try { + _releatedController.popupDialog = + _createPopupDialog(_releatedController + .relatedVideoList[index]); + Overlay.of(context) + .insert(_releatedController.popupDialog!); + } catch (err) { + return {}; + } + }, + longPressEnd: () { + _releatedController.popupDialog?.remove(); + }, + ), + ); + } + }, childCount: relatedVideoList.length + 1), + ), + ); } else { // 请求错误 return HttpError(errMsg: '出错了', fn: () {}); From 8950658f0818344c7306ac073bce00a2e5c96416 Mon Sep 17 00:00:00 2001 From: orz12 Date: Fri, 16 Feb 2024 19:52:21 +0800 Subject: [PATCH 092/220] =?UTF-8?q?mod:=20=E5=9B=BE=E7=89=87=E9=A2=84?= =?UTF-8?q?=E8=A7=88=E9=A1=B5=EF=BC=8C=E5=AE=89=E5=8D=93=E4=B9=9F=E9=9A=90?= =?UTF-8?q?=E8=97=8F=E7=8A=B6=E6=80=81=E6=A0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/preview/view.dart | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/lib/pages/preview/view.dart b/lib/pages/preview/view.dart index 1c37c833..dcffc973 100644 --- a/lib/pages/preview/view.dart +++ b/lib/pages/preview/view.dart @@ -102,15 +102,12 @@ class _ImagePreviewState extends State ); } - // 设置状态栏图标透明 + // 隐藏状态栏，避免遮挡图片内容 setStatusBar() async { - if (Platform.isIOS) { + if (Platform.isIOS || Platform.isAndroid) { await StatusBarControl.setHidden(true, animation: StatusBarAnimation.SLIDE); } - if (Platform.isAndroid) { - await StatusBarControl.setColor(Colors.transparent); - } } @override From 3d2c6a122ac652712a6ee82f7f16234ad790c5d7 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Fri, 16 Feb 2024 21:30:29 +0800 Subject: [PATCH 093/220] =?UTF-8?q?feat:=20=E5=85=85=E7=94=B5=E8=A7=86?= =?UTF-8?q?=E9=A2=91=E8=AF=95=E7=9C=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/models/video/play/url.dart | 31 +++++++++++++++++++++++++- lib/pages/video/detail/controller.dart | 23 ++++++++++++++++--- 2 files changed, 50 insertions(+), 4 deletions(-) diff --git a/lib/models/video/play/url.dart b/lib/models/video/play/url.dart index 4c43cb00..792cd50d 100644 --- a/lib/models/video/play/url.dart +++ b/lib/models/video/play/url.dart @@ -34,6 +34,7 @@ class PlayUrlModel { String? seekParam; String? seekType; Dash? dash; + List? durl; List? supportFormats; // String? highFormat; int? lastPlayTime; @@ -52,7 +53,8 @@ class PlayUrlModel { videoCodecid = json['video_codecid']; seekParam = json['seek_param']; seekType = json['seek_type']; - dash = Dash.fromJson(json['dash']); + dash = json['dash'] != null ? Dash.fromJson(json['dash']) : null; + durl = json['durl']?.map((e) => Durl.fromJson(e)).toList(); supportFormats = json['support_formats'] != null ? json['support_formats'] .map((e) => FormatItem.fromJson(e)) @@ -250,3 +252,30 @@ class Flac { audio = json['audio'] != null ? AudioItem.fromJson(json['audio']) : null; } } + +class Durl { + Durl({ + this.order, + this.length, + this.size, + this.ahead, + this.vhead, + this.url, + }); + + int? order; + int? length; + int? size; + String? ahead; + String? vhead; + String? url; + + Durl.fromJson(Map json) { + order = json['order']; + length = json['length']; + size = json['size']; + ahead = json['ahead']; + vhead = json['vhead']; + url = json['url']; + } +} diff --git a/lib/pages/video/detail/controller.dart b/lib/pages/video/detail/controller.dart index 0162654f..d0cf53a6 100644 --- a/lib/pages/video/detail/controller.dart +++ b/lib/pages/video/detail/controller.dart @@ -229,9 +229,11 @@ class VideoDetailController extends GetxController seekTo: seekToTime ?? defaultST, duration: duration ?? Duration(milliseconds: data.timeLength ?? 0), // 宽>高 水平 否则 垂直 - direction: (firstVideo.width! - firstVideo.height!) > 0 - ? 'horizontal' - : 'vertical', + direction: firstVideo.width != null && firstVideo.height != null + ? ((firstVideo.width! - firstVideo.height!) > 0 + ? 'horizontal' + : 'vertical') + : null, bvid: bvid, cid: cid.value, enableHeart: enableHeart, @@ -248,6 +250,21 @@ class VideoDetailController extends GetxController var result = await VideoHttp.videoUrl(cid: cid.value, bvid: bvid); if (result['status']) { data = result['data']; + if (data.acceptDesc!.isNotEmpty && data.acceptDesc!.contains('试看')) { + SmartDialog.showToast( + '该视频为专属视频，仅提供试看', + displayTime: const Duration(seconds: 3), + ); + videoUrl = data.durl!.first.url!; + audioUrl = ''; + defaultST = Duration.zero; + firstVideo = VideoItem(); + if (autoPlay.value) { + await playerInit(); + isShowCover.value = false; + } + return result; + } final List allVideosList = data.dash!.video!; try { // 当前可播放的最高质量视频 From 3c0f54bfd74b50f25d46466fceab768f7f604d96 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Fri, 16 Feb 2024 21:46:48 +0800 Subject: [PATCH 094/220] =?UTF-8?q?fix:=20app=E7=AB=AFmodel=20bvid=20null?= =?UTF-8?q?=20issues=20#546?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/models/home/rcmd/result.dart | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/models/home/rcmd/result.dart b/lib/models/home/rcmd/result.dart index 9363beb3..78747d1a 100644 --- a/lib/models/home/rcmd/result.dart +++ b/lib/models/home/rcmd/result.dart @@ -1,3 +1,5 @@ +import 'package:pilipala/utils/id_utils.dart'; + class RecVideoItemAppModel { RecVideoItemAppModel({ this.id, @@ -50,14 +52,15 @@ class RecVideoItemAppModel { ? json['player_args']['aid'] : int.parse(json['param'] ?? '-1'); aid = json['player_args'] != null ? json['player_args']['aid'] : -1; - bvid = null; + bvid = json['player_args'] != null + ? IdUtils.av2bv(json['player_args']['aid']) + : ''; cid = json['player_args'] != null ? json['player_args']['cid'] : -1; pic = json['cover']; stat = RcmdStat.fromJson(json); // 改用player_args中的duration作为原始数据（秒数） - duration = json['player_args'] != null - ? json['player_args']['duration'] - : -1; + duration = + json['player_args'] != null ? json['player_args']['duration'] : -1; //duration = json['cover_right_text']; title = json['title']; owner = RcmdOwner.fromJson(json); From e8f63f611441f7f7df2bc1c35cf8cc69f197f8a4 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sat, 17 Feb 2024 17:32:13 +0800 Subject: [PATCH 095/220] =?UTF-8?q?fix:=20up=E6=8A=95=E7=A8=BF=E5=8A=A8?= =?UTF-8?q?=E6=80=81=E9=A1=B5=E5=A2=9E=E5=8A=A0=E6=9C=AA=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E9=A3=8E=E6=8E=A7=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/http/member.dart | 10 ++++++++-- lib/pages/member_archive/view.dart | 11 +++++++++-- lib/pages/member_dynamics/view.dart | 11 +++++++++-- 3 files changed, 26 insertions(+), 6 deletions(-) diff --git a/lib/http/member.dart b/lib/http/member.dart index 6b6df7fe..82d2992b 100644 --- a/lib/http/member.dart +++ b/lib/http/member.dart @@ -101,10 +101,13 @@ class MemberHttp { 'data': MemberArchiveDataModel.fromJson(res.data['data']) }; } else { + Map errMap = { + -352: '风控校验失败，请检查登录状态', + }; return { 'status': false, 'data': [], - 'msg': res.data['message'], + 'msg': errMap[res.data['code']] ?? res.data['message'], }; } } @@ -123,10 +126,13 @@ class MemberHttp { 'data': DynamicsDataModel.fromJson(res.data['data']), }; } else { + Map errMap = { + -352: '风控校验失败，请检查登录状态', + }; return { 'status': false, 'data': [], - 'msg': res.data['message'], + 'msg': errMap[res.data['code']] ?? res.data['message'], }; } } diff --git a/lib/pages/member_archive/view.dart b/lib/pages/member_archive/view.dart index 43867323..3103683a 100644 --- a/lib/pages/member_archive/view.dart +++ b/lib/pages/member_archive/view.dart @@ -3,6 +3,7 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:pilipala/common/widgets/video_card_h.dart'; import 'package:pilipala/utils/utils.dart'; +import '../../common/widgets/http_error.dart'; import 'controller.dart'; class MemberArchivePage extends StatefulWidget { @@ -86,10 +87,16 @@ class _MemberArchivePageState extends State { : const SliverToBoxAdapter(), ); } else { - return const SliverToBoxAdapter(); + return HttpError( + errMsg: snapshot.data['msg'], + fn: () {}, + ); } } else { - return const SliverToBoxAdapter(); + return HttpError( + errMsg: snapshot.data['msg'], + fn: () {}, + ); } } else { return const SliverToBoxAdapter(); diff --git a/lib/pages/member_dynamics/view.dart b/lib/pages/member_dynamics/view.dart index fe7573fc..68aa72d7 100644 --- a/lib/pages/member_dynamics/view.dart +++ b/lib/pages/member_dynamics/view.dart @@ -4,6 +4,7 @@ import 'package:get/get.dart'; import 'package:pilipala/pages/member_dynamics/index.dart'; import 'package:pilipala/utils/utils.dart'; +import '../../common/widgets/http_error.dart'; import '../dynamics/widgets/dynamic_panel.dart'; class MemberDynamicsPage extends StatefulWidget { @@ -80,10 +81,16 @@ class _MemberDynamicsPageState extends State { : const SliverToBoxAdapter(), ); } else { - return const SliverToBoxAdapter(); + return HttpError( + errMsg: snapshot.data['msg'], + fn: () {}, + ); } } else { - return const SliverToBoxAdapter(); + return HttpError( + errMsg: snapshot.data['msg'], + fn: () {}, + ); } } else { return const SliverToBoxAdapter(); From 4811dc5ba5da887c69ea8b7304d162694c3237cb Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sun, 18 Feb 2024 08:11:11 +0800 Subject: [PATCH 096/220] fix: changeSeasonOrbangu aid null --- lib/pages/video/detail/introduction/controller.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/pages/video/detail/introduction/controller.dart b/lib/pages/video/detail/introduction/controller.dart index 723e1355..2c5e2dc5 100644 --- a/lib/pages/video/detail/introduction/controller.dart +++ b/lib/pages/video/detail/introduction/controller.dart @@ -482,7 +482,7 @@ class VideoIntroController extends GetxController { final ReleatedController releatedCtr = Get.find(tag: heroTag); videoDetailCtr.bvid = bvid; - videoDetailCtr.oid.value = aid; + videoDetailCtr.oid.value = aid ?? IdUtils.bv2av(bvid); videoDetailCtr.cid.value = cid; videoDetailCtr.danmakuCid.value = cid; videoDetailCtr.queryVideoUrl(); From 841d0f25f537c19aab3034cc8fa7b4afdc43038f Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sun, 18 Feb 2024 08:20:48 +0800 Subject: [PATCH 097/220] =?UTF-8?q?fix:=20=E8=AF=84=E8=AE=BA=E5=8C=BAjumpU?= =?UTF-8?q?rl=20BV=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../detail/reply/widgets/reply_item.dart | 41 +++++++++++-------- 1 file changed, 25 insertions(+), 16 deletions(-) diff --git a/lib/pages/video/detail/reply/widgets/reply_item.dart b/lib/pages/video/detail/reply/widgets/reply_item.dart index dc242216..5840b2bf 100644 --- a/lib/pages/video/detail/reply/widgets/reply_item.dart +++ b/lib/pages/video/detail/reply/widgets/reply_item.dart @@ -12,6 +12,7 @@ import 'package:pilipala/pages/preview/index.dart'; import 'package:pilipala/pages/video/detail/index.dart'; import 'package:pilipala/pages/video/detail/reply_new/index.dart'; import 'package:pilipala/utils/feed_back.dart'; +import 'package:pilipala/utils/id_utils.dart'; import 'package:pilipala/utils/storage.dart'; import 'package:pilipala/utils/url_utils.dart'; import 'package:pilipala/utils/utils.dart'; @@ -620,26 +621,34 @@ InlineSpan buildContent( ..onTap = () async { final String title = content.jumpUrl[matchStr]['title']; if (appUrlSchema == '') { - final String redirectUrl = - await UrlUtils.parseRedirectUrl(matchStr); - final String pathSegment = Uri.parse(redirectUrl).path; - final String lastPathSegment = - pathSegment.split('/').last; - if (lastPathSegment.startsWith('BV')) { + if (matchStr.startsWith('BV')) { UrlUtils.matchUrlPush( - lastPathSegment, + matchStr, title, - redirectUrl, + '', ); } else { - Get.toNamed( - '/webview', - parameters: { - 'url': redirectUrl, - 'type': 'url', - 'pageTitle': title - }, - ); + final String redirectUrl = + await UrlUtils.parseRedirectUrl(matchStr); + final String pathSegment = Uri.parse(redirectUrl).path; + final String lastPathSegment = + pathSegment.split('/').last; + if (lastPathSegment.startsWith('BV')) { + UrlUtils.matchUrlPush( + lastPathSegment, + title, + redirectUrl, + ); + } else { + Get.toNamed( + '/webview', + parameters: { + 'url': redirectUrl, + 'type': 'url', + 'pageTitle': title + }, + ); + } } } else { if (appUrlSchema.startsWith('bilibili://search')) { From bcf94e287ae325011677ce26b9eb9926246201e9 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sun, 18 Feb 2024 23:44:21 +0800 Subject: [PATCH 098/220] =?UTF-8?q?mod:=20=E4=BF=AE=E6=94=B9=E6=94=B6?= =?UTF-8?q?=E8=97=8F=E8=A7=86=E9=A2=91=E5=93=8D=E5=BA=94=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bangumi/introduction/controller.dart | 14 +++++------- lib/pages/fav_detail/controller.dart | 14 +++++------- lib/pages/fav_search/controller.dart | 14 +++++------- .../video/detail/introduction/controller.dart | 22 ++++++++----------- 4 files changed, 27 insertions(+), 37 deletions(-) diff --git a/lib/pages/bangumi/introduction/controller.dart b/lib/pages/bangumi/introduction/controller.dart index 13dd50c0..6b3123ea 100644 --- a/lib/pages/bangumi/introduction/controller.dart +++ b/lib/pages/bangumi/introduction/controller.dart @@ -218,14 +218,12 @@ class BangumiIntroController extends GetxController { addIds: addMediaIdsNew.join(','), delIds: delMediaIdsNew.join(',')); if (result['status']) { - if (result['data']['prompt']) { - addMediaIdsNew = []; - delMediaIdsNew = []; - Get.back(); - // 重新获取收藏状态 - queryHasFavVideo(); - SmartDialog.showToast('✅ 操作成功'); - } + addMediaIdsNew = []; + delMediaIdsNew = []; + // 重新获取收藏状态 + queryHasFavVideo(); + SmartDialog.showToast('✅ 操作成功'); + Get.back(); } } diff --git a/lib/pages/fav_detail/controller.dart b/lib/pages/fav_detail/controller.dart index c2c63dd5..95130be6 100644 --- a/lib/pages/fav_detail/controller.dart +++ b/lib/pages/fav_detail/controller.dart @@ -60,16 +60,14 @@ class FavDetailController extends GetxController { var result = await VideoHttp.favVideo( aid: id, addIds: '', delIds: mediaId.toString()); if (result['status']) { - if (result['data']['prompt']) { - List dataList = favList; - for (var i in dataList) { - if (i.id == id) { - dataList.remove(i); - break; - } + List dataList = favList; + for (var i in dataList) { + if (i.id == id) { + dataList.remove(i); + break; } - SmartDialog.showToast('取消收藏'); } + SmartDialog.showToast('取消收藏'); } } diff --git a/lib/pages/fav_search/controller.dart b/lib/pages/fav_search/controller.dart index abd25e0b..371a3a07 100644 --- a/lib/pages/fav_search/controller.dart +++ b/lib/pages/fav_search/controller.dart @@ -80,16 +80,14 @@ class FavSearchController extends GetxController { var result = await VideoHttp.favVideo( aid: id, addIds: '', delIds: mediaId.toString()); if (result['status']) { - if (result['data']['prompt']) { - List dataList = favList; - for (var i in dataList) { - if (i.id == id) { - dataList.remove(i); - break; - } + List dataList = favList; + for (var i in dataList) { + if (i.id == id) { + dataList.remove(i); + break; } - SmartDialog.showToast('取消收藏'); } + SmartDialog.showToast('取消收藏'); } } } diff --git a/lib/pages/video/detail/introduction/controller.dart b/lib/pages/video/detail/introduction/controller.dart index 2c5e2dc5..26cbd2e0 100644 --- a/lib/pages/video/detail/introduction/controller.dart +++ b/lib/pages/video/detail/introduction/controller.dart @@ -305,11 +305,9 @@ class VideoIntroController extends GetxController { delIds: favStatus == 1 ? '$defaultFolderId' : '', ); if (result['status']) { - if (result['data']['prompt']) { - // 重新获取收藏状态 - await queryHasFavVideo(); - SmartDialog.showToast('✅ 操作成功'); - } + // 重新获取收藏状态 + await queryHasFavVideo(); + SmartDialog.showToast('✅ 操作成功'); } else { SmartDialog.showToast(result['msg']); } @@ -334,14 +332,12 @@ class VideoIntroController extends GetxController { delIds: delMediaIdsNew.join(',')); SmartDialog.dismiss(); if (result['status']) { - if (result['data']['prompt']) { - addMediaIdsNew = []; - delMediaIdsNew = []; - Get.back(); - // 重新获取收藏状态 - await queryHasFavVideo(); - SmartDialog.showToast('✅ 操作成功'); - } + addMediaIdsNew = []; + delMediaIdsNew = []; + Get.back(); + // 重新获取收藏状态 + await queryHasFavVideo(); + SmartDialog.showToast('✅ 操作成功'); } else { SmartDialog.showToast(result['msg']); } From fce96d497689b18959995baddcbe1a45eccbfcf0 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Tue, 20 Feb 2024 23:54:45 +0800 Subject: [PATCH 099/220] =?UTF-8?q?feat:=20=E8=AF=84=E8=AE=BA=E8=AF=9D?= =?UTF-8?q?=E9=A2=98=E5=8C=B9=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/models/video/reply/content.dart | 3 +++ .../detail/reply/widgets/reply_item.dart | 20 ++++++++++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/lib/models/video/reply/content.dart b/lib/models/video/reply/content.dart index 9180ec97..d62a4bca 100644 --- a/lib/models/video/reply/content.dart +++ b/lib/models/video/reply/content.dart @@ -9,6 +9,7 @@ class ReplyContent { this.vote, this.richText, this.isText, + this.topicsMeta, }); String? message; @@ -20,6 +21,7 @@ class ReplyContent { Map? vote; Map? richText; bool? isText; + Map? topicsMeta; ReplyContent.fromJson(Map json) { message = json['message'] @@ -39,6 +41,7 @@ class ReplyContent { richText = json['rich_text'] ?? {}; // 不包含@ 笔记 图片的时候，文字可折叠 isText = atNameToMid!.isEmpty && vote!.isEmpty && pictures!.isEmpty; + topicsMeta = json['topics_meta'] ?? {}; } } diff --git a/lib/pages/video/detail/reply/widgets/reply_item.dart b/lib/pages/video/detail/reply/widgets/reply_item.dart index 7991a366..d0b2b0e5 100644 --- a/lib/pages/video/detail/reply/widgets/reply_item.dart +++ b/lib/pages/video/detail/reply/widgets/reply_item.dart @@ -582,6 +582,7 @@ InlineSpan buildContent( // 构建正则表达式 final List specialTokens = [ ...content.emote.keys, + ...content.topicsMeta?.keys?.map((e) => '#$e#') ?? [], ...content.atNameToMid.keys.map((e) => '@$e'), ...content.jumpUrl.keys.map((e) => e.replaceAll('?', '\\?').replaceAll('+', '\\+').replaceAll('*', '\\*')), @@ -664,7 +665,7 @@ InlineSpan buildContent( ), ); } else { - // print("matchStr=$matchStr"); + print("matchStr=$matchStr"); String appUrlSchema = ''; final bool enableWordRe = setting.get(SettingBoxKey.enableWordRe, defaultValue: false) as bool; @@ -727,6 +728,23 @@ InlineSpan buildContent( ); // 只显示一次 matchedStrs.add(matchStr); + } else if (content + .topicsMeta[matchStr.substring(1, matchStr.length - 1)] != + null) { + spanChilds.add( + TextSpan( + text: matchStr, + style: TextStyle( + color: Theme.of(context).colorScheme.primary, + ), + recognizer: TapGestureRecognizer() + ..onTap = () { + final String topic = + matchStr.substring(1, matchStr.length - 1); + Get.toNamed('/searchResult', parameters: {'keyword': topic}); + }, + ), + ); } else { addPlainTextSpan(matchStr); } From a0f92df5b558cfb002c9c8142282bd4eae2835d6 Mon Sep 17 00:00:00 2001 From: My-Responsitories <107370289+My-Responsitories@users.noreply.github.com> Date: Wed, 21 Feb 2024 13:16:38 +0800 Subject: [PATCH 100/220] fix dynamic risk challenge --- lib/http/api.dart | 6 ++++++ lib/http/init.dart | 42 ++++++++++++++++++++++++++++++++++++------ lib/http/member.dart | 8 +++++++- lib/utils/utils.dart | 15 ++++++++++++++- 4 files changed, 63 insertions(+), 8 deletions(-) diff --git a/lib/http/api.dart b/lib/http/api.dart index 4b6bbeb8..2e758439 100644 --- a/lib/http/api.dart +++ b/lib/http/api.dart @@ -477,4 +477,10 @@ class Api { /// 获取未读动态数 static const getUnreadDynamic = '/x/web-interface/dynamic/entrance'; + + /// 用户动态主页 + static const dynamicSpmPrefix = 'https://space.bilibili.com/1/dynamic'; + + /// 激活buvid3 + static const activateBuvidApi = '/x/internal/gaia-gateway/ExClimbWuzhi'; } diff --git a/lib/http/init.dart b/lib/http/init.dart index dcc9f402..a0b36369 100644 --- a/lib/http/init.dart +++ b/lib/http/init.dart @@ -1,7 +1,9 @@ // ignore_for_file: avoid_print import 'dart:async'; +import 'dart:convert'; import 'dart:developer'; import 'dart:io'; +import 'dart:math' show Random; import 'package:cookie_jar/cookie_jar.dart'; import 'package:dio/dio.dart'; import 'package:dio/io.dart'; @@ -11,6 +13,7 @@ import 'package:hive/hive.dart'; import 'package:pilipala/utils/id_utils.dart'; import '../utils/storage.dart'; import '../utils/utils.dart'; +import 'api.dart'; import 'constants.dart'; import 'interceptor.dart'; @@ -24,6 +27,7 @@ class Request { late bool enableSystemProxy; late String systemProxyHost; late String systemProxyPort; + static final RegExp spmPrefixExp = RegExp(r''); /// 设置cookie static setCookie() async { @@ -51,13 +55,12 @@ class Request { } setOptionsHeaders(userInfo, userInfo != null && userInfo.mid != null); - if (cookie.isEmpty) { - try { - await Request().get(HttpString.baseUrl); - } catch (e) { - log("setCookie, ${e.toString()}"); - } + try { + await buvidActivate(); + } catch (e) { + log("setCookie, ${e.toString()}"); } + final String cookieString = cookie .map((Cookie cookie) => '${cookie.name}=${cookie.value}') .join('; '); @@ -87,6 +90,33 @@ class Request { dio.options.headers['referer'] = 'https://www.bilibili.com/'; } + static Future buvidActivate() async { + var html = await Request().get(Api.dynamicSpmPrefix); + String spmPrefix = spmPrefixExp.firstMatch(html.data)!.group(1)!; + Random rand = Random(); + String rand_png_end = base64.encode( + List.generate(32, (_) => rand.nextInt(256)) + + List.filled(4, 0) + + [73, 69, 78, 68] + + List.generate(4, (_) => rand.nextInt(256)) + ); + + String jsonData = json.encode({ + '3064': 1, + '39c8': '${spmPrefix}.fp.risk', + '3c43': { + 'adca': 'Linux', + 'bfe9': rand_png_end.substring(rand_png_end.length - 50), + }, + }); + + await Request().post( + Api.activateBuvidApi, + data: {'payload': jsonData}, + options: Options(contentType: 'application/json') + ); + } + /* * config it and create */ diff --git a/lib/http/member.dart b/lib/http/member.dart index 82d2992b..1af0f9a4 100644 --- a/lib/http/member.dart +++ b/lib/http/member.dart @@ -79,6 +79,8 @@ class MemberHttp { String order = 'pubdate', bool orderAvoided = true, }) async { + String dmImgStr = Utils.base64EncodeRandomString(16, 64); + String dmCoverImgStr = Utils.base64EncodeRandomString(32, 128); Map params = await WbiSign().makSign({ 'mid': mid, 'ps': ps, @@ -88,7 +90,11 @@ class MemberHttp { 'order': order, 'platform': 'web', 'web_location': 1550101, - 'order_avoided': orderAvoided + 'order_avoided': orderAvoided, + 'dm_img_list': '[]', + 'dm_img_str': dmImgStr.substring(0, dmImgStr.length - 2), + 'dm_cover_img_str': dmCoverImgStr.substring(0, dmCoverImgStr.length - 2), + 'dm_img_inter': '{"ds":[],"wh":[0,0,0],"of":[0,0,0]}', }); var res = await Request().get( Api.memberArchive, diff --git a/lib/utils/utils.dart b/lib/utils/utils.dart index d68ac51b..09d8c97f 100644 --- a/lib/utils/utils.dart +++ b/lib/utils/utils.dart @@ -16,6 +16,8 @@ import '../http/index.dart'; import '../models/github/latest.dart'; class Utils { + static final Random random = Random(); + static Future getCookiePath() async { final Directory tempDir = await getApplicationSupportDirectory(); final String tempPath = "${tempDir.path}/.plpl/"; @@ -180,7 +182,7 @@ class Utils { } static String makeHeroTag(v) { - return v.toString() + Random().nextInt(9999).toString(); + return v.toString() + random.nextInt(9999).toString(); } static int duration(String duration) { @@ -340,4 +342,15 @@ class Utils { return md5String; } + + static List generateRandomBytes(int minLength, int maxLength) { + return List.generate( + random.nextInt(maxLength-minLength+1), (_) => random.nextInt(0x60) + 0x20 + ); + } + + static String base64EncodeRandomString(int minLength, int maxLength) { + List randomBytes = generateRandomBytes(minLength, maxLength); + return base64.encode(randomBytes); + } } From 740d5f1ddd2d52f48ae3b3dfd5ee60ad59951b7a Mon Sep 17 00:00:00 2001 From: guozhigq Date: Wed, 21 Feb 2024 23:27:32 +0800 Subject: [PATCH 101/220] =?UTF-8?q?fix:=20=E8=A7=86=E9=A2=91=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E9=A1=B5=E7=82=B9=E5=87=BB=E4=B8=BB=E9=A1=B5=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E5=8D=A1=E6=AD=BB=20issues=20#562?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/video/detail/view.dart | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/pages/video/detail/view.dart b/lib/pages/video/detail/view.dart index 14311cc9..3d315804 100644 --- a/lib/pages/video/detail/view.dart +++ b/lib/pages/video/detail/view.dart @@ -225,7 +225,10 @@ class _VideoDetailPageState extends State @override // 返回当前页面时 void didPopNext() async { - setState(() => isShowing = true); + if (plPlayerController != null && + plPlayerController!.videoPlayerController != null) { + setState(() => isShowing = true); + } videoDetailController.isFirstTime = false; final bool autoplay = autoPlayEnable; videoDetailController.playerInit(autoplay: autoplay); From 5746b85b275945ef1c88725a2891b70f7e8aae38 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Thu, 22 Feb 2024 00:17:38 +0800 Subject: [PATCH 102/220] =?UTF-8?q?fix:=20=E8=A7=86=E9=A2=91=E5=85=A8?= =?UTF-8?q?=E5=B1=8F=E9=81=AE=E6=8C=A1=20issues=20#347?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/video/detail/controller.dart | 13 +++++++++++-- lib/pages/video/detail/view.dart | 9 +++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/lib/pages/video/detail/controller.dart b/lib/pages/video/detail/controller.dart index d0cf53a6..7465c6f2 100644 --- a/lib/pages/video/detail/controller.dart +++ b/lib/pages/video/detail/controller.dart @@ -90,6 +90,8 @@ class VideoDetailController extends GetxController late String cacheDecode; late int cacheAudioQa; + PersistentBottomSheetController? replyReplyBottomSheetCtr; + @override void onInit() { super.onInit(); @@ -140,7 +142,7 @@ class VideoDetailController extends GetxController } showReplyReplyPanel() { - PersistentBottomSheetController? ctr = + replyReplyBottomSheetCtr = scaffoldKey.currentState?.showBottomSheet((BuildContext context) { return VideoReplyReplyPanel( oid: oid.value, @@ -153,7 +155,7 @@ class VideoDetailController extends GetxController source: 'videoDetail', ); }); - ctr?.closed.then((value) { + replyReplyBottomSheetCtr?.closed.then((value) { fRpid = 0; }); } @@ -372,4 +374,11 @@ class VideoDetailController extends GetxController } return result; } + + // mob端全屏状态关闭二级回复 + hiddenReplyReplyPanel() { + replyReplyBottomSheetCtr != null + ? replyReplyBottomSheetCtr!.close() + : print('replyReplyBottomSheetCtr is null'); + } } diff --git a/lib/pages/video/detail/view.dart b/lib/pages/video/detail/view.dart index 3d315804..febca105 100644 --- a/lib/pages/video/detail/view.dart +++ b/lib/pages/video/detail/view.dart @@ -92,6 +92,7 @@ class _VideoDetailPageState extends State videoSourceInit(); appbarStreamListen(); lifecycleListener(); + fullScreenStatusListener(); } // 获取视频资源，初始化播放器 @@ -188,6 +189,14 @@ class _VideoDetailPageState extends State ); } + void fullScreenStatusListener() { + plPlayerController?.isFullScreen.listen((bool isFullScreen) { + if (isFullScreen) { + videoDetailController.hiddenReplyReplyPanel(); + } + }); + } + @override void dispose() { shutdownTimerService.handleWaitingFinished(); From 35dc94014c8346fd28a8c03bd0a97bbdd58b35cc Mon Sep 17 00:00:00 2001 From: guozhigq Date: Fri, 23 Feb 2024 00:30:26 +0800 Subject: [PATCH 103/220] =?UTF-8?q?mod:=20=E7=9B=B4=E6=92=ADmcdn=E9=93=BE?= =?UTF-8?q?=E6=8E=A5=E6=9B=BF=E6=8D=A2=20issues=20#568?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/live_room/controller.dart | 13 ++++++++++--- lib/utils/video_utils.dart | 13 +++++++++++-- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/lib/pages/live_room/controller.dart b/lib/pages/live_room/controller.dart index ee7b8214..2bb1cd0a 100644 --- a/lib/pages/live_room/controller.dart +++ b/lib/pages/live_room/controller.dart @@ -4,6 +4,8 @@ import 'package:pilipala/http/live.dart'; import 'package:pilipala/models/live/room_info.dart'; import 'package:pilipala/plugin/pl_player/index.dart'; import '../../models/live/room_info_h5.dart'; +import '../../utils/storage.dart'; +import '../../utils/video_utils.dart'; class LiveRoomController extends GetxController { String cover = ''; @@ -16,6 +18,7 @@ class LiveRoomController extends GetxController { PlPlayerController plPlayerController = PlPlayerController.getInstance(videoType: 'live'); Rx roomInfoH5 = RoomInfoH5Model().obs; + late bool enableCDN; @override void onInit() { @@ -31,6 +34,8 @@ class LiveRoomController extends GetxController { cover = liveItem.cover; } } + // CDN优化 + enableCDN = setting.get(SettingBoxKey.enableCDN, defaultValue: true); } playerInit(source) async { @@ -57,9 +62,11 @@ class LiveRoomController extends GetxController { List codec = res['data'].playurlInfo.playurl.stream.first.format.first.codec; CodecItem item = codec.first; - String videoUrl = (item.urlInfo?.first.host)! + - item.baseUrl! + - item.urlInfo!.first.extra!; + String videoUrl = enableCDN + ? VideoUtils.getCdnUrl(item) + : (item.urlInfo?.first.host)! + + item.baseUrl! + + item.urlInfo!.first.extra!; await playerInit(videoUrl); return res; } diff --git a/lib/utils/video_utils.dart b/lib/utils/video_utils.dart index 88faba3c..a4bdd027 100644 --- a/lib/utils/video_utils.dart +++ b/lib/utils/video_utils.dart @@ -1,5 +1,7 @@ import 'package:pilipala/models/video/play/url.dart'; +import '../models/live/room_info.dart'; + class VideoUtils { static String getCdnUrl(dynamic item) { var backupUrl = ""; @@ -12,13 +14,20 @@ class VideoUtils { } else if (item is AudioItem) { backupUrl = item.backupUrl ?? ""; videoUrl = backupUrl.contains("http") ? backupUrl : (item.baseUrl ?? ""); + } else if (item is CodecItem) { + backupUrl = (item.urlInfo?.first.host)! + + item.baseUrl! + + item.urlInfo!.first.extra!; + videoUrl = backupUrl.contains("http") ? backupUrl : (item.baseUrl ?? ""); } else { return ""; } /// issues #70 - if (videoUrl.contains(".mcdn.bilivideo") || - videoUrl.contains("/upgcxcode/")) { + if (videoUrl.contains(".mcdn.bilivideo")) { + videoUrl = + 'https://proxy-tf-all-ws.bilivideo.com/?url=${Uri.encodeComponent(videoUrl)}'; + } else if (videoUrl.contains("/upgcxcode/")) { //CDN列表 var cdnList = { 'ali': 'upos-sz-mirrorali.bilivideo.com', From 02cc1646359ad032c0088874c7779009aa41613d Mon Sep 17 00:00:00 2001 From: guozhigq Date: Fri, 23 Feb 2024 22:44:10 +0800 Subject: [PATCH 104/220] =?UTF-8?q?feat:=20=E9=A6=96=E9=A1=B5tabbar?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=AE=BE=E7=BD=AE=20issues=20#564?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/home/controller.dart | 3 + lib/pages/home/view.dart | 88 ++++++++++++++++++++-------- lib/pages/setting/style_setting.dart | 6 ++ lib/utils/storage.dart | 3 +- 4 files changed, 75 insertions(+), 25 deletions(-) diff --git a/lib/pages/home/controller.dart b/lib/pages/home/controller.dart index 685ff5c3..9f6f8ac5 100644 --- a/lib/pages/home/controller.dart +++ b/lib/pages/home/controller.dart @@ -26,6 +26,7 @@ class HomeController extends GetxController with GetTickerProviderStateMixin { late List defaultTabs; late List tabbarSort; RxString defaultSearch = ''.obs; + late bool enableGradientBg; @override void onInit() { @@ -40,6 +41,8 @@ class HomeController extends GetxController with GetTickerProviderStateMixin { if (setting.get(SettingBoxKey.enableSearchWord, defaultValue: true)) { searchDefault(); } + enableGradientBg = + setting.get(SettingBoxKey.enableGradientBg, defaultValue: true); } void onRefresh() { diff --git a/lib/pages/home/view.dart b/lib/pages/home/view.dart index ce7b46c6..91d0ea8c 100644 --- a/lib/pages/home/view.dart +++ b/lib/pages/home/view.dart @@ -48,38 +48,48 @@ class _HomePageState extends State super.build(context); Brightness currentBrightness = MediaQuery.of(context).platformBrightness; // 设置状态栏图标的亮度 - SystemChrome.setSystemUIOverlayStyle(SystemUiOverlayStyle( - statusBarIconBrightness: currentBrightness == Brightness.light - ? Brightness.dark - : Brightness.light, - )); + if (_homeController.enableGradientBg) { + SystemChrome.setSystemUIOverlayStyle(SystemUiOverlayStyle( + statusBarIconBrightness: currentBrightness == Brightness.light + ? Brightness.dark + : Brightness.light, + )); + } return Scaffold( extendBody: true, extendBodyBehindAppBar: true, body: Stack( children: [ // gradient background - Align( - alignment: Alignment.topLeft, - child: Opacity( - opacity: 0.6, - child: Container( - width: MediaQuery.of(context).size.width, - height: MediaQuery.of(context).size.height, - decoration: BoxDecoration( - gradient: LinearGradient( - colors: [ - Theme.of(context).colorScheme.primary.withOpacity(0.9), - Theme.of(context).colorScheme.primary.withOpacity(0.5), - Theme.of(context).colorScheme.surface - ], - begin: Alignment.topLeft, - end: Alignment.bottomRight, - stops: const [0, 0.0034, 0.34]), + if (_homeController.enableGradientBg) ...[ + Align( + alignment: Alignment.topLeft, + child: Opacity( + opacity: 0.6, + child: Container( + width: MediaQuery.of(context).size.width, + height: MediaQuery.of(context).size.height, + decoration: BoxDecoration( + gradient: LinearGradient( + colors: [ + Theme.of(context) + .colorScheme + .primary + .withOpacity(0.9), + Theme.of(context) + .colorScheme + .primary + .withOpacity(0.5), + Theme.of(context).colorScheme.surface + ], + begin: Alignment.topLeft, + end: Alignment.bottomRight, + stops: const [0, 0.0034, 0.34]), + ), ), ), ), - ), + ], Column( children: [ CustomAppBar( @@ -90,7 +100,37 @@ class _HomePageState extends State callback: showUserBottomSheet, ), if (_homeController.tabs.length > 1) ...[ - const CustomTabs(), + if (_homeController.enableGradientBg) ...[ + const CustomTabs(), + ] else ...[ + const SizedBox(height: 4), + SizedBox( + width: double.infinity, + height: 42, + child: Align( + alignment: Alignment.center, + child: TabBar( + controller: _homeController.tabController, + tabs: [ + for (var i in _homeController.tabs) + Tab(text: i['label']) + ], + isScrollable: true, + dividerColor: Colors.transparent, + enableFeedback: true, + splashBorderRadius: BorderRadius.circular(10), + tabAlignment: TabAlignment.center, + onTap: (value) { + feedBack(); + if (_homeController.initialIndex.value == value) { + _homeController.tabsCtrList[value]().animateToTop(); + } + _homeController.initialIndex.value = value; + }, + ), + ), + ), + ], ] else ...[ const SizedBox(height: 6), ], diff --git a/lib/pages/setting/style_setting.dart b/lib/pages/setting/style_setting.dart index fb3c780a..c9bffa69 100644 --- a/lib/pages/setting/style_setting.dart +++ b/lib/pages/setting/style_setting.dart @@ -102,6 +102,12 @@ class _StyleSettingState extends State { defaultVal: true, needReboot: true, ), + const SetSwitchItem( + title: '首页底栏背景渐变', + setKey: SettingBoxKey.enableGradientBg, + defaultVal: true, + needReboot: true, + ), ListTile( onTap: () async { int? result = await showDialog( diff --git a/lib/utils/storage.dart b/lib/utils/storage.dart index 41ec0ce8..16cef463 100644 --- a/lib/utils/storage.dart +++ b/lib/utils/storage.dart @@ -135,7 +135,8 @@ class SettingBoxKey { hideSearchBar = 'hideSearchBar', // 收起顶栏 hideTabBar = 'hideTabBar', // 收起底栏 tabbarSort = 'tabbarSort', // 首页tabbar - dynamicBadgeMode = 'dynamicBadgeMode'; + dynamicBadgeMode = 'dynamicBadgeMode', + enableGradientBg = 'enableGradientBg'; } class LocalCacheKey { From b1a05c5c27bf30c2a1b502ee28dcd4ad0063cf8c Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sat, 24 Feb 2024 01:38:27 +0800 Subject: [PATCH 105/220] =?UTF-8?q?mod:=20=E4=BF=AE=E6=94=B9=E5=85=B3?= =?UTF-8?q?=E4=BA=8E=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/about/index.dart | 145 +++++++++++++++++++++++++++---------- 1 file changed, 106 insertions(+), 39 deletions(-) diff --git a/lib/pages/about/index.dart b/lib/pages/about/index.dart index 0f159ce7..41ee1516 100644 --- a/lib/pages/about/index.dart +++ b/lib/pages/about/index.dart @@ -53,29 +53,54 @@ class _AboutPageState extends State { style: Theme.of(context).textTheme.titleMedium, ), const SizedBox(height: 6), - Text( - '使用Flutter开发的哔哩哔哩第三方客户端', - style: TextStyle(color: Theme.of(context).colorScheme.outline), - ), - const SizedBox(height: 20), Obx( - () => ListTile( - title: const Text('当前版本'), - trailing: Text(_aboutController.currentVersion.value, - style: subTitleStyle), - ), - ), - Obx( - () => ListTile( - onTap: () => _aboutController.onUpdate(), - title: const Text('最新版本'), - trailing: Text( - _aboutController.isLoading.value - ? '正在获取' - : _aboutController.isUpdate.value - ? '有新版本 ❤️${_aboutController.remoteVersion.value}' - : '当前已是最新版', - style: subTitleStyle, + () => Badge( + isLabelVisible: _aboutController.isLoading.value + ? false + : _aboutController.isUpdate.value, + label: const Text('New'), + child: Padding( + padding: const EdgeInsets.fromLTRB(0, 0, 0, 30), + child: FilledButton.tonal( + onPressed: () { + showModalBottomSheet( + context: context, + builder: (context) { + return Column( + mainAxisSize: MainAxisSize.min, + children: [ + ListTile( + onTap: () => _aboutController.githubRelease(), + title: const Text('Github下载'), + ), + ListTile( + onTap: () => _aboutController.panDownload(), + title: const Text('网盘下载'), + ), + ListTile( + onTap: () => _aboutController.webSiteUrl(), + title: const Text('官网下载'), + ), + ListTile( + onTap: () => _aboutController.qimiao(), + title: const Text('奇妙应用'), + ), + SizedBox( + height: + MediaQuery.of(context).padding.bottom + + 20) + ], + ); + }, + ); + }, + child: Text( + 'V${_aboutController.currentVersion.value}', + style: subTitleStyle.copyWith( + color: Theme.of(context).primaryColor, + ), + ), + ), ), ), ), @@ -87,14 +112,9 @@ class _AboutPageState extends State { // size: 16, // ), // ), - Divider( - thickness: 1, - height: 30, - color: Theme.of(context).colorScheme.outlineVariant, - ), ListTile( onTap: () => _aboutController.githubUrl(), - title: const Text('Github'), + title: const Text('开源地址'), trailing: Text( 'github.com/guozhigq/pilipala', style: subTitleStyle, @@ -129,19 +149,43 @@ class _AboutPageState extends State { ), ), ListTile( - onTap: () => _aboutController.qqChanel(), - title: const Text('QQ群'), + onTap: () { + showModalBottomSheet( + context: context, + builder: (context) { + return Column( + mainAxisSize: MainAxisSize.min, + children: [ + ListTile( + onTap: () => _aboutController.qqChanel(), + title: const Text('QQ群'), + trailing: Text( + '616150809', + style: subTitleStyle, + ), + ), + ListTile( + onTap: () => _aboutController.tgChanel(), + title: const Text('TG频道'), + trailing: Text( + 'https://t.me/+lm_oOVmF0RJiODk1', + style: subTitleStyle, + ), + ), + SizedBox( + height: MediaQuery.of(context).padding.bottom + 20) + ], + ); + }, + ); + }, + title: const Text('交流社区'), trailing: Icon( Icons.arrow_forward_ios, size: 16, color: outline, ), ), - ListTile( - onTap: () => _aboutController.tgChanel(), - title: const Text('TG频道'), - trailing: Icon(Icons.arrow_forward_ios, size: 16, color: outline), - ), ListTile( onTap: () => _aboutController.aPay(), title: const Text('赞助'), @@ -163,6 +207,7 @@ class _AboutPageState extends State { subtitle: Text('图片及网络缓存 $cacheSize', style: subTitleStyle), trailing: Icon(Icons.arrow_forward_ios, size: 16, color: outline), ), + SizedBox(height: MediaQuery.of(context).padding.bottom + 20) ], ), ), @@ -230,11 +275,26 @@ class AboutController extends GetxController { ); } + githubRelease() { + launchUrl( + Uri.parse('https://github.com/guozhigq/pilipala/release'), + mode: LaunchMode.externalApplication, + ); + } + // 从网盘下载 panDownload() { - launchUrl( - Uri.parse('https://www.123pan.com/s/9sVqVv-flu0A.html'), - mode: LaunchMode.externalApplication, + Clipboard.setData( + const ClipboardData(text: 'pili'), + ); + SmartDialog.showToast( + '已复制提取码：pili', + displayTime: const Duration(milliseconds: 500), + ).then( + (value) => launchUrl( + Uri.parse('https://www.123pan.com/s/9sVqVv-flu0A.html'), + mode: LaunchMode.externalApplication, + ), ); } @@ -250,7 +310,7 @@ class AboutController extends GetxController { // qq频道 qqChanel() { Clipboard.setData( - const ClipboardData(text: '489981949'), + const ClipboardData(text: '616150809'), ); SmartDialog.showToast('已复制QQ群号'); } @@ -291,6 +351,13 @@ class AboutController extends GetxController { ); } + qimiao() { + launchUrl( + Uri.parse('https://www.magicalapk.com/home'), + mode: LaunchMode.externalApplication, + ); + } + // 日志 logs() { Get.toNamed('/logs'); From e2befb11ff5903524fa8e33ebe6fe0b8525a426d Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sat, 24 Feb 2024 02:37:16 +0800 Subject: [PATCH 106/220] =?UTF-8?q?feat:=20=E6=A8=AA=E5=B1=8F=E5=85=A8?= =?UTF-8?q?=E5=B1=8F=E6=97=B6=E5=B1=95=E7=A4=BA=E8=A7=86=E9=A2=91=E6=A0=87?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../video/detail/widgets/header_control.dart | 83 +++++++++++++++---- 1 file changed, 66 insertions(+), 17 deletions(-) diff --git a/lib/pages/video/detail/widgets/header_control.dart b/lib/pages/video/detail/widgets/header_control.dart index 8bc7d84e..596c567b 100644 --- a/lib/pages/video/detail/widgets/header_control.dart +++ b/lib/pages/video/detail/widgets/header_control.dart @@ -19,6 +19,8 @@ import 'package:pilipala/plugin/pl_player/models/play_repeat.dart'; import 'package:pilipala/utils/storage.dart'; import 'package:pilipala/http/danmaku.dart'; import 'package:pilipala/services/shutdown_timer_service.dart'; +import '../../../../models/video_detail_res.dart'; +import '../introduction/index.dart'; class HeaderControl extends StatefulWidget implements PreferredSizeWidget { const HeaderControl({ @@ -48,11 +50,31 @@ class _HeaderControlState extends State { final Box videoStorage = GStrorage.video; late List speedsList; double buttonSpace = 8; + bool showTitle = false; + late String heroTag; + late VideoIntroController videoIntroController; + late VideoDetailData videoDetail; + @override void initState() { super.initState(); videoInfo = widget.videoDetailCtr!.data; speedsList = widget.controller!.speedsList; + fullScreenStatusListener(); + heroTag = Get.arguments['heroTag']; + videoIntroController = Get.put(VideoIntroController(), tag: heroTag); + } + + void fullScreenStatusListener() { + widget.videoDetailCtr!.plPlayerController.isFullScreen + .listen((bool isFullScreen) { + if (isFullScreen) { + showTitle = true; + } else { + showTitle = false; + } + setState(() {}); + }); } /// 设置面板 @@ -342,8 +364,7 @@ class _HeaderControlState extends State { }, dense: true, contentPadding: const EdgeInsets.only(), - title: - const Text("额外等待视频播放完毕", style: titleStyle), + title: const Text("额外等待视频播放完毕", style: titleStyle), trailing: Switch( // thumb color (round icon) activeColor: Theme.of(context).colorScheme.primary, @@ -891,7 +912,7 @@ class _HeaderControlState extends State { final DanmakuOption currentOption = danmakuController.option; final DanmakuOption updatedOption = - currentOption.copyWith(strokeWidth: val); + currentOption.copyWith(strokeWidth: val); danmakuController.updateOption(updatedOption); } catch (_) {} }, @@ -1047,6 +1068,8 @@ class _HeaderControlState extends State { color: Colors.white, fontSize: 12, ); + final bool isLandscape = + MediaQuery.of(context).orientation == Orientation.landscape; return AppBar( backgroundColor: Colors.transparent, foregroundColor: Colors.white, @@ -1081,21 +1104,47 @@ class _HeaderControlState extends State { }, ), SizedBox(width: buttonSpace), - ComBtn( - icon: const Icon( - FontAwesomeIcons.house, - size: 15, - color: Colors.white, + if (showTitle && isLandscape) ...[ + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + ConstrainedBox( + constraints: BoxConstraints(maxWidth: 200), + child: Text( + videoIntroController.videoDetail.value.title!, + style: const TextStyle( + color: Colors.white, + fontSize: 16, + ), + ), + ), + if (videoIntroController.isShowOnlineTotal) + Text( + '${videoIntroController.total.value}人正在看', + style: const TextStyle( + color: Colors.white, + fontSize: 12, + ), + ) + ], + ) + ] else ...[ + ComBtn( + icon: const Icon( + FontAwesomeIcons.house, + size: 15, + color: Colors.white, + ), + fuc: () async { + // 销毁播放器实例 + await widget.controller!.dispose(type: 'all'); + if (mounted) { + Navigator.popUntil( + context, (Route route) => route.isFirst); + } + }, ), - fuc: () async { - // 销毁播放器实例 - await widget.controller!.dispose(type: 'all'); - if (mounted) { - Navigator.popUntil( - context, (Route route) => route.isFirst); - } - }, - ), + ], const Spacer(), // ComBtn( // icon: const Icon( From 4da6667b81e088a670b9f6289d72fe938d58d688 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sat, 24 Feb 2024 17:37:14 +0800 Subject: [PATCH 107/220] =?UTF-8?q?mod:=20=E7=9B=B4=E6=92=AD=E9=97=B4?= =?UTF-8?q?=E8=83=8C=E6=99=AF=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/common/widgets/network_img_layer.dart | 24 ++++----- lib/pages/live_room/view.dart | 60 ++++++++++++----------- 2 files changed, 45 insertions(+), 39 deletions(-) diff --git a/lib/common/widgets/network_img_layer.dart b/lib/common/widgets/network_img_layer.dart index 03adc166..52c56a8a 100644 --- a/lib/common/widgets/network_img_layer.dart +++ b/lib/common/widgets/network_img_layer.dart @@ -104,17 +104,19 @@ class NetworkImgLayer extends StatelessWidget { ? 0 : StyleString.imgRadius.x), ), - child: Center( - child: Image.asset( - type == 'avatar' - ? 'assets/images/noface.jpeg' - : 'assets/images/loading.png', - width: width, - height: height, - cacheWidth: width.cacheSize(context), - cacheHeight: height.cacheSize(context), - ), - ), + child: type == 'bg' + ? const SizedBox() + : Center( + child: Image.asset( + type == 'avatar' + ? 'assets/images/noface.jpeg' + : 'assets/images/loading.png', + width: width, + height: height, + cacheWidth: width.cacheSize(context), + cacheHeight: height.cacheSize(context), + ), + ), ); } } diff --git a/lib/pages/live_room/view.dart b/lib/pages/live_room/view.dart index 39800b90..1e5c29c5 100644 --- a/lib/pages/live_room/view.dart +++ b/lib/pages/live_room/view.dart @@ -75,41 +75,45 @@ class _LiveRoomPageState extends State { backgroundColor: Colors.black, body: Stack( children: [ - // Obx( - // () => Positioned.fill( - // child: Opacity( - // opacity: 0.8, - // child: _liveRoomController - // .roomInfoH5.value.roomInfo?.appBackground != - // '' && - // _liveRoomController - // .roomInfoH5.value.roomInfo?.appBackground != - // null - // ? NetworkImgLayer( - // width: Get.width, - // height: Get.height, - // src: _liveRoomController - // .roomInfoH5.value.roomInfo?.appBackground ?? - // '', - // ) - // : Image.asset( - // 'assets/images/live/default_bg.webp', - // width: Get.width, - // height: Get.height, - // ), - // ), - // ), - // ), - Positioned.fill( + Positioned( + left: 0, + right: 0, + bottom: 0, child: Opacity( opacity: 0.8, child: Image.asset( 'assets/images/live/default_bg.webp', - width: Get.width, - height: Get.height, + fit: BoxFit.cover, + // width: Get.width, + // height: Get.height, ), ), ), + Obx( + () => Positioned( + left: 0, + right: 0, + bottom: 0, + child: _liveRoomController + .roomInfoH5.value.roomInfo?.appBackground != + '' && + _liveRoomController + .roomInfoH5.value.roomInfo?.appBackground != + null + ? Opacity( + opacity: 0.8, + child: NetworkImgLayer( + width: Get.width, + height: Get.height, + type: 'bg', + src: _liveRoomController + .roomInfoH5.value.roomInfo?.appBackground ?? + '', + ), + ) + : const SizedBox(), + ), + ), Column( children: [ AppBar( From 078e4716b4de4acc93f4f963ebf24fc44e80147e Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sun, 25 Feb 2024 12:12:54 +0800 Subject: [PATCH 108/220] =?UTF-8?q?feat:=20=E6=88=91=E7=9A=84=E8=AE=A2?= =?UTF-8?q?=E9=98=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/http/api.dart | 6 + lib/http/user.dart | 44 +++ lib/models/user/sub_detail.dart | 123 +++++++++ lib/models/user/sub_folder.dart | 111 ++++++++ lib/pages/fav/controller.dart | 2 +- lib/pages/fav_detail/controller.dart | 2 +- lib/pages/fav_detail/view.dart | 1 - lib/pages/history/view.dart | 4 - lib/pages/media/controller.dart | 5 + lib/pages/subscription/controller.dart | 49 ++++ lib/pages/subscription/index.dart | 4 + lib/pages/subscription/view.dart | 85 ++++++ lib/pages/subscription/widgets/item.dart | 108 ++++++++ lib/pages/subscription_detail/controller.dart | 60 ++++ lib/pages/subscription_detail/index.dart | 4 + lib/pages/subscription_detail/view.dart | 257 ++++++++++++++++++ .../widget/sub_video_card.dart | 168 ++++++++++++ lib/router/app_pages.dart | 6 + 18 files changed, 1032 insertions(+), 7 deletions(-) create mode 100644 lib/models/user/sub_detail.dart create mode 100644 lib/models/user/sub_folder.dart create mode 100644 lib/pages/subscription/controller.dart create mode 100644 lib/pages/subscription/index.dart create mode 100644 lib/pages/subscription/view.dart create mode 100644 lib/pages/subscription/widgets/item.dart create mode 100644 lib/pages/subscription_detail/controller.dart create mode 100644 lib/pages/subscription_detail/index.dart create mode 100644 lib/pages/subscription_detail/view.dart create mode 100644 lib/pages/subscription_detail/widget/sub_video_card.dart diff --git a/lib/http/api.dart b/lib/http/api.dart index 2e758439..736030b2 100644 --- a/lib/http/api.dart +++ b/lib/http/api.dart @@ -483,4 +483,10 @@ class Api { /// 激活buvid3 static const activateBuvidApi = '/x/internal/gaia-gateway/ExClimbWuzhi'; + + /// 我的订阅 + static const userSubFolder = '/x/v3/fav/folder/collected/list'; + + /// 我的订阅详情 + static const userSubFolderDetail = '/x/space/fav/season/list'; } diff --git a/lib/http/user.dart b/lib/http/user.dart index c1f86285..7d3def4e 100644 --- a/lib/http/user.dart +++ b/lib/http/user.dart @@ -6,6 +6,8 @@ import '../models/user/fav_folder.dart'; import '../models/user/history.dart'; import '../models/user/info.dart'; import '../models/user/stat.dart'; +import '../models/user/sub_detail.dart'; +import '../models/user/sub_folder.dart'; import 'api.dart'; import 'init.dart'; @@ -305,4 +307,46 @@ class UserHttp { return {'status': false, 'msg': res.data['message']}; } } + + // 我的订阅 + static Future userSubFolder({ + required int mid, + required int pn, + required int ps, + }) async { + var res = await Request().get(Api.userSubFolder, data: { + 'up_mid': mid, + 'ps': ps, + 'pn': pn, + 'platform': 'web', + }); + if (res.data['code'] == 0) { + return { + 'status': true, + 'data': SubFolderModelData.fromJson(res.data['data']) + }; + } else { + return {'status': false, 'msg': res.data['message']}; + } + } + + static Future userSubFolderDetail({ + required int seasonId, + required int pn, + required int ps, + }) async { + var res = await Request().get(Api.userSubFolderDetail, data: { + 'season_id': seasonId, + 'ps': ps, + 'pn': pn, + }); + if (res.data['code'] == 0) { + return { + 'status': true, + 'data': SubDetailModelData.fromJson(res.data['data']) + }; + } else { + return {'status': false, 'msg': res.data['message']}; + } + } } diff --git a/lib/models/user/sub_detail.dart b/lib/models/user/sub_detail.dart new file mode 100644 index 00000000..a1e52e55 --- /dev/null +++ b/lib/models/user/sub_detail.dart @@ -0,0 +1,123 @@ +class SubDetailModelData { + DetailInfo? info; + List? medias; + + SubDetailModelData({this.info, this.medias}); + + SubDetailModelData.fromJson(Map json) { + info = DetailInfo.fromJson(json['info']); + if (json['medias'] != null) { + medias = []; + json['medias'].forEach((v) { + medias!.add(SubDetailMediaItem.fromJson(v)); + }); + } + } +} + +class SubDetailMediaItem { + int? id; + String? title; + String? cover; + String? pic; + int? duration; + int? pubtime; + String? bvid; + Map? upper; + Map? cntInfo; + int? enableVt; + String? vtDisplay; + + SubDetailMediaItem({ + this.id, + this.title, + this.cover, + this.pic, + this.duration, + this.pubtime, + this.bvid, + this.upper, + this.cntInfo, + this.enableVt, + this.vtDisplay, + }); + + SubDetailMediaItem.fromJson(Map json) { + id = json['id']; + title = json['title']; + cover = json['cover']; + pic = json['cover']; + duration = json['duration']; + pubtime = json['pubtime']; + bvid = json['bvid']; + upper = json['upper']; + cntInfo = json['cnt_info']; + enableVt = json['enable_vt']; + vtDisplay = json['vt_display']; + } + + Map toJson() { + final data = {}; + data['id'] = id; + data['title'] = title; + data['cover'] = cover; + data['duration'] = duration; + data['pubtime'] = pubtime; + data['bvid'] = bvid; + data['upper'] = upper; + data['cnt_info'] = cntInfo; + data['enable_vt'] = enableVt; + data['vt_display'] = vtDisplay; + return data; + } +} + +class DetailInfo { + int? id; + int? seasonType; + String? title; + String? cover; + Map? upper; + Map? cntInfo; + int? mediaCount; + String? intro; + int? enableVt; + + DetailInfo({ + this.id, + this.seasonType, + this.title, + this.cover, + this.upper, + this.cntInfo, + this.mediaCount, + this.intro, + this.enableVt, + }); + + DetailInfo.fromJson(Map json) { + id = json['id']; + seasonType = json['season_type']; + title = json['title']; + cover = json['cover']; + upper = json['upper']; + cntInfo = json['cnt_info']; + mediaCount = json['media_count']; + intro = json['intro']; + enableVt = json['enable_vt']; + } + + Map toJson() { + final data = {}; + data['id'] = id; + data['season_type'] = seasonType; + data['title'] = title; + data['cover'] = cover; + data['upper'] = upper; + data['cnt_info'] = cntInfo; + data['media_count'] = mediaCount; + data['intro'] = intro; + data['enable_vt'] = enableVt; + return data; + } +} diff --git a/lib/models/user/sub_folder.dart b/lib/models/user/sub_folder.dart new file mode 100644 index 00000000..d496a1cf --- /dev/null +++ b/lib/models/user/sub_folder.dart @@ -0,0 +1,111 @@ +class SubFolderModelData { + final int? count; + final List? list; + + SubFolderModelData({ + this.count, + this.list, + }); + + factory SubFolderModelData.fromJson(Map json) { + return SubFolderModelData( + count: json['count'], + list: json['list'] != null + ? (json['list'] as List) + .map((i) => SubFolderItemData.fromJson(i)) + .toList() + : null, + ); + } +} + +class SubFolderItemData { + final int? id; + final int? fid; + final int? mid; + final int? attr; + final String? title; + final String? cover; + final Upper? upper; + final int? coverType; + final String? intro; + final int? ctime; + final int? mtime; + final int? state; + final int? favState; + final int? mediaCount; + final int? viewCount; + final int? vt; + final int? playSwitch; + final int? type; + final String? link; + final String? bvid; + + SubFolderItemData({ + this.id, + this.fid, + this.mid, + this.attr, + this.title, + this.cover, + this.upper, + this.coverType, + this.intro, + this.ctime, + this.mtime, + this.state, + this.favState, + this.mediaCount, + this.viewCount, + this.vt, + this.playSwitch, + this.type, + this.link, + this.bvid, + }); + + factory SubFolderItemData.fromJson(Map json) { + return SubFolderItemData( + id: json['id'], + fid: json['fid'], + mid: json['mid'], + attr: json['attr'], + title: json['title'], + cover: json['cover'], + upper: json['upper'] != null ? Upper.fromJson(json['upper']) : null, + coverType: json['cover_type'], + intro: json['intro'], + ctime: json['ctime'], + mtime: json['mtime'], + state: json['state'], + favState: json['fav_state'], + mediaCount: json['media_count'], + viewCount: json['view_count'], + vt: json['vt'], + playSwitch: json['play_switch'], + type: json['type'], + link: json['link'], + bvid: json['bvid'], + ); + } +} + +class Upper { + final int? mid; + final String? name; + final String? face; + + Upper({ + this.mid, + this.name, + this.face, + }); + + factory Upper.fromJson(Map json) { + return Upper( + mid: json['mid'], + name: json['name'], + face: json['face'], + ); + } +} diff --git a/lib/pages/fav/controller.dart b/lib/pages/fav/controller.dart index c3f76186..a5f94525 100644 --- a/lib/pages/fav/controller.dart +++ b/lib/pages/fav/controller.dart @@ -24,7 +24,7 @@ class FavController extends GetxController { if (!hasMore.value) { return; } - var res = await await UserHttp.userfavFolder( + var res = await UserHttp.userfavFolder( pn: currentPage, ps: pageSize, mid: userInfo!.mid!, diff --git a/lib/pages/fav_detail/controller.dart b/lib/pages/fav_detail/controller.dart index 95130be6..69cc939e 100644 --- a/lib/pages/fav_detail/controller.dart +++ b/lib/pages/fav_detail/controller.dart @@ -34,7 +34,7 @@ class FavDetailController extends GetxController { return; } isLoadingMore = true; - var res = await await UserHttp.userFavFolderDetail( + var res = await UserHttp.userFavFolderDetail( pn: currentPage, ps: 20, mediaId: mediaId!, diff --git a/lib/pages/fav_detail/view.dart b/lib/pages/fav_detail/view.dart index 787fa96e..27d7182b 100644 --- a/lib/pages/fav_detail/view.dart +++ b/lib/pages/fav_detail/view.dart @@ -31,7 +31,6 @@ class _FavDetailPageState extends State { super.initState(); mediaId = Get.parameters['mediaId']!; _futureBuilderFuture = _favDetailController.queryUserFavFolderDetail(); - mediaId = Get.parameters['mediaId']!; titleStreamC = StreamController(); _controller.addListener( () { diff --git a/lib/pages/history/view.dart b/lib/pages/history/view.dart index d8fc60f0..92e1eee7 100644 --- a/lib/pages/history/view.dart +++ b/lib/pages/history/view.dart @@ -70,10 +70,6 @@ class _HistoryPageState extends State { child1: AppBar( titleSpacing: 0, centerTitle: false, - leading: IconButton( - onPressed: () => Get.back(), - icon: const Icon(Icons.arrow_back_outlined), - ), title: Text( '观看记录', style: Theme.of(context).textTheme.titleMedium, diff --git a/lib/pages/media/controller.dart b/lib/pages/media/controller.dart index 8b875511..757d5ac9 100644 --- a/lib/pages/media/controller.dart +++ b/lib/pages/media/controller.dart @@ -28,6 +28,11 @@ class MediaController extends GetxController { 'title': '我的收藏', 'onTap': () => Get.toNamed('/fav'), }, + { + 'icon': Icons.subscriptions_outlined, + 'title': '我的订阅', + 'onTap': () => Get.toNamed('/subscription'), + }, { 'icon': Icons.watch_later_outlined, 'title': '稍后再看', diff --git a/lib/pages/subscription/controller.dart b/lib/pages/subscription/controller.dart new file mode 100644 index 00000000..bf0c593c --- /dev/null +++ b/lib/pages/subscription/controller.dart @@ -0,0 +1,49 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; +import 'package:get/get.dart'; +import 'package:hive/hive.dart'; +import 'package:pilipala/http/user.dart'; +import 'package:pilipala/models/user/info.dart'; +import 'package:pilipala/utils/storage.dart'; + +import '../../models/user/sub_folder.dart'; + +class SubController extends GetxController { + final ScrollController scrollController = ScrollController(); + Rx subFolderData = SubFolderModelData().obs; + Box userInfoCache = GStrorage.userInfo; + UserInfoData? userInfo; + int currentPage = 1; + int pageSize = 20; + RxBool hasMore = true.obs; + + Future querySubFolder({type = 'init'}) async { + userInfo = userInfoCache.get('userInfoCache'); + if (userInfo == null) { + return {'status': false, 'msg': '账号未登录'}; + } + var res = await UserHttp.userSubFolder( + pn: currentPage, + ps: pageSize, + mid: userInfo!.mid!, + ); + if (res['status']) { + if (type == 'init') { + subFolderData.value = res['data']; + } else { + if (res['data'].list.isNotEmpty) { + subFolderData.value.list!.addAll(res['data'].list); + subFolderData.update((val) {}); + } + } + currentPage++; + } else { + SmartDialog.showToast(res['msg']); + } + return res; + } + + Future onLoad() async { + querySubFolder(type: 'onload'); + } +} diff --git a/lib/pages/subscription/index.dart b/lib/pages/subscription/index.dart new file mode 100644 index 00000000..4d034396 --- /dev/null +++ b/lib/pages/subscription/index.dart @@ -0,0 +1,4 @@ +library sub; + +export './controller.dart'; +export './view.dart'; diff --git a/lib/pages/subscription/view.dart b/lib/pages/subscription/view.dart new file mode 100644 index 00000000..b2a4965b --- /dev/null +++ b/lib/pages/subscription/view.dart @@ -0,0 +1,85 @@ +import 'package:easy_debounce/easy_throttle.dart'; +import 'package:flutter/material.dart'; +import 'package:get/get.dart'; +import 'package:pilipala/common/widgets/http_error.dart'; +import 'package:pilipala/pages/fav/widgets/item.dart'; +import 'controller.dart'; +import 'widgets/item.dart'; + +class SubPage extends StatefulWidget { + const SubPage({super.key}); + + @override + State createState() => _SubPageState(); +} + +class _SubPageState extends State { + final SubController _subController = Get.put(SubController()); + late Future _futureBuilderFuture; + late ScrollController scrollController; + + @override + void initState() { + super.initState(); + _futureBuilderFuture = _subController.querySubFolder(); + scrollController = _subController.scrollController; + scrollController.addListener( + () { + if (scrollController.position.pixels >= + scrollController.position.maxScrollExtent - 300) { + EasyThrottle.throttle('history', const Duration(seconds: 1), () { + _subController.onLoad(); + }); + } + }, + ); + } + + @override + Widget build(BuildContext context) { + return Scaffold( + appBar: AppBar( + centerTitle: false, + titleSpacing: 0, + title: Text( + '我的订阅', + style: Theme.of(context).textTheme.titleMedium, + ), + ), + body: FutureBuilder( + future: _futureBuilderFuture, + builder: (context, snapshot) { + if (snapshot.connectionState == ConnectionState.done) { + Map? data = snapshot.data; + if (data != null && data['status']) { + return Obx( + () => ListView.builder( + controller: scrollController, + itemCount: _subController.subFolderData.value.list!.length, + itemBuilder: (context, index) { + return SubItem( + subFolderItem: + _subController.subFolderData.value.list![index]); + }, + ), + ); + } else { + return CustomScrollView( + physics: const NeverScrollableScrollPhysics(), + slivers: [ + HttpError( + errMsg: data?['msg'], + fn: () => setState(() {}), + ), + ], + ); + } + } else { + // 骨架屏 + return const Text('请求中'); + } + }, + ), + ); + } +} diff --git a/lib/pages/subscription/widgets/item.dart b/lib/pages/subscription/widgets/item.dart new file mode 100644 index 00000000..fd08ffa5 --- /dev/null +++ b/lib/pages/subscription/widgets/item.dart @@ -0,0 +1,108 @@ +import 'package:flutter/material.dart'; +import 'package:get/get.dart'; +import 'package:pilipala/common/constants.dart'; +import 'package:pilipala/common/widgets/network_img_layer.dart'; +import 'package:pilipala/utils/utils.dart'; + +import '../../../models/user/sub_folder.dart'; + +class SubItem extends StatelessWidget { + final SubFolderItemData subFolderItem; + const SubItem({super.key, required this.subFolderItem}); + + @override + Widget build(BuildContext context) { + String heroTag = Utils.makeHeroTag(subFolderItem.id); + return InkWell( + onTap: () => Get.toNamed( + '/subDetail', + arguments: subFolderItem, + parameters: { + 'heroTag': heroTag, + 'seasonId': subFolderItem.id.toString(), + }, + ), + child: Padding( + padding: const EdgeInsets.fromLTRB(12, 7, 12, 7), + child: LayoutBuilder( + builder: (context, boxConstraints) { + double width = + (boxConstraints.maxWidth - StyleString.cardSpace * 6) / 2; + return SizedBox( + height: width / StyleString.aspectRatio, + child: Row( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + AspectRatio( + aspectRatio: StyleString.aspectRatio, + child: LayoutBuilder( + builder: (context, boxConstraints) { + double maxWidth = boxConstraints.maxWidth; + double maxHeight = boxConstraints.maxHeight; + return Hero( + tag: heroTag, + child: NetworkImgLayer( + src: subFolderItem.cover, + width: maxWidth, + height: maxHeight, + ), + ); + }, + ), + ), + VideoContent(subFolderItem: subFolderItem) + ], + ), + ); + }, + ), + ), + ); + } +} + +class VideoContent extends StatelessWidget { + final SubFolderItemData subFolderItem; + const VideoContent({super.key, required this.subFolderItem}); + + @override + Widget build(BuildContext context) { + return Expanded( + child: Padding( + padding: const EdgeInsets.fromLTRB(10, 2, 6, 0), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + subFolderItem.title!, + textAlign: TextAlign.start, + style: const TextStyle( + fontWeight: FontWeight.w500, + letterSpacing: 0.3, + ), + ), + const SizedBox(height: 2), + Text( + '合集 UP主：${subFolderItem.upper!.name!}', + textAlign: TextAlign.start, + style: TextStyle( + fontSize: Theme.of(context).textTheme.labelMedium!.fontSize, + color: Theme.of(context).colorScheme.outline, + ), + ), + const SizedBox(height: 2), + Text( + '${subFolderItem.mediaCount}个视频', + textAlign: TextAlign.start, + style: TextStyle( + fontSize: Theme.of(context).textTheme.labelMedium!.fontSize, + color: Theme.of(context).colorScheme.outline, + ), + ), + ], + ), + ), + ); + } +} diff --git a/lib/pages/subscription_detail/controller.dart b/lib/pages/subscription_detail/controller.dart new file mode 100644 index 00000000..6ecb894e --- /dev/null +++ b/lib/pages/subscription_detail/controller.dart @@ -0,0 +1,60 @@ +import 'package:get/get.dart'; +import 'package:pilipala/http/user.dart'; + +import '../../models/user/sub_detail.dart'; +import '../../models/user/sub_folder.dart'; + +class SubDetailController extends GetxController { + late SubFolderItemData item; + + late int seasonId; + late String heroTag; + int currentPage = 1; + bool isLoadingMore = false; + Rx subInfo = DetailInfo().obs; + RxList subList = [].obs; + RxString loadingText = '加载中...'.obs; + int mediaCount = 0; + + @override + void onInit() { + item = Get.arguments; + if (Get.parameters.keys.isNotEmpty) { + seasonId = int.parse(Get.parameters['seasonId']!); + heroTag = Get.parameters['heroTag']!; + } + super.onInit(); + } + + Future queryUserSubFolderDetail({type = 'init'}) async { + if (type == 'onLoad' && subList.length >= mediaCount) { + loadingText.value = '没有更多了'; + return; + } + isLoadingMore = true; + var res = await UserHttp.userSubFolderDetail( + seasonId: seasonId, + ps: 20, + pn: currentPage, + ); + if (res['status']) { + subInfo.value = res['data'].info; + if (currentPage == 1 && type == 'init') { + subList.value = res['data'].medias; + mediaCount = res['data'].info.mediaCount; + } else if (type == 'onLoad') { + subList.addAll(res['data'].medias); + } + if (subList.length >= mediaCount) { + loadingText.value = '没有更多了'; + } + } + currentPage += 1; + isLoadingMore = false; + return res; + } + + onLoad() { + queryUserSubFolderDetail(type: 'onLoad'); + } +} diff --git a/lib/pages/subscription_detail/index.dart b/lib/pages/subscription_detail/index.dart new file mode 100644 index 00000000..71df4b24 --- /dev/null +++ b/lib/pages/subscription_detail/index.dart @@ -0,0 +1,4 @@ +library sub_detail; + +export './controller.dart'; +export './view.dart'; diff --git a/lib/pages/subscription_detail/view.dart b/lib/pages/subscription_detail/view.dart new file mode 100644 index 00000000..d56125cd --- /dev/null +++ b/lib/pages/subscription_detail/view.dart @@ -0,0 +1,257 @@ +import 'dart:async'; + +import 'package:easy_debounce/easy_throttle.dart'; +import 'package:flutter/material.dart'; +import 'package:get/get.dart'; +import 'package:pilipala/common/skeleton/video_card_h.dart'; +import 'package:pilipala/common/widgets/http_error.dart'; +import 'package:pilipala/common/widgets/network_img_layer.dart'; +import 'package:pilipala/common/widgets/no_data.dart'; + +import '../../models/user/sub_folder.dart'; +import '../../utils/utils.dart'; +import 'controller.dart'; +import 'widget/sub_video_card.dart'; + +class SubDetailPage extends StatefulWidget { + const SubDetailPage({super.key}); + + @override + State createState() => _SubDetailPageState(); +} + +class _SubDetailPageState extends State { + late final ScrollController _controller = ScrollController(); + final SubDetailController _subDetailController = + Get.put(SubDetailController()); + late StreamController titleStreamC; // a + late Future _futureBuilderFuture; + late String seasonId; + + @override + void initState() { + super.initState(); + seasonId = Get.parameters['seasonId']!; + _futureBuilderFuture = _subDetailController.queryUserSubFolderDetail(); + titleStreamC = StreamController(); + _controller.addListener( + () { + if (_controller.offset > 160) { + titleStreamC.add(true); + } else if (_controller.offset <= 160) { + titleStreamC.add(false); + } + + if (_controller.position.pixels >= + _controller.position.maxScrollExtent - 200) { + EasyThrottle.throttle('subDetail', const Duration(seconds: 1), () { + _subDetailController.onLoad(); + }); + } + }, + ); + } + + @override + void dispose() { + _controller.dispose(); + super.dispose(); + } + + @override + Widget build(BuildContext context) { + return Scaffold( + body: CustomScrollView( + controller: _controller, + slivers: [ + SliverAppBar( + expandedHeight: 260 - MediaQuery.of(context).padding.top, + pinned: true, + titleSpacing: 0, + title: StreamBuilder( + stream: titleStreamC.stream, + initialData: false, + builder: (context, AsyncSnapshot snapshot) { + return AnimatedOpacity( + opacity: snapshot.data ? 1 : 0, + curve: Curves.easeOut, + duration: const Duration(milliseconds: 500), + child: Row( + children: [ + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + _subDetailController.item.title!, + style: Theme.of(context).textTheme.titleMedium, + ), + Text( + '共${_subDetailController.item.mediaCount!}条视频', + style: Theme.of(context).textTheme.labelMedium, + ) + ], + ) + ], + ), + ); + }, + ), + flexibleSpace: FlexibleSpaceBar( + background: Container( + decoration: BoxDecoration( + border: Border( + bottom: BorderSide( + color: Theme.of(context).dividerColor.withOpacity(0.2), + ), + ), + ), + padding: EdgeInsets.only( + top: kTextTabBarHeight + + MediaQuery.of(context).padding.top + + 30, + left: 20, + right: 20), + child: SizedBox( + height: 200, + child: Row( + // mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Hero( + tag: _subDetailController.heroTag, + child: NetworkImgLayer( + width: 180, + height: 110, + src: _subDetailController.item.cover, + ), + ), + const SizedBox(width: 14), + Expanded( + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + const SizedBox(height: 4), + Text( + _subDetailController.item.title!, + style: TextStyle( + fontSize: Theme.of(context) + .textTheme + .titleMedium! + .fontSize, + fontWeight: FontWeight.bold), + ), + const SizedBox(height: 4), + GestureDetector( + onTap: () { + SubFolderItemData item = + _subDetailController.item; + Get.toNamed( + '/member?mid=${item.upper!.mid}', + arguments: { + 'face': item.upper!.face, + }, + ); + }, + child: Text( + _subDetailController.item.upper!.name!, + style: TextStyle( + color: + Theme.of(context).colorScheme.primary), + ), + ), + const SizedBox(height: 4), + Text( + '${Utils.numFormat(_subDetailController.item.viewCount)}次播放', + style: TextStyle( + fontSize: Theme.of(context) + .textTheme + .labelSmall! + .fontSize, + color: Theme.of(context).colorScheme.outline), + ), + ], + ), + ), + ], + ), + ), + ), + ), + ), + SliverToBoxAdapter( + child: Padding( + padding: const EdgeInsets.only(top: 15, bottom: 8, left: 14), + child: Obx( + () => Text( + '共${_subDetailController.subList.length}条视频', + style: TextStyle( + fontSize: + Theme.of(context).textTheme.labelMedium!.fontSize, + color: Theme.of(context).colorScheme.outline, + letterSpacing: 1), + ), + ), + ), + ), + FutureBuilder( + future: _futureBuilderFuture, + builder: (context, snapshot) { + if (snapshot.connectionState == ConnectionState.done) { + Map data = snapshot.data; + if (data['status']) { + if (_subDetailController.item.mediaCount == 0) { + return const NoData(); + } else { + List subList = _subDetailController.subList; + return Obx( + () => subList.isEmpty + ? const SliverToBoxAdapter(child: SizedBox()) + : SliverList( + delegate: + SliverChildBuilderDelegate((context, index) { + return SubVideoCardH( + videoItem: subList[index], + ); + }, childCount: subList.length), + ), + ); + } + } else { + return HttpError( + errMsg: data['msg'], + fn: () => setState(() {}), + ); + } + } else { + // 骨架屏 + return SliverList( + delegate: SliverChildBuilderDelegate((context, index) { + return const VideoCardHSkeleton(); + }, childCount: 10), + ); + } + }, + ), + SliverToBoxAdapter( + child: Container( + height: MediaQuery.of(context).padding.bottom + 60, + padding: EdgeInsets.only( + bottom: MediaQuery.of(context).padding.bottom), + child: Center( + child: Obx( + () => Text( + _subDetailController.loadingText.value, + style: TextStyle( + color: Theme.of(context).colorScheme.outline, + fontSize: 13), + ), + ), + ), + ), + ) + ], + ), + ); + } +} diff --git a/lib/pages/subscription_detail/widget/sub_video_card.dart b/lib/pages/subscription_detail/widget/sub_video_card.dart new file mode 100644 index 00000000..11aebc39 --- /dev/null +++ b/lib/pages/subscription_detail/widget/sub_video_card.dart @@ -0,0 +1,168 @@ +import 'package:get/get.dart'; +import 'package:flutter/material.dart'; +import 'package:pilipala/common/constants.dart'; +import 'package:pilipala/common/widgets/stat/danmu.dart'; +import 'package:pilipala/common/widgets/stat/view.dart'; +import 'package:pilipala/http/search.dart'; +import 'package:pilipala/models/common/search_type.dart'; +import 'package:pilipala/utils/utils.dart'; +import 'package:pilipala/common/widgets/network_img_layer.dart'; +import '../../../common/widgets/badge.dart'; +import '../../../models/user/sub_detail.dart'; + +// 收藏视频卡片 - 水平布局 +class SubVideoCardH extends StatelessWidget { + final SubDetailMediaItem videoItem; + final int? searchType; + + const SubVideoCardH({ + Key? key, + required this.videoItem, + this.searchType, + }) : super(key: key); + + @override + Widget build(BuildContext context) { + int id = videoItem.id!; + String bvid = videoItem.bvid!; + String heroTag = Utils.makeHeroTag(id); + return InkWell( + onTap: () async { + int cid = await SearchHttp.ab2c(bvid: bvid); + Map parameters = { + 'bvid': bvid, + 'cid': cid.toString(), + }; + + Get.toNamed('/video', parameters: parameters, arguments: { + 'videoItem': videoItem, + 'heroTag': heroTag, + 'videoType': SearchType.video, + }); + }, + child: Column( + children: [ + Padding( + padding: const EdgeInsets.fromLTRB( + StyleString.safeSpace, 5, StyleString.safeSpace, 5), + child: LayoutBuilder( + builder: (context, boxConstraints) { + double width = + (boxConstraints.maxWidth - StyleString.cardSpace * 6) / 2; + return SizedBox( + height: width / StyleString.aspectRatio, + child: Row( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + AspectRatio( + aspectRatio: StyleString.aspectRatio, + child: LayoutBuilder( + builder: (context, boxConstraints) { + double maxWidth = boxConstraints.maxWidth; + double maxHeight = boxConstraints.maxHeight; + return Stack( + children: [ + Hero( + tag: heroTag, + child: NetworkImgLayer( + src: videoItem.cover, + width: maxWidth, + height: maxHeight, + ), + ), + PBadge( + text: Utils.timeFormat(videoItem.duration!), + right: 6.0, + bottom: 6.0, + type: 'gray', + ), + // if (videoItem.ogv != null) ...[ + // PBadge( + // text: videoItem.ogv['type_name'], + // top: 6.0, + // right: 6.0, + // bottom: null, + // left: null, + // ), + // ], + ], + ); + }, + ), + ), + VideoContent( + videoItem: videoItem, + searchType: searchType, + ) + ], + ), + ); + }, + ), + ), + ], + ), + ); + } +} + +class VideoContent extends StatelessWidget { + final dynamic videoItem; + final int? searchType; + const VideoContent({ + super.key, + required this.videoItem, + this.searchType, + }); + + @override + Widget build(BuildContext context) { + return Expanded( + child: Padding( + padding: const EdgeInsets.fromLTRB(10, 2, 6, 0), + child: Stack( + children: [ + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + videoItem.title, + textAlign: TextAlign.start, + style: const TextStyle( + fontWeight: FontWeight.w500, + letterSpacing: 0.3, + ), + maxLines: 2, + overflow: TextOverflow.ellipsis, + ), + const Spacer(), + Text( + Utils.dateFormat(videoItem.pubtime), + style: TextStyle( + fontSize: 11, + color: Theme.of(context).colorScheme.outline), + ), + Padding( + padding: const EdgeInsets.only(top: 2), + child: Row( + children: [ + StatView( + theme: 'gray', + view: videoItem.cntInfo['play'], + ), + const SizedBox(width: 8), + StatDanMu( + theme: 'gray', danmu: videoItem.cntInfo['danmaku']), + const Spacer(), + ], + ), + ), + ], + ), + ], + ), + ), + ); + } +} diff --git a/lib/router/app_pages.dart b/lib/router/app_pages.dart index 45d7cad1..6ebaa638 100644 --- a/lib/router/app_pages.dart +++ b/lib/router/app_pages.dart @@ -44,6 +44,8 @@ import '../pages/setting/recommend_setting.dart'; import '../pages/setting/play_setting.dart'; import '../pages/setting/privacy_setting.dart'; import '../pages/setting/style_setting.dart'; +import '../pages/subscription/index.dart'; +import '../pages/subscription_detail/index.dart'; import '../pages/video/detail/index.dart'; import '../pages/video/detail/reply_reply/index.dart'; import '../pages/webview/index.dart'; @@ -160,6 +162,10 @@ class Routes { CustomGetPage(name: '/logs', page: () => const LogsPage()), // 搜索关注 CustomGetPage(name: '/followSearch', page: () => const FollowSearchPage()), + // 订阅 + CustomGetPage(name: '/subscription', page: () => const SubPage()), + // 订阅详情 + CustomGetPage(name: '/subDetail', page: () => const SubDetailPage()), ]; } From f8a8c0967a95a9eb1b349b5cef0941f4c777d18e Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sun, 25 Feb 2024 19:09:12 +0800 Subject: [PATCH 109/220] =?UTF-8?q?feat:=20=E8=AF=84=E8=AE=BA=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E8=A1=A8=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/http/api.dart | 3 + lib/http/reply.dart | 20 +++ lib/models/video/reply/emote.dart | 120 ++++++++++++++++ lib/pages/emote/controller.dart | 20 +++ lib/pages/emote/index.dart | 4 + lib/pages/emote/view.dart | 116 ++++++++++++++++ .../detail/reply_new/toolbar_icon_button.dart | 40 ++++++ lib/pages/video/detail/reply_new/view.dart | 128 ++++++++++++++---- 8 files changed, 426 insertions(+), 25 deletions(-) create mode 100644 lib/models/video/reply/emote.dart create mode 100644 lib/pages/emote/controller.dart create mode 100644 lib/pages/emote/index.dart create mode 100644 lib/pages/emote/view.dart create mode 100644 lib/pages/video/detail/reply_new/toolbar_icon_button.dart diff --git a/lib/http/api.dart b/lib/http/api.dart index 736030b2..d812d76c 100644 --- a/lib/http/api.dart +++ b/lib/http/api.dart @@ -489,4 +489,7 @@ class Api { /// 我的订阅详情 static const userSubFolderDetail = '/x/space/fav/season/list'; + + /// 表情 + static const emojiList = '/x/emote/user/panel/web'; } diff --git a/lib/http/reply.dart b/lib/http/reply.dart index fab433fc..f080ed51 100644 --- a/lib/http/reply.dart +++ b/lib/http/reply.dart @@ -1,4 +1,5 @@ import '../models/video/reply/data.dart'; +import '../models/video/reply/emote.dart'; import 'api.dart'; import 'init.dart'; @@ -100,4 +101,23 @@ class ReplyHttp { }; } } + + static Future getEmoteList({String? business}) async { + var res = await Request().get(Api.emojiList, data: { + 'business': business ?? 'reply', + 'web_location': '333.1245', + }); + if (res.data['code'] == 0) { + return { + 'status': true, + 'data': EmoteModelData.fromJson(res.data['data']), + }; + } else { + return { + 'status': false, + 'date': [], + 'msg': res.data['message'], + }; + } + } } diff --git a/lib/models/video/reply/emote.dart b/lib/models/video/reply/emote.dart new file mode 100644 index 00000000..b4071826 --- /dev/null +++ b/lib/models/video/reply/emote.dart @@ -0,0 +1,120 @@ +class EmoteModelData { + final List? packages; + + EmoteModelData({ + required this.packages, + }); + + factory EmoteModelData.fromJson(Map jsonRes) { + final List? packages = + jsonRes['packages'] is List ? [] : null; + if (packages != null) { + for (final dynamic item in jsonRes['packages']!) { + if (item != null) { + try { + packages.add(PackageItem.fromJson(item)); + } catch (_) {} + } + } + } + return EmoteModelData( + packages: packages, + ); + } +} + +class PackageItem { + final int? id; + final String? text; + final String? url; + final int? mtime; + final int? type; + final int? attr; + final Meta? meta; + final List? emote; + + PackageItem({ + required this.id, + required this.text, + required this.url, + required this.mtime, + required this.type, + required this.attr, + required this.meta, + required this.emote, + }); + + factory PackageItem.fromJson(Map jsonRes) { + final List? emote = jsonRes['emote'] is List ? [] : null; + if (emote != null) { + for (final dynamic item in jsonRes['emote']!) { + if (item != null) { + try { + emote.add(Emote.fromJson(item)); + } catch (_) {} + } + } + } + return PackageItem( + id: jsonRes['id'], + text: jsonRes['text'], + url: jsonRes['url'], + mtime: jsonRes['mtime'], + type: jsonRes['type'], + attr: jsonRes['attr'], + meta: Meta.fromJson(jsonRes['meta']), + emote: emote, + ); + } +} + +class Meta { + final int? size; + final List? suggest; + + Meta({ + required this.size, + required this.suggest, + }); + + factory Meta.fromJson(Map jsonRes) => Meta( + size: jsonRes['size'], + suggest: jsonRes['suggest'] is List ? [] : null, + ); +} + +class Emote { + final int? id; + final int? packageId; + final String? text; + final String? url; + final int? mtime; + final int? type; + final int? attr; + final Meta? meta; + final dynamic activity; + + Emote({ + required this.id, + required this.packageId, + required this.text, + required this.url, + required this.mtime, + required this.type, + required this.attr, + required this.meta, + required this.activity, + }); + + factory Emote.fromJson(Map jsonRes) => Emote( + id: jsonRes['id'], + packageId: jsonRes['package_id'], + text: jsonRes['text'], + url: jsonRes['url'], + mtime: jsonRes['mtime'], + type: jsonRes['type'], + attr: jsonRes['attr'], + meta: Meta.fromJson(jsonRes['meta']), + activity: jsonRes['activity'], + ); +} diff --git a/lib/pages/emote/controller.dart b/lib/pages/emote/controller.dart new file mode 100644 index 00000000..c1a4c504 --- /dev/null +++ b/lib/pages/emote/controller.dart @@ -0,0 +1,20 @@ +import 'package:flutter/material.dart'; +import 'package:get/get.dart'; + +import '../../http/reply.dart'; +import '../../models/video/reply/emote.dart'; + +class EmotePanelController extends GetxController + with GetTickerProviderStateMixin { + late List emotePackage; + late TabController tabController; + + Future getEmote() async { + var res = await ReplyHttp.getEmoteList(business: 'reply'); + if (res['status']) { + emotePackage = res['data'].packages; + tabController = TabController(length: emotePackage.length, vsync: this); + } + return res; + } +} diff --git a/lib/pages/emote/index.dart b/lib/pages/emote/index.dart new file mode 100644 index 00000000..32ce53e3 --- /dev/null +++ b/lib/pages/emote/index.dart @@ -0,0 +1,4 @@ +library emote; + +export './controller.dart'; +export './view.dart'; diff --git a/lib/pages/emote/view.dart b/lib/pages/emote/view.dart new file mode 100644 index 00000000..d30767c3 --- /dev/null +++ b/lib/pages/emote/view.dart @@ -0,0 +1,116 @@ +import 'package:flutter/material.dart'; +import 'package:get/get.dart'; +import '../../models/video/reply/emote.dart'; +import 'controller.dart'; + +class EmotePanel extends StatefulWidget { + final Function onChoose; + const EmotePanel({super.key, required this.onChoose}); + + @override + State createState() => _EmotePanelState(); +} + +class _EmotePanelState extends State + with AutomaticKeepAliveClientMixin { + final EmotePanelController _emotePanelController = + Get.put(EmotePanelController()); + late Future _futureBuilderFuture; + + @override + bool get wantKeepAlive => true; + + @override + void initState() { + _futureBuilderFuture = _emotePanelController.getEmote(); + super.initState(); + } + + @override + Widget build(BuildContext context) { + super.build(context); + return FutureBuilder( + future: _futureBuilderFuture, + builder: (context, snapshot) { + if (snapshot.connectionState == ConnectionState.done) { + Map data = snapshot.data as Map; + if (data['status']) { + List emotePackage = + _emotePanelController.emotePackage; + + return Column( + children: [ + Expanded( + child: TabBarView( + controller: _emotePanelController.tabController, + children: emotePackage.map( + (e) { + int size = e.emote!.first.meta!.size!; + int type = e.type!; + return Padding( + padding: const EdgeInsets.fromLTRB(12, 6, 12, 0), + child: GridView.builder( + gridDelegate: + SliverGridDelegateWithMaxCrossAxisExtent( + maxCrossAxisExtent: size == 1 ? 40 : 60, + crossAxisSpacing: 8, + mainAxisSpacing: 8, + ), + itemCount: e.emote!.length, + itemBuilder: (context, index) { + return Material( + color: Colors.transparent, + clipBehavior: Clip.hardEdge, + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(4), + ), + child: InkWell( + onTap: () { + widget.onChoose(e, e.emote![index]); + }, + child: Padding( + padding: const EdgeInsets.all(3), + child: type == 4 + ? Text( + e.emote![index].text!, + overflow: TextOverflow.clip, + maxLines: 1, + ) + : Image.network( + e.emote![index].url!, + width: size * 38, + height: size * 38, + ), + ), + ), + ); + }, + ), + ); + }, + ).toList(), + )), + Divider( + height: 1, + color: Theme.of(context).dividerColor.withOpacity(0.1), + ), + TabBar( + controller: _emotePanelController.tabController, + dividerColor: Colors.transparent, + isScrollable: true, + tabs: _emotePanelController.emotePackage + .map((e) => Tab(text: e.text)) + .toList(), + ), + SizedBox(height: MediaQuery.of(context).padding.bottom + 20), + ], + ); + } else { + return Center(child: Text(data['msg'])); + } + } else { + return const Center(child: Text('加载中...')); + } + }); + } +} diff --git a/lib/pages/video/detail/reply_new/toolbar_icon_button.dart b/lib/pages/video/detail/reply_new/toolbar_icon_button.dart new file mode 100644 index 00000000..c4390796 --- /dev/null +++ b/lib/pages/video/detail/reply_new/toolbar_icon_button.dart @@ -0,0 +1,40 @@ +import 'package:flutter/material.dart'; + +class ToolbarIconButton extends StatelessWidget { + final VoidCallback onPressed; + final Icon icon; + final String toolbarType; + final bool selected; + + const ToolbarIconButton({ + super.key, + required this.onPressed, + required this.icon, + required this.toolbarType, + required this.selected, + }); + + @override + Widget build(BuildContext context) { + return SizedBox( + width: 36, + height: 36, + child: IconButton( + onPressed: onPressed, + icon: icon, + highlightColor: Theme.of(context).colorScheme.secondaryContainer, + color: selected + ? Theme.of(context).colorScheme.onSecondaryContainer + : Theme.of(context).colorScheme.outline, + style: ButtonStyle( + padding: MaterialStateProperty.all(EdgeInsets.zero), + backgroundColor: MaterialStateProperty.resolveWith((states) { + return selected + ? Theme.of(context).colorScheme.secondaryContainer + : null; + }), + ), + ), + ); + } +} diff --git a/lib/pages/video/detail/reply_new/view.dart b/lib/pages/video/detail/reply_new/view.dart index 01c95adc..83201697 100644 --- a/lib/pages/video/detail/reply_new/view.dart +++ b/lib/pages/video/detail/reply_new/view.dart @@ -4,9 +4,13 @@ import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:get/get.dart'; import 'package:pilipala/http/video.dart'; import 'package:pilipala/models/common/reply_type.dart'; +import 'package:pilipala/models/video/reply/emote.dart'; import 'package:pilipala/models/video/reply/item.dart'; +import 'package:pilipala/pages/emote/index.dart'; import 'package:pilipala/utils/feed_back.dart'; +import 'toolbar_icon_button.dart'; + class VideoReplyNewDialog extends StatefulWidget { final int? oid; final int? root; @@ -32,6 +36,10 @@ class _VideoReplyNewDialogState extends State final TextEditingController _replyContentController = TextEditingController(); final FocusNode replyContentFocusNode = FocusNode(); final GlobalKey _formKey = GlobalKey(); + late double emoteHeight = 0.0; + double keyboardHeight = 0.0; // 键盘高度 + final _debouncer = Debouncer(milliseconds: 200); // 设置延迟时间 + String toolbarType = 'input'; @override void initState() { @@ -42,6 +50,8 @@ class _VideoReplyNewDialogState extends State WidgetsBinding.instance.addObserver(this); // 自动聚焦 _autoFocus(); + // 监听聚焦状态 + _focuslistener(); } _autoFocus() async { @@ -51,6 +61,16 @@ class _VideoReplyNewDialogState extends State } } + _focuslistener() { + replyContentFocusNode.addListener(() { + if (replyContentFocusNode.hasFocus) { + setState(() { + toolbarType = 'input'; + }); + } + }); + } + Future submitReplyAdd() async { feedBack(); String message = _replyContentController.text; @@ -73,18 +93,49 @@ class _VideoReplyNewDialogState extends State } } + void onChooseEmote(PackageItem package, Emote emote) { + final int cursorPosition = _replyContentController.selection.baseOffset; + final String currentText = _replyContentController.text; + final String newText = currentText.substring(0, cursorPosition) + + emote.text! + + currentText.substring(cursorPosition); + _replyContentController.value = TextEditingValue( + text: newText, + selection: + TextSelection.collapsed(offset: cursorPosition + emote.text!.length), + ); + } + + @override + void didChangeMetrics() { + super.didChangeMetrics(); + WidgetsBinding.instance.addPostFrameCallback((_) { + // 键盘高度 + final viewInsets = EdgeInsets.fromViewPadding( + View.of(context).viewInsets, View.of(context).devicePixelRatio); + _debouncer.run(() { + if (mounted) { + if (keyboardHeight == 0 && emoteHeight == 0) { + setState(() { + emoteHeight = keyboardHeight = + keyboardHeight == 0.0 ? viewInsets.bottom : keyboardHeight; + }); + } + } + }); + }); + } + @override void dispose() { WidgetsBinding.instance.removeObserver(this); _replyContentController.dispose(); + replyContentFocusNode.removeListener(() {}); super.dispose(); } @override Widget build(BuildContext context) { - double keyboardHeight = EdgeInsets.fromViewPadding( - View.of(context).viewInsets, View.of(context).devicePixelRatio) - .bottom; return Container( clipBehavior: Clip.hardEdge, decoration: BoxDecoration( @@ -137,27 +188,32 @@ class _VideoReplyNewDialogState extends State child: Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - SizedBox( - width: 36, - height: 36, - child: IconButton( - onPressed: () { - FocusScope.of(context) - .requestFocus(replyContentFocusNode); - }, - icon: Icon(Icons.keyboard, - size: 22, - color: Theme.of(context).colorScheme.onBackground), - highlightColor: - Theme.of(context).colorScheme.onInverseSurface, - style: ButtonStyle( - padding: MaterialStateProperty.all(EdgeInsets.zero), - backgroundColor: - MaterialStateProperty.resolveWith((states) { - return Theme.of(context).highlightColor; - }), - ), - ), + ToolbarIconButton( + onPressed: () { + if (toolbarType == 'emote') { + setState(() { + toolbarType = 'input'; + }); + } + FocusScope.of(context).requestFocus(replyContentFocusNode); + }, + icon: const Icon(Icons.keyboard, size: 22), + toolbarType: toolbarType, + selected: toolbarType == 'input', + ), + const SizedBox(width: 20), + ToolbarIconButton( + onPressed: () { + if (toolbarType == 'input') { + setState(() { + toolbarType = 'emote'; + }); + } + FocusScope.of(context).unfocus(); + }, + icon: const Icon(Icons.emoji_emotions, size: 22), + toolbarType: toolbarType, + selected: toolbarType == 'emote', ), const Spacer(), TextButton( @@ -170,7 +226,10 @@ class _VideoReplyNewDialogState extends State duration: const Duration(milliseconds: 300), child: SizedBox( width: double.infinity, - height: keyboardHeight, + height: toolbarType == 'input' ? keyboardHeight : emoteHeight, + child: EmotePanel( + onChoose: (package, emote) => onChooseEmote(package, emote), + ), ), ), ], @@ -178,3 +237,22 @@ class _VideoReplyNewDialogState extends State ); } } + +typedef DebounceCallback = void Function(); + +class Debouncer { + DebounceCallback? callback; + final int? milliseconds; + Timer? _timer; + + Debouncer({this.milliseconds}); + + run(DebounceCallback callback) { + if (_timer != null) { + _timer!.cancel(); + } + _timer = Timer(Duration(milliseconds: milliseconds!), () { + callback(); + }); + } +} From bf071ea9e1b869ff69dd2fbb30cc5766f2066420 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sun, 25 Feb 2024 19:34:24 +0800 Subject: [PATCH 110/220] =?UTF-8?q?feat:=20=E6=B6=88=E6=81=AF=E6=9C=AA?= =?UTF-8?q?=E8=AF=BB=E6=A0=87=E8=AE=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/http/api.dart | 4 ++ lib/http/msg.dart | 32 +++++++++++++++ lib/pages/whisper/view.dart | 50 ++++++++++++------------ lib/pages/whisper_detail/controller.dart | 25 +++++++++++- 4 files changed, 85 insertions(+), 26 deletions(-) diff --git a/lib/http/api.dart b/lib/http/api.dart index 736030b2..258b706b 100644 --- a/lib/http/api.dart +++ b/lib/http/api.dart @@ -489,4 +489,8 @@ class Api { /// 我的订阅详情 static const userSubFolderDetail = '/x/space/fav/season/list'; + + /// 已读标记 + static const String ackSessionMsg = + '${HttpString.tUrl}/session_svr/v1/session_svr/update_ack'; } diff --git a/lib/http/msg.dart b/lib/http/msg.dart index 70af5b55..be0bdd3a 100644 --- a/lib/http/msg.dart +++ b/lib/http/msg.dart @@ -86,4 +86,36 @@ class MsgHttp { }; } } + + // 消息标记已读 + static Future ackSessionMsg({ + int? talkerId, + int? ackSeqno, + }) async { + String csrf = await Request.getCsrf(); + Map params = await WbiSign().makSign({ + 'talker_id': talkerId, + 'session_type': 1, + 'ack_seqno': ackSeqno, + 'build': 0, + 'mobi_app': 'web', + 'csrf_token': csrf, + 'csrf': csrf + }); + var res = await Request().get(Api.ackSessionMsg, data: params); + if (res.data['code'] == 0) { + return { + 'status': true, + 'data': res.data['data'], + }; + } else { + return { + 'status': false, + 'date': [], + 'msg': "message: ${res.data['message']}," + " msg: ${res.data['msg']}," + " code: ${res.data['code']}", + }; + } + } } diff --git a/lib/pages/whisper/view.dart b/lib/pages/whisper/view.dart index f2779a17..f54efa58 100644 --- a/lib/pages/whisper/view.dart +++ b/lib/pages/whisper/view.dart @@ -110,7 +110,7 @@ class _WhisperPageState extends State { if (snapshot.connectionState == ConnectionState.done) { Map data = snapshot.data as Map; if (data['status']) { - List sessionList = _whisperController.sessionList; + RxList sessionList = _whisperController.sessionList; return Obx( () => sessionList.isEmpty ? const SizedBox() @@ -121,33 +121,35 @@ class _WhisperPageState extends State { const NeverScrollableScrollPhysics(), itemBuilder: (_, int i) { return ListTile( - onTap: () => Get.toNamed( - '/whisperDetail', - parameters: { - 'talkerId': sessionList[i] - .talkerId - .toString(), - 'name': sessionList[i] - .accountInfo - .name, - 'face': sessionList[i] - .accountInfo - .face, - 'mid': sessionList[i] - .accountInfo - .mid - .toString(), - }, - ), + onTap: () { + sessionList[i].unreadCount = 0; + sessionList.refresh(); + Get.toNamed( + '/whisperDetail', + parameters: { + 'talkerId': sessionList[i] + .talkerId + .toString(), + 'name': sessionList[i] + .accountInfo + .name, + 'face': sessionList[i] + .accountInfo + .face, + 'mid': sessionList[i] + .accountInfo + .mid + .toString(), + }, + ); + }, leading: Badge( - isLabelVisible: false, - backgroundColor: Theme.of(context) - .colorScheme - .primary, + isLabelVisible: + sessionList[i].unreadCount > 0, label: Text(sessionList[i] .unreadCount .toString()), - alignment: Alignment.bottomRight, + alignment: Alignment.topRight, child: NetworkImgLayer( width: 45, height: 45, diff --git a/lib/pages/whisper_detail/controller.dart b/lib/pages/whisper_detail/controller.dart index 71dd4c03..6e854712 100644 --- a/lib/pages/whisper_detail/controller.dart +++ b/lib/pages/whisper_detail/controller.dart @@ -25,10 +25,31 @@ class WhisperDetailController extends GetxController { var res = await MsgHttp.sessionMsg(talkerId: talkerId); if (res['status']) { messageList.value = res['data'].messages; - if (messageList.isNotEmpty && res['data'].eInfos != null) { - eInfos = res['data'].eInfos; + if (messageList.isNotEmpty) { + ackSessionMsg(); + if (res['data'].eInfos != null) { + eInfos = res['data'].eInfos; + } } + } else { + SmartDialog.showToast(res['msg']); } return res; } + + // 消息标记已读 + Future ackSessionMsg() async { + if (messageList.isEmpty) { + return; + } + var res = await MsgHttp.ackSessionMsg( + talkerId: talkerId, + ackSeqno: messageList.last.msgSeqno, + ); + if (res['status']) { + SmartDialog.showToast("已读成功"); + } else { + SmartDialog.showToast(res['msg']); + } + } } From e2489ef0e3990a8065e73ecb6a97941811fd1eb7 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sun, 25 Feb 2024 22:48:02 +0800 Subject: [PATCH 111/220] =?UTF-8?q?feat:=20=E7=A7=81=E4=BF=A1=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E8=A1=A8=E6=83=85=E9=9D=A2=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/http/api.dart | 3 + lib/http/msg.dart | 122 +++++++- lib/models/msg/session.dart | 18 +- lib/pages/whisper/view.dart | 40 ++- lib/pages/whisper_detail/controller.dart | 34 ++- lib/pages/whisper_detail/view.dart | 273 +++++++++++++----- .../whisper_detail/widget/chat_item.dart | 6 +- 7 files changed, 377 insertions(+), 119 deletions(-) diff --git a/lib/http/api.dart b/lib/http/api.dart index 516935d3..3a23ef80 100644 --- a/lib/http/api.dart +++ b/lib/http/api.dart @@ -496,4 +496,7 @@ class Api { /// 已读标记 static const String ackSessionMsg = '${HttpString.tUrl}/session_svr/v1/session_svr/update_ack'; + + /// 发送私信 + static const String sendMsg = '${HttpString.tUrl}/web_im/v1/web_im/send_msg'; } diff --git a/lib/http/msg.dart b/lib/http/msg.dart index be0bdd3a..4ba2f818 100644 --- a/lib/http/msg.dart +++ b/lib/http/msg.dart @@ -1,3 +1,4 @@ +import 'dart:math'; import '../models/msg/account.dart'; import '../models/msg/session.dart'; import '../utils/wbi_sign.dart'; @@ -22,10 +23,18 @@ class MsgHttp { Map signParams = await WbiSign().makSign(params); var res = await Request().get(Api.sessionList, data: signParams); if (res.data['code'] == 0) { - return { - 'status': true, - 'data': SessionDataModel.fromJson(res.data['data']), - }; + try { + return { + 'status': true, + 'data': SessionDataModel.fromJson(res.data['data']), + }; + } catch (err) { + return { + 'status': false, + 'date': [], + 'msg': err.toString(), + }; + } } else { return { 'status': false, @@ -42,12 +51,16 @@ class MsgHttp { 'mobi_app': 'web', }); if (res.data['code'] == 0) { - return { - 'status': true, - 'data': res.data['data'] - .map((e) => AccountListModel.fromJson(e)) - .toList(), - }; + try { + return { + 'status': true, + 'data': res.data['data'] + .map((e) => AccountListModel.fromJson(e)) + .toList(), + }; + } catch (err) { + print('err🔟: $err'); + } } else { return { 'status': false, @@ -118,4 +131,93 @@ class MsgHttp { }; } } + + // 发送私信 + static Future sendMsg({ + int? senderUid, + int? receiverId, + int? receiverType, + int? msgType, + dynamic content, + }) async { + String csrf = await Request.getCsrf(); + Map params = await WbiSign().makSign({ + 'msg[sender_uid]': senderUid, + 'msg[receiver_id]': receiverId, + 'msg[receiver_type]': receiverType ?? 1, + 'msg[msg_type]': msgType ?? 1, + 'msg[msg_status]': 0, + 'msg[dev_id]': getDevId(), + 'msg[timestamp]': DateTime.now().millisecondsSinceEpoch ~/ 1000, + 'msg[new_face_version]': 0, + 'msg[content]': content, + 'from_firework': 0, + 'build': 0, + 'mobi_app': 'web', + 'csrf_token': csrf, + 'csrf': csrf, + }); + var res = + await Request().post(Api.sendMsg, queryParameters: { + ...params, + 'csrf_token': csrf, + 'csrf': csrf, + }, data: { + 'w_sender_uid': params['msg[sender_uid]'], + 'w_receiver_id': params['msg[receiver_id]'], + 'w_dev_id': params['msg[dev_id]'], + 'w_rid': params['w_rid'], + 'wts': params['wts'], + 'csrf_token': csrf, + 'csrf': csrf, + }); + if (res.data['code'] == 0) { + return { + 'status': true, + 'data': res.data['data'], + }; + } else { + return { + 'status': false, + 'date': [], + 'msg': "message: ${res.data['message']}," + " msg: ${res.data['msg']}," + " code: ${res.data['code']}", + }; + } + } + + static String getDevId() { + final List b = [ + '0', + '1', + '2', + '3', + '4', + '5', + '6', + '7', + '8', + '9', + 'A', + 'B', + 'C', + 'D', + 'E', + 'F' + ]; + final List s = "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".split(''); + for (int i = 0; i < s.length; i++) { + if ('-' == s[i] || '4' == s[i]) { + continue; + } + final int randomInt = Random().nextInt(16); + if ('x' == s[i]) { + s[i] = b[randomInt]; + } else { + s[i] = b[3 & randomInt | 8]; + } + } + return s.join(); + } } diff --git a/lib/models/msg/session.dart b/lib/models/msg/session.dart index ea241249..b6c1b6a6 100644 --- a/lib/models/msg/session.dart +++ b/lib/models/msg/session.dart @@ -8,7 +8,7 @@ class SessionDataModel { this.hasMore, }); - List? sessionList; + List? sessionList; int? hasMore; SessionDataModel.fromJson(Map json) { @@ -121,35 +121,37 @@ class LastMsg { this.msgKey, this.msgStatus, this.notifyCode, - this.newFaceVersion, + // this.newFaceVersion, }); int? senderIid; int? receiverType; int? receiverId; int? msgType; - Map? content; + dynamic content; int? msgSeqno; int? timestamp; String? atUids; int? msgKey; int? msgStatus; String? notifyCode; - int? newFaceVersion; + // int? newFaceVersion; LastMsg.fromJson(Map json) { senderIid = json['sender_uid']; receiverType = json['receiver_type']; receiverId = json['receiver_id']; msgType = json['msg_type']; - content = jsonDecode(json['content']); + content = json['content'] != null && json['content'] != '' + ? jsonDecode(json['content']) + : ''; msgSeqno = json['msg_seqno']; timestamp = json['timestamp']; atUids = json['at_uids']; msgKey = json['msg_key']; msgStatus = json['msg_status']; notifyCode = json['notify_code']; - newFaceVersion = json['new_face_version']; + // newFaceVersion = json['new_face_version']; } } @@ -214,7 +216,9 @@ class MessageItem { receiverId = json['receiver_id']; // 1 文本 2 图片 18 系统提示 10 系统通知 5 撤回的消息 msgType = json['msg_type']; - content = jsonDecode(json['content']); + content = json['content'] != null && json['content'] != '' + ? jsonDecode(json['content']) + : ''; msgSeqno = json['msg_seqno']; timestamp = json['timestamp']; atUids = json['at_uids']; diff --git a/lib/pages/whisper/view.dart b/lib/pages/whisper/view.dart index f54efa58..f1c58650 100644 --- a/lib/pages/whisper/view.dart +++ b/lib/pages/whisper/view.dart @@ -108,8 +108,8 @@ class _WhisperPageState extends State { future: _futureBuilderFuture, builder: (context, snapshot) { if (snapshot.connectionState == ConnectionState.done) { - Map data = snapshot.data as Map; - if (data['status']) { + Map? data = snapshot.data; + if (data != null && data['status']) { RxList sessionList = _whisperController.sessionList; return Obx( () => sessionList.isEmpty @@ -162,20 +162,26 @@ class _WhisperPageState extends State { title: Text( sessionList[i].accountInfo.name), subtitle: Text( - sessionList[i] - .lastMsg - .content['text'] ?? - sessionList[i] - .lastMsg - .content['content'] ?? - sessionList[i] - .lastMsg - .content['title'] ?? - sessionList[i] + sessionList[i].lastMsg.content != + null && + sessionList[i] + .lastMsg + .content != + '' + ? (sessionList[i] .lastMsg - .content[ - 'reply_content'] ?? - '', + .content['text'] ?? + sessionList[i] + .lastMsg + .content['content'] ?? + sessionList[i] + .lastMsg + .content['title'] ?? + sessionList[i] + .lastMsg + .content[ + 'reply_content']) + : '不支持的消息类型', maxLines: 1, overflow: TextOverflow.ellipsis, style: Theme.of(context) @@ -212,7 +218,9 @@ class _WhisperPageState extends State { ); } else { // 请求错误 - return const SizedBox(); + return Center( + child: Text(data?['msg'] ?? '请求异常'), + ); } } else { // 骨架屏 diff --git a/lib/pages/whisper_detail/controller.dart b/lib/pages/whisper_detail/controller.dart index 6e854712..6e950f81 100644 --- a/lib/pages/whisper_detail/controller.dart +++ b/lib/pages/whisper_detail/controller.dart @@ -1,7 +1,11 @@ +import 'package:flutter/material.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:get/get.dart'; +import 'package:hive/hive.dart'; import 'package:pilipala/http/msg.dart'; import 'package:pilipala/models/msg/session.dart'; +import '../../utils/feed_back.dart'; +import '../../utils/storage.dart'; class WhisperDetailController extends GetxController { late int talkerId; @@ -11,6 +15,8 @@ class WhisperDetailController extends GetxController { RxList messageList = [].obs; //表情转换图片规则 List? eInfos; + final TextEditingController replyContentController = TextEditingController(); + Box userInfoCache = GStrorage.userInfo; @override void onInit() { @@ -42,14 +48,34 @@ class WhisperDetailController extends GetxController { if (messageList.isEmpty) { return; } - var res = await MsgHttp.ackSessionMsg( + await MsgHttp.ackSessionMsg( talkerId: talkerId, ackSeqno: messageList.last.msgSeqno, ); - if (res['status']) { - SmartDialog.showToast("已读成功"); + } + + Future sendMsg() async { + feedBack(); + String message = replyContentController.text; + final userInfo = userInfoCache.get('userInfoCache'); + if (userInfo == null) { + SmartDialog.showToast('请先登录'); + return; + } + if (message == '') { + SmartDialog.showToast('请输入内容'); + return; + } + var result = await MsgHttp.sendMsg( + senderUid: userInfo.mid, + receiverId: int.parse(mid), + content: {'content': message}, + msgType: 1, + ); + if (result['status']) { + SmartDialog.showToast('发送成功'); } else { - SmartDialog.showToast(res['msg']); + SmartDialog.showToast(result['msg']); } } } diff --git a/lib/pages/whisper_detail/view.dart b/lib/pages/whisper_detail/view.dart index 8d2297c4..e94b7d6d 100644 --- a/lib/pages/whisper_detail/view.dart +++ b/lib/pages/whisper_detail/view.dart @@ -1,9 +1,12 @@ +import 'dart:async'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; +import 'package:hive/hive.dart'; import 'package:pilipala/common/widgets/network_img_layer.dart'; +import 'package:pilipala/pages/emote/index.dart'; import 'package:pilipala/pages/whisper_detail/controller.dart'; import 'package:pilipala/utils/feed_back.dart'; - +import '../../utils/storage.dart'; import 'widget/chat_item.dart'; class WhisperDetailPage extends StatefulWidget { @@ -13,15 +16,63 @@ class WhisperDetailPage extends StatefulWidget { State createState() => _WhisperDetailPageState(); } -class _WhisperDetailPageState extends State { +class _WhisperDetailPageState extends State + with WidgetsBindingObserver { final WhisperDetailController _whisperDetailController = Get.put(WhisperDetailController()); late Future _futureBuilderFuture; + late TextEditingController _replyContentController; + final FocusNode replyContentFocusNode = FocusNode(); + final _debouncer = Debouncer(milliseconds: 200); // 设置延迟时间 + late double emoteHeight = 0.0; + double keyboardHeight = 0.0; // 键盘高度 + String toolbarType = 'input'; + Box userInfoCache = GStrorage.userInfo; @override void initState() { super.initState(); + WidgetsBinding.instance.addObserver(this); _futureBuilderFuture = _whisperDetailController.querySessionMsg(); + _replyContentController = _whisperDetailController.replyContentController; + _focuslistener(); + } + + _focuslistener() { + replyContentFocusNode.addListener(() { + if (replyContentFocusNode.hasFocus) { + setState(() { + toolbarType = 'input'; + }); + } + }); + } + + @override + void didChangeMetrics() { + super.didChangeMetrics(); + WidgetsBinding.instance.addPostFrameCallback((_) { + // 键盘高度 + final viewInsets = EdgeInsets.fromViewPadding( + View.of(context).viewInsets, View.of(context).devicePixelRatio); + _debouncer.run(() { + if (mounted) { + if (keyboardHeight == 0) { + setState(() { + emoteHeight = keyboardHeight = + keyboardHeight == 0.0 ? viewInsets.bottom : keyboardHeight; + }); + } + } + }); + }); + } + + @override + void dispose() { + WidgetsBinding.instance.removeObserver(this); + replyContentFocusNode.removeListener(() {}); + super.dispose(); } @override @@ -89,55 +140,63 @@ class _WhisperDetailPageState extends State { ), ), ), - body: FutureBuilder( - future: _futureBuilderFuture, - builder: (BuildContext context, snapshot) { - if (snapshot.connectionState == ConnectionState.done) { - if (snapshot.data == null) { - return const SizedBox(); - } - final Map data = snapshot.data as Map; - if (data['status']) { - List messageList = _whisperDetailController.messageList; - return Obx( - () => messageList.isEmpty - ? const SizedBox() - : ListView.builder( - itemCount: messageList.length, - shrinkWrap: true, - reverse: true, - itemBuilder: (_, int i) { - if (i == 0) { - return Column( - children: [ - ChatItem( - item: messageList[i], - e_infos: _whisperDetailController.eInfos), - const SizedBox(height: 12), - ], - ); - } else { - return ChatItem( - item: messageList[i], - e_infos: _whisperDetailController.eInfos); - } - }, - ), - ); - } else { - // 请求错误 - return const SizedBox(); - } - } else { - // 骨架屏 - return const SizedBox(); - } + body: GestureDetector( + onTap: () { + FocusScope.of(context).unfocus(); + setState(() { + keyboardHeight = 0; + }); }, + child: FutureBuilder( + future: _futureBuilderFuture, + builder: (BuildContext context, snapshot) { + if (snapshot.connectionState == ConnectionState.done) { + if (snapshot.data == null) { + return const SizedBox(); + } + final Map data = snapshot.data as Map; + if (data['status']) { + List messageList = _whisperDetailController.messageList; + return Obx( + () => messageList.isEmpty + ? const SizedBox() + : ListView.builder( + itemCount: messageList.length, + shrinkWrap: true, + reverse: true, + itemBuilder: (_, int i) { + if (i == 0) { + return Column( + children: [ + ChatItem( + item: messageList[i], + e_infos: _whisperDetailController.eInfos), + const SizedBox(height: 12), + ], + ); + } else { + return ChatItem( + item: messageList[i], + e_infos: _whisperDetailController.eInfos); + } + }, + ), + ); + } else { + // 请求错误 + return const SizedBox(); + } + } else { + // 骨架屏 + return const SizedBox(); + } + }, + ), ), // resizeToAvoidBottomInset: true, bottomNavigationBar: Container( width: double.infinity, - height: MediaQuery.of(context).padding.bottom + 70, + height: MediaQuery.of(context).padding.bottom + 70 + keyboardHeight, padding: EdgeInsets.only( left: 8, right: 12, @@ -152,48 +211,102 @@ class _WhisperDetailPageState extends State { ), ), ), - child: Row( - mainAxisAlignment: MainAxisAlignment.center, - crossAxisAlignment: CrossAxisAlignment.start, + child: Column( children: [ - // IconButton( - // onPressed: () {}, - // icon: Icon( - // Icons.add_circle_outline, - // color: Theme.of(context).colorScheme.outline, - // ), - // ), - IconButton( - onPressed: () {}, - icon: Icon( - Icons.emoji_emotions_outlined, - color: Theme.of(context).colorScheme.outline, - ), - ), - Expanded( - child: Container( - height: 45, - decoration: BoxDecoration( - color: - Theme.of(context).colorScheme.primary.withOpacity(0.08), - borderRadius: BorderRadius.circular(40.0), - ), - child: TextField( - readOnly: true, - style: Theme.of(context).textTheme.titleMedium, - decoration: const InputDecoration( - border: InputBorder.none, // 移除默认边框 - hintText: '开发中 ...', // 提示文本 - contentPadding: EdgeInsets.symmetric( - horizontal: 16.0, vertical: 12.0), // 内边距 + Row( + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + // IconButton( + // onPressed: () {}, + // icon: Icon( + // Icons.add_circle_outline, + // color: Theme.of(context).colorScheme.outline, + // ), + // ), + IconButton( + onPressed: () { + // if (toolbarType == 'input') { + // setState(() { + // toolbarType = 'emote'; + // }); + // } + // FocusScope.of(context).unfocus(); + }, + icon: Icon( + Icons.emoji_emotions_outlined, + color: Theme.of(context).colorScheme.outline, ), ), + Expanded( + child: Container( + height: 45, + decoration: BoxDecoration( + color: Theme.of(context) + .colorScheme + .primary + .withOpacity(0.08), + borderRadius: BorderRadius.circular(40.0), + ), + child: TextField( + readOnly: true, + style: Theme.of(context).textTheme.titleMedium, + controller: _replyContentController, + autofocus: false, + focusNode: replyContentFocusNode, + decoration: const InputDecoration( + border: InputBorder.none, // 移除默认边框 + hintText: '开发中 ...', // 提示文本 + contentPadding: EdgeInsets.symmetric( + horizontal: 16.0, vertical: 12.0), // 内边距 + ), + ), + ), + ), + IconButton( + // onPressed: _whisperDetailController.sendMsg, + onPressed: null, + icon: Icon( + Icons.send, + color: Theme.of(context).colorScheme.outline, + ), + ), + // const SizedBox(width: 16), + ], + ), + AnimatedSize( + curve: Curves.easeInOut, + duration: const Duration(milliseconds: 300), + child: SizedBox( + width: double.infinity, + height: toolbarType == 'input' ? keyboardHeight : emoteHeight, + child: EmotePanel( + onChoose: (package, emote) => {}, + ), ), ), - const SizedBox(width: 16), ], ), ), ); } } + +typedef DebounceCallback = void Function(); + +class Debouncer { + DebounceCallback? callback; + final int? milliseconds; + Timer? _timer; + + Debouncer({this.milliseconds}); + + run(DebounceCallback callback) { + if (_timer != null) { + _timer!.cancel(); + } + _timer = Timer(Duration(milliseconds: milliseconds!), () { + callback(); + }); + } +} diff --git a/lib/pages/whisper_detail/widget/chat_item.dart b/lib/pages/whisper_detail/widget/chat_item.dart index 0925d569..4fd49254 100644 --- a/lib/pages/whisper_detail/widget/chat_item.dart +++ b/lib/pages/whisper_detail/widget/chat_item.dart @@ -204,7 +204,7 @@ class ChatItem extends StatelessWidget { final int cid = await SearchHttp.ab2c(bvid: bvid); final String heroTag = Utils.makeHeroTag(bvid); SmartDialog.dismiss().then( - (e) => Get.toNamed('/video?bvid=$bvid&cid=$cid', + (e) => Get.toNamed('/video?bvid=$bvid&cid=$cid', arguments: { 'pic': content['thumb'], 'heroTag': heroTag, @@ -352,7 +352,9 @@ class ChatItem extends StatelessWidget { )); default: return Text( - content['content'] ?? content.toString(), + content != null && content != '' + ? (content['content'] ?? content.toString()) + : '不支持的消息类型', style: TextStyle( letterSpacing: 0.6, height: 1.5, From 90c0256766cd2fc82849c5d0db160b3583ad8a8c Mon Sep 17 00:00:00 2001 From: guozhigq Date: Mon, 26 Feb 2024 00:00:14 +0800 Subject: [PATCH 112/220] =?UTF-8?q?opt:=20=E5=9B=BE=E7=89=87=E5=8A=A0?= =?UTF-8?q?=E8=BD=BD&=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/common/widgets/network_img_layer.dart | 7 +++++-- lib/pages/about/index.dart | 2 +- lib/pages/setting/extra_setting.dart | 10 +++++++--- lib/pages/setting/style_setting.dart | 3 +++ lib/pages/subscription/view.dart | 1 - lib/utils/global_data.dart | 12 ++++++++++++ lib/utils/storage.dart | 5 +++-- 7 files changed, 31 insertions(+), 9 deletions(-) create mode 100644 lib/utils/global_data.dart diff --git a/lib/common/widgets/network_img_layer.dart b/lib/common/widgets/network_img_layer.dart index 52c56a8a..06c35974 100644 --- a/lib/common/widgets/network_img_layer.dart +++ b/lib/common/widgets/network_img_layer.dart @@ -2,6 +2,7 @@ import 'package:cached_network_image/cached_network_image.dart'; import 'package:flutter/material.dart'; import 'package:hive/hive.dart'; import 'package:pilipala/utils/extension.dart'; +import 'package:pilipala/utils/global_data.dart'; import '../../utils/storage.dart'; import '../constants.dart'; @@ -32,8 +33,10 @@ class NetworkImgLayer extends StatelessWidget { @override Widget build(BuildContext context) { + final int defaultImgQuality = GlobalData().imgQuality; final String imageUrl = - '${src!.startsWith('//') ? 'https:${src!}' : src!}@${quality ?? 100}q.webp'; + '${src!.startsWith('//') ? 'https:${src!}' : src!}@${quality ?? defaultImgQuality}q.webp'; + print(imageUrl); int? memCacheWidth, memCacheHeight; double aspectRatio = (width / height).toDouble(); @@ -81,7 +84,7 @@ class NetworkImgLayer extends StatelessWidget { fadeOutDuration ?? const Duration(milliseconds: 120), fadeInDuration: fadeInDuration ?? const Duration(milliseconds: 120), - filterQuality: FilterQuality.high, + filterQuality: FilterQuality.low, errorWidget: (BuildContext context, String url, Object error) => placeholder(context), placeholder: (BuildContext context, String url) => diff --git a/lib/pages/about/index.dart b/lib/pages/about/index.dart index 41ee1516..7c42f5aa 100644 --- a/lib/pages/about/index.dart +++ b/lib/pages/about/index.dart @@ -201,11 +201,11 @@ class _AboutPageState extends State { var cleanStatus = await CacheManage().clearCacheAll(); if (cleanStatus) { getCacheSize(); + SmartDialog.showToast('清除成功'); } }, title: const Text('清除缓存'), subtitle: Text('图片及网络缓存 $cacheSize', style: subTitleStyle), - trailing: Icon(Icons.arrow_forward_ios, size: 16, color: outline), ), SizedBox(height: MediaQuery.of(context).padding.bottom + 20) ], diff --git a/lib/pages/setting/extra_setting.dart b/lib/pages/setting/extra_setting.dart index 1580ad8b..0a4dd2bf 100644 --- a/lib/pages/setting/extra_setting.dart +++ b/lib/pages/setting/extra_setting.dart @@ -1,11 +1,13 @@ import 'package:flutter/material.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; +import 'package:get/get.dart'; import 'package:hive/hive.dart'; import 'package:pilipala/models/common/dynamics_type.dart'; import 'package:pilipala/models/common/reply_sort_type.dart'; import 'package:pilipala/pages/setting/widgets/select_dialog.dart'; import 'package:pilipala/utils/storage.dart'; +import '../home/index.dart'; import 'widgets/switch_item.dart'; class ExtraSetting extends StatefulWidget { @@ -138,18 +140,20 @@ class _ExtraSettingState extends State { ), body: ListView( children: [ - SetSwitchItem( + const SetSwitchItem( title: '大家都在搜', subTitle: '是否展示「大家都在搜」', setKey: SettingBoxKey.enableHotKey, defaultVal: true, - callFn: (val) => {SmartDialog.showToast('下次启动时生效')}, ), - const SetSwitchItem( + SetSwitchItem( title: '搜索默认词', subTitle: '是否展示搜索框默认词', setKey: SettingBoxKey.enableSearchWord, defaultVal: true, + callFn: (val) { + Get.find().defaultSearch.value = ''; + }, ), const SetSwitchItem( title: '快速收藏', diff --git a/lib/pages/setting/style_setting.dart b/lib/pages/setting/style_setting.dart index c9bffa69..849123e5 100644 --- a/lib/pages/setting/style_setting.dart +++ b/lib/pages/setting/style_setting.dart @@ -8,6 +8,7 @@ import 'package:pilipala/models/common/theme_type.dart'; import 'package:pilipala/pages/setting/pages/color_select.dart'; import 'package:pilipala/pages/setting/widgets/select_dialog.dart'; import 'package:pilipala/pages/setting/widgets/slide_dialog.dart'; +import 'package:pilipala/utils/global_data.dart'; import 'package:pilipala/utils/storage.dart'; import '../../models/common/dynamic_badge_mode.dart'; @@ -176,6 +177,8 @@ class _StyleSettingState extends State { SettingBoxKey.defaultPicQa, picQuality); Get.back(); settingController.picQuality.value = picQuality; + GlobalData().imgQuality = picQuality; + SmartDialog.showToast('设置成功'); }, child: const Text('确定'), ) diff --git a/lib/pages/subscription/view.dart b/lib/pages/subscription/view.dart index b2a4965b..1eee4a4f 100644 --- a/lib/pages/subscription/view.dart +++ b/lib/pages/subscription/view.dart @@ -2,7 +2,6 @@ import 'package:easy_debounce/easy_throttle.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:pilipala/common/widgets/http_error.dart'; -import 'package:pilipala/pages/fav/widgets/item.dart'; import 'controller.dart'; import 'widgets/item.dart'; diff --git a/lib/utils/global_data.dart b/lib/utils/global_data.dart new file mode 100644 index 00000000..a8a04eba --- /dev/null +++ b/lib/utils/global_data.dart @@ -0,0 +1,12 @@ +class GlobalData { + int imgQuality = 10; + + // 私有构造函数 + GlobalData._(); + + // 单例实例 + static final GlobalData _instance = GlobalData._(); + + // 获取全局实例 + factory GlobalData() => _instance; +} diff --git a/lib/utils/storage.dart b/lib/utils/storage.dart index 16cef463..09e362fd 100644 --- a/lib/utils/storage.dart +++ b/lib/utils/storage.dart @@ -1,11 +1,10 @@ -// import 'package:hive/hive.dart'; import 'dart:io'; - import 'package:hive_flutter/hive_flutter.dart'; import 'package:path_provider/path_provider.dart'; import 'package:pilipala/models/model_owner.dart'; import 'package:pilipala/models/search/hot.dart'; import 'package:pilipala/models/user/info.dart'; +import 'global_data.dart'; class GStrorage { static late final Box userInfo; @@ -44,6 +43,8 @@ class GStrorage { ); // 视频设置 video = await Hive.openBox('video'); + GlobalData().imgQuality = + setting.get(SettingBoxKey.defaultPicQa, defaultValue: 10); // 设置全局变量 } static void regAdapter() { From ee368d348d00148edf7c5557f6171b044bc3d353 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Tue, 27 Feb 2024 22:50:02 +0800 Subject: [PATCH 113/220] =?UTF-8?q?feat:=20=E5=AD=97=E5=B9=95=E5=B1=95?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/http/api.dart | 3 ++ lib/http/video.dart | 16 ++++++ lib/models/video/subTitile/content.dart | 20 +++++++ lib/models/video/subTitile/result.dart | 70 +++++++++++++++++++++++++ lib/pages/video/detail/controller.dart | 36 +++++++++++++ lib/pages/video/detail/view.dart | 5 +- lib/plugin/pl_player/controller.dart | 21 +++++++- lib/plugin/pl_player/view.dart | 37 ++++++++++++- 8 files changed, 204 insertions(+), 4 deletions(-) create mode 100644 lib/models/video/subTitile/content.dart create mode 100644 lib/models/video/subTitile/result.dart diff --git a/lib/http/api.dart b/lib/http/api.dart index 2e758439..559c6fdb 100644 --- a/lib/http/api.dart +++ b/lib/http/api.dart @@ -483,4 +483,7 @@ class Api { /// 激活buvid3 static const activateBuvidApi = '/x/internal/gaia-gateway/ExClimbWuzhi'; + + /// 获取字幕配置 + static const getSubtitleConfig = '/x/player/v2'; } diff --git a/lib/http/video.dart b/lib/http/video.dart index 30df62c3..a852e74b 100644 --- a/lib/http/video.dart +++ b/lib/http/video.dart @@ -8,6 +8,7 @@ import '../models/model_rec_video_item.dart'; import '../models/user/fav_folder.dart'; import '../models/video/ai.dart'; import '../models/video/play/url.dart'; +import '../models/video/subTitile/result.dart'; import '../models/video_detail_res.dart'; import '../utils/recommend_filter.dart'; import '../utils/storage.dart'; @@ -475,4 +476,19 @@ class VideoHttp { return {'status': false, 'data': []}; } } + + static Future getSubtitle({int? cid, String? bvid}) async { + var res = await Request().get(Api.getSubtitleConfig, data: { + 'cid': cid, + 'bvid': bvid, + }); + if (res.data['code'] == 0) { + return { + 'status': true, + 'data': SubTitlteModel.fromJson(res.data['data']), + }; + } else { + return {'status': false, 'data': [], 'msg': res.data['msg']}; + } + } } diff --git a/lib/models/video/subTitile/content.dart b/lib/models/video/subTitile/content.dart new file mode 100644 index 00000000..b18098a4 --- /dev/null +++ b/lib/models/video/subTitile/content.dart @@ -0,0 +1,20 @@ +class SubTitileContentModel { + double? from; + double? to; + int? location; + String? content; + + SubTitileContentModel({ + this.from, + this.to, + this.location, + this.content, + }); + + SubTitileContentModel.fromJson(Map json) { + from = json['from']; + to = json['to']; + location = json['location']; + content = json['content']; + } +} diff --git a/lib/models/video/subTitile/result.dart b/lib/models/video/subTitile/result.dart new file mode 100644 index 00000000..389378fa --- /dev/null +++ b/lib/models/video/subTitile/result.dart @@ -0,0 +1,70 @@ +class SubTitlteModel { + SubTitlteModel({ + this.aid, + this.bvid, + this.cid, + this.loginMid, + this.loginMidHash, + this.isOwner, + this.name, + this.subtitles, + }); + + int? aid; + String? bvid; + int? cid; + int? loginMid; + String? loginMidHash; + bool? isOwner; + String? name; + List? subtitles; + + factory SubTitlteModel.fromJson(Map json) => SubTitlteModel( + aid: json["aid"], + bvid: json["bvid"], + cid: json["cid"], + loginMid: json["login_mid"], + loginMidHash: json["login_mid_hash"], + isOwner: json["is_owner"], + name: json["name"], + subtitles: json["subtitle"] != null + ? json["subtitle"]["subtitles"] + .map((x) => SubTitlteItemModel.fromJson(x)) + .toList() + : [], + ); +} + +class SubTitlteItemModel { + SubTitlteItemModel({ + this.id, + this.lan, + this.lanDoc, + this.isLock, + this.subtitleUrl, + this.type, + this.aiType, + this.aiStatus, + }); + + int? id; + String? lan; + String? lanDoc; + bool? isLock; + String? subtitleUrl; + int? type; + int? aiType; + int? aiStatus; + + factory SubTitlteItemModel.fromJson(Map json) => + SubTitlteItemModel( + id: json["id"], + lan: json["lan"], + lanDoc: json["lan_doc"], + isLock: json["is_lock"], + subtitleUrl: json["subtitle_url"], + type: json["type"], + aiType: json["ai_type"], + aiStatus: json["ai_status"], + ); +} diff --git a/lib/pages/video/detail/controller.dart b/lib/pages/video/detail/controller.dart index 7465c6f2..198da362 100644 --- a/lib/pages/video/detail/controller.dart +++ b/lib/pages/video/detail/controller.dart @@ -19,6 +19,8 @@ import 'package:pilipala/utils/utils.dart'; import 'package:pilipala/utils/video_utils.dart'; import 'package:screen_brightness/screen_brightness.dart'; +import '../../../http/index.dart'; +import '../../../models/video/subTitile/content.dart'; import '../../../utils/id_utils.dart'; import 'widgets/header_control.dart'; @@ -91,6 +93,8 @@ class VideoDetailController extends GetxController late int cacheAudioQa; PersistentBottomSheetController? replyReplyBottomSheetCtr; + RxList subtitleContents = + [].obs; @override void onInit() { @@ -139,6 +143,7 @@ class VideoDetailController extends GetxController cacheAudioQa = setting.get(SettingBoxKey.defaultAudioQa, defaultValue: AudioQuality.hiRes.code); oid.value = IdUtils.bv2av(Get.parameters['bvid']!); + getSubtitle(); } showReplyReplyPanel() { @@ -381,4 +386,35 @@ class VideoDetailController extends GetxController ? replyReplyBottomSheetCtr!.close() : print('replyReplyBottomSheetCtr is null'); } + + // 获取字幕配置 + Future getSubtitle() async { + var result = await VideoHttp.getSubtitle(bvid: bvid, cid: cid.value); + if (result['status']) { + if (result['data'].subtitles.isNotEmpty) { + SmartDialog.showToast('字幕加载中...'); + var subtitle = result['data'].subtitles.first; + getSubtitleContent(subtitle.subtitleUrl); + } + return result['data']; + } else { + SmartDialog.showToast(result['msg'].toString()); + } + } + + // 获取字幕内容 + Future getSubtitleContent(String url) async { + var res = await Request().get('https:$url'); + subtitleContents.value = res.data['body'].map((e) { + return SubTitileContentModel.fromJson(e); + }).toList(); + setSubtitleContent(); + } + + setSubtitleContent() { + plPlayerController.subtitleContent.value = ''; + if (subtitleContents.isNotEmpty) { + plPlayerController.subtitleContents = subtitleContents; + } + } } diff --git a/lib/pages/video/detail/view.dart b/lib/pages/video/detail/view.dart index febca105..449c377e 100644 --- a/lib/pages/video/detail/view.dart +++ b/lib/pages/video/detail/view.dart @@ -236,7 +236,10 @@ class _VideoDetailPageState extends State void didPopNext() async { if (plPlayerController != null && plPlayerController!.videoPlayerController != null) { - setState(() => isShowing = true); + setState(() { + videoDetailController.setSubtitleContent(); + isShowing = true; + }); } videoDetailController.isFirstTime = false; final bool autoplay = autoPlayEnable; diff --git a/lib/plugin/pl_player/controller.dart b/lib/plugin/pl_player/controller.dart index dfa580ab..081b9ad9 100644 --- a/lib/plugin/pl_player/controller.dart +++ b/lib/plugin/pl_player/controller.dart @@ -21,6 +21,7 @@ import 'package:pilipala/utils/storage.dart'; import 'package:screen_brightness/screen_brightness.dart'; import 'package:status_bar_control/status_bar_control.dart'; import 'package:universal_platform/universal_platform.dart'; +import '../../models/video/subTitile/content.dart'; // import 'package:wakelock_plus/wakelock_plus.dart'; Box videoStorage = GStrorage.video; @@ -231,6 +232,10 @@ class PlPlayerController { // 播放顺序相关 PlayRepeat playRepeat = PlayRepeat.pause; + RxList subtitleContents = + [].obs; + RxString subtitleContent = ''.obs; + void updateSliderPositionSecond() { int newSecond = _sliderPosition.value.inSeconds; if (sliderPositionSeconds.value != newSecond) { @@ -277,8 +282,7 @@ class PlPlayerController { danmakuDurationVal = localCache.get(LocalCacheKey.danmakuDuration, defaultValue: 4.0); // 描边粗细 - strokeWidth = - localCache.get(LocalCacheKey.strokeWidth, defaultValue: 1.5); + strokeWidth = localCache.get(LocalCacheKey.strokeWidth, defaultValue: 1.5); playRepeat = PlayRepeat.values.toList().firstWhere( (e) => e.value == @@ -566,6 +570,8 @@ class PlPlayerController { _sliderPosition.value = event; updateSliderPositionSecond(); } + querySubtitleContent( + videoPlayerController!.state.position.inSeconds.toDouble()); /// 触发回调事件 for (var element in _positionListeners) { @@ -1050,6 +1056,17 @@ class PlPlayerController { } } + void querySubtitleContent(double progress) { + if (subtitleContents.isNotEmpty) { + for (var content in subtitleContents) { + if (progress >= content.from! && progress <= content.to!) { + subtitleContent.value = content.content!; + return; + } + } + } + } + setPlayRepeat(PlayRepeat type) { playRepeat = type; videoStorage.put(VideoBoxKey.playRepeat, type.value); diff --git a/lib/plugin/pl_player/view.dart b/lib/plugin/pl_player/view.dart index d073945b..e7a8ce73 100644 --- a/lib/plugin/pl_player/view.dart +++ b/lib/plugin/pl_player/view.dart @@ -16,7 +16,6 @@ import 'package:pilipala/plugin/pl_player/utils.dart'; import 'package:pilipala/utils/feed_back.dart'; import 'package:pilipala/utils/storage.dart'; import 'package:screen_brightness/screen_brightness.dart'; - import 'models/bottom_progress_behavior.dart'; import 'widgets/app_bar_ani.dart'; import 'widgets/backward_seek.dart'; @@ -428,6 +427,42 @@ class _PLVideoPlayerState extends State if (widget.danmuWidget != null) Positioned.fill(top: 4, child: widget.danmuWidget!), + widget.controller.subscriptions.isNotEmpty + ? Stack( + children: [ + Positioned( + left: 0, + right: 0, + bottom: 30, + child: Align( + alignment: Alignment.center, + child: Obx( + () => Container( + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(4), + color: widget.controller.subtitleContent.value != '' + ? Colors.black.withOpacity(0.4) + : Colors.transparent, + ), + padding: const EdgeInsets.symmetric( + horizontal: 10, + vertical: 4, + ), + child: Text( + widget.controller.subtitleContent.value, + style: const TextStyle( + color: Colors.white, + fontSize: 12, + ), + ), + ), + ), + ), + ), + ], + ) + : nil, + /// 手势 Positioned.fill( left: 16, From 542975d0ecdff82de25137f4ae81a6b29282953f Mon Sep 17 00:00:00 2001 From: guozhigq Date: Wed, 28 Feb 2024 00:34:46 +0800 Subject: [PATCH 114/220] =?UTF-8?q?feat:=20=E5=85=A8=E5=B1=8F=E6=89=8B?= =?UTF-8?q?=E5=8A=BF=E8=AE=BE=E7=BD=AE=20issues=20#517?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/models/common/gesture_mode.dart | 12 +++ lib/models/common/index.dart | 4 + lib/pages/setting/pages/play_gesture_set.dart | 88 +++++++++++++++++++ lib/pages/setting/play_setting.dart | 12 +-- lib/plugin/pl_player/view.dart | 14 ++- lib/router/app_pages.dart | 4 + lib/utils/global_data.dart | 4 + lib/utils/storage.dart | 5 ++ 8 files changed, 133 insertions(+), 10 deletions(-) create mode 100644 lib/models/common/gesture_mode.dart create mode 100644 lib/models/common/index.dart create mode 100644 lib/pages/setting/pages/play_gesture_set.dart diff --git a/lib/models/common/gesture_mode.dart b/lib/models/common/gesture_mode.dart new file mode 100644 index 00000000..1149ae12 --- /dev/null +++ b/lib/models/common/gesture_mode.dart @@ -0,0 +1,12 @@ +enum FullScreenGestureMode { + /// 从上滑到下 + fromToptoBottom, + + /// 从下滑到上 + fromBottomtoTop, +} + +extension FullScreenGestureModeExtension on FullScreenGestureMode { + String get values => ['fromToptoBottom', 'fromBottomtoTop'][index]; + String get labels => ['从上往下滑进入全屏', '从下往上滑进入全屏'][index]; +} diff --git a/lib/models/common/index.dart b/lib/models/common/index.dart new file mode 100644 index 00000000..89a05076 --- /dev/null +++ b/lib/models/common/index.dart @@ -0,0 +1,4 @@ +library commonn_model; + +export './business_type.dart'; +export './gesture_mode.dart'; diff --git a/lib/pages/setting/pages/play_gesture_set.dart b/lib/pages/setting/pages/play_gesture_set.dart new file mode 100644 index 00000000..f688c43c --- /dev/null +++ b/lib/pages/setting/pages/play_gesture_set.dart @@ -0,0 +1,88 @@ +import 'package:flutter/material.dart'; +import 'package:hive/hive.dart'; +import 'package:pilipala/utils/global_data.dart'; + +import '../../../models/common/gesture_mode.dart'; +import '../../../utils/storage.dart'; +import '../widgets/select_dialog.dart'; +import '../widgets/switch_item.dart'; + +class PlayGesturePage extends StatefulWidget { + const PlayGesturePage({super.key}); + + @override + State createState() => _PlayGesturePageState(); +} + +class _PlayGesturePageState extends State { + Box setting = GStrorage.setting; + late int fullScreenGestureMode; + + @override + void initState() { + super.initState(); + fullScreenGestureMode = setting.get(SettingBoxKey.fullScreenGestureMode, + defaultValue: FullScreenGestureMode.values.last.index); + } + + @override + Widget build(BuildContext context) { + TextStyle titleStyle = Theme.of(context).textTheme.titleMedium!; + TextStyle subTitleStyle = Theme.of(context) + .textTheme + .labelMedium! + .copyWith(color: Theme.of(context).colorScheme.outline); + return Scaffold( + appBar: AppBar( + centerTitle: false, + titleSpacing: 0, + title: Text( + '手势设置', + style: Theme.of(context).textTheme.titleMedium, + ), + ), + body: ListView( + children: [ + ListTile( + dense: false, + title: Text('全屏手势', style: titleStyle), + subtitle: Text( + '通过手势快速进入全屏', + style: subTitleStyle, + ), + onTap: () async { + String? result = await showDialog( + context: context, + builder: (context) { + return SelectDialog( + title: '全屏手势', + value: FullScreenGestureMode + .values[fullScreenGestureMode].values, + values: FullScreenGestureMode.values.map((e) { + return {'title': e.labels, 'value': e.values}; + }).toList()); + }, + ); + if (result != null) { + GlobalData().fullScreenGestureMode = FullScreenGestureMode + .values + .firstWhere((element) => element.values == result); + fullScreenGestureMode = + GlobalData().fullScreenGestureMode.index; + setting.put( + SettingBoxKey.fullScreenGestureMode, fullScreenGestureMode); + setState(() {}); + } + }, + ), + const SetSwitchItem( + title: '双击快退/快进', + subTitle: '左侧双击快退，右侧双击快进', + setKey: SettingBoxKey.enableQuickDouble, + defaultVal: true, + ), + ], + ), + ); + } +} diff --git a/lib/pages/setting/play_setting.dart b/lib/pages/setting/play_setting.dart index bfd5db5f..a2a3fef2 100644 --- a/lib/pages/setting/play_setting.dart +++ b/lib/pages/setting/play_setting.dart @@ -73,6 +73,12 @@ class _PlaySettingState extends State { title: Text('倍速设置', style: titleStyle), subtitle: Text('设置视频播放速度', style: subTitleStyle), ), + ListTile( + dense: false, + onTap: () => Get.toNamed('/playerGestureSet'), + title: Text('手势设置', style: titleStyle), + subtitle: Text('设置播放器手势', style: subTitleStyle), + ), const SetSwitchItem( title: '开启1080P', subTitle: '免登录查看1080P视频', @@ -134,12 +140,6 @@ class _PlaySettingState extends State { setKey: SettingBoxKey.enableAutoBrightness, defaultVal: false, ), - const SetSwitchItem( - title: '双击快退/快进', - subTitle: '左侧双击快退，右侧双击快进', - setKey: SettingBoxKey.enableQuickDouble, - defaultVal: true, - ), const SetSwitchItem( title: '弹幕开关', subTitle: '展示弹幕', diff --git a/lib/plugin/pl_player/view.dart b/lib/plugin/pl_player/view.dart index d073945b..9c5731ec 100644 --- a/lib/plugin/pl_player/view.dart +++ b/lib/plugin/pl_player/view.dart @@ -9,6 +9,7 @@ import 'package:hive/hive.dart'; import 'package:media_kit/media_kit.dart'; import 'package:media_kit_video/media_kit_video.dart'; import 'package:nil/nil.dart'; +import 'package:pilipala/models/common/gesture_mode.dart'; import 'package:pilipala/plugin/pl_player/controller.dart'; import 'package:pilipala/plugin/pl_player/models/duration.dart'; import 'package:pilipala/plugin/pl_player/models/fullscreen_mode.dart'; @@ -17,6 +18,7 @@ import 'package:pilipala/utils/feed_back.dart'; import 'package:pilipala/utils/storage.dart'; import 'package:screen_brightness/screen_brightness.dart'; +import '../../utils/global_data.dart'; import 'models/bottom_progress_behavior.dart'; import 'widgets/app_bar_ani.dart'; import 'widgets/backward_seek.dart'; @@ -73,6 +75,8 @@ class _PLVideoPlayerState extends State late bool enableQuickDouble; late bool enableBackgroundPlay; late double screenWidth; + final FullScreenGestureMode fullScreenGestureMode = + GlobalData().fullScreenGestureMode; // 用于记录上一次全屏切换手势触发时间，避免误触 DateTime? lastFullScreenToggleTime; @@ -520,18 +524,20 @@ class _PLVideoPlayerState extends State // 全屏 final double dy = details.delta.dy; const double threshold = 7.0; // 滑动阈值 + final bool flag = + fullScreenGestureMode != FullScreenGestureMode.values.last; if (dy > _distance && dy > threshold) { - if (_.isFullScreen.value) { + if (_.isFullScreen.value ^ flag) { lastFullScreenToggleTime = DateTime.now(); // 下滑退出全屏 - await widget.controller.triggerFullScreen(status: false); + await widget.controller.triggerFullScreen(status: flag); } _distance = 0.0; } else if (dy < _distance && dy < -threshold) { - if (!_.isFullScreen.value) { + if (!_.isFullScreen.value ^ flag) { lastFullScreenToggleTime = DateTime.now(); // 上滑进入全屏 - await widget.controller.triggerFullScreen(); + await widget.controller.triggerFullScreen(status: !flag); } _distance = 0.0; } diff --git a/lib/router/app_pages.dart b/lib/router/app_pages.dart index 6ebaa638..1f1ea31e 100644 --- a/lib/router/app_pages.dart +++ b/lib/router/app_pages.dart @@ -39,6 +39,7 @@ import '../pages/setting/pages/color_select.dart'; import '../pages/setting/pages/display_mode.dart'; import '../pages/setting/pages/font_size_select.dart'; import '../pages/setting/pages/home_tabbar_set.dart'; +import '../pages/setting/pages/play_gesture_set.dart'; import '../pages/setting/pages/play_speed_set.dart'; import '../pages/setting/recommend_setting.dart'; import '../pages/setting/play_setting.dart'; @@ -166,6 +167,9 @@ class Routes { CustomGetPage(name: '/subscription', page: () => const SubPage()), // 订阅详情 CustomGetPage(name: '/subDetail', page: () => const SubDetailPage()), + // 播放器手势 + CustomGetPage( + name: '/playerGestureSet', page: () => const PlayGesturePage()), ]; } diff --git a/lib/utils/global_data.dart b/lib/utils/global_data.dart index a8a04eba..08157db4 100644 --- a/lib/utils/global_data.dart +++ b/lib/utils/global_data.dart @@ -1,5 +1,9 @@ +import '../models/common/index.dart'; + class GlobalData { int imgQuality = 10; + FullScreenGestureMode fullScreenGestureMode = + FullScreenGestureMode.values.last; // 私有构造函数 GlobalData._(); diff --git a/lib/utils/storage.dart b/lib/utils/storage.dart index 09e362fd..d69ffc20 100644 --- a/lib/utils/storage.dart +++ b/lib/utils/storage.dart @@ -4,6 +4,7 @@ import 'package:path_provider/path_provider.dart'; import 'package:pilipala/models/model_owner.dart'; import 'package:pilipala/models/search/hot.dart'; import 'package:pilipala/models/user/info.dart'; +import '../models/common/gesture_mode.dart'; import 'global_data.dart'; class GStrorage { @@ -45,6 +46,9 @@ class GStrorage { video = await Hive.openBox('video'); GlobalData().imgQuality = setting.get(SettingBoxKey.defaultPicQa, defaultValue: 10); // 设置全局变量 + GlobalData().fullScreenGestureMode = FullScreenGestureMode.values[ + setting.get(SettingBoxKey.fullScreenGestureMode, + defaultValue: FullScreenGestureMode.values.last.index) as int]; } static void regAdapter() { @@ -99,6 +103,7 @@ class SettingBoxKey { enableQuickDouble = 'enableQuickDouble', enableShowDanmaku = 'enableShowDanmaku', enableBackgroundPlay = 'enableBackgroundPlay', + fullScreenGestureMode = 'fullScreenGestureMode', /// 隐私 blackMidsList = 'blackMidsList', From db03cdd4426f5831d2491daf096083055a613b53 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Wed, 28 Feb 2024 00:45:13 +0800 Subject: [PATCH 115/220] fix: List dataType --- lib/models/user/fav_folder.dart | 2 +- lib/pages/bangumi/controller.dart | 4 ++-- lib/pages/blacklist/index.dart | 2 +- lib/pages/dynamics/controller.dart | 8 ++++---- lib/pages/dynamics/detail/controller.dart | 2 +- lib/pages/fan/controller.dart | 2 +- lib/pages/hot/controller.dart | 2 +- lib/pages/member/controller.dart | 2 +- lib/pages/search/controller.dart | 2 +- lib/pages/video/detail/reply/controller.dart | 2 +- lib/pages/video/detail/reply_reply/controller.dart | 2 +- 11 files changed, 15 insertions(+), 15 deletions(-) diff --git a/lib/models/user/fav_folder.dart b/lib/models/user/fav_folder.dart index 6d3f9975..c45e2de9 100644 --- a/lib/models/user/fav_folder.dart +++ b/lib/models/user/fav_folder.dart @@ -15,7 +15,7 @@ class FavFolderData { ? json['list'] .map((e) => FavFolderItemData.fromJson(e)) .toList() - : [FavFolderItemData()]; + : []; hasMore = json['has_more']; } } diff --git a/lib/pages/bangumi/controller.dart b/lib/pages/bangumi/controller.dart index 09afc43a..e5748d6c 100644 --- a/lib/pages/bangumi/controller.dart +++ b/lib/pages/bangumi/controller.dart @@ -7,8 +7,8 @@ import 'package:pilipala/utils/storage.dart'; class BangumiController extends GetxController { final ScrollController scrollController = ScrollController(); - RxList bangumiList = [BangumiListItemModel()].obs; - RxList bangumiFollowList = [BangumiListItemModel()].obs; + RxList bangumiList = [].obs; + RxList bangumiFollowList = [].obs; int _currentPage = 1; bool isLoadingMore = true; Box userInfoCache = GStrorage.userInfo; diff --git a/lib/pages/blacklist/index.dart b/lib/pages/blacklist/index.dart index 3bf64146..402790f5 100644 --- a/lib/pages/blacklist/index.dart +++ b/lib/pages/blacklist/index.dart @@ -139,7 +139,7 @@ class BlackListController extends GetxController { int currentPage = 1; int pageSize = 50; RxInt total = 0.obs; - RxList blackList = [BlackListItem()].obs; + RxList blackList = [].obs; Future queryBlacklist({type = 'init'}) async { if (type == 'init') { diff --git a/lib/pages/dynamics/controller.dart b/lib/pages/dynamics/controller.dart index 26ba2b22..1e9f2da4 100644 --- a/lib/pages/dynamics/controller.dart +++ b/lib/pages/dynamics/controller.dart @@ -20,7 +20,7 @@ import 'package:pilipala/utils/utils.dart'; class DynamicsController extends GetxController { int page = 1; String? offset = ''; - RxList dynamicsList = [DynamicItemModel()].obs; + RxList dynamicsList = [].obs; Rx dynamicsType = DynamicsType.values[0].obs; RxString dynamicsTypeLabel = '全部'.obs; final ScrollController scrollController = ScrollController(); @@ -105,7 +105,7 @@ class DynamicsController extends GetxController { onSelectType(value) async { dynamicsType.value = filterTypeList[value]['value']; - dynamicsList.value = [DynamicItemModel()]; + dynamicsList.value = []; page = 1; initialValue.value = value; await queryFollowDynamic(); @@ -264,7 +264,7 @@ class DynamicsController extends GetxController { onSelectUp(mid) async { dynamicsType.value = DynamicsType.values[0]; - dynamicsList.value = [DynamicItemModel()]; + dynamicsList.value = []; page = 1; queryFollowDynamic(); } @@ -293,7 +293,7 @@ class DynamicsController extends GetxController { dynamicsType.value = DynamicsType.values[0]; initialValue.value = 0; SmartDialog.showToast('还原默认加载'); - dynamicsList.value = [DynamicItemModel()]; + dynamicsList.value = []; queryFollowDynamic(); } } diff --git a/lib/pages/dynamics/detail/controller.dart b/lib/pages/dynamics/detail/controller.dart index 4c5f35d6..8e117383 100644 --- a/lib/pages/dynamics/detail/controller.dart +++ b/lib/pages/dynamics/detail/controller.dart @@ -17,7 +17,7 @@ class DynamicDetailController extends GetxController { int currentPage = 0; bool isLoadingMore = false; RxString noMore = ''.obs; - RxList replyList = [ReplyItemModel()].obs; + RxList replyList = [].obs; RxInt acount = 0.obs; final ScrollController scrollController = ScrollController(); diff --git a/lib/pages/fan/controller.dart b/lib/pages/fan/controller.dart index 8675ada7..c1c2a427 100644 --- a/lib/pages/fan/controller.dart +++ b/lib/pages/fan/controller.dart @@ -10,7 +10,7 @@ class FansController extends GetxController { int pn = 1; int ps = 20; int total = 0; - RxList fansList = [FansItemModel()].obs; + RxList fansList = [].obs; late int mid; late String name; var userInfo; diff --git a/lib/pages/hot/controller.dart b/lib/pages/hot/controller.dart index 65706c32..85072475 100644 --- a/lib/pages/hot/controller.dart +++ b/lib/pages/hot/controller.dart @@ -7,7 +7,7 @@ class HotController extends GetxController { final ScrollController scrollController = ScrollController(); final int _count = 20; int _currentPage = 1; - RxList videoList = [HotVideoItemModel()].obs; + RxList videoList = [].obs; bool isLoadingMore = false; bool flag = false; OverlayEntry? popupDialog; diff --git a/lib/pages/member/controller.dart b/lib/pages/member/controller.dart index 70169e3d..0aa7166f 100644 --- a/lib/pages/member/controller.dart +++ b/lib/pages/member/controller.dart @@ -20,7 +20,7 @@ class MemberController extends GetxController { Box userInfoCache = GStrorage.userInfo; late int ownerMid; // 投稿列表 - RxList? archiveList = [VListItemModel()].obs; + RxList? archiveList = [].obs; dynamic userInfo; RxInt attribute = (-1).obs; RxString attributeText = '关注'.obs; diff --git a/lib/pages/search/controller.dart b/lib/pages/search/controller.dart index 5ec1710a..cbb86405 100644 --- a/lib/pages/search/controller.dart +++ b/lib/pages/search/controller.dart @@ -15,7 +15,7 @@ class SSearchController extends GetxController { Box histiryWord = GStrorage.historyword; List historyCacheList = []; RxList historyList = [].obs; - RxList searchSuggestList = [SearchSuggestItem()].obs; + RxList searchSuggestList = [].obs; final _debouncer = Debouncer(delay: const Duration(milliseconds: 200)); // 设置延迟时间 String hintText = '搜索'; diff --git a/lib/pages/video/detail/reply/controller.dart b/lib/pages/video/detail/reply/controller.dart index e564ef02..91344fc1 100644 --- a/lib/pages/video/detail/reply/controller.dart +++ b/lib/pages/video/detail/reply/controller.dart @@ -22,7 +22,7 @@ class VideoReplyController extends GetxController { String? replyLevel; // rpid 请求楼中楼回复 String? rpid; - RxList replyList = [ReplyItemModel()].obs; + RxList replyList = [].obs; // 当前页 int currentPage = 0; bool isLoadingMore = false; diff --git a/lib/pages/video/detail/reply_reply/controller.dart b/lib/pages/video/detail/reply_reply/controller.dart index 0d5b4488..6daa0b8a 100644 --- a/lib/pages/video/detail/reply_reply/controller.dart +++ b/lib/pages/video/detail/reply_reply/controller.dart @@ -12,7 +12,7 @@ class VideoReplyReplyController extends GetxController { // rpid 请求楼中楼回复 String? rpid; ReplyType replyType = ReplyType.video; - RxList replyList = [ReplyItemModel()].obs; + RxList replyList = [].obs; // 当前页 int currentPage = 0; bool isLoadingMore = false; From a3abed0a03d04edc16371b34ce8c70e6b9381d80 Mon Sep 17 00:00:00 2001 From: VillagerTom Date: Tue, 20 Feb 2024 13:07:27 +0800 Subject: [PATCH 116/220] =?UTF-8?q?=E6=96=B0=E5=A2=9Ealpha.yml,=20?= =?UTF-8?q?=E7=94=A8=E4=BA=8E=E7=BC=96=E8=AF=91=E6=8E=A8=E9=80=81=E8=87=B3?= =?UTF-8?q?alpha=E5=88=86=E6=94=AF=E7=9A=84=E4=BB=A3=E7=A0=81=E5=B9=B6?= =?UTF-8?q?=E5=8F=91=E9=80=81=E8=87=B3Telegram=E9=A2=91=E9=81=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/alpha.yml | 209 ++++++++++++++++++++++++++++++++++++ 1 file changed, 209 insertions(+) create mode 100644 .github/workflows/alpha.yml diff --git a/.github/workflows/alpha.yml b/.github/workflows/alpha.yml new file mode 100644 index 00000000..e56fb2f9 --- /dev/null +++ b/.github/workflows/alpha.yml @@ -0,0 +1,209 @@ +name: CI + +on: + workflow_dispatch: + push: + branches: + - 'alpha' + paths-ignore: + - '**.md' + - '**.txt' + - '.github/**' + - '.idea/**' + - '!.github/workflows/**' + +jobs: + update_version: + name: Read and update version + runs-on: ubuntu-latest + + outputs: + # 定义输出变量 version，以便在其他job中引用 + new_version: ${{ steps.version.outputs.new_version }} + + steps: + - name: Checkout code + uses: actions/checkout@v4 + with: + ref: ${{ github.ref_name }} + + - name: 获取first parent commit次数 + id: get-first-parent-commit-count + run: | + version=$(yq e .version pubspec.yaml | cut -d "+" -f 1) + git fetch origin "refs/tags/*:refs/tags/*" + recent_release_tag=$(git tag -l | grep $version | egrep -v "[-|+]" || true) + if [[ "x$recent_release_tag" == "x" ]]; then + echo "当前版本tag不存在，请手动生成tag." + exit 1 + fi + first_parent_commit_count=$(git rev-list --first-parent --count $recent_release_tag..FETCH_HEAD) + echo "count=$first_parent_commit_count" >> $GITHUB_OUTPUT + + - name: 更新版本号 + id: version + run: | + # 读取版本号 + VERSION=$(yq e .version pubspec.yaml | cut -d "+" -f 1) + + # 获取GitHub Actions的run_number + #RUN_NUMBER=${{ github.run_number }} + + # 构建新版本号 + NEW_VERSION=$VERSION-alpha.${{ steps.get-first-parent-commit-count.outputs.count }} + + # 输出新版本号 + echo "New version: $NEW_VERSION" + + # 设置新版本号为输出变量 + echo "new_version=$NEW_VERSION" >>$GITHUB_OUTPUT + + android: + name: Build CI (Android) + needs: update_version + runs-on: ubuntu-latest + + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: 构建Java环境 + uses: actions/setup-java@v3 + with: + distribution: "zulu" + java-version: "17" + token: ${{secrets.GIT_TOKEN}} + + - name: 检查缓存 + uses: actions/cache@v2 + id: cache-flutter + with: + path: /root/flutter-sdk + key: ${{ runner.os }}-flutter-${{ hashFiles('**/pubspec.lock') }} + + - name: 安装Flutter + if: steps.cache-flutter.outputs.cache-hit != 'true' + uses: subosito/flutter-action@v2 + with: + flutter-version: 3.16.5 + channel: any + + - name: 下载项目依赖 + run: flutter pub get + + - name: 解码生成 jks + run: echo $KEYSTORE_BASE64 | base64 -di > android/app/vvex.jks + env: + KEYSTORE_BASE64: ${{ secrets.KEYSTORE_BASE64 }} + + - name: 更新版本号 + id: version + run: | + # 更新pubspec.yaml文件中的版本号 + sed -i "s/version: .*+/version: ${{ needs.update_version.outputs.new_version }}+/g" pubspec.yaml + + - name: flutter build apk + run: flutter build apk --release --split-per-abi + env: + KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }} + KEY_ALIAS: ${{ secrets.KEY_ALIAS }} + KEY_PASSWORD: ${{ secrets.KEY_PASSWORD}} + + - name: 重命名应用 + run: | + for file in build/app/outputs/flutter-apk/app-*.apk; do + if [[ $file =~ app-(.?*)release.apk ]]; then + new_file_name="build/app/outputs/flutter-apk/Pili-${BASH_REMATCH[1]}${{ needs.update_version.outputs.new_version }}.apk" + mv "$file" "$new_file_name" + fi + done + + - name: 上传 + uses: actions/upload-artifact@v3 + with: + name: Pilipala-CI + path: | + build/app/outputs/flutter-apk/Pili-*.apk + + iOS: + name: Build CI (iOS) + needs: update_version + runs-on: macos-latest + + steps: + - name: Checkout code + uses: actions/checkout@v2 + + - name: 安装Flutter + if: steps.cache-flutter.outputs.cache-hit != 'true' + uses: subosito/flutter-action@v2.10.0 + with: + cache: true + flutter-version: 3.16.5 + + - name: 更新版本号 + id: version + run: | + # 更新pubspec.yaml文件中的版本号 + sed -i "" "s/version: .*+/version: ${{ needs.update_version.outputs.new_version }}+/g" pubspec.yaml + + - name: flutter build ipa + run: | + flutter build ios --release --no-codesign + ln -sf ./build/ios/iphoneos Payload + zip -r9 app.ipa Payload/runner.app + + - name: 重命名应用 + run: | + DATE=${{ steps.date.outputs.date }} + for file in app.ipa; do + new_file_name="build/Pili-${{ needs.update_version.outputs.new_version }}.ipa" + mv "$file" "$new_file_name" + done + + - name: 上传 + uses: actions/upload-artifact@v3 + with: + if-no-files-found: error + name: Pilipala-CI + path: | + build/Pili-*.ipa + + upload: + runs-on: ubuntu-latest + + needs: + - update_version + - android + - iOS + steps: + + - uses: actions/download-artifact@v3 + with: + name: Pilipala-CI + path: ./Pilipala-CI + + # - name: Upload Pre-release + # uses: ncipollo/release-action@v1 + # with: + # name: ${{ needs.update_version.outputs.new_version }} + # token: ${{ secrets.GIT_TOKEN }} + # commit: main + # tag: ${{ needs.update_version.outputs.new_version }} + # prerelease: true + # allowUpdates: true + # artifacts: Pilipala-CI/* + + - name: 发送到Telegram频道 + uses: xireiki/channel-post@main + with: + BOT_TOKEN: ${{ secrets.BOT_TOKEN }} + CHAT_ID: ${{ secrets.CHAT_ID }} + METHOD: sendMediaGroup + path: | + ./Pilipala-CI/Pili-${{ needs.update_version.outputs.new_version }}.ipa + ./Pilipala-CI/Pili-arm64-${{ needs.update_version.outputs.new_version }}.apk + ./Pilipala-CI/Pili-armeabi-v7a-${{ needs.update_version.outputs.new_version }}.apk + ./Pilipala-CI/Pili-x86_64-${{ needs.update_version.outputs.new_version }}.apk + CONTEXT: "**Pre-release:** ${{ needs.update_version.outputs.new_version }}" + PARSE_MODE: Markdown From fc2da3ce577a03fd707e512b7bbcf8706cbf4ad1 Mon Sep 17 00:00:00 2001 From: VillagerTom Date: Tue, 20 Feb 2024 13:17:44 +0800 Subject: [PATCH 117/220] =?UTF-8?q?=E4=BD=BFcheckout=20action=E5=85=8B?= =?UTF-8?q?=E9=9A=86=E6=8C=87=E5=AE=9A=E5=88=86=E6=94=AF;=20=E7=BB=9F?= =?UTF-8?q?=E4=B8=80=E4=BB=A3=E7=A0=81=E7=BC=A9=E8=BF=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/alpha.yml | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/.github/workflows/alpha.yml b/.github/workflows/alpha.yml index e56fb2f9..c56c9abb 100644 --- a/.github/workflows/alpha.yml +++ b/.github/workflows/alpha.yml @@ -66,27 +66,29 @@ jobs: steps: - name: Checkout code uses: actions/checkout@v4 + with: + ref: ${{ github.ref_name }} - name: 构建Java环境 uses: actions/setup-java@v3 with: - distribution: "zulu" - java-version: "17" - token: ${{secrets.GIT_TOKEN}} + distribution: "zulu" + java-version: "17" + token: ${{secrets.GIT_TOKEN}} - name: 检查缓存 uses: actions/cache@v2 id: cache-flutter with: - path: /root/flutter-sdk - key: ${{ runner.os }}-flutter-${{ hashFiles('**/pubspec.lock') }} + path: /root/flutter-sdk + key: ${{ runner.os }}-flutter-${{ hashFiles('**/pubspec.lock') }} - name: 安装Flutter if: steps.cache-flutter.outputs.cache-hit != 'true' uses: subosito/flutter-action@v2 with: - flutter-version: 3.16.5 - channel: any + flutter-version: 3.16.5 + channel: any - name: 下载项目依赖 run: flutter pub get @@ -94,7 +96,7 @@ jobs: - name: 解码生成 jks run: echo $KEYSTORE_BASE64 | base64 -di > android/app/vvex.jks env: - KEYSTORE_BASE64: ${{ secrets.KEYSTORE_BASE64 }} + KEYSTORE_BASE64: ${{ secrets.KEYSTORE_BASE64 }} - name: 更新版本号 id: version @@ -105,9 +107,9 @@ jobs: - name: flutter build apk run: flutter build apk --release --split-per-abi env: - KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }} - KEY_ALIAS: ${{ secrets.KEY_ALIAS }} - KEY_PASSWORD: ${{ secrets.KEY_PASSWORD}} + KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }} + KEY_ALIAS: ${{ secrets.KEY_ALIAS }} + KEY_PASSWORD: ${{ secrets.KEY_PASSWORD}} - name: 重命名应用 run: | @@ -132,7 +134,9 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v4 + with: + ref: ${{ github.ref_name }} - name: 安装Flutter if: steps.cache-flutter.outputs.cache-hit != 'true' From 6c20a434ed89e2b9f8ee9106131d95b8d0a98a69 Mon Sep 17 00:00:00 2001 From: VillagerTom Date: Tue, 20 Feb 2024 15:31:40 +0800 Subject: [PATCH 118/220] =?UTF-8?q?=E5=88=97=E5=87=BA=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/alpha.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/alpha.yml b/.github/workflows/alpha.yml index c56c9abb..c32db6d4 100644 --- a/.github/workflows/alpha.yml +++ b/.github/workflows/alpha.yml @@ -197,6 +197,8 @@ jobs: # prerelease: true # allowUpdates: true # artifacts: Pilipala-CI/* + - name: 列出文件 + run: ls -1 ./Pilipala-CI - name: 发送到Telegram频道 uses: xireiki/channel-post@main From 381e832f3cba8da4027bbcf3acd7c0aa29c03f30 Mon Sep 17 00:00:00 2001 From: VillagerTom Date: Tue, 20 Feb 2024 15:59:34 +0800 Subject: [PATCH 119/220] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=9E=B6=E6=9E=84?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E6=8B=BC=E5=86=99=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/alpha.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/alpha.yml b/.github/workflows/alpha.yml index c32db6d4..4d840447 100644 --- a/.github/workflows/alpha.yml +++ b/.github/workflows/alpha.yml @@ -208,7 +208,7 @@ jobs: METHOD: sendMediaGroup path: | ./Pilipala-CI/Pili-${{ needs.update_version.outputs.new_version }}.ipa - ./Pilipala-CI/Pili-arm64-${{ needs.update_version.outputs.new_version }}.apk + ./Pilipala-CI/Pili-arm64-v8a-${{ needs.update_version.outputs.new_version }}.apk ./Pilipala-CI/Pili-armeabi-v7a-${{ needs.update_version.outputs.new_version }}.apk ./Pilipala-CI/Pili-x86_64-${{ needs.update_version.outputs.new_version }}.apk CONTEXT: "**Pre-release:** ${{ needs.update_version.outputs.new_version }}" From cfeb0588c1d8633a9c90a299b0a2976990b33816 Mon Sep 17 00:00:00 2001 From: VillagerTom Date: Tue, 20 Feb 2024 18:03:18 +0800 Subject: [PATCH 120/220] =?UTF-8?q?=E5=8F=96=E6=B6=88=E5=8F=91=E9=80=81?= =?UTF-8?q?=E5=85=B6=E4=BB=96=E6=9E=B6=E6=9E=84APK,=20=E5=87=8F=E5=B0=91?= =?UTF-8?q?=E5=8F=91=E9=80=81=E6=96=87=E4=BB=B6=E5=A4=A7=E5=B0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/alpha.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/alpha.yml b/.github/workflows/alpha.yml index 4d840447..6cda8d49 100644 --- a/.github/workflows/alpha.yml +++ b/.github/workflows/alpha.yml @@ -209,7 +209,7 @@ jobs: path: | ./Pilipala-CI/Pili-${{ needs.update_version.outputs.new_version }}.ipa ./Pilipala-CI/Pili-arm64-v8a-${{ needs.update_version.outputs.new_version }}.apk - ./Pilipala-CI/Pili-armeabi-v7a-${{ needs.update_version.outputs.new_version }}.apk - ./Pilipala-CI/Pili-x86_64-${{ needs.update_version.outputs.new_version }}.apk + #./Pilipala-CI/Pili-armeabi-v7a-${{ needs.update_version.outputs.new_version }}.apk + #./Pilipala-CI/Pili-x86_64-${{ needs.update_version.outputs.new_version }}.apk CONTEXT: "**Pre-release:** ${{ needs.update_version.outputs.new_version }}" PARSE_MODE: Markdown From 83ad11402fbf0840e3d1ded91854a4e9f4eef314 Mon Sep 17 00:00:00 2001 From: VillagerTom Date: Tue, 20 Feb 2024 18:52:41 +0800 Subject: [PATCH 121/220] =?UTF-8?q?=F0=9F=98=85=E6=B3=A8=E9=87=8A=E7=AC=A6?= =?UTF-8?q?=E8=A2=AB=E8=AF=86=E5=88=AB=E4=B8=BA=E6=96=87=E4=BB=B6=E5=90=8D?= =?UTF-8?q?=E7=9A=84=E4=B8=80=E9=83=A8=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/alpha.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/alpha.yml b/.github/workflows/alpha.yml index 6cda8d49..922c6ef5 100644 --- a/.github/workflows/alpha.yml +++ b/.github/workflows/alpha.yml @@ -209,7 +209,5 @@ jobs: path: | ./Pilipala-CI/Pili-${{ needs.update_version.outputs.new_version }}.ipa ./Pilipala-CI/Pili-arm64-v8a-${{ needs.update_version.outputs.new_version }}.apk - #./Pilipala-CI/Pili-armeabi-v7a-${{ needs.update_version.outputs.new_version }}.apk - #./Pilipala-CI/Pili-x86_64-${{ needs.update_version.outputs.new_version }}.apk CONTEXT: "**Pre-release:** ${{ needs.update_version.outputs.new_version }}" PARSE_MODE: Markdown From 3bf3fd9a46b2f42e26dd4d819116853775c62493 Mon Sep 17 00:00:00 2001 From: VillagerTom Date: Wed, 21 Feb 2024 13:03:30 +0800 Subject: [PATCH 122/220] =?UTF-8?q?=E4=BD=BF=E7=94=A8=E5=8F=82=E6=95=B0`fe?= =?UTF-8?q?tch-depth:=200`=E5=8F=96=E5=BE=97=E6=89=80=E6=9C=89=E5=88=86?= =?UTF-8?q?=E6=94=AF=E5=92=8Ctags,=20=E6=9C=AB=E7=AB=AF=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E6=94=B9=E5=9B=9EHEAD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/alpha.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/alpha.yml b/.github/workflows/alpha.yml index 922c6ef5..9d0b4ed8 100644 --- a/.github/workflows/alpha.yml +++ b/.github/workflows/alpha.yml @@ -26,18 +26,19 @@ jobs: uses: actions/checkout@v4 with: ref: ${{ github.ref_name }} + fetch-depth: 0 - name: 获取first parent commit次数 id: get-first-parent-commit-count run: | version=$(yq e .version pubspec.yaml | cut -d "+" -f 1) - git fetch origin "refs/tags/*:refs/tags/*" recent_release_tag=$(git tag -l | grep $version | egrep -v "[-|+]" || true) if [[ "x$recent_release_tag" == "x" ]]; then echo "当前版本tag不存在，请手动生成tag." exit 1 fi - first_parent_commit_count=$(git rev-list --first-parent --count $recent_release_tag..FETCH_HEAD) + git log --oneline --first-parent $recent_release_tag..HEAD + first_parent_commit_count=$(git rev-list --first-parent --count $recent_release_tag..HEAD) echo "count=$first_parent_commit_count" >> $GITHUB_OUTPUT - name: 更新版本号 From 95bc4a9f468ace6a088a6e4c9a7bf7b3568c398a Mon Sep 17 00:00:00 2001 From: VillagerTom Date: Wed, 21 Feb 2024 16:05:57 +0800 Subject: [PATCH 123/220] =?UTF-8?q?=E5=9C=A8Telegram=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E4=B8=AD=E6=98=BE=E7=A4=BA=E6=9C=80=E5=90=8E=E4=B8=80=E6=AC=A1?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/alpha.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/alpha.yml b/.github/workflows/alpha.yml index 9d0b4ed8..81c8e611 100644 --- a/.github/workflows/alpha.yml +++ b/.github/workflows/alpha.yml @@ -20,6 +20,7 @@ jobs: outputs: # 定义输出变量 version，以便在其他job中引用 new_version: ${{ steps.version.outputs.new_version }} + last_commit: ${{ steps.get-last-commit.outputs.last_commit }} steps: - name: Checkout code @@ -41,6 +42,12 @@ jobs: first_parent_commit_count=$(git rev-list --first-parent --count $recent_release_tag..HEAD) echo "count=$first_parent_commit_count" >> $GITHUB_OUTPUT + - name: 获取最后一次提交 + id: get-last-commit + run: | + last_commit=$(git log -1 --pretty="%h %B" --first-parent) + echo "last_commit=$last_commit" >> $GITHUB_OUTPUT + - name: 更新版本号 id: version run: | @@ -210,5 +217,6 @@ jobs: path: | ./Pilipala-CI/Pili-${{ needs.update_version.outputs.new_version }}.ipa ./Pilipala-CI/Pili-arm64-v8a-${{ needs.update_version.outputs.new_version }}.apk - CONTEXT: "**Pre-release:** ${{ needs.update_version.outputs.new_version }}" + CONTEXT: "**Pre-release: ${{ needs.update_version.outputs.new_version }}**\n${{ needs.update_version.outputs.last_commit }}" + PARSE_MODE: Markdown From 40cc4e0dd1470323aa2ec6da231d8a7e497ea65a Mon Sep 17 00:00:00 2001 From: VillagerTom Date: Wed, 21 Feb 2024 17:29:59 +0800 Subject: [PATCH 124/220] =?UTF-8?q?channel-post@v1.0.5=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E5=8F=91=E9=80=81=E6=96=87=E4=BB=B6=EF=BC=8C=E6=94=B9=E4=B8=BA?= =?UTF-8?q?v1.0.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/alpha.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/alpha.yml b/.github/workflows/alpha.yml index 81c8e611..ae207a44 100644 --- a/.github/workflows/alpha.yml +++ b/.github/workflows/alpha.yml @@ -209,7 +209,7 @@ jobs: run: ls -1 ./Pilipala-CI - name: 发送到Telegram频道 - uses: xireiki/channel-post@main + uses: xireiki/channel-post@v1.0.4 with: BOT_TOKEN: ${{ secrets.BOT_TOKEN }} CHAT_ID: ${{ secrets.CHAT_ID }} From 04186cdd5b8484eedd086f54b6a8464dca8bffcd Mon Sep 17 00:00:00 2001 From: VillagerTom Date: Wed, 21 Feb 2024 23:53:23 +0800 Subject: [PATCH 125/220] =?UTF-8?q?=E5=B0=86alpha.yml=E7=9A=84workflow=20n?= =?UTF-8?q?ame=E6=94=B9=E4=B8=BAalpha,=20=E9=81=BF=E5=85=8D=E6=B7=B7?= =?UTF-8?q?=E6=B7=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/alpha.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/alpha.yml b/.github/workflows/alpha.yml index ae207a44..3cdc4fd5 100644 --- a/.github/workflows/alpha.yml +++ b/.github/workflows/alpha.yml @@ -1,4 +1,4 @@ -name: CI +name: alpha on: workflow_dispatch: From 4642c2a8472e41e4443d69eb829c901d9a1a3cad Mon Sep 17 00:00:00 2001 From: VillagerTom Date: Wed, 21 Feb 2024 23:55:50 +0800 Subject: [PATCH 126/220] =?UTF-8?q?=E5=B0=86git=20log=20pretty=20format?= =?UTF-8?q?=E4=B8=ADraw=20body=E6=9B=BF=E6=8D=A2=E4=B8=BAsubject,=20?= =?UTF-8?q?=E9=81=BF=E5=85=8Drevert=20commit=E5=A4=9A=E8=A1=8C=E8=BE=93?= =?UTF-8?q?=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/alpha.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/alpha.yml b/.github/workflows/alpha.yml index 3cdc4fd5..e44bd262 100644 --- a/.github/workflows/alpha.yml +++ b/.github/workflows/alpha.yml @@ -45,7 +45,7 @@ jobs: - name: 获取最后一次提交 id: get-last-commit run: | - last_commit=$(git log -1 --pretty="%h %B" --first-parent) + last_commit=$(git log -1 --pretty="%h %s" --first-parent) echo "last_commit=$last_commit" >> $GITHUB_OUTPUT - name: 更新版本号 From 65d2bfd844e5019cd3655266063e0514ee82a561 Mon Sep 17 00:00:00 2001 From: VillagerTom Date: Sat, 24 Feb 2024 22:10:08 +0800 Subject: [PATCH 127/220] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E8=87=B3channel-post?= =?UTF-8?q?@v1.0.7,=20=E6=94=AF=E6=8C=81=E4=BC=A0=E8=BE=93=E5=A4=A7?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/alpha.yml | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/.github/workflows/alpha.yml b/.github/workflows/alpha.yml index e44bd262..c22f25c9 100644 --- a/.github/workflows/alpha.yml +++ b/.github/workflows/alpha.yml @@ -205,18 +205,16 @@ jobs: # prerelease: true # allowUpdates: true # artifacts: Pilipala-CI/* - - name: 列出文件 - run: ls -1 ./Pilipala-CI - name: 发送到Telegram频道 - uses: xireiki/channel-post@v1.0.4 + uses: xireiki/channel-post@v1.0.7 with: - BOT_TOKEN: ${{ secrets.BOT_TOKEN }} - CHAT_ID: ${{ secrets.CHAT_ID }} - METHOD: sendMediaGroup - path: | - ./Pilipala-CI/Pili-${{ needs.update_version.outputs.new_version }}.ipa - ./Pilipala-CI/Pili-arm64-v8a-${{ needs.update_version.outputs.new_version }}.apk - CONTEXT: "**Pre-release: ${{ needs.update_version.outputs.new_version }}**\n${{ needs.update_version.outputs.last_commit }}" - - PARSE_MODE: Markdown + bot_token: ${{ secrets.BOT_TOKEN }} + chat_id: ${{ secrets.CHAT_ID }} + large_file: true + api_id: ${{ secrets.TELEGRAM_API_ID }} + api_hash: ${{ secrets.TELEGRAM_API_HASH }} + method: sendFile + path: Pilipala-CI/* + parse_mode: Markdown + context: "**Pre-release: ${{ needs.update_version.outputs.new_version }}**\n${{ needs.update_version.outputs.last_commit }}" From 3f9fcabc2d7058fb21cbba9a69cace34e18a3985 Mon Sep 17 00:00:00 2001 From: VillagerTom Date: Wed, 28 Feb 2024 15:36:30 +0800 Subject: [PATCH 128/220] =?UTF-8?q?Revert=20"=E5=B0=86alpha.yml=E7=9A=84wo?= =?UTF-8?q?rkflow=20name=E6=94=B9=E4=B8=BAalpha,=20=E9=81=BF=E5=85=8D?= =?UTF-8?q?=E6=B7=B7=E6=B7=86"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 04186cdd5b8484eedd086f54b6a8464dca8bffcd. --- .github/workflows/alpha.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/alpha.yml b/.github/workflows/alpha.yml index c22f25c9..af155cc9 100644 --- a/.github/workflows/alpha.yml +++ b/.github/workflows/alpha.yml @@ -1,4 +1,4 @@ -name: alpha +name: CI on: workflow_dispatch: From 45cc46d6d6316eacadd69e40b1840814e4153cc9 Mon Sep 17 00:00:00 2001 From: VillagerTom Date: Wed, 28 Feb 2024 15:38:17 +0800 Subject: [PATCH 129/220] =?UTF-8?q?=E9=87=8D=E5=91=BD=E5=90=8D=EF=BC=9A.gi?= =?UTF-8?q?thub/workflows/alpha.yml=20->=20.github/workflows/CI.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/{alpha.yml => CI.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{alpha.yml => CI.yml} (100%) diff --git a/.github/workflows/alpha.yml b/.github/workflows/CI.yml similarity index 100% rename from .github/workflows/alpha.yml rename to .github/workflows/CI.yml From 699be4125bc1265aee15d3820506369c7a463f0a Mon Sep 17 00:00:00 2001 From: VillagerTom Date: Wed, 28 Feb 2024 16:22:14 +0800 Subject: [PATCH 130/220] =?UTF-8?q?=E5=B0=86=E7=89=88=E6=9C=AC=E5=8F=B7?= =?UTF-8?q?=E4=B8=AD=E7=9A=84alpha=E6=94=B9=E4=B8=BAbeta;=20=E5=8A=A0?= =?UTF-8?q?=E5=9B=9E=E4=B9=8B=E5=89=8D=E5=88=A0=E5=8E=BB=E7=9A=84=E2=80=9C?= =?UTF-8?q?v=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/CI.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index af155cc9..231c61f5 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -4,7 +4,7 @@ on: workflow_dispatch: push: branches: - - 'alpha' + - 'main' paths-ignore: - '**.md' - '**.txt' @@ -58,7 +58,7 @@ jobs: #RUN_NUMBER=${{ github.run_number }} # 构建新版本号 - NEW_VERSION=$VERSION-alpha.${{ steps.get-first-parent-commit-count.outputs.count }} + NEW_VERSION=$VERSION-beta.${{ steps.get-first-parent-commit-count.outputs.count }} # 输出新版本号 echo "New version: $NEW_VERSION" @@ -123,7 +123,7 @@ jobs: run: | for file in build/app/outputs/flutter-apk/app-*.apk; do if [[ $file =~ app-(.?*)release.apk ]]; then - new_file_name="build/app/outputs/flutter-apk/Pili-${BASH_REMATCH[1]}${{ needs.update_version.outputs.new_version }}.apk" + new_file_name="build/app/outputs/flutter-apk/Pili-${BASH_REMATCH[1]}v${{ needs.update_version.outputs.new_version }}.apk" mv "$file" "$new_file_name" fi done @@ -169,7 +169,7 @@ jobs: run: | DATE=${{ steps.date.outputs.date }} for file in app.ipa; do - new_file_name="build/Pili-${{ needs.update_version.outputs.new_version }}.ipa" + new_file_name="build/Pili-v${{ needs.update_version.outputs.new_version }}.ipa" mv "$file" "$new_file_name" done @@ -217,4 +217,4 @@ jobs: method: sendFile path: Pilipala-CI/* parse_mode: Markdown - context: "**Pre-release: ${{ needs.update_version.outputs.new_version }}**\n${{ needs.update_version.outputs.last_commit }}" + context: "*Pre-release: v${{ needs.update_version.outputs.new_version }}*\n${{ needs.update_version.outputs.last_commit }}" From 466214b26a6e37a9ec58b846a281230d557aa3cc Mon Sep 17 00:00:00 2001 From: guozhigq Date: Wed, 28 Feb 2024 23:17:03 +0800 Subject: [PATCH 131/220] fix: statusBarIcon color --- lib/pages/home/view.dart | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/pages/home/view.dart b/lib/pages/home/view.dart index 91d0ea8c..020cb355 100644 --- a/lib/pages/home/view.dart +++ b/lib/pages/home/view.dart @@ -58,6 +58,9 @@ class _HomePageState extends State return Scaffold( extendBody: true, extendBodyBehindAppBar: true, + appBar: _homeController.enableGradientBg + ? null + : AppBar(toolbarHeight: 0, elevation: 0), body: Stack( children: [ // gradient background From 0b5397ec00ef148e08c54a5a40b71b636c1c715a Mon Sep 17 00:00:00 2001 From: guozhigq Date: Wed, 28 Feb 2024 23:29:02 +0800 Subject: [PATCH 132/220] =?UTF-8?q?fix:=20=E5=8A=A8=E6=80=81=E8=AF=84?= =?UTF-8?q?=E8=AE=BA=E5=8C=BAseek=20error?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../detail/reply/widgets/reply_item.dart | 32 ++++++++++++------- 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/lib/pages/video/detail/reply/widgets/reply_item.dart b/lib/pages/video/detail/reply/widgets/reply_item.dart index 246d0688..ab385c0e 100644 --- a/lib/pages/video/detail/reply/widgets/reply_item.dart +++ b/lib/pages/video/detail/reply/widgets/reply_item.dart @@ -462,6 +462,9 @@ class ReplyItemRow extends StatelessWidget { InlineSpan buildContent( BuildContext context, replyItem, replyReply, fReplyItem) { + final String routePath = Get.currentRoute; + bool isVideoPage = routePath.startsWith('/video/detail'); + // replyItem 当前回复内容 // replyReply 查看二楼回复（回复详情）回调 // fReplyItem 父级回复内容，用作二楼回复（回复详情）展示 @@ -571,21 +574,26 @@ InlineSpan buildContent( spanChilds.add( TextSpan( text: ' $matchStr ', - style: TextStyle( - color: Theme.of(context).colorScheme.primary, - ), + style: isVideoPage + ? TextStyle( + color: Theme.of(context).colorScheme.primary, + ) + : null, recognizer: TapGestureRecognizer() ..onTap = () { // 跳转到指定位置 - try { - SmartDialog.showToast('跳转至：$matchStr'); - Get.find(tag: Get.arguments['heroTag']) - .plPlayerController - .seekTo( - Duration(seconds: Utils.duration(matchStr)), - ); - } catch (e) { - SmartDialog.showToast('跳转失败: $e'); + if (isVideoPage) { + try { + SmartDialog.showToast('跳转至：$matchStr'); + Get.find( + tag: Get.arguments['heroTag']) + .plPlayerController + .seekTo( + Duration(seconds: Utils.duration(matchStr)), + ); + } catch (e) { + SmartDialog.showToast('跳转失败: $e'); + } } }, ), From a9d73a9f1ba1749461b4e3132cd090993ab26023 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Wed, 28 Feb 2024 23:51:30 +0800 Subject: [PATCH 133/220] =?UTF-8?q?fix:=20=E5=8A=A8=E6=80=81=E6=A0=87?= =?UTF-8?q?=E9=A2=98=E6=9C=AA=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/dynamics/widgets/content_panel.dart | 4 +++- lib/pages/dynamics/widgets/rich_node_panel.dart | 11 +++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/lib/pages/dynamics/widgets/content_panel.dart b/lib/pages/dynamics/widgets/content_panel.dart index d10804d7..e1beaeb2 100644 --- a/lib/pages/dynamics/widgets/content_panel.dart +++ b/lib/pages/dynamics/widgets/content_panel.dart @@ -45,7 +45,9 @@ class _ContentState extends State { if (len == 1) { OpusPicsModel pictureItem = pics.first; picList.add(pictureItem.url!); - spanChilds.add(const TextSpan(text: '\n')); + + /// 图片上方的空白间隔 + // spanChilds.add(const TextSpan(text: '\n')); spanChilds.add( WidgetSpan( child: LayoutBuilder( diff --git a/lib/pages/dynamics/widgets/rich_node_panel.dart b/lib/pages/dynamics/widgets/rich_node_panel.dart index 8f744dd5..5ffee5f1 100644 --- a/lib/pages/dynamics/widgets/rich_node_panel.dart +++ b/lib/pages/dynamics/widgets/rich_node_panel.dart @@ -19,6 +19,17 @@ InlineSpan richNode(item, context) { // 动态页面 richTextNodes 层级可能与主页动态层级不同 richTextNodes = item.modules.moduleDynamic.major.opus.summary.richTextNodes; + if (item.modules.moduleDynamic.major.opus.title != null) { + spanChilds.add( + TextSpan( + text: item.modules.moduleDynamic.major.opus.title + '\n', + style: Theme.of(context) + .textTheme + .titleMedium! + .copyWith(fontWeight: FontWeight.bold), + ), + ); + } } if (richTextNodes == null || richTextNodes.isEmpty) { return spacer; From 0b0db1a2b17c056744bc28cf7d4d4f38f0501ade Mon Sep 17 00:00:00 2001 From: guozhigq Date: Wed, 28 Feb 2024 23:59:47 +0800 Subject: [PATCH 134/220] =?UTF-8?q?mod:=20videoPage=20path=E5=88=A4?= =?UTF-8?q?=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/video/detail/reply/widgets/reply_item.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/pages/video/detail/reply/widgets/reply_item.dart b/lib/pages/video/detail/reply/widgets/reply_item.dart index ab385c0e..4232d4e9 100644 --- a/lib/pages/video/detail/reply/widgets/reply_item.dart +++ b/lib/pages/video/detail/reply/widgets/reply_item.dart @@ -463,7 +463,7 @@ class ReplyItemRow extends StatelessWidget { InlineSpan buildContent( BuildContext context, replyItem, replyReply, fReplyItem) { final String routePath = Get.currentRoute; - bool isVideoPage = routePath.startsWith('/video/detail'); + bool isVideoPage = routePath.startsWith('/video'); // replyItem 当前回复内容 // replyReply 查看二楼回复（回复详情）回调 From 33ef18ef1d23bbcc90022aec95f9c8cc4aed1891 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Thu, 29 Feb 2024 00:30:55 +0800 Subject: [PATCH 135/220] =?UTF-8?q?fix:=20=E8=AF=84=E8=AE=BAjumpUrl?= =?UTF-8?q?=E6=AD=A3=E5=88=99=E8=BD=AC=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/video/detail/reply/widgets/reply_item.dart | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/pages/video/detail/reply/widgets/reply_item.dart b/lib/pages/video/detail/reply/widgets/reply_item.dart index 4232d4e9..c55380f2 100644 --- a/lib/pages/video/detail/reply/widgets/reply_item.dart +++ b/lib/pages/video/detail/reply/widgets/reply_item.dart @@ -506,21 +506,25 @@ InlineSpan buildContent( .replaceAll('"', '"') .replaceAll(''', "'") .replaceAll(' ', ' '); - // print("content.jumpUrl.keys:" + content.jumpUrl.keys.toString()); // 构建正则表达式 final List specialTokens = [ ...content.emote.keys, ...content.topicsMeta?.keys?.map((e) => '#$e#') ?? [], ...content.atNameToMid.keys.map((e) => '@$e'), - ...content.jumpUrl.keys.map((e) => - e.replaceAll('?', '\\?').replaceAll('+', '\\+').replaceAll('*', '\\*')), ]; + List jumpUrlKeysList = content.jumpUrl.keys.map((e) { + return e.replaceAllMapped( + RegExp(r'[?+*]'), (match) => '\\${match.group(0)}'); + }).toList(); String patternStr = specialTokens.map(RegExp.escape).join('|'); if (patternStr.isNotEmpty) { patternStr += "|"; } patternStr += r'(\b(?:\d+[:：])?[0-5]?[0-9][:：][0-5]?[0-9]\b)'; + if (jumpUrlKeysList.isNotEmpty) { + patternStr += '|${jumpUrlKeysList.join('|')}'; + } final RegExp pattern = RegExp(patternStr); List matchedStrs = []; void addPlainTextSpan(str) { @@ -599,7 +603,6 @@ InlineSpan buildContent( ), ); } else { - print("matchStr=$matchStr"); String appUrlSchema = ''; final bool enableWordRe = setting.get(SettingBoxKey.enableWordRe, defaultValue: false) as bool; From ce1c80fd86ad564f0fdd886e4ad8772bdeb046d0 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Thu, 29 Feb 2024 23:42:09 +0800 Subject: [PATCH 136/220] =?UTF-8?q?fix:=20=E5=8A=A8=E6=80=81=E6=9C=80?= =?UTF-8?q?=E6=96=B0=E5=85=B3=E6=B3=A8=E6=A8=AA=E8=A1=8C=E6=8B=89=E4=BC=B8?= =?UTF-8?q?=20issuse=20#580?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/dynamics/widgets/up_panel.dart | 54 +++++++++++------------- 1 file changed, 25 insertions(+), 29 deletions(-) diff --git a/lib/pages/dynamics/widgets/up_panel.dart b/lib/pages/dynamics/widgets/up_panel.dart index 84753ff9..aa0bdd02 100644 --- a/lib/pages/dynamics/widgets/up_panel.dart +++ b/lib/pages/dynamics/widgets/up_panel.dart @@ -88,36 +88,32 @@ class _UpPanelState extends State { Container( height: 90, color: Theme.of(context).colorScheme.background, - child: Row( - children: [ - Expanded( - child: ListView( - scrollDirection: Axis.horizontal, - controller: scrollController, - children: [ - const SizedBox(width: 10), - if (liveList.isNotEmpty) ...[ - for (int i = 0; i < liveList.length; i++) ...[ - upItemBuild(liveList[i], i) - ], - VerticalDivider( - indent: 20, - endIndent: 40, - width: 26, - color: Theme.of(context) - .colorScheme - .primary - .withOpacity(0.5), - ), - ], - for (int i = 0; i < upList.length; i++) ...[ - upItemBuild(upList[i], i) - ], - const SizedBox(width: 10), + child: Expanded( + child: ListView( + scrollDirection: Axis.horizontal, + controller: scrollController, + children: [ + const SizedBox(width: 10), + if (liveList.isNotEmpty) ...[ + for (int i = 0; i < liveList.length; i++) ...[ + upItemBuild(liveList[i], i) ], - ), - ), - ], + VerticalDivider( + indent: 20, + endIndent: 40, + width: 26, + color: Theme.of(context) + .colorScheme + .primary + .withOpacity(0.5), + ), + ], + for (int i = 0; i < upList.length; i++) ...[ + upItemBuild(upList[i], i) + ], + const SizedBox(width: 10), + ], + ), ), ), Container( From be56fb721fd9d23b3efdebbc2123090b4a7b8464 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Fri, 1 Mar 2024 00:14:42 +0800 Subject: [PATCH 137/220] =?UTF-8?q?fix:=20=E7=A7=81=E4=BF=A1=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E8=A1=A8=E6=83=85=E9=9D=A2=E6=9D=BF=20issues=20#588?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/video/detail/reply_new/view.dart | 33 +++++++++++++--------- lib/pages/whisper_detail/view.dart | 30 +++++++++++--------- 2 files changed, 37 insertions(+), 26 deletions(-) diff --git a/lib/pages/video/detail/reply_new/view.dart b/lib/pages/video/detail/reply_new/view.dart index 83201697..678c66cc 100644 --- a/lib/pages/video/detail/reply_new/view.dart +++ b/lib/pages/video/detail/reply_new/view.dart @@ -109,21 +109,24 @@ class _VideoReplyNewDialogState extends State @override void didChangeMetrics() { super.didChangeMetrics(); - WidgetsBinding.instance.addPostFrameCallback((_) { - // 键盘高度 - final viewInsets = EdgeInsets.fromViewPadding( - View.of(context).viewInsets, View.of(context).devicePixelRatio); - _debouncer.run(() { - if (mounted) { - if (keyboardHeight == 0 && emoteHeight == 0) { - setState(() { - emoteHeight = keyboardHeight = - keyboardHeight == 0.0 ? viewInsets.bottom : keyboardHeight; - }); + final String routePath = Get.currentRoute; + if (mounted && routePath.startsWith('/video')) { + WidgetsBinding.instance.addPostFrameCallback((_) { + // 键盘高度 + final viewInsets = EdgeInsets.fromViewPadding( + View.of(context).viewInsets, View.of(context).devicePixelRatio); + _debouncer.run(() { + if (mounted) { + if (keyboardHeight == 0 && emoteHeight == 0) { + setState(() { + emoteHeight = keyboardHeight = + keyboardHeight == 0.0 ? viewInsets.bottom : keyboardHeight; + }); + } } - } + }); }); - }); + } } @override @@ -131,11 +134,15 @@ class _VideoReplyNewDialogState extends State WidgetsBinding.instance.removeObserver(this); _replyContentController.dispose(); replyContentFocusNode.removeListener(() {}); + replyContentFocusNode.dispose(); super.dispose(); } @override Widget build(BuildContext context) { + double keyboardHeight = EdgeInsets.fromViewPadding( + View.of(context).viewInsets, View.of(context).devicePixelRatio) + .bottom; return Container( clipBehavior: Clip.hardEdge, decoration: BoxDecoration( diff --git a/lib/pages/whisper_detail/view.dart b/lib/pages/whisper_detail/view.dart index e94b7d6d..1701be33 100644 --- a/lib/pages/whisper_detail/view.dart +++ b/lib/pages/whisper_detail/view.dart @@ -51,27 +51,31 @@ class _WhisperDetailPageState extends State @override void didChangeMetrics() { super.didChangeMetrics(); - WidgetsBinding.instance.addPostFrameCallback((_) { - // 键盘高度 - final viewInsets = EdgeInsets.fromViewPadding( - View.of(context).viewInsets, View.of(context).devicePixelRatio); - _debouncer.run(() { - if (mounted) { - if (keyboardHeight == 0) { - setState(() { - emoteHeight = keyboardHeight = - keyboardHeight == 0.0 ? viewInsets.bottom : keyboardHeight; - }); + final String routePath = Get.currentRoute; + if (mounted && routePath.startsWith('/whisper_detail')) { + WidgetsBinding.instance.addPostFrameCallback((_) { + // 键盘高度 + final viewInsets = EdgeInsets.fromViewPadding( + View.of(context).viewInsets, View.of(context).devicePixelRatio); + _debouncer.run(() { + if (mounted) { + if (keyboardHeight == 0) { + setState(() { + emoteHeight = keyboardHeight = + keyboardHeight == 0.0 ? viewInsets.bottom : keyboardHeight; + }); + } } - } + }); }); - }); + } } @override void dispose() { WidgetsBinding.instance.removeObserver(this); replyContentFocusNode.removeListener(() {}); + replyContentFocusNode.dispose(); super.dispose(); } From e5eae93a78812633adc843ac2ff7e1d17315a0db Mon Sep 17 00:00:00 2001 From: guozhigq Date: Fri, 1 Mar 2024 23:01:10 +0800 Subject: [PATCH 138/220] =?UTF-8?q?fix:=20=E7=A7=81=E4=BF=A1=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E8=A1=A8=E6=83=85=E9=9D=A2=E6=9D=BF=20issues=20#588?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/video/detail/reply_new/view.dart | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/pages/video/detail/reply_new/view.dart b/lib/pages/video/detail/reply_new/view.dart index 678c66cc..05351411 100644 --- a/lib/pages/video/detail/reply_new/view.dart +++ b/lib/pages/video/detail/reply_new/view.dart @@ -110,7 +110,9 @@ class _VideoReplyNewDialogState extends State void didChangeMetrics() { super.didChangeMetrics(); final String routePath = Get.currentRoute; - if (mounted && routePath.startsWith('/video')) { + if (mounted && + (routePath.startsWith('/video') || + routePath.startsWith('/dynamicDetail'))) { WidgetsBinding.instance.addPostFrameCallback((_) { // 键盘高度 final viewInsets = EdgeInsets.fromViewPadding( From d6da2a8a476c65456426173364d492106aeeb586 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Fri, 1 Mar 2024 23:55:19 +0800 Subject: [PATCH 139/220] =?UTF-8?q?fix:=20headerControl=20bvid=E4=B8=A2?= =?UTF-8?q?=E5=A4=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/video/detail/controller.dart | 1 + .../video/detail/introduction/controller.dart | 3 ++- lib/pages/video/detail/introduction/view.dart | 24 ++++++++++++++----- lib/pages/video/detail/view.dart | 12 ++++++---- .../video/detail/widgets/header_control.dart | 5 +++- 5 files changed, 33 insertions(+), 12 deletions(-) diff --git a/lib/pages/video/detail/controller.dart b/lib/pages/video/detail/controller.dart index 7465c6f2..d590cea9 100644 --- a/lib/pages/video/detail/controller.dart +++ b/lib/pages/video/detail/controller.dart @@ -128,6 +128,7 @@ class VideoDetailController extends GetxController controller: plPlayerController, videoDetailCtr: this, floating: floating, + bvid: bvid, ); // CDN优化 enableCDN = setting.get(SettingBoxKey.enableCDN, defaultValue: true); diff --git a/lib/pages/video/detail/introduction/controller.dart b/lib/pages/video/detail/introduction/controller.dart index 26cbd2e0..c7f22b13 100644 --- a/lib/pages/video/detail/introduction/controller.dart +++ b/lib/pages/video/detail/introduction/controller.dart @@ -22,8 +22,9 @@ import '../related/index.dart'; import 'widgets/group_panel.dart'; class VideoIntroController extends GetxController { + VideoIntroController({required this.bvid}); // 视频bvid - String bvid = Get.parameters['bvid']!; + String bvid; // 是否预渲染 骨架屏 bool preRender = false; diff --git a/lib/pages/video/detail/introduction/view.dart b/lib/pages/video/detail/introduction/view.dart index 0a3ac934..bed37bb5 100644 --- a/lib/pages/video/detail/introduction/view.dart +++ b/lib/pages/video/detail/introduction/view.dart @@ -24,7 +24,10 @@ import 'widgets/page.dart'; import 'widgets/season.dart'; class VideoIntroPanel extends StatefulWidget { - const VideoIntroPanel({super.key}); + final String bvid; + final String? cid; + + const VideoIntroPanel({super.key, required this.bvid, this.cid}); @override State createState() => _VideoIntroPanelState(); @@ -47,7 +50,8 @@ class _VideoIntroPanelState extends State /// fix 全屏时参数丢失 heroTag = Get.arguments['heroTag']; - videoIntroController = Get.put(VideoIntroController(), tag: heroTag); + videoIntroController = + Get.put(VideoIntroController(bvid: widget.bvid), tag: heroTag); _futureBuilderFuture = videoIntroController.queryVideoIntro(); videoIntroController.videoDetail.listen((value) { videoDetail = value; @@ -77,6 +81,7 @@ class _VideoIntroPanelState extends State loadingStatus: false, videoDetail: videoIntroController.videoDetail.value, heroTag: heroTag, + bvid: widget.bvid, ), ); } else { @@ -95,6 +100,7 @@ class _VideoIntroPanelState extends State loadingStatus: true, videoDetail: videoDetail, heroTag: heroTag, + bvid: widget.bvid, ); } }, @@ -106,10 +112,15 @@ class VideoInfo extends StatefulWidget { final bool loadingStatus; final VideoDetailData? videoDetail; final String? heroTag; + final String bvid; - const VideoInfo( - {Key? key, this.loadingStatus = false, this.videoDetail, this.heroTag}) - : super(key: key); + const VideoInfo({ + Key? key, + this.loadingStatus = false, + this.videoDetail, + this.heroTag, + required this.bvid, + }) : super(key: key); @override State createState() => _VideoInfoState(); @@ -149,7 +160,8 @@ class _VideoInfoState extends State with TickerProviderStateMixin { void initState() { super.initState(); heroTag = widget.heroTag!; - videoIntroController = Get.put(VideoIntroController(), tag: heroTag); + videoIntroController = + Get.put(VideoIntroController(bvid: widget.bvid), tag: heroTag); videoDetailCtr = Get.find(tag: heroTag); videoItem = videoIntroController.videoItem!; sheetHeight = localCache.get('sheetHeight'); diff --git a/lib/pages/video/detail/view.dart b/lib/pages/video/detail/view.dart index febca105..b82d3e96 100644 --- a/lib/pages/video/detail/view.dart +++ b/lib/pages/video/detail/view.dart @@ -23,7 +23,6 @@ import 'package:pilipala/plugin/pl_player/models/play_repeat.dart'; import 'package:pilipala/services/service_locator.dart'; import 'package:pilipala/utils/storage.dart'; -import 'package:pilipala/plugin/pl_player/utils/fullscreen.dart'; import '../../../services/shutdown_timer_service.dart'; import 'widgets/header_control.dart'; @@ -68,7 +67,9 @@ class _VideoDetailPageState extends State super.initState(); heroTag = Get.arguments['heroTag']; videoDetailController = Get.put(VideoDetailController(), tag: heroTag); - videoIntroController = Get.put(VideoIntroController(), tag: heroTag); + videoIntroController = Get.put( + VideoIntroController(bvid: Get.parameters['bvid']!), + tag: heroTag); videoIntroController.videoDetail.listen((value) { videoPlayerServiceHandler.onVideoDetailChange( value, videoDetailController.cid.value); @@ -227,6 +228,7 @@ class _VideoDetailPageState extends State plPlayerController!.removeStatusLister(playerListener); plPlayerController!.pause(); } + print('🐶🐶'); setState(() => isShowing = false); super.didPushNext(); } @@ -550,7 +552,8 @@ class _VideoDetailPageState extends State slivers: [ if (videoDetailController.videoType == SearchType.video) ...[ - const VideoIntroPanel(), + VideoIntroPanel( + bvid: videoDetailController.bvid), ] else if (videoDetailController.videoType == SearchType.media_bangumi) ...[ Obx(() => BangumiIntroPanel( @@ -577,7 +580,7 @@ class _VideoDetailPageState extends State .withOpacity(0.06), ), ), - RelatedVideoPanel(), + const RelatedVideoPanel(), ], ); }, @@ -627,6 +630,7 @@ class _VideoDetailPageState extends State headerControl: HeaderControl( controller: plPlayerController, videoDetailCtr: videoDetailController, + bvid: videoDetailController.bvid, ), danmuWidget: Obx( () => PlDanmaku( diff --git a/lib/pages/video/detail/widgets/header_control.dart b/lib/pages/video/detail/widgets/header_control.dart index 596c567b..e2e4db8c 100644 --- a/lib/pages/video/detail/widgets/header_control.dart +++ b/lib/pages/video/detail/widgets/header_control.dart @@ -27,11 +27,13 @@ class HeaderControl extends StatefulWidget implements PreferredSizeWidget { this.controller, this.videoDetailCtr, this.floating, + this.bvid, super.key, }); final PlPlayerController? controller; final VideoDetailController? videoDetailCtr; final Floating? floating; + final String? bvid; @override State createState() => _HeaderControlState(); @@ -62,7 +64,8 @@ class _HeaderControlState extends State { speedsList = widget.controller!.speedsList; fullScreenStatusListener(); heroTag = Get.arguments['heroTag']; - videoIntroController = Get.put(VideoIntroController(), tag: heroTag); + videoIntroController = + Get.put(VideoIntroController(bvid: widget.bvid!), tag: heroTag); } void fullScreenStatusListener() { From f815affff9983e98ec9957df246749ddf6dba790 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sat, 2 Mar 2024 00:40:53 +0800 Subject: [PATCH 140/220] =?UTF-8?q?opt:=20=E6=92=AD=E6=94=BE=E5=99=A8?= =?UTF-8?q?=E6=8E=A7=E5=88=B6=E6=A0=8F=E5=8A=A8=E7=94=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/plugin/pl_player/widgets/app_bar_ani.dart | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/plugin/pl_player/widgets/app_bar_ani.dart b/lib/plugin/pl_player/widgets/app_bar_ani.dart index 9a3af267..53eaad16 100644 --- a/lib/plugin/pl_player/widgets/app_bar_ani.dart +++ b/lib/plugin/pl_player/widgets/app_bar_ani.dart @@ -19,11 +19,11 @@ class AppBarAni extends StatelessWidget implements PreferredSizeWidget { @override Widget build(BuildContext context) { - visible ? controller.reverse() : controller.forward(); + visible ? controller.forward() : controller.reverse(); return SlideTransition( position: Tween( - begin: Offset.zero, - end: Offset(0, position! == 'top' ? -1 : 1), + begin: Offset(0, position! == 'top' ? -1 : 1), + end: Offset.zero, ).animate(CurvedAnimation( parent: controller, curve: Curves.linear, From f0d8e2a122b4ed060ad8c9326ca3c5de9bab616e Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sat, 2 Mar 2024 11:19:18 +0800 Subject: [PATCH 141/220] =?UTF-8?q?feat:=20=E6=92=AD=E6=94=BE=E5=99=A8?= =?UTF-8?q?=E6=8E=A7=E5=88=B6=E6=A0=8F=E5=8A=A8=E7=94=BB=E5=BC=80=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/setting/play_setting.dart | 9 +++++++++ lib/plugin/pl_player/view.dart | 6 +++++- lib/utils/global_data.dart | 1 + lib/utils/storage.dart | 3 +++ 4 files changed, 18 insertions(+), 1 deletion(-) diff --git a/lib/pages/setting/play_setting.dart b/lib/pages/setting/play_setting.dart index a2a3fef2..469bf975 100644 --- a/lib/pages/setting/play_setting.dart +++ b/lib/pages/setting/play_setting.dart @@ -7,6 +7,7 @@ import 'package:pilipala/models/video/play/quality.dart'; import 'package:pilipala/pages/setting/widgets/select_dialog.dart'; import 'package:pilipala/plugin/pl_player/index.dart'; import 'package:pilipala/services/service_locator.dart'; +import 'package:pilipala/utils/global_data.dart'; import 'package:pilipala/utils/storage.dart'; import 'widgets/switch_item.dart'; @@ -146,6 +147,14 @@ class _PlaySettingState extends State { setKey: SettingBoxKey.enableShowDanmaku, defaultVal: false, ), + SetSwitchItem( + title: '控制栏动画', + subTitle: '播放器控制栏显示动画效果', + setKey: SettingBoxKey.enablePlayerControlAnimation, + defaultVal: true, + callFn: (bool val) { + GlobalData().enablePlayerControlAnimation = val; + }), ListTile( dense: false, title: Text('默认画质', style: titleStyle), diff --git a/lib/plugin/pl_player/view.dart b/lib/plugin/pl_player/view.dart index 9c5731ec..988ec26d 100644 --- a/lib/plugin/pl_player/view.dart +++ b/lib/plugin/pl_player/view.dart @@ -120,7 +120,11 @@ class _PLVideoPlayerState extends State super.initState(); screenWidth = Get.size.width; animationController = AnimationController( - vsync: this, duration: const Duration(milliseconds: 300)); + vsync: this, + duration: GlobalData().enablePlayerControlAnimation + ? const Duration(milliseconds: 150) + : const Duration(milliseconds: 10), + ); videoController = widget.controller.videoController!; widget.controller.headerControl = widget.headerControl; widget.controller.bottomControl = widget.bottomControl; diff --git a/lib/utils/global_data.dart b/lib/utils/global_data.dart index 08157db4..ef3daf21 100644 --- a/lib/utils/global_data.dart +++ b/lib/utils/global_data.dart @@ -4,6 +4,7 @@ class GlobalData { int imgQuality = 10; FullScreenGestureMode fullScreenGestureMode = FullScreenGestureMode.values.last; + bool enablePlayerControlAnimation = true; // 私有构造函数 GlobalData._(); diff --git a/lib/utils/storage.dart b/lib/utils/storage.dart index d69ffc20..44beb4e7 100644 --- a/lib/utils/storage.dart +++ b/lib/utils/storage.dart @@ -49,6 +49,8 @@ class GStrorage { GlobalData().fullScreenGestureMode = FullScreenGestureMode.values[ setting.get(SettingBoxKey.fullScreenGestureMode, defaultValue: FullScreenGestureMode.values.last.index) as int]; + GlobalData().enablePlayerControlAnimation = setting + .get(SettingBoxKey.enablePlayerControlAnimation, defaultValue: true); } static void regAdapter() { @@ -98,6 +100,7 @@ class SettingBoxKey { enableCDN = 'enableCDN', autoPiP = 'autoPiP', enableAutoLongPressSpeed = 'enableAutoLongPressSpeed', + enablePlayerControlAnimation = 'enablePlayerControlAnimation', // youtube 双击快进快退 enableQuickDouble = 'enableQuickDouble', From 98122aeaae1e54315a68f72e924fea016981f763 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sat, 2 Mar 2024 11:45:36 +0800 Subject: [PATCH 142/220] fix: audioHandler null --- lib/services/audio_handler.dart | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/services/audio_handler.dart b/lib/services/audio_handler.dart index ad510e7d..0b37d419 100644 --- a/lib/services/audio_handler.dart +++ b/lib/services/audio_handler.dart @@ -149,6 +149,8 @@ class VideoPlayerServiceHandler extends BaseAudioHandler with SeekHandler { )); if (_item.isNotEmpty) { _item.removeLast(); + } + if (_item.isNotEmpty) { setMediaItem(_item.last); } if (_item.isEmpty) { From fca7c362031e46a1bc097155db69fe1d26d687d3 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sat, 2 Mar 2024 12:56:16 +0800 Subject: [PATCH 143/220] =?UTF-8?q?mod:=20=E5=8A=A8=E6=80=81=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2upPanel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/models/dynamics/up.dart | 7 +++ lib/pages/dynamics/controller.dart | 5 +- lib/pages/dynamics/widgets/up_panel.dart | 60 +++++++++++++----------- 3 files changed, 41 insertions(+), 31 deletions(-) diff --git a/lib/models/dynamics/up.dart b/lib/models/dynamics/up.dart index cfd1fa7d..ce445acb 100644 --- a/lib/models/dynamics/up.dart +++ b/lib/models/dynamics/up.dart @@ -2,15 +2,22 @@ class FollowUpModel { FollowUpModel({ this.liveUsers, this.upList, + this.liveList, }); LiveUsers? liveUsers; List? upList; + List? liveList; FollowUpModel.fromJson(Map json) { liveUsers = json['live_users'] != null ? LiveUsers.fromJson(json['live_users']) : null; + liveList = json['live_users'] != null + ? json['live_users']['items'] + .map((e) => LiveUserItem.fromJson(e)) + .toList() + : []; upList = json['up_list'] != null ? json['up_list'].map((e) => UpItem.fromJson(e)).toList() : []; diff --git a/lib/pages/dynamics/controller.dart b/lib/pages/dynamics/controller.dart index 1e9f2da4..1d415aa4 100644 --- a/lib/pages/dynamics/controller.dart +++ b/lib/pages/dynamics/controller.dart @@ -249,8 +249,8 @@ class DynamicsController extends GetxController { return {'status': false, 'msg': '账号未登录'}; } if (type == 'init') { - upData.value.upList = []; - upData.value.liveUsers = LiveUsers(); + upData.value.upList = []; + upData.value.liveList = []; } var res = await DynamicsHttp.followUp(); if (res['status']) { @@ -271,7 +271,6 @@ class DynamicsController extends GetxController { onRefresh() async { page = 1; - print('onRefresh'); await queryFollowUp(); await queryFollowDynamic(); } diff --git a/lib/pages/dynamics/widgets/up_panel.dart b/lib/pages/dynamics/widgets/up_panel.dart index aa0bdd02..ef0c3731 100644 --- a/lib/pages/dynamics/widgets/up_panel.dart +++ b/lib/pages/dynamics/widgets/up_panel.dart @@ -31,8 +31,8 @@ class _UpPanelState extends State { void initState() { super.initState(); upList = widget.upData!.upList!; - if (widget.upData!.liveUsers != null) { - liveList = widget.upData!.liveUsers!.items!; + if (widget.upData!.liveList!.isNotEmpty) { + liveList = widget.upData!.liveList!; } upList.insert( 0, @@ -55,7 +55,7 @@ class _UpPanelState extends State { floating: true, pinned: false, delegate: _SliverHeaderDelegate( - height: 126, + height: liveList.isNotEmpty || upList.isNotEmpty ? 126 : 0, child: Column( mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start, @@ -88,32 +88,36 @@ class _UpPanelState extends State { Container( height: 90, color: Theme.of(context).colorScheme.background, - child: Expanded( - child: ListView( - scrollDirection: Axis.horizontal, - controller: scrollController, - children: [ - const SizedBox(width: 10), - if (liveList.isNotEmpty) ...[ - for (int i = 0; i < liveList.length; i++) ...[ - upItemBuild(liveList[i], i) + child: Row( + children: [ + Flexible( + child: ListView( + scrollDirection: Axis.horizontal, + controller: scrollController, + children: [ + const SizedBox(width: 10), + if (liveList.isNotEmpty) ...[ + for (int i = 0; i < liveList.length; i++) ...[ + upItemBuild(liveList[i], i) + ], + VerticalDivider( + indent: 20, + endIndent: 40, + width: 26, + color: Theme.of(context) + .colorScheme + .primary + .withOpacity(0.5), + ), + ], + for (int i = 0; i < upList.length; i++) ...[ + upItemBuild(upList[i], i) + ], + const SizedBox(width: 10), ], - VerticalDivider( - indent: 20, - endIndent: 40, - width: 26, - color: Theme.of(context) - .colorScheme - .primary - .withOpacity(0.5), - ), - ], - for (int i = 0; i < upList.length; i++) ...[ - upItemBuild(upList[i], i) - ], - const SizedBox(width: 10), - ], - ), + ), + ), + ], ), ), Container( From ae33cbf7ca9c93cc93e0837f8ba5f59775804ec7 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sat, 2 Mar 2024 13:02:43 +0800 Subject: [PATCH 144/220] =?UTF-8?q?fix:=20=E6=90=9C=E7=B4=A2=E6=A1=86?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E6=90=9C=E7=B4=A2=E8=AF=8D=E6=BA=A2=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/home/view.dart | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/lib/pages/home/view.dart b/lib/pages/home/view.dart index 020cb355..b0cef90b 100644 --- a/lib/pages/home/view.dart +++ b/lib/pages/home/view.dart @@ -415,13 +415,16 @@ class SearchBar extends StatelessWidget { ), const SizedBox(width: 10), Obx( - () => Text( - ctr!.defaultSearch.value, - maxLines: 1, - overflow: TextOverflow.ellipsis, - style: TextStyle(color: colorScheme.outline), + () => Expanded( + child: Text( + ctr!.defaultSearch.value, + maxLines: 1, + overflow: TextOverflow.ellipsis, + style: TextStyle(color: colorScheme.outline), + ), ), ), + const SizedBox(width: 15), ], ), ), From 4191cafe78e3b999f2ae74c2bb673767d2865f7d Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sat, 2 Mar 2024 14:47:07 +0800 Subject: [PATCH 145/220] =?UTF-8?q?fix:=20=E6=8E=A8=E8=8D=90=E5=8D=A1?= =?UTF-8?q?=E7=89=87=E5=8D=95=E5=88=97=E5=B8=83=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/common/widgets/video_card_v.dart | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/common/widgets/video_card_v.dart b/lib/common/widgets/video_card_v.dart index 43dd05ca..0d96f7b7 100644 --- a/lib/common/widgets/video_card_v.dart +++ b/lib/common/widgets/video_card_v.dart @@ -231,6 +231,7 @@ class VideoContent extends StatelessWidget { const SizedBox(height: 2), VideoStat( videoItem: videoItem, + crossAxisCount: crossAxisCount, ), ], if (crossAxisCount == 1) const SizedBox(height: 4), @@ -294,6 +295,7 @@ class VideoContent extends StatelessWidget { ), VideoStat( videoItem: videoItem, + crossAxisCount: crossAxisCount, ), const Spacer(), ], @@ -317,10 +319,12 @@ class VideoContent extends StatelessWidget { class VideoStat extends StatelessWidget { final dynamic videoItem; + final int crossAxisCount; const VideoStat({ Key? key, required this.videoItem, + required this.crossAxisCount, }) : super(key: key); @override @@ -337,7 +341,7 @@ class VideoStat extends StatelessWidget { danmu: videoItem.stat.danmu, ), if (videoItem is RecVideoItemModel) ...[ - const Spacer(), + crossAxisCount > 1 ? const Spacer() : const SizedBox(width: 8), RichText( maxLines: 1, text: TextSpan( From f81f348a3e1be25cf8ff4cd0befa92c762948e3b Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sat, 2 Mar 2024 15:51:24 +0800 Subject: [PATCH 146/220] =?UTF-8?q?fix:=20=E8=A7=86=E9=A2=91=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E9=A1=B5=E8=AF=84=E8=AE=BA=E4=B8=8B=E6=8B=89=E5=88=B7?= =?UTF-8?q?=E6=96=B0=20issues=20#486?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/video/detail/reply/controller.dart | 1 + lib/pages/video/detail/reply/view.dart | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/pages/video/detail/reply/controller.dart b/lib/pages/video/detail/reply/controller.dart index 91344fc1..06ce26ff 100644 --- a/lib/pages/video/detail/reply/controller.dart +++ b/lib/pages/video/detail/reply/controller.dart @@ -62,6 +62,7 @@ class VideoReplyController extends GetxController { noMore.value = ''; } if (noMore.value == '没有更多了') { + isLoadingMore = false; return; } final res = await ReplyHttp.replyList( diff --git a/lib/pages/video/detail/reply/view.dart b/lib/pages/video/detail/reply/view.dart index df8c75b1..b07a6168 100644 --- a/lib/pages/video/detail/reply/view.dart +++ b/lib/pages/video/detail/reply/view.dart @@ -134,13 +134,13 @@ class _VideoReplyPanelState extends State super.build(context); return RefreshIndicator( onRefresh: () async { - _videoReplyController.currentPage = 0; - return await _videoReplyController.queryReplyList(); + return await _videoReplyController.queryReplyList(type: 'init'); }, child: Stack( children: [ CustomScrollView( controller: scrollController, + physics: const AlwaysScrollableScrollPhysics(), key: const PageStorageKey('评论'), slivers: [ SliverPersistentHeader( From 370dcaf419a72495d650fcc4c91c876875f5352c Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sat, 2 Mar 2024 16:05:15 +0800 Subject: [PATCH 147/220] =?UTF-8?q?mod:=20=E7=94=A8=E6=88=B7=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E7=8A=B6=E6=80=81msg=E5=8F=96=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/webview/controller.dart | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/pages/webview/controller.dart b/lib/pages/webview/controller.dart index 37600ea7..f26f4284 100644 --- a/lib/pages/webview/controller.dart +++ b/lib/pages/webview/controller.dart @@ -131,13 +131,13 @@ class WebviewController extends GetxController { Get.back(); } else { // 获取用户信息失败 - SmartDialog.showToast(result.msg); - Clipboard.setData(ClipboardData(text: result.msg.toString())); + SmartDialog.showToast(result['msg']); + Clipboard.setData(ClipboardData(text: result['msg'])); } } catch (e) { SmartDialog.showNotify(msg: e.toString(), notifyType: NotifyType.warning); content = content + e.toString(); + Clipboard.setData(ClipboardData(text: content)); } - Clipboard.setData(ClipboardData(text: content)); } } From a3ce15bd9ef3e33e7df1ff139301603d76ceccce Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sat, 2 Mar 2024 22:27:02 +0800 Subject: [PATCH 148/220] mod: CI format --- .github/workflows/CI.yml | 36 ++++++++++++------------------------ 1 file changed, 12 insertions(+), 24 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 231c61f5..2fa0a6ef 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -1,16 +1,16 @@ -name: CI +name: Pilipala Beta on: workflow_dispatch: push: branches: - - 'main' + - "main" paths-ignore: - - '**.md' - - '**.txt' - - '.github/**' - - '.idea/**' - - '!.github/workflows/**' + - "**.md" + - "**.txt" + - ".github/**" + - ".idea/**" + - "!.github/workflows/**" jobs: update_version: @@ -53,16 +53,16 @@ jobs: run: | # 读取版本号 VERSION=$(yq e .version pubspec.yaml | cut -d "+" -f 1) - + # 获取GitHub Actions的run_number #RUN_NUMBER=${{ github.run_number }} - + # 构建新版本号 NEW_VERSION=$VERSION-beta.${{ steps.get-first-parent-commit-count.outputs.count }} - + # 输出新版本号 echo "New version: $NEW_VERSION" - + # 设置新版本号为输出变量 echo "new_version=$NEW_VERSION" >>$GITHUB_OUTPUT @@ -189,22 +189,10 @@ jobs: - android - iOS steps: - - uses: actions/download-artifact@v3 with: name: Pilipala-CI path: ./Pilipala-CI - - # - name: Upload Pre-release - # uses: ncipollo/release-action@v1 - # with: - # name: ${{ needs.update_version.outputs.new_version }} - # token: ${{ secrets.GIT_TOKEN }} - # commit: main - # tag: ${{ needs.update_version.outputs.new_version }} - # prerelease: true - # allowUpdates: true - # artifacts: Pilipala-CI/* - name: 发送到Telegram频道 uses: xireiki/channel-post@v1.0.7 @@ -217,4 +205,4 @@ jobs: method: sendFile path: Pilipala-CI/* parse_mode: Markdown - context: "*Pre-release: v${{ needs.update_version.outputs.new_version }}*\n${{ needs.update_version.outputs.last_commit }}" + context: "*Beta版本: v${{ needs.update_version.outputs.new_version }}*\n更新内容: [${{ needs.update_version.outputs.last_commit }}](${{ github.event.head_commit.url }})" From 0e888537e83dcf806bb1cbcc415ded7185312176 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sat, 2 Mar 2024 22:37:56 +0800 Subject: [PATCH 149/220] mod: yml rename --- .github/workflows/{CI.yml => beta_ci.yml} | 10 +++++----- .github/workflows/{main.yml => release_ci.yml} | 0 2 files changed, 5 insertions(+), 5 deletions(-) rename .github/workflows/{CI.yml => beta_ci.yml} (97%) rename .github/workflows/{main.yml => release_ci.yml} (100%) diff --git a/.github/workflows/CI.yml b/.github/workflows/beta_ci.yml similarity index 97% rename from .github/workflows/CI.yml rename to .github/workflows/beta_ci.yml index 2fa0a6ef..e839aca1 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/beta_ci.yml @@ -131,7 +131,7 @@ jobs: - name: 上传 uses: actions/upload-artifact@v3 with: - name: Pilipala-CI + name: Pilipala-Beta path: | build/app/outputs/flutter-apk/Pili-*.apk @@ -177,7 +177,7 @@ jobs: uses: actions/upload-artifact@v3 with: if-no-files-found: error - name: Pilipala-CI + name: Pilipala-Beta path: | build/Pili-*.ipa @@ -191,8 +191,8 @@ jobs: steps: - uses: actions/download-artifact@v3 with: - name: Pilipala-CI - path: ./Pilipala-CI + name: Pilipala-Beta + path: ./Pilipala-Beta - name: 发送到Telegram频道 uses: xireiki/channel-post@v1.0.7 @@ -203,6 +203,6 @@ jobs: api_id: ${{ secrets.TELEGRAM_API_ID }} api_hash: ${{ secrets.TELEGRAM_API_HASH }} method: sendFile - path: Pilipala-CI/* + path: Pilipala-Beta/* parse_mode: Markdown context: "*Beta版本: v${{ needs.update_version.outputs.new_version }}*\n更新内容: [${{ needs.update_version.outputs.last_commit }}](${{ github.event.head_commit.url }})" diff --git a/.github/workflows/main.yml b/.github/workflows/release_ci.yml similarity index 100% rename from .github/workflows/main.yml rename to .github/workflows/release_ci.yml From 75f569cb79c25c284abdb2d98c6a669c06ab4eb7 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sun, 3 Mar 2024 00:15:16 +0800 Subject: [PATCH 150/220] =?UTF-8?q?mod:=20=E5=90=88=E9=9B=86=E5=B8=83?= =?UTF-8?q?=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/bangumi/widgets/bangumi_panel.dart | 83 +++++++++++------- .../detail/introduction/widgets/page.dart | 84 +++++++++++-------- .../detail/introduction/widgets/season.dart | 68 +++++++++------ 3 files changed, 147 insertions(+), 88 deletions(-) diff --git a/lib/pages/bangumi/widgets/bangumi_panel.dart b/lib/pages/bangumi/widgets/bangumi_panel.dart index 5996d6c8..05889f16 100644 --- a/lib/pages/bangumi/widgets/bangumi_panel.dart +++ b/lib/pages/bangumi/widgets/bangumi_panel.dart @@ -65,6 +65,45 @@ class _BangumiPanelState extends State { super.dispose(); } + Widget buildPageListItem( + EpisodeItem page, + int index, + bool isCurrentIndex, + ) { + Color primary = Theme.of(context).colorScheme.primary; + return ListTile( + onTap: () { + Get.back(); + setState(() { + changeFucCall(page, index); + }); + }, + dense: false, + leading: isCurrentIndex + ? Image.asset( + 'assets/images/live.gif', + color: primary, + height: 12, + ) + : null, + title: Text( + '第${index + 1}话 ${page.longTitle!}', + style: TextStyle( + fontSize: 14, + color: isCurrentIndex + ? primary + : Theme.of(context).colorScheme.onSurface, + ), + ), + trailing: page.badge != null + ? Image.asset( + 'assets/images/big-vip.png', + height: 20, + ) + : const SizedBox(), + ); + } + void showBangumiPanel() { showBottomSheet( context: context, @@ -106,37 +145,21 @@ class _BangumiPanelState extends State { child: Material( child: ScrollablePositionedList.builder( itemCount: widget.pages.length, - itemBuilder: (BuildContext context, int index) => - ListTile( - onTap: () { - setState(() { - changeFucCall(widget.pages[index], index); - }); - }, - dense: false, - leading: index == currentIndex - ? Image.asset( - 'assets/images/live.gif', - color: Theme.of(context).colorScheme.primary, - height: 12, + itemBuilder: (BuildContext context, int index) { + bool isLastItem = index == widget.pages.length - 1; + bool isCurrentIndex = currentIndex == index; + return isLastItem + ? SizedBox( + height: + MediaQuery.of(context).padding.bottom + + 20, ) - : null, - title: Text( - '第${index + 1}话 ${widget.pages[index].longTitle!}', - style: TextStyle( - fontSize: 14, - color: index == currentIndex - ? Theme.of(context).colorScheme.primary - : Theme.of(context).colorScheme.onSurface, - ), - ), - trailing: widget.pages[index].badge != null - ? Image.asset( - 'assets/images/big-vip.png', - height: 20, - ) - : const SizedBox(), - ), + : buildPageListItem( + widget.pages[index], + index, + isCurrentIndex, + ); + }, itemScrollController: itemScrollController, ), ), diff --git a/lib/pages/video/detail/introduction/widgets/page.dart b/lib/pages/video/detail/introduction/widgets/page.dart index 2ba7f507..8d296050 100644 --- a/lib/pages/video/detail/introduction/widgets/page.dart +++ b/lib/pages/video/detail/introduction/widgets/page.dart @@ -56,6 +56,37 @@ class _PagesPanelState extends State { super.dispose(); } + Widget buildEpisodeListItem( + Part episode, + int index, + bool isCurrentIndex, + ) { + Color primary = Theme.of(context).colorScheme.primary; + return ListTile( + onTap: () { + changeFucCall(episode, index); + Get.back(); + }, + dense: false, + leading: isCurrentIndex + ? Image.asset( + 'assets/images/live.gif', + color: primary, + height: 12, + ) + : null, + title: Text( + episode.pagePart!, + style: TextStyle( + fontSize: 14, + color: isCurrentIndex + ? primary + : Theme.of(context).colorScheme.onSurface, + ), + ), + ); + } + @override Widget build(BuildContext context) { return Column( @@ -131,39 +162,25 @@ class _PagesPanelState extends State { child: Material( child: ListView.builder( controller: _scrollController, - itemCount: episodes.length, + itemCount: episodes.length + 1, itemBuilder: (BuildContext context, int index) { - return ListTile( - onTap: () { - changeFucCall( - episodes[index], index); - Get.back(); - }, - dense: false, - leading: index == currentIndex - ? Image.asset( - 'assets/images/live.gif', - color: Theme.of(context) - .colorScheme - .primary, - height: 12, - ) - : null, - title: Text( - episodes[index].pagePart!, - style: TextStyle( - fontSize: 14, - color: index == currentIndex - ? Theme.of(context) - .colorScheme - .primary - : Theme.of(context) - .colorScheme - .onSurface, - ), - ), - ); + bool isLastItem = + index == episodes.length; + bool isCurrentIndex = + currentIndex == index; + return isLastItem + ? SizedBox( + height: MediaQuery.of(context) + .padding + .bottom + + 20, + ) + : buildEpisodeListItem( + episodes[index], + index, + isCurrentIndex, + ); }, ), ), @@ -192,6 +209,7 @@ class _PagesPanelState extends State { itemCount: widget.pages.length, itemExtent: 150, itemBuilder: (BuildContext context, int i) { + bool isCurrentIndex = currentIndex == i; return Container( width: 150, margin: const EdgeInsets.only(right: 10), @@ -206,7 +224,7 @@ class _PagesPanelState extends State { vertical: 8, horizontal: 8), child: Row( children: [ - if (i == currentIndex) ...[ + if (isCurrentIndex) ...[ Image.asset( 'assets/images/live.gif', color: Theme.of(context).colorScheme.primary, @@ -220,7 +238,7 @@ class _PagesPanelState extends State { maxLines: 1, style: TextStyle( fontSize: 13, - color: i == currentIndex + color: isCurrentIndex ? Theme.of(context).colorScheme.primary : Theme.of(context).colorScheme.onSurface), overflow: TextOverflow.ellipsis, diff --git a/lib/pages/video/detail/introduction/widgets/season.dart b/lib/pages/video/detail/introduction/widgets/season.dart index 9e5dd34f..c6a94398 100644 --- a/lib/pages/video/detail/introduction/widgets/season.dart +++ b/lib/pages/video/detail/introduction/widgets/season.dart @@ -80,6 +80,34 @@ class _SeasonPanelState extends State { super.dispose(); } + Widget buildEpisodeListItem( + EpisodeItem episode, + int index, + bool isCurrentIndex, + ) { + Color primary = Theme.of(context).colorScheme.primary; + return ListTile( + onTap: () => changeFucCall(episode, index), + dense: false, + leading: isCurrentIndex + ? Image.asset( + 'assets/images/live.gif', + color: primary, + height: 12, + ) + : null, + title: Text( + episode.title!, + style: TextStyle( + fontSize: 14, + color: isCurrentIndex + ? primary + : Theme.of(context).colorScheme.onSurface, + ), + ), + ); + } + @override Widget build(BuildContext context) { return Builder(builder: (BuildContext context) { @@ -134,32 +162,22 @@ class _SeasonPanelState extends State { child: Material( child: ScrollablePositionedList.builder( itemCount: episodes.length, - itemBuilder: (BuildContext context, int index) => - ListTile( - onTap: () => - changeFucCall(episodes[index], index), - dense: false, - leading: index == currentIndex - ? Image.asset( - 'assets/images/live.gif', - color: Theme.of(context) - .colorScheme - .primary, - height: 12, + itemBuilder: (BuildContext context, int index) { + bool isLastItem = index == episodes.length - 1; + bool isCurrentIndex = currentIndex == index; + return isLastItem + ? SizedBox( + height: MediaQuery.of(context) + .padding + .bottom + + 20, ) - : null, - title: Text( - episodes[index].title!, - style: TextStyle( - fontSize: 14, - color: index == currentIndex - ? Theme.of(context).colorScheme.primary - : Theme.of(context) - .colorScheme - .onSurface, - ), - ), - ), + : buildEpisodeListItem( + episodes[index], + index, + isCurrentIndex, + ); + }, itemScrollController: itemScrollController, ), ), From 800f714f4ac85e09bdb8b20c1896ff4270dabee7 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sun, 3 Mar 2024 00:52:47 +0800 Subject: [PATCH 151/220] =?UTF-8?q?mod:=20=E8=A7=86=E9=A2=91=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E9=A1=B5appBar?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/video/detail/view.dart | 76 ++++++++++++++++++++------------ 1 file changed, 47 insertions(+), 29 deletions(-) diff --git a/lib/pages/video/detail/view.dart b/lib/pages/video/detail/view.dart index b82d3e96..4bedcb37 100644 --- a/lib/pages/video/detail/view.dart +++ b/lib/pages/video/detail/view.dart @@ -5,6 +5,7 @@ import 'dart:ui'; import 'package:extended_nested_scroll_view/extended_nested_scroll_view.dart'; import 'package:floating/floating.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; +import 'package:font_awesome_flutter/font_awesome_flutter.dart'; import 'package:get/get.dart'; import 'package:flutter/material.dart'; import 'package:hive/hive.dart'; @@ -228,7 +229,6 @@ class _VideoDetailPageState extends State plPlayerController!.removeStatusLister(playerListener); plPlayerController!.pause(); } - print('🐶🐶'); setState(() => isShowing = false); super.didPushNext(); } @@ -406,7 +406,7 @@ class _VideoDetailPageState extends State ), ); } else { - return const SizedBox(); + return buildCustomAppBar(); } }, ), @@ -449,33 +449,7 @@ class _VideoDetailPageState extends State top: 0, left: 0, right: 0, - child: AppBar( - primary: false, - foregroundColor: - Colors.white, - elevation: 0, - scrolledUnderElevation: 0, - backgroundColor: - Colors.transparent, - actions: [ - IconButton( - tooltip: '稍后再看', - onPressed: () async { - var res = await UserHttp - .toViewLater( - bvid: videoDetailController - .bvid); - SmartDialog - .showToast( - res['msg']); - }, - icon: const Icon(Icons - .history_outlined), - ), - const SizedBox( - width: 14) - ], - ), + child: buildCustomAppBar(), ), Positioned( right: 12, @@ -657,4 +631,48 @@ class _VideoDetailPageState extends State return childWhenDisabled; } } + + Widget buildCustomAppBar() { + return AppBar( + backgroundColor: Colors.transparent, // 使背景透明 + foregroundColor: Colors.white, + elevation: 0, + scrolledUnderElevation: 0, + primary: false, + centerTitle: false, + automaticallyImplyLeading: false, + titleSpacing: 0, + title: Container( + height: kToolbarHeight, + padding: const EdgeInsets.symmetric(horizontal: 14), + decoration: const BoxDecoration( + gradient: LinearGradient( + begin: Alignment.bottomCenter, + end: Alignment.topCenter, + colors: [ + Colors.transparent, + Colors.black54, + ], + tileMode: TileMode.mirror, + )), + child: Row( + children: [ + ComBtn( + icon: const Icon(FontAwesomeIcons.arrowLeft, size: 15), + fuc: () => Get.back(), + ), + const Spacer(), + ComBtn( + icon: const Icon(Icons.history_outlined, size: 22), + fuc: () async { + var res = await UserHttp.toViewLater( + bvid: videoDetailController.bvid); + SmartDialog.showToast(res['msg']); + }, + ), + ], + ), + ), + ); + } } From caca16a9574df11de0301075a07f7ad51b5de73d Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sun, 3 Mar 2024 09:57:41 +0800 Subject: [PATCH 152/220] =?UTF-8?q?fix:=20=E5=8A=A8=E6=80=81=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2upPanel=E4=B8=8D=E5=88=B7=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/models/dynamics/up.dart | 21 ++++++++++++++++ lib/pages/dynamics/controller.dart | 4 +++ lib/pages/dynamics/widgets/up_panel.dart | 32 ++++++------------------ 3 files changed, 32 insertions(+), 25 deletions(-) diff --git a/lib/models/dynamics/up.dart b/lib/models/dynamics/up.dart index ce445acb..9bb82f70 100644 --- a/lib/models/dynamics/up.dart +++ b/lib/models/dynamics/up.dart @@ -3,11 +3,13 @@ class FollowUpModel { this.liveUsers, this.upList, this.liveList, + this.myInfo, }); LiveUsers? liveUsers; List? upList; List? liveList; + MyInfo? myInfo; FollowUpModel.fromJson(Map json) { liveUsers = json['live_users'] != null @@ -21,6 +23,7 @@ class FollowUpModel { upList = json['up_list'] != null ? json['up_list'].map((e) => UpItem.fromJson(e)).toList() : []; + myInfo = json['my_info'] != null ? MyInfo.fromJson(json['my_info']) : null; } } @@ -100,3 +103,21 @@ class UpItem { uname = json['uname']; } } + +class MyInfo { + MyInfo({ + this.face, + this.mid, + this.name, + }); + + String? face; + int? mid; + String? name; + + MyInfo.fromJson(Map json) { + face = json['face']; + mid = json['mid']; + name = json['name']; + } +} diff --git a/lib/pages/dynamics/controller.dart b/lib/pages/dynamics/controller.dart index 1d415aa4..b7676663 100644 --- a/lib/pages/dynamics/controller.dart +++ b/lib/pages/dynamics/controller.dart @@ -258,6 +258,10 @@ class DynamicsController extends GetxController { if (upData.value.upList!.isEmpty) { mid.value = -1; } + upData.value.upList!.insertAll(0, [ + UpItem(face: '', uname: '全部动态', mid: -1), + UpItem(face: userInfo.face, uname: '我', mid: userInfo.mid), + ]); } return res; } diff --git a/lib/pages/dynamics/widgets/up_panel.dart b/lib/pages/dynamics/widgets/up_panel.dart index ef0c3731..fd0ae642 100644 --- a/lib/pages/dynamics/widgets/up_panel.dart +++ b/lib/pages/dynamics/widgets/up_panel.dart @@ -1,16 +1,14 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:hive/hive.dart'; import 'package:pilipala/common/widgets/network_img_layer.dart'; import 'package:pilipala/models/dynamics/up.dart'; import 'package:pilipala/models/live/item.dart'; import 'package:pilipala/pages/dynamics/controller.dart'; import 'package:pilipala/utils/feed_back.dart'; -import 'package:pilipala/utils/storage.dart'; import 'package:pilipala/utils/utils.dart'; class UpPanel extends StatefulWidget { - final FollowUpModel? upData; + final FollowUpModel upData; const UpPanel(this.upData, {Key? key}) : super(key: key); @override @@ -24,33 +22,17 @@ class _UpPanelState extends State { List upList = []; List liveList = []; static const itemPadding = EdgeInsets.symmetric(horizontal: 5, vertical: 0); - Box userInfoCache = GStrorage.userInfo; - var userInfo; + late MyInfo userInfo; - @override - void initState() { - super.initState(); - upList = widget.upData!.upList!; - if (widget.upData!.liveList!.isNotEmpty) { - liveList = widget.upData!.liveList!; - } - upList.insert( - 0, - UpItem(face: '', uname: '全部动态', mid: -1), - ); - userInfo = userInfoCache.get('userInfoCache'); - upList.insert( - 1, - UpItem( - face: userInfo.face, - uname: '我', - mid: userInfo.mid, - ), - ); + void listFormat() { + userInfo = widget.upData.myInfo!; + upList = widget.upData.upList!; + liveList = widget.upData.liveList!; } @override Widget build(BuildContext context) { + listFormat(); return SliverPersistentHeader( floating: true, pinned: false, From 481fa0d934b8081bda433b85c2c4bbf71d49d644 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sun, 3 Mar 2024 11:09:52 +0800 Subject: [PATCH 153/220] =?UTF-8?q?feat:=20=E9=BB=98=E8=AE=A4=E5=90=AF?= =?UTF-8?q?=E5=8A=A8=E9=A1=B5=E8=AE=BE=E7=BD=AE=20issues=20#483?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/models/common/nav_bar_config.dart | 43 +++++++++++++++++++ lib/pages/main/controller.dart | 44 +++----------------- lib/pages/setting/controller.dart | 24 +++++++++++ lib/pages/setting/pages/home_tabbar_set.dart | 4 -- lib/pages/setting/style_setting.dart | 11 ++++- lib/utils/storage.dart | 3 +- 6 files changed, 84 insertions(+), 45 deletions(-) create mode 100644 lib/models/common/nav_bar_config.dart diff --git a/lib/models/common/nav_bar_config.dart b/lib/models/common/nav_bar_config.dart new file mode 100644 index 00000000..2d195e8b --- /dev/null +++ b/lib/models/common/nav_bar_config.dart @@ -0,0 +1,43 @@ +import 'package:flutter/material.dart'; + +const defaultNavigationBars = [ + { + 'id': 0, + 'icon': Icon( + Icons.home_outlined, + size: 21, + ), + 'selectIcon': Icon( + Icons.home, + size: 21, + ), + 'label': "首页", + 'count': 0, + }, + { + 'id': 1, + 'icon': Icon( + Icons.motion_photos_on_outlined, + size: 21, + ), + 'selectIcon': Icon( + Icons.motion_photos_on, + size: 21, + ), + 'label': "动态", + 'count': 0, + }, + { + 'id': 2, + 'icon': Icon( + Icons.video_collection_outlined, + size: 20, + ), + 'selectIcon': Icon( + Icons.video_collection, + size: 21, + ), + 'label': "媒体库", + 'count': 0, + } +]; diff --git a/lib/pages/main/controller.dart b/lib/pages/main/controller.dart index 6f33d9cd..f3bcb75a 100644 --- a/lib/pages/main/controller.dart +++ b/lib/pages/main/controller.dart @@ -12,6 +12,7 @@ import 'package:pilipala/pages/media/index.dart'; import 'package:pilipala/utils/storage.dart'; import 'package:pilipala/utils/utils.dart'; import '../../models/common/dynamic_badge_mode.dart'; +import '../../models/common/nav_bar_config.dart'; class MainController extends GetxController { List pages = [ @@ -19,44 +20,7 @@ class MainController extends GetxController { const DynamicsPage(), const MediaPage(), ]; - RxList navigationBars = [ - { - 'icon': const Icon( - Icons.home_outlined, - size: 21, - ), - 'selectIcon': const Icon( - Icons.home, - size: 21, - ), - 'label': "首页", - 'count': 0, - }, - { - 'icon': const Icon( - Icons.motion_photos_on_outlined, - size: 21, - ), - 'selectIcon': const Icon( - Icons.motion_photos_on, - size: 21, - ), - 'label': "动态", - 'count': 0, - }, - { - 'icon': const Icon( - Icons.video_collection_outlined, - size: 20, - ), - 'selectIcon': const Icon( - Icons.video_collection, - size: 21, - ), - 'label': "媒体库", - 'count': 0, - } - ].obs; + RxList navigationBars = defaultNavigationBars.obs; final StreamController bottomBarStream = StreamController.broadcast(); Box setting = GStrorage.setting; @@ -75,6 +39,10 @@ class MainController extends GetxController { Utils.checkUpdata(); } hideTabBar = setting.get(SettingBoxKey.hideTabBar, defaultValue: true); + int defaultHomePage = + setting.get(SettingBoxKey.defaultHomePage, defaultValue: 0) as int; + selectedIndex = defaultNavigationBars + .indexWhere((item) => item['id'] == defaultHomePage); var userInfo = userInfoCache.get('userInfoCache'); userLogin.value = userInfo != null; dynamicBadgeType.value = DynamicBadgeMode.values[setting.get( diff --git a/lib/pages/setting/controller.dart b/lib/pages/setting/controller.dart index 2e6680e5..1fbd7efb 100644 --- a/lib/pages/setting/controller.dart +++ b/lib/pages/setting/controller.dart @@ -8,6 +8,7 @@ import 'package:pilipala/utils/feed_back.dart'; import 'package:pilipala/utils/login.dart'; import 'package:pilipala/utils/storage.dart'; import '../../models/common/dynamic_badge_mode.dart'; +import '../../models/common/nav_bar_config.dart'; import '../main/index.dart'; import 'widgets/select_dialog.dart'; @@ -23,6 +24,7 @@ class SettingController extends GetxController { Rx themeType = ThemeType.system.obs; var userInfo; Rx dynamicBadgeType = DynamicBadgeMode.number.obs; + RxInt defaultHomePage = 0.obs; @override void onInit() { @@ -40,6 +42,8 @@ class SettingController extends GetxController { dynamicBadgeType.value = DynamicBadgeMode.values[setting.get( SettingBoxKey.dynamicBadgeMode, defaultValue: DynamicBadgeMode.number.code)]; + defaultHomePage.value = + setting.get(SettingBoxKey.defaultHomePage, defaultValue: 0); } loginOut() async { @@ -110,4 +114,24 @@ class SettingController extends GetxController { SmartDialog.showToast('设置成功'); } } + + // 设置默认启动页 + seteDefaultHomePage(BuildContext context) async { + int? result = await showDialog( + context: context, + builder: (context) { + return SelectDialog( + title: '首页启动页', + value: defaultHomePage.value, + values: defaultNavigationBars.map((e) { + return {'title': e['label'], 'value': e['id']}; + }).toList()); + }, + ); + if (result != null) { + defaultHomePage.value = result; + setting.put(SettingBoxKey.defaultHomePage, result); + SmartDialog.showToast('设置成功，重启生效'); + } + } } diff --git a/lib/pages/setting/pages/home_tabbar_set.dart b/lib/pages/setting/pages/home_tabbar_set.dart index 4cb3944c..63e87d02 100644 --- a/lib/pages/setting/pages/home_tabbar_set.dart +++ b/lib/pages/setting/pages/home_tabbar_set.dart @@ -40,10 +40,6 @@ class _TabbarSetPageState extends State { .where((i) => tabbarSort.contains((i['type'] as TabType).id)) .map((i) => (i['type'] as TabType).id) .toList(); - if (sortedTabbar.isEmpty) { - SmartDialog.showToast('请至少设置一项！'); - return; - } settingStorage.put(SettingBoxKey.tabbarSort, sortedTabbar); SmartDialog.showToast('保存成功，下次启动时生效'); } diff --git a/lib/pages/setting/style_setting.dart b/lib/pages/setting/style_setting.dart index 849123e5..30b9a30f 100644 --- a/lib/pages/setting/style_setting.dart +++ b/lib/pages/setting/style_setting.dart @@ -12,6 +12,7 @@ import 'package:pilipala/utils/global_data.dart'; import 'package:pilipala/utils/storage.dart'; import '../../models/common/dynamic_badge_mode.dart'; +import '../../models/common/nav_bar_config.dart'; import 'controller.dart'; import 'widgets/switch_item.dart'; @@ -29,7 +30,6 @@ class _StyleSettingState extends State { Box setting = GStrorage.setting; late int picQuality; - late double toastOpacity; late ThemeType _tempThemeValue; late dynamic defaultCustomRows; @@ -37,7 +37,6 @@ class _StyleSettingState extends State { void initState() { super.initState(); picQuality = setting.get(SettingBoxKey.defaultPicQa, defaultValue: 10); - toastOpacity = setting.get(SettingBoxKey.defaultToastOp, defaultValue: 1.0); _tempThemeValue = settingController.themeType.value; defaultCustomRows = setting.get(SettingBoxKey.customRows, defaultValue: 2); } @@ -267,6 +266,14 @@ class _StyleSettingState extends State { '当前主题：${colorSelectController.type.value == 0 ? '动态取色' : '指定颜色'}', style: subTitleStyle)), ), + ListTile( + dense: false, + onTap: () => settingController.seteDefaultHomePage(context), + title: Text('默认启动页', style: titleStyle), + subtitle: Obx(() => Text( + '当前启动页：${defaultNavigationBars.firstWhere((e) => e['id'] == settingController.defaultHomePage.value)['label']}', + style: subTitleStyle)), + ), ListTile( dense: false, onTap: () => Get.toNamed('/fontSizeSetting'), diff --git a/lib/utils/storage.dart b/lib/utils/storage.dart index 44beb4e7..fea31d56 100644 --- a/lib/utils/storage.dart +++ b/lib/utils/storage.dart @@ -130,7 +130,8 @@ class SettingBoxKey { enableWordRe = 'enableWordRe', enableSearchWord = 'enableSearchWord', enableSystemProxy = 'enableSystemProxy', - enableAi = 'enableAi'; + enableAi = 'enableAi', + defaultHomePage = 'defaultHomePage'; /// 外观 static const String themeMode = 'themeMode', From 19f0b1b28f400ef3b9cd7c4c8ae45caf4b3a5bfe Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sun, 3 Mar 2024 11:53:15 +0800 Subject: [PATCH 154/220] =?UTF-8?q?fix:=20=E5=8A=A8=E6=80=81=E4=B8=93?= =?UTF-8?q?=E6=A0=8F=E9=87=8D=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/dynamics/widgets/article_panel.dart | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/lib/pages/dynamics/widgets/article_panel.dart b/lib/pages/dynamics/widgets/article_panel.dart index e68d966d..19707435 100644 --- a/lib/pages/dynamics/widgets/article_panel.dart +++ b/lib/pages/dynamics/widgets/article_panel.dart @@ -34,25 +34,25 @@ Widget articlePanel(item, context, {floor = 1}) { ), const SizedBox(height: 8), ], - Text( - item.modules.moduleDynamic.major.opus.title, - style: Theme.of(context) - .textTheme - .titleMedium! - .copyWith(fontWeight: FontWeight.bold), - ), - const SizedBox(height: 2), - if (item.modules.moduleDynamic.major.opus.summary.text != - 'undefined') ...[ - Text( - item.modules.moduleDynamic.major.opus.summary.richTextNodes.first - .text, - maxLines: 4, - style: const TextStyle(height: 1.55), - overflow: TextOverflow.ellipsis, - ), - const SizedBox(height: 2), - ], + // Text( + // item.modules.moduleDynamic.major.opus.title, + // style: Theme.of(context) + // .textTheme + // .titleMedium! + // .copyWith(fontWeight: FontWeight.bold), + // ), + // const SizedBox(height: 2), + // if (item.modules.moduleDynamic.major.opus.summary.text != + // 'undefined') ...[ + // Text( + // item.modules.moduleDynamic.major.opus.summary.richTextNodes.first + // .text, + // maxLines: 4, + // style: const TextStyle(height: 1.55), + // overflow: TextOverflow.ellipsis, + // ), + // const SizedBox(height: 2), + // ], picWidget(item, context) ], ), From c20df8fd811bf578520b1c593b55c53ec91fda57 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sun, 3 Mar 2024 12:22:10 +0800 Subject: [PATCH 155/220] fix: enable pip --- lib/pages/video/detail/view.dart | 63 ++++++++------------------------ pubspec.lock | 2 +- 2 files changed, 16 insertions(+), 49 deletions(-) diff --git a/lib/pages/video/detail/view.dart b/lib/pages/video/detail/view.dart index febca105..6b9ef373 100644 --- a/lib/pages/video/detail/view.dart +++ b/lib/pages/video/detail/view.dart @@ -58,9 +58,7 @@ class _VideoDetailPageState extends State late bool autoExitFullcreen; late bool autoPlayEnable; late bool autoPiP; - final Floating floating = Floating(); - // 生命周期监听 - late final AppLifecycleListener _lifecycleListener; + late Floating floating; bool isShowing = true; @override @@ -91,8 +89,11 @@ class _VideoDetailPageState extends State videoSourceInit(); appbarStreamListen(); - lifecycleListener(); fullScreenStatusListener(); + if (Platform.isAndroid) { + floating = videoDetailController.floating!; + autoEnterPip(); + } } // 获取视频资源，初始化播放器 @@ -150,6 +151,10 @@ class _VideoDetailPageState extends State } } catch (_) {} } + if (Platform.isAndroid) { + floating.toggleAutoPip( + autoEnter: status == PlayerStatus.playing && autoPiP); + } } // 继续播放或重新播放 @@ -168,27 +173,6 @@ class _VideoDetailPageState extends State videoDetailController.isShowCover.value = false; } - // 生命周期监听 - void lifecycleListener() { - _lifecycleListener = AppLifecycleListener( - onResume: () => _handleTransition('resume'), - // 后台 - onInactive: () => _handleTransition('inactive'), - // 在Android和iOS端不生效 - onHide: () => _handleTransition('hide'), - onShow: () => _handleTransition('show'), - onPause: () => _handleTransition('pause'), - onRestart: () => _handleTransition('restart'), - onDetach: () => _handleTransition('detach'), - // 只作用于桌面端 - onExitRequested: () { - ScaffoldMessenger.maybeOf(context) - ?.showSnackBar(const SnackBar(content: Text("拦截应用退出"))); - return Future.value(AppExitResponse.cancel); - }, - ); - } - void fullScreenStatusListener() { plPlayerController?.isFullScreen.listen((bool isFullScreen) { if (isFullScreen) { @@ -208,8 +192,10 @@ class _VideoDetailPageState extends State videoDetailController.floating!.dispose(); } videoPlayerServiceHandler.onVideoDetailDispose(); - floating.dispose(); - _lifecycleListener.dispose(); + if (Platform.isAndroid) { + floating.toggleAutoPip(autoEnter: false); + floating.dispose(); + } super.dispose(); } @@ -262,29 +248,10 @@ class _VideoDetailPageState extends State .subscribe(this, ModalRoute.of(context)! as PageRoute); } - void _handleTransition(String name) { - switch (name) { - case 'inactive': - if (plPlayerController != null && - playerStatus == PlayerStatus.playing) { - autoEnterPip(); - } - break; - } - } - void autoEnterPip() { final String routePath = Get.currentRoute; - final bool isPortrait = - MediaQuery.of(context).orientation == Orientation.portrait; - - /// TODO 横屏全屏状态下误触pip - if (autoPiP && routePath.startsWith('/video') && isPortrait) { - floating.enable( - aspectRatio: Rational( - videoDetailController.data.dash!.video!.first.width!, - videoDetailController.data.dash!.video!.first.height!, - )); + if (autoPiP && routePath.startsWith('/video')) { + floating.toggleAutoPip(autoEnter: autoPiP); } } diff --git a/pubspec.lock b/pubspec.lock index f5d63ca9..bfef5f26 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -502,7 +502,7 @@ packages: description: path: "." ref: main - resolved-ref: d2d8421c4d80f6113f832404109853684721e11a + resolved-ref: "8e89669eb9341f9980265306e24ef96fdbd3fd08" url: "https://github.com/guozhigq/floating.git" source: git version: "2.0.1" From 8109314aaf4e70606bae6b14c147714c612542e4 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sun, 3 Mar 2024 15:20:59 +0800 Subject: [PATCH 156/220] =?UTF-8?q?opt:=20url=20scheme=E4=BC=98=E5=8C=96?= =?UTF-8?q?=20issues=20#581?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- android/app/src/main/AndroidManifest.xml | 4 + lib/utils/app_scheme.dart | 118 ++++++++++++++++------- lib/utils/id_utils.dart | 5 +- 3 files changed, 88 insertions(+), 39 deletions(-) diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index d82845fe..c52d8447 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -223,6 +223,10 @@ android:pathPattern="/mobile/video/.*" /> + + diff --git a/lib/utils/app_scheme.dart b/lib/utils/app_scheme.dart index 6820050c..bb9d556f 100644 --- a/lib/utils/app_scheme.dart +++ b/lib/utils/app_scheme.dart @@ -5,6 +5,7 @@ import 'package:get/get.dart'; import '../http/search.dart'; import '../models/common/search_type.dart'; import 'id_utils.dart'; +import 'url_utils.dart'; import 'utils.dart'; class PiliSchame { @@ -38,23 +39,16 @@ class PiliSchame { final String path = value.path; if (scheme == 'bilibili') { - // bilibili://root if (host == 'root') { Navigator.popUntil( Get.context!, (Route route) => route.isFirst); - } - - // bilibili://space/{uid} - else if (host == 'space') { + } else if (host == 'space') { final String mid = path.split('/').last; Get.toNamed( '/member?mid=$mid', arguments: {'face': null}, ); - } - - // bilibili://video/{aid} - else if (host == 'video') { + } else if (host == 'video') { String pathQuery = path.split('/').last; final numericRegex = RegExp(r'^[0-9]+$'); if (numericRegex.hasMatch(pathQuery)) { @@ -68,24 +62,16 @@ class PiliSchame { } else { SmartDialog.showToast('投稿匹配失败'); } - } - - // bilibili://live/{roomid} - else if (host == 'live') { + } else if (host == 'live') { final String roomId = path.split('/').last; Get.toNamed('/liveRoom?roomid=$roomId', arguments: {'liveItem': null, 'heroTag': roomId}); - } - - // bilibili://bangumi/season/${ssid} - else if (host == 'bangumi') { + } else if (host == 'bangumi') { if (path.startsWith('/season')) { final String seasonId = path.split('/').last; - _bangumiPush(int.parse(seasonId)); + _bangumiPush(int.parse(seasonId), null); } - } - // 专栏 bilibili://opus/detail/883089655985078289 - else if (host == 'opus') { + } else if (host == 'opus') { if (path.startsWith('/detail')) { var opusId = path.split('/').last; Get.toNamed( @@ -101,6 +87,9 @@ class PiliSchame { Get.toNamed('/searchResult', parameters: {'keyword': ''}); } } + if (scheme == 'https') { + _fullPathPush(value); + } } // 投稿跳转 @@ -131,10 +120,10 @@ class PiliSchame { } // 番剧跳转 - static Future _bangumiPush(int seasonId) async { + static Future _bangumiPush(int? seasonId, int? epId) async { SmartDialog.showLoading(msg: '获取中...'); try { - var result = await SearchHttp.bangumiInfo(seasonId: seasonId, epId: null); + var result = await SearchHttp.bangumiInfo(seasonId: seasonId, epId: epId); if (result['status']) { var bangumiDetail = result['data']; final int cid = bangumiDetail.episodes!.first.cid; @@ -151,6 +140,8 @@ class PiliSchame { }, ), ); + } else { + SmartDialog.showToast(result['msg']); } } catch (e) { SmartDialog.showToast('番剧获取失败：$e'); @@ -163,29 +154,67 @@ class PiliSchame { // final String scheme = value.scheme!; final String host = value.host!; final String? path = value.path; - // Map query = value.query!; - if (host.startsWith('live.bilibili')) { + Map? query = value.query; + RegExp regExp = RegExp(r'^(www\.)?m?\.(bilibili\.com)$'); + if (regExp.hasMatch(host)) { + print('bilibili.com'); + } else if (host.contains('live')) { int roomId = int.parse(path!.split('/').last); - // print('直播'); - Get.toNamed('/liveRoom?roomid=$roomId', - arguments: {'liveItem': null, 'heroTag': roomId.toString()}); - return; - } - if (host.startsWith('space.bilibili')) { - print('个人空间'); + Get.toNamed( + '/liveRoom?roomid=$roomId', + arguments: {'liveItem': null, 'heroTag': roomId.toString()}, + ); + } else if (host.contains('space')) { + var mid = path!.split('/').last; + Get.toNamed('/member?mid=$mid', arguments: {'face': ''}); return; + } else if (host == 'b23.tv') { + final String fullPath = 'https://$host$path'; + final String redirectUrl = await UrlUtils.parseRedirectUrl(fullPath); + final String pathSegment = Uri.parse(redirectUrl).path; + final String lastPathSegment = pathSegment.split('/').last; + final RegExp avRegex = RegExp(r'^[aA][vV]\d+', caseSensitive: false); + if (avRegex.hasMatch(lastPathSegment)) { + final Map map = + IdUtils.matchAvorBv(input: lastPathSegment); + if (map.containsKey('AV')) { + _videoPush(map['AV']! as int, null); + } else if (map.containsKey('BV')) { + _videoPush(null, map['BV'] as String); + } else { + SmartDialog.showToast('投稿匹配失败'); + } + } else if (lastPathSegment.startsWith('ep')) { + _handleEpisodePath(lastPathSegment, redirectUrl); + } else if (lastPathSegment.startsWith('ss')) { + _handleSeasonPath(lastPathSegment, redirectUrl); + } else if (lastPathSegment.startsWith('BV')) { + UrlUtils.matchUrlPush( + lastPathSegment, + '', + redirectUrl, + ); + } else { + Get.toNamed( + '/webview', + parameters: {'url': redirectUrl, 'type': 'url', 'pageTitle': ''}, + ); + } } if (path != null) { - final String area = path.split('/')[1]; + final String area = path.split('/').last; switch (area) { case 'bangumi': - // print('番剧'); - final String seasonId = path.split('/').last; - _bangumiPush(matchNum(seasonId).first); + print('番剧'); + if (area.startsWith('ep')) { + _bangumiPush(null, matchNum(area).first); + } else if (area.startsWith('ss')) { + _bangumiPush(matchNum(area).first, null); + } break; case 'video': - // print('投稿'); + print('投稿'); final Map map = IdUtils.matchAvorBv(input: path); if (map.containsKey('AV')) { _videoPush(map['AV']! as int, null); @@ -200,6 +229,7 @@ class PiliSchame { break; case 'space': print('个人空间'); + Get.toNamed('/member?mid=$area', arguments: {'face': ''}); break; } } @@ -211,4 +241,18 @@ class PiliSchame { return matches.map((Match match) => int.parse(match.group(0)!)).toList(); } + + static void _handleEpisodePath(String lastPathSegment, String redirectUrl) { + final String seasonId = _extractIdFromPath(lastPathSegment); + _bangumiPush(null, matchNum(seasonId).first); + } + + static void _handleSeasonPath(String lastPathSegment, String redirectUrl) { + final String seasonId = _extractIdFromPath(lastPathSegment); + _bangumiPush(matchNum(seasonId).first, null); + } + + static String _extractIdFromPath(String lastPathSegment) { + return lastPathSegment.split('/').last; + } } diff --git a/lib/utils/id_utils.dart b/lib/utils/id_utils.dart index 906f6348..7fefc268 100644 --- a/lib/utils/id_utils.dart +++ b/lib/utils/id_utils.dart @@ -68,8 +68,9 @@ class IdUtils { if (input == null || input.isEmpty) { return result; } - final RegExp bvRegex = RegExp(r'BV[0-9A-Za-z]{10}', caseSensitive: false); - final RegExp avRegex = RegExp(r'AV\d+', caseSensitive: false); + final RegExp bvRegex = + RegExp(r'[bB][vV][0-9A-Za-z]{10}', caseSensitive: false); + final RegExp avRegex = RegExp(r'[aA][vV]\d+', caseSensitive: false); final Iterable bvMatches = bvRegex.allMatches(input); final Iterable avMatches = avRegex.allMatches(input); From 83b0ff02e4ddbd62d06dad8f54721ad3cecbf833 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sun, 3 Mar 2024 18:32:13 +0800 Subject: [PATCH 157/220] =?UTF-8?q?fix:=20=E5=9B=BE=E7=89=87=E9=A2=84?= =?UTF-8?q?=E8=A7=88=E6=94=BE=E5=A4=A7=E3=80=81=E5=8F=96=E6=B6=88=E4=B8=8B?= =?UTF-8?q?=E6=BB=91=E5=85=B3=E9=97=AD=E5=9B=BE=E7=89=87=E9=A2=84=E8=A7=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/preview/view.dart | 272 ++++++++++++++++++------------------ 1 file changed, 138 insertions(+), 134 deletions(-) diff --git a/lib/pages/preview/view.dart b/lib/pages/preview/view.dart index dcffc973..13868d37 100644 --- a/lib/pages/preview/view.dart +++ b/lib/pages/preview/view.dart @@ -135,115 +135,103 @@ class _ImagePreviewState extends State ), body: Stack( children: [ - DismissiblePage( - backgroundColor: Colors.transparent, - onDismissed: () { - Navigator.of(context).pop(); - }, - // Note that scrollable widget inside DismissiblePage might limit the functionality - // If scroll direction matches DismissiblePage direction - direction: DismissiblePageDismissDirection.down, - disabled: _dismissDisabled, - isFullScreen: true, - child: GestureDetector( - onLongPress: () => onOpenMenu(), - child: ExtendedImageGesturePageView.builder( - controller: ExtendedPageController( - initialPage: _previewController.initialPage.value, - pageSpacing: 0, - ), - onPageChanged: (int index) => - _previewController.onChange(index), - canScrollPage: (GestureDetails? gestureDetails) => - gestureDetails!.totalScale! <= 1.0, - itemCount: widget.imgList!.length, - itemBuilder: (BuildContext context, int index) { - return ExtendedImage.network( - widget.imgList![index], - fit: BoxFit.contain, - mode: ExtendedImageMode.gesture, - onDoubleTap: (ExtendedImageGestureState state) { - final Offset? pointerDownPosition = - state.pointerDownPosition; - final double? begin = state.gestureDetails!.totalScale; - double end; - - //remove old - _doubleClickAnimation - ?.removeListener(_doubleClickAnimationListener); - - //stop pre - _doubleClickAnimationController.stop(); - - //reset to use - _doubleClickAnimationController.reset(); - - if (begin == doubleTapScales[0]) { - setState(() { - _dismissDisabled = true; - }); - end = doubleTapScales[1]; - } else { - setState(() { - _dismissDisabled = false; - }); - end = doubleTapScales[0]; - } - - _doubleClickAnimationListener = () { - state.handleDoubleTap( - scale: _doubleClickAnimation!.value, - doubleTapPosition: pointerDownPosition); - }; - _doubleClickAnimation = _doubleClickAnimationController - .drive(Tween(begin: begin, end: end)); - - _doubleClickAnimation! - .addListener(_doubleClickAnimationListener); - - _doubleClickAnimationController.forward(); - }, - // ignore: body_might_complete_normally_nullable - loadStateChanged: (ExtendedImageState state) { - if (state.extendedImageLoadState == LoadState.loading) { - final ImageChunkEvent? loadingProgress = - state.loadingProgress; - final double? progress = - loadingProgress?.expectedTotalBytes != null - ? loadingProgress!.cumulativeBytesLoaded / - loadingProgress.expectedTotalBytes! - : null; - return Center( - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - SizedBox( - width: 150.0, - child: LinearProgressIndicator( - value: progress, - color: Colors.white, - ), - ), - // const SizedBox(height: 10.0), - // Text('${((progress ?? 0.0) * 100).toInt()}%',), - ], - ), - ); - } - }, - initGestureConfigHandler: (ExtendedImageState state) { - return GestureConfig( - inPageView: true, - initialScale: 1.0, - maxScale: 5.0, - animationMaxScale: 6.0, - initialAlignment: InitialAlignment.center, - ); - }, - ); - }, + GestureDetector( + onLongPress: () => onOpenMenu(), + child: ExtendedImageGesturePageView.builder( + controller: ExtendedPageController( + initialPage: _previewController.initialPage.value, + pageSpacing: 0, ), + onPageChanged: (int index) => _previewController.onChange(index), + canScrollPage: (GestureDetails? gestureDetails) => + gestureDetails!.totalScale! <= 1.0, + itemCount: widget.imgList!.length, + itemBuilder: (BuildContext context, int index) { + return ExtendedImage.network( + widget.imgList![index], + fit: BoxFit.contain, + mode: ExtendedImageMode.gesture, + onDoubleTap: (ExtendedImageGestureState state) { + final Offset? pointerDownPosition = + state.pointerDownPosition; + final double? begin = state.gestureDetails!.totalScale; + double end; + + //remove old + _doubleClickAnimation + ?.removeListener(_doubleClickAnimationListener); + + //stop pre + _doubleClickAnimationController.stop(); + + //reset to use + _doubleClickAnimationController.reset(); + + if (begin == doubleTapScales[0]) { + setState(() { + _dismissDisabled = true; + }); + end = doubleTapScales[1]; + } else { + setState(() { + _dismissDisabled = false; + }); + end = doubleTapScales[0]; + } + + _doubleClickAnimationListener = () { + state.handleDoubleTap( + scale: _doubleClickAnimation!.value, + doubleTapPosition: pointerDownPosition); + }; + _doubleClickAnimation = _doubleClickAnimationController + .drive(Tween(begin: begin, end: end)); + + _doubleClickAnimation! + .addListener(_doubleClickAnimationListener); + + _doubleClickAnimationController.forward(); + }, + // ignore: body_might_complete_normally_nullable + loadStateChanged: (ExtendedImageState state) { + if (state.extendedImageLoadState == LoadState.loading) { + final ImageChunkEvent? loadingProgress = + state.loadingProgress; + final double? progress = + loadingProgress?.expectedTotalBytes != null + ? loadingProgress!.cumulativeBytesLoaded / + loadingProgress.expectedTotalBytes! + : null; + return Center( + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + SizedBox( + width: 150.0, + child: LinearProgressIndicator( + value: progress, + color: Colors.white, + ), + ), + // const SizedBox(height: 10.0), + // Text('${((progress ?? 0.0) * 100).toInt()}%',), + ], + ), + ); + } + }, + initGestureConfigHandler: (ExtendedImageState state) { + return GestureConfig( + inPageView: true, + initialScale: 1.0, + maxScale: 5.0, + animationMaxScale: 6.0, + initialAlignment: InitialAlignment.center, + ); + }, + ); + }, ), ), Positioned( @@ -251,33 +239,49 @@ class _ImagePreviewState extends State right: 0, bottom: 0, child: Container( - padding: EdgeInsets.only( - bottom: MediaQuery.of(context).padding.bottom + 30), - decoration: const BoxDecoration( - gradient: LinearGradient( - begin: Alignment.topCenter, - end: Alignment.bottomCenter, - colors: [ - Colors.transparent, - Colors.black87, + padding: EdgeInsets.only( + left: 20, + right: 20, + bottom: MediaQuery.of(context).padding.bottom + 30), + decoration: const BoxDecoration( + gradient: LinearGradient( + begin: Alignment.topCenter, + end: Alignment.bottomCenter, + colors: [ + Colors.transparent, + Colors.black87, + ], + tileMode: TileMode.mirror, + ), + ), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + widget.imgList!.length > 1 + ? Obx( + () => Text.rich( + textAlign: TextAlign.center, + TextSpan( + style: const TextStyle( + color: Colors.white, fontSize: 16), + children: [ + TextSpan( + text: _previewController.currentPage + .toString()), + const TextSpan(text: ' / '), + TextSpan( + text: + widget.imgList!.length.toString()), + ]), + ), + ) + : const SizedBox(), + IconButton( + onPressed: () => Get.back(), + icon: const Icon(Icons.close, color: Colors.white), + ), ], - tileMode: TileMode.mirror, - ), - ), - child: Obx( - () => Text.rich( - textAlign: TextAlign.center, - TextSpan( - style: const TextStyle(color: Colors.white, fontSize: 15), - children: [ - TextSpan( - text: _previewController.currentPage.toString()), - const TextSpan(text: ' / '), - TextSpan(text: widget.imgList!.length.toString()), - ]), - ), - ), - ), + )), ), ], ), From b248158e627add8e94242b2546645dbd291bcc24 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sun, 3 Mar 2024 19:48:10 +0800 Subject: [PATCH 158/220] =?UTF-8?q?v1.0.20=20=E6=9B=B4=E6=96=B0=E6=97=A5?= =?UTF-8?q?=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- change_log/1.0.20.0303.md | 31 +++++++++++++++++++++++++++++++ pubspec.yaml | 2 +- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 change_log/1.0.20.0303.md diff --git a/change_log/1.0.20.0303.md b/change_log/1.0.20.0303.md new file mode 100644 index 00000000..1d8c4e00 --- /dev/null +++ b/change_log/1.0.20.0303.md @@ -0,0 +1,31 @@ +## 1.0.20 + + +### 功能 ++ 评论区增加表情 ++ 首页渐变背景开关 ++ 媒体库显示「我的订阅」 ++ 评论区链接解析 ++ 默认启动页设置 + +### 修复 ++ 评论区内容重复 ++ pip相关问题 ++ 播放多p视频评论不刷新 ++ 视频评论翻页重复 + +### 优化 ++ url scheme优化 ++ 图片预览放大 ++ 图片加载速度 ++ 视频评论区复制 ++ 全屏显示视频标题 ++ 网络异常处理 + + + + + + +更多更新日志可在Github上查看 +问题反馈、功能建议请查看「关于」页面。 diff --git a/pubspec.yaml b/pubspec.yaml index 9597eab7..d261675a 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -16,7 +16,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html # In Windows, build-name is used as the major, minor, and patch parts # of the product and file versions while build-number is used as the build suffix. -version: 1.0.19+1019 +version: 1.0.20+1020 environment: sdk: ">=2.19.6 <3.0.0" From f1b829cec1f330eb9ab790c1e3d8bc6558067025 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Mon, 4 Mar 2024 08:29:01 +0800 Subject: [PATCH 159/220] =?UTF-8?q?fix:=20=E9=A6=96=E9=A1=B5tarbar?= =?UTF-8?q?=E6=8C=87=E7=A4=BA=E5=99=A8=E8=B7=B3=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/home/controller.dart | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/lib/pages/home/controller.dart b/lib/pages/home/controller.dart index 9f6f8ac5..6113d901 100644 --- a/lib/pages/home/controller.dart +++ b/lib/pages/home/controller.dart @@ -91,19 +91,21 @@ class HomeController extends GetxController with GetTickerProviderStateMixin { vsync: this, ); // 监听 tabController 切换 - tabController.animation!.addListener(() { - if (tabController.indexIsChanging) { - if (initialIndex.value != tabController.index) { - initialIndex.value = tabController.index; + if (enableGradientBg) { + tabController.animation!.addListener(() { + if (tabController.indexIsChanging) { + if (initialIndex.value != tabController.index) { + initialIndex.value = tabController.index; + } + } else { + final int temp = tabController.animation!.value.round(); + if (initialIndex.value != temp) { + initialIndex.value = temp; + tabController.index = initialIndex.value; + } } - } else { - final int temp = tabController.animation!.value.round(); - if (initialIndex.value != temp) { - initialIndex.value = temp; - tabController.index = initialIndex.value; - } - } - }); + }); + } } void searchDefault() async { From eb4435045b35074ba2f8768359e2b6c0b05a540d Mon Sep 17 00:00:00 2001 From: guozhigq Date: Mon, 4 Mar 2024 23:48:01 +0800 Subject: [PATCH 160/220] =?UTF-8?q?fix:=20=E7=95=AA=E5=89=A7=E5=85=A8?= =?UTF-8?q?=E5=B1=8F=E6=97=B6title=E5=8F=96=E5=80=BC=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/video/detail/controller.dart | 1 + lib/pages/video/detail/view.dart | 1 + lib/pages/video/detail/widgets/header_control.dart | 11 ++++++++--- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/lib/pages/video/detail/controller.dart b/lib/pages/video/detail/controller.dart index d590cea9..b4005b5a 100644 --- a/lib/pages/video/detail/controller.dart +++ b/lib/pages/video/detail/controller.dart @@ -129,6 +129,7 @@ class VideoDetailController extends GetxController videoDetailCtr: this, floating: floating, bvid: bvid, + videoType: videoType, ); // CDN优化 enableCDN = setting.get(SettingBoxKey.enableCDN, defaultValue: true); diff --git a/lib/pages/video/detail/view.dart b/lib/pages/video/detail/view.dart index 0c432129..04d41b2e 100644 --- a/lib/pages/video/detail/view.dart +++ b/lib/pages/video/detail/view.dart @@ -572,6 +572,7 @@ class _VideoDetailPageState extends State controller: plPlayerController, videoDetailCtr: videoDetailController, bvid: videoDetailController.bvid, + videoType: videoDetailController.videoType, ), danmuWidget: Obx( () => PlDanmaku( diff --git a/lib/pages/video/detail/widgets/header_control.dart b/lib/pages/video/detail/widgets/header_control.dart index e2e4db8c..03f7ff7f 100644 --- a/lib/pages/video/detail/widgets/header_control.dart +++ b/lib/pages/video/detail/widgets/header_control.dart @@ -19,6 +19,7 @@ import 'package:pilipala/plugin/pl_player/models/play_repeat.dart'; import 'package:pilipala/utils/storage.dart'; import 'package:pilipala/http/danmaku.dart'; import 'package:pilipala/services/shutdown_timer_service.dart'; +import '../../../../models/common/search_type.dart'; import '../../../../models/video_detail_res.dart'; import '../introduction/index.dart'; @@ -28,12 +29,14 @@ class HeaderControl extends StatefulWidget implements PreferredSizeWidget { this.videoDetailCtr, this.floating, this.bvid, + this.videoType, super.key, }); final PlPlayerController? controller; final VideoDetailController? videoDetailCtr; final Floating? floating; final String? bvid; + final SearchType? videoType; @override State createState() => _HeaderControlState(); @@ -1107,14 +1110,16 @@ class _HeaderControlState extends State { }, ), SizedBox(width: buttonSpace), - if (showTitle && isLandscape) ...[ + if (showTitle && + isLandscape && + widget.videoType == SearchType.video) ...[ Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ ConstrainedBox( - constraints: BoxConstraints(maxWidth: 200), + constraints: const BoxConstraints(maxWidth: 200), child: Text( - videoIntroController.videoDetail.value.title!, + videoIntroController.videoDetail.value.title ?? '', style: const TextStyle( color: Colors.white, fontSize: 16, From 32cdb27f7c3ebfb8c9c94ee4a399b9d1e7b3f869 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Tue, 5 Mar 2024 22:37:52 +0800 Subject: [PATCH 161/220] =?UTF-8?q?fix:=20enableGradientBg=E6=9C=AA?= =?UTF-8?q?=E5=AE=9A=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/home/controller.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/pages/home/controller.dart b/lib/pages/home/controller.dart index 6113d901..fb85be0b 100644 --- a/lib/pages/home/controller.dart +++ b/lib/pages/home/controller.dart @@ -34,8 +34,6 @@ class HomeController extends GetxController with GetTickerProviderStateMixin { userInfo = userInfoCache.get('userInfoCache'); userLogin.value = userInfo != null; userFace.value = userInfo != null ? userInfo.face : ''; - // 进行tabs配置 - setTabConfig(); hideSearchBar = setting.get(SettingBoxKey.hideSearchBar, defaultValue: true); if (setting.get(SettingBoxKey.enableSearchWord, defaultValue: true)) { @@ -43,6 +41,8 @@ class HomeController extends GetxController with GetTickerProviderStateMixin { } enableGradientBg = setting.get(SettingBoxKey.enableGradientBg, defaultValue: true); + // 进行tabs配置 + setTabConfig(); } void onRefresh() { From fea70011cb1c2595bd125394f9894bb5946b3898 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Tue, 5 Mar 2024 23:01:23 +0800 Subject: [PATCH 162/220] fix: navBars unmodifiable issues #612 --- lib/models/common/nav_bar_config.dart | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/models/common/nav_bar_config.dart b/lib/models/common/nav_bar_config.dart index 2d195e8b..7fb22e48 100644 --- a/lib/models/common/nav_bar_config.dart +++ b/lib/models/common/nav_bar_config.dart @@ -1,13 +1,13 @@ import 'package:flutter/material.dart'; -const defaultNavigationBars = [ +List defaultNavigationBars = [ { 'id': 0, - 'icon': Icon( + 'icon': const Icon( Icons.home_outlined, size: 21, ), - 'selectIcon': Icon( + 'selectIcon': const Icon( Icons.home, size: 21, ), @@ -16,11 +16,11 @@ const defaultNavigationBars = [ }, { 'id': 1, - 'icon': Icon( + 'icon': const Icon( Icons.motion_photos_on_outlined, size: 21, ), - 'selectIcon': Icon( + 'selectIcon': const Icon( Icons.motion_photos_on, size: 21, ), @@ -29,11 +29,11 @@ const defaultNavigationBars = [ }, { 'id': 2, - 'icon': Icon( + 'icon': const Icon( Icons.video_collection_outlined, size: 20, ), - 'selectIcon': Icon( + 'selectIcon': const Icon( Icons.video_collection, size: 21, ), From 3fad86e7e33db6861b6a6c0a1ff417c8a4bbf886 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Tue, 5 Mar 2024 23:04:59 +0800 Subject: [PATCH 163/220] =?UTF-8?q?fix:=20=E8=A7=86=E9=A2=91=E7=AE=80?= =?UTF-8?q?=E4=BB=8B=E8=A2=AB=E9=81=AE=E6=8C=A1=20issues=20#613?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../video/detail/introduction/widgets/intro_detail.dart | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/pages/video/detail/introduction/widgets/intro_detail.dart b/lib/pages/video/detail/introduction/widgets/intro_detail.dart index 59ed10a3..c74e27ee 100644 --- a/lib/pages/video/detail/introduction/widgets/intro_detail.dart +++ b/lib/pages/video/detail/introduction/widgets/intro_detail.dart @@ -23,7 +23,10 @@ class IntroDetail extends StatelessWidget { sheetHeight = localCache.get('sheetHeight'); return Container( color: Theme.of(context).colorScheme.background, - padding: const EdgeInsets.only(left: 14, right: 14), + padding: EdgeInsets.only( + left: 14, + right: 14, + bottom: MediaQuery.of(context).padding.bottom + 20), height: sheetHeight, child: Column( children: [ From 12e947ef849490fca3204857dccb7b4b8382352d Mon Sep 17 00:00:00 2001 From: guozhigq Date: Tue, 5 Mar 2024 23:21:51 +0800 Subject: [PATCH 164/220] fix: reply callback null error issues #615 --- lib/pages/video/detail/reply/widgets/reply_item.dart | 6 +++--- lib/pages/video/detail/reply_reply/view.dart | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/pages/video/detail/reply/widgets/reply_item.dart b/lib/pages/video/detail/reply/widgets/reply_item.dart index c55380f2..174cfabb 100644 --- a/lib/pages/video/detail/reply/widgets/reply_item.dart +++ b/lib/pages/video/detail/reply/widgets/reply_item.dart @@ -280,7 +280,7 @@ class ReplyItem extends StatelessWidget { // 完成评论，数据添加 if (value != null && value['data'] != null) { - addReply!(value['data']) + addReply?.call(value['data']) // replyControl.replies.add(value['data']), } }); @@ -531,8 +531,8 @@ InlineSpan buildContent( spanChilds.add(TextSpan( text: str, recognizer: TapGestureRecognizer() - ..onTap = - () => replyReply(replyItem.root == 0 ? replyItem : fReplyItem))); + ..onTap = () => + replyReply?.call(replyItem.root == 0 ? replyItem : fReplyItem))); } // 分割文本并处理每个部分 diff --git a/lib/pages/video/detail/reply_reply/view.dart b/lib/pages/video/detail/reply_reply/view.dart index c08c81cc..820a69ec 100644 --- a/lib/pages/video/detail/reply_reply/view.dart +++ b/lib/pages/video/detail/reply_reply/view.dart @@ -92,7 +92,7 @@ class _VideoReplyReplyPanelState extends State { icon: const Icon(Icons.close, size: 20), onPressed: () { _videoReplyReplyController.currentPage = 0; - widget.closePanel!(); + widget.closePanel?.call; Navigator.pop(context); }, ), @@ -184,6 +184,8 @@ class _VideoReplyReplyPanelState extends State { .add(replyItem); }, replyType: widget.replyType, + replyReply: (replyItem) => + replyReply(replyItem), ); } }, From d728b1fb6d74ee535b57f1ca0dc87f056789387c Mon Sep 17 00:00:00 2001 From: guozhigq Date: Tue, 5 Mar 2024 23:39:05 +0800 Subject: [PATCH 165/220] =?UTF-8?q?mod:=20=E8=AF=84=E8=AE=BA=E5=8C=BA?= =?UTF-8?q?=E9=9D=9E=E6=AD=A3=E5=B8=B8=E5=9C=B0=E5=9D=80=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../detail/reply/widgets/reply_item.dart | 5 ++++ lib/utils/url_utils.dart | 24 +++++++++++-------- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/lib/pages/video/detail/reply/widgets/reply_item.dart b/lib/pages/video/detail/reply/widgets/reply_item.dart index 174cfabb..f9f695d4 100644 --- a/lib/pages/video/detail/reply/widgets/reply_item.dart +++ b/lib/pages/video/detail/reply/widgets/reply_item.dart @@ -642,6 +642,11 @@ InlineSpan buildContent( } else { final String redirectUrl = await UrlUtils.parseRedirectUrl(matchStr); + if (redirectUrl == matchStr) { + Clipboard.setData(ClipboardData(text: matchStr)); + SmartDialog.showToast('地址可能有误'); + return; + } final String pathSegment = Uri.parse(redirectUrl).path; final String lastPathSegment = pathSegment.split('/').last; diff --git a/lib/utils/url_utils.dart b/lib/utils/url_utils.dart index bac6cdfa..cf0ef9e2 100644 --- a/lib/utils/url_utils.dart +++ b/lib/utils/url_utils.dart @@ -14,19 +14,23 @@ class UrlUtils { dio.options.validateStatus = (status) { return status == 200 || status == 301 || status == 302; }; - final response = await dio.get(url); - if (response.statusCode == 302) { - redirectUrl = response.headers['location']?.first as String; - if (redirectUrl.endsWith('/')) { - redirectUrl = redirectUrl.substring(0, redirectUrl.length - 1); - } - } else { - if (url.endsWith('/')) { - url = url.substring(0, url.length - 1); + try { + final response = await dio.get(url); + if (response.statusCode == 302) { + redirectUrl = response.headers['location']?.first as String; + if (redirectUrl.endsWith('/')) { + redirectUrl = redirectUrl.substring(0, redirectUrl.length - 1); + } + } else { + if (url.endsWith('/')) { + url = url.substring(0, url.length - 1); + } + return url; } + return redirectUrl; + } catch (err) { return url; } - return redirectUrl; } // 匹配url路由跳转 From ab9ae3a48147af32b5a7cd96e80d955b6cc45f76 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Wed, 6 Mar 2024 00:04:52 +0800 Subject: [PATCH 166/220] =?UTF-8?q?fix:=20setState()=20called=20after=20di?= =?UTF-8?q?spose()=20=E5=AF=BC=E8=87=B4=E5=85=A8=E5=B1=8F=E5=A4=B1?= =?UTF-8?q?=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/video/detail/widgets/header_control.dart | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/pages/video/detail/widgets/header_control.dart b/lib/pages/video/detail/widgets/header_control.dart index 03f7ff7f..e72e6a69 100644 --- a/lib/pages/video/detail/widgets/header_control.dart +++ b/lib/pages/video/detail/widgets/header_control.dart @@ -79,7 +79,11 @@ class _HeaderControlState extends State { } else { showTitle = false; } - setState(() {}); + + /// TODO setState() called after dispose() + if (mounted) { + setState(() {}); + } }); } From ed0b43eff1f6043fe00e54c141053bd7ab336794 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Wed, 6 Mar 2024 23:29:18 +0800 Subject: [PATCH 167/220] =?UTF-8?q?v1.0.21=20=E6=9B=B4=E6=96=B0=E6=97=A5?= =?UTF-8?q?=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- change_log/1.0.21.0306.md | 9 +++++++++ pubspec.yaml | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 change_log/1.0.21.0306.md diff --git a/change_log/1.0.21.0306.md b/change_log/1.0.21.0306.md new file mode 100644 index 00000000..3a582dbb --- /dev/null +++ b/change_log/1.0.21.0306.md @@ -0,0 +1,9 @@ +## 1.0.21 + +### 修复 ++ 推荐视频全屏问题 ++ 番剧全屏播放时灰屏问题 ++ 评论回调导致页面卡死问题 + +更多更新日志可在Github上查看 +问题反馈、功能建议请查看「关于」页面。 diff --git a/pubspec.yaml b/pubspec.yaml index d261675a..a5d103f6 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -16,7 +16,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html # In Windows, build-name is used as the major, minor, and patch parts # of the product and file versions while build-number is used as the build suffix. -version: 1.0.20+1020 +version: 1.0.21+1021 environment: sdk: ">=2.19.6 <3.0.0" From ab24da5f55a4ba0322fbd97a7a0dd60b7c7dfc8a Mon Sep 17 00:00:00 2001 From: guozhigq Date: Thu, 7 Mar 2024 23:35:39 +0800 Subject: [PATCH 168/220] =?UTF-8?q?fix:=20=E5=AA=92=E4=BD=93=E9=80=9A?= =?UTF-8?q?=E7=9F=A5=E8=BF=9B=E5=BA=A6=E6=9D=A1=E6=9C=AA=E6=8C=89=E9=A2=84?= =?UTF-8?q?=E6=9C=9F=E5=81=9C=E6=AD=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/plugin/pl_player/controller.dart | 7 ++++--- lib/services/audio_handler.dart | 7 ++++--- lib/services/audio_session.dart | 4 ++-- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/lib/plugin/pl_player/controller.dart b/lib/plugin/pl_player/controller.dart index dfa580ab..b4b37cea 100644 --- a/lib/plugin/pl_player/controller.dart +++ b/lib/plugin/pl_player/controller.dart @@ -277,8 +277,7 @@ class PlPlayerController { danmakuDurationVal = localCache.get(LocalCacheKey.danmakuDuration, defaultValue: 4.0); // 描边粗细 - strokeWidth = - localCache.get(LocalCacheKey.strokeWidth, defaultValue: 1.5); + strokeWidth = localCache.get(LocalCacheKey.strokeWidth, defaultValue: 1.5); playRepeat = PlayRepeat.values.toList().firstWhere( (e) => e.value == @@ -535,8 +534,10 @@ class PlPlayerController { if (event) { playerStatus.status.value = PlayerStatus.playing; } else { - // playerStatus.status.value = PlayerStatus.paused; + playerStatus.status.value = PlayerStatus.paused; } + videoPlayerServiceHandler.onStatusChange( + playerStatus.status.value, isBuffering.value); /// 触发回调事件 for (var element in _statusListeners) { diff --git a/lib/services/audio_handler.dart b/lib/services/audio_handler.dart index 0b37d419..bf98298b 100644 --- a/lib/services/audio_handler.dart +++ b/lib/services/audio_handler.dart @@ -26,6 +26,7 @@ class VideoPlayerServiceHandler extends BaseAudioHandler with SeekHandler { static final List _item = []; Box setting = GStrorage.setting; bool enableBackgroundPlay = false; + PlPlayerController player = PlPlayerController.getInstance(); VideoPlayerServiceHandler() { revalidateSetting(); @@ -38,12 +39,12 @@ class VideoPlayerServiceHandler extends BaseAudioHandler with SeekHandler { @override Future play() async { - PlPlayerController.getInstance().play(); + player.play(); } @override Future pause() async { - PlPlayerController.getInstance().pause(); + player.pause(); } @override @@ -51,7 +52,7 @@ class VideoPlayerServiceHandler extends BaseAudioHandler with SeekHandler { playbackState.add(playbackState.value.copyWith( updatePosition: position, )); - await PlPlayerController.getInstance().seekTo(position); + await player.seekTo(position); } Future setMediaItem(MediaItem newMediaItem) async { diff --git a/lib/services/audio_session.dart b/lib/services/audio_session.dart index 57c42e05..ea83a30a 100644 --- a/lib/services/audio_session.dart +++ b/lib/services/audio_session.dart @@ -20,7 +20,7 @@ class AudioSessionHandler { session.interruptionEventStream.listen((event) { final player = PlPlayerController.getInstance(); if (event.begin) { - if (player.playerStatus != PlayerStatus.playing) return; + if (!player.playerStatus.playing) return; switch (event.type) { case AudioInterruptionType.duck: player.setVolume(player.volume.value * 0.5); @@ -52,7 +52,7 @@ class AudioSessionHandler { // 耳机拔出暂停 session.becomingNoisyEventStream.listen((_) { final player = PlPlayerController.getInstance(); - if (player.playerStatus == PlayerStatus.playing) { + if (player.playerStatus.playing) { player.pause(); } }); From 3bf6136bc67f6d1dfbc50c43ef84ca98b07fdf03 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Fri, 8 Mar 2024 00:03:34 +0800 Subject: [PATCH 169/220] =?UTF-8?q?fix:=20=E6=A5=BC=E4=B8=AD=E6=A5=BC?= =?UTF-8?q?=E8=AF=84=E8=AE=BA=E8=AF=B7=E6=B1=82=E9=87=8D=E5=A4=8D=20#284?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../video/detail/reply_reply/controller.dart | 20 ++++--------------- lib/pages/video/detail/reply_reply/view.dart | 3 ++- 2 files changed, 6 insertions(+), 17 deletions(-) diff --git a/lib/pages/video/detail/reply_reply/controller.dart b/lib/pages/video/detail/reply_reply/controller.dart index 6daa0b8a..e94aaea5 100644 --- a/lib/pages/video/detail/reply_reply/controller.dart +++ b/lib/pages/video/detail/reply_reply/controller.dart @@ -30,6 +30,9 @@ class VideoReplyReplyController extends GetxController { if (type == 'init') { currentPage = 0; } + if (isLoadingMore) { + return; + } isLoadingMore = true; final res = await ReplyHttp.replyReplyList( oid: aid!, @@ -41,7 +44,7 @@ class VideoReplyReplyController extends GetxController { final List replies = res['data'].replies; if (replies.isNotEmpty) { noMore.value = '加载中...'; - if (replyList.length == res['data'].page.count) { + if (replies.length == res['data'].page.count) { noMore.value = '没有更多了'; } currentPage++; @@ -50,21 +53,6 @@ class VideoReplyReplyController extends GetxController { noMore.value = currentPage == 0 ? '还没有评论' : '没有更多了'; } if (type == 'init') { - // List replies = res['data'].replies; - // 添加置顶回复 - // if (res['data'].upper.top != null) { - // bool flag = false; - // for (var i = 0; i < res['data'].topReplies.length; i++) { - // if (res['data'].topReplies[i].rpid == res['data'].upper.top.rpid) { - // flag = true; - // } - // } - // if (!flag) { - // replies.insert(0, res['data'].upper.top); - // } - // } - // replies.insertAll(0, res['data'].topReplies); - // res['data'].replies = replies; replyList.value = replies; } else { // 每次回复之后，翻页请求有且只有相同的一条回复数据 diff --git a/lib/pages/video/detail/reply_reply/view.dart b/lib/pages/video/detail/reply_reply/view.dart index 820a69ec..e8754a31 100644 --- a/lib/pages/video/detail/reply_reply/view.dart +++ b/lib/pages/video/detail/reply_reply/view.dart @@ -54,7 +54,8 @@ class _VideoReplyReplyPanelState extends State { () { if (scrollController.position.pixels >= scrollController.position.maxScrollExtent - 300) { - EasyThrottle.throttle('replylist', const Duration(seconds: 2), () { + EasyThrottle.throttle('replylist', const Duration(milliseconds: 200), + () { _videoReplyReplyController.queryReplyList(type: 'onLoad'); }); } From 105a29f311e363ce0d4e529f269047cea522847e Mon Sep 17 00:00:00 2001 From: guozhigq Date: Fri, 8 Mar 2024 22:56:16 +0800 Subject: [PATCH 170/220] feat: disable Battery Optimization --- lib/main.dart | 2 ++ lib/services/disable_battery_opt.dart | 40 +++++++++++++++++++++++++++ lib/utils/storage.dart | 4 +++ pubspec.lock | 8 ++++++ pubspec.yaml | 2 ++ 5 files changed, 56 insertions(+) create mode 100644 lib/services/disable_battery_opt.dart diff --git a/lib/main.dart b/lib/main.dart index fc2149de..44bb1dcd 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -16,6 +16,7 @@ import 'package:pilipala/pages/search/index.dart'; import 'package:pilipala/pages/video/detail/index.dart'; import 'package:pilipala/router/app_pages.dart'; import 'package:pilipala/pages/main/view.dart'; +import 'package:pilipala/services/disable_battery_opt.dart'; import 'package:pilipala/services/service_locator.dart'; import 'package:pilipala/utils/app_scheme.dart'; import 'package:pilipala/utils/data.dart'; @@ -71,6 +72,7 @@ void main() async { )); Data.init(); PiliSchame.init(); + DisableBatteryOpt(); }); } diff --git a/lib/services/disable_battery_opt.dart b/lib/services/disable_battery_opt.dart new file mode 100644 index 00000000..ae018977 --- /dev/null +++ b/lib/services/disable_battery_opt.dart @@ -0,0 +1,40 @@ +import 'dart:io'; + +import 'package:disable_battery_optimization/disable_battery_optimization.dart'; +import 'package:pilipala/utils/storage.dart'; + +void DisableBatteryOpt() async { + if (!Platform.isAndroid) { + return; + } + // 本地缓存中读取 是否禁用了电池优化 默认未禁用 + bool isDisableBatteryOptLocal = + GStrorage.localCache.get('isDisableBatteryOptLocal', defaultValue: false); + if (!isDisableBatteryOptLocal) { + final isBatteryOptimizationDisabled = + await DisableBatteryOptimization.isBatteryOptimizationDisabled; + if (isBatteryOptimizationDisabled == false) { + final hasDisabled = await DisableBatteryOptimization + .showDisableBatteryOptimizationSettings(); + // 设置为已禁用 + GStrorage.localCache.put('isDisableBatteryOptLocal', hasDisabled == true); + } + } + + bool isManufacturerBatteryOptimizationDisabled = GStrorage.localCache + .get('isManufacturerBatteryOptimizationDisabled', defaultValue: false); + if (!isManufacturerBatteryOptimizationDisabled) { + final isManBatteryOptimizationDisabled = await DisableBatteryOptimization + .isManufacturerBatteryOptimizationDisabled; + if (isManBatteryOptimizationDisabled == false) { + final hasDisabled = await DisableBatteryOptimization + .showDisableManufacturerBatteryOptimizationSettings( + "当前设备可能有额外的电池优化", + "按照步骤操作以禁用电池优化，以保证应用在后台正常运行", + ); + // 设置为已禁用 + GStrorage.localCache.put( + 'isManufacturerBatteryOptimizationDisabled', hasDisabled == true); + } + } +} diff --git a/lib/utils/storage.dart b/lib/utils/storage.dart index fea31d56..44a3c3d7 100644 --- a/lib/utils/storage.dart +++ b/lib/utils/storage.dart @@ -170,6 +170,10 @@ class LocalCacheKey { // 代理host port systemProxyHost = 'systemProxyHost', systemProxyPort = 'systemProxyPort'; + + static const String isDisableBatteryOptLocal = 'isDisableBatteryOptLocal', + isManufacturerBatteryOptimizationDisabled = + 'isManufacturerBatteryOptimizationDisabled'; } class VideoBoxKey { diff --git a/pubspec.lock b/pubspec.lock index bfef5f26..8972ef45 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -393,6 +393,14 @@ packages: url: "https://pub.flutter-io.cn" source: hosted version: "2.4.0" + disable_battery_optimization: + dependency: "direct main" + description: + name: disable_battery_optimization + sha256: "6b2ba802f984af141faf1b6b5fb956d5ef01f9cd555597c35b9cc335a03185ba" + url: "https://pub.flutter-io.cn" + source: hosted + version: "1.1.1" dismissible_page: dependency: "direct main" description: diff --git a/pubspec.yaml b/pubspec.yaml index a5d103f6..5c25f044 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -140,6 +140,8 @@ dependencies: catcher_2: ^1.1.0 logger: ^2.0.2+1 path: 1.8.3 + # 电池优化 + disable_battery_optimization: ^1.1.1 dev_dependencies: flutter_test: From f41bb02bae23284a7b8c15a4b7b667ce4c46f1d3 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Fri, 8 Mar 2024 23:05:09 +0800 Subject: [PATCH 171/220] =?UTF-8?q?fix:=20=E5=90=88=E9=9B=86=E6=9C=80?= =?UTF-8?q?=E5=90=8E=E4=B8=80p=E4=B8=8D=E6=98=BE=E7=A4=BA=20issues=20#620?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/bangumi/widgets/bangumi_panel.dart | 4 ++-- lib/pages/video/detail/introduction/widgets/season.dart | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/pages/bangumi/widgets/bangumi_panel.dart b/lib/pages/bangumi/widgets/bangumi_panel.dart index 05889f16..20a153a0 100644 --- a/lib/pages/bangumi/widgets/bangumi_panel.dart +++ b/lib/pages/bangumi/widgets/bangumi_panel.dart @@ -144,9 +144,9 @@ class _BangumiPanelState extends State { Expanded( child: Material( child: ScrollablePositionedList.builder( - itemCount: widget.pages.length, + itemCount: widget.pages.length + 1, itemBuilder: (BuildContext context, int index) { - bool isLastItem = index == widget.pages.length - 1; + bool isLastItem = index == widget.pages.length; bool isCurrentIndex = currentIndex == index; return isLastItem ? SizedBox( diff --git a/lib/pages/video/detail/introduction/widgets/season.dart b/lib/pages/video/detail/introduction/widgets/season.dart index c6a94398..0f3884ed 100644 --- a/lib/pages/video/detail/introduction/widgets/season.dart +++ b/lib/pages/video/detail/introduction/widgets/season.dart @@ -161,9 +161,9 @@ class _SeasonPanelState extends State { Expanded( child: Material( child: ScrollablePositionedList.builder( - itemCount: episodes.length, + itemCount: episodes.length + 1, itemBuilder: (BuildContext context, int index) { - bool isLastItem = index == episodes.length - 1; + bool isLastItem = index == episodes.length; bool isCurrentIndex = currentIndex == index; return isLastItem ? SizedBox( From a3e1fd4e918521c4bc44720760615d65fba663a0 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Fri, 8 Mar 2024 23:09:52 +0800 Subject: [PATCH 172/220] =?UTF-8?q?fix:=20=E6=B8=85=E9=99=A4=E7=BC=93?= =?UTF-8?q?=E5=AD=98=E6=8F=90=E7=A4=BA=20issues=20#619?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/about/index.dart | 1 - lib/utils/cache_manage.dart | 6 ++---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/lib/pages/about/index.dart b/lib/pages/about/index.dart index 7c42f5aa..dcfa7a9e 100644 --- a/lib/pages/about/index.dart +++ b/lib/pages/about/index.dart @@ -201,7 +201,6 @@ class _AboutPageState extends State { var cleanStatus = await CacheManage().clearCacheAll(); if (cleanStatus) { getCacheSize(); - SmartDialog.showToast('清除成功'); } }, title: const Text('清除缓存'), diff --git a/lib/utils/cache_manage.dart b/lib/utils/cache_manage.dart index e250ab70..d6bbb816 100644 --- a/lib/utils/cache_manage.dart +++ b/lib/utils/cache_manage.dart @@ -99,10 +99,8 @@ class CacheManage { try { // 清除缓存 图片缓存 await clearLibraryCache(); - Timer(const Duration(milliseconds: 500), () { - SmartDialog.dismiss().then((res) { - SmartDialog.showToast('清除完成'); - }); + SmartDialog.dismiss().then((res) { + SmartDialog.showToast('清除完成'); }); } catch (err) { SmartDialog.dismiss(); From df4539a0353b44d343b633cb4fb4d73e76e523f9 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Fri, 8 Mar 2024 23:15:48 +0800 Subject: [PATCH 173/220] =?UTF-8?q?fix:=20github=E9=93=BE=E6=8E=A5=20issue?= =?UTF-8?q?s=20#618?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/about/index.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/pages/about/index.dart b/lib/pages/about/index.dart index dcfa7a9e..89aec795 100644 --- a/lib/pages/about/index.dart +++ b/lib/pages/about/index.dart @@ -276,7 +276,7 @@ class AboutController extends GetxController { githubRelease() { launchUrl( - Uri.parse('https://github.com/guozhigq/pilipala/release'), + Uri.parse('https://github.com/guozhigq/pilipala/releases'), mode: LaunchMode.externalApplication, ); } From 504be6fbdac224ad7dbb2c72f7bc06c086aa7e84 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sat, 9 Mar 2024 01:18:26 +0800 Subject: [PATCH 174/220] =?UTF-8?q?fix:=20=E6=90=9C=E7=B4=A2=E7=BB=93?= =?UTF-8?q?=E6=9E=9C=E7=B1=BB=E5=9E=8B=E4=B8=BA=E8=AF=BE=E5=A0=82=E6=97=B6?= =?UTF-8?q?=E6=B8=B2=E6=9F=93=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/common/widgets/video_card_h.dart | 28 ++++++++++++++++++++++------ lib/models/search/result.dart | 4 +++- lib/utils/utils.dart | 12 +++++++++--- 3 files changed, 34 insertions(+), 10 deletions(-) diff --git a/lib/common/widgets/video_card_h.dart b/lib/common/widgets/video_card_h.dart index c78643db..99059a9e 100644 --- a/lib/common/widgets/video_card_h.dart +++ b/lib/common/widgets/video_card_h.dart @@ -38,6 +38,10 @@ class VideoCardH extends StatelessWidget { Widget build(BuildContext context) { final int aid = videoItem.aid; final String bvid = videoItem.bvid; + String type = 'video'; + try { + type = videoItem.type; + } catch (_) {} final String heroTag = Utils.makeHeroTag(aid); return GestureDetector( onLongPress: () { @@ -53,6 +57,10 @@ class VideoCardH extends StatelessWidget { child: InkWell( onTap: () async { try { + if (type == 'ketang') { + SmartDialog.showToast('课堂视频暂不支持播放'); + return; + } final int cid = videoItem.cid ?? await SearchHttp.ab2c(aid: aid, bvid: bvid); Get.toNamed('/video?bvid=$bvid&cid=$cid', @@ -95,12 +103,20 @@ class VideoCardH extends StatelessWidget { height: maxHeight, ), ), - PBadge( - text: Utils.timeFormat(videoItem.duration!), - right: 6.0, - bottom: 6.0, - type: 'gray', - ), + if (videoItem.duration != 0) + PBadge( + text: Utils.timeFormat(videoItem.duration!), + right: 6.0, + bottom: 6.0, + type: 'gray', + ), + if (type != 'video') + PBadge( + text: type, + left: 6.0, + bottom: 6.0, + type: 'primary', + ), // if (videoItem.rcmdReason != null && // videoItem.rcmdReason.content != '') // pBadge(videoItem.rcmdReason.content, context, diff --git a/lib/models/search/result.dart b/lib/models/search/result.dart index 3d381ed9..0067791c 100644 --- a/lib/models/search/result.dart +++ b/lib/models/search/result.dart @@ -85,7 +85,9 @@ class SearchVideoItemModel { // title = json['title'].replaceAll(RegExp(r'<.*?>'), ''); title = Em.regTitle(json['title']); description = json['description']; - pic = 'https:${json['pic']}'; + pic = json['pic'] != null && json['pic'].startsWith('//') + ? 'https:${json['pic']}' + : json['pic'] ?? ''; videoReview = json['video_review']; pubdate = json['pubdate']; senddate = json['senddate']; diff --git a/lib/utils/utils.dart b/lib/utils/utils.dart index 09d8c97f..62bd4d0a 100644 --- a/lib/utils/utils.dart +++ b/lib/utils/utils.dart @@ -50,6 +50,9 @@ class Utils { return time; } if (time < 3600) { + if (time == 0) { + return time; + } final int minute = time ~/ 60; final double res = time / 60; if (minute != res) { @@ -87,6 +90,9 @@ class Utils { // 时间显示，刚刚，x分钟前 static String dateFormat(timeStamp, {formatType = 'list'}) { + if (timeStamp == 0 || timeStamp == null || timeStamp == '') { + return ''; + } // 当前时间 int time = (DateTime.now().millisecondsSinceEpoch / 1000).round(); // 对比 @@ -103,6 +109,7 @@ class Utils { toInt: false, formatType: formatType); } + print('distance: $distance'); if (distance <= 60) { return '刚刚'; } else if (distance <= 3600) { @@ -344,9 +351,8 @@ class Utils { } static List generateRandomBytes(int minLength, int maxLength) { - return List.generate( - random.nextInt(maxLength-minLength+1), (_) => random.nextInt(0x60) + 0x20 - ); + return List.generate(random.nextInt(maxLength - minLength + 1), + (_) => random.nextInt(0x60) + 0x20); } static String base64EncodeRandomString(int minLength, int maxLength) { From 06fb3e8d2f2da9d1ac0a57830f14e261679f0195 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sat, 9 Mar 2024 01:25:54 +0800 Subject: [PATCH 175/220] =?UTF-8?q?fix:=20=E8=AF=B7=E6=B1=82github?= =?UTF-8?q?=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/about/index.dart | 6 +++++- lib/utils/utils.dart | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/lib/pages/about/index.dart b/lib/pages/about/index.dart index 89aec795..b381691a 100644 --- a/lib/pages/about/index.dart +++ b/lib/pages/about/index.dart @@ -253,12 +253,16 @@ class AboutController extends GetxController { // 获取远程版本 Future getRemoteApp() async { var result = await Request().get(Api.latestApp, extra: {'ua': 'pc'}); + isLoading.value = false; + if (result.data == null || result.data.isEmpty) { + SmartDialog.showToast('获取远程版本失败，请检查网络'); + return; + } data = LatestDataModel.fromJson(result.data); remoteAppInfo = data; remoteVersion.value = data.tagName!; isUpdate.value = Utils.needUpdate(currentVersion.value, remoteVersion.value); - isLoading.value = false; } // 跳转下载/本地更新 diff --git a/lib/utils/utils.dart b/lib/utils/utils.dart index 62bd4d0a..adcc7b5a 100644 --- a/lib/utils/utils.dart +++ b/lib/utils/utils.dart @@ -243,6 +243,10 @@ class Utils { SmartDialog.dismiss(); var currentInfo = await PackageInfo.fromPlatform(); var result = await Request().get(Api.latestApp, extra: {'ua': 'mob'}); + if (result.data == null || result.data.isEmpty) { + SmartDialog.showToast('获取远程版本失败，请检查网络'); + return false; + } LatestDataModel data = LatestDataModel.fromJson(result.data); bool isUpdate = Utils.needUpdate(currentInfo.version, data.tagName!); if (isUpdate) { From bf37c33291655044834674d93768caaa724a0d90 Mon Sep 17 00:00:00 2001 From: yezi Date: Sat, 9 Mar 2024 19:39:21 +0800 Subject: [PATCH 176/220] =?UTF-8?q?feat:=E6=94=AF=E6=8C=81=E6=8E=92?= =?UTF-8?q?=E8=A1=8C=E6=A6=9C=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/http/api.dart | 4 + lib/http/video.dart | 23 +++ lib/models/common/nav_bar_config.dart | 15 +- lib/models/common/rank_type.dart | 240 ++++++++++++++++++++++++++ lib/pages/main/controller.dart | 2 + lib/pages/main/view.dart | 17 ++ lib/pages/rank/controller.dart | 70 ++++++++ lib/pages/rank/index.dart | 4 + lib/pages/rank/view.dart | 149 ++++++++++++++++ lib/pages/rank/zone/controller.dart | 53 ++++++ lib/pages/rank/zone/index.dart | 4 + lib/pages/rank/zone/view.dart | 148 ++++++++++++++++ 12 files changed, 728 insertions(+), 1 deletion(-) create mode 100644 lib/models/common/rank_type.dart create mode 100644 lib/pages/rank/controller.dart create mode 100644 lib/pages/rank/index.dart create mode 100644 lib/pages/rank/view.dart create mode 100644 lib/pages/rank/zone/controller.dart create mode 100644 lib/pages/rank/zone/index.dart create mode 100644 lib/pages/rank/zone/view.dart diff --git a/lib/http/api.dart b/lib/http/api.dart index 3a23ef80..8aa62233 100644 --- a/lib/http/api.dart +++ b/lib/http/api.dart @@ -499,4 +499,8 @@ class Api { /// 发送私信 static const String sendMsg = '${HttpString.tUrl}/web_im/v1/web_im/send_msg'; + + /// 排行榜 + static const String getRankApi = "/x/web-interface/ranking/v2"; + } diff --git a/lib/http/video.dart b/lib/http/video.dart index 30df62c3..73e8b698 100644 --- a/lib/http/video.dart +++ b/lib/http/video.dart @@ -475,4 +475,27 @@ class VideoHttp { return {'status': false, 'data': []}; } } + + // 视频排行 + static Future getRankVideoList(int rid) async { + try { + var rankApi = "${Api.getRankApi}?rid=$rid&type=all"; + var res = await Request().get(rankApi); + if (res.data['code'] == 0) { + List list = []; + List blackMidsList = + setting.get(SettingBoxKey.blackMidsList, defaultValue: [-1]); + for (var i in res.data['data']['list']) { + if (!blackMidsList.contains(i['owner']['mid'])) { + list.add(HotVideoItemModel.fromJson(i)); + } + } + return {'status': true, 'data': list}; + } else { + return {'status': false, 'data': [], 'msg': res.data['message']}; + } + } catch (err) { + return {'status': false, 'data': [], 'msg': err}; + } + } } diff --git a/lib/models/common/nav_bar_config.dart b/lib/models/common/nav_bar_config.dart index 7fb22e48..9ebe8e6f 100644 --- a/lib/models/common/nav_bar_config.dart +++ b/lib/models/common/nav_bar_config.dart @@ -16,6 +16,19 @@ List defaultNavigationBars = [ }, { 'id': 1, + 'icon': const Icon( + Icons.trending_up, + size: 21, + ), + 'selectIcon': const Icon( + Icons.trending_up_outlined, + size: 21, + ), + 'label': "排行榜", + 'count': 0, + }, + { + 'id': 2, 'icon': const Icon( Icons.motion_photos_on_outlined, size: 21, @@ -28,7 +41,7 @@ List defaultNavigationBars = [ 'count': 0, }, { - 'id': 2, + 'id': 3, 'icon': const Icon( Icons.video_collection_outlined, size: 20, diff --git a/lib/models/common/rank_type.dart b/lib/models/common/rank_type.dart new file mode 100644 index 00000000..2ce6d3b5 --- /dev/null +++ b/lib/models/common/rank_type.dart @@ -0,0 +1,240 @@ +import 'package:flutter/material.dart'; +import 'package:get/get.dart'; +import 'package:pilipala/pages/rank/zone/index.dart'; + +enum RandType { + all, + creation, + animation, + music, + dance, + game, + knowledge, + technology, + sport, + car, + life, + food, + animal, + madness, + fashion, + entertainment, + film, + origin, + rookie +} + +extension RankTypeDesc on RandType { + String get description => [ + '全站', + '国创相关', + '动画', + '音乐', + '舞蹈', + '游戏', + '知识', + '科技', + '运动', + '汽车', + '生活', + '美食', + '动物圈', + '鬼畜', + '时尚', + '娱乐', + '影视' + ][index]; + + String get id => [ + 'all', + 'creation', + 'animation', + 'music', + 'dance', + 'game', + 'knowledge', + 'technology', + 'sport', + 'car', + 'life', + 'food', + 'animal', + 'madness', + 'fashion', + 'entertainment', + 'film' + ][index]; +} + +List tabsConfig = [ + { + 'icon': const Icon( + Icons.live_tv_outlined, + size: 15, + ), + 'label': '全站', + 'type': RandType.all, + 'ctr': Get.put, + 'page': const ZonePage(rid: 0), + }, + { + 'icon': const Icon( + Icons.live_tv_outlined, + size: 15, + ), + 'label': '国创相关', + 'type': RandType.creation, + 'ctr': Get.put, + 'page': const ZonePage(rid: 168), + }, + { + 'icon': const Icon( + Icons.live_tv_outlined, + size: 15, + ), + 'label': '动画', + 'type': RandType.animation, + 'ctr': Get.put, + 'page': const ZonePage(rid: 1), + }, + { + 'icon': const Icon( + Icons.live_tv_outlined, + size: 15, + ), + 'label': '音乐', + 'type': RandType.music, + 'ctr': Get.put, + 'page': const ZonePage(rid: 3), + }, + { + 'icon': const Icon( + Icons.live_tv_outlined, + size: 15, + ), + 'label': '舞蹈', + 'type': RandType.dance, + 'ctr': Get.put, + 'page': const ZonePage(rid: 129), + }, + { + 'icon': const Icon( + Icons.live_tv_outlined, + size: 15, + ), + 'label': '游戏', + 'type': RandType.game, + 'ctr': Get.put, + 'page': const ZonePage(rid: 4), + }, + { + 'icon': const Icon( + Icons.live_tv_outlined, + size: 15, + ), + 'label': '知识', + 'type': RandType.knowledge, + 'ctr': Get.put, + 'page': const ZonePage(rid: 36), + }, + { + 'icon': const Icon( + Icons.live_tv_outlined, + size: 15, + ), + 'label': '科技', + 'type': RandType.technology, + 'ctr': Get.put, + 'page': const ZonePage(rid: 188), + }, + { + 'icon': const Icon( + Icons.live_tv_outlined, + size: 15, + ), + 'label': '运动', + 'type': RandType.sport, + 'ctr': Get.put, + 'page': const ZonePage(rid: 234), + }, + { + 'icon': const Icon( + Icons.live_tv_outlined, + size: 15, + ), + 'label': '汽车', + 'type': RandType.car, + 'ctr': Get.put, + 'page': const ZonePage(rid: 223), + }, + { + 'icon': const Icon( + Icons.live_tv_outlined, + size: 15, + ), + 'label': '生活', + 'type': RandType.life, + 'ctr': Get.put, + 'page': const ZonePage(rid: 160), + }, + { + 'icon': const Icon( + Icons.live_tv_outlined, + size: 15, + ), + 'label': '美食', + 'type': RandType.food, + 'ctr': Get.put, + 'page': const ZonePage(rid: 211), + }, + { + 'icon': const Icon( + Icons.live_tv_outlined, + size: 15, + ), + 'label': '动物圈', + 'type': RandType.animal, + 'ctr': Get.put, + 'page': const ZonePage(rid: 217), + }, + { + 'icon': const Icon( + Icons.live_tv_outlined, + size: 15, + ), + 'label': '鬼畜', + 'type': RandType.madness, + 'ctr': Get.put, + 'page': const ZonePage(rid: 119), + }, + { + 'icon': const Icon( + Icons.live_tv_outlined, + size: 15, + ), + 'label': '时尚', + 'type': RandType.fashion, + 'ctr': Get.put, + 'page': const ZonePage(rid: 155), + }, + { + 'icon': const Icon( + Icons.live_tv_outlined, + size: 15, + ), + 'label': '娱乐', + 'type': RandType.entertainment, + 'ctr': Get.put, + 'page': const ZonePage(rid: 5), + }, + { + 'icon': const Icon( + Icons.live_tv_outlined, + size: 15, + ), + 'label': '影视', + 'type': RandType.film, + 'ctr': Get.put, + 'page': const ZonePage(rid: 181), + } +]; diff --git a/lib/pages/main/controller.dart b/lib/pages/main/controller.dart index f3bcb75a..ddbd364a 100644 --- a/lib/pages/main/controller.dart +++ b/lib/pages/main/controller.dart @@ -9,6 +9,7 @@ import 'package:pilipala/http/common.dart'; import 'package:pilipala/pages/dynamics/index.dart'; import 'package:pilipala/pages/home/view.dart'; import 'package:pilipala/pages/media/index.dart'; +import 'package:pilipala/pages/rank/index.dart'; import 'package:pilipala/utils/storage.dart'; import 'package:pilipala/utils/utils.dart'; import '../../models/common/dynamic_badge_mode.dart'; @@ -17,6 +18,7 @@ import '../../models/common/nav_bar_config.dart'; class MainController extends GetxController { List pages = [ const HomePage(), + const RankPage(), const DynamicsPage(), const MediaPage(), ]; diff --git a/lib/pages/main/view.dart b/lib/pages/main/view.dart index 04e0f087..c551e690 100644 --- a/lib/pages/main/view.dart +++ b/lib/pages/main/view.dart @@ -7,6 +7,7 @@ import 'package:pilipala/models/common/dynamic_badge_mode.dart'; import 'package:pilipala/pages/dynamics/index.dart'; import 'package:pilipala/pages/home/index.dart'; import 'package:pilipala/pages/media/index.dart'; +import 'package:pilipala/pages/rank/index.dart'; import 'package:pilipala/utils/event_bus.dart'; import 'package:pilipala/utils/feed_back.dart'; import 'package:pilipala/utils/storage.dart'; @@ -22,6 +23,7 @@ class MainApp extends StatefulWidget { class _MainAppState extends State with SingleTickerProviderStateMixin { final MainController _mainController = Get.put(MainController()); final HomeController _homeController = Get.put(HomeController()); + final RankController _rankController = Get.put(RankController()); final DynamicsController _dynamicController = Get.put(DynamicsController()); final MediaController _mediaController = Get.put(MediaController()); @@ -57,6 +59,21 @@ class _MainAppState extends State with SingleTickerProviderStateMixin { _homeController.flag = false; } + if (currentPage is RankPage) { + if (_rankController.flag) { + // 单击返回顶部 双击并刷新 + if (DateTime.now().millisecondsSinceEpoch - _lastSelectTime! < 500) { + _rankController.onRefresh(); + } else { + _rankController.animateToTop(); + } + _lastSelectTime = DateTime.now().millisecondsSinceEpoch; + } + _rankController.flag = true; + } else { + _rankController.flag = false; + } + if (currentPage is DynamicsPage) { if (_dynamicController.flag) { // 单击返回顶部 双击并刷新 diff --git a/lib/pages/rank/controller.dart b/lib/pages/rank/controller.dart new file mode 100644 index 00000000..61475d97 --- /dev/null +++ b/lib/pages/rank/controller.dart @@ -0,0 +1,70 @@ +import 'dart:async'; + +import 'package:flutter/material.dart'; +import 'package:get/get.dart'; +import 'package:hive/hive.dart'; +import 'package:pilipala/models/common/rank_type.dart'; +import 'package:pilipala/utils/storage.dart'; + +class RankController extends GetxController with GetTickerProviderStateMixin { + bool flag = false; + late RxList tabs = [].obs; + RxInt initialIndex = 1.obs; + late TabController tabController; + late List tabsCtrList; + late List tabsPageList; + Box setting = GStrorage.setting; + late final StreamController searchBarStream = + StreamController.broadcast(); + late bool enableGradientBg; + + @override + void onInit() { + super.onInit(); + enableGradientBg = + setting.get(SettingBoxKey.enableGradientBg, defaultValue: true); + // 进行tabs配置 + setTabConfig(); + } + + void onRefresh() { + int index = tabController.index; + var ctr = tabsCtrList[index]; + ctr().onRefresh(); + } + + void animateToTop() { + int index = tabController.index; + var ctr = tabsCtrList[index]; + ctr().animateToTop(); + } + + void setTabConfig() async { + tabs.value = tabsConfig; + initialIndex.value = 0; + tabsCtrList = tabs.map((e) => e['ctr']).toList(); + tabsPageList = tabs.map((e) => e['page']).toList(); + + tabController = TabController( + initialIndex: initialIndex.value, + length: tabs.length, + vsync: this, + ); + // 监听 tabController 切换 + if (enableGradientBg) { + tabController.animation!.addListener(() { + if (tabController.indexIsChanging) { + if (initialIndex.value != tabController.index) { + initialIndex.value = tabController.index; + } + } else { + final int temp = tabController.animation!.value.round(); + if (initialIndex.value != temp) { + initialIndex.value = temp; + tabController.index = initialIndex.value; + } + } + }); + } + } +} diff --git a/lib/pages/rank/index.dart b/lib/pages/rank/index.dart new file mode 100644 index 00000000..eaac0a34 --- /dev/null +++ b/lib/pages/rank/index.dart @@ -0,0 +1,4 @@ +library rank; + +export './controller.dart'; +export './view.dart'; diff --git a/lib/pages/rank/view.dart b/lib/pages/rank/view.dart new file mode 100644 index 00000000..7b5b4906 --- /dev/null +++ b/lib/pages/rank/view.dart @@ -0,0 +1,149 @@ +import 'dart:async'; + +import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; +import 'package:get/get.dart'; +import 'package:pilipala/utils/feed_back.dart'; +import './controller.dart'; + +class RankPage extends StatefulWidget { + const RankPage({Key? key}) : super(key: key); + + @override + State createState() => _RankPageState(); +} + +class _RankPageState extends State + with AutomaticKeepAliveClientMixin, TickerProviderStateMixin { + final RankController _rankController = Get.put(RankController()); + List videoList = []; + late Stream stream; + + @override + bool get wantKeepAlive => true; + + @override + void initState() { + super.initState(); + stream = _rankController.searchBarStream.stream; + } + + @override + Widget build(BuildContext context) { + super.build(context); + Brightness currentBrightness = MediaQuery.of(context).platformBrightness; + // 设置状态栏图标的亮度 + if (_rankController.enableGradientBg) { + SystemChrome.setSystemUIOverlayStyle(SystemUiOverlayStyle( + statusBarIconBrightness: currentBrightness == Brightness.light + ? Brightness.dark + : Brightness.light, + )); + } + return Scaffold( + extendBody: true, + extendBodyBehindAppBar: false, + appBar: _rankController.enableGradientBg + ? null + : AppBar(toolbarHeight: 0, elevation: 0), + body: Stack( + children: [ + // gradient background + if (_rankController.enableGradientBg) ...[ + Align( + alignment: Alignment.topLeft, + child: Opacity( + opacity: 0.6, + child: Container( + width: MediaQuery.of(context).size.width, + height: MediaQuery.of(context).size.height, + decoration: BoxDecoration( + gradient: LinearGradient( + colors: [ + Theme.of(context) + .colorScheme + .primary + .withOpacity(0.9), + Theme.of(context) + .colorScheme + .primary + .withOpacity(0.5), + Theme.of(context).colorScheme.surface + ], + begin: Alignment.topLeft, + end: Alignment.bottomRight, + stops: const [0, 0.0034, 0.34]), + ), + ), + ), + ), + ], + Column( + children: [ + const CustomAppBar(), + if (_rankController.tabs.length > 1) ...[ + const SizedBox(height: 4), + SizedBox( + width: double.infinity, + height: 42, + child: Align( + alignment: Alignment.center, + child: TabBar( + controller: _rankController.tabController, + tabs: [ + for (var i in _rankController.tabs) + Tab(text: i['label']) + ], + isScrollable: true, + dividerColor: Colors.transparent, + enableFeedback: true, + splashBorderRadius: BorderRadius.circular(10), + tabAlignment: TabAlignment.center, + onTap: (value) { + feedBack(); + if (_rankController.initialIndex.value == value) { + _rankController.tabsCtrList[value]().animateToTop(); + } + _rankController.initialIndex.value = value; + }, + ), + ), + ), + ] else ...[ + const SizedBox(height: 6), + ], + Expanded( + child: TabBarView( + controller: _rankController.tabController, + children: _rankController.tabsPageList, + ), + ), + ], + ), + ], + ), + ); + } +} + +class CustomAppBar extends StatelessWidget implements PreferredSizeWidget { + final double height; + + const CustomAppBar({ + super.key, + this.height = kToolbarHeight, + }); + + @override + Size get preferredSize => Size.fromHeight(height); + + @override + Widget build(BuildContext context) { + final double top = MediaQuery.of(context).padding.top; + return Container( + width: MediaQuery.of(context).size.width, + height: top, + color: Colors.transparent, + ); + } +} diff --git a/lib/pages/rank/zone/controller.dart b/lib/pages/rank/zone/controller.dart new file mode 100644 index 00000000..f9f4dc6e --- /dev/null +++ b/lib/pages/rank/zone/controller.dart @@ -0,0 +1,53 @@ +import 'package:get/get.dart'; +import 'package:flutter/material.dart'; +import 'package:pilipala/http/video.dart'; +import 'package:pilipala/models/model_hot_video_item.dart'; + +class ZoneController extends GetxController { + final ScrollController scrollController = ScrollController(); + RxList videoList = [].obs; + bool isLoadingMore = false; + bool flag = false; + OverlayEntry? popupDialog; + int zoneID = 0; + + // 获取推荐 + Future queryRankFeed(type, rid) async { + zoneID = rid; + var res = await VideoHttp.getRankVideoList(zoneID); + if (res['status']) { + if (type == 'init') { + videoList.value = res['data']; + } else if (type == 'onRefresh') { + videoList.clear(); + videoList.addAll(res['data']); + } else if (type == 'onLoad') { + videoList.clear(); + videoList.addAll(res['data']); + } + } + isLoadingMore = false; + return res; + } + + // 下拉刷新 + Future onRefresh() async { + queryRankFeed('onRefresh', zoneID); + } + + // 上拉加载 + Future onLoad() async { + queryRankFeed('onLoad', zoneID); + } + + // 返回顶部并刷新 + void animateToTop() async { + if (scrollController.offset >= + MediaQuery.of(Get.context!).size.height * 5) { + scrollController.jumpTo(0); + } else { + await scrollController.animateTo(0, + duration: const Duration(milliseconds: 500), curve: Curves.easeInOut); + } + } +} diff --git a/lib/pages/rank/zone/index.dart b/lib/pages/rank/zone/index.dart new file mode 100644 index 00000000..8f535736 --- /dev/null +++ b/lib/pages/rank/zone/index.dart @@ -0,0 +1,4 @@ +library rank.zone; + +export './controller.dart'; +export './view.dart'; diff --git a/lib/pages/rank/zone/view.dart b/lib/pages/rank/zone/view.dart new file mode 100644 index 00000000..58ca187f --- /dev/null +++ b/lib/pages/rank/zone/view.dart @@ -0,0 +1,148 @@ +import 'dart:async'; + +import 'package:flutter/material.dart'; +import 'package:flutter/rendering.dart'; +import 'package:get/get.dart'; +import 'package:pilipala/common/constants.dart'; +import 'package:pilipala/common/widgets/animated_dialog.dart'; +import 'package:pilipala/common/widgets/overlay_pop.dart'; +import 'package:pilipala/common/skeleton/video_card_h.dart'; +import 'package:pilipala/common/widgets/http_error.dart'; +import 'package:pilipala/common/widgets/video_card_h.dart'; +import 'package:pilipala/pages/home/index.dart'; +import 'package:pilipala/pages/main/index.dart'; +import 'package:pilipala/pages/rank/zone/index.dart'; + +class ZonePage extends StatefulWidget { + const ZonePage({Key? key, required this.rid}) : super(key: key); + + final int rid; + + @override + State createState() => _ZonePageState(); +} + +class _ZonePageState extends State { + final ZoneController _zoneController = Get.put(ZoneController()); + List videoList = []; + Future? _futureBuilderFuture; + late ScrollController scrollController; + + @override + void initState() { + super.initState(); + _futureBuilderFuture = _zoneController.queryRankFeed('init', widget.rid); + scrollController = _zoneController.scrollController; + StreamController mainStream = + Get.find().bottomBarStream; + StreamController searchBarStream = + Get.find().searchBarStream; + scrollController.addListener( + () { + if (scrollController.position.pixels >= + scrollController.position.maxScrollExtent - 200) { + if (!_zoneController.isLoadingMore) { + _zoneController.isLoadingMore = true; + _zoneController.onLoad(); + } + } + + final ScrollDirection direction = + scrollController.position.userScrollDirection; + if (direction == ScrollDirection.forward) { + mainStream.add(true); + searchBarStream.add(true); + } else if (direction == ScrollDirection.reverse) { + mainStream.add(false); + searchBarStream.add(false); + } + }, + ); + } + + @override + void dispose() { + scrollController.removeListener(() {}); + super.dispose(); + } + + @override + Widget build(BuildContext context) { + return RefreshIndicator( + onRefresh: () async { + return await _zoneController.onRefresh(); + }, + child: CustomScrollView( + controller: _zoneController.scrollController, + slivers: [ + SliverPadding( + // 单列布局 EdgeInsets.zero + padding: + const EdgeInsets.fromLTRB(0, StyleString.safeSpace - 5, 0, 0), + sliver: FutureBuilder( + future: _futureBuilderFuture, + builder: (context, snapshot) { + if (snapshot.connectionState == ConnectionState.done) { + Map data = snapshot.data as Map; + if (data['status']) { + return Obx( + () => SliverList( + delegate: SliverChildBuilderDelegate((context, index) { + return VideoCardH( + videoItem: _zoneController.videoList[index], + showPubdate: true, + longPress: () { + _zoneController.popupDialog = _createPopupDialog( + _zoneController.videoList[index]); + Overlay.of(context) + .insert(_zoneController.popupDialog!); + }, + longPressEnd: () { + _zoneController.popupDialog?.remove(); + }, + ); + }, childCount: _zoneController.videoList.length), + ), + ); + } else { + return HttpError( + errMsg: data['msg'], + fn: () { + setState(() { + _futureBuilderFuture = + _zoneController.queryRankFeed('init', widget.rid); + }); + }, + ); + } + } else { + // 骨架屏 + return SliverList( + delegate: SliverChildBuilderDelegate((context, index) { + return const VideoCardHSkeleton(); + }, childCount: 10), + ); + } + }, + ), + ), + SliverToBoxAdapter( + child: SizedBox( + height: MediaQuery.of(context).padding.bottom + 10, + ), + ) + ], + ), + ); + } + + OverlayEntry _createPopupDialog(videoItem) { + return OverlayEntry( + builder: (context) => AnimatedDialog( + closeFn: _zoneController.popupDialog?.remove, + child: OverlayPop( + videoItem: videoItem, closeFn: _zoneController.popupDialog?.remove), + ), + ); + } +} From b7b75e956fbc66fa02a31e9aace44ff39997421f Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sun, 10 Mar 2024 16:13:11 +0800 Subject: [PATCH 177/220] =?UTF-8?q?fix:=20=E5=88=A0=E9=99=A4=E5=8D=95?= =?UTF-8?q?=E4=B8=AA=E6=90=9C=E7=B4=A2=E5=8E=86=E5=8F=B2=E6=97=A0=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/search/controller.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/pages/search/controller.dart b/lib/pages/search/controller.dart index cbb86405..1853c238 100644 --- a/lib/pages/search/controller.dart +++ b/lib/pages/search/controller.dart @@ -115,7 +115,7 @@ class SSearchController extends GetxController { onLongSelect(word) { int index = historyList.indexOf(word); - historyList.value = historyList.removeAt(index); + historyList.removeAt(index); historyList.refresh(); histiryWord.put('cacheList', historyList); } From 3ece2bb173ad31caa0638cc400d49190718db254 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sun, 10 Mar 2024 17:57:24 +0800 Subject: [PATCH 178/220] =?UTF-8?q?feat:=20=E7=B3=BB=E7=BB=9F=E5=80=8D?= =?UTF-8?q?=E9=80=9F=E5=8F=AF=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../live_room/widgets/bottom_control.dart | 1 - lib/pages/setting/pages/play_speed_set.dart | 101 +++++++++--------- .../video/detail/widgets/header_control.dart | 1 - lib/plugin/pl_player/controller.dart | 26 ++--- lib/plugin/pl_player/models/play_speed.dart | 46 ++------ lib/utils/storage.dart | 2 + 6 files changed, 77 insertions(+), 100 deletions(-) diff --git a/lib/pages/live_room/widgets/bottom_control.dart b/lib/pages/live_room/widgets/bottom_control.dart index a00f3d92..7ec8864f 100644 --- a/lib/pages/live_room/widgets/bottom_control.dart +++ b/lib/pages/live_room/widgets/bottom_control.dart @@ -29,7 +29,6 @@ class BottomControl extends StatefulWidget implements PreferredSizeWidget { class _BottomControlState extends State { late PlayUrlModel videoInfo; - List playSpeed = PlaySpeed.values; TextStyle subTitleStyle = const TextStyle(fontSize: 12); TextStyle titleStyle = const TextStyle(fontSize: 14); Size get preferredSize => const Size(double.infinity, kToolbarHeight); diff --git a/lib/pages/setting/pages/play_speed_set.dart b/lib/pages/setting/pages/play_speed_set.dart index ceff07ed..eb81f586 100644 --- a/lib/pages/setting/pages/play_speed_set.dart +++ b/lib/pages/setting/pages/play_speed_set.dart @@ -17,6 +17,7 @@ class _PlaySpeedPageState extends State { Box videoStorage = GStrorage.video; Box settingStorage = GStrorage.setting; late double playSpeedDefault; + late List playSpeedSystem; late double longPressSpeedDefault; late List customSpeedsList; late bool enableAutoLongPressSpeed; @@ -53,6 +54,9 @@ class _PlaySpeedPageState extends State { @override void initState() { super.initState(); + // 系统预设倍速 + playSpeedSystem = + videoStorage.get(VideoBoxKey.playSpeedSystem, defaultValue: playSpeed); // 默认倍速 playSpeedDefault = videoStorage.get(VideoBoxKey.playSpeedDefault, defaultValue: 1.0); @@ -64,6 +68,7 @@ class _PlaySpeedPageState extends State { videoStorage.get(VideoBoxKey.customSpeedsList, defaultValue: []); enableAutoLongPressSpeed = settingStorage .get(SettingBoxKey.enableAutoLongPressSpeed, defaultValue: false); + // 开启动态长按倍速时不展示 if (enableAutoLongPressSpeed) { Map newItem = sheetMenu[1]; newItem['show'] = false; @@ -123,7 +128,7 @@ class _PlaySpeedPageState extends State { } // 设定倍速弹窗 - void showBottomSheet(type, i) { + void showBottomSheet(String type, int i) { showModalBottomSheet( context: context, isScrollControlled: true, @@ -159,18 +164,11 @@ class _PlaySpeedPageState extends State { } // - void menuAction(type, index, id) async { + void menuAction(type, int index, id) async { double chooseSpeed = 1.0; - if (type == 'system' && id == -1) { - SmartDialog.showToast('系统预设倍速不支持删除'); - return; - } // 获取当前选中的倍速值 - if (type == 'system') { - chooseSpeed = PlaySpeed.values[index].value; - } else { - chooseSpeed = customSpeedsList[index]; - } + chooseSpeed = + type == 'system' ? playSpeedSystem[index] : customSpeedsList[index]; // 设置 if (id == 1) { // 设置默认倍速 @@ -182,17 +180,22 @@ class _PlaySpeedPageState extends State { videoStorage.put( VideoBoxKey.longPressSpeedDefault, longPressSpeedDefault); } else if (id == -1) { - if (customSpeedsList[index] == playSpeedDefault) { - playSpeedDefault = 1.0; - videoStorage.put(VideoBoxKey.playSpeedDefault, playSpeedDefault); + late List speedsList = + type == 'system' ? playSpeedSystem : customSpeedsList; + if (speedsList[index] == playSpeedDefault) { + SmartDialog.showToast('默认倍速不可删除'); } - if (customSpeedsList[index] == longPressSpeedDefault) { + if (speedsList[index] == longPressSpeedDefault) { longPressSpeedDefault = 2.0; videoStorage.put( VideoBoxKey.longPressSpeedDefault, longPressSpeedDefault); } - customSpeedsList.removeAt(index); - await videoStorage.put(VideoBoxKey.customSpeedsList, customSpeedsList); + speedsList.removeAt(index); + await videoStorage.put( + type == 'system' + ? VideoBoxKey.playSpeedSystem + : VideoBoxKey.customSpeedsList, + speedsList); } setState(() {}); SmartDialog.showToast('操作成功'); @@ -249,38 +252,40 @@ class _PlaySpeedPageState extends State { subtitle: Text(longPressSpeedDefault.toString()), ) : const SizedBox(), - Padding( - padding: const EdgeInsets.only( - left: 14, - right: 14, - bottom: 10, - top: 20, + if (playSpeedSystem.isNotEmpty) ...[ + Padding( + padding: const EdgeInsets.only( + left: 14, + right: 14, + bottom: 10, + top: 20, + ), + child: Text( + '系统预设倍速', + style: Theme.of(context).textTheme.titleMedium, + ), ), - child: Text( - '系统预设倍速', - style: Theme.of(context).textTheme.titleMedium, - ), - ), - Padding( - padding: const EdgeInsets.only( - left: 18, - right: 18, - bottom: 30, - ), - child: Wrap( - alignment: WrapAlignment.start, - spacing: 8, - runSpacing: 2, - children: [ - for (var i in PlaySpeed.values) ...[ - FilledButton.tonal( - onPressed: () => showBottomSheet('system', i.index), - child: Text(i.description), - ), - ] - ], - ), - ), + Padding( + padding: const EdgeInsets.only( + left: 18, + right: 18, + bottom: 30, + ), + child: Wrap( + alignment: WrapAlignment.start, + spacing: 8, + runSpacing: 2, + children: [ + for (int i = 0; i < playSpeedSystem.length; i++) ...[ + FilledButton.tonal( + onPressed: () => showBottomSheet('system', i), + child: Text(playSpeedSystem[i].toString()), + ), + ] + ], + ), + ) + ], Padding( padding: const EdgeInsets.only( left: 14, diff --git a/lib/pages/video/detail/widgets/header_control.dart b/lib/pages/video/detail/widgets/header_control.dart index e72e6a69..e07e618e 100644 --- a/lib/pages/video/detail/widgets/header_control.dart +++ b/lib/pages/video/detail/widgets/header_control.dart @@ -47,7 +47,6 @@ class HeaderControl extends StatefulWidget implements PreferredSizeWidget { class _HeaderControlState extends State { late PlayUrlModel videoInfo; - List playSpeed = PlaySpeed.values; static const TextStyle subTitleStyle = TextStyle(fontSize: 12); static const TextStyle titleStyle = TextStyle(fontSize: 14); Size get preferredSize => const Size(double.infinity, kToolbarHeight); diff --git a/lib/plugin/pl_player/controller.dart b/lib/plugin/pl_player/controller.dart index b4b37cea..aaded67d 100644 --- a/lib/plugin/pl_player/controller.dart +++ b/lib/plugin/pl_player/controller.dart @@ -292,11 +292,19 @@ class PlPlayerController { _longPressSpeed.value = videoStorage .get(VideoBoxKey.longPressSpeedDefault, defaultValue: 2.0); } + // 自定义倍速集合 speedsList = List.from(videoStorage .get(VideoBoxKey.customSpeedsList, defaultValue: [])); - for (final PlaySpeed i in PlaySpeed.values) { - speedsList.add(i.value); - } + // 默认倍速 + speedsList = List.from(videoStorage + .get(VideoBoxKey.customSpeedsList, defaultValue: [])); + //playSpeedSystem + final List playSpeedSystem = + videoStorage.get(VideoBoxKey.playSpeedSystem, defaultValue: playSpeed); + + // for (final PlaySpeed i in PlaySpeed.values) { + speedsList.addAll(playSpeedSystem); + // } // _playerEventSubs = onPlayerStatusChanged.listen((PlayerStatus status) { // if (status == PlayerStatus.playing) { @@ -676,18 +684,6 @@ class PlPlayerController { _playbackSpeed.value = speed; } - /// 设置倍速 - // Future togglePlaybackSpeed() async { - // List allowedSpeeds = - // PlaySpeed.values.map((e) => e.value).toList(); - // int index = allowedSpeeds.indexOf(_playbackSpeed.value); - // if (index < allowedSpeeds.length - 1) { - // setPlaybackSpeed(allowedSpeeds[index + 1]); - // } else { - // setPlaybackSpeed(allowedSpeeds[0]); - // } - // } - /// 播放视频 /// TODO _duration.value丢失 Future play( diff --git a/lib/plugin/pl_player/models/play_speed.dart b/lib/plugin/pl_player/models/play_speed.dart index fd699eaf..8bb25118 100644 --- a/lib/plugin/pl_player/models/play_speed.dart +++ b/lib/plugin/pl_player/models/play_speed.dart @@ -1,39 +1,15 @@ -enum PlaySpeed { - pointTwoFive, - pointFive, - pointSevenFive, +List generatePlaySpeedList() { + List playSpeed = []; + double startSpeed = 0.25; + double endSpeed = 2.0; + double increment = 0.25; - one, - onePointTwoFive, - onePointFive, - onePointSevenFive, + for (double speed = startSpeed; speed <= endSpeed; speed += increment) { + playSpeed.add(speed); + } - two, + return playSpeed; } -extension PlaySpeedExtension on PlaySpeed { - static final List _descList = [ - '0.25', - '0.5', - '0.75', - '正常', - '1.25', - '1.5', - '1.75', - '2.0', - ]; - String get description => _descList[index]; - - static final List _valueList = [ - 0.25, - 0.5, - 0.75, - 1.0, - 1.25, - 1.5, - 1.75, - 2.0, - ]; - double get value => _valueList[index]; - double get defaultValue => _valueList[3]; -} +// 导出 playSpeed 列表 +List playSpeed = generatePlaySpeedList(); diff --git a/lib/utils/storage.dart b/lib/utils/storage.dart index fea31d56..6283299b 100644 --- a/lib/utils/storage.dart +++ b/lib/utils/storage.dart @@ -181,6 +181,8 @@ class VideoBoxKey { videoSpeed = 'videoSpeed', // 播放顺序 playRepeat = 'playRepeat', + // 系统预设倍速 + playSpeedSystem = 'playSpeedSystem', // 默认倍速 playSpeedDefault = 'playSpeedDefault', // 默认长按倍速 From 6fdfcb888d968a871aa80cb9dd63530fba2fa6bb Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sun, 10 Mar 2024 19:41:23 +0800 Subject: [PATCH 179/220] =?UTF-8?q?feat:=20=E6=92=AD=E6=94=BE=E5=99=A8?= =?UTF-8?q?=E5=BA=95=E9=83=A8=E6=8E=A7=E5=88=B6=E6=A0=8F=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pl_player/models/bottom_control_type.dart | 10 + lib/plugin/pl_player/view.dart | 300 ++++++++++++------ .../pl_player/widgets/bottom_control.dart | 177 ++++++----- 3 files changed, 296 insertions(+), 191 deletions(-) create mode 100644 lib/plugin/pl_player/models/bottom_control_type.dart diff --git a/lib/plugin/pl_player/models/bottom_control_type.dart b/lib/plugin/pl_player/models/bottom_control_type.dart new file mode 100644 index 00000000..599f6e4f --- /dev/null +++ b/lib/plugin/pl_player/models/bottom_control_type.dart @@ -0,0 +1,10 @@ +enum BottomControlType { + pre, + playOrPause, + next, + time, + space, + fit, + speed, + fullscreen, +} diff --git a/lib/plugin/pl_player/view.dart b/lib/plugin/pl_player/view.dart index 988ec26d..0b2e652e 100644 --- a/lib/plugin/pl_player/view.dart +++ b/lib/plugin/pl_player/view.dart @@ -8,7 +8,6 @@ import 'package:get/get.dart'; import 'package:hive/hive.dart'; import 'package:media_kit/media_kit.dart'; import 'package:media_kit_video/media_kit_video.dart'; -import 'package:nil/nil.dart'; import 'package:pilipala/models/common/gesture_mode.dart'; import 'package:pilipala/plugin/pl_player/controller.dart'; import 'package:pilipala/plugin/pl_player/models/duration.dart'; @@ -19,12 +18,14 @@ import 'package:pilipala/utils/storage.dart'; import 'package:screen_brightness/screen_brightness.dart'; import '../../utils/global_data.dart'; +import 'models/bottom_control_type.dart'; import 'models/bottom_progress_behavior.dart'; import 'widgets/app_bar_ani.dart'; import 'widgets/backward_seek.dart'; import 'widgets/bottom_control.dart'; import 'widgets/common_btn.dart'; import 'widgets/forward_seek.dart'; +import 'widgets/play_pause_btn.dart'; class PLVideoPlayer extends StatefulWidget { const PLVideoPlayer({ @@ -32,6 +33,7 @@ class PLVideoPlayer extends StatefulWidget { this.headerControl, this.bottomControl, this.danmuWidget, + this.bottomList, super.key, }); @@ -39,6 +41,7 @@ class PLVideoPlayer extends StatefulWidget { final PreferredSizeWidget? headerControl; final PreferredSizeWidget? bottomControl; final Widget? danmuWidget; + final List? bottomList; @override State createState() => _PLVideoPlayerState(); @@ -48,26 +51,22 @@ class _PLVideoPlayerState extends State with TickerProviderStateMixin { late AnimationController animationController; late VideoController videoController; - final PLVideoPlayerController _ctr = Get.put(PLVideoPlayerController()); - // bool _mountSeekBackwardButton = false; - // bool _mountSeekForwardButton = false; - // bool _hideSeekBackwardButton = false; - // bool _hideSeekForwardButton = false; + final RxBool _mountSeekBackwardButton = false.obs; + final RxBool _mountSeekForwardButton = false.obs; + final RxBool _hideSeekBackwardButton = false.obs; + final RxBool _hideSeekForwardButton = false.obs; - // double _brightnessValue = 0.0; - // bool _brightnessIndicator = false; + final RxDouble _brightnessValue = 0.0.obs; + final RxBool _brightnessIndicator = false.obs; Timer? _brightnessTimer; - // double _volumeValue = 0.0; - // bool _volumeIndicator = false; + final RxDouble _volumeValue = 0.0.obs; + final RxBool _volumeIndicator = false.obs; Timer? _volumeTimer; - double _distance = 0.0; - // 初始手指落下位置 - // double _initTapPositoin = 0.0; - - // bool _volumeInterceptEventStream = false; + final RxDouble _distance = 0.0.obs; + final RxBool _volumeInterceptEventStream = false.obs; Box setting = GStrorage.setting; late FullScreenMode mode; @@ -82,11 +81,11 @@ class _PLVideoPlayerState extends State DateTime? lastFullScreenToggleTime; void onDoubleTapSeekBackward() { - _ctr.onDoubleTapSeekBackward(); + _mountSeekBackwardButton.value = true; } void onDoubleTapSeekForward() { - _ctr.onDoubleTapSeekForward(); + _mountSeekForwardButton.value = true; } // 双击播放、暂停 @@ -138,10 +137,10 @@ class _PLVideoPlayerState extends State Future.microtask(() async { try { FlutterVolumeController.updateShowSystemUI(true); - _ctr.volumeValue.value = (await FlutterVolumeController.getVolume())!; + _volumeValue.value = (await FlutterVolumeController.getVolume())!; FlutterVolumeController.addListener((double value) { - if (mounted && !_ctr.volumeInterceptEventStream.value) { - _ctr.volumeValue.value = value; + if (mounted && !_volumeInterceptEventStream.value) { + _volumeValue.value = value; } }); } catch (_) {} @@ -149,10 +148,10 @@ class _PLVideoPlayerState extends State Future.microtask(() async { try { - _ctr.brightnessValue.value = await ScreenBrightness().current; + _brightnessValue.value = await ScreenBrightness().current; ScreenBrightness().onCurrentBrightnessChanged.listen((double value) { if (mounted) { - _ctr.brightnessValue.value = value; + _brightnessValue.value = value; } }); } catch (_) {} @@ -164,14 +163,14 @@ class _PLVideoPlayerState extends State FlutterVolumeController.updateShowSystemUI(false); await FlutterVolumeController.setVolume(value); } catch (_) {} - _ctr.volumeValue.value = value; - _ctr.volumeIndicator.value = true; - _ctr.volumeInterceptEventStream.value = true; + _volumeValue.value = value; + _volumeIndicator.value = true; + _volumeInterceptEventStream.value = true; _volumeTimer?.cancel(); _volumeTimer = Timer(const Duration(milliseconds: 200), () { if (mounted) { - _ctr.volumeIndicator.value = false; - _ctr.volumeInterceptEventStream.value = false; + _volumeIndicator.value = false; + _volumeInterceptEventStream.value = false; } }); } @@ -180,11 +179,11 @@ class _PLVideoPlayerState extends State try { await ScreenBrightness().setScreenBrightness(value); } catch (_) {} - _ctr.brightnessIndicator.value = true; + _brightnessIndicator.value = true; _brightnessTimer?.cancel(); _brightnessTimer = Timer(const Duration(milliseconds: 200), () { if (mounted) { - _ctr.brightnessIndicator.value = false; + _brightnessIndicator.value = false; } }); widget.controller.brightness.value = value; @@ -197,6 +196,134 @@ class _PLVideoPlayerState extends State super.dispose(); } + // 动态构建底部控制条 + List buildBottomControl() { + const TextStyle textStyle = TextStyle( + color: Colors.white, + fontSize: 12, + ); + final PlPlayerController _ = widget.controller; + Map videoProgressWidgets = { + /// 上一集 + BottomControlType.pre: ComBtn( + icon: const Icon( + Icons.skip_previous_outlined, + size: 15, + color: Colors.white, + ), + fuc: () {}, + ), + + /// 播放暂停 + BottomControlType.playOrPause: PlayOrPauseButton( + controller: _, + ), + + /// 下一集 + BottomControlType.next: ComBtn( + icon: const Icon( + Icons.last_page_outlined, + size: 15, + color: Colors.white, + ), + fuc: () {}, + ), + + /// 时间进度 + BottomControlType.time: Row( + children: [ + Obx(() { + return Text( + _.durationSeconds.value >= 3600 + ? printDurationWithHours( + Duration(seconds: _.positionSeconds.value)) + : printDuration(Duration(seconds: _.positionSeconds.value)), + style: textStyle, + ); + }), + const SizedBox(width: 2), + const Text('/', style: textStyle), + const SizedBox(width: 2), + Obx( + () => Text( + _.durationSeconds.value >= 3600 + ? printDurationWithHours( + Duration(seconds: _.durationSeconds.value)) + : printDuration(Duration(seconds: _.durationSeconds.value)), + style: textStyle, + ), + ), + ], + ), + + /// 空白占位 + BottomControlType.space: const Spacer(), + + /// 画面比例 + BottomControlType.fit: SizedBox( + height: 30, + child: TextButton( + onPressed: () => _.toggleVideoFit(), + style: ButtonStyle( + padding: MaterialStateProperty.all(EdgeInsets.zero), + ), + child: Obx( + () => Text( + _.videoFitDEsc.value, + style: const TextStyle(color: Colors.white, fontSize: 13), + ), + ), + ), + ), + + /// 播放速度 + BottomControlType.speed: SizedBox( + width: 45, + height: 34, + child: TextButton( + style: ButtonStyle( + padding: MaterialStateProperty.all(EdgeInsets.zero), + ), + onPressed: () {}, + child: Obx( + () => Text( + '${_.playbackSpeed.toString()}X', + style: textStyle, + ), + ), + ), + ), + + /// 字幕 + /// 全屏 + BottomControlType.fullscreen: ComBtn( + icon: Obx( + () => Icon( + _.isFullScreen.value + ? FontAwesomeIcons.compress + : FontAwesomeIcons.expand, + size: 15, + color: Colors.white, + ), + ), + fuc: () => _.triggerFullScreen(), + ), + }; + final List list = []; + var userSpecifyItem = widget.bottomList ?? + [ + BottomControlType.playOrPause, + BottomControlType.time, + BottomControlType.space, + BottomControlType.fit, + BottomControlType.fullscreen, + ]; + for (var i = 0; i < userSpecifyItem.length; i++) { + list.add(videoProgressWidgets[userSpecifyItem[i]]!); + } + return list; + } + @override Widget build(BuildContext context) { final PlPlayerController _ = widget.controller; @@ -316,7 +443,7 @@ class _PLVideoPlayerState extends State () => Align( child: AnimatedOpacity( curve: Curves.easeInOut, - opacity: _ctr.volumeIndicator.value ? 1.0 : 0.0, + opacity: _volumeIndicator.value ? 1.0 : 0.0, duration: const Duration(milliseconds: 150), child: Container( alignment: Alignment.center, @@ -335,9 +462,9 @@ class _PLVideoPlayerState extends State width: 28.0, alignment: Alignment.centerRight, child: Icon( - _ctr.volumeValue.value == 0.0 + _volumeValue.value == 0.0 ? Icons.volume_off - : _ctr.volumeValue.value < 0.5 + : _volumeValue.value < 0.5 ? Icons.volume_down : Icons.volume_up, color: const Color(0xFFFFFFFF), @@ -346,7 +473,7 @@ class _PLVideoPlayerState extends State ), Expanded( child: Text( - '${(_ctr.volumeValue.value * 100.0).round()}%', + '${(_volumeValue.value * 100.0).round()}%', textAlign: TextAlign.center, style: const TextStyle( fontSize: 13.0, @@ -367,7 +494,7 @@ class _PLVideoPlayerState extends State () => Align( child: AnimatedOpacity( curve: Curves.easeInOut, - opacity: _ctr.brightnessIndicator.value ? 1.0 : 0.0, + opacity: _brightnessIndicator.value ? 1.0 : 0.0, duration: const Duration(milliseconds: 150), child: Container( alignment: Alignment.center, @@ -386,9 +513,9 @@ class _PLVideoPlayerState extends State width: 28.0, alignment: Alignment.centerRight, child: Icon( - _ctr.brightnessValue.value < 1.0 / 3.0 + _brightnessValue.value < 1.0 / 3.0 ? Icons.brightness_low - : _ctr.brightnessValue.value < 2.0 / 3.0 + : _brightnessValue.value < 2.0 / 3.0 ? Icons.brightness_medium : Icons.brightness_high, color: const Color(0xFFFFFFFF), @@ -398,7 +525,7 @@ class _PLVideoPlayerState extends State const SizedBox(width: 2.0), Expanded( child: Text( - '${(_ctr.brightnessValue.value * 100.0).round()}%', + '${(_brightnessValue.value * 100.0).round()}%', textAlign: TextAlign.center, style: const TextStyle( fontSize: 13.0, @@ -489,7 +616,6 @@ class _PLVideoPlayerState extends State pos.clamp(Duration.zero, _.duration.value); _.onUpdatedSliderProgress(result); _.onChangedSliderStart(); - // _initTapPositoin = tapPosition; }, onHorizontalDragEnd: (DragEndDetails details) { if (_.videoType.value == 'live' || _.controlsLock.value) { @@ -521,7 +647,7 @@ class _PLVideoPlayerState extends State : screenWidth * 9 / 16) * 3; final double brightness = - _ctr.brightnessValue.value - delta / level; + _brightnessValue.value - delta / level; final double result = brightness.clamp(0.0, 1.0); setBrightness(result); } else if (tapPosition < sectionWidth * 2) { @@ -530,29 +656,29 @@ class _PLVideoPlayerState extends State const double threshold = 7.0; // 滑动阈值 final bool flag = fullScreenGestureMode != FullScreenGestureMode.values.last; - if (dy > _distance && dy > threshold) { + if (dy > _distance.value && dy > threshold) { if (_.isFullScreen.value ^ flag) { lastFullScreenToggleTime = DateTime.now(); // 下滑退出全屏 await widget.controller.triggerFullScreen(status: flag); } - _distance = 0.0; - } else if (dy < _distance && dy < -threshold) { + _distance.value = 0.0; + } else if (dy < _distance.value && dy < -threshold) { if (!_.isFullScreen.value ^ flag) { lastFullScreenToggleTime = DateTime.now(); // 上滑进入全屏 await widget.controller.triggerFullScreen(status: !flag); } - _distance = 0.0; + _distance.value = 0.0; } - _distance = dy; + _distance.value = dy; } else { // 右边区域 👈 final double level = (_.isFullScreen.value ? Get.size.height : screenWidth * 9 / 16) * 3; - final double volume = _ctr.volumeValue.value - delta / level; + final double volume = _volumeValue.value - delta / level; final double result = volume.clamp(0.0, 1.0); setVolume(result); } @@ -585,9 +711,10 @@ class _PLVideoPlayerState extends State position: 'bottom', child: widget.bottomControl ?? BottomControl( - controller: widget.controller, - triggerFullScreen: - widget.controller.triggerFullScreen), + controller: widget.controller, + triggerFullScreen: _.triggerFullScreen, + buildBottomControl: buildBottomControl(), + ), ), ), ], @@ -607,23 +734,23 @@ class _PLVideoPlayerState extends State } if (defaultBtmProgressBehavior == BtmProgresBehavior.alwaysHide.code) { - return nil; + return const SizedBox(); } if (defaultBtmProgressBehavior == BtmProgresBehavior.onlyShowFullScreen.code && !_.isFullScreen.value) { - return nil; + return const SizedBox(); } else if (defaultBtmProgressBehavior == BtmProgresBehavior.onlyHideFullScreen.code && _.isFullScreen.value) { - return nil; + return const SizedBox(); } if (_.videoType.value == 'live') { return const SizedBox(); } if (value > max || max <= 0) { - return nil; + return const SizedBox(); } return Positioned( bottom: -1.5, @@ -720,18 +847,17 @@ class _PLVideoPlayerState extends State /// 点击 快进/快退 Obx( () => Visibility( - visible: _ctr.mountSeekBackwardButton.value || - _ctr.mountSeekForwardButton.value, + visible: + _mountSeekBackwardButton.value || _mountSeekForwardButton.value, child: Positioned.fill( child: Row( children: [ Expanded( - child: _ctr.mountSeekBackwardButton.value + child: _mountSeekBackwardButton.value ? TweenAnimationBuilder( tween: Tween( begin: 0.0, - end: - _ctr.hideSeekBackwardButton.value ? 0.0 : 1.0, + end: _hideSeekBackwardButton.value ? 0.0 : 1.0, ), duration: const Duration(milliseconds: 500), builder: (BuildContext context, double value, @@ -741,17 +867,15 @@ class _PLVideoPlayerState extends State child: child, ), onEnd: () { - if (_ctr.hideSeekBackwardButton.value) { - _ctr.hideSeekBackwardButton.value = false; - _ctr.mountSeekBackwardButton.value = false; + if (_hideSeekBackwardButton.value) { + _hideSeekBackwardButton.value = false; + _mountSeekBackwardButton.value = false; } }, child: BackwardSeekIndicator( - onChanged: (Duration value) { - // _seekBarDeltaValueNotifier.value = -value; - }, + onChanged: (Duration value) => {}, onSubmitted: (Duration value) { - _ctr.hideSeekBackwardButton.value = true; + _hideSeekBackwardButton.value = true; final Player player = widget.controller.videoPlayerController!; Duration result = player.state.position - value; @@ -764,7 +888,7 @@ class _PLVideoPlayerState extends State }, ), ) - : nil, + : const SizedBox(), ), Expanded( child: SizedBox( @@ -772,11 +896,11 @@ class _PLVideoPlayerState extends State ), ), Expanded( - child: _ctr.mountSeekForwardButton.value + child: _mountSeekForwardButton.value ? TweenAnimationBuilder( tween: Tween( begin: 0.0, - end: _ctr.hideSeekForwardButton.value ? 0.0 : 1.0, + end: _hideSeekForwardButton.value ? 0.0 : 1.0, ), duration: const Duration(milliseconds: 500), builder: (BuildContext context, double value, @@ -786,17 +910,15 @@ class _PLVideoPlayerState extends State child: child, ), onEnd: () { - if (_ctr.hideSeekForwardButton.value) { - _ctr.hideSeekForwardButton.value = false; - _ctr.mountSeekForwardButton.value = false; + if (_hideSeekForwardButton.value) { + _hideSeekForwardButton.value = false; + _mountSeekForwardButton.value = false; } }, child: ForwardSeekIndicator( - onChanged: (Duration value) { - // _seekBarDeltaValueNotifier.value = value; - }, + onChanged: (Duration value) => {}, onSubmitted: (Duration value) { - _ctr.hideSeekForwardButton.value = true; + _hideSeekForwardButton.value = true; final Player player = widget.controller.videoPlayerController!; Duration result = player.state.position + value; @@ -809,7 +931,7 @@ class _PLVideoPlayerState extends State }, ), ) - : nil, + : const SizedBox(), ), ], ), @@ -820,31 +942,3 @@ class _PLVideoPlayerState extends State ); } } - -class PLVideoPlayerController extends GetxController { - RxBool mountSeekBackwardButton = false.obs; - RxBool mountSeekForwardButton = false.obs; - RxBool hideSeekBackwardButton = false.obs; - RxBool hideSeekForwardButton = false.obs; - - RxDouble brightnessValue = 0.0.obs; - RxBool brightnessIndicator = false.obs; - - RxDouble volumeValue = 0.0.obs; - RxBool volumeIndicator = false.obs; - - RxDouble distance = 0.0.obs; - // 初始手指落下位置 - RxDouble initTapPositoin = 0.0.obs; - - RxBool volumeInterceptEventStream = false.obs; - - // 双击快进 展示样式 - void onDoubleTapSeekForward() { - mountSeekForwardButton.value = true; - } - - void onDoubleTapSeekBackward() { - mountSeekBackwardButton.value = true; - } -} diff --git a/lib/plugin/pl_player/widgets/bottom_control.dart b/lib/plugin/pl_player/widgets/bottom_control.dart index 8f21fc17..ebb71b54 100644 --- a/lib/plugin/pl_player/widgets/bottom_control.dart +++ b/lib/plugin/pl_player/widgets/bottom_control.dart @@ -1,17 +1,20 @@ import 'package:audio_video_progress_bar/audio_video_progress_bar.dart'; import 'package:flutter/material.dart'; -import 'package:font_awesome_flutter/font_awesome_flutter.dart'; import 'package:get/get.dart'; import 'package:nil/nil.dart'; import 'package:pilipala/plugin/pl_player/index.dart'; -import 'package:pilipala/plugin/pl_player/widgets/play_pause_btn.dart'; import 'package:pilipala/utils/feed_back.dart'; class BottomControl extends StatelessWidget implements PreferredSizeWidget { final PlPlayerController? controller; final Function? triggerFullScreen; - const BottomControl({this.controller, this.triggerFullScreen, Key? key}) - : super(key: key); + final List? buildBottomControl; + const BottomControl({ + this.controller, + this.triggerFullScreen, + this.buildBottomControl, + Key? key, + }) : super(key: key); @override Size get preferredSize => const Size(double.infinity, kToolbarHeight); @@ -20,11 +23,6 @@ class BottomControl extends StatelessWidget implements PreferredSizeWidget { Widget build(BuildContext context) { Color colorTheme = Theme.of(context).colorScheme.primary; final _ = controller!; - const textStyle = TextStyle( - color: Colors.white, - fontSize: 12, - ); - return Container( color: Colors.transparent, height: 90, @@ -71,86 +69,89 @@ class BottomControl extends StatelessWidget implements PreferredSizeWidget { }, ), Row( - children: [ - PlayOrPauseButton( - controller: _, - ), - const SizedBox(width: 4), - // 播放时间 - Obx(() { - return Text( - _.durationSeconds.value >= 3600 - ? printDurationWithHours( - Duration(seconds: _.positionSeconds.value)) - : printDuration( - Duration(seconds: _.positionSeconds.value)), - style: textStyle, - ); - }), - const SizedBox(width: 2), - const Text('/', style: textStyle), - const SizedBox(width: 2), - Obx( - () => Text( - _.durationSeconds.value >= 3600 - ? printDurationWithHours( - Duration(seconds: _.durationSeconds.value)) - : printDuration( - Duration(seconds: _.durationSeconds.value)), - style: textStyle, - ), - ), - const Spacer(), - // 倍速 - // Obx( - // () => SizedBox( - // width: 45, - // height: 34, - // child: TextButton( - // style: ButtonStyle( - // padding: MaterialStateProperty.all(EdgeInsets.zero), - // ), - // onPressed: () { - // _.togglePlaybackSpeed(); - // }, - // child: Text( - // '${_.playbackSpeed.toString()}X', - // style: textStyle, - // ), - // ), - // ), - // ), - SizedBox( - height: 30, - child: TextButton( - onPressed: () => _.toggleVideoFit(), - style: ButtonStyle( - padding: MaterialStateProperty.all(EdgeInsets.zero), - ), - child: Obx( - () => Text( - _.videoFitDEsc.value, - style: const TextStyle(color: Colors.white, fontSize: 13), - ), - ), - ), - ), - const SizedBox(width: 10), - // 全屏 - Obx( - () => ComBtn( - icon: Icon( - _.isFullScreen.value - ? FontAwesomeIcons.compress - : FontAwesomeIcons.expand, - size: 15, - color: Colors.white, - ), - fuc: () => triggerFullScreen!(), - ), - ), - ], + children: [...buildBottomControl!], ), + // Row( + // children: [ + // PlayOrPauseButton( + // controller: _, + // ), + // const SizedBox(width: 4), + // // 播放时间 + // Obx(() { + // return Text( + // _.durationSeconds.value >= 3600 + // ? printDurationWithHours( + // Duration(seconds: _.positionSeconds.value)) + // : printDuration( + // Duration(seconds: _.positionSeconds.value)), + // style: textStyle, + // ); + // }), + // const SizedBox(width: 2), + // const Text('/', style: textStyle), + // const SizedBox(width: 2), + // Obx( + // () => Text( + // _.durationSeconds.value >= 3600 + // ? printDurationWithHours( + // Duration(seconds: _.durationSeconds.value)) + // : printDuration( + // Duration(seconds: _.durationSeconds.value)), + // style: textStyle, + // ), + // ), + // const Spacer(), + // // 倍速 + // // Obx( + // // () => SizedBox( + // // width: 45, + // // height: 34, + // // child: TextButton( + // // style: ButtonStyle( + // // padding: MaterialStateProperty.all(EdgeInsets.zero), + // // ), + // // onPressed: () { + // // _.togglePlaybackSpeed(); + // // }, + // // child: Text( + // // '${_.playbackSpeed.toString()}X', + // // style: textStyle, + // // ), + // // ), + // // ), + // // ), + // SizedBox( + // height: 30, + // child: TextButton( + // onPressed: () => _.toggleVideoFit(), + // style: ButtonStyle( + // padding: MaterialStateProperty.all(EdgeInsets.zero), + // ), + // child: Obx( + // () => Text( + // _.videoFitDEsc.value, + // style: const TextStyle(color: Colors.white, fontSize: 13), + // ), + // ), + // ), + // ), + // const SizedBox(width: 10), + // // 全屏 + // Obx( + // () => ComBtn( + // icon: Icon( + // _.isFullScreen.value + // ? FontAwesomeIcons.compress + // : FontAwesomeIcons.expand, + // size: 15, + // color: Colors.white, + // ), + // fuc: () => triggerFullScreen!(), + // ), + // ), + // ], + // ), const SizedBox(height: 12), ], ), From 31405750e619914c0dabb0dfbdb015270203b1e0 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sun, 10 Mar 2024 22:44:07 +0800 Subject: [PATCH 180/220] =?UTF-8?q?mod:=20=E8=A7=86=E9=A2=91=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E9=A1=B5=E5=B8=83=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/video/detail/controller.dart | 84 ++++ lib/pages/video/detail/view.dart | 450 +++++++++--------- .../video/detail/widgets/header_control.dart | 119 ----- 3 files changed, 308 insertions(+), 345 deletions(-) diff --git a/lib/pages/video/detail/controller.dart b/lib/pages/video/detail/controller.dart index b4005b5a..40723efa 100644 --- a/lib/pages/video/detail/controller.dart +++ b/lib/pages/video/detail/controller.dart @@ -5,6 +5,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:get/get.dart'; import 'package:hive/hive.dart'; +import 'package:ns_danmaku/ns_danmaku.dart'; import 'package:pilipala/http/constants.dart'; import 'package:pilipala/http/video.dart'; import 'package:pilipala/models/common/reply_type.dart'; @@ -19,6 +20,7 @@ import 'package:pilipala/utils/utils.dart'; import 'package:pilipala/utils/video_utils.dart'; import 'package:screen_brightness/screen_brightness.dart'; +import '../../../http/danmaku.dart'; import '../../../utils/id_utils.dart'; import 'widgets/header_control.dart'; @@ -383,4 +385,86 @@ class VideoDetailController extends GetxController ? replyReplyBottomSheetCtr!.close() : print('replyReplyBottomSheetCtr is null'); } + + /// 发送弹幕 + void showShootDanmakuSheet() { + final TextEditingController textController = TextEditingController(); + bool isSending = false; // 追踪是否正在发送 + showDialog( + context: Get.context!, + builder: (BuildContext context) { + // TODO: 支持更多类型和颜色的弹幕 + return AlertDialog( + title: const Text('发送弹幕'), + content: StatefulBuilder( + builder: (BuildContext context, StateSetter setState) { + return TextField( + controller: textController, + ); + }), + actions: [ + TextButton( + onPressed: () => Get.back(), + child: Text( + '取消', + style: TextStyle(color: Theme.of(context).colorScheme.outline), + ), + ), + StatefulBuilder( + builder: (BuildContext context, StateSetter setState) { + return TextButton( + onPressed: isSending + ? null + : () async { + final String msg = textController.text; + if (msg.isEmpty) { + SmartDialog.showToast('弹幕内容不能为空'); + return; + } else if (msg.length > 100) { + SmartDialog.showToast('弹幕内容不能超过100个字符'); + return; + } + setState(() { + isSending = true; // 开始发送，更新状态 + }); + //修改按钮文字 + // SmartDialog.showToast('弹幕发送中,\n$msg'); + final dynamic res = await DanmakaHttp.shootDanmaku( + oid: cid.value, + msg: textController.text, + bvid: bvid, + progress: + plPlayerController.position.value.inMilliseconds, + type: 1, + ); + setState(() { + isSending = false; // 发送结束，更新状态 + }); + if (res['status']) { + SmartDialog.showToast('发送成功'); + // 发送成功，自动预览该弹幕，避免重新请求 + // TODO: 暂停状态下预览弹幕仍会移动与计时，可考虑添加到dmSegList或其他方式实现 + plPlayerController.danmakuController?.addItems([ + DanmakuItem( + msg, + color: Colors.white, + time: plPlayerController + .position.value.inMilliseconds, + type: DanmakuItemType.scroll, + isSend: true, + ) + ]); + Get.back(); + } else { + SmartDialog.showToast('发送失败，错误信息为${res['msg']}'); + } + }, + child: Text(isSending ? '发送中...' : '发送'), + ); + }) + ], + ); + }, + ); + } } diff --git a/lib/pages/video/detail/view.dart b/lib/pages/video/detail/view.dart index 04d41b2e..e8ca935d 100644 --- a/lib/pages/video/detail/view.dart +++ b/lib/pages/video/detail/view.dart @@ -25,7 +25,7 @@ import 'package:pilipala/services/service_locator.dart'; import 'package:pilipala/utils/storage.dart'; import '../../../services/shutdown_timer_service.dart'; -import 'widgets/header_control.dart'; +import 'widgets/app_bar.dart'; class VideoDetailPage extends StatefulWidget { const VideoDetailPage({Key? key}) : super(key: key); @@ -38,7 +38,7 @@ class VideoDetailPage extends StatefulWidget { class _VideoDetailPageState extends State with TickerProviderStateMixin, RouteAware { - late VideoDetailController videoDetailController; + late VideoDetailController vdCtr; PlPlayerController? plPlayerController; final ScrollController _extendNestCtr = ScrollController(); late StreamController appbarStream; @@ -65,20 +65,18 @@ class _VideoDetailPageState extends State void initState() { super.initState(); heroTag = Get.arguments['heroTag']; - videoDetailController = Get.put(VideoDetailController(), tag: heroTag); + vdCtr = Get.put(VideoDetailController(), tag: heroTag); videoIntroController = Get.put( VideoIntroController(bvid: Get.parameters['bvid']!), tag: heroTag); videoIntroController.videoDetail.listen((value) { - videoPlayerServiceHandler.onVideoDetailChange( - value, videoDetailController.cid.value); + videoPlayerServiceHandler.onVideoDetailChange(value, vdCtr.cid.value); }); bangumiIntroController = Get.put(BangumiIntroController(), tag: heroTag); bangumiIntroController.bangumiDetail.listen((value) { - videoPlayerServiceHandler.onVideoDetailChange( - value, videoDetailController.cid.value); + videoPlayerServiceHandler.onVideoDetailChange(value, vdCtr.cid.value); }); - videoDetailController.cid.listen((p0) { + vdCtr.cid.listen((p0) { videoPlayerServiceHandler.onVideoDetailChange( bangumiIntroController.bangumiDetail.value, p0); }); @@ -93,16 +91,16 @@ class _VideoDetailPageState extends State appbarStreamListen(); fullScreenStatusListener(); if (Platform.isAndroid) { - floating = videoDetailController.floating!; + floating = vdCtr.floating!; autoEnterPip(); } } // 获取视频资源，初始化播放器 Future videoSourceInit() async { - _futureBuilderFuture = videoDetailController.queryVideoUrl(); - if (videoDetailController.autoPlay.value) { - plPlayerController = videoDetailController.plPlayerController; + _futureBuilderFuture = vdCtr.queryVideoUrl(); + if (vdCtr.autoPlay.value) { + plPlayerController = vdCtr.plPlayerController; plPlayerController!.addStatusLister(playerListener); } } @@ -131,10 +129,10 @@ class _VideoDetailPageState extends State /// 顺序播放 列表循环 if (plPlayerController!.playRepeat != PlayRepeat.pause && plPlayerController!.playRepeat != PlayRepeat.singleCycle) { - if (videoDetailController.videoType == SearchType.video) { + if (vdCtr.videoType == SearchType.video) { videoIntroController.nextPlay(); } - if (videoDetailController.videoType == SearchType.media_bangumi) { + if (vdCtr.videoType == SearchType.media_bangumi) { bangumiIntroController.nextPlay(); } } @@ -146,8 +144,7 @@ class _VideoDetailPageState extends State } // 播放完展示控制栏 try { - PiPStatus currentStatus = - await videoDetailController.floating!.pipStatus; + PiPStatus currentStatus = await vdCtr.floating!.pipStatus; if (currentStatus == PiPStatus.disabled) { plPlayerController!.onLockControl(false); } @@ -168,17 +165,17 @@ class _VideoDetailPageState extends State /// 未开启自动播放时触发播放 Future handlePlay() async { - await videoDetailController.playerInit(); - plPlayerController = videoDetailController.plPlayerController; + await vdCtr.playerInit(); + plPlayerController = vdCtr.plPlayerController; plPlayerController!.addStatusLister(playerListener); - videoDetailController.autoPlay.value = true; - videoDetailController.isShowCover.value = false; + vdCtr.autoPlay.value = true; + vdCtr.isShowCover.value = false; } void fullScreenStatusListener() { plPlayerController?.isFullScreen.listen((bool isFullScreen) { if (isFullScreen) { - videoDetailController.hiddenReplyReplyPanel(); + vdCtr.hiddenReplyReplyPanel(); } }); } @@ -190,8 +187,8 @@ class _VideoDetailPageState extends State plPlayerController!.removeStatusLister(playerListener); plPlayerController!.dispose(); } - if (videoDetailController.floating != null) { - videoDetailController.floating!.dispose(); + if (vdCtr.floating != null) { + vdCtr.floating!.dispose(); } videoPlayerServiceHandler.onVideoDetailDispose(); if (Platform.isAndroid) { @@ -207,10 +204,10 @@ class _VideoDetailPageState extends State /// 开启 if (setting.get(SettingBoxKey.enableAutoBrightness, defaultValue: false) as bool) { - videoDetailController.brightness = plPlayerController!.brightness.value; + vdCtr.brightness = plPlayerController!.brightness.value; } if (plPlayerController != null) { - videoDetailController.defaultST = plPlayerController!.position.value; + vdCtr.defaultST = plPlayerController!.position.value; videoIntroController.isPaused = true; plPlayerController!.removeStatusLister(playerListener); plPlayerController!.pause(); @@ -226,17 +223,16 @@ class _VideoDetailPageState extends State plPlayerController!.videoPlayerController != null) { setState(() => isShowing = true); } - videoDetailController.isFirstTime = false; + vdCtr.isFirstTime = false; final bool autoplay = autoPlayEnable; - videoDetailController.playerInit(autoplay: autoplay); + vdCtr.playerInit(autoplay: autoplay); /// 未开启自动播放时，未播放跳转下一页返回/播放后跳转下一页返回 - videoDetailController.autoPlay.value = - !videoDetailController.isShowCover.value; + vdCtr.autoPlay.value = !vdCtr.isShowCover.value; videoIntroController.isPaused = false; if (_extendNestCtr.position.pixels == 0 && autoplay) { await Future.delayed(const Duration(milliseconds: 300)); - plPlayerController?.seekTo(videoDetailController.defaultST); + plPlayerController?.seekTo(vdCtr.defaultST); plPlayerController?.play(); } plPlayerController?.addStatusLister(playerListener); @@ -259,9 +255,158 @@ class _VideoDetailPageState extends State @override Widget build(BuildContext context) { - final double videoHeight = MediaQuery.sizeOf(context).width * 9 / 16; + // final double videoHeight = MediaQuery.sizeOf(context).width * 9 / 16; + final sizeContext = MediaQuery.sizeOf(context); + final _context = MediaQuery.of(context); + late double defaultVideoHeight = sizeContext.width * 9 / 16; + late RxDouble videoHeight = defaultVideoHeight.obs; final double pinnedHeaderHeight = - statusBarHeight + kToolbarHeight + videoHeight; + statusBarHeight + kToolbarHeight + videoHeight.value; + // ignore: no_leading_underscores_for_local_identifiers + + // 竖屏 + final bool isPortrait = _context.orientation == Orientation.portrait; + // 横屏 + final bool isLandscape = _context.orientation == Orientation.landscape; + final Rx isFullScreen = plPlayerController?.isFullScreen ?? false.obs; + // 全屏时高度撑满 + if (isLandscape || isFullScreen.value == true) { + videoHeight.value = Get.size.height; + enterFullScreen(); + } else { + videoHeight.value = defaultVideoHeight; + exitFullScreen(); + } + + /// 播放器面板 + Widget videoPlayerPanel = FutureBuilder( + future: _futureBuilderFuture, + builder: (BuildContext context, AsyncSnapshot snapshot) { + if (snapshot.hasData && snapshot.data['status']) { + return Obx( + () { + return !vdCtr.autoPlay.value + ? const SizedBox() + : PLVideoPlayer( + controller: plPlayerController!, + headerControl: vdCtr.headerControl, + danmuWidget: Obx( + () => PlDanmaku( + key: Key(vdCtr.danmakuCid.value.toString()), + cid: vdCtr.danmakuCid.value, + playerController: plPlayerController!, + ), + ), + ); + }, + ); + } else { + // 加载失败异常处理 + return const SizedBox(); + } + }, + ); + + /// tabbar + Widget tabbarBuild = SizedBox( + width: double.infinity, + height: 45, + child: Row( + children: [ + Expanded( + child: TabBar( + controller: vdCtr.tabCtr, + dividerColor: Colors.transparent, + tabs: vdCtr.tabs.map((String name) => Tab(text: name)).toList(), + ), + ), + SizedBox( + width: 200, + child: Center( + child: Row( + mainAxisAlignment: MainAxisAlignment.end, + children: [ + SizedBox( + height: 32, + child: TextButton( + style: ButtonStyle( + padding: MaterialStateProperty.all(EdgeInsets.zero), + ), + onPressed: () => vdCtr.showShootDanmakuSheet(), + child: const Text( + '发弹幕', + ), + ), + ), + const SizedBox(width: 4), + SizedBox( + width: 34, + height: 32, + child: TextButton( + style: ButtonStyle( + padding: MaterialStateProperty.all(EdgeInsets.zero), + ), + onPressed: () { + plPlayerController?.isOpenDanmu.value = + !(plPlayerController?.isOpenDanmu.value ?? false); + }, + child: Obx(() => Text( + '弹', + style: TextStyle( + color: (plPlayerController?.isOpenDanmu.value ?? + false) + ? Theme.of(context).colorScheme.primary + : Theme.of(context).colorScheme.outline, + ), + )), + ), + ), + const SizedBox(width: 14), + ], + ), + ), + ), + ], + ), + ); + + /// 手动播放 + Widget handlePlayPanel() { + return Stack( + children: [ + GestureDetector( + onTap: () { + handlePlay(); + }, + child: NetworkImgLayer( + type: 'emote', + src: vdCtr.videoItem['pic'], + width: Get.width, + height: videoHeight.value, + ), + ), + Positioned( + top: 0, + left: 0, + right: 0, + child: buildCustomAppBar(), + ), + Positioned( + right: 12, + bottom: 10, + child: IconButton( + tooltip: '播放', + onPressed: () => handlePlay(), + icon: Image.asset( + 'assets/images/play.png', + width: 60, + height: 60, + )), + ), + ], + ); + } + Widget childWhenDisabled = SafeArea( top: MediaQuery.of(context).orientation == Orientation.portrait && plPlayerController?.isFullScreen.value == true, @@ -273,7 +418,7 @@ class _VideoDetailPageState extends State children: [ Scaffold( resizeToAvoidBottomInset: false, - key: videoDetailController.scaffoldKey, + key: vdCtr.scaffoldKey, backgroundColor: Colors.black, appBar: PreferredSize( preferredSize: const Size.fromHeight(0), @@ -299,21 +444,19 @@ class _VideoDetailPageState extends State return SliverAppBar( automaticallyImplyLeading: false, // 假装使用一个非空变量，避免Obx检测不到而罢工 - pinned: videoDetailController.autoPlay.value ^ - false ^ - videoDetailController.autoPlay.value, + pinned: vdCtr.autoPlay.value, elevation: 0, scrolledUnderElevation: 0, forceElevated: innerBoxIsScrolled, expandedHeight: MediaQuery.of(context).orientation == Orientation.landscape || plPlayerController?.isFullScreen.value == true - ? MediaQuery.sizeOf(context).height - + ? (MediaQuery.sizeOf(context).height - (MediaQuery.of(context).orientation == Orientation.landscape ? 0 - : MediaQuery.of(context).padding.top) - : videoHeight, + : MediaQuery.of(context).padding.top)) + : videoHeight.value, backgroundColor: Colors.black, flexibleSpace: FlexibleSpaceBar( background: PopScope( @@ -333,108 +476,27 @@ class _VideoDetailPageState extends State child: LayoutBuilder( builder: (BuildContext context, BoxConstraints boxConstraints) { - final double maxWidth = - boxConstraints.maxWidth; - final double maxHeight = - boxConstraints.maxHeight; + // final double maxWidth = + // boxConstraints.maxWidth; + // final double maxHeight = + // boxConstraints.maxHeight; return Stack( children: [ - if (isShowing) - FutureBuilder( - future: _futureBuilderFuture, - builder: (BuildContext context, - AsyncSnapshot snapshot) { - if (snapshot.hasData && - snapshot.data['status']) { - return Obx( - () => - !videoDetailController - .autoPlay.value - ? nil - : PLVideoPlayer( - controller: - plPlayerController!, - headerControl: - videoDetailController - .headerControl, - danmuWidget: Obx( - () => PlDanmaku( - key: Key(videoDetailController - .danmakuCid - .value - .toString()), - cid: videoDetailController - .danmakuCid - .value, - playerController: - plPlayerController!, - ), - ), - ), - ); - } else { - return buildCustomAppBar(); - } - }, - ), + if (isShowing) videoPlayerPanel, /// 关闭自动播放时 手动播放 - if (!videoDetailController - .autoPlay.value) ...[ - Obx( - () => Visibility( - visible: videoDetailController - .isShowCover.value, - child: Positioned( - top: 0, - left: 0, - right: 0, - child: GestureDetector( - onTap: () { - handlePlay(); - }, - child: NetworkImgLayer( - type: 'emote', - src: videoDetailController - .videoItem['pic'], - width: maxWidth, - height: maxHeight, - ), - ), - ), + Obx( + () => Visibility( + visible: !vdCtr.autoPlay.value && + vdCtr.isShowCover.value, + child: Positioned( + top: 0, + left: 0, + right: 0, + child: handlePlayPanel(), ), ), - Obx( - () => Visibility( - visible: videoDetailController - .isShowCover.value && - videoDetailController - .isEffective.value, - child: Stack( - children: [ - Positioned( - top: 0, - left: 0, - right: 0, - child: buildCustomAppBar(), - ), - Positioned( - right: 12, - bottom: 10, - child: IconButton( - tooltip: '播放', - onPressed: () => - handlePlay(), - icon: Image.asset( - 'assets/images/play.png', - width: 60, - height: 60, - )), - ), - ], - )), - ), - ] + ), ], ); }, @@ -445,18 +507,16 @@ class _VideoDetailPageState extends State ), ]; }, - // pinnedHeaderSliverHeightBuilder: () { - // return playerStatus != PlayerStatus.playing - // ? statusBarHeight + kToolbarHeight - // : pinnedHeaderHeight; - // }, + /// 不收回 pinnedHeaderSliverHeightBuilder: () { return MediaQuery.of(context).orientation == Orientation.landscape || plPlayerController?.isFullScreen.value == true ? MediaQuery.sizeOf(context).height - : pinnedHeaderHeight; + : playerStatus != PlayerStatus.playing + ? kToolbarHeight + : pinnedHeaderHeight; }, onlyOneScrollInBody: true, body: ColoredBox( @@ -464,54 +524,23 @@ class _VideoDetailPageState extends State color: Theme.of(context).colorScheme.background, child: Column( children: [ - Opacity( - opacity: 0, - child: SizedBox( - width: double.infinity, - height: 0, - child: Obx( - () => TabBar( - controller: videoDetailController.tabCtr, - dividerColor: Colors.transparent, - indicatorColor: - Theme.of(context).colorScheme.background, - tabs: videoDetailController.tabs - .map((String name) => Tab(text: name)) - .toList(), - ), - ), - ), - ), + tabbarBuild, Expanded( child: TabBarView( - controller: videoDetailController.tabCtr, + controller: vdCtr.tabCtr, children: [ Builder( builder: (BuildContext context) { return CustomScrollView( key: const PageStorageKey('简介'), slivers: [ - if (videoDetailController.videoType == - SearchType.video) ...[ - VideoIntroPanel( - bvid: videoDetailController.bvid), - ] else if (videoDetailController.videoType == + if (vdCtr.videoType == SearchType.video) ...[ + VideoIntroPanel(bvid: vdCtr.bvid), + ] else if (vdCtr.videoType == SearchType.media_bangumi) ...[ Obx(() => BangumiIntroPanel( - cid: videoDetailController.cid.value)), + cid: vdCtr.cid.value)), ], - // if (videoDetailController.videoType == - // SearchType.video) ...[ - // SliverPersistentHeader( - // floating: true, - // pinned: true, - // delegate: SliverHeaderDelegate( - // height: 50, - // child: - // const MenuRow(loadingStatus: false), - // ), - // ), - // ], SliverToBoxAdapter( child: Divider( indent: 12, @@ -528,8 +557,8 @@ class _VideoDetailPageState extends State ), Obx( () => VideoReplyPanel( - bvid: videoDetailController.bvid, - oid: videoDetailController.oid.value, + bvid: vdCtr.bvid, + oid: vdCtr.oid.value, ), ) ], @@ -543,56 +572,26 @@ class _VideoDetailPageState extends State /// 重新进入会刷新 // 播放完成/暂停播放 - // StreamBuilder( - // stream: appbarStream.stream, - // initialData: 0, - // builder: ((context, snapshot) { - // return ScrollAppBar( - // snapshot.data!.toDouble(), - // () => continuePlay(), - // playerStatus, - // null, - // ); - // }), - // ) + StreamBuilder( + stream: appbarStream.stream, + initialData: 0, + builder: ((context, snapshot) { + return ScrollAppBar( + snapshot.data!.toDouble(), + () => continuePlay(), + playerStatus, + null, + ); + }), + ) ], ), ); - Widget childWhenEnabled = FutureBuilder( - key: Key(heroTag), - future: _futureBuilderFuture, - builder: (BuildContext context, AsyncSnapshot snapshot) { - if (snapshot.hasData && snapshot.data['status']) { - return Obx( - () => !videoDetailController.autoPlay.value - ? const SizedBox() - : PLVideoPlayer( - controller: plPlayerController!, - headerControl: HeaderControl( - controller: plPlayerController, - videoDetailCtr: videoDetailController, - bvid: videoDetailController.bvid, - videoType: videoDetailController.videoType, - ), - danmuWidget: Obx( - () => PlDanmaku( - key: Key( - videoDetailController.danmakuCid.value.toString()), - cid: videoDetailController.danmakuCid.value, - playerController: plPlayerController!, - ), - ), - ), - ); - } else { - return nil; - } - }, - ); + if (Platform.isAndroid) { return PiPSwitcher( childWhenDisabled: childWhenDisabled, - childWhenEnabled: childWhenEnabled, + childWhenEnabled: videoPlayerPanel, floating: floating, ); } else { @@ -633,8 +632,7 @@ class _VideoDetailPageState extends State ComBtn( icon: const Icon(Icons.history_outlined, size: 22), fuc: () async { - var res = await UserHttp.toViewLater( - bvid: videoDetailController.bvid); + var res = await UserHttp.toViewLater(bvid: vdCtr.bvid); SmartDialog.showToast(res['msg']); }, ), diff --git a/lib/pages/video/detail/widgets/header_control.dart b/lib/pages/video/detail/widgets/header_control.dart index e72e6a69..a8414c18 100644 --- a/lib/pages/video/detail/widgets/header_control.dart +++ b/lib/pages/video/detail/widgets/header_control.dart @@ -1,5 +1,4 @@ import 'dart:io'; -import 'dart:math'; import 'package:floating/floating.dart'; import 'package:flutter/material.dart'; @@ -17,7 +16,6 @@ import 'package:pilipala/pages/video/detail/introduction/widgets/menu_row.dart'; import 'package:pilipala/plugin/pl_player/index.dart'; import 'package:pilipala/plugin/pl_player/models/play_repeat.dart'; import 'package:pilipala/utils/storage.dart'; -import 'package:pilipala/http/danmaku.dart'; import 'package:pilipala/services/shutdown_timer_service.dart'; import '../../../../models/common/search_type.dart'; import '../../../../models/video_detail_res.dart'; @@ -221,88 +219,6 @@ class _HeaderControlState extends State { ); } - /// 发送弹幕 - void showShootDanmakuSheet() { - final TextEditingController textController = TextEditingController(); - bool isSending = false; // 追踪是否正在发送 - showDialog( - context: Get.context!, - builder: (BuildContext context) { - // TODO: 支持更多类型和颜色的弹幕 - return AlertDialog( - title: const Text('发送弹幕（测试）'), - content: StatefulBuilder( - builder: (BuildContext context, StateSetter setState) { - return TextField( - controller: textController, - ); - }), - actions: [ - TextButton( - onPressed: () => Get.back(), - child: Text( - '取消', - style: TextStyle(color: Theme.of(context).colorScheme.outline), - ), - ), - StatefulBuilder( - builder: (BuildContext context, StateSetter setState) { - return TextButton( - onPressed: isSending - ? null - : () async { - final String msg = textController.text; - if (msg.isEmpty) { - SmartDialog.showToast('弹幕内容不能为空'); - return; - } else if (msg.length > 100) { - SmartDialog.showToast('弹幕内容不能超过100个字符'); - return; - } - setState(() { - isSending = true; // 开始发送，更新状态 - }); - //修改按钮文字 - // SmartDialog.showToast('弹幕发送中,\n$msg'); - final dynamic res = await DanmakaHttp.shootDanmaku( - oid: widget.videoDetailCtr!.cid.value, - msg: textController.text, - bvid: widget.videoDetailCtr!.bvid, - progress: - widget.controller!.position.value.inMilliseconds, - type: 1, - ); - setState(() { - isSending = false; // 发送结束，更新状态 - }); - if (res['status']) { - SmartDialog.showToast('发送成功'); - // 发送成功，自动预览该弹幕，避免重新请求 - // TODO: 暂停状态下预览弹幕仍会移动与计时，可考虑添加到dmSegList或其他方式实现 - widget.controller!.danmakuController!.addItems([ - DanmakuItem( - msg, - color: Colors.white, - time: widget - .controller!.position.value.inMilliseconds, - type: DanmakuItemType.scroll, - isSend: true, - ) - ]); - Get.back(); - } else { - SmartDialog.showToast('发送失败，错误信息为${res['msg']}'); - } - }, - child: Text(isSending ? '发送中...' : '发送'), - ); - }) - ], - ); - }, - ); - } - /// 定时关闭 void scheduleExit() async { const List scheduleTimeChoices = [ @@ -1166,41 +1082,6 @@ class _HeaderControlState extends State { // ), // fuc: () => _.screenshot(), // ), - SizedBox( - width: 56, - height: 34, - child: TextButton( - style: ButtonStyle( - padding: MaterialStateProperty.all(EdgeInsets.zero), - ), - onPressed: () => showShootDanmakuSheet(), - child: const Text( - '发弹幕', - style: textStyle, - ), - ), - ), - SizedBox( - width: 34, - height: 34, - child: Obx( - () => IconButton( - style: ButtonStyle( - padding: MaterialStateProperty.all(EdgeInsets.zero), - ), - onPressed: () { - _.isOpenDanmu.value = !_.isOpenDanmu.value; - }, - icon: Icon( - _.isOpenDanmu.value - ? Icons.subtitles_outlined - : Icons.subtitles_off_outlined, - size: 19, - color: Colors.white, - ), - ), - ), - ), SizedBox(width: buttonSpace), if (Platform.isAndroid) ...[ SizedBox( From 98aaca286bd7e5b7eedf88cd95bf613606968d60 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Mon, 11 Mar 2024 00:02:11 +0800 Subject: [PATCH 181/220] =?UTF-8?q?feat:=20=E7=9B=B4=E6=92=AD=E7=94=BB?= =?UTF-8?q?=E8=B4=A8=E5=88=87=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/models/live/quality.dart | 43 +++++++++++++++++++ lib/pages/live_room/controller.dart | 34 ++++++++++++++- .../live_room/widgets/bottom_control.dart | 25 +++++++++++ 3 files changed, 101 insertions(+), 1 deletion(-) create mode 100644 lib/models/live/quality.dart diff --git a/lib/models/live/quality.dart b/lib/models/live/quality.dart new file mode 100644 index 00000000..47938416 --- /dev/null +++ b/lib/models/live/quality.dart @@ -0,0 +1,43 @@ +enum LiveQuality { + dolby, + super4K, + origin, + veryHigh, + bluRay, + superHD, + smooth, + flunt, +} + +extension LiveQualityCode on LiveQuality { + static final List _codeList = [ + 30000, + 20000, + 10000, + 400, + 250, + 150, + 80, + ]; + int get code => _codeList[index]; + + static LiveQuality? fromCode(int code) { + final index = _codeList.indexOf(code); + if (index != -1) { + return LiveQuality.values[index]; + } + return null; + } +} + +extension VideoQualityDesc on LiveQuality { + static final List _descList = [ + '杜比', + '4K', + '原画', + '蓝光', + '超清', + '流畅', + ]; + get description => _descList[index]; +} diff --git a/lib/pages/live_room/controller.dart b/lib/pages/live_room/controller.dart index 2bb1cd0a..a1878c74 100644 --- a/lib/pages/live_room/controller.dart +++ b/lib/pages/live_room/controller.dart @@ -1,6 +1,7 @@ import 'package:get/get.dart'; import 'package:pilipala/http/constants.dart'; import 'package:pilipala/http/live.dart'; +import 'package:pilipala/models/live/quality.dart'; import 'package:pilipala/models/live/room_info.dart'; import 'package:pilipala/plugin/pl_player/index.dart'; import '../../models/live/room_info_h5.dart'; @@ -19,10 +20,14 @@ class LiveRoomController extends GetxController { PlPlayerController.getInstance(videoType: 'live'); Rx roomInfoH5 = RoomInfoH5Model().obs; late bool enableCDN; + late int currentQn; + late List> acceptQnList; + RxString currentQnDesc = ''.obs; @override void onInit() { super.onInit(); + currentQn = 10000; roomId = int.parse(Get.parameters['roomid']!); if (Get.arguments != null) { liveItem = Get.arguments['liveItem']; @@ -57,11 +62,26 @@ class LiveRoomController extends GetxController { } Future queryLiveInfo() async { - var res = await LiveHttp.liveRoomInfo(roomId: roomId, qn: 10000); + /// TODO 默认获取预设质量的直播资源 + var res = await LiveHttp.liveRoomInfo(roomId: roomId, qn: currentQn); if (res['status']) { List codec = res['data'].playurlInfo.playurl.stream.first.format.first.codec; CodecItem item = codec.first; + // 以服务端返回的码率为准 + currentQn = item.currentQn!; + List acceptQn = item.acceptQn!; + acceptQnList = acceptQn.map((e) { + return { + 'code': e, + 'desc': LiveQuality.values + .firstWhere((element) => element.code == e) + .description, + }; + }).toList(); + currentQnDesc.value = LiveQuality.values + .firstWhere((element) => element.code == currentQn) + .description; String videoUrl = enableCDN ? VideoUtils.getCdnUrl(item) : (item.urlInfo?.first.host)! + @@ -90,4 +110,16 @@ class LiveRoomController extends GetxController { } return res; } + + // 修改画质 + void changeQn(int qn) async { + if (currentQn == qn) { + return; + } + currentQn = qn; + currentQnDesc.value = LiveQuality.values + .firstWhere((element) => element.code == currentQn) + .description; + await queryLiveInfo(); + } } diff --git a/lib/pages/live_room/widgets/bottom_control.dart b/lib/pages/live_room/widgets/bottom_control.dart index a00f3d92..0dcedc2c 100644 --- a/lib/pages/live_room/widgets/bottom_control.dart +++ b/lib/pages/live_room/widgets/bottom_control.dart @@ -3,6 +3,7 @@ import 'dart:io'; import 'package:floating/floating.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; +import 'package:get/get.dart'; import 'package:hive/hive.dart'; import 'package:pilipala/models/video/play/url.dart'; import 'package:pilipala/pages/live_room/index.dart'; @@ -113,6 +114,30 @@ class _BottomControlState extends State { ), const SizedBox(width: 4), ], + SizedBox( + width: 30, + child: PopupMenuButton( + padding: EdgeInsets.zero, + onSelected: (value) { + widget.liveRoomCtr!.changeQn(value); + }, + child: Obx( + () => Text( + widget.liveRoomCtr!.currentQnDesc.value, + style: const TextStyle(color: Colors.white, fontSize: 13), + ), + ), + itemBuilder: (BuildContext context) { + return widget.liveRoomCtr!.acceptQnList.map((e) { + return PopupMenuItem( + value: e['code'], + child: Text(e['desc']), + ); + }).toList(); + }, + ), + ), + const SizedBox(width: 10), ComBtn( icon: const Icon( Icons.fullscreen, From 99e6abdad93da78daed1bc54c50a8b6c5ee8ba58 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Mon, 11 Mar 2024 23:31:20 +0800 Subject: [PATCH 182/220] =?UTF-8?q?feat:=20=E7=9B=B8=E5=85=B3=E8=A7=86?= =?UTF-8?q?=E9=A2=91=E6=8E=A8=E8=8D=90=E5=BC=80=E5=85=B3=20issues=20#585?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/setting/extra_setting.dart | 6 ++++++ lib/pages/video/detail/controller.dart | 4 +++- lib/pages/video/detail/view.dart | 5 ++++- lib/utils/storage.dart | 3 ++- 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/lib/pages/setting/extra_setting.dart b/lib/pages/setting/extra_setting.dart index 0a4dd2bf..aaaa8b84 100644 --- a/lib/pages/setting/extra_setting.dart +++ b/lib/pages/setting/extra_setting.dart @@ -173,6 +173,12 @@ class _ExtraSettingState extends State { setKey: SettingBoxKey.enableAi, defaultVal: true, ), + const SetSwitchItem( + title: '相关视频推荐', + subTitle: '视频详情页推荐相关视频', + setKey: SettingBoxKey.enableRelatedVideo, + defaultVal: true, + ), ListTile( dense: false, title: Text('评论展示', style: titleStyle), diff --git a/lib/pages/video/detail/controller.dart b/lib/pages/video/detail/controller.dart index b4005b5a..65f844ab 100644 --- a/lib/pages/video/detail/controller.dart +++ b/lib/pages/video/detail/controller.dart @@ -91,6 +91,7 @@ class VideoDetailController extends GetxController late int cacheAudioQa; PersistentBottomSheetController? replyReplyBottomSheetCtr; + late bool enableRelatedVideo; @override void onInit() { @@ -113,7 +114,8 @@ class VideoDetailController extends GetxController autoPlay.value = setting.get(SettingBoxKey.autoPlayEnable, defaultValue: true); enableHA.value = setting.get(SettingBoxKey.enableHA, defaultValue: true); - + enableRelatedVideo = + setting.get(SettingBoxKey.enableRelatedVideo, defaultValue: true); if (userInfo == null || localCache.get(LocalCacheKey.historyPause) == true) { enableHeart = false; diff --git a/lib/pages/video/detail/view.dart b/lib/pages/video/detail/view.dart index 04d41b2e..04c50804 100644 --- a/lib/pages/video/detail/view.dart +++ b/lib/pages/video/detail/view.dart @@ -521,7 +521,10 @@ class _VideoDetailPageState extends State .withOpacity(0.06), ), ), - const RelatedVideoPanel(), + if (videoDetailController.videoType == + SearchType.video && + videoDetailController.enableRelatedVideo) + const RelatedVideoPanel(), ], ); }, diff --git a/lib/utils/storage.dart b/lib/utils/storage.dart index 6283299b..835848cd 100644 --- a/lib/utils/storage.dart +++ b/lib/utils/storage.dart @@ -131,7 +131,8 @@ class SettingBoxKey { enableSearchWord = 'enableSearchWord', enableSystemProxy = 'enableSystemProxy', enableAi = 'enableAi', - defaultHomePage = 'defaultHomePage'; + defaultHomePage = 'defaultHomePage', + enableRelatedVideo = 'enableRelatedVideo'; /// 外观 static const String themeMode = 'themeMode', From d3766ae31b5465257c92aa74b0b4a5c4d30fafc8 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Mon, 11 Mar 2024 23:35:07 +0800 Subject: [PATCH 183/220] typo: dynamic type --- lib/models/common/dynamics_type.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/models/common/dynamics_type.dart b/lib/models/common/dynamics_type.dart index 337f6aec..f4e20a4b 100644 --- a/lib/models/common/dynamics_type.dart +++ b/lib/models/common/dynamics_type.dart @@ -7,5 +7,5 @@ enum DynamicsType { extension BusinessTypeExtension on DynamicsType { String get values => ['all', 'video', 'pgc', 'article'][index]; - String get labels => ['全部', '视频', '追番', '专栏'][index]; + String get labels => ['全部', '投稿', '番剧', '专栏'][index]; } From 882957e2f842a0d54b1b134e21b9cb08869a80ff Mon Sep 17 00:00:00 2001 From: guohaonan <972101775@qq.com> Date: Tue, 12 Mar 2024 14:34:32 +0800 Subject: [PATCH 184/220] =?UTF-8?q?feature:=E5=8A=A8=E6=80=81=E9=A1=B5?= =?UTF-8?q?=E7=9A=84=E9=94=99=E8=AF=AF=E6=8C=89=E9=92=AE=E5=9C=A8=E6=9C=AA?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E7=8A=B6=E6=80=81=E4=B8=8B=E7=9A=84=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E4=B8=BA=E7=9B=B4=E6=8E=A5=E8=B7=B3=E8=BD=AC=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/dynamics/view.dart | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/lib/pages/dynamics/view.dart b/lib/pages/dynamics/view.dart index 4a92cdfb..5fa06c91 100644 --- a/lib/pages/dynamics/view.dart +++ b/lib/pages/dynamics/view.dart @@ -14,6 +14,7 @@ import 'package:pilipala/pages/main/index.dart'; import 'package:pilipala/utils/feed_back.dart'; import 'package:pilipala/utils/storage.dart'; +import '../mine/controller.dart'; import 'controller.dart'; import 'widgets/dynamic_panel.dart'; import 'widgets/up_panel.dart'; @@ -28,6 +29,7 @@ class DynamicsPage extends StatefulWidget { class _DynamicsPageState extends State with AutomaticKeepAliveClientMixin { final DynamicsController _dynamicsController = Get.put(DynamicsController()); + final MineController mineController = Get.put(MineController()); late Future _futureBuilderFuture; late Future _futureBuilderFutureUp; Box userInfoCache = GStrorage.userInfo; @@ -256,6 +258,16 @@ class _DynamicsPageState extends State } }, ); + } else if (data['msg'] == "账号未登录") { + return HttpError( + errMsg: data['msg'], + btnText: "去登录", + fn: () { + setState(() { + mineController.onLogin(); + }); + }, + ); } else { return HttpError( errMsg: data['msg'], From bc9ea43cd2c8bc5203968911da744dca10e7ad8d Mon Sep 17 00:00:00 2001 From: guozhigq Date: Tue, 12 Mar 2024 23:45:22 +0800 Subject: [PATCH 185/220] =?UTF-8?q?feat:=20=E8=A7=86=E9=A2=91=E7=95=AA?= =?UTF-8?q?=E5=89=A7=E8=AF=A6=E6=83=85=E9=A1=B5=E4=BB=A3=E7=A0=81=E6=95=B4?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bangumi/introduction/controller.dart | 57 +- lib/pages/bangumi/introduction/view.dart | 494 ++++++---------- .../video/detail/introduction/controller.dart | 27 - lib/pages/video/detail/introduction/view.dart | 531 +++++++----------- .../introduction/widgets/action_item.dart | 28 +- 5 files changed, 406 insertions(+), 731 deletions(-) diff --git a/lib/pages/bangumi/introduction/controller.dart b/lib/pages/bangumi/introduction/controller.dart index 6b3123ea..12f0c053 100644 --- a/lib/pages/bangumi/introduction/controller.dart +++ b/lib/pages/bangumi/introduction/controller.dart @@ -25,13 +25,6 @@ class BangumiIntroController extends GetxController { ? int.tryParse(Get.parameters['epId']!) : null; - // 是否预渲染 骨架屏 - bool preRender = false; - - // 视频详情 上个页面传入 - Map? videoItem = {}; - BangumiInfoModel? bangumiItem; - // 请求状态 RxBool isLoading = false.obs; @@ -63,27 +56,6 @@ class BangumiIntroController extends GetxController { @override void onInit() { super.onInit(); - if (Get.arguments.isNotEmpty as bool) { - if (Get.arguments.containsKey('bangumiItem') as bool) { - preRender = true; - bangumiItem = Get.arguments['bangumiItem']; - // bangumiItem!['pic'] = args.pic; - // if (args.title is String) { - // videoItem!['title'] = args.title; - // } else { - // String str = ''; - // for (Map map in args.title) { - // str += map['text']; - // } - // videoItem!['title'] = str; - // } - // if (args.stat != null) { - // videoItem!['stat'] = args.stat; - // } - // videoItem!['pubdate'] = args.pubdate; - // videoItem!['owner'] = args.owner; - } - } userInfo = userInfoCache.get('userInfoCache'); userLogin = userInfo != null; } @@ -183,20 +155,21 @@ class BangumiIntroController extends GetxController { actions: [ TextButton(onPressed: () => Get.back(), child: const Text('取消')), TextButton( - onPressed: () async { - var res = await VideoHttp.coinVideo( - bvid: bvid, multiply: _tempThemeValue); - if (res['status']) { - SmartDialog.showToast('投币成功 👏'); - hasCoin.value = true; - bangumiDetail.value.stat!['coins'] = - bangumiDetail.value.stat!['coins'] + _tempThemeValue; - } else { - SmartDialog.showToast(res['msg']); - } - Get.back(); - }, - child: const Text('确定')) + onPressed: () async { + var res = await VideoHttp.coinVideo( + bvid: bvid, multiply: _tempThemeValue); + if (res['status']) { + SmartDialog.showToast('投币成功 👏'); + hasCoin.value = true; + bangumiDetail.value.stat!['coins'] = + bangumiDetail.value.stat!['coins'] + _tempThemeValue; + } else { + SmartDialog.showToast(res['msg']); + } + Get.back(); + }, + child: const Text('确定'), + ) ], ); }); diff --git a/lib/pages/bangumi/introduction/view.dart b/lib/pages/bangumi/introduction/view.dart index f9efc66c..551d91d7 100644 --- a/lib/pages/bangumi/introduction/view.dart +++ b/lib/pages/bangumi/introduction/view.dart @@ -12,11 +12,10 @@ import 'package:pilipala/models/bangumi/info.dart'; import 'package:pilipala/pages/bangumi/widgets/bangumi_panel.dart'; import 'package:pilipala/pages/video/detail/index.dart'; import 'package:pilipala/pages/video/detail/introduction/widgets/action_item.dart'; -import 'package:pilipala/pages/video/detail/introduction/widgets/action_row_item.dart'; import 'package:pilipala/pages/video/detail/introduction/widgets/fav_panel.dart'; import 'package:pilipala/utils/feed_back.dart'; import 'package:pilipala/utils/storage.dart'; - +import '../../../common/widgets/http_error.dart'; import 'controller.dart'; import 'widgets/intro_detail.dart'; @@ -51,9 +50,6 @@ class _BangumiIntroPanelState extends State cid = widget.cid!; bangumiIntroController = Get.put(BangumiIntroController(), tag: heroTag); videoDetailCtr = Get.find(tag: heroTag); - bangumiIntroController.bangumiDetail.listen((BangumiInfoModel value) { - bangumiDetail = value; - }); _futureBuilderFuture = bangumiIntroController.queryBangumiIntro(); videoDetailCtr.cid.listen((int p0) { cid = p0; @@ -68,27 +64,32 @@ class _BangumiIntroPanelState extends State future: _futureBuilderFuture, builder: (BuildContext context, AsyncSnapshot snapshot) { if (snapshot.connectionState == ConnectionState.done) { + if (snapshot.data == null) { + return const SliverToBoxAdapter(child: SizedBox()); + } if (snapshot.data['status']) { // 请求成功 - - return BangumiInfo( - loadingStatus: false, - bangumiDetail: bangumiDetail, - cid: cid, + return Obx( + () => BangumiInfo( + bangumiDetail: bangumiIntroController.bangumiDetail.value, + cid: cid, + ), ); } else { // 请求错误 - // return HttpError( - // errMsg: snapshot.data['msg'], - // fn: () => Get.back(), - // ); - return const SizedBox(); + return HttpError( + errMsg: snapshot.data['msg'], + fn: () => Get.back(), + ); } } else { - return BangumiInfo( - loadingStatus: true, - bangumiDetail: bangumiDetail, - cid: cid, + return const SliverToBoxAdapter( + child: SizedBox( + height: 100, + child: Center( + child: CircularProgressIndicator(), + ), + ), ); } }, @@ -99,12 +100,10 @@ class _BangumiIntroPanelState extends State class BangumiInfo extends StatefulWidget { const BangumiInfo({ super.key, - this.loadingStatus = false, this.bangumiDetail, this.cid, }); - final bool loadingStatus; final BangumiInfoModel? bangumiDetail; final int? cid; @@ -117,7 +116,6 @@ class _BangumiInfoState extends State { late final BangumiIntroController bangumiIntroController; late final VideoDetailController videoDetailCtr; Box localCache = GStrorage.localCache; - late final BangumiInfoModel? bangumiItem; late double sheetHeight; int? cid; bool isProcessing = false; @@ -136,13 +134,10 @@ class _BangumiInfoState extends State { super.initState(); bangumiIntroController = Get.put(BangumiIntroController(), tag: heroTag); videoDetailCtr = Get.find(tag: heroTag); - bangumiItem = bangumiIntroController.bangumiItem; sheetHeight = localCache.get('sheetHeight'); cid = widget.cid!; - print('cid: $cid'); videoDetailCtr.cid.listen((p0) { cid = p0; - print('cid: $cid'); setState(() {}); }); } @@ -182,207 +177,154 @@ class _BangumiInfoState extends State { padding: const EdgeInsets.only( left: StyleString.safeSpace, right: StyleString.safeSpace, top: 20), sliver: SliverToBoxAdapter( - child: !widget.loadingStatus || bangumiItem != null - ? Column( - crossAxisAlignment: CrossAxisAlignment.start, + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Stack( children: [ - Row( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Stack( - children: [ - NetworkImgLayer( - width: 105, - height: 160, - src: !widget.loadingStatus - ? widget.bangumiDetail!.cover! - : bangumiItem!.cover!, - ), - if (bangumiItem != null && - bangumiItem!.rating != null) - PBadge( - text: - '评分 ${!widget.loadingStatus ? widget.bangumiDetail!.rating!['score']! : bangumiItem!.rating!['score']!}', - top: null, - right: 6, - bottom: 6, - left: null, + NetworkImgLayer( + width: 105, + height: 160, + src: widget.bangumiDetail!.cover!, + ), + PBadge( + text: '评分 ${widget.bangumiDetail!.rating!['score']!}', + top: null, + right: 6, + bottom: 6, + left: null, + ), + ], + ), + const SizedBox(width: 10), + Expanded( + child: InkWell( + onTap: () => showIntroDetail(), + child: SizedBox( + height: 158, + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.min, + children: [ + Row( + children: [ + Expanded( + child: Text( + widget.bangumiDetail!.title!, + style: const TextStyle( + fontSize: 16, + fontWeight: FontWeight.w500, + ), + maxLines: 1, + overflow: TextOverflow.ellipsis, + ), ), - ], - ), - const SizedBox(width: 10), - Expanded( - child: InkWell( - onTap: () => showIntroDetail(), - child: SizedBox( - height: 158, - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - mainAxisSize: MainAxisSize.min, - children: [ - Row( - children: [ - Expanded( - child: Text( - !widget.loadingStatus - ? widget.bangumiDetail!.title! - : bangumiItem!.title!, - style: const TextStyle( - fontSize: 16, - fontWeight: FontWeight.w500, - ), - maxLines: 1, - overflow: TextOverflow.ellipsis, - ), - ), - const SizedBox(width: 20), - SizedBox( - width: 34, - height: 34, - child: IconButton( - style: ButtonStyle( - padding: MaterialStateProperty.all( - EdgeInsets.zero), - backgroundColor: - MaterialStateProperty.resolveWith( - (Set states) { - return t - .colorScheme.primaryContainer - .withOpacity(0.7); - }), - ), - onPressed: () => - bangumiIntroController.bangumiAdd(), - icon: Icon( - Icons.favorite_border_rounded, - color: t.colorScheme.primary, - size: 22, - ), - ), - ), - ], + const SizedBox(width: 20), + SizedBox( + width: 34, + height: 34, + child: IconButton( + style: ButtonStyle( + padding: MaterialStateProperty.all( + EdgeInsets.zero), + backgroundColor: + MaterialStateProperty.resolveWith( + (Set states) { + return t.colorScheme.primaryContainer + .withOpacity(0.7); + }), ), - Row( - children: [ - StatView( - theme: 'gray', - view: !widget.loadingStatus - ? widget.bangumiDetail!.stat!['views'] - : bangumiItem!.stat!['views'], - size: 'medium', - ), - const SizedBox(width: 6), - StatDanMu( - theme: 'gray', - danmu: !widget.loadingStatus - ? widget - .bangumiDetail!.stat!['danmakus'] - : bangumiItem!.stat!['danmakus'], - size: 'medium', - ), - ], + onPressed: () => + bangumiIntroController.bangumiAdd(), + icon: Icon( + Icons.favorite_border_rounded, + color: t.colorScheme.primary, + size: 22, ), - const SizedBox(height: 6), - Row( - children: [ - Text( - !widget.loadingStatus - ? (widget.bangumiDetail!.areas! - .isNotEmpty - ? widget.bangumiDetail!.areas! - .first['name'] - : '') - : (bangumiItem!.areas!.isNotEmpty - ? bangumiItem! - .areas!.first['name'] - : ''), - style: TextStyle( - fontSize: 12, - color: t.colorScheme.outline, - ), - ), - const SizedBox(width: 6), - Text( - !widget.loadingStatus - ? widget.bangumiDetail! - .publish!['pub_time_show'] - : bangumiItem! - .publish!['pub_time_show'], - style: TextStyle( - fontSize: 12, - color: t.colorScheme.outline, - ), - ), - ], - ), - // const SizedBox(height: 4), - Text( - !widget.loadingStatus - ? widget.bangumiDetail!.newEp!['desc'] - : bangumiItem!.newEp!['desc'], - style: TextStyle( - fontSize: 12, - color: t.colorScheme.outline, - ), - ), - // const SizedBox(height: 10), - const Spacer(), - Text( - '简介：${!widget.loadingStatus ? widget.bangumiDetail!.evaluate! : bangumiItem!.evaluate!}', - maxLines: 3, - overflow: TextOverflow.ellipsis, - style: TextStyle( - fontSize: 13, - color: t.colorScheme.outline, - ), - ), - ], + ), ), + ], + ), + Row( + children: [ + StatView( + theme: 'gray', + view: widget.bangumiDetail!.stat!['views'], + size: 'medium', + ), + const SizedBox(width: 6), + StatDanMu( + theme: 'gray', + danmu: widget.bangumiDetail!.stat!['danmakus'], + size: 'medium', + ), + ], + ), + const SizedBox(height: 6), + Row( + children: [ + Text( + (widget.bangumiDetail!.areas!.isNotEmpty + ? widget.bangumiDetail!.areas!.first['name'] + : ''), + style: TextStyle( + fontSize: 12, + color: t.colorScheme.outline, + ), + ), + const SizedBox(width: 6), + Text( + widget.bangumiDetail!.publish!['pub_time_show'], + style: TextStyle( + fontSize: 12, + color: t.colorScheme.outline, + ), + ), + ], + ), + Text( + widget.bangumiDetail!.newEp!['desc'], + style: TextStyle( + fontSize: 12, + color: t.colorScheme.outline, ), ), - ), - ], + const Spacer(), + Text( + '简介：${widget.bangumiDetail!.evaluate!}', + maxLines: 3, + overflow: TextOverflow.ellipsis, + style: TextStyle( + fontSize: 13, + color: t.colorScheme.outline, + ), + ), + ], + ), ), - const SizedBox(height: 6), - // 点赞收藏转发 布局样式1 - // SingleChildScrollView( - // padding: const EdgeInsets.only(top: 7, bottom: 7), - // scrollDirection: Axis.horizontal, - // child: actionRow( - // context, - // bangumiIntroController, - // videoDetailCtr, - // ), - // ), - // 点赞收藏转发 布局样式2 - actionGrid(context, bangumiIntroController), - // 番剧分p - if ((!widget.loadingStatus && - widget.bangumiDetail!.episodes!.isNotEmpty) || - bangumiItem != null && - bangumiItem!.episodes!.isNotEmpty) ...[ - BangumiPanel( - pages: bangumiItem != null - ? bangumiItem!.episodes! - : widget.bangumiDetail!.episodes!, - cid: cid ?? - (bangumiItem != null - ? bangumiItem!.episodes!.first.cid - : widget.bangumiDetail!.episodes!.first.cid), - sheetHeight: sheetHeight, - changeFuc: (bvid, cid, aid) => bangumiIntroController - .changeSeasonOrbangu(bvid, cid, aid), - ) - ], - ], - ) - : const SizedBox( - height: 100, - child: Center( - child: CircularProgressIndicator(), ), ), - ), + ], + ), + const SizedBox(height: 6), + + /// 点赞收藏转发 + actionGrid(context, bangumiIntroController), + // 番剧分p + if (widget.bangumiDetail!.episodes!.isNotEmpty) ...[ + BangumiPanel( + pages: widget.bangumiDetail!.episodes!, + cid: cid ?? widget.bangumiDetail!.episodes!.first.cid, + sheetHeight: sheetHeight, + changeFuc: (bvid, cid, aid) => + bangumiIntroController.changeSeasonOrbangu(bvid, cid, aid), + ) + ], + ], + )), ); } @@ -402,57 +344,44 @@ class _BangumiInfoState extends State { children: [ Obx( () => ActionItem( - icon: const Icon(FontAwesomeIcons.thumbsUp), - selectIcon: const Icon(FontAwesomeIcons.solidThumbsUp), - onTap: - handleState(bangumiIntroController.actionLikeVideo), - selectStatus: bangumiIntroController.hasLike.value, - loadingStatus: false, - text: !widget.loadingStatus - ? widget.bangumiDetail!.stat!['likes']!.toString() - : bangumiItem!.stat!['likes']!.toString()), + icon: const Icon(FontAwesomeIcons.thumbsUp), + selectIcon: const Icon(FontAwesomeIcons.solidThumbsUp), + onTap: handleState(bangumiIntroController.actionLikeVideo), + selectStatus: bangumiIntroController.hasLike.value, + text: widget.bangumiDetail!.stat!['likes']!.toString(), + ), ), Obx( () => ActionItem( - icon: const Icon(FontAwesomeIcons.b), - selectIcon: const Icon(FontAwesomeIcons.b), - onTap: - handleState(bangumiIntroController.actionCoinVideo), - selectStatus: bangumiIntroController.hasCoin.value, - loadingStatus: false, - text: !widget.loadingStatus - ? widget.bangumiDetail!.stat!['coins']!.toString() - : bangumiItem!.stat!['coins']!.toString()), + icon: const Icon(FontAwesomeIcons.b), + selectIcon: const Icon(FontAwesomeIcons.b), + onTap: handleState(bangumiIntroController.actionCoinVideo), + selectStatus: bangumiIntroController.hasCoin.value, + text: widget.bangumiDetail!.stat!['coins']!.toString(), + ), ), Obx( () => ActionItem( - icon: const Icon(FontAwesomeIcons.star), - selectIcon: const Icon(FontAwesomeIcons.solidStar), - onTap: () => showFavBottomSheet(), - selectStatus: bangumiIntroController.hasFav.value, - loadingStatus: false, - text: !widget.loadingStatus - ? widget.bangumiDetail!.stat!['favorite']!.toString() - : bangumiItem!.stat!['favorite']!.toString()), + icon: const Icon(FontAwesomeIcons.star), + selectIcon: const Icon(FontAwesomeIcons.solidStar), + onTap: () => showFavBottomSheet(), + selectStatus: bangumiIntroController.hasFav.value, + text: widget.bangumiDetail!.stat!['favorite']!.toString(), + ), ), ActionItem( icon: const Icon(FontAwesomeIcons.comment), selectIcon: const Icon(FontAwesomeIcons.reply), onTap: () => videoDetailCtr.tabCtr.animateTo(1), selectStatus: false, - loadingStatus: false, - text: !widget.loadingStatus - ? widget.bangumiDetail!.stat!['reply']!.toString() - : bangumiItem!.stat!['reply']!.toString(), + text: widget.bangumiDetail!.stat!['reply']!.toString(), ), ActionItem( - icon: const Icon(FontAwesomeIcons.shareFromSquare), - onTap: () => bangumiIntroController.actionShareVideo(), - selectStatus: false, - loadingStatus: false, - text: !widget.loadingStatus - ? widget.bangumiDetail!.stat!['share']!.toString() - : bangumiItem!.stat!['share']!.toString()), + icon: const Icon(FontAwesomeIcons.shareFromSquare), + onTap: () => bangumiIntroController.actionShareVideo(), + selectStatus: false, + text: widget.bangumiDetail!.stat!['share']!.toString(), + ), ], ), ), @@ -460,63 +389,4 @@ class _BangumiInfoState extends State { ); }); } - - Widget actionRow(BuildContext context, videoIntroController, videoDetailCtr) { - return Row(children: [ - Obx( - () => ActionRowItem( - icon: const Icon(FontAwesomeIcons.thumbsUp), - onTap: handleState(videoIntroController.actionLikeVideo), - selectStatus: videoIntroController.hasLike.value, - loadingStatus: widget.loadingStatus, - text: !widget.loadingStatus - ? widget.bangumiDetail!.stat!['likes']!.toString() - : '-', - ), - ), - const SizedBox(width: 8), - Obx( - () => ActionRowItem( - icon: const Icon(FontAwesomeIcons.b), - onTap: handleState(videoIntroController.actionCoinVideo), - selectStatus: videoIntroController.hasCoin.value, - loadingStatus: widget.loadingStatus, - text: !widget.loadingStatus - ? widget.bangumiDetail!.stat!['coins']!.toString() - : '-', - ), - ), - const SizedBox(width: 8), - Obx( - () => ActionRowItem( - icon: const Icon(FontAwesomeIcons.heart), - onTap: () => showFavBottomSheet(), - selectStatus: videoIntroController.hasFav.value, - loadingStatus: widget.loadingStatus, - text: !widget.loadingStatus - ? widget.bangumiDetail!.stat!['favorite']!.toString() - : '-', - ), - ), - const SizedBox(width: 8), - ActionRowItem( - icon: const Icon(FontAwesomeIcons.comment), - onTap: () { - videoDetailCtr.tabCtr.animateTo(1); - }, - selectStatus: false, - loadingStatus: widget.loadingStatus, - text: !widget.loadingStatus - ? widget.bangumiDetail!.stat!['reply']!.toString() - : '-', - ), - const SizedBox(width: 8), - ActionRowItem( - icon: const Icon(FontAwesomeIcons.share), - onTap: () => videoIntroController.actionShareVideo(), - selectStatus: false, - loadingStatus: widget.loadingStatus, - text: '转发'), - ]); - } } diff --git a/lib/pages/video/detail/introduction/controller.dart b/lib/pages/video/detail/introduction/controller.dart index c7f22b13..6714b887 100644 --- a/lib/pages/video/detail/introduction/controller.dart +++ b/lib/pages/video/detail/introduction/controller.dart @@ -25,13 +25,6 @@ class VideoIntroController extends GetxController { VideoIntroController({required this.bvid}); // 视频bvid String bvid; - - // 是否预渲染 骨架屏 - bool preRender = false; - - // 视频详情 上个页面传入 - Map? videoItem = {}; - // 请求状态 RxBool isLoading = false.obs; @@ -74,26 +67,6 @@ class VideoIntroController extends GetxController { try { heroTag = Get.arguments['heroTag']; } catch (_) {} - if (Get.arguments.isNotEmpty) { - if (Get.arguments.containsKey('videoItem')) { - preRender = true; - var args = Get.arguments['videoItem']; - var keys = Get.arguments.keys.toList(); - videoItem!['pic'] = args.pic; - if (args.title is String) { - videoItem!['title'] = args.title; - } else { - String str = ''; - for (Map map in args.title) { - str += map['text']; - } - videoItem!['title'] = str; - } - videoItem!['stat'] = keys.contains('stat') && args.stat; - videoItem!['pubdate'] = keys.contains('pubdate') && args.pubdate; - videoItem!['owner'] = keys.contains('owner') && args.owner; - } - } userLogin = userInfo != null; lastPlayCid.value = int.parse(Get.parameters['cid']!); isShowOnlineTotal = diff --git a/lib/pages/video/detail/introduction/view.dart b/lib/pages/video/detail/introduction/view.dart index bed37bb5..5e24220b 100644 --- a/lib/pages/video/detail/introduction/view.dart +++ b/lib/pages/video/detail/introduction/view.dart @@ -15,9 +15,7 @@ import 'package:pilipala/pages/video/detail/widgets/ai_detail.dart'; import 'package:pilipala/utils/feed_back.dart'; import 'package:pilipala/utils/storage.dart'; import 'package:pilipala/utils/utils.dart'; - import 'widgets/action_item.dart'; -import 'widgets/action_row_item.dart'; import 'widgets/fav_panel.dart'; import 'widgets/intro_detail.dart'; import 'widgets/page.dart'; @@ -78,7 +76,6 @@ class _VideoIntroPanelState extends State // 请求成功 return Obx( () => VideoInfo( - loadingStatus: false, videoDetail: videoIntroController.videoDetail.value, heroTag: heroTag, bvid: widget.bvid, @@ -96,11 +93,13 @@ class _VideoIntroPanelState extends State ); } } else { - return VideoInfo( - loadingStatus: true, - videoDetail: videoDetail, - heroTag: heroTag, - bvid: widget.bvid, + return const SliverToBoxAdapter( + child: SizedBox( + height: 100, + child: Center( + child: CircularProgressIndicator(), + ), + ), ); } }, @@ -109,14 +108,12 @@ class _VideoIntroPanelState extends State } class VideoInfo extends StatefulWidget { - final bool loadingStatus; final VideoDetailData? videoDetail; final String? heroTag; final String bvid; const VideoInfo({ Key? key, - this.loadingStatus = false, this.videoDetail, this.heroTag, required this.bvid, @@ -127,18 +124,12 @@ class VideoInfo extends StatefulWidget { } class _VideoInfoState extends State with TickerProviderStateMixin { - // final String heroTag = Get.arguments['heroTag']; late String heroTag; late final VideoIntroController videoIntroController; late final VideoDetailController videoDetailCtr; - late final Map videoItem; - final Box localCache = GStrorage.localCache; final Box setting = GStrorage.setting; late double sheetHeight; - - late final bool loadingStatus; // 加载状态 - late final dynamic owner; late final dynamic follower; late final dynamic followStatus; @@ -163,14 +154,10 @@ class _VideoInfoState extends State with TickerProviderStateMixin { videoIntroController = Get.put(VideoIntroController(bvid: widget.bvid), tag: heroTag); videoDetailCtr = Get.find(tag: heroTag); - videoItem = videoIntroController.videoItem!; sheetHeight = localCache.get('sheetHeight'); - loadingStatus = widget.loadingStatus; - owner = loadingStatus ? videoItem['owner'] : widget.videoDetail!.owner; - follower = loadingStatus - ? '-' - : Utils.numFormat(videoIntroController.userStat['follower']); + owner = widget.videoDetail!.owner; + follower = Utils.numFormat(videoIntroController.userStat['follower']); followStatus = videoIntroController.followStatus; enableAi = setting.get(SettingBoxKey.enableAi, defaultValue: true); } @@ -224,9 +211,6 @@ class _VideoInfoState extends State with TickerProviderStateMixin { // 视频介绍 showIntroDetail() { - if (loadingStatus) { - return; - } feedBack(); showBottomSheet( context: context, @@ -240,13 +224,9 @@ class _VideoInfoState extends State with TickerProviderStateMixin { // 用户主页 onPushMember() { feedBack(); - mid = !loadingStatus - ? widget.videoDetail!.owner!.mid - : videoItem['owner'].mid; + mid = widget.videoDetail!.owner!.mid!; memberHeroTag = Utils.makeHeroTag(mid); - String face = !loadingStatus - ? widget.videoDetail!.owner!.face - : videoItem['owner'].face; + String face = widget.videoDetail!.owner!.face!; Get.toNamed('/member?mid=$mid', arguments: {'face': face, 'heroTag': memberHeroTag}); } @@ -270,221 +250,181 @@ class _VideoInfoState extends State with TickerProviderStateMixin { padding: const EdgeInsets.only( left: StyleString.safeSpace, right: StyleString.safeSpace, top: 10), sliver: SliverToBoxAdapter( - child: !loadingStatus - ? Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - GestureDetector( - behavior: HitTestBehavior.translucent, - onTap: () => showIntroDetail(), - child: Text( - !loadingStatus - ? widget.videoDetail!.title - : videoItem['title'], - style: const TextStyle( - fontSize: 18, - fontWeight: FontWeight.bold, - ), - maxLines: 2, - overflow: TextOverflow.ellipsis, - ), - ), - Stack( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + GestureDetector( + behavior: HitTestBehavior.translucent, + onTap: () => showIntroDetail(), + child: Text( + widget.videoDetail!.title!, + style: const TextStyle( + fontSize: 18, + fontWeight: FontWeight.bold, + ), + maxLines: 2, + overflow: TextOverflow.ellipsis, + ), + ), + Stack( + children: [ + GestureDetector( + behavior: HitTestBehavior.translucent, + onTap: () => showIntroDetail(), + child: Padding( + padding: const EdgeInsets.only(top: 7, bottom: 6), + child: Row( children: [ - GestureDetector( - behavior: HitTestBehavior.translucent, - onTap: () => showIntroDetail(), - child: Padding( - padding: const EdgeInsets.only(top: 7, bottom: 6), - child: Row( - children: [ - StatView( - theme: 'gray', - view: !loadingStatus - ? widget.videoDetail!.stat!.view - : videoItem['stat'].view, - size: 'medium', - ), - const SizedBox(width: 10), - StatDanMu( - theme: 'gray', - danmu: !loadingStatus - ? widget.videoDetail!.stat!.danmaku - : videoItem['stat'].danmaku, - size: 'medium', - ), - const SizedBox(width: 10), - Text( - Utils.dateFormat( - !loadingStatus - ? widget.videoDetail!.pubdate - : videoItem['pubdate'], - formatType: 'detail'), - style: TextStyle( - fontSize: 12, - color: t.colorScheme.outline, - ), - ), - const SizedBox(width: 10), - if (videoIntroController.isShowOnlineTotal) - Obx( - () => Text( - '${videoIntroController.total.value}人在看', - style: TextStyle( - fontSize: 12, - color: t.colorScheme.outline, - ), - ), - ), - ], - ), + StatView( + theme: 'gray', + view: widget.videoDetail!.stat!.view, + size: 'medium', + ), + const SizedBox(width: 10), + StatDanMu( + theme: 'gray', + danmu: widget.videoDetail!.stat!.danmaku, + size: 'medium', + ), + const SizedBox(width: 10), + Text( + Utils.dateFormat(widget.videoDetail!.pubdate, + formatType: 'detail'), + style: TextStyle( + fontSize: 12, + color: t.colorScheme.outline, ), ), - if (enableAi) - Positioned( - right: 10, - top: 6, - child: GestureDetector( - onTap: () async { - final res = - await videoIntroController.aiConclusion(); - if (res['status']) { - showAiBottomSheet(); - } - }, - child: - Image.asset('assets/images/ai.png', height: 22), - ), - ) - ], - ), - // 点赞收藏转发 布局样式1 - // SingleChildScrollView( - // padding: const EdgeInsets.only(top: 7, bottom: 7), - // scrollDirection: Axis.horizontal, - // child: actionRow( - // context, - // videoIntroController, - // videoDetailCtr, - // ), - // ), - // 点赞收藏转发 布局样式2 - actionGrid(context, videoIntroController), - // 合集 - if (!loadingStatus && - widget.videoDetail!.ugcSeason != null) ...[ - Obx( - () => SeasonPanel( - ugcSeason: widget.videoDetail!.ugcSeason!, - cid: videoIntroController.lastPlayCid.value != 0 - ? videoIntroController.lastPlayCid.value - : widget.videoDetail!.pages!.first.cid, - sheetHeight: sheetHeight, - changeFuc: (bvid, cid, aid) => videoIntroController - .changeSeasonOrbangu(bvid, cid, aid), - ), - ) - ], - if (!loadingStatus && - widget.videoDetail!.pages != null && - widget.videoDetail!.pages!.length > 1) ...[ - Obx(() => PagesPanel( - pages: widget.videoDetail!.pages!, - cid: videoIntroController.lastPlayCid.value, - sheetHeight: sheetHeight, - changeFuc: (cid) => - videoIntroController.changeSeasonOrbangu( - videoIntroController.bvid, cid, null), - )) - ], - GestureDetector( - onTap: onPushMember, - child: Container( - padding: const EdgeInsets.symmetric( - vertical: 12, horizontal: 4), - child: Row( - children: [ - NetworkImgLayer( - type: 'avatar', - src: loadingStatus - ? owner.face - : widget.videoDetail!.owner!.face, - width: 34, - height: 34, - fadeInDuration: Duration.zero, - fadeOutDuration: Duration.zero, - ), - const SizedBox(width: 10), - Text(owner.name, - style: const TextStyle(fontSize: 13)), - const SizedBox(width: 6), - Text( - follower, + const SizedBox(width: 10), + if (videoIntroController.isShowOnlineTotal) + Obx( + () => Text( + '${videoIntroController.total.value}人在看', style: TextStyle( - fontSize: t.textTheme.labelSmall!.fontSize, - color: outline, + fontSize: 12, + color: t.colorScheme.outline, ), ), - const Spacer(), - Obx(() => AnimatedOpacity( - opacity: loadingStatus || - videoIntroController - .followStatus.isEmpty - ? 0 - : 1, - duration: const Duration(milliseconds: 50), - child: SizedBox( - height: 32, - child: Obx( - () => videoIntroController - .followStatus.isNotEmpty - ? TextButton( - onPressed: videoIntroController - .actionRelationMod, - style: TextButton.styleFrom( - padding: const EdgeInsets.only( - left: 8, right: 8), - foregroundColor: - followStatus['attribute'] != 0 - ? outline - : t.colorScheme.onPrimary, - backgroundColor: - followStatus['attribute'] != 0 - ? t.colorScheme - .onInverseSurface - : t.colorScheme - .primary, // 设置按钮背景色 - ), - child: Text( - followStatus['attribute'] != 0 - ? '已关注' - : '关注', - style: TextStyle( - fontSize: t.textTheme - .labelMedium!.fontSize), - ), - ) - : ElevatedButton( - onPressed: videoIntroController - .actionRelationMod, - child: const Text('关注'), - ), - ), - ), - )), - ], - ), - ), + ), + ], ), - ], - ) - : const SizedBox( - height: 100, - child: Center( - child: CircularProgressIndicator(), ), ), - ), + if (enableAi) + Positioned( + right: 10, + top: 6, + child: GestureDetector( + onTap: () async { + final res = await videoIntroController.aiConclusion(); + if (res['status']) { + showAiBottomSheet(); + } + }, + child: Image.asset('assets/images/ai.png', height: 22), + ), + ) + ], + ), + + /// 点赞收藏转发 + actionGrid(context, videoIntroController), + // 合集 + if (widget.videoDetail!.ugcSeason != null) ...[ + Obx( + () => SeasonPanel( + ugcSeason: widget.videoDetail!.ugcSeason!, + cid: videoIntroController.lastPlayCid.value != 0 + ? videoIntroController.lastPlayCid.value + : widget.videoDetail!.pages!.first.cid, + sheetHeight: sheetHeight, + changeFuc: (bvid, cid, aid) => + videoIntroController.changeSeasonOrbangu(bvid, cid, aid), + ), + ) + ], + if (widget.videoDetail!.pages != null && + widget.videoDetail!.pages!.length > 1) ...[ + Obx(() => PagesPanel( + pages: widget.videoDetail!.pages!, + cid: videoIntroController.lastPlayCid.value, + sheetHeight: sheetHeight, + changeFuc: (cid) => videoIntroController.changeSeasonOrbangu( + videoIntroController.bvid, cid, null), + )) + ], + GestureDetector( + onTap: onPushMember, + child: Container( + padding: const EdgeInsets.symmetric(vertical: 12, horizontal: 4), + child: Row( + children: [ + NetworkImgLayer( + type: 'avatar', + src: widget.videoDetail!.owner!.face, + width: 34, + height: 34, + fadeInDuration: Duration.zero, + fadeOutDuration: Duration.zero, + ), + const SizedBox(width: 10), + Text(owner.name, style: const TextStyle(fontSize: 13)), + const SizedBox(width: 6), + Text( + follower, + style: TextStyle( + fontSize: t.textTheme.labelSmall!.fontSize, + color: outline, + ), + ), + const Spacer(), + Obx(() => AnimatedOpacity( + opacity: + videoIntroController.followStatus.isEmpty ? 0 : 1, + duration: const Duration(milliseconds: 50), + child: SizedBox( + height: 32, + child: Obx( + () => videoIntroController.followStatus.isNotEmpty + ? TextButton( + onPressed: + videoIntroController.actionRelationMod, + style: TextButton.styleFrom( + padding: const EdgeInsets.only( + left: 8, right: 8), + foregroundColor: + followStatus['attribute'] != 0 + ? outline + : t.colorScheme.onPrimary, + backgroundColor: + followStatus['attribute'] != 0 + ? t.colorScheme.onInverseSurface + : t.colorScheme + .primary, // 设置按钮背景色 + ), + child: Text( + followStatus['attribute'] != 0 + ? '已关注' + : '关注', + style: TextStyle( + fontSize: t + .textTheme.labelMedium!.fontSize), + ), + ) + : ElevatedButton( + onPressed: + videoIntroController.actionRelationMod, + child: const Text('关注'), + ), + ), + ), + )), + ], + ), + ), + ), + ], + )), ); } @@ -506,10 +446,7 @@ class _VideoInfoState extends State with TickerProviderStateMixin { selectIcon: const Icon(FontAwesomeIcons.solidThumbsUp), onTap: handleState(videoIntroController.actionLikeVideo), selectStatus: videoIntroController.hasLike.value, - loadingStatus: loadingStatus, - text: !loadingStatus - ? widget.videoDetail!.stat!.like!.toString() - : '-'), + text: widget.videoDetail!.stat!.like!.toString()), ), // ActionItem( // icon: const Icon(FontAwesomeIcons.clock), @@ -519,104 +456,38 @@ class _VideoInfoState extends State with TickerProviderStateMixin { // text: '稍后再看'), Obx( () => ActionItem( - icon: const Icon(FontAwesomeIcons.b), - selectIcon: const Icon(FontAwesomeIcons.b), - onTap: handleState(videoIntroController.actionCoinVideo), - selectStatus: videoIntroController.hasCoin.value, - loadingStatus: loadingStatus, - text: !loadingStatus - ? widget.videoDetail!.stat!.coin!.toString() - : '-'), + icon: const Icon(FontAwesomeIcons.b), + selectIcon: const Icon(FontAwesomeIcons.b), + onTap: handleState(videoIntroController.actionCoinVideo), + selectStatus: videoIntroController.hasCoin.value, + text: widget.videoDetail!.stat!.coin!.toString(), + ), ), Obx( () => ActionItem( - icon: const Icon(FontAwesomeIcons.star), - selectIcon: const Icon(FontAwesomeIcons.solidStar), - onTap: () => showFavBottomSheet(), - onLongPress: () => showFavBottomSheet(type: 'longPress'), - selectStatus: videoIntroController.hasFav.value, - loadingStatus: loadingStatus, - text: !loadingStatus - ? widget.videoDetail!.stat!.favorite!.toString() - : '-'), + icon: const Icon(FontAwesomeIcons.star), + selectIcon: const Icon(FontAwesomeIcons.solidStar), + onTap: () => showFavBottomSheet(), + onLongPress: () => showFavBottomSheet(type: 'longPress'), + selectStatus: videoIntroController.hasFav.value, + text: widget.videoDetail!.stat!.favorite!.toString(), + ), ), ActionItem( - icon: const Icon(FontAwesomeIcons.comment), - onTap: () => videoDetailCtr.tabCtr.animateTo(1), - selectStatus: false, - loadingStatus: loadingStatus, - text: !loadingStatus - ? widget.videoDetail!.stat!.reply!.toString() - : '评论'), + icon: const Icon(FontAwesomeIcons.comment), + onTap: () => videoDetailCtr.tabCtr.animateTo(1), + selectStatus: false, + text: widget.videoDetail!.stat!.reply!.toString(), + ), ActionItem( - icon: const Icon(FontAwesomeIcons.shareFromSquare), - onTap: () => videoIntroController.actionShareVideo(), - selectStatus: false, - loadingStatus: loadingStatus, - text: '分享'), + icon: const Icon(FontAwesomeIcons.shareFromSquare), + onTap: () => videoIntroController.actionShareVideo(), + selectStatus: false, + text: '分享', + ), ], ), ); }); } - - Widget actionRow(BuildContext context, videoIntroController, videoDetailCtr) { - return Row(children: [ - Obx( - () => ActionRowItem( - icon: const Icon(FontAwesomeIcons.thumbsUp), - onTap: handleState(videoIntroController.actionLikeVideo), - selectStatus: videoIntroController.hasLike.value, - loadingStatus: loadingStatus, - text: - !loadingStatus ? widget.videoDetail!.stat!.like!.toString() : '-', - ), - ), - const SizedBox(width: 8), - Obx( - () => ActionRowItem( - icon: const Icon(FontAwesomeIcons.b), - onTap: handleState(videoIntroController.actionCoinVideo), - selectStatus: videoIntroController.hasCoin.value, - loadingStatus: loadingStatus, - text: - !loadingStatus ? widget.videoDetail!.stat!.coin!.toString() : '-', - ), - ), - const SizedBox(width: 8), - Obx( - () => ActionRowItem( - icon: const Icon(FontAwesomeIcons.heart), - onTap: () => showFavBottomSheet(), - onLongPress: () => showFavBottomSheet(type: 'longPress'), - selectStatus: videoIntroController.hasFav.value, - loadingStatus: loadingStatus, - text: !loadingStatus - ? widget.videoDetail!.stat!.favorite!.toString() - : '-', - ), - ), - const SizedBox(width: 8), - ActionRowItem( - icon: const Icon(FontAwesomeIcons.comment), - onTap: () { - videoDetailCtr.tabCtr.animateTo(1); - }, - selectStatus: false, - loadingStatus: loadingStatus, - text: - !loadingStatus ? widget.videoDetail!.stat!.reply!.toString() : '-', - ), - const SizedBox(width: 8), - ActionRowItem( - icon: const Icon(FontAwesomeIcons.share), - onTap: () => videoIntroController.actionShareVideo(), - selectStatus: false, - loadingStatus: loadingStatus, - // text: !loadingStatus - // ? widget.videoDetail!.stat!.share!.toString() - // : '-', - text: '转发'), - ]); - } } diff --git a/lib/pages/video/detail/introduction/widgets/action_item.dart b/lib/pages/video/detail/introduction/widgets/action_item.dart index 95ac103b..022d9223 100644 --- a/lib/pages/video/detail/introduction/widgets/action_item.dart +++ b/lib/pages/video/detail/introduction/widgets/action_item.dart @@ -7,7 +7,6 @@ class ActionItem extends StatelessWidget { final Icon? selectIcon; final Function? onTap; final Function? onLongPress; - final bool? loadingStatus; final String? text; final bool selectStatus; @@ -17,7 +16,6 @@ class ActionItem extends StatelessWidget { this.selectIcon, this.onTap, this.onLongPress, - this.loadingStatus, this.text, this.selectStatus = false, }) : super(key: key); @@ -43,25 +41,15 @@ class ActionItem extends StatelessWidget { : Icon(icon!.icon!, size: 18, color: Theme.of(context).colorScheme.outline), const SizedBox(height: 6), - AnimatedOpacity( - opacity: loadingStatus! ? 0 : 1, - duration: const Duration(milliseconds: 200), - child: AnimatedSwitcher( - duration: const Duration(milliseconds: 300), - transitionBuilder: (Widget child, Animation animation) { - return ScaleTransition(scale: animation, child: child); - }, - child: Text( - text ?? '', - key: ValueKey(text ?? ''), - style: TextStyle( - color: selectStatus - ? Theme.of(context).colorScheme.primary - : Theme.of(context).colorScheme.outline, - fontSize: Theme.of(context).textTheme.labelSmall!.fontSize), - ), + Text( + text ?? '', + style: TextStyle( + color: selectStatus + ? Theme.of(context).colorScheme.primary + : Theme.of(context).colorScheme.outline, + fontSize: Theme.of(context).textTheme.labelSmall!.fontSize, ), - ), + ) ], ), ); From 70317f92e2935e4ae5b996657df8c6af26367c92 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Wed, 13 Mar 2024 22:42:34 +0800 Subject: [PATCH 186/220] =?UTF-8?q?mod:=20=E8=A7=86=E9=A2=91=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E9=A1=B5=E7=BB=93=E6=9E=84=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/video/detail/controller.dart | 84 ++++ lib/pages/video/detail/introduction/view.dart | 5 +- lib/pages/video/detail/view.dart | 459 +++++++++--------- .../video/detail/widgets/header_control.dart | 119 ----- 4 files changed, 320 insertions(+), 347 deletions(-) diff --git a/lib/pages/video/detail/controller.dart b/lib/pages/video/detail/controller.dart index b4005b5a..40723efa 100644 --- a/lib/pages/video/detail/controller.dart +++ b/lib/pages/video/detail/controller.dart @@ -5,6 +5,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:get/get.dart'; import 'package:hive/hive.dart'; +import 'package:ns_danmaku/ns_danmaku.dart'; import 'package:pilipala/http/constants.dart'; import 'package:pilipala/http/video.dart'; import 'package:pilipala/models/common/reply_type.dart'; @@ -19,6 +20,7 @@ import 'package:pilipala/utils/utils.dart'; import 'package:pilipala/utils/video_utils.dart'; import 'package:screen_brightness/screen_brightness.dart'; +import '../../../http/danmaku.dart'; import '../../../utils/id_utils.dart'; import 'widgets/header_control.dart'; @@ -383,4 +385,86 @@ class VideoDetailController extends GetxController ? replyReplyBottomSheetCtr!.close() : print('replyReplyBottomSheetCtr is null'); } + + /// 发送弹幕 + void showShootDanmakuSheet() { + final TextEditingController textController = TextEditingController(); + bool isSending = false; // 追踪是否正在发送 + showDialog( + context: Get.context!, + builder: (BuildContext context) { + // TODO: 支持更多类型和颜色的弹幕 + return AlertDialog( + title: const Text('发送弹幕'), + content: StatefulBuilder( + builder: (BuildContext context, StateSetter setState) { + return TextField( + controller: textController, + ); + }), + actions: [ + TextButton( + onPressed: () => Get.back(), + child: Text( + '取消', + style: TextStyle(color: Theme.of(context).colorScheme.outline), + ), + ), + StatefulBuilder( + builder: (BuildContext context, StateSetter setState) { + return TextButton( + onPressed: isSending + ? null + : () async { + final String msg = textController.text; + if (msg.isEmpty) { + SmartDialog.showToast('弹幕内容不能为空'); + return; + } else if (msg.length > 100) { + SmartDialog.showToast('弹幕内容不能超过100个字符'); + return; + } + setState(() { + isSending = true; // 开始发送，更新状态 + }); + //修改按钮文字 + // SmartDialog.showToast('弹幕发送中,\n$msg'); + final dynamic res = await DanmakaHttp.shootDanmaku( + oid: cid.value, + msg: textController.text, + bvid: bvid, + progress: + plPlayerController.position.value.inMilliseconds, + type: 1, + ); + setState(() { + isSending = false; // 发送结束，更新状态 + }); + if (res['status']) { + SmartDialog.showToast('发送成功'); + // 发送成功，自动预览该弹幕，避免重新请求 + // TODO: 暂停状态下预览弹幕仍会移动与计时，可考虑添加到dmSegList或其他方式实现 + plPlayerController.danmakuController?.addItems([ + DanmakuItem( + msg, + color: Colors.white, + time: plPlayerController + .position.value.inMilliseconds, + type: DanmakuItemType.scroll, + isSend: true, + ) + ]); + Get.back(); + } else { + SmartDialog.showToast('发送失败，错误信息为${res['msg']}'); + } + }, + child: Text(isSending ? '发送中...' : '发送'), + ); + }) + ], + ); + }, + ); + } } diff --git a/lib/pages/video/detail/introduction/view.dart b/lib/pages/video/detail/introduction/view.dart index bed37bb5..6c713efe 100644 --- a/lib/pages/video/detail/introduction/view.dart +++ b/lib/pages/video/detail/introduction/view.dart @@ -268,7 +268,10 @@ class _VideoInfoState extends State with TickerProviderStateMixin { final Color outline = t.colorScheme.outline; return SliverPadding( padding: const EdgeInsets.only( - left: StyleString.safeSpace, right: StyleString.safeSpace, top: 10), + left: StyleString.safeSpace, + right: StyleString.safeSpace, + top: 16, + ), sliver: SliverToBoxAdapter( child: !loadingStatus ? Column( diff --git a/lib/pages/video/detail/view.dart b/lib/pages/video/detail/view.dart index 04d41b2e..b02264cd 100644 --- a/lib/pages/video/detail/view.dart +++ b/lib/pages/video/detail/view.dart @@ -9,7 +9,6 @@ import 'package:font_awesome_flutter/font_awesome_flutter.dart'; import 'package:get/get.dart'; import 'package:flutter/material.dart'; import 'package:hive/hive.dart'; -import 'package:nil/nil.dart'; import 'package:pilipala/common/widgets/network_img_layer.dart'; import 'package:pilipala/http/user.dart'; import 'package:pilipala/models/common/search_type.dart'; @@ -25,7 +24,7 @@ import 'package:pilipala/services/service_locator.dart'; import 'package:pilipala/utils/storage.dart'; import '../../../services/shutdown_timer_service.dart'; -import 'widgets/header_control.dart'; +import 'widgets/app_bar.dart'; class VideoDetailPage extends StatefulWidget { const VideoDetailPage({Key? key}) : super(key: key); @@ -38,7 +37,7 @@ class VideoDetailPage extends StatefulWidget { class _VideoDetailPageState extends State with TickerProviderStateMixin, RouteAware { - late VideoDetailController videoDetailController; + late VideoDetailController vdCtr; PlPlayerController? plPlayerController; final ScrollController _extendNestCtr = ScrollController(); late StreamController appbarStream; @@ -65,20 +64,18 @@ class _VideoDetailPageState extends State void initState() { super.initState(); heroTag = Get.arguments['heroTag']; - videoDetailController = Get.put(VideoDetailController(), tag: heroTag); + vdCtr = Get.put(VideoDetailController(), tag: heroTag); videoIntroController = Get.put( VideoIntroController(bvid: Get.parameters['bvid']!), tag: heroTag); videoIntroController.videoDetail.listen((value) { - videoPlayerServiceHandler.onVideoDetailChange( - value, videoDetailController.cid.value); + videoPlayerServiceHandler.onVideoDetailChange(value, vdCtr.cid.value); }); bangumiIntroController = Get.put(BangumiIntroController(), tag: heroTag); bangumiIntroController.bangumiDetail.listen((value) { - videoPlayerServiceHandler.onVideoDetailChange( - value, videoDetailController.cid.value); + videoPlayerServiceHandler.onVideoDetailChange(value, vdCtr.cid.value); }); - videoDetailController.cid.listen((p0) { + vdCtr.cid.listen((p0) { videoPlayerServiceHandler.onVideoDetailChange( bangumiIntroController.bangumiDetail.value, p0); }); @@ -93,16 +90,16 @@ class _VideoDetailPageState extends State appbarStreamListen(); fullScreenStatusListener(); if (Platform.isAndroid) { - floating = videoDetailController.floating!; + floating = vdCtr.floating!; autoEnterPip(); } } // 获取视频资源，初始化播放器 Future videoSourceInit() async { - _futureBuilderFuture = videoDetailController.queryVideoUrl(); - if (videoDetailController.autoPlay.value) { - plPlayerController = videoDetailController.plPlayerController; + _futureBuilderFuture = vdCtr.queryVideoUrl(); + if (vdCtr.autoPlay.value) { + plPlayerController = vdCtr.plPlayerController; plPlayerController!.addStatusLister(playerListener); } } @@ -131,10 +128,10 @@ class _VideoDetailPageState extends State /// 顺序播放 列表循环 if (plPlayerController!.playRepeat != PlayRepeat.pause && plPlayerController!.playRepeat != PlayRepeat.singleCycle) { - if (videoDetailController.videoType == SearchType.video) { + if (vdCtr.videoType == SearchType.video) { videoIntroController.nextPlay(); } - if (videoDetailController.videoType == SearchType.media_bangumi) { + if (vdCtr.videoType == SearchType.media_bangumi) { bangumiIntroController.nextPlay(); } } @@ -146,8 +143,7 @@ class _VideoDetailPageState extends State } // 播放完展示控制栏 try { - PiPStatus currentStatus = - await videoDetailController.floating!.pipStatus; + PiPStatus currentStatus = await vdCtr.floating!.pipStatus; if (currentStatus == PiPStatus.disabled) { plPlayerController!.onLockControl(false); } @@ -168,17 +164,17 @@ class _VideoDetailPageState extends State /// 未开启自动播放时触发播放 Future handlePlay() async { - await videoDetailController.playerInit(); - plPlayerController = videoDetailController.plPlayerController; + await vdCtr.playerInit(); + plPlayerController = vdCtr.plPlayerController; plPlayerController!.addStatusLister(playerListener); - videoDetailController.autoPlay.value = true; - videoDetailController.isShowCover.value = false; + vdCtr.autoPlay.value = true; + vdCtr.isShowCover.value = false; } void fullScreenStatusListener() { plPlayerController?.isFullScreen.listen((bool isFullScreen) { if (isFullScreen) { - videoDetailController.hiddenReplyReplyPanel(); + vdCtr.hiddenReplyReplyPanel(); } }); } @@ -190,8 +186,8 @@ class _VideoDetailPageState extends State plPlayerController!.removeStatusLister(playerListener); plPlayerController!.dispose(); } - if (videoDetailController.floating != null) { - videoDetailController.floating!.dispose(); + if (vdCtr.floating != null) { + vdCtr.floating!.dispose(); } videoPlayerServiceHandler.onVideoDetailDispose(); if (Platform.isAndroid) { @@ -207,10 +203,10 @@ class _VideoDetailPageState extends State /// 开启 if (setting.get(SettingBoxKey.enableAutoBrightness, defaultValue: false) as bool) { - videoDetailController.brightness = plPlayerController!.brightness.value; + vdCtr.brightness = plPlayerController!.brightness.value; } if (plPlayerController != null) { - videoDetailController.defaultST = plPlayerController!.position.value; + vdCtr.defaultST = plPlayerController!.position.value; videoIntroController.isPaused = true; plPlayerController!.removeStatusLister(playerListener); plPlayerController!.pause(); @@ -226,17 +222,16 @@ class _VideoDetailPageState extends State plPlayerController!.videoPlayerController != null) { setState(() => isShowing = true); } - videoDetailController.isFirstTime = false; + vdCtr.isFirstTime = false; final bool autoplay = autoPlayEnable; - videoDetailController.playerInit(autoplay: autoplay); + vdCtr.playerInit(autoplay: autoplay); /// 未开启自动播放时，未播放跳转下一页返回/播放后跳转下一页返回 - videoDetailController.autoPlay.value = - !videoDetailController.isShowCover.value; + vdCtr.autoPlay.value = !vdCtr.isShowCover.value; videoIntroController.isPaused = false; if (_extendNestCtr.position.pixels == 0 && autoplay) { await Future.delayed(const Duration(milliseconds: 300)); - plPlayerController?.seekTo(videoDetailController.defaultST); + plPlayerController?.seekTo(vdCtr.defaultST); plPlayerController?.play(); } plPlayerController?.addStatusLister(playerListener); @@ -259,9 +254,166 @@ class _VideoDetailPageState extends State @override Widget build(BuildContext context) { - final double videoHeight = MediaQuery.sizeOf(context).width * 9 / 16; + // final double videoHeight = MediaQuery.sizeOf(context).width * 9 / 16; + final sizeContext = MediaQuery.sizeOf(context); + final _context = MediaQuery.of(context); + late double defaultVideoHeight = sizeContext.width * 9 / 16; + late RxDouble videoHeight = defaultVideoHeight.obs; final double pinnedHeaderHeight = - statusBarHeight + kToolbarHeight + videoHeight; + statusBarHeight + kToolbarHeight + videoHeight.value; + // ignore: no_leading_underscores_for_local_identifiers + + // 竖屏 + final bool isPortrait = _context.orientation == Orientation.portrait; + // 横屏 + final bool isLandscape = _context.orientation == Orientation.landscape; + final Rx isFullScreen = plPlayerController?.isFullScreen ?? false.obs; + // 全屏时高度撑满 + if (isLandscape || isFullScreen.value == true) { + videoHeight.value = Get.size.height; + enterFullScreen(); + } else { + videoHeight.value = defaultVideoHeight; + exitFullScreen(); + } + + /// 播放器面板 + Widget videoPlayerPanel = FutureBuilder( + future: _futureBuilderFuture, + builder: (BuildContext context, AsyncSnapshot snapshot) { + if (snapshot.hasData && snapshot.data['status']) { + return Obx( + () { + return !vdCtr.autoPlay.value + ? const SizedBox() + : PLVideoPlayer( + controller: plPlayerController!, + headerControl: vdCtr.headerControl, + danmuWidget: Obx( + () => PlDanmaku( + key: Key(vdCtr.danmakuCid.value.toString()), + cid: vdCtr.danmakuCid.value, + playerController: plPlayerController!, + ), + ), + ); + }, + ); + } else { + // 加载失败异常处理 + return const SizedBox(); + } + }, + ); + + /// tabbar + Widget tabbarBuild = Container( + width: double.infinity, + height: 45, + decoration: BoxDecoration( + border: Border( + bottom: BorderSide( + width: 1, + color: Theme.of(context).dividerColor.withOpacity(0.1), + ), + ), + ), + child: Row( + children: [ + const SizedBox(width: 20), + Expanded( + child: TabBar( + controller: vdCtr.tabCtr, + dividerColor: Colors.transparent, + tabs: vdCtr.tabs.map((String name) => Tab(text: name)).toList(), + ), + ), + SizedBox( + width: 220, + child: Center( + child: Row( + mainAxisAlignment: MainAxisAlignment.end, + children: [ + SizedBox( + height: 32, + child: TextButton( + style: ButtonStyle( + padding: MaterialStateProperty.all(EdgeInsets.zero), + ), + onPressed: () => vdCtr.showShootDanmakuSheet(), + child: const Text('发弹幕', style: TextStyle(fontSize: 12)), + ), + ), + const SizedBox(width: 4), + SizedBox( + width: 34, + height: 32, + child: TextButton( + style: ButtonStyle( + padding: MaterialStateProperty.all(EdgeInsets.zero), + ), + onPressed: () { + plPlayerController?.isOpenDanmu.value = + !(plPlayerController?.isOpenDanmu.value ?? false); + }, + child: Obx(() => Text( + '弹', + style: TextStyle( + fontSize: 12, + color: (plPlayerController?.isOpenDanmu.value ?? + false) + ? Theme.of(context).colorScheme.primary + : Theme.of(context).colorScheme.outline, + ), + )), + ), + ), + const SizedBox(width: 14), + ], + ), + ), + ), + ], + ), + ); + + /// 手动播放 + Widget handlePlayPanel() { + return Stack( + children: [ + GestureDetector( + onTap: () { + handlePlay(); + }, + child: NetworkImgLayer( + type: 'emote', + src: vdCtr.videoItem['pic'], + width: Get.width, + height: videoHeight.value, + ), + ), + Positioned( + top: 0, + left: 0, + right: 0, + child: buildCustomAppBar(), + ), + Positioned( + right: 12, + bottom: 10, + child: IconButton( + tooltip: '播放', + onPressed: () => handlePlay(), + icon: Image.asset( + 'assets/images/play.png', + width: 60, + height: 60, + )), + ), + ], + ); + } + Widget childWhenDisabled = SafeArea( top: MediaQuery.of(context).orientation == Orientation.portrait && plPlayerController?.isFullScreen.value == true, @@ -273,7 +425,7 @@ class _VideoDetailPageState extends State children: [ Scaffold( resizeToAvoidBottomInset: false, - key: videoDetailController.scaffoldKey, + key: vdCtr.scaffoldKey, backgroundColor: Colors.black, appBar: PreferredSize( preferredSize: const Size.fromHeight(0), @@ -299,21 +451,19 @@ class _VideoDetailPageState extends State return SliverAppBar( automaticallyImplyLeading: false, // 假装使用一个非空变量，避免Obx检测不到而罢工 - pinned: videoDetailController.autoPlay.value ^ - false ^ - videoDetailController.autoPlay.value, + pinned: vdCtr.autoPlay.value, elevation: 0, scrolledUnderElevation: 0, forceElevated: innerBoxIsScrolled, expandedHeight: MediaQuery.of(context).orientation == Orientation.landscape || plPlayerController?.isFullScreen.value == true - ? MediaQuery.sizeOf(context).height - + ? (MediaQuery.sizeOf(context).height - (MediaQuery.of(context).orientation == Orientation.landscape ? 0 - : MediaQuery.of(context).padding.top) - : videoHeight, + : MediaQuery.of(context).padding.top)) + : videoHeight.value, backgroundColor: Colors.black, flexibleSpace: FlexibleSpaceBar( background: PopScope( @@ -333,108 +483,27 @@ class _VideoDetailPageState extends State child: LayoutBuilder( builder: (BuildContext context, BoxConstraints boxConstraints) { - final double maxWidth = - boxConstraints.maxWidth; - final double maxHeight = - boxConstraints.maxHeight; + // final double maxWidth = + // boxConstraints.maxWidth; + // final double maxHeight = + // boxConstraints.maxHeight; return Stack( children: [ - if (isShowing) - FutureBuilder( - future: _futureBuilderFuture, - builder: (BuildContext context, - AsyncSnapshot snapshot) { - if (snapshot.hasData && - snapshot.data['status']) { - return Obx( - () => - !videoDetailController - .autoPlay.value - ? nil - : PLVideoPlayer( - controller: - plPlayerController!, - headerControl: - videoDetailController - .headerControl, - danmuWidget: Obx( - () => PlDanmaku( - key: Key(videoDetailController - .danmakuCid - .value - .toString()), - cid: videoDetailController - .danmakuCid - .value, - playerController: - plPlayerController!, - ), - ), - ), - ); - } else { - return buildCustomAppBar(); - } - }, - ), + if (isShowing) videoPlayerPanel, /// 关闭自动播放时 手动播放 - if (!videoDetailController - .autoPlay.value) ...[ - Obx( - () => Visibility( - visible: videoDetailController - .isShowCover.value, - child: Positioned( - top: 0, - left: 0, - right: 0, - child: GestureDetector( - onTap: () { - handlePlay(); - }, - child: NetworkImgLayer( - type: 'emote', - src: videoDetailController - .videoItem['pic'], - width: maxWidth, - height: maxHeight, - ), - ), - ), + Obx( + () => Visibility( + visible: !vdCtr.autoPlay.value && + vdCtr.isShowCover.value, + child: Positioned( + top: 0, + left: 0, + right: 0, + child: handlePlayPanel(), ), ), - Obx( - () => Visibility( - visible: videoDetailController - .isShowCover.value && - videoDetailController - .isEffective.value, - child: Stack( - children: [ - Positioned( - top: 0, - left: 0, - right: 0, - child: buildCustomAppBar(), - ), - Positioned( - right: 12, - bottom: 10, - child: IconButton( - tooltip: '播放', - onPressed: () => - handlePlay(), - icon: Image.asset( - 'assets/images/play.png', - width: 60, - height: 60, - )), - ), - ], - )), - ), - ] + ), ], ); }, @@ -445,18 +514,16 @@ class _VideoDetailPageState extends State ), ]; }, - // pinnedHeaderSliverHeightBuilder: () { - // return playerStatus != PlayerStatus.playing - // ? statusBarHeight + kToolbarHeight - // : pinnedHeaderHeight; - // }, + /// 不收回 pinnedHeaderSliverHeightBuilder: () { return MediaQuery.of(context).orientation == Orientation.landscape || plPlayerController?.isFullScreen.value == true ? MediaQuery.sizeOf(context).height - : pinnedHeaderHeight; + : playerStatus != PlayerStatus.playing + ? kToolbarHeight + : pinnedHeaderHeight; }, onlyOneScrollInBody: true, body: ColoredBox( @@ -464,54 +531,23 @@ class _VideoDetailPageState extends State color: Theme.of(context).colorScheme.background, child: Column( children: [ - Opacity( - opacity: 0, - child: SizedBox( - width: double.infinity, - height: 0, - child: Obx( - () => TabBar( - controller: videoDetailController.tabCtr, - dividerColor: Colors.transparent, - indicatorColor: - Theme.of(context).colorScheme.background, - tabs: videoDetailController.tabs - .map((String name) => Tab(text: name)) - .toList(), - ), - ), - ), - ), + tabbarBuild, Expanded( child: TabBarView( - controller: videoDetailController.tabCtr, + controller: vdCtr.tabCtr, children: [ Builder( builder: (BuildContext context) { return CustomScrollView( key: const PageStorageKey('简介'), slivers: [ - if (videoDetailController.videoType == - SearchType.video) ...[ - VideoIntroPanel( - bvid: videoDetailController.bvid), - ] else if (videoDetailController.videoType == + if (vdCtr.videoType == SearchType.video) ...[ + VideoIntroPanel(bvid: vdCtr.bvid), + ] else if (vdCtr.videoType == SearchType.media_bangumi) ...[ Obx(() => BangumiIntroPanel( - cid: videoDetailController.cid.value)), + cid: vdCtr.cid.value)), ], - // if (videoDetailController.videoType == - // SearchType.video) ...[ - // SliverPersistentHeader( - // floating: true, - // pinned: true, - // delegate: SliverHeaderDelegate( - // height: 50, - // child: - // const MenuRow(loadingStatus: false), - // ), - // ), - // ], SliverToBoxAdapter( child: Divider( indent: 12, @@ -528,8 +564,8 @@ class _VideoDetailPageState extends State ), Obx( () => VideoReplyPanel( - bvid: videoDetailController.bvid, - oid: videoDetailController.oid.value, + bvid: vdCtr.bvid, + oid: vdCtr.oid.value, ), ) ], @@ -543,56 +579,26 @@ class _VideoDetailPageState extends State /// 重新进入会刷新 // 播放完成/暂停播放 - // StreamBuilder( - // stream: appbarStream.stream, - // initialData: 0, - // builder: ((context, snapshot) { - // return ScrollAppBar( - // snapshot.data!.toDouble(), - // () => continuePlay(), - // playerStatus, - // null, - // ); - // }), - // ) + StreamBuilder( + stream: appbarStream.stream, + initialData: 0, + builder: ((context, snapshot) { + return ScrollAppBar( + snapshot.data!.toDouble(), + () => continuePlay(), + playerStatus, + null, + ); + }), + ) ], ), ); - Widget childWhenEnabled = FutureBuilder( - key: Key(heroTag), - future: _futureBuilderFuture, - builder: (BuildContext context, AsyncSnapshot snapshot) { - if (snapshot.hasData && snapshot.data['status']) { - return Obx( - () => !videoDetailController.autoPlay.value - ? const SizedBox() - : PLVideoPlayer( - controller: plPlayerController!, - headerControl: HeaderControl( - controller: plPlayerController, - videoDetailCtr: videoDetailController, - bvid: videoDetailController.bvid, - videoType: videoDetailController.videoType, - ), - danmuWidget: Obx( - () => PlDanmaku( - key: Key( - videoDetailController.danmakuCid.value.toString()), - cid: videoDetailController.danmakuCid.value, - playerController: plPlayerController!, - ), - ), - ), - ); - } else { - return nil; - } - }, - ); + if (Platform.isAndroid) { return PiPSwitcher( childWhenDisabled: childWhenDisabled, - childWhenEnabled: childWhenEnabled, + childWhenEnabled: videoPlayerPanel, floating: floating, ); } else { @@ -633,8 +639,7 @@ class _VideoDetailPageState extends State ComBtn( icon: const Icon(Icons.history_outlined, size: 22), fuc: () async { - var res = await UserHttp.toViewLater( - bvid: videoDetailController.bvid); + var res = await UserHttp.toViewLater(bvid: vdCtr.bvid); SmartDialog.showToast(res['msg']); }, ), diff --git a/lib/pages/video/detail/widgets/header_control.dart b/lib/pages/video/detail/widgets/header_control.dart index e72e6a69..a8414c18 100644 --- a/lib/pages/video/detail/widgets/header_control.dart +++ b/lib/pages/video/detail/widgets/header_control.dart @@ -1,5 +1,4 @@ import 'dart:io'; -import 'dart:math'; import 'package:floating/floating.dart'; import 'package:flutter/material.dart'; @@ -17,7 +16,6 @@ import 'package:pilipala/pages/video/detail/introduction/widgets/menu_row.dart'; import 'package:pilipala/plugin/pl_player/index.dart'; import 'package:pilipala/plugin/pl_player/models/play_repeat.dart'; import 'package:pilipala/utils/storage.dart'; -import 'package:pilipala/http/danmaku.dart'; import 'package:pilipala/services/shutdown_timer_service.dart'; import '../../../../models/common/search_type.dart'; import '../../../../models/video_detail_res.dart'; @@ -221,88 +219,6 @@ class _HeaderControlState extends State { ); } - /// 发送弹幕 - void showShootDanmakuSheet() { - final TextEditingController textController = TextEditingController(); - bool isSending = false; // 追踪是否正在发送 - showDialog( - context: Get.context!, - builder: (BuildContext context) { - // TODO: 支持更多类型和颜色的弹幕 - return AlertDialog( - title: const Text('发送弹幕（测试）'), - content: StatefulBuilder( - builder: (BuildContext context, StateSetter setState) { - return TextField( - controller: textController, - ); - }), - actions: [ - TextButton( - onPressed: () => Get.back(), - child: Text( - '取消', - style: TextStyle(color: Theme.of(context).colorScheme.outline), - ), - ), - StatefulBuilder( - builder: (BuildContext context, StateSetter setState) { - return TextButton( - onPressed: isSending - ? null - : () async { - final String msg = textController.text; - if (msg.isEmpty) { - SmartDialog.showToast('弹幕内容不能为空'); - return; - } else if (msg.length > 100) { - SmartDialog.showToast('弹幕内容不能超过100个字符'); - return; - } - setState(() { - isSending = true; // 开始发送，更新状态 - }); - //修改按钮文字 - // SmartDialog.showToast('弹幕发送中,\n$msg'); - final dynamic res = await DanmakaHttp.shootDanmaku( - oid: widget.videoDetailCtr!.cid.value, - msg: textController.text, - bvid: widget.videoDetailCtr!.bvid, - progress: - widget.controller!.position.value.inMilliseconds, - type: 1, - ); - setState(() { - isSending = false; // 发送结束，更新状态 - }); - if (res['status']) { - SmartDialog.showToast('发送成功'); - // 发送成功，自动预览该弹幕，避免重新请求 - // TODO: 暂停状态下预览弹幕仍会移动与计时，可考虑添加到dmSegList或其他方式实现 - widget.controller!.danmakuController!.addItems([ - DanmakuItem( - msg, - color: Colors.white, - time: widget - .controller!.position.value.inMilliseconds, - type: DanmakuItemType.scroll, - isSend: true, - ) - ]); - Get.back(); - } else { - SmartDialog.showToast('发送失败，错误信息为${res['msg']}'); - } - }, - child: Text(isSending ? '发送中...' : '发送'), - ); - }) - ], - ); - }, - ); - } - /// 定时关闭 void scheduleExit() async { const List scheduleTimeChoices = [ @@ -1166,41 +1082,6 @@ class _HeaderControlState extends State { // ), // fuc: () => _.screenshot(), // ), - SizedBox( - width: 56, - height: 34, - child: TextButton( - style: ButtonStyle( - padding: MaterialStateProperty.all(EdgeInsets.zero), - ), - onPressed: () => showShootDanmakuSheet(), - child: const Text( - '发弹幕', - style: textStyle, - ), - ), - ), - SizedBox( - width: 34, - height: 34, - child: Obx( - () => IconButton( - style: ButtonStyle( - padding: MaterialStateProperty.all(EdgeInsets.zero), - ), - onPressed: () { - _.isOpenDanmu.value = !_.isOpenDanmu.value; - }, - icon: Icon( - _.isOpenDanmu.value - ? Icons.subtitles_outlined - : Icons.subtitles_off_outlined, - size: 19, - color: Colors.white, - ), - ), - ), - ), SizedBox(width: buttonSpace), if (Platform.isAndroid) ...[ SizedBox( From da2bbeedffdfd08143a4353a1cf6abd0719d41c0 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Wed, 13 Mar 2024 23:12:34 +0800 Subject: [PATCH 187/220] =?UTF-8?q?mod:=20=E9=BB=98=E8=AE=A4=E7=9B=B4?= =?UTF-8?q?=E6=92=AD=E7=94=BB=E8=B4=A8=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/models/live/quality.dart | 2 +- lib/pages/live_room/controller.dart | 4 +- .../live_room/widgets/bottom_control.dart | 50 +++++++++---------- lib/pages/setting/play_setting.dart | 36 +++++++++++-- lib/utils/storage.dart | 1 + 5 files changed, 62 insertions(+), 31 deletions(-) diff --git a/lib/models/live/quality.dart b/lib/models/live/quality.dart index 47938416..677d615b 100644 --- a/lib/models/live/quality.dart +++ b/lib/models/live/quality.dart @@ -2,7 +2,6 @@ enum LiveQuality { dolby, super4K, origin, - veryHigh, bluRay, superHD, smooth, @@ -37,6 +36,7 @@ extension VideoQualityDesc on LiveQuality { '原画', '蓝光', '超清', + '高清', '流畅', ]; get description => _descList[index]; diff --git a/lib/pages/live_room/controller.dart b/lib/pages/live_room/controller.dart index a1878c74..f785da63 100644 --- a/lib/pages/live_room/controller.dart +++ b/lib/pages/live_room/controller.dart @@ -27,7 +27,8 @@ class LiveRoomController extends GetxController { @override void onInit() { super.onInit(); - currentQn = 10000; + currentQn = setting.get(SettingBoxKey.defaultLiveQa, + defaultValue: LiveQuality.values.last.code); roomId = int.parse(Get.parameters['roomid']!); if (Get.arguments != null) { liveItem = Get.arguments['liveItem']; @@ -62,7 +63,6 @@ class LiveRoomController extends GetxController { } Future queryLiveInfo() async { - /// TODO 默认获取预设质量的直播资源 var res = await LiveHttp.liveRoomInfo(roomId: roomId, qn: currentQn); if (res['status']) { List codec = diff --git a/lib/pages/live_room/widgets/bottom_control.dart b/lib/pages/live_room/widgets/bottom_control.dart index 0dcedc2c..c98a80ae 100644 --- a/lib/pages/live_room/widgets/bottom_control.dart +++ b/lib/pages/live_room/widgets/bottom_control.dart @@ -85,6 +85,30 @@ class _BottomControlState extends State { // ), // ), // const SizedBox(width: 4), + SizedBox( + width: 30, + child: PopupMenuButton( + padding: EdgeInsets.zero, + onSelected: (value) { + widget.liveRoomCtr!.changeQn(value); + }, + child: Obx( + () => Text( + widget.liveRoomCtr!.currentQnDesc.value, + style: const TextStyle(color: Colors.white, fontSize: 13), + ), + ), + itemBuilder: (BuildContext context) { + return widget.liveRoomCtr!.acceptQnList.map((e) { + return PopupMenuItem( + value: e['code'], + child: Text(e['desc']), + ); + }).toList(); + }, + ), + ), + const SizedBox(width: 10), if (Platform.isAndroid) ...[ SizedBox( width: 34, @@ -112,32 +136,8 @@ class _BottomControlState extends State { ), ), ), - const SizedBox(width: 4), + const SizedBox(width: 10), ], - SizedBox( - width: 30, - child: PopupMenuButton( - padding: EdgeInsets.zero, - onSelected: (value) { - widget.liveRoomCtr!.changeQn(value); - }, - child: Obx( - () => Text( - widget.liveRoomCtr!.currentQnDesc.value, - style: const TextStyle(color: Colors.white, fontSize: 13), - ), - ), - itemBuilder: (BuildContext context) { - return widget.liveRoomCtr!.acceptQnList.map((e) { - return PopupMenuItem( - value: e['code'], - child: Text(e['desc']), - ); - }).toList(); - }, - ), - ), - const SizedBox(width: 10), ComBtn( icon: const Icon( Icons.fullscreen, diff --git a/lib/pages/setting/play_setting.dart b/lib/pages/setting/play_setting.dart index bfd5db5f..03e91212 100644 --- a/lib/pages/setting/play_setting.dart +++ b/lib/pages/setting/play_setting.dart @@ -9,6 +9,7 @@ import 'package:pilipala/plugin/pl_player/index.dart'; import 'package:pilipala/services/service_locator.dart'; import 'package:pilipala/utils/storage.dart'; +import '../../models/live/quality.dart'; import 'widgets/switch_item.dart'; class PlaySetting extends StatefulWidget { @@ -21,6 +22,7 @@ class PlaySetting extends StatefulWidget { class _PlaySettingState extends State { Box setting = GStrorage.setting; late dynamic defaultVideoQa; + late dynamic defaultLiveQa; late dynamic defaultAudioQa; late dynamic defaultDecode; late int defaultFullScreenMode; @@ -31,6 +33,8 @@ class _PlaySettingState extends State { super.initState(); defaultVideoQa = setting.get(SettingBoxKey.defaultVideoQa, defaultValue: VideoQuality.values.last.code); + defaultLiveQa = setting.get(SettingBoxKey.defaultLiveQa, + defaultValue: LiveQuality.values.last.code); defaultAudioQa = setting.get(SettingBoxKey.defaultAudioQa, defaultValue: AudioQuality.values.last.code); defaultDecode = setting.get(SettingBoxKey.defaultDecode, @@ -148,9 +152,9 @@ class _PlaySettingState extends State { ), ListTile( dense: false, - title: Text('默认画质', style: titleStyle), + title: Text('默认视频画质', style: titleStyle), subtitle: Text( - '当前画质${VideoQualityCode.fromCode(defaultVideoQa)!.description!}', + '当前默认画质${VideoQualityCode.fromCode(defaultVideoQa)!.description!}', style: subTitleStyle, ), onTap: () async { @@ -158,7 +162,7 @@ class _PlaySettingState extends State { context: context, builder: (context) { return SelectDialog( - title: '默认画质', + title: '默认视频画质', value: defaultVideoQa, values: VideoQuality.values.reversed.map((e) { return {'title': e.description, 'value': e.code}; @@ -172,6 +176,32 @@ class _PlaySettingState extends State { } }, ), + ListTile( + dense: false, + title: Text('默认直播画质', style: titleStyle), + subtitle: Text( + '当前默认画质${LiveQualityCode.fromCode(defaultLiveQa)!.description!}', + style: subTitleStyle, + ), + onTap: () async { + int? result = await showDialog( + context: context, + builder: (context) { + return SelectDialog( + title: '默认直播画质', + value: defaultLiveQa, + values: LiveQuality.values.reversed.map((e) { + return {'title': e.description, 'value': e.code}; + }).toList()); + }, + ); + if (result != null) { + defaultLiveQa = result; + setting.put(SettingBoxKey.defaultLiveQa, result); + setState(() {}); + } + }, + ), ListTile( dense: false, title: Text('默认音质', style: titleStyle), diff --git a/lib/utils/storage.dart b/lib/utils/storage.dart index 16cef463..47fd7596 100644 --- a/lib/utils/storage.dart +++ b/lib/utils/storage.dart @@ -77,6 +77,7 @@ class SettingBoxKey { autoUpgradeEnable = 'autoUpgradeEnable', feedBackEnable = 'feedBackEnable', defaultVideoQa = 'defaultVideoQa', + defaultLiveQa = 'defaultLiveQa', defaultAudioQa = 'defaultAudioQa', autoPlayEnable = 'autoPlayEnable', fullScreenMode = 'fullScreenMode', From 337cdafef3d30876d78d4983cc6d69868f647a6e Mon Sep 17 00:00:00 2001 From: guozhigq Date: Thu, 14 Mar 2024 00:18:03 +0800 Subject: [PATCH 188/220] typo: vdCtr --- lib/pages/video/detail/view.dart | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/pages/video/detail/view.dart b/lib/pages/video/detail/view.dart index eee9af3e..71e7edd3 100644 --- a/lib/pages/video/detail/view.dart +++ b/lib/pages/video/detail/view.dart @@ -557,9 +557,8 @@ class _VideoDetailPageState extends State .withOpacity(0.06), ), ), - if (videoDetailController.videoType == - SearchType.video && - videoDetailController.enableRelatedVideo) + if (vdCtr.videoType == SearchType.video && + vdCtr.enableRelatedVideo) const RelatedVideoPanel(), ], ); From 357133fa975d0c059e897117db849536d5444be4 Mon Sep 17 00:00:00 2001 From: guohaonan <972101775@qq.com> Date: Thu, 14 Mar 2024 10:00:32 +0800 Subject: [PATCH 189/220] =?UTF-8?q?fix:=E5=8E=BB=E9=99=A4=E6=97=A0?= =?UTF-8?q?=E7=94=A8=E7=9A=84setState?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/dynamics/view.dart | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/pages/dynamics/view.dart b/lib/pages/dynamics/view.dart index 5fa06c91..fe594a43 100644 --- a/lib/pages/dynamics/view.dart +++ b/lib/pages/dynamics/view.dart @@ -263,9 +263,7 @@ class _DynamicsPageState extends State errMsg: data['msg'], btnText: "去登录", fn: () { - setState(() { - mineController.onLogin(); - }); + mineController.onLogin(); }, ); } else { From 606f1b5c64bd00fedbfba28d7d20ccc627a46410 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Thu, 14 Mar 2024 23:30:18 +0800 Subject: [PATCH 190/220] =?UTF-8?q?fix:=20=E6=94=B6=E8=97=8F=E5=A4=B9?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E8=AE=A1=E6=95=B0=E9=94=99=E8=AF=AF=20issues?= =?UTF-8?q?=20#637?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/fav_detail/controller.dart | 8 ++++---- lib/pages/fav_detail/view.dart | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/pages/fav_detail/controller.dart b/lib/pages/fav_detail/controller.dart index 69cc939e..55d5b884 100644 --- a/lib/pages/fav_detail/controller.dart +++ b/lib/pages/fav_detail/controller.dart @@ -16,7 +16,7 @@ class FavDetailController extends GetxController { RxMap favInfo = {}.obs; RxList favList = [].obs; RxString loadingText = '加载中...'.obs; - int mediaCount = 0; + RxInt mediaCount = 0.obs; @override void onInit() { @@ -29,7 +29,7 @@ class FavDetailController extends GetxController { } Future queryUserFavFolderDetail({type = 'init'}) async { - if (type == 'onLoad' && favList.length >= mediaCount) { + if (type == 'onLoad' && favList.length >= mediaCount.value) { loadingText.value = '没有更多了'; return; } @@ -43,11 +43,11 @@ class FavDetailController extends GetxController { favInfo.value = res['data'].info; if (currentPage == 1 && type == 'init') { favList.value = res['data'].medias; - mediaCount = res['data'].info['media_count']; + mediaCount.value = res['data'].info['media_count']; } else if (type == 'onLoad') { favList.addAll(res['data'].medias); } - if (favList.length >= mediaCount) { + if (favList.length >= mediaCount.value) { loadingText.value = '没有更多了'; } } diff --git a/lib/pages/fav_detail/view.dart b/lib/pages/fav_detail/view.dart index 27d7182b..d94f5149 100644 --- a/lib/pages/fav_detail/view.dart +++ b/lib/pages/fav_detail/view.dart @@ -84,7 +84,7 @@ class _FavDetailPageState extends State { style: Theme.of(context).textTheme.titleMedium, ), Text( - '共${_favDetailController.item!.mediaCount!}条视频', + '共${_favDetailController.mediaCount}条视频', style: Theme.of(context).textTheme.labelMedium, ) ], @@ -175,7 +175,7 @@ class _FavDetailPageState extends State { padding: const EdgeInsets.only(top: 15, bottom: 8, left: 14), child: Obx( () => Text( - '共${_favDetailController.favList.length}条视频', + '共${_favDetailController.mediaCount}条视频', style: TextStyle( fontSize: Theme.of(context).textTheme.labelMedium!.fontSize, From b13d7b475b47203e9172065103db02816744406e Mon Sep 17 00:00:00 2001 From: guozhigq Date: Thu, 14 Mar 2024 23:49:36 +0800 Subject: [PATCH 191/220] =?UTF-8?q?feat:=20=E9=9D=9E=E5=85=A8=E5=B1=8F?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E4=B8=8B=E9=9A=90=E8=97=8F=E9=94=81=E5=AE=9A?= =?UTF-8?q?=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/plugin/pl_player/view.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/plugin/pl_player/view.dart b/lib/plugin/pl_player/view.dart index 988ec26d..203f6c97 100644 --- a/lib/plugin/pl_player/view.dart +++ b/lib/plugin/pl_player/view.dart @@ -672,7 +672,7 @@ class _PLVideoPlayerState extends State // 锁 Obx( () => Visibility( - visible: _.videoType.value != 'live', + visible: _.videoType.value != 'live' && _.isFullScreen.value, child: Align( alignment: Alignment.centerLeft, child: FractionalTranslation( From 491bc87251047a6d1284660337101798f7323cd0 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Fri, 15 Mar 2024 23:26:43 +0800 Subject: [PATCH 192/220] =?UTF-8?q?fix:=20=E7=A7=81=E4=BF=A1=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=B8=B2=E6=9F=93=E5=BC=82=E5=B8=B8=20issues=20#295?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/http/msg.dart | 4 ++-- lib/pages/whisper/view.dart | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/http/msg.dart b/lib/http/msg.dart index 4ba2f818..d1d31958 100644 --- a/lib/http/msg.dart +++ b/lib/http/msg.dart @@ -31,14 +31,14 @@ class MsgHttp { } catch (err) { return { 'status': false, - 'date': [], + 'data': [], 'msg': err.toString(), }; } } else { return { 'status': false, - 'date': [], + 'data': [], 'msg': res.data['message'], }; } diff --git a/lib/pages/whisper/view.dart b/lib/pages/whisper/view.dart index f1c58650..fa7ad60b 100644 --- a/lib/pages/whisper/view.dart +++ b/lib/pages/whisper/view.dart @@ -180,7 +180,8 @@ class _WhisperPageState extends State { sessionList[i] .lastMsg .content[ - 'reply_content']) + 'reply_content'] ?? + '不支持的消息类型') : '不支持的消息类型', maxLines: 1, overflow: TextOverflow.ellipsis, From 13c77957fe3de669896b8dc130c0ffaaab6cbdd6 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sat, 16 Mar 2024 22:48:47 +0800 Subject: [PATCH 193/220] =?UTF-8?q?fix:=20=E7=95=AA=E5=89=A7badge?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/bangumi/introduction/view.dart | 22 +++++----- lib/pages/bangumi/widgets/bangumi_panel.dart | 42 +++++++++----------- 2 files changed, 30 insertions(+), 34 deletions(-) diff --git a/lib/pages/bangumi/introduction/view.dart b/lib/pages/bangumi/introduction/view.dart index f9efc66c..3b2cf122 100644 --- a/lib/pages/bangumi/introduction/view.dart +++ b/lib/pages/bangumi/introduction/view.dart @@ -362,17 +362,17 @@ class _BangumiInfoState extends State { bangumiItem != null && bangumiItem!.episodes!.isNotEmpty) ...[ BangumiPanel( - pages: bangumiItem != null - ? bangumiItem!.episodes! - : widget.bangumiDetail!.episodes!, - cid: cid ?? - (bangumiItem != null - ? bangumiItem!.episodes!.first.cid - : widget.bangumiDetail!.episodes!.first.cid), - sheetHeight: sheetHeight, - changeFuc: (bvid, cid, aid) => bangumiIntroController - .changeSeasonOrbangu(bvid, cid, aid), - ) + pages: bangumiItem != null + ? bangumiItem!.episodes! + : widget.bangumiDetail!.episodes!, + cid: cid ?? + (bangumiItem != null + ? bangumiItem!.episodes!.first.cid + : widget.bangumiDetail!.episodes!.first.cid), + sheetHeight: sheetHeight, + changeFuc: (bvid, cid, aid) => bangumiIntroController + .changeSeasonOrbangu(bvid, cid, aid), + bangumiDetail: widget.bangumiDetail ?? bangumiItem) ], ], ) diff --git a/lib/pages/bangumi/widgets/bangumi_panel.dart b/lib/pages/bangumi/widgets/bangumi_panel.dart index 05889f16..791cc108 100644 --- a/lib/pages/bangumi/widgets/bangumi_panel.dart +++ b/lib/pages/bangumi/widgets/bangumi_panel.dart @@ -14,12 +14,14 @@ class BangumiPanel extends StatefulWidget { this.cid, this.sheetHeight, this.changeFuc, + this.bangumiDetail, }); final List pages; final int? cid; final double? sheetHeight; final Function? changeFuc; + final BangumiInfoModel? bangumiDetail; @override State createState() => _BangumiPanelState(); @@ -87,7 +89,7 @@ class _BangumiPanelState extends State { ) : null, title: Text( - '第${index + 1}话 ${page.longTitle!}', + '第${page.title}话 ${page.longTitle!}', style: TextStyle( fontSize: 14, color: isCurrentIndex @@ -96,9 +98,11 @@ class _BangumiPanelState extends State { ), ), trailing: page.badge != null - ? Image.asset( - 'assets/images/big-vip.png', - height: 20, + ? Text( + page.badge!, + style: TextStyle( + color: Theme.of(context).colorScheme.primary, + ), ) : const SizedBox(), ); @@ -201,11 +205,11 @@ class _BangumiPanelState extends State { return Column( children: [ Padding( - padding: const EdgeInsets.only(top: 10, bottom: 6), + padding: const EdgeInsets.only(top: 10, bottom: 10), child: Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - const Text('合集 '), + const Text('选集 '), Expanded( child: Text( ' 正在播放：${widget.pages[currentIndex].longTitle}', @@ -225,7 +229,7 @@ class _BangumiPanelState extends State { ), onPressed: () => showBangumiPanel(), child: Text( - '全${widget.pages.length}话', + '${widget.bangumiDetail!.newEp!['desc']}', style: const TextStyle(fontSize: 13), ), ), @@ -278,23 +282,15 @@ class _BangumiPanelState extends State { ), const SizedBox(width: 2), if (widget.pages[i].badge != null) ...[ - if (widget.pages[i].badge == '会员') ...[ - Image.asset( - 'assets/images/big-vip.png', - height: 16, + const Spacer(), + Text( + widget.pages[i].badge!, + style: TextStyle( + fontSize: 12, + color: + Theme.of(context).colorScheme.primary, ), - ], - if (widget.pages[i].badge != '会员') ...[ - const Spacer(), - Text( - widget.pages[i].badge!, - style: TextStyle( - fontSize: 11, - color: - Theme.of(context).colorScheme.primary, - ), - ), - ], + ), ] ], ), From 2985c624ab1207a9b780a05dfd35da8f6ec492c6 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sat, 16 Mar 2024 23:02:21 +0800 Subject: [PATCH 194/220] mod: stream close --- lib/pages/video/detail/view.dart | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/pages/video/detail/view.dart b/lib/pages/video/detail/view.dart index 71e7edd3..1dff9060 100644 --- a/lib/pages/video/detail/view.dart +++ b/lib/pages/video/detail/view.dart @@ -194,6 +194,7 @@ class _VideoDetailPageState extends State floating.toggleAutoPip(autoEnter: false); floating.dispose(); } + appbarStream.close(); super.dispose(); } From 33d28f51d1819f9f28451bf315a0ad8ee16188ad Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sun, 17 Mar 2024 00:36:00 +0800 Subject: [PATCH 195/220] =?UTF-8?q?feat:=20=E6=9C=AA=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=88=87=E6=8D=A2=E7=9B=B4=E6=92=AD=E7=94=BB?= =?UTF-8?q?=E8=B4=A8=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/live_room/controller.dart | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/pages/live_room/controller.dart b/lib/pages/live_room/controller.dart index f785da63..5c2a9800 100644 --- a/lib/pages/live_room/controller.dart +++ b/lib/pages/live_room/controller.dart @@ -1,3 +1,4 @@ +import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:get/get.dart'; import 'package:pilipala/http/constants.dart'; import 'package:pilipala/http/live.dart'; @@ -21,6 +22,7 @@ class LiveRoomController extends GetxController { Rx roomInfoH5 = RoomInfoH5Model().obs; late bool enableCDN; late int currentQn; + int? tempCurrentQn; late List> acceptQnList; RxString currentQnDesc = ''.obs; @@ -70,6 +72,9 @@ class LiveRoomController extends GetxController { CodecItem item = codec.first; // 以服务端返回的码率为准 currentQn = item.currentQn!; + if (tempCurrentQn != null && tempCurrentQn == currentQn) { + SmartDialog.showToast('画质切换失败，请检查登录状态'); + } List acceptQn = item.acceptQn!; acceptQnList = acceptQn.map((e) { return { @@ -113,6 +118,7 @@ class LiveRoomController extends GetxController { // 修改画质 void changeQn(int qn) async { + tempCurrentQn = currentQn; if (currentQn == qn) { return; } From e04a7e5702961340cdcbde71f9b187b42bdeae0f Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sun, 17 Mar 2024 14:29:39 +0800 Subject: [PATCH 196/220] =?UTF-8?q?fix:=20=E5=9B=BE=E7=89=87=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=E5=91=BD=E5=90=8D=E3=80=81=E8=B4=A8=E9=87=8F=E3=80=81?= =?UTF-8?q?=E6=9D=83=E9=99=90=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/utils/download.dart | 76 +++++++++++++++++++++++++++++++++++------ 1 file changed, 65 insertions(+), 11 deletions(-) diff --git a/lib/utils/download.dart b/lib/utils/download.dart index ad008f6d..a9c56ec0 100644 --- a/lib/utils/download.dart +++ b/lib/utils/download.dart @@ -1,40 +1,94 @@ import 'dart:typed_data'; import 'package:dio/dio.dart'; +import 'package:flutter/material.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:permission_handler/permission_handler.dart'; import 'package:saver_gallery/saver_gallery.dart'; class DownloadUtils { // 获取存储权限 - static requestStoragePer() async { - Map statuses = await [ - Permission.storage, - Permission.photos, - ].request(); - statuses[Permission.storage].toString(); + static Future requestStoragePer() async { + await Permission.storage.request(); + PermissionStatus status = await Permission.storage.status; + if (status == PermissionStatus.denied || + status == PermissionStatus.permanentlyDenied) { + SmartDialog.show( + useSystem: true, + animationType: SmartAnimationType.centerFade_otherSlide, + builder: (BuildContext context) { + return AlertDialog( + title: const Text('提示'), + content: const Text('存储权限未授权'), + actions: [ + TextButton( + onPressed: () async { + openAppSettings(); + }, + child: const Text('去授权'), + ) + ], + ); + }, + ); + return false; + } else { + return true; + } + } + + // 获取相册权限 + static Future requestPhotoPer() async { + await Permission.photos.request(); + PermissionStatus status = await Permission.photos.status; + if (status == PermissionStatus.denied || + status == PermissionStatus.permanentlyDenied) { + SmartDialog.show( + useSystem: true, + animationType: SmartAnimationType.centerFade_otherSlide, + builder: (BuildContext context) { + return AlertDialog( + title: const Text('提示'), + content: const Text('相册权限未授权'), + actions: [ + TextButton( + onPressed: () async { + openAppSettings(); + }, + child: const Text('去授权'), + ) + ], + ); + }, + ); + return false; + } else { + return true; + } } static Future downloadImg(String imgUrl, {String imgType = 'cover'}) async { try { - await requestStoragePer(); + if (!await requestPhotoPer()) { + return false; + } SmartDialog.showLoading(msg: '保存中'); var response = await Dio() .get(imgUrl, options: Options(responseType: ResponseType.bytes)); + final String imgSuffix = imgUrl.split('.').last; String picName = - "plpl_${imgType}_${DateTime.now().toString().split('-').join()}"; + "plpl_${imgType}_${DateTime.now().toString().replaceAll(RegExp(r'[- :]'), '').split('.').first}"; final SaveResult result = await SaverGallery.saveImage( Uint8List.fromList(response.data), - quality: 60, - name: picName, + name: '$picName.$imgSuffix', // 保存到 PiliPala文件夹 androidRelativePath: "Pictures/PiliPala", androidExistNotSave: false, ); SmartDialog.dismiss(); if (result.isSuccess) { - await SmartDialog.showToast('「$picName」已保存 '); + await SmartDialog.showToast('「${'$picName.$imgSuffix'}」已保存 '); } return true; } catch (err) { From 64292d523f26bd679447d1d34f5c3c51087c8760 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Mon, 18 Mar 2024 22:13:15 +0800 Subject: [PATCH 197/220] fix: player fit rebuild --- lib/plugin/pl_player/view.dart | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/plugin/pl_player/view.dart b/lib/plugin/pl_player/view.dart index 0b2e652e..02f442d4 100644 --- a/lib/plugin/pl_player/view.dart +++ b/lib/plugin/pl_player/view.dart @@ -346,6 +346,7 @@ class _PLVideoPlayerState extends State children: [ Obx( () => Video( + key: ValueKey(_.videoFit.value), controller: videoController, controls: NoVideoControls, pauseUponEnteringBackgroundMode: !enableBackgroundPlay, From 79fcd017ab16e182cee8a52ebdf05f68b6370958 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Wed, 20 Mar 2024 00:07:00 +0800 Subject: [PATCH 198/220] =?UTF-8?q?mod:=20tabbar=E6=A0=B7=E5=BC=8F&?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AF=84=E8=AE=BA=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../video/detail/introduction/controller.dart | 7 +- lib/pages/video/detail/view.dart | 124 ++++++++++-------- 2 files changed, 73 insertions(+), 58 deletions(-) diff --git a/lib/pages/video/detail/introduction/controller.dart b/lib/pages/video/detail/introduction/controller.dart index c7f22b13..babc18aa 100644 --- a/lib/pages/video/detail/introduction/controller.dart +++ b/lib/pages/video/detail/introduction/controller.dart @@ -112,10 +112,9 @@ class VideoIntroController extends GetxController { if (videoDetail.value.pages!.isNotEmpty && lastPlayCid.value == 0) { lastPlayCid.value = videoDetail.value.pages!.first.cid!; } - // Get.find(tag: heroTag).tabs.value = [ - // '简介', - // '评论 ${result['data']!.stat!.reply}' - // ]; + final VideoDetailController videoDetailCtr = + Get.find(tag: heroTag); + videoDetailCtr.tabs.value = ['简介', '评论 ${result['data']?.stat?.reply}']; // 获取到粉丝数再返回 await queryUserStat(); } diff --git a/lib/pages/video/detail/view.dart b/lib/pages/video/detail/view.dart index 1dff9060..af901cd2 100644 --- a/lib/pages/video/detail/view.dart +++ b/lib/pages/video/detail/view.dart @@ -319,62 +319,78 @@ class _VideoDetailPageState extends State ), ), ), - child: Row( - children: [ - const SizedBox(width: 20), - Expanded( - child: TabBar( - controller: vdCtr.tabCtr, - dividerColor: Colors.transparent, - tabs: vdCtr.tabs.map((String name) => Tab(text: name)).toList(), - ), - ), - SizedBox( - width: 220, - child: Center( - child: Row( - mainAxisAlignment: MainAxisAlignment.end, - children: [ - SizedBox( - height: 32, - child: TextButton( - style: ButtonStyle( - padding: MaterialStateProperty.all(EdgeInsets.zero), - ), - onPressed: () => vdCtr.showShootDanmakuSheet(), - child: const Text('发弹幕', style: TextStyle(fontSize: 12)), - ), - ), - const SizedBox(width: 4), - SizedBox( - width: 34, - height: 32, - child: TextButton( - style: ButtonStyle( - padding: MaterialStateProperty.all(EdgeInsets.zero), - ), - onPressed: () { - plPlayerController?.isOpenDanmu.value = - !(plPlayerController?.isOpenDanmu.value ?? false); - }, - child: Obx(() => Text( - '弹', - style: TextStyle( - fontSize: 12, - color: (plPlayerController?.isOpenDanmu.value ?? - false) - ? Theme.of(context).colorScheme.primary - : Theme.of(context).colorScheme.outline, - ), - )), - ), - ), - const SizedBox(width: 14), - ], + child: Material( + child: Row( + children: [ + Flexible( + flex: 1, + child: Obx( + () => TabBar( + padding: EdgeInsets.zero, + controller: vdCtr.tabCtr, + labelStyle: const TextStyle(fontSize: 13), + labelPadding: + const EdgeInsets.symmetric(horizontal: 10.0), // 设置每个标签的宽度 + dividerColor: Colors.transparent, + tabs: vdCtr.tabs + .map( + (String name) => Flexible( + child: Tab(text: name), + ), + ) + .toList(), + ), ), ), - ), - ], + Flexible( + flex: 1, + child: Center( + child: Row( + mainAxisAlignment: MainAxisAlignment.end, + children: [ + SizedBox( + height: 32, + child: TextButton( + style: ButtonStyle( + padding: MaterialStateProperty.all(EdgeInsets.zero), + ), + onPressed: () => vdCtr.showShootDanmakuSheet(), + child: + const Text('发弹幕', style: TextStyle(fontSize: 12)), + ), + ), + const SizedBox(width: 4), + SizedBox( + width: 34, + height: 32, + child: TextButton( + style: ButtonStyle( + padding: MaterialStateProperty.all(EdgeInsets.zero), + ), + onPressed: () { + plPlayerController?.isOpenDanmu.value = + !(plPlayerController?.isOpenDanmu.value ?? + false); + }, + child: Obx(() => Text( + '弹', + style: TextStyle( + fontSize: 12, + color: (plPlayerController + ?.isOpenDanmu.value ?? + false) + ? Theme.of(context).colorScheme.primary + : Theme.of(context).colorScheme.outline, + ), + )), + ), + ), + const SizedBox(width: 14), + ], + ), + )), + ], + ), ), ); From 710361caeac2f3aa155fad8d8a2633890d01be10 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Wed, 20 Mar 2024 23:21:41 +0800 Subject: [PATCH 199/220] =?UTF-8?q?fix:=20=E5=8E=86=E5=8F=B2=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E7=9B=B8=E5=85=B3=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/http/interceptor.dart | 12 ++++++++---- lib/pages/history/controller.dart | 6 ++++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/lib/http/interceptor.dart b/lib/http/interceptor.dart index 362ff17a..fbc60ddf 100644 --- a/lib/http/interceptor.dart +++ b/lib/http/interceptor.dart @@ -45,10 +45,14 @@ class ApiInterceptor extends Interceptor { void onError(DioException err, ErrorInterceptorHandler handler) async { // 处理网络请求错误 // handler.next(err); - SmartDialog.showToast( - await dioError(err), - displayType: SmartToastType.onlyRefresh, - ); + String url = err.requestOptions.uri.toString(); + print('🌹🌹ApiInterceptor: $url'); + if (!url.contains('heartBeat')) { + SmartDialog.showToast( + await dioError(err), + displayType: SmartToastType.onlyRefresh, + ); + } super.onError(err, handler); } diff --git a/lib/pages/history/controller.dart b/lib/pages/history/controller.dart index e7822cd9..a1f18113 100644 --- a/lib/pages/history/controller.dart +++ b/lib/pages/history/controller.dart @@ -88,8 +88,10 @@ class HistoryController extends GetxController { // 观看历史暂停状态 Future historyStatus() async { var res = await UserHttp.historyStatus(); - pauseStatus.value = res.data['data']; - localCache.put(LocalCacheKey.historyPause, res.data['data']); + if (res.data['code'] == 0) { + pauseStatus.value = res.data['data']; + localCache.put(LocalCacheKey.historyPause, res.data['data']); + } } // 清空观看历史 From 6d276fce4c01e6a24d7abcd8313a0b653916c777 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Thu, 21 Mar 2024 00:03:20 +0800 Subject: [PATCH 200/220] =?UTF-8?q?fix:=20=E5=AA=92=E4=BD=93=E5=BA=93?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E6=BB=91=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/media/view.dart | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/pages/media/view.dart b/lib/pages/media/view.dart index c3bad4b9..460c5648 100644 --- a/lib/pages/media/view.dart +++ b/lib/pages/media/view.dart @@ -3,6 +3,7 @@ import 'dart:async'; import 'package:flutter/material.dart'; import 'package:flutter/rendering.dart'; import 'package:get/get.dart'; +import 'package:media_kit/media_kit.dart'; import 'package:pilipala/common/widgets/network_img_layer.dart'; import 'package:pilipala/models/user/fav_folder.dart'; import 'package:pilipala/pages/main/index.dart'; @@ -102,7 +103,11 @@ class _MediaPageState extends State ], Obx(() => mediaController.userLogin.value ? favFolder(mediaController, context) - : const SizedBox()) + : const SizedBox()), + SizedBox( + height: MediaQuery.of(context).padding.bottom + + kBottomNavigationBarHeight, + ) ], ), ), From 4dbcd2e0ec1bfd99d305651b295f8390778ae845 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Thu, 21 Mar 2024 23:39:56 +0800 Subject: [PATCH 201/220] =?UTF-8?q?fix:=20=E5=B0=9D=E8=AF=95=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E9=9F=B3=E9=87=8F=E8=B0=83=E8=8A=82=E6=8A=96=E5=8A=A8?= =?UTF-8?q?=20issues=20#647=20#498=20#104=20#198?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/plugin/pl_player/view.dart | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/lib/plugin/pl_player/view.dart b/lib/plugin/pl_player/view.dart index 4b6627b8..b0933af2 100644 --- a/lib/plugin/pl_player/view.dart +++ b/lib/plugin/pl_player/view.dart @@ -1,6 +1,7 @@ import 'dart:async'; import 'package:audio_video_progress_bar/audio_video_progress_bar.dart'; +import 'package:easy_debounce/easy_throttle.dart'; import 'package:flutter/material.dart'; import 'package:flutter_volume_controller/flutter_volume_controller.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; @@ -674,13 +675,16 @@ class _PLVideoPlayerState extends State _distance.value = dy; } else { // 右边区域 👈 - final double level = (_.isFullScreen.value - ? Get.size.height - : screenWidth * 9 / 16) * - 3; - final double volume = _volumeValue.value - delta / level; - final double result = volume.clamp(0.0, 1.0); - setVolume(result); + EasyThrottle.throttle( + 'setVolume', const Duration(milliseconds: 20), () { + final double level = (_.isFullScreen.value + ? Get.size.height + : screenWidth * 9 / 16); + final double volume = _volumeValue.value - + double.parse(delta.toStringAsFixed(1)) / level; + final double result = volume.clamp(0.0, 1.0); + setVolume(result); + }); } }, onVerticalDragEnd: (DragEndDetails details) {}, From c216c9bd653524bcd6a9cc613b4fd0bc96b35630 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Wed, 20 Mar 2024 00:07:00 +0800 Subject: [PATCH 202/220] =?UTF-8?q?mod:=20tabbar=E6=A0=B7=E5=BC=8F&?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AF=84=E8=AE=BA=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../video/detail/introduction/controller.dart | 7 +- lib/pages/video/detail/view.dart | 124 ++++++++++-------- 2 files changed, 73 insertions(+), 58 deletions(-) diff --git a/lib/pages/video/detail/introduction/controller.dart b/lib/pages/video/detail/introduction/controller.dart index 6714b887..8114bdaf 100644 --- a/lib/pages/video/detail/introduction/controller.dart +++ b/lib/pages/video/detail/introduction/controller.dart @@ -85,10 +85,9 @@ class VideoIntroController extends GetxController { if (videoDetail.value.pages!.isNotEmpty && lastPlayCid.value == 0) { lastPlayCid.value = videoDetail.value.pages!.first.cid!; } - // Get.find(tag: heroTag).tabs.value = [ - // '简介', - // '评论 ${result['data']!.stat!.reply}' - // ]; + final VideoDetailController videoDetailCtr = + Get.find(tag: heroTag); + videoDetailCtr.tabs.value = ['简介', '评论 ${result['data']?.stat?.reply}']; // 获取到粉丝数再返回 await queryUserStat(); } diff --git a/lib/pages/video/detail/view.dart b/lib/pages/video/detail/view.dart index 1dff9060..af901cd2 100644 --- a/lib/pages/video/detail/view.dart +++ b/lib/pages/video/detail/view.dart @@ -319,62 +319,78 @@ class _VideoDetailPageState extends State ), ), ), - child: Row( - children: [ - const SizedBox(width: 20), - Expanded( - child: TabBar( - controller: vdCtr.tabCtr, - dividerColor: Colors.transparent, - tabs: vdCtr.tabs.map((String name) => Tab(text: name)).toList(), - ), - ), - SizedBox( - width: 220, - child: Center( - child: Row( - mainAxisAlignment: MainAxisAlignment.end, - children: [ - SizedBox( - height: 32, - child: TextButton( - style: ButtonStyle( - padding: MaterialStateProperty.all(EdgeInsets.zero), - ), - onPressed: () => vdCtr.showShootDanmakuSheet(), - child: const Text('发弹幕', style: TextStyle(fontSize: 12)), - ), - ), - const SizedBox(width: 4), - SizedBox( - width: 34, - height: 32, - child: TextButton( - style: ButtonStyle( - padding: MaterialStateProperty.all(EdgeInsets.zero), - ), - onPressed: () { - plPlayerController?.isOpenDanmu.value = - !(plPlayerController?.isOpenDanmu.value ?? false); - }, - child: Obx(() => Text( - '弹', - style: TextStyle( - fontSize: 12, - color: (plPlayerController?.isOpenDanmu.value ?? - false) - ? Theme.of(context).colorScheme.primary - : Theme.of(context).colorScheme.outline, - ), - )), - ), - ), - const SizedBox(width: 14), - ], + child: Material( + child: Row( + children: [ + Flexible( + flex: 1, + child: Obx( + () => TabBar( + padding: EdgeInsets.zero, + controller: vdCtr.tabCtr, + labelStyle: const TextStyle(fontSize: 13), + labelPadding: + const EdgeInsets.symmetric(horizontal: 10.0), // 设置每个标签的宽度 + dividerColor: Colors.transparent, + tabs: vdCtr.tabs + .map( + (String name) => Flexible( + child: Tab(text: name), + ), + ) + .toList(), + ), ), ), - ), - ], + Flexible( + flex: 1, + child: Center( + child: Row( + mainAxisAlignment: MainAxisAlignment.end, + children: [ + SizedBox( + height: 32, + child: TextButton( + style: ButtonStyle( + padding: MaterialStateProperty.all(EdgeInsets.zero), + ), + onPressed: () => vdCtr.showShootDanmakuSheet(), + child: + const Text('发弹幕', style: TextStyle(fontSize: 12)), + ), + ), + const SizedBox(width: 4), + SizedBox( + width: 34, + height: 32, + child: TextButton( + style: ButtonStyle( + padding: MaterialStateProperty.all(EdgeInsets.zero), + ), + onPressed: () { + plPlayerController?.isOpenDanmu.value = + !(plPlayerController?.isOpenDanmu.value ?? + false); + }, + child: Obx(() => Text( + '弹', + style: TextStyle( + fontSize: 12, + color: (plPlayerController + ?.isOpenDanmu.value ?? + false) + ? Theme.of(context).colorScheme.primary + : Theme.of(context).colorScheme.outline, + ), + )), + ), + ), + const SizedBox(width: 14), + ], + ), + )), + ], + ), ), ); From 14338dc33d508dbd06d8766310fbf197493c6332 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sat, 23 Mar 2024 17:23:51 +0800 Subject: [PATCH 203/220] =?UTF-8?q?fix:=20=E8=AF=A6=E6=83=85=E9=A1=B5TabBa?= =?UTF-8?q?r=E5=B8=83=E5=B1=80=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/images/video/danmu_close.svg | 1 + assets/images/video/danmu_open.svg | 1 + lib/pages/video/detail/view.dart | 47 ++++++++++++++--------------- pubspec.yaml | 1 + 4 files changed, 25 insertions(+), 25 deletions(-) create mode 100644 assets/images/video/danmu_close.svg create mode 100644 assets/images/video/danmu_open.svg diff --git a/assets/images/video/danmu_close.svg b/assets/images/video/danmu_close.svg new file mode 100644 index 00000000..9f48027b --- /dev/null +++ b/assets/images/video/danmu_close.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/images/video/danmu_open.svg b/assets/images/video/danmu_open.svg new file mode 100644 index 00000000..24e8d7a9 --- /dev/null +++ b/assets/images/video/danmu_open.svg @@ -0,0 +1 @@ +Layer 1 \ No newline at end of file diff --git a/lib/pages/video/detail/view.dart b/lib/pages/video/detail/view.dart index af901cd2..a403e298 100644 --- a/lib/pages/video/detail/view.dart +++ b/lib/pages/video/detail/view.dart @@ -5,6 +5,7 @@ import 'dart:ui'; import 'package:extended_nested_scroll_view/extended_nested_scroll_view.dart'; import 'package:floating/floating.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; +import 'package:flutter_svg/svg.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; import 'package:get/get.dart'; import 'package:flutter/material.dart'; @@ -334,9 +335,7 @@ class _VideoDetailPageState extends State dividerColor: Colors.transparent, tabs: vdCtr.tabs .map( - (String name) => Flexible( - child: Tab(text: name), - ), + (String name) => Tab(text: name), ) .toList(), ), @@ -359,30 +358,28 @@ class _VideoDetailPageState extends State const Text('发弹幕', style: TextStyle(fontSize: 12)), ), ), - const SizedBox(width: 4), SizedBox( - width: 34, - height: 32, - child: TextButton( - style: ButtonStyle( - padding: MaterialStateProperty.all(EdgeInsets.zero), + width: 38, + height: 38, + child: Obx( + () => IconButton( + onPressed: () { + plPlayerController?.isOpenDanmu.value = + !(plPlayerController?.isOpenDanmu.value ?? + false); + }, + icon: (plPlayerController?.isOpenDanmu.value ?? + false) + ? SvgPicture.asset( + 'assets/images/video/danmu_close.svg', + ) + : SvgPicture.asset( + 'assets/images/video/danmu_open.svg', + // ignore: deprecated_member_use + color: + Theme.of(context).colorScheme.primary, + ), ), - onPressed: () { - plPlayerController?.isOpenDanmu.value = - !(plPlayerController?.isOpenDanmu.value ?? - false); - }, - child: Obx(() => Text( - '弹', - style: TextStyle( - fontSize: 12, - color: (plPlayerController - ?.isOpenDanmu.value ?? - false) - ? Theme.of(context).colorScheme.primary - : Theme.of(context).colorScheme.outline, - ), - )), ), ), const SizedBox(width: 14), diff --git a/pubspec.yaml b/pubspec.yaml index 5c25f044..82166403 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -191,6 +191,7 @@ flutter: - assets/images/lv/ - assets/images/logo/ - assets/images/live/ + - assets/images/video/ # An image asset can refer to one or more resolution-specific "variants", see # https://flutter.dev/assets-and-images/#resolution-aware From b5a46d1be02ab94811d8c37bf7a14ab49ffb31d1 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Mon, 11 Mar 2024 23:03:50 +0800 Subject: [PATCH 204/220] =?UTF-8?q?feat:=20=E6=8E=A5=E6=94=B6=E8=87=AA?= =?UTF-8?q?=E5=AE=9A=E4=B9=89=E7=BB=84=E4=BB=B6=E4=BC=A0=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pl_player/models/bottom_control_type.dart | 1 + lib/plugin/pl_player/view.dart | 19 +++++++++++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/lib/plugin/pl_player/models/bottom_control_type.dart b/lib/plugin/pl_player/models/bottom_control_type.dart index 599f6e4f..739e1d38 100644 --- a/lib/plugin/pl_player/models/bottom_control_type.dart +++ b/lib/plugin/pl_player/models/bottom_control_type.dart @@ -7,4 +7,5 @@ enum BottomControlType { fit, speed, fullscreen, + custom, } diff --git a/lib/plugin/pl_player/view.dart b/lib/plugin/pl_player/view.dart index 5f47ca4a..90861204 100644 --- a/lib/plugin/pl_player/view.dart +++ b/lib/plugin/pl_player/view.dart @@ -35,6 +35,8 @@ class PLVideoPlayer extends StatefulWidget { this.bottomControl, this.danmuWidget, this.bottomList, + this.customWidget, + this.customWidgets, super.key, }); @@ -43,6 +45,10 @@ class PLVideoPlayer extends StatefulWidget { final PreferredSizeWidget? bottomControl; final Widget? danmuWidget; final List? bottomList; + // List or Widget + + final Widget? customWidget; + final List? customWidgets; @override State createState() => _PLVideoPlayerState(); @@ -311,7 +317,7 @@ class _PLVideoPlayerState extends State ), }; final List list = []; - var userSpecifyItem = widget.bottomList ?? + List userSpecifyItem = widget.bottomList ?? [ BottomControlType.playOrPause, BottomControlType.time, @@ -320,7 +326,16 @@ class _PLVideoPlayerState extends State BottomControlType.fullscreen, ]; for (var i = 0; i < userSpecifyItem.length; i++) { - list.add(videoProgressWidgets[userSpecifyItem[i]]!); + if (userSpecifyItem[i] == BottomControlType.custom) { + if (widget.customWidget != null && widget.customWidget is Widget) { + list.add(widget.customWidget!); + } + if (widget.customWidgets != null && widget.customWidgets!.isNotEmpty) { + list.addAll(widget.customWidgets!); + } + } else { + list.add(videoProgressWidgets[userSpecifyItem[i]]!); + } } return list; } From 72f1a82650b30053f807da017c6f44fa36d4ff48 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sat, 23 Mar 2024 19:44:37 +0800 Subject: [PATCH 205/220] bump: sdk&dependencies --- lib/http/interceptor.dart | 34 ++++---- macos/Flutter/GeneratedPluginRegistrant.swift | 2 +- pubspec.lock | 84 +++++++++---------- pubspec.yaml | 26 +++--- 4 files changed, 73 insertions(+), 73 deletions(-) diff --git a/lib/http/interceptor.dart b/lib/http/interceptor.dart index fbc60ddf..a5359283 100644 --- a/lib/http/interceptor.dart +++ b/lib/http/interceptor.dart @@ -46,7 +46,6 @@ class ApiInterceptor extends Interceptor { // 处理网络请求错误 // handler.next(err); String url = err.requestOptions.uri.toString(); - print('🌹🌹ApiInterceptor: $url'); if (!url.contains('heartBeat')) { SmartDialog.showToast( await dioError(err), @@ -79,23 +78,24 @@ class ApiInterceptor extends Interceptor { } static Future checkConnect() async { - final ConnectivityResult connectivityResult = + final List connectivityResult = await Connectivity().checkConnectivity(); - switch (connectivityResult) { - case ConnectivityResult.mobile: - return '正在使用移动流量'; - case ConnectivityResult.wifi: - return '正在使用wifi'; - case ConnectivityResult.ethernet: - return '正在使用局域网'; - case ConnectivityResult.vpn: - return '正在使用代理网络'; - case ConnectivityResult.other: - return '正在使用其他网络'; - case ConnectivityResult.none: - return '未连接到任何网络'; - default: - return ''; + if (connectivityResult.contains(ConnectivityResult.mobile)) { + return '正在使用移动流量'; + } else if (connectivityResult.contains(ConnectivityResult.wifi)) { + return '正在使用wifi'; + } else if (connectivityResult.contains(ConnectivityResult.ethernet)) { + return '正在使用局域网'; + } else if (connectivityResult.contains(ConnectivityResult.vpn)) { + return '正在使用代理网络'; + } else if (connectivityResult.contains(ConnectivityResult.bluetooth)) { + return '正在使用蓝牙网络'; + } else if (connectivityResult.contains(ConnectivityResult.other)) { + return '正在使用其他网络'; + } else if (connectivityResult.contains(ConnectivityResult.none)) { + return '未连接到任何网络'; + } else { + return ''; } } } diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift index 3e5f82f7..8af2f922 100644 --- a/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/macos/Flutter/GeneratedPluginRegistrant.swift @@ -24,7 +24,7 @@ import wakelock_plus func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { AudioServicePlugin.register(with: registry.registrar(forPlugin: "AudioServicePlugin")) AudioSessionPlugin.register(with: registry.registrar(forPlugin: "AudioSessionPlugin")) - ConnectivityPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlugin")) + ConnectivityPlusPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlusPlugin")) DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin")) DynamicColorPlugin.register(with: registry.registrar(forPlugin: "DynamicColorPlugin")) FlutterVolumeControllerPlugin.register(with: registry.registrar(forPlugin: "FlutterVolumeControllerPlugin")) diff --git a/pubspec.lock b/pubspec.lock index 8972ef45..695505d7 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -21,10 +21,10 @@ packages: dependency: "direct main" description: name: animations - sha256: "708e4b68c23228c264b038fe7003a2f5d01ce85fc64d8cae090e86b27fcea6c5" + sha256: d3d6dcfb218225bbe68e87ccf6378bbb2e32a94900722c5f81611dad089911cb url: "https://pub.flutter-io.cn" source: hosted - version: "2.0.10" + version: "2.0.11" appscheme: dependency: "direct main" description: @@ -101,10 +101,10 @@ packages: dependency: "direct main" description: name: audio_video_progress_bar - sha256: "3384875247cdbea748bd9ae8330631cd06a6cabfcda4945d45c9b406da92bc66" + sha256: ccc7d7b83d2a16c52d4a7fb332faabd1baa053fb0e4c16815aefd3945ab33b81 url: "https://pub.flutter-io.cn" source: hosted - version: "2.0.1" + version: "2.0.2" auto_orientation: dependency: "direct main" description: @@ -157,10 +157,10 @@ packages: dependency: "direct dev" description: name: build_runner - sha256: "67d591d602906ef9201caf93452495ad1812bea2074f04e25dbd7c133785821b" + sha256: "581bacf68f89ec8792f5e5a0b2c4decd1c948e97ce659dc783688c8a88fbec21" url: "https://pub.flutter-io.cn" source: hosted - version: "2.4.7" + version: "2.4.8" build_runner_core: dependency: transitive description: @@ -213,10 +213,10 @@ packages: dependency: "direct main" description: name: catcher_2 - sha256: ca94d45ffb52bf4b16a425cdff6734ae8443d36d5f06c276f1c2a593120b11ed + sha256: "9cf33d2befd10058374e5fc6177577fdd938d73d9c06810de81cf91311a7ce98" url: "https://pub.flutter-io.cn" source: hosted - version: "1.1.0" + version: "1.2.3" characters: dependency: transitive description: @@ -269,18 +269,18 @@ packages: dependency: "direct main" description: name: connectivity_plus - sha256: "77a180d6938f78ca7d2382d2240eb626c0f6a735d0bfdce227d8ffb80f95c48b" + sha256: e9feae83b1849f61bad9f6f33ee00646e3410d54ce0821e02f262f9901dad3c9 url: "https://pub.flutter-io.cn" source: hosted - version: "4.0.2" + version: "6.0.1" connectivity_plus_platform_interface: dependency: transitive description: name: connectivity_plus_platform_interface - sha256: cf1d1c28f4416f8c654d7dc3cd638ec586076255d407cef3ddbdaf178272a71a + sha256: b6a56efe1e6675be240de39107281d4034b64ac23438026355b4234042a35adb url: "https://pub.flutter-io.cn" source: hosted - version: "1.2.4" + version: "2.0.0" convert: dependency: transitive description: @@ -373,10 +373,10 @@ packages: dependency: "direct main" description: name: dio - sha256: "797e1e341c3dd2f69f2dad42564a6feff3bfb87187d05abb93b9609e6f1645c3" + sha256: "49af28382aefc53562459104f64d16b9dfd1e8ef68c862d5af436cc8356ce5a8" url: "https://pub.flutter-io.cn" source: hosted - version: "5.4.0" + version: "5.4.1" dio_cookie_manager: dependency: "direct main" description: @@ -413,10 +413,10 @@ packages: dependency: "direct main" description: name: dynamic_color - sha256: "8b8bd1d798bd393e11eddeaa8ae95b12ff028bf7d5998fc5d003488cd5f4ce2f" + sha256: eae98052fa6e2826bdac3dd2e921c6ce2903be15c6b7f8b6d8a5d49b5086298d url: "https://pub.flutter-io.cn" source: hosted - version: "1.6.8" + version: "1.7.0" easy_debounce: dependency: "direct main" description: @@ -469,10 +469,10 @@ packages: dependency: "direct main" description: name: extended_nested_scroll_view - sha256: "444a6f883e6e07effc7639e69a309e1fb491b6c19b095e9281714a51ace2b384" + sha256: "835580d40c2c62b448bd14adecd316acba469ba61f1510ef559d17668a85e777" url: "https://pub.flutter-io.cn" source: hosted - version: "6.1.2" + version: "6.2.1" fake_async: dependency: transitive description: @@ -592,10 +592,10 @@ packages: dependency: "direct main" description: name: flutter_svg - sha256: d39e7f95621fc84376bc0f7d504f05c3a41488c562f4a8ad410569127507402c + sha256: "7b4ca6cf3304575fe9c8ec64813c8d02ee41d2afe60bcfe0678bcb5375d596a2" url: "https://pub.flutter-io.cn" source: hosted - version: "2.0.9" + version: "2.0.10+1" flutter_test: dependency: "direct dev" description: flutter @@ -1067,50 +1067,50 @@ packages: dependency: "direct main" description: name: permission_handler - sha256: "860c6b871c94c78e202dc69546d4d8fd84bd59faeb36f8fb9888668a53ff4f78" + sha256: "74e962b7fad7ff75959161bb2c0ad8fe7f2568ee82621c9c2660b751146bfe44" url: "https://pub.flutter-io.cn" source: hosted - version: "11.1.0" + version: "11.3.0" permission_handler_android: dependency: transitive description: name: permission_handler_android - sha256: "2f1bec180ee2f5665c22faada971a8f024761f632e93ddc23310487df52dcfa6" + sha256: "1acac6bae58144b442f11e66621c062aead9c99841093c38f5bcdcc24c1c3474" url: "https://pub.flutter-io.cn" source: hosted - version: "12.0.1" + version: "12.0.5" permission_handler_apple: dependency: transitive description: name: permission_handler_apple - sha256: "1a816084338ada8d574b1cb48390e6e8b19305d5120fe3a37c98825bacc78306" + sha256: "92861b0f0c2443dd8898398c2baa4f1ae925109b5909ae4a17d0108a6a788932" url: "https://pub.flutter-io.cn" source: hosted - version: "9.2.0" + version: "9.4.2" permission_handler_html: dependency: transitive description: name: permission_handler_html - sha256: "11b762a8c123dced6461933a88ea1edbbe036078c3f9f41b08886e678e7864df" + sha256: "54bf176b90f6eddd4ece307e2c06cf977fb3973719c35a93b85cc7093eb6070d" url: "https://pub.flutter-io.cn" source: hosted - version: "0.1.0+2" + version: "0.1.1" permission_handler_platform_interface: dependency: transitive description: name: permission_handler_platform_interface - sha256: d87349312f7eaf6ce0adaf668daf700ac5b06af84338bd8b8574dfbd93ffe1a1 + sha256: "23dfba8447c076ab5be3dee9ceb66aad345c4a648f0cac292c77b1eb0e800b78" url: "https://pub.flutter-io.cn" source: hosted - version: "4.0.2" + version: "4.2.0" permission_handler_windows: dependency: transitive description: name: permission_handler_windows - sha256: "1e8640c1e39121128da6b816d236e714d2cf17fac5a105dd6acdd3403a628004" + sha256: "1a790728016f79a41216d88672dbc5df30e686e811ad4e698bfc51f76ad91f1e" url: "https://pub.flutter-io.cn" source: hosted - version: "0.2.0" + version: "0.2.1" petitparser: dependency: transitive description: @@ -1536,26 +1536,26 @@ packages: dependency: transitive description: name: vector_graphics - sha256: "0f0c746dd2d6254a0057218ff980fc7f5670fd0fcf5e4db38a490d31eed4ad43" + sha256: "32c3c684e02f9bc0afb0ae0aa653337a2fe022e8ab064bcd7ffda27a74e288e3" url: "https://pub.flutter-io.cn" source: hosted - version: "1.1.9+1" + version: "1.1.11+1" vector_graphics_codec: dependency: transitive description: name: vector_graphics_codec - sha256: "0edf6d630d1bfd5589114138ed8fada3234deacc37966bec033d3047c29248b7" + sha256: c86987475f162fadff579e7320c7ddda04cd2fdeffbe1129227a85d9ac9e03da url: "https://pub.flutter-io.cn" source: hosted - version: "1.1.9+1" + version: "1.1.11+1" vector_graphics_compiler: dependency: transitive description: name: vector_graphics_compiler - sha256: d24333727332d9bd20990f1483af4e09abdb9b1fc7c3db940b56ab5c42790c26 + sha256: "12faff3f73b1741a36ca7e31b292ddeb629af819ca9efe9953b70bd63fc8cd81" url: "https://pub.flutter-io.cn" source: hosted - version: "1.1.9+1" + version: "1.1.11+1" vector_math: dependency: transitive description: @@ -1640,10 +1640,10 @@ packages: dependency: "direct main" description: name: webview_flutter - sha256: "42393b4492e629aa3a88618530a4a00de8bb46e50e7b3993fedbfdc5352f0dbf" + sha256: d81b68e88cc353e546afb93fb38958e3717282c5ac6e5d3be4a4aef9fc3c1413 url: "https://pub.flutter-io.cn" source: hosted - version: "4.4.2" + version: "4.5.0" webview_flutter_android: dependency: transitive description: @@ -1664,10 +1664,10 @@ packages: dependency: transitive description: name: webview_flutter_wkwebview - sha256: accdaaa49a2aca2dc3c3230907988954cdd23fed0a19525d6c9789d380f4dc76 + sha256: "4d062ad505390ecef1c4bfb6001cd857a51e00912cc9dfb66edb1886a9ebd80c" url: "https://pub.flutter-io.cn" source: hosted - version: "3.9.4" + version: "3.10.2" win32: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 82166403..5e19b56b 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -19,7 +19,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev version: 1.0.21+1021 environment: - sdk: ">=2.19.6 <3.0.0" + sdk: ">=3.0.0 <4.0.0" # Dependencies specify other packages that your package needs in order to work. # To automatically upgrade your package dependencies to the latest versions @@ -36,15 +36,15 @@ dependencies: # Use with the CupertinoIcons class for iOS style icons. cupertino_icons: ^1.0.5 # 动态取色 - dynamic_color: ^1.6.8 + dynamic_color: ^1.7.0 get: ^4.6.5 # 网络 - dio: ^5.3.3 + dio: ^5.4.1 cookie_jar: ^4.0.8 dio_cookie_manager: ^3.1.1 - connectivity_plus: ^4.0.1 + connectivity_plus: ^6.0.1 dio_http2_adapter: ^2.3.1+1 # 图片 @@ -58,17 +58,17 @@ dependencies: hive_flutter: ^1.1.0 # 设备信息 - device_info_plus: ^9.0.2 + device_info_plus: ^9.0.0 # 权限 - permission_handler: ^11.0.1 + permission_handler: ^11.3.0 # 分享 share_plus: ^7.0.2 # cookie 管理 webview_cookie_manager: ^2.0.6 # 浏览器 - webview_flutter: ^4.2.2 + webview_flutter: ^4.5.0 # 解决sliver滑动不同步 - extended_nested_scroll_view: ^6.1.2 + extended_nested_scroll_view: ^6.2.1 # 上拉加载 loading_more_list: ^6.0.0 # 下拉刷新 @@ -99,15 +99,15 @@ dependencies: wakelock_plus: ^1.1.1 universal_platform: ^1.0.0+1 # 进度条 - audio_video_progress_bar: ^2.0.1 + audio_video_progress_bar: ^2.0.2 auto_orientation: ^2.3.1 protobuf: ^3.0.0 - animations: ^2.0.8 + animations: ^2.0.11 # 获取appx信息 package_info_plus: ^4.1.0 url_launcher: ^6.1.14 - flutter_svg: ^2.0.7 + flutter_svg: ^2.0.10+1 # 防抖节流 easy_debounce: ^2.0.3 # 高帧率 @@ -137,7 +137,7 @@ dependencies: uuid: ^3.0.7 scrollable_positioned_list: ^0.3.8 nil: ^1.1.1 - catcher_2: ^1.1.0 + catcher_2: ^1.2.3 logger: ^2.0.2+1 path: 1.8.3 # 电池优化 @@ -159,7 +159,7 @@ dev_dependencies: # url: https://github.com/nvi9/flutter_launcher_icons.git # ref: e045d40 hive_generator: ^2.0.0 - build_runner: ^2.3.3 + build_runner: ^2.4.8 flutter_launcher_icons: android: true From 11e907d74bc1bbcb68dea7579fe0242dea035791 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sun, 24 Mar 2024 10:48:45 +0800 Subject: [PATCH 206/220] =?UTF-8?q?mod:=20=E5=BC=B9=E5=B9=95=E5=BC=80?= =?UTF-8?q?=E5=85=B3=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/video/detail/view.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/pages/video/detail/view.dart b/lib/pages/video/detail/view.dart index a403e298..69801beb 100644 --- a/lib/pages/video/detail/view.dart +++ b/lib/pages/video/detail/view.dart @@ -368,7 +368,7 @@ class _VideoDetailPageState extends State !(plPlayerController?.isOpenDanmu.value ?? false); }, - icon: (plPlayerController?.isOpenDanmu.value ?? + icon: !(plPlayerController?.isOpenDanmu.value ?? false) ? SvgPicture.asset( 'assets/images/video/danmu_close.svg', From 8ff387d54a2b7e31fb1150a7030b61c9f97a3ecd Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sun, 24 Mar 2024 11:30:50 +0800 Subject: [PATCH 207/220] =?UTF-8?q?mod:=20=E8=AF=84=E8=AE=BA=E5=A4=B4?= =?UTF-8?q?=E9=83=A8=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/video/detail/reply/view.dart | 45 ++++++++------------------ 1 file changed, 13 insertions(+), 32 deletions(-) diff --git a/lib/pages/video/detail/reply/view.dart b/lib/pages/video/detail/reply/view.dart index b07a6168..38203f7e 100644 --- a/lib/pages/video/detail/reply/view.dart +++ b/lib/pages/video/detail/reply/view.dart @@ -148,35 +148,14 @@ class _VideoReplyPanelState extends State floating: true, delegate: _MySliverPersistentHeaderDelegate( child: Container( - height: 45, - padding: const EdgeInsets.fromLTRB(12, 0, 6, 0), - decoration: BoxDecoration( - color: Theme.of(context).colorScheme.background, - border: Border( - bottom: BorderSide( - color: Theme.of(context) - .colorScheme - .outline - .withOpacity(0.1)), - ), - ), + height: 40, + padding: const EdgeInsets.fromLTRB(12, 6, 6, 0), child: Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - Obx( - () => AnimatedSwitcher( - duration: const Duration(milliseconds: 400), - transitionBuilder: - (Widget child, Animation animation) { - return ScaleTransition( - scale: animation, child: child); - }, - child: Text( - '共${_videoReplyController.count.value}条回复', - key: ValueKey( - _videoReplyController.count.value), - ), - ), + Text( + '${_videoReplyController.sortTypeLabel.value}评论', + style: const TextStyle(fontSize: 13), ), SizedBox( height: 35, @@ -184,10 +163,12 @@ class _VideoReplyPanelState extends State onPressed: () => _videoReplyController.queryBySort(), icon: const Icon(Icons.sort, size: 16), - label: Obx(() => Text( - _videoReplyController.sortTypeLabel.value, - style: const TextStyle(fontSize: 13), - )), + label: Obx( + () => Text( + _videoReplyController.sortTypeLabel.value, + style: const TextStyle(fontSize: 13), + ), + ), ), ) ], @@ -329,8 +310,8 @@ class _VideoReplyPanelState extends State class _MySliverPersistentHeaderDelegate extends SliverPersistentHeaderDelegate { _MySliverPersistentHeaderDelegate({required this.child}); - final double _minExtent = 45; - final double _maxExtent = 45; + final double _minExtent = 40; + final double _maxExtent = 40; final Widget child; @override From c9327c97e5ae7f044426bbb3847c988f71046558 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sun, 24 Mar 2024 10:59:00 +0800 Subject: [PATCH 208/220] =?UTF-8?q?fix:=20=E8=AF=84=E8=AE=BA=E6=8A=95?= =?UTF-8?q?=E7=A5=A8message=E9=87=8D=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/video/detail/reply/widgets/reply_item.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/pages/video/detail/reply/widgets/reply_item.dart b/lib/pages/video/detail/reply/widgets/reply_item.dart index f9f695d4..e79b6159 100644 --- a/lib/pages/video/detail/reply/widgets/reply_item.dart +++ b/lib/pages/video/detail/reply/widgets/reply_item.dart @@ -498,7 +498,7 @@ InlineSpan buildContent( return str; }); } - // content.message = content.message.replaceAll(RegExp(r"\{vote:.*?\}"), ' '); + content.message = content.message.replaceAll(RegExp(r"\{vote:.*?\}"), ' '); content.message = content.message .replaceAll('&', '&') .replaceAll('<', '<') From 4db5a950f344af1aa5aee4b309cd626a2de2fbfc Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sun, 24 Mar 2024 10:48:45 +0800 Subject: [PATCH 209/220] =?UTF-8?q?mod:=20=E5=BC=B9=E5=B9=95=E5=BC=80?= =?UTF-8?q?=E5=85=B3=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/video/detail/view.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/pages/video/detail/view.dart b/lib/pages/video/detail/view.dart index a403e298..69801beb 100644 --- a/lib/pages/video/detail/view.dart +++ b/lib/pages/video/detail/view.dart @@ -368,7 +368,7 @@ class _VideoDetailPageState extends State !(plPlayerController?.isOpenDanmu.value ?? false); }, - icon: (plPlayerController?.isOpenDanmu.value ?? + icon: !(plPlayerController?.isOpenDanmu.value ?? false) ? SvgPicture.asset( 'assets/images/video/danmu_close.svg', From 77b509fd1703b464fd557b1ca87983f19c62c324 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sun, 24 Mar 2024 13:42:40 +0800 Subject: [PATCH 210/220] =?UTF-8?q?opt:=20=E6=8E=92=E8=A1=8C=E6=A6=9C?= =?UTF-8?q?=E5=88=87=E6=8D=A2tab=E6=95=B0=E6=8D=AE=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/rank/controller.dart | 2 +- lib/pages/rank/zone/view.dart | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/lib/pages/rank/controller.dart b/lib/pages/rank/controller.dart index 61475d97..da73ea02 100644 --- a/lib/pages/rank/controller.dart +++ b/lib/pages/rank/controller.dart @@ -9,7 +9,7 @@ import 'package:pilipala/utils/storage.dart'; class RankController extends GetxController with GetTickerProviderStateMixin { bool flag = false; late RxList tabs = [].obs; - RxInt initialIndex = 1.obs; + RxInt initialIndex = 0.obs; late TabController tabController; late List tabsCtrList; late List tabsPageList; diff --git a/lib/pages/rank/zone/view.dart b/lib/pages/rank/zone/view.dart index 58ca187f..fbf8a524 100644 --- a/lib/pages/rank/zone/view.dart +++ b/lib/pages/rank/zone/view.dart @@ -22,15 +22,20 @@ class ZonePage extends StatefulWidget { State createState() => _ZonePageState(); } -class _ZonePageState extends State { - final ZoneController _zoneController = Get.put(ZoneController()); +class _ZonePageState extends State + with AutomaticKeepAliveClientMixin { + late ZoneController _zoneController; List videoList = []; Future? _futureBuilderFuture; late ScrollController scrollController; + @override + bool get wantKeepAlive => true; + @override void initState() { super.initState(); + _zoneController = Get.put(ZoneController(), tag: widget.rid.toString()); _futureBuilderFuture = _zoneController.queryRankFeed('init', widget.rid); scrollController = _zoneController.scrollController; StreamController mainStream = @@ -68,6 +73,7 @@ class _ZonePageState extends State { @override Widget build(BuildContext context) { + super.build(context); return RefreshIndicator( onRefresh: () async { return await _zoneController.onRefresh(); From 031d57e1fdf34e64a6d2f989a500d17ab63e43e2 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sun, 24 Mar 2024 13:42:40 +0800 Subject: [PATCH 211/220] =?UTF-8?q?opt:=20=E6=8E=92=E8=A1=8C=E6=A6=9C?= =?UTF-8?q?=E5=88=87=E6=8D=A2tab=E6=95=B0=E6=8D=AE=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/rank/controller.dart | 2 +- lib/pages/rank/zone/view.dart | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/lib/pages/rank/controller.dart b/lib/pages/rank/controller.dart index 61475d97..da73ea02 100644 --- a/lib/pages/rank/controller.dart +++ b/lib/pages/rank/controller.dart @@ -9,7 +9,7 @@ import 'package:pilipala/utils/storage.dart'; class RankController extends GetxController with GetTickerProviderStateMixin { bool flag = false; late RxList tabs = [].obs; - RxInt initialIndex = 1.obs; + RxInt initialIndex = 0.obs; late TabController tabController; late List tabsCtrList; late List tabsPageList; diff --git a/lib/pages/rank/zone/view.dart b/lib/pages/rank/zone/view.dart index 58ca187f..fbf8a524 100644 --- a/lib/pages/rank/zone/view.dart +++ b/lib/pages/rank/zone/view.dart @@ -22,15 +22,20 @@ class ZonePage extends StatefulWidget { State createState() => _ZonePageState(); } -class _ZonePageState extends State { - final ZoneController _zoneController = Get.put(ZoneController()); +class _ZonePageState extends State + with AutomaticKeepAliveClientMixin { + late ZoneController _zoneController; List videoList = []; Future? _futureBuilderFuture; late ScrollController scrollController; + @override + bool get wantKeepAlive => true; + @override void initState() { super.initState(); + _zoneController = Get.put(ZoneController(), tag: widget.rid.toString()); _futureBuilderFuture = _zoneController.queryRankFeed('init', widget.rid); scrollController = _zoneController.scrollController; StreamController mainStream = @@ -68,6 +73,7 @@ class _ZonePageState extends State { @override Widget build(BuildContext context) { + super.build(context); return RefreshIndicator( onRefresh: () async { return await _zoneController.onRefresh(); From 02d2598d0192e32a4de297d952053956f214f7f3 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sun, 24 Mar 2024 16:03:18 +0800 Subject: [PATCH 212/220] =?UTF-8?q?mod:=20=E8=A7=86=E9=A2=91=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E9=A1=B5=E7=AE=80=E4=BB=8B=E6=9F=A5=E7=9C=8B&?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=A0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/video/detail/introduction/view.dart | 33 ++--- .../introduction/widgets/intro_detail.dart | 130 ++++-------------- .../detail/widgets/expandable_section.dart | 20 +-- 3 files changed, 50 insertions(+), 133 deletions(-) diff --git a/lib/pages/video/detail/introduction/view.dart b/lib/pages/video/detail/introduction/view.dart index 9c1b7db0..831491f6 100644 --- a/lib/pages/video/detail/introduction/view.dart +++ b/lib/pages/video/detail/introduction/view.dart @@ -15,6 +15,7 @@ import 'package:pilipala/pages/video/detail/widgets/ai_detail.dart'; import 'package:pilipala/utils/feed_back.dart'; import 'package:pilipala/utils/storage.dart'; import 'package:pilipala/utils/utils.dart'; +import '../widgets/expandable_section.dart'; import 'widgets/action_item.dart'; import 'widgets/fav_panel.dart'; import 'widgets/intro_detail.dart'; @@ -137,6 +138,7 @@ class _VideoInfoState extends State with TickerProviderStateMixin { late String memberHeroTag; late bool enableAi; bool isProcessing = false; + RxBool isExpand = false.obs; void Function()? handleState(Future Function() action) { return isProcessing ? null @@ -212,13 +214,7 @@ class _VideoInfoState extends State with TickerProviderStateMixin { // 视频介绍 showIntroDetail() { feedBack(); - showBottomSheet( - context: context, - enableDrag: true, - builder: (BuildContext context) { - return IntroDetail(videoDetail: widget.videoDetail!); - }, - ); + isExpand.value = !(isExpand.value); } // 用户主页 @@ -330,6 +326,16 @@ class _VideoInfoState extends State with TickerProviderStateMixin { ], ), + /// 视频简介 + Obx( + () => ExpandedSection( + expand: isExpand.value, + begin: 0, + end: 1, + child: IntroDetail(videoDetail: widget.videoDetail!), + ), + ), + /// 点赞收藏转发 actionGrid(context, videoIntroController), // 合集 @@ -438,6 +444,7 @@ class _VideoInfoState extends State with TickerProviderStateMixin { margin: const EdgeInsets.only(top: 6, bottom: 4), height: constraints.maxWidth / 5 * 0.8, child: GridView.count( + physics: const NeverScrollableScrollPhysics(), primary: false, padding: EdgeInsets.zero, crossAxisCount: 5, @@ -451,12 +458,6 @@ class _VideoInfoState extends State with TickerProviderStateMixin { selectStatus: videoIntroController.hasLike.value, text: widget.videoDetail!.stat!.like!.toString()), ), - // ActionItem( - // icon: const Icon(FontAwesomeIcons.clock), - // onTap: () => videoIntroController.actionShareVideo(), - // selectStatus: false, - // loadingStatus: loadingStatus, - // text: '稍后再看'), Obx( () => ActionItem( icon: const Icon(FontAwesomeIcons.b), @@ -477,10 +478,10 @@ class _VideoInfoState extends State with TickerProviderStateMixin { ), ), ActionItem( - icon: const Icon(FontAwesomeIcons.comment), - onTap: () => videoDetailCtr.tabCtr.animateTo(1), + icon: const Icon(FontAwesomeIcons.clock), + onTap: () => videoIntroController.actionShareVideo(), selectStatus: false, - text: widget.videoDetail!.stat!.reply!.toString(), + text: '稍后看', ), ActionItem( icon: const Icon(FontAwesomeIcons.shareFromSquare), diff --git a/lib/pages/video/detail/introduction/widgets/intro_detail.dart b/lib/pages/video/detail/introduction/widgets/intro_detail.dart index c74e27ee..1e9bb842 100644 --- a/lib/pages/video/detail/introduction/widgets/intro_detail.dart +++ b/lib/pages/video/detail/introduction/widgets/intro_detail.dart @@ -1,16 +1,10 @@ import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:get/get.dart'; -import 'package:hive/hive.dart'; -import 'package:pilipala/common/widgets/stat/danmu.dart'; -import 'package:pilipala/common/widgets/stat/view.dart'; -import 'package:pilipala/utils/storage.dart'; import 'package:pilipala/utils/utils.dart'; -Box localCache = GStrorage.localCache; -late double sheetHeight; - class IntroDetail extends StatelessWidget { const IntroDetail({ super.key, @@ -20,105 +14,39 @@ class IntroDetail extends StatelessWidget { @override Widget build(BuildContext context) { - sheetHeight = localCache.get('sheetHeight'); - return Container( - color: Theme.of(context).colorScheme.background, - padding: EdgeInsets.only( - left: 14, - right: 14, - bottom: MediaQuery.of(context).padding.bottom + 20), - height: sheetHeight, + return SizedBox( + width: double.infinity, + child: SelectableRegion( + focusNode: FocusNode(), + selectionControls: MaterialTextSelectionControls(), child: Column( - children: [ - InkWell( - onTap: () => Get.back(), - child: Container( - height: 35, - padding: const EdgeInsets.only(bottom: 2), - child: Center( - child: Container( - width: 32, - height: 3, - decoration: BoxDecoration( - color: Theme.of(context).colorScheme.primary, - borderRadius: - const BorderRadius.all(Radius.circular(3))), - ), - ), + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + const SizedBox(height: 4), + GestureDetector( + onTap: () { + Clipboard.setData(ClipboardData(text: videoDetail!.bvid!)); + SmartDialog.showToast('已复制'); + }, + child: Text( + videoDetail!.bvid!, + style: TextStyle( + fontSize: 13, color: Theme.of(context).colorScheme.primary), ), ), - Expanded( - child: SingleChildScrollView( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - videoDetail!.title, - style: const TextStyle( - fontSize: 16, - fontWeight: FontWeight.w500, - ), - ), - const SizedBox(height: 6), - Row( - children: [ - StatView( - theme: 'gray', - view: videoDetail!.stat!.view, - size: 'medium', - ), - const SizedBox(width: 10), - StatDanMu( - theme: 'gray', - danmu: videoDetail!.stat!.danmaku, - size: 'medium', - ), - const SizedBox(width: 10), - Text( - Utils.dateFormat(videoDetail!.pubdate, - formatType: 'detail'), - style: TextStyle( - fontSize: 12, - color: Theme.of(context).colorScheme.outline, - ), - ), - ], - ), - const SizedBox(height: 20), - SizedBox( - width: double.infinity, - child: SelectableRegion( - focusNode: FocusNode(), - selectionControls: MaterialTextSelectionControls(), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - videoDetail!.bvid!, - style: const TextStyle(fontSize: 13), - ), - const SizedBox(height: 4), - Text.rich( - style: const TextStyle( - height: 1.4, - // fontSize: 13, - ), - TextSpan( - children: [ - buildContent(context, videoDetail!), - ], - ), - ), - ], - ), - ), - ), - ], - ), + const SizedBox(height: 4), + Text.rich( + style: const TextStyle(height: 1.4), + TextSpan( + children: [ + buildContent(context, videoDetail!), + ], ), - ) + ), ], - )); + ), + ), + ); } InlineSpan buildContent(BuildContext context, content) { diff --git a/lib/pages/video/detail/widgets/expandable_section.dart b/lib/pages/video/detail/widgets/expandable_section.dart index afa68cc9..69e73e20 100644 --- a/lib/pages/video/detail/widgets/expandable_section.dart +++ b/lib/pages/video/detail/widgets/expandable_section.dart @@ -32,28 +32,14 @@ class _ExpandedSectionState extends State _runExpandCheck(); } - ///Setting up the animation - // void prepareAnimations() { - // expandController = AnimationController( - // vsync: this, duration: const Duration(milliseconds: 500)); - // animation = CurvedAnimation( - // parent: expandController, - // curve: Curves.fastOutSlowIn, - // ); - // } - void prepareAnimations() { expandController = AnimationController( vsync: this, duration: const Duration(milliseconds: 400)); Animation curve = CurvedAnimation( parent: expandController, - curve: Curves.fastOutSlowIn, + curve: Curves.linear, ); animation = Tween(begin: widget.begin, end: widget.end).animate(curve); - // animation = CurvedAnimation( - // parent: expandController, - // curve: Curves.fastOutSlowIn, - // ); } void _runExpandCheck() { @@ -67,7 +53,9 @@ class _ExpandedSectionState extends State @override void didUpdateWidget(ExpandedSection oldWidget) { super.didUpdateWidget(oldWidget); - _runExpandCheck(); + if (widget.expand != oldWidget.expand) { + _runExpandCheck(); + } } @override From f8326e7cb5aea074f772836acc42894df94a6d41 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sun, 24 Mar 2024 16:17:02 +0800 Subject: [PATCH 213/220] =?UTF-8?q?fix:=20appbar=E6=BB=91=E5=8A=A8?= =?UTF-8?q?=E8=B7=9D=E7=A6=BB=E7=A7=BB=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/video/detail/widgets/app_bar.dart | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/pages/video/detail/widgets/app_bar.dart b/lib/pages/video/detail/widgets/app_bar.dart index 17f4bec7..efc0b593 100644 --- a/lib/pages/video/detail/widgets/app_bar.dart +++ b/lib/pages/video/detail/widgets/app_bar.dart @@ -17,12 +17,16 @@ class ScrollAppBar extends StatelessWidget { Widget build(BuildContext context) { final double statusBarHeight = MediaQuery.of(context).padding.top; final videoHeight = MediaQuery.sizeOf(context).width * 9 / 16; + double scrollDistance = scrollVal; + if (scrollVal > videoHeight - kToolbarHeight) { + scrollDistance = videoHeight - kToolbarHeight; + } return Positioned( - top: -videoHeight + scrollVal + kToolbarHeight + 0.5, + top: -videoHeight + scrollDistance + kToolbarHeight + 0.5, left: 0, right: 0, child: Opacity( - opacity: scrollVal / (videoHeight - kToolbarHeight), + opacity: scrollDistance / (videoHeight - kToolbarHeight), child: Container( height: statusBarHeight + kToolbarHeight, color: Theme.of(context).colorScheme.background, From a925ef63eb09ebaae30f5558f37999b00d443df3 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sun, 24 Mar 2024 16:03:18 +0800 Subject: [PATCH 214/220] =?UTF-8?q?mod:=20=E8=A7=86=E9=A2=91=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E9=A1=B5=E7=AE=80=E4=BB=8B=E6=9F=A5=E7=9C=8B&?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=A0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/video/detail/introduction/view.dart | 33 ++--- .../introduction/widgets/intro_detail.dart | 130 ++++-------------- .../detail/widgets/expandable_section.dart | 20 +-- 3 files changed, 50 insertions(+), 133 deletions(-) diff --git a/lib/pages/video/detail/introduction/view.dart b/lib/pages/video/detail/introduction/view.dart index 9c1b7db0..831491f6 100644 --- a/lib/pages/video/detail/introduction/view.dart +++ b/lib/pages/video/detail/introduction/view.dart @@ -15,6 +15,7 @@ import 'package:pilipala/pages/video/detail/widgets/ai_detail.dart'; import 'package:pilipala/utils/feed_back.dart'; import 'package:pilipala/utils/storage.dart'; import 'package:pilipala/utils/utils.dart'; +import '../widgets/expandable_section.dart'; import 'widgets/action_item.dart'; import 'widgets/fav_panel.dart'; import 'widgets/intro_detail.dart'; @@ -137,6 +138,7 @@ class _VideoInfoState extends State with TickerProviderStateMixin { late String memberHeroTag; late bool enableAi; bool isProcessing = false; + RxBool isExpand = false.obs; void Function()? handleState(Future Function() action) { return isProcessing ? null @@ -212,13 +214,7 @@ class _VideoInfoState extends State with TickerProviderStateMixin { // 视频介绍 showIntroDetail() { feedBack(); - showBottomSheet( - context: context, - enableDrag: true, - builder: (BuildContext context) { - return IntroDetail(videoDetail: widget.videoDetail!); - }, - ); + isExpand.value = !(isExpand.value); } // 用户主页 @@ -330,6 +326,16 @@ class _VideoInfoState extends State with TickerProviderStateMixin { ], ), + /// 视频简介 + Obx( + () => ExpandedSection( + expand: isExpand.value, + begin: 0, + end: 1, + child: IntroDetail(videoDetail: widget.videoDetail!), + ), + ), + /// 点赞收藏转发 actionGrid(context, videoIntroController), // 合集 @@ -438,6 +444,7 @@ class _VideoInfoState extends State with TickerProviderStateMixin { margin: const EdgeInsets.only(top: 6, bottom: 4), height: constraints.maxWidth / 5 * 0.8, child: GridView.count( + physics: const NeverScrollableScrollPhysics(), primary: false, padding: EdgeInsets.zero, crossAxisCount: 5, @@ -451,12 +458,6 @@ class _VideoInfoState extends State with TickerProviderStateMixin { selectStatus: videoIntroController.hasLike.value, text: widget.videoDetail!.stat!.like!.toString()), ), - // ActionItem( - // icon: const Icon(FontAwesomeIcons.clock), - // onTap: () => videoIntroController.actionShareVideo(), - // selectStatus: false, - // loadingStatus: loadingStatus, - // text: '稍后再看'), Obx( () => ActionItem( icon: const Icon(FontAwesomeIcons.b), @@ -477,10 +478,10 @@ class _VideoInfoState extends State with TickerProviderStateMixin { ), ), ActionItem( - icon: const Icon(FontAwesomeIcons.comment), - onTap: () => videoDetailCtr.tabCtr.animateTo(1), + icon: const Icon(FontAwesomeIcons.clock), + onTap: () => videoIntroController.actionShareVideo(), selectStatus: false, - text: widget.videoDetail!.stat!.reply!.toString(), + text: '稍后看', ), ActionItem( icon: const Icon(FontAwesomeIcons.shareFromSquare), diff --git a/lib/pages/video/detail/introduction/widgets/intro_detail.dart b/lib/pages/video/detail/introduction/widgets/intro_detail.dart index c74e27ee..1e9bb842 100644 --- a/lib/pages/video/detail/introduction/widgets/intro_detail.dart +++ b/lib/pages/video/detail/introduction/widgets/intro_detail.dart @@ -1,16 +1,10 @@ import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:get/get.dart'; -import 'package:hive/hive.dart'; -import 'package:pilipala/common/widgets/stat/danmu.dart'; -import 'package:pilipala/common/widgets/stat/view.dart'; -import 'package:pilipala/utils/storage.dart'; import 'package:pilipala/utils/utils.dart'; -Box localCache = GStrorage.localCache; -late double sheetHeight; - class IntroDetail extends StatelessWidget { const IntroDetail({ super.key, @@ -20,105 +14,39 @@ class IntroDetail extends StatelessWidget { @override Widget build(BuildContext context) { - sheetHeight = localCache.get('sheetHeight'); - return Container( - color: Theme.of(context).colorScheme.background, - padding: EdgeInsets.only( - left: 14, - right: 14, - bottom: MediaQuery.of(context).padding.bottom + 20), - height: sheetHeight, + return SizedBox( + width: double.infinity, + child: SelectableRegion( + focusNode: FocusNode(), + selectionControls: MaterialTextSelectionControls(), child: Column( - children: [ - InkWell( - onTap: () => Get.back(), - child: Container( - height: 35, - padding: const EdgeInsets.only(bottom: 2), - child: Center( - child: Container( - width: 32, - height: 3, - decoration: BoxDecoration( - color: Theme.of(context).colorScheme.primary, - borderRadius: - const BorderRadius.all(Radius.circular(3))), - ), - ), + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + const SizedBox(height: 4), + GestureDetector( + onTap: () { + Clipboard.setData(ClipboardData(text: videoDetail!.bvid!)); + SmartDialog.showToast('已复制'); + }, + child: Text( + videoDetail!.bvid!, + style: TextStyle( + fontSize: 13, color: Theme.of(context).colorScheme.primary), ), ), - Expanded( - child: SingleChildScrollView( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - videoDetail!.title, - style: const TextStyle( - fontSize: 16, - fontWeight: FontWeight.w500, - ), - ), - const SizedBox(height: 6), - Row( - children: [ - StatView( - theme: 'gray', - view: videoDetail!.stat!.view, - size: 'medium', - ), - const SizedBox(width: 10), - StatDanMu( - theme: 'gray', - danmu: videoDetail!.stat!.danmaku, - size: 'medium', - ), - const SizedBox(width: 10), - Text( - Utils.dateFormat(videoDetail!.pubdate, - formatType: 'detail'), - style: TextStyle( - fontSize: 12, - color: Theme.of(context).colorScheme.outline, - ), - ), - ], - ), - const SizedBox(height: 20), - SizedBox( - width: double.infinity, - child: SelectableRegion( - focusNode: FocusNode(), - selectionControls: MaterialTextSelectionControls(), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - videoDetail!.bvid!, - style: const TextStyle(fontSize: 13), - ), - const SizedBox(height: 4), - Text.rich( - style: const TextStyle( - height: 1.4, - // fontSize: 13, - ), - TextSpan( - children: [ - buildContent(context, videoDetail!), - ], - ), - ), - ], - ), - ), - ), - ], - ), + const SizedBox(height: 4), + Text.rich( + style: const TextStyle(height: 1.4), + TextSpan( + children: [ + buildContent(context, videoDetail!), + ], ), - ) + ), ], - )); + ), + ), + ); } InlineSpan buildContent(BuildContext context, content) { diff --git a/lib/pages/video/detail/widgets/expandable_section.dart b/lib/pages/video/detail/widgets/expandable_section.dart index afa68cc9..69e73e20 100644 --- a/lib/pages/video/detail/widgets/expandable_section.dart +++ b/lib/pages/video/detail/widgets/expandable_section.dart @@ -32,28 +32,14 @@ class _ExpandedSectionState extends State _runExpandCheck(); } - ///Setting up the animation - // void prepareAnimations() { - // expandController = AnimationController( - // vsync: this, duration: const Duration(milliseconds: 500)); - // animation = CurvedAnimation( - // parent: expandController, - // curve: Curves.fastOutSlowIn, - // ); - // } - void prepareAnimations() { expandController = AnimationController( vsync: this, duration: const Duration(milliseconds: 400)); Animation curve = CurvedAnimation( parent: expandController, - curve: Curves.fastOutSlowIn, + curve: Curves.linear, ); animation = Tween(begin: widget.begin, end: widget.end).animate(curve); - // animation = CurvedAnimation( - // parent: expandController, - // curve: Curves.fastOutSlowIn, - // ); } void _runExpandCheck() { @@ -67,7 +53,9 @@ class _ExpandedSectionState extends State @override void didUpdateWidget(ExpandedSection oldWidget) { super.didUpdateWidget(oldWidget); - _runExpandCheck(); + if (widget.expand != oldWidget.expand) { + _runExpandCheck(); + } } @override From 7e7bb1f43a4c23f0b3473ca58506c93da51912ec Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sun, 24 Mar 2024 16:17:02 +0800 Subject: [PATCH 215/220] =?UTF-8?q?fix:=20appbar=E6=BB=91=E5=8A=A8?= =?UTF-8?q?=E8=B7=9D=E7=A6=BB=E7=A7=BB=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/video/detail/widgets/app_bar.dart | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/pages/video/detail/widgets/app_bar.dart b/lib/pages/video/detail/widgets/app_bar.dart index 17f4bec7..efc0b593 100644 --- a/lib/pages/video/detail/widgets/app_bar.dart +++ b/lib/pages/video/detail/widgets/app_bar.dart @@ -17,12 +17,16 @@ class ScrollAppBar extends StatelessWidget { Widget build(BuildContext context) { final double statusBarHeight = MediaQuery.of(context).padding.top; final videoHeight = MediaQuery.sizeOf(context).width * 9 / 16; + double scrollDistance = scrollVal; + if (scrollVal > videoHeight - kToolbarHeight) { + scrollDistance = videoHeight - kToolbarHeight; + } return Positioned( - top: -videoHeight + scrollVal + kToolbarHeight + 0.5, + top: -videoHeight + scrollDistance + kToolbarHeight + 0.5, left: 0, right: 0, child: Opacity( - opacity: scrollVal / (videoHeight - kToolbarHeight), + opacity: scrollDistance / (videoHeight - kToolbarHeight), child: Container( height: statusBarHeight + kToolbarHeight, color: Theme.of(context).colorScheme.background, From 2cd8ab7d27fcf9c6a686725827242d76091b3207 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sun, 24 Mar 2024 16:03:18 +0800 Subject: [PATCH 216/220] =?UTF-8?q?mod:=20=E8=A7=86=E9=A2=91=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E9=A1=B5=E7=AE=80=E4=BB=8B=E6=9F=A5=E7=9C=8B&?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=A0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/video/detail/introduction/view.dart | 33 ++--- .../introduction/widgets/intro_detail.dart | 130 ++++-------------- .../detail/widgets/expandable_section.dart | 20 +-- 3 files changed, 50 insertions(+), 133 deletions(-) diff --git a/lib/pages/video/detail/introduction/view.dart b/lib/pages/video/detail/introduction/view.dart index 9c1b7db0..831491f6 100644 --- a/lib/pages/video/detail/introduction/view.dart +++ b/lib/pages/video/detail/introduction/view.dart @@ -15,6 +15,7 @@ import 'package:pilipala/pages/video/detail/widgets/ai_detail.dart'; import 'package:pilipala/utils/feed_back.dart'; import 'package:pilipala/utils/storage.dart'; import 'package:pilipala/utils/utils.dart'; +import '../widgets/expandable_section.dart'; import 'widgets/action_item.dart'; import 'widgets/fav_panel.dart'; import 'widgets/intro_detail.dart'; @@ -137,6 +138,7 @@ class _VideoInfoState extends State with TickerProviderStateMixin { late String memberHeroTag; late bool enableAi; bool isProcessing = false; + RxBool isExpand = false.obs; void Function()? handleState(Future Function() action) { return isProcessing ? null @@ -212,13 +214,7 @@ class _VideoInfoState extends State with TickerProviderStateMixin { // 视频介绍 showIntroDetail() { feedBack(); - showBottomSheet( - context: context, - enableDrag: true, - builder: (BuildContext context) { - return IntroDetail(videoDetail: widget.videoDetail!); - }, - ); + isExpand.value = !(isExpand.value); } // 用户主页 @@ -330,6 +326,16 @@ class _VideoInfoState extends State with TickerProviderStateMixin { ], ), + /// 视频简介 + Obx( + () => ExpandedSection( + expand: isExpand.value, + begin: 0, + end: 1, + child: IntroDetail(videoDetail: widget.videoDetail!), + ), + ), + /// 点赞收藏转发 actionGrid(context, videoIntroController), // 合集 @@ -438,6 +444,7 @@ class _VideoInfoState extends State with TickerProviderStateMixin { margin: const EdgeInsets.only(top: 6, bottom: 4), height: constraints.maxWidth / 5 * 0.8, child: GridView.count( + physics: const NeverScrollableScrollPhysics(), primary: false, padding: EdgeInsets.zero, crossAxisCount: 5, @@ -451,12 +458,6 @@ class _VideoInfoState extends State with TickerProviderStateMixin { selectStatus: videoIntroController.hasLike.value, text: widget.videoDetail!.stat!.like!.toString()), ), - // ActionItem( - // icon: const Icon(FontAwesomeIcons.clock), - // onTap: () => videoIntroController.actionShareVideo(), - // selectStatus: false, - // loadingStatus: loadingStatus, - // text: '稍后再看'), Obx( () => ActionItem( icon: const Icon(FontAwesomeIcons.b), @@ -477,10 +478,10 @@ class _VideoInfoState extends State with TickerProviderStateMixin { ), ), ActionItem( - icon: const Icon(FontAwesomeIcons.comment), - onTap: () => videoDetailCtr.tabCtr.animateTo(1), + icon: const Icon(FontAwesomeIcons.clock), + onTap: () => videoIntroController.actionShareVideo(), selectStatus: false, - text: widget.videoDetail!.stat!.reply!.toString(), + text: '稍后看', ), ActionItem( icon: const Icon(FontAwesomeIcons.shareFromSquare), diff --git a/lib/pages/video/detail/introduction/widgets/intro_detail.dart b/lib/pages/video/detail/introduction/widgets/intro_detail.dart index c74e27ee..1e9bb842 100644 --- a/lib/pages/video/detail/introduction/widgets/intro_detail.dart +++ b/lib/pages/video/detail/introduction/widgets/intro_detail.dart @@ -1,16 +1,10 @@ import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:get/get.dart'; -import 'package:hive/hive.dart'; -import 'package:pilipala/common/widgets/stat/danmu.dart'; -import 'package:pilipala/common/widgets/stat/view.dart'; -import 'package:pilipala/utils/storage.dart'; import 'package:pilipala/utils/utils.dart'; -Box localCache = GStrorage.localCache; -late double sheetHeight; - class IntroDetail extends StatelessWidget { const IntroDetail({ super.key, @@ -20,105 +14,39 @@ class IntroDetail extends StatelessWidget { @override Widget build(BuildContext context) { - sheetHeight = localCache.get('sheetHeight'); - return Container( - color: Theme.of(context).colorScheme.background, - padding: EdgeInsets.only( - left: 14, - right: 14, - bottom: MediaQuery.of(context).padding.bottom + 20), - height: sheetHeight, + return SizedBox( + width: double.infinity, + child: SelectableRegion( + focusNode: FocusNode(), + selectionControls: MaterialTextSelectionControls(), child: Column( - children: [ - InkWell( - onTap: () => Get.back(), - child: Container( - height: 35, - padding: const EdgeInsets.only(bottom: 2), - child: Center( - child: Container( - width: 32, - height: 3, - decoration: BoxDecoration( - color: Theme.of(context).colorScheme.primary, - borderRadius: - const BorderRadius.all(Radius.circular(3))), - ), - ), + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + const SizedBox(height: 4), + GestureDetector( + onTap: () { + Clipboard.setData(ClipboardData(text: videoDetail!.bvid!)); + SmartDialog.showToast('已复制'); + }, + child: Text( + videoDetail!.bvid!, + style: TextStyle( + fontSize: 13, color: Theme.of(context).colorScheme.primary), ), ), - Expanded( - child: SingleChildScrollView( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - videoDetail!.title, - style: const TextStyle( - fontSize: 16, - fontWeight: FontWeight.w500, - ), - ), - const SizedBox(height: 6), - Row( - children: [ - StatView( - theme: 'gray', - view: videoDetail!.stat!.view, - size: 'medium', - ), - const SizedBox(width: 10), - StatDanMu( - theme: 'gray', - danmu: videoDetail!.stat!.danmaku, - size: 'medium', - ), - const SizedBox(width: 10), - Text( - Utils.dateFormat(videoDetail!.pubdate, - formatType: 'detail'), - style: TextStyle( - fontSize: 12, - color: Theme.of(context).colorScheme.outline, - ), - ), - ], - ), - const SizedBox(height: 20), - SizedBox( - width: double.infinity, - child: SelectableRegion( - focusNode: FocusNode(), - selectionControls: MaterialTextSelectionControls(), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - videoDetail!.bvid!, - style: const TextStyle(fontSize: 13), - ), - const SizedBox(height: 4), - Text.rich( - style: const TextStyle( - height: 1.4, - // fontSize: 13, - ), - TextSpan( - children: [ - buildContent(context, videoDetail!), - ], - ), - ), - ], - ), - ), - ), - ], - ), + const SizedBox(height: 4), + Text.rich( + style: const TextStyle(height: 1.4), + TextSpan( + children: [ + buildContent(context, videoDetail!), + ], ), - ) + ), ], - )); + ), + ), + ); } InlineSpan buildContent(BuildContext context, content) { diff --git a/lib/pages/video/detail/widgets/expandable_section.dart b/lib/pages/video/detail/widgets/expandable_section.dart index afa68cc9..69e73e20 100644 --- a/lib/pages/video/detail/widgets/expandable_section.dart +++ b/lib/pages/video/detail/widgets/expandable_section.dart @@ -32,28 +32,14 @@ class _ExpandedSectionState extends State _runExpandCheck(); } - ///Setting up the animation - // void prepareAnimations() { - // expandController = AnimationController( - // vsync: this, duration: const Duration(milliseconds: 500)); - // animation = CurvedAnimation( - // parent: expandController, - // curve: Curves.fastOutSlowIn, - // ); - // } - void prepareAnimations() { expandController = AnimationController( vsync: this, duration: const Duration(milliseconds: 400)); Animation curve = CurvedAnimation( parent: expandController, - curve: Curves.fastOutSlowIn, + curve: Curves.linear, ); animation = Tween(begin: widget.begin, end: widget.end).animate(curve); - // animation = CurvedAnimation( - // parent: expandController, - // curve: Curves.fastOutSlowIn, - // ); } void _runExpandCheck() { @@ -67,7 +53,9 @@ class _ExpandedSectionState extends State @override void didUpdateWidget(ExpandedSection oldWidget) { super.didUpdateWidget(oldWidget); - _runExpandCheck(); + if (widget.expand != oldWidget.expand) { + _runExpandCheck(); + } } @override From 1f75a7e781dd452eae763bd2fc38fb409e97e973 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sun, 24 Mar 2024 16:17:02 +0800 Subject: [PATCH 217/220] =?UTF-8?q?fix:=20appbar=E6=BB=91=E5=8A=A8?= =?UTF-8?q?=E8=B7=9D=E7=A6=BB=E7=A7=BB=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/video/detail/widgets/app_bar.dart | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/pages/video/detail/widgets/app_bar.dart b/lib/pages/video/detail/widgets/app_bar.dart index 17f4bec7..efc0b593 100644 --- a/lib/pages/video/detail/widgets/app_bar.dart +++ b/lib/pages/video/detail/widgets/app_bar.dart @@ -17,12 +17,16 @@ class ScrollAppBar extends StatelessWidget { Widget build(BuildContext context) { final double statusBarHeight = MediaQuery.of(context).padding.top; final videoHeight = MediaQuery.sizeOf(context).width * 9 / 16; + double scrollDistance = scrollVal; + if (scrollVal > videoHeight - kToolbarHeight) { + scrollDistance = videoHeight - kToolbarHeight; + } return Positioned( - top: -videoHeight + scrollVal + kToolbarHeight + 0.5, + top: -videoHeight + scrollDistance + kToolbarHeight + 0.5, left: 0, right: 0, child: Opacity( - opacity: scrollVal / (videoHeight - kToolbarHeight), + opacity: scrollDistance / (videoHeight - kToolbarHeight), child: Container( height: statusBarHeight + kToolbarHeight, color: Theme.of(context).colorScheme.background, From 955d8f54019ee6f0d97672fcc4f06a03776baddc Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sun, 24 Mar 2024 23:25:45 +0800 Subject: [PATCH 218/220] =?UTF-8?q?feat:=20=E7=AE=80=E5=8D=95=E5=AE=9E?= =?UTF-8?q?=E7=8E=B0=E5=AD=97=E5=B9=95=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/http/video.dart | 27 +++++-- lib/models/common/subtitle_type.dart | 47 ++++++++++++ lib/models/video/subTitile/result.dart | 21 +++++- lib/pages/video/detail/controller.dart | 42 +++++++---- lib/pages/video/detail/view.dart | 1 + .../video/detail/widgets/header_control.dart | 75 +++++++++++++++++++ lib/plugin/pl_player/controller.dart | 66 ++++++++++++++-- lib/plugin/pl_player/view.dart | 69 +++++++++-------- lib/utils/subtitle.dart | 32 ++++++++ 9 files changed, 318 insertions(+), 62 deletions(-) create mode 100644 lib/models/common/subtitle_type.dart create mode 100644 lib/utils/subtitle.dart diff --git a/lib/http/video.dart b/lib/http/video.dart index 4ac886c7..d43656b2 100644 --- a/lib/http/video.dart +++ b/lib/http/video.dart @@ -12,6 +12,7 @@ import '../models/video/subTitile/result.dart'; import '../models/video_detail_res.dart'; import '../utils/recommend_filter.dart'; import '../utils/storage.dart'; +import '../utils/subtitle.dart'; import '../utils/wbi_sign.dart'; import 'api.dart'; import 'init.dart'; @@ -482,13 +483,17 @@ class VideoHttp { 'cid': cid, 'bvid': bvid, }); - if (res.data['code'] == 0) { - return { - 'status': true, - 'data': SubTitlteModel.fromJson(res.data['data']), - }; - } else { - return {'status': false, 'data': [], 'msg': res.data['msg']}; + try { + if (res.data['code'] == 0) { + return { + 'status': true, + 'data': SubTitlteModel.fromJson(res.data['data']), + }; + } else { + return {'status': false, 'data': [], 'msg': res.data['msg']}; + } + } catch (err) { + print(err); } } @@ -514,4 +519,12 @@ class VideoHttp { return {'status': false, 'data': [], 'msg': err}; } } + + // 获取字幕内容 + static Future> getSubtitleContent(url) async { + var res = await Request().get('https:$url'); + final String content = SubTitleUtils.convertToWebVTT(res.data['body']); + final List body = res.data['body']; + return {'content': content, 'body': body}; + } } diff --git a/lib/models/common/subtitle_type.dart b/lib/models/common/subtitle_type.dart new file mode 100644 index 00000000..11716351 --- /dev/null +++ b/lib/models/common/subtitle_type.dart @@ -0,0 +1,47 @@ +enum SubtitleType { + // 中文（中国） + zhCN, + // 中文（自动翻译） + aizh, + // 英语（自动生成） + aien, +} + +extension SubtitleTypeExtension on SubtitleType { + String get description { + switch (this) { + case SubtitleType.zhCN: + return '中文（中国）'; + case SubtitleType.aizh: + return '中文（自动翻译）'; + case SubtitleType.aien: + return '英语（自动生成）'; + } + } +} + +extension SubtitleIdExtension on SubtitleType { + String get id { + switch (this) { + case SubtitleType.zhCN: + return 'zh-CN'; + case SubtitleType.aizh: + return 'ai-zh'; + case SubtitleType.aien: + return 'ai-en'; + } + } +} + +extension SubtitleCodeExtension on SubtitleType { + int get code { + switch (this) { + case SubtitleType.zhCN: + return 1; + case SubtitleType.aizh: + return 2; + case SubtitleType.aien: + return 3; + } + } +} diff --git a/lib/models/video/subTitile/result.dart b/lib/models/video/subTitile/result.dart index 389378fa..d3e32e55 100644 --- a/lib/models/video/subTitile/result.dart +++ b/lib/models/video/subTitile/result.dart @@ -1,3 +1,6 @@ +import 'package:get/get.dart'; +import '../../common/subtitle_type.dart'; + class SubTitlteModel { SubTitlteModel({ this.aid, @@ -45,6 +48,10 @@ class SubTitlteItemModel { this.type, this.aiType, this.aiStatus, + this.title, + this.code, + this.content, + this.body, }); int? id; @@ -55,16 +62,28 @@ class SubTitlteItemModel { int? type; int? aiType; int? aiStatus; + String? title; + int? code; + String? content; + List? body; factory SubTitlteItemModel.fromJson(Map json) => SubTitlteItemModel( id: json["id"], - lan: json["lan"], + lan: json["lan"].replaceAll('-', ''), lanDoc: json["lan_doc"], isLock: json["is_lock"], subtitleUrl: json["subtitle_url"], type: json["type"], aiType: json["ai_type"], aiStatus: json["ai_status"], + title: json["lan_doc"], + code: SubtitleType.values + .firstWhereOrNull( + (element) => element.id.toString() == json["lan"]) + ?.index ?? + -1, + content: '', + body: [], ); } diff --git a/lib/pages/video/detail/controller.dart b/lib/pages/video/detail/controller.dart index 5eda1e77..5c4ac14b 100644 --- a/lib/pages/video/detail/controller.dart +++ b/lib/pages/video/detail/controller.dart @@ -20,7 +20,6 @@ import 'package:pilipala/utils/utils.dart'; import 'package:pilipala/utils/video_utils.dart'; import 'package:screen_brightness/screen_brightness.dart'; -import '../../../http/index.dart'; import '../../../models/video/subTitile/content.dart'; import '../../../http/danmaku.dart'; import '../../../utils/id_utils.dart'; @@ -98,6 +97,7 @@ class VideoDetailController extends GetxController RxList subtitleContents = [].obs; late bool enableRelatedVideo; + List subtitles = []; @override void onInit() { @@ -256,6 +256,8 @@ class VideoDetailController extends GetxController /// 开启自动全屏时，在player初始化完成后立即传入headerControl plPlayerController.headerControl = headerControl; + + plPlayerController.subtitles.value = subtitles; } // 视频链接 @@ -398,30 +400,38 @@ class VideoDetailController extends GetxController var result = await VideoHttp.getSubtitle(bvid: bvid, cid: cid.value); if (result['status']) { if (result['data'].subtitles.isNotEmpty) { - SmartDialog.showToast('字幕加载中...'); - var subtitle = result['data'].subtitles.first; - getSubtitleContent(subtitle.subtitleUrl); + subtitles = result['data'].subtitles; + if (subtitles.isNotEmpty) { + for (var i in subtitles) { + final Map res = await VideoHttp.getSubtitleContent( + i.subtitleUrl, + ); + i.content = res['content']; + i.body = res['body']; + } + } } return result['data']; - } else { - SmartDialog.showToast(result['msg'].toString()); } } // 获取字幕内容 - Future getSubtitleContent(String url) async { - var res = await Request().get('https:$url'); - subtitleContents.value = res.data['body'].map((e) { - return SubTitileContentModel.fromJson(e); - }).toList(); - setSubtitleContent(); - } + // Future getSubtitleContent(String url) async { + // var res = await Request().get('https:$url'); + // subtitleContents.value = res.data['body'].map((e) { + // return SubTitileContentModel.fromJson(e); + // }).toList(); + // setSubtitleContent(); + // } setSubtitleContent() { plPlayerController.subtitleContent.value = ''; - if (subtitleContents.isNotEmpty) { - plPlayerController.subtitleContents = subtitleContents; - } + plPlayerController.subtitles.value = subtitles; + } + + clearSubtitleContent() { + plPlayerController.subtitleContent.value = ''; + plPlayerController.subtitles.value = []; } /// 发送弹幕 diff --git a/lib/pages/video/detail/view.dart b/lib/pages/video/detail/view.dart index 08826763..6958a62d 100644 --- a/lib/pages/video/detail/view.dart +++ b/lib/pages/video/detail/view.dart @@ -212,6 +212,7 @@ class _VideoDetailPageState extends State videoIntroController.isPaused = true; plPlayerController!.removeStatusLister(playerListener); plPlayerController!.pause(); + vdCtr.clearSubtitleContent(); } setState(() => isShowing = false); super.didPushNext(); diff --git a/lib/pages/video/detail/widgets/header_control.dart b/lib/pages/video/detail/widgets/header_control.dart index 858ca2df..b0b7db17 100644 --- a/lib/pages/video/detail/widgets/header_control.dart +++ b/lib/pages/video/detail/widgets/header_control.dart @@ -344,6 +344,56 @@ class _HeaderControlState extends State { ); } + /// 选择字幕 + void showSubtitleDialog() async { + int tempThemeValue = widget.controller!.subTitleCode.value; + int len = widget.videoDetailCtr!.subtitles.length; + showDialog( + context: context, + builder: (BuildContext context) { + return AlertDialog( + title: const Text('选择字幕'), + contentPadding: const EdgeInsets.fromLTRB(0, 12, 0, 18), + content: StatefulBuilder(builder: (context, StateSetter setState) { + return len == 0 + ? const SizedBox( + height: 60, + child: Center( + child: Text('没有字幕'), + ), + ) + : Column( + mainAxisSize: MainAxisSize.min, + children: [ + RadioListTile( + value: -1, + title: const Text('关闭弹幕'), + groupValue: tempThemeValue, + onChanged: (value) { + tempThemeValue = value!; + widget.controller?.toggleSubtitle(value); + Get.back(); + }, + ), + ...widget.videoDetailCtr!.subtitles + .map((e) => RadioListTile( + value: e.code, + title: Text(e.title), + groupValue: tempThemeValue, + onChanged: (value) { + tempThemeValue = value!; + widget.controller?.toggleSubtitle(value); + Get.back(); + }, + )) + .toList(), + ], + ); + }), + ); + }); + } + /// 选择倍速 void showSetSpeedSheet() { final double currentSpeed = widget.controller!.playbackSpeed; @@ -1115,6 +1165,31 @@ class _HeaderControlState extends State { ), SizedBox(width: buttonSpace), ], + + /// 字幕 + // SizedBox( + // width: 34, + // height: 34, + // child: IconButton( + // style: ButtonStyle( + // padding: MaterialStateProperty.all(EdgeInsets.zero), + // ), + // onPressed: () => showSubtitleDialog(), + // icon: const Icon( + // Icons.closed_caption_off, + // size: 22, + // ), + // ), + // ), + ComBtn( + icon: const Icon( + Icons.closed_caption_off, + size: 22, + color: Colors.white, + ), + fuc: () => showSubtitleDialog(), + ), + SizedBox(width: buttonSpace), Obx( () => SizedBox( width: 45, diff --git a/lib/plugin/pl_player/controller.dart b/lib/plugin/pl_player/controller.dart index 6f73f6aa..b385fca8 100644 --- a/lib/plugin/pl_player/controller.dart +++ b/lib/plugin/pl_player/controller.dart @@ -22,6 +22,7 @@ import 'package:screen_brightness/screen_brightness.dart'; import 'package:status_bar_control/status_bar_control.dart'; import 'package:universal_platform/universal_platform.dart'; import '../../models/video/subTitile/content.dart'; +import '../../models/video/subTitile/result.dart'; // import 'package:wakelock_plus/wakelock_plus.dart'; Box videoStorage = GStrorage.video; @@ -74,6 +75,8 @@ class PlPlayerController { final Rx _doubleSpeedStatus = false.obs; final Rx _controlsLock = false.obs; final Rx _isFullScreen = false.obs; + final Rx _subTitleOpen = false.obs; + final Rx _subTitleCode = (-1).obs; // 默认投稿视频格式 static Rx _videoType = 'archive'.obs; @@ -119,6 +122,7 @@ class PlPlayerController { PreferredSizeWidget? headerControl; PreferredSizeWidget? bottomControl; Widget? danmuWidget; + late RxList subtitles; /// 数据加载监听 Stream get onDataStatusChanged => dataStatus.status.stream; @@ -148,6 +152,11 @@ class PlPlayerController { Rx get mute => _mute; Stream get onMuteChanged => _mute.stream; + /// 字幕开启状态 + Rx get subTitleOpen => _subTitleOpen; + Rx get subTitleCode => _subTitleCode; + // Stream get onSubTitleOpenChanged => _subTitleOpen.stream; + /// [videoPlayerController] instace of Player Player? get videoPlayerController => _videoPlayerController; @@ -355,6 +364,8 @@ class PlPlayerController { bool enableHeart = true, // 是否首次加载 bool isFirstTime = true, + // 是否开启字幕 + bool enableSubTitle = false, }) async { try { _autoPlay = autoplay; @@ -369,7 +380,9 @@ class PlPlayerController { _cid = cid; _enableHeart = enableHeart; _isFirstTime = isFirstTime; - + _subTitleOpen.value = enableSubTitle; + subtitles = [].obs; + subtitleContent.value = ''; if (_videoPlayerController != null && _videoPlayerController!.state.playing) { await pause(notify: false); @@ -616,6 +629,10 @@ class PlPlayerController { const Duration(seconds: 1), () => videoPlayerServiceHandler.onPositionChange(event)); }), + + // onSubTitleOpenChanged.listen((bool event) { + // toggleSubtitle(event ? subTitleCode.value : -1); + // }) ], ); } @@ -1054,11 +1071,46 @@ class PlPlayerController { } } + /// 字幕 + void toggleSubtitle(int code) { + _subTitleOpen.value = code != -1; + _subTitleCode.value = code; + // if (code == -1) { + // // 关闭字幕 + // _subTitleOpen.value = false; + // _subTitleCode.value = code; + // _videoPlayerController?.setSubtitleTrack(SubtitleTrack.no()); + // return; + // } + // final SubTitlteItemModel? subtitle = subtitles?.firstWhereOrNull( + // (element) => element.code == code, + // ); + // _subTitleOpen.value = true; + // _subTitleCode.value = code; + // _videoPlayerController?.setSubtitleTrack( + // SubtitleTrack.data( + // subtitle!.content!, + // title: subtitle.title, + // language: subtitle.lan, + // ), + // ); + } + void querySubtitleContent(double progress) { - if (subtitleContents.isNotEmpty) { - for (var content in subtitleContents) { - if (progress >= content.from! && progress <= content.to!) { - subtitleContent.value = content.content!; + if (subTitleCode.value == -1) { + subtitleContent.value = ''; + return; + } + if (subtitles.isEmpty) { + return; + } + final SubTitlteItemModel? subtitle = subtitles.firstWhereOrNull( + (element) => element.code == subTitleCode.value, + ); + if (subtitle != null && subtitle.body!.isNotEmpty) { + for (var content in subtitle.body!) { + if (progress >= content['from']! && progress <= content['to']!) { + subtitleContent.value = content['content']!; return; } } @@ -1071,6 +1123,9 @@ class PlPlayerController { } Future dispose({String type = 'single'}) async { + print('dispose'); + print('dispose: ${playerCount.value}'); + // 每次减1，最后销毁 if (type == 'single' && playerCount.value > 1) { _playerCount.value -= 1; @@ -1080,6 +1135,7 @@ class PlPlayerController { } _playerCount.value = 0; try { + print('dispose dispose ---------'); _timer?.cancel(); _timerForVolume?.cancel(); _timerForGettingVolume?.cancel(); diff --git a/lib/plugin/pl_player/view.dart b/lib/plugin/pl_player/view.dart index aad686e3..be24b105 100644 --- a/lib/plugin/pl_player/view.dart +++ b/lib/plugin/pl_player/view.dart @@ -580,41 +580,44 @@ class _PLVideoPlayerState extends State if (widget.danmuWidget != null) Positioned.fill(top: 4, child: widget.danmuWidget!), - widget.controller.subscriptions.isNotEmpty - ? Stack( - children: [ - Positioned( - left: 0, - right: 0, - bottom: 30, - child: Align( - alignment: Alignment.center, - child: Obx( - () => Container( - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(4), - color: widget.controller.subtitleContent.value != '' - ? Colors.black.withOpacity(0.4) - : Colors.transparent, - ), - padding: const EdgeInsets.symmetric( - horizontal: 10, - vertical: 4, - ), - child: Text( - widget.controller.subtitleContent.value, - style: const TextStyle( - color: Colors.white, - fontSize: 12, - ), + /// 开启且有字幕时展示 + Stack( + children: [ + Positioned( + left: 0, + right: 0, + bottom: 30, + child: Align( + alignment: Alignment.center, + child: Obx( + () => Visibility( + visible: widget.controller.subTitleCode.value != -1, + child: Container( + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(4), + color: widget.controller.subtitleContent.value != '' + ? Colors.black.withOpacity(0.6) + : Colors.transparent, + ), + padding: widget.controller.subTitleCode.value != -1 + ? const EdgeInsets.symmetric( + horizontal: 10, + vertical: 4, + ) + : EdgeInsets.zero, + child: Text( + widget.controller.subtitleContent.value, + style: const TextStyle( + color: Colors.white, + fontSize: 12, ), ), - ), - ), - ), - ], - ) - : const SizedBox(), + )), + ), + ), + ), + ], + ), /// 手势 Positioned.fill( diff --git a/lib/utils/subtitle.dart b/lib/utils/subtitle.dart new file mode 100644 index 00000000..452be542 --- /dev/null +++ b/lib/utils/subtitle.dart @@ -0,0 +1,32 @@ +class SubTitleUtils { + // 格式整理 + static String convertToWebVTT(List jsonData) { + String webVTTContent = 'WEBVTT FILE\n\n'; + + for (int i = 0; i < jsonData.length; i++) { + final item = jsonData[i]; + double from = item['from'] as double; + double to = item['to'] as double; + int sid = (item['sid'] ?? 0) as int; + String content = item['content'] as String; + + webVTTContent += '$sid\n'; + webVTTContent += '${formatTime(from)} --> ${formatTime(to)}\n'; + webVTTContent += '$content\n\n'; + } + + return webVTTContent; + } + + static String formatTime(num seconds) { + final String h = (seconds / 3600).floor().toString().padLeft(2, '0'); + final String m = (seconds % 3600 / 60).floor().toString().padLeft(2, '0'); + final String s = (seconds % 60).floor().toString().padLeft(2, '0'); + final String ms = + (seconds * 1000 % 1000).floor().toString().padLeft(3, '0'); + if (h == '00') { + return "$m:$s.$ms"; + } + return "$h:$m:$s.$ms"; + } +} From d6fd2993950779a57a75f4e4fe533f3b8c8f2bc9 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Mon, 25 Mar 2024 22:25:05 +0800 Subject: [PATCH 219/220] =?UTF-8?q?fix:=20tabbar=E6=8C=87=E7=A4=BA?= =?UTF-8?q?=E5=99=A8=E6=8A=96=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/rank/controller.dart | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/lib/pages/rank/controller.dart b/lib/pages/rank/controller.dart index da73ea02..6fe3d424 100644 --- a/lib/pages/rank/controller.dart +++ b/lib/pages/rank/controller.dart @@ -50,21 +50,5 @@ class RankController extends GetxController with GetTickerProviderStateMixin { length: tabs.length, vsync: this, ); - // 监听 tabController 切换 - if (enableGradientBg) { - tabController.animation!.addListener(() { - if (tabController.indexIsChanging) { - if (initialIndex.value != tabController.index) { - initialIndex.value = tabController.index; - } - } else { - final int temp = tabController.animation!.value.round(); - if (initialIndex.value != temp) { - initialIndex.value = temp; - tabController.index = initialIndex.value; - } - } - }); - } } } From d6b972a8ab7e6036f82b91fd866f77792996aa24 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Tue, 26 Mar 2024 22:13:01 +0800 Subject: [PATCH 220/220] =?UTF-8?q?mod:=20=E5=BC=B9=E5=B9=95=E5=9B=BE?= =?UTF-8?q?=E6=A0=87=E9=A2=9C=E8=89=B2&=E7=A8=8D=E5=90=8E=E5=86=8D?= =?UTF-8?q?=E7=9C=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/video/detail/introduction/view.dart | 7 ++++++- lib/pages/video/detail/view.dart | 3 +++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/lib/pages/video/detail/introduction/view.dart b/lib/pages/video/detail/introduction/view.dart index 831491f6..344b4b3a 100644 --- a/lib/pages/video/detail/introduction/view.dart +++ b/lib/pages/video/detail/introduction/view.dart @@ -15,6 +15,7 @@ import 'package:pilipala/pages/video/detail/widgets/ai_detail.dart'; import 'package:pilipala/utils/feed_back.dart'; import 'package:pilipala/utils/storage.dart'; import 'package:pilipala/utils/utils.dart'; +import '../../../../http/user.dart'; import '../widgets/expandable_section.dart'; import 'widgets/action_item.dart'; import 'widgets/fav_panel.dart'; @@ -479,7 +480,11 @@ class _VideoInfoState extends State with TickerProviderStateMixin { ), ActionItem( icon: const Icon(FontAwesomeIcons.clock), - onTap: () => videoIntroController.actionShareVideo(), + onTap: () async { + final res = + await UserHttp.toViewLater(bvid: widget.videoDetail!.bvid); + SmartDialog.showToast(res['msg']); + }, selectStatus: false, text: '稍后看', ), diff --git a/lib/pages/video/detail/view.dart b/lib/pages/video/detail/view.dart index 69801beb..ffa50476 100644 --- a/lib/pages/video/detail/view.dart +++ b/lib/pages/video/detail/view.dart @@ -372,6 +372,9 @@ class _VideoDetailPageState extends State false) ? SvgPicture.asset( 'assets/images/video/danmu_close.svg', + // ignore: deprecated_member_use + color: + Theme.of(context).colorScheme.outline, ) : SvgPicture.asset( 'assets/images/video/danmu_open.svg',