From fa8fd42e9a526d44994725fc05c1dd3ad5e78ee6 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sun, 7 Jan 2024 12:58:24 +0800 Subject: [PATCH] mod: format code --- lib/common/widgets/custom_toast.dart | 9 +- lib/common/widgets/html_render.dart | 56 +++--- lib/common/widgets/live_card.dart | 32 +-- lib/common/widgets/network_img_layer.dart | 46 ++--- lib/common/widgets/overlay_pop.dart | 21 +- .../widgets/pull_to_refresh_header.dart | 7 +- lib/common/widgets/video_card_h.dart | 82 ++++---- lib/common/widgets/video_card_v.dart | 22 +-- lib/http/bangumi.dart | 4 +- lib/http/black.dart | 4 +- lib/http/danmaku.dart | 29 ++- lib/http/dynamics.dart | 6 +- lib/http/fan.dart | 4 +- lib/http/follow.dart | 4 +- lib/http/html.dart | 2 +- lib/http/init.dart | 50 ++--- lib/http/interceptor.dart | 44 +++-- lib/http/live.dart | 8 +- lib/http/login.dart | 7 +- lib/http/member.dart | 24 +-- lib/http/msg.dart | 10 +- lib/http/reply.dart | 6 +- lib/http/search.dart | 28 +-- lib/http/user.dart | 19 +- lib/http/video.dart | 27 ++- lib/pages/about/index.dart | 5 +- .../bangumi/introduction/controller.dart | 4 +- lib/pages/bangumi/introduction/view.dart | 52 ++--- lib/pages/bangumi/view.dart | 18 +- lib/pages/bangumi/widgets/bangumi_panel.dart | 147 +++++++------- lib/pages/bangumi/widgets/bangumu_card_v.dart | 23 ++- lib/pages/blacklist/index.dart | 2 +- lib/pages/danmaku/controller.dart | 19 +- lib/pages/danmaku/view.dart | 36 ++-- .../{deatil => detail}/controller.dart | 0 .../dynamics/{deatil => detail}/index.dart | 0 .../dynamics/{deatil => detail}/view.dart | 6 +- lib/pages/dynamics/widgets/author_panel.dart | 1 - lib/pages/dynamics/widgets/up_panel.dart | 2 +- .../{favDetail => fav_detail}/controller.dart | 0 .../{favDetail => fav_detail}/index.dart | 0 lib/pages/{favDetail => fav_detail}/view.dart | 2 +- .../widget/fav_video_card.dart | 0 lib/pages/fav_search/view.dart | 2 +- lib/pages/html/view.dart | 4 +- .../{liveRoom => live_room}/controller.dart | 0 lib/pages/{liveRoom => live_room}/index.dart | 0 lib/pages/{liveRoom => live_room}/view.dart | 0 .../widgets/bottom_control.dart | 2 +- lib/pages/main/view.dart | 4 +- lib/pages/member/view.dart | 4 +- lib/pages/member_archive/view.dart | 4 +- .../controller.dart | 0 .../{searchPanel => search_panel}/index.dart | 0 .../{searchPanel => search_panel}/view.dart | 0 .../widgets/article_panel.dart | 0 .../widgets/live_panel.dart | 2 +- .../widgets/media_bangumi_panel.dart | 0 .../widgets/user_panel.dart | 0 .../widgets/video_panel.dart | 2 +- .../controller.dart | 0 .../index.dart | 0 .../{searchResult => search_result}/view.dart | 2 +- lib/pages/video/detail/controller.dart | 22 +-- .../video/detail/introduction/controller.dart | 34 ++-- lib/pages/video/detail/introduction/view.dart | 42 ++-- .../introduction/widgets/fav_panel.dart | 8 +- .../introduction/widgets/group_panel.dart | 17 +- .../introduction/widgets/intro_detail.dart | 31 ++- .../detail/introduction/widgets/menu_row.dart | 22 +-- .../detail/introduction/widgets/page.dart | 30 +-- .../detail/introduction/widgets/season.dart | 31 ++- lib/pages/video/detail/related/view.dart | 12 +- lib/pages/video/detail/reply/controller.dart | 13 +- lib/pages/video/detail/reply/view.dart | 16 +- .../detail/reply/widgets/reply_item.dart | 65 +++---- lib/pages/video/detail/reply/widgets/zan.dart | 42 ++-- .../detail/{replyNew => reply_new}/index.dart | 0 .../detail/{replyNew => reply_new}/view.dart | 0 .../controller.dart | 4 +- .../{replyReply => reply_reply}/index.dart | 0 .../{replyReply => reply_reply}/view.dart | 27 ++- lib/pages/video/detail/view.dart | 72 ++++--- lib/pages/video/detail/widgets/app_bar.dart | 2 +- .../video/detail/widgets/header_control.dart | 183 ++++++++++-------- lib/pages/webview/controller.dart | 15 +- .../controller.dart | 0 .../index.dart | 0 .../view.dart | 12 +- .../widget/chat_item.dart | 7 +- lib/plugin/pl_player/controller.dart | 17 +- lib/plugin/pl_player/models/play_repeat.dart | 8 +- lib/plugin/pl_player/models/play_speed.dart | 6 +- lib/plugin/pl_player/view.dart | 143 +++++++------- .../pl_player/widgets/bottom_control.dart | 15 +- lib/router/app_pages.dart | 103 +++++----- lib/utils/app_scheme.dart | 71 +++---- lib/utils/feed_back.dart | 7 +- lib/utils/id_utils.dart | 18 +- lib/utils/storage.dart | 30 +-- lib/utils/utils.dart | 22 +-- lib/utils/wbi_sign.dart | 59 +++--- pubspec.lock | 8 + pubspec.yaml | 1 + 104 files changed, 1077 insertions(+), 1032 deletions(-) rename lib/pages/dynamics/{deatil => detail}/controller.dart (100%) rename lib/pages/dynamics/{deatil => detail}/index.dart (100%) rename lib/pages/dynamics/{deatil => detail}/view.dart (98%) rename lib/pages/{favDetail => fav_detail}/controller.dart (100%) rename lib/pages/{favDetail => fav_detail}/index.dart (100%) rename lib/pages/{favDetail => fav_detail}/view.dart (99%) rename lib/pages/{favDetail => fav_detail}/widget/fav_video_card.dart (100%) rename lib/pages/{liveRoom => live_room}/controller.dart (100%) rename lib/pages/{liveRoom => live_room}/index.dart (100%) rename lib/pages/{liveRoom => live_room}/view.dart (100%) rename lib/pages/{liveRoom => live_room}/widgets/bottom_control.dart (98%) rename lib/pages/{searchPanel => search_panel}/controller.dart (100%) rename lib/pages/{searchPanel => search_panel}/index.dart (100%) rename lib/pages/{searchPanel => search_panel}/view.dart (100%) rename lib/pages/{searchPanel => search_panel}/widgets/article_panel.dart (100%) rename lib/pages/{searchPanel => search_panel}/widgets/live_panel.dart (98%) rename lib/pages/{searchPanel => search_panel}/widgets/media_bangumi_panel.dart (100%) rename lib/pages/{searchPanel => search_panel}/widgets/user_panel.dart (100%) rename lib/pages/{searchPanel => search_panel}/widgets/video_panel.dart (99%) rename lib/pages/{searchResult => search_result}/controller.dart (100%) rename lib/pages/{searchResult => search_result}/index.dart (100%) rename lib/pages/{searchResult => search_result}/view.dart (98%) rename lib/pages/video/detail/{replyNew => reply_new}/index.dart (100%) rename lib/pages/video/detail/{replyNew => reply_new}/view.dart (100%) rename lib/pages/video/detail/{replyReply => reply_reply}/controller.dart (95%) rename lib/pages/video/detail/{replyReply => reply_reply}/index.dart (100%) rename lib/pages/video/detail/{replyReply => reply_reply}/view.dart (95%) rename lib/pages/{whisperDetail => whisper_detail}/controller.dart (100%) rename lib/pages/{whisperDetail => whisper_detail}/index.dart (100%) rename lib/pages/{whisperDetail => whisper_detail}/view.dart (94%) rename lib/pages/{whisperDetail => whisper_detail}/widget/chat_item.dart (97%) diff --git a/lib/common/widgets/custom_toast.dart b/lib/common/widgets/custom_toast.dart index 64cf0da2..f732fd85 100644 --- a/lib/common/widgets/custom_toast.dart +++ b/lib/common/widgets/custom_toast.dart @@ -2,16 +2,17 @@ import 'package:flutter/material.dart'; import 'package:hive/hive.dart'; import 'package:pilipala/utils/storage.dart'; -Box setting = GStrorage.setting; +Box setting = GStrorage.setting; class CustomToast extends StatelessWidget { + const CustomToast({super.key, required this.msg}); + final String msg; - const CustomToast({Key? key, required this.msg}) : super(key: key); @override Widget build(BuildContext context) { - double toastOpacity = - setting.get(SettingBoxKey.defaultToastOp, defaultValue: 1.0); + final double toastOpacity = + setting.get(SettingBoxKey.defaultToastOp, defaultValue: 1.0) as double; return Container( margin: EdgeInsets.only(bottom: MediaQuery.of(context).padding.bottom + 30), diff --git a/lib/common/widgets/html_render.dart b/lib/common/widgets/html_render.dart index 2e97ceed..bf58d78c 100644 --- a/lib/common/widgets/html_render.dart +++ b/lib/common/widgets/html_render.dart @@ -1,45 +1,46 @@ -import 'package:get/get.dart'; import 'package:flutter/material.dart'; import 'package:flutter_html/flutter_html.dart'; -import 'package:pilipala/common/widgets/network_img_layer.dart'; +import 'package:get/get.dart'; +import 'network_img_layer.dart'; // ignore: must_be_immutable class HtmlRender extends StatelessWidget { - String? htmlContent; - final int? imgCount; - final List? imgList; - - HtmlRender({ + const HtmlRender({ this.htmlContent, this.imgCount, this.imgList, super.key, }); + final String? htmlContent; + final int? imgCount; + final List? imgList; + @override Widget build(BuildContext context) { return Html( data: htmlContent, - onLinkTap: (url, buildContext, attributes) => {}, + onLinkTap: (String? url, Map buildContext, attributes) {}, extensions: [ TagExtension( - tagsToExtend: {"img"}, - builder: (extensionContext) { + tagsToExtend: {'img'}, + builder: (ExtensionContext extensionContext) { try { - Map attributes = extensionContext.attributes; - List key = attributes.keys.toList(); - String? imgUrl = key.contains('src') - ? attributes['src'] - : attributes['data-src']; - if (imgUrl!.startsWith('//')) { + final Map attributes = + extensionContext.attributes; + final List key = attributes.keys.toList(); + String imgUrl = key.contains('src') + ? attributes['src'] as String + : attributes['data-src'] as String; + if (imgUrl.startsWith('//')) { imgUrl = 'https:$imgUrl'; } if (imgUrl.startsWith('http://')) { imgUrl = imgUrl.replaceAll('http://', 'https://'); } imgUrl = imgUrl.contains('@') ? imgUrl.split('@').first : imgUrl; - bool isEmote = imgUrl.contains('/emote/'); - bool isMall = imgUrl.contains('/mall/'); + final bool isEmote = imgUrl.contains('/emote/'); + final bool isMall = imgUrl.contains('/mall/'); if (isMall) { return const SizedBox(); } @@ -58,38 +59,37 @@ class HtmlRender extends StatelessWidget { src: imgUrl, ); } catch (err) { - print(err); return const SizedBox(); } }, ), ], style: { - "html": Style( + 'html': Style( fontSize: FontSize.medium, lineHeight: LineHeight.percent(140), ), - "body": Style(margin: Margins.zero, padding: HtmlPaddings.zero), - "a": Style( + 'body': Style(margin: Margins.zero, padding: HtmlPaddings.zero), + 'a': Style( color: Theme.of(context).colorScheme.primary, textDecoration: TextDecoration.none, ), - "p": Style( + 'p': Style( margin: Margins.only(bottom: 10), ), - "span": Style( + 'span': Style( fontSize: FontSize.medium, height: Height(1.65), ), - "div": Style(height: Height.auto()), - "li > p": Style( + 'div': Style(height: Height.auto()), + 'li > p': Style( display: Display.inline, ), - "li": Style( + 'li': Style( padding: HtmlPaddings.only(bottom: 4), textAlign: TextAlign.justify, ), - "img": Style(margin: Margins.only(top: 4, bottom: 4)), + 'img': Style(margin: Margins.only(top: 4, bottom: 4)), }, ); } diff --git a/lib/common/widgets/live_card.dart b/lib/common/widgets/live_card.dart index 01d0bf32..4034756d 100644 --- a/lib/common/widgets/live_card.dart +++ b/lib/common/widgets/live_card.dart @@ -1,11 +1,11 @@ import 'package:flutter/material.dart'; -import 'package:pilipala/common/constants.dart'; -import 'package:pilipala/common/widgets/network_img_layer.dart'; -import 'package:pilipala/utils/utils.dart'; +import '../../utils/utils.dart'; +import '../constants.dart'; +import 'network_img_layer.dart'; class LiveCard extends StatelessWidget { // ignore: prefer_typing_uninitialized_variables - final liveItem; + final dynamic liveItem; const LiveCard({ Key? key, @@ -14,7 +14,7 @@ class LiveCard extends StatelessWidget { @override Widget build(BuildContext context) { - String heroTag = Utils.makeHeroTag(liveItem.roomid); + final String heroTag = Utils.makeHeroTag(liveItem.roomid); return Card( elevation: 0, @@ -23,7 +23,6 @@ class LiveCard extends StatelessWidget { borderRadius: BorderRadius.circular(0), side: BorderSide( color: Theme.of(context).dividerColor.withOpacity(0.08), - width: 1, ), ), margin: EdgeInsets.zero, @@ -33,15 +32,16 @@ class LiveCard extends StatelessWidget { children: [ AspectRatio( aspectRatio: StyleString.aspectRatio, - child: LayoutBuilder(builder: (context, boxConstraints) { - double maxWidth = boxConstraints.maxWidth; - double maxHeight = boxConstraints.maxHeight; + child: LayoutBuilder(builder: + (BuildContext context, BoxConstraints boxConstraints) { + final double maxWidth = boxConstraints.maxWidth; + final double maxHeight = boxConstraints.maxHeight; return Stack( children: [ Hero( tag: heroTag, child: NetworkImgLayer( - src: liveItem.cover, + src: liveItem.cover as String, type: 'emote', width: maxWidth, height: maxHeight, @@ -58,7 +58,7 @@ class LiveCard extends StatelessWidget { // view: liveItem.stat.view, // danmaku: liveItem.stat.danmaku, // duration: liveItem.duration, - online: liveItem.online, + online: liveItem.online as int, ), ), ), @@ -90,7 +90,7 @@ class LiveContent extends StatelessWidget { mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ Text( - liveItem.title, + liveItem.title as String, textAlign: TextAlign.start, style: const TextStyle(fontSize: 13, fontWeight: FontWeight.w500), maxLines: 2, @@ -99,7 +99,7 @@ class LiveContent extends StatelessWidget { SizedBox( width: double.infinity, child: Text( - liveItem.uname, + liveItem.uname as String, maxLines: 1, style: TextStyle( fontSize: Theme.of(context).textTheme.labelMedium!.fontSize, @@ -114,9 +114,9 @@ class LiveContent extends StatelessWidget { } class LiveStat extends StatelessWidget { - final int? online; + const LiveStat({super.key, required this.online}); - const LiveStat({Key? key, required this.online}) : super(key: key); + final int? online; @override Widget build(BuildContext context) { @@ -136,7 +136,7 @@ class LiveStat extends StatelessWidget { ), child: Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ + children: [ // Row( // children: [ // StatView( diff --git a/lib/common/widgets/network_img_layer.dart b/lib/common/widgets/network_img_layer.dart index c44bd0e7..0a8bb028 100644 --- a/lib/common/widgets/network_img_layer.dart +++ b/lib/common/widgets/network_img_layer.dart @@ -1,24 +1,14 @@ -import 'package:flutter/material.dart'; import 'package:cached_network_image/cached_network_image.dart'; +import 'package:flutter/material.dart'; import 'package:hive/hive.dart'; -import 'package:pilipala/common/constants.dart'; -import 'package:pilipala/utils/storage.dart'; +import '../../utils/storage.dart'; +import '../constants.dart'; -Box setting = GStrorage.setting; +Box setting = GStrorage.setting; class NetworkImgLayer extends StatelessWidget { - final String? src; - final double? width; - final double? height; - final double? cacheW; - final double? cacheH; - final String? type; - final Duration? fadeOutDuration; - final Duration? fadeInDuration; - final int? quality; - const NetworkImgLayer({ - Key? key, + super.key, this.src, required this.width, required this.height, @@ -29,12 +19,23 @@ class NetworkImgLayer extends StatelessWidget { this.fadeInDuration, // 图片质量 默认1% this.quality, - }) : super(key: key); + }); + + final String? src; + final double? width; + final double? height; + final double? cacheW; + final double? cacheH; + final String? type; + final Duration? fadeOutDuration; + final Duration? fadeInDuration; + final int? quality; @override Widget build(BuildContext context) { - double pr = MediaQuery.of(context).devicePixelRatio; - int picQuality = setting.get(SettingBoxKey.defaultPicQa, defaultValue: 10); + final double pr = MediaQuery.of(context).devicePixelRatio; + final int picQuality = + setting.get(SettingBoxKey.defaultPicQa, defaultValue: 10) as int; // double pr = 2; return src != '' @@ -50,7 +51,6 @@ class NetworkImgLayer extends StatelessWidget { '${src!.startsWith('//') ? 'https:${src!}' : src!}@${quality ?? picQuality}q.webp', width: width ?? double.infinity, height: height ?? double.infinity, - alignment: Alignment.center, maxWidthDiskCache: ((cacheW ?? width!) * pr).toInt(), // maxHeightDiskCache: (cacheH ?? height!).toInt(), memCacheWidth: ((cacheW ?? width!) * pr).toInt(), @@ -61,14 +61,16 @@ class NetworkImgLayer extends StatelessWidget { fadeInDuration: fadeInDuration ?? const Duration(milliseconds: 200), // filterQuality: FilterQuality.high, - errorWidget: (context, url, error) => placeholder(context), - placeholder: (context, url) => placeholder(context), + errorWidget: (BuildContext context, String url, Object error) => + placeholder(context), + placeholder: (BuildContext context, String url) => + placeholder(context), ), ) : placeholder(context); } - Widget placeholder(context) { + Widget placeholder(BuildContext context) { return Container( width: width ?? double.infinity, height: height ?? double.infinity, diff --git a/lib/common/widgets/overlay_pop.dart b/lib/common/widgets/overlay_pop.dart index 53d4c9a1..fe9b9377 100644 --- a/lib/common/widgets/overlay_pop.dart +++ b/lib/common/widgets/overlay_pop.dart @@ -1,16 +1,17 @@ import 'package:flutter/material.dart'; -import 'package:pilipala/common/constants.dart'; -import 'package:pilipala/common/widgets/network_img_layer.dart'; -import 'package:pilipala/utils/download.dart'; +import '../../utils/download.dart'; +import '../constants.dart'; +import 'network_img_layer.dart'; class OverlayPop extends StatelessWidget { + const OverlayPop({super.key, this.videoItem, this.closeFn}); + final dynamic videoItem; final Function? closeFn; - const OverlayPop({super.key, this.videoItem, this.closeFn}); @override Widget build(BuildContext context) { - double imgWidth = MediaQuery.of(context).size.width - 8 * 2; + final double imgWidth = MediaQuery.sizeOf(context).width - 8 * 2; return Container( margin: const EdgeInsets.symmetric(horizontal: 8), decoration: BoxDecoration( @@ -19,7 +20,6 @@ class OverlayPop extends StatelessWidget { ), child: Column( mainAxisSize: MainAxisSize.min, - mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start, children: [ Stack( @@ -27,7 +27,7 @@ class OverlayPop extends StatelessWidget { NetworkImgLayer( width: imgWidth, height: imgWidth / StyleString.aspectRatio, - src: videoItem.pic!, + src: videoItem.pic! as String, quality: 100, ), Positioned( @@ -61,7 +61,7 @@ class OverlayPop extends StatelessWidget { children: [ Expanded( child: Text( - videoItem.title!, + videoItem.title! as String, ), ), const SizedBox(width: 4), @@ -69,7 +69,10 @@ class OverlayPop extends StatelessWidget { tooltip: '保存封面图', onPressed: () async { await DownloadUtils.downloadImg( - videoItem.pic ?? videoItem.cover); + videoItem.pic != null + ? videoItem.pic as String + : videoItem.cover as String, + ); // closeFn!(); }, icon: const Icon(Icons.download, size: 20), diff --git a/lib/common/widgets/pull_to_refresh_header.dart b/lib/common/widgets/pull_to_refresh_header.dart index 3333a0a6..46db5138 100644 --- a/lib/common/widgets/pull_to_refresh_header.dart +++ b/lib/common/widgets/pull_to_refresh_header.dart @@ -17,8 +17,8 @@ class PullToRefreshHeader extends StatelessWidget { this.info, this.lastRefreshTime, { this.color, - Key? key, - }) : super(key: key); + super.key, + }); final PullToRefreshScrollNotificationInfo? info; final DateTime? lastRefreshTime; @@ -28,7 +28,7 @@ class PullToRefreshHeader extends StatelessWidget { Widget build(BuildContext context) { final PullToRefreshScrollNotificationInfo? infos = info; if (infos == null) { - return Container(); + return const SizedBox(); } String text = ''; if (infos.mode == PullToRefreshIndicatorMode.armed) { @@ -65,7 +65,6 @@ class PullToRefreshHeader extends StatelessWidget { top: top, child: Row( mainAxisAlignment: MainAxisAlignment.center, - crossAxisAlignment: CrossAxisAlignment.center, children: [ Expanded( child: Container( diff --git a/lib/common/widgets/video_card_h.dart b/lib/common/widgets/video_card_h.dart index 551f4063..c4472b42 100644 --- a/lib/common/widgets/video_card_h.dart +++ b/lib/common/widgets/video_card_h.dart @@ -1,17 +1,28 @@ +import 'package:flutter/material.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:get/get.dart'; -import 'package:flutter/material.dart'; -import 'package:pilipala/common/constants.dart'; -import 'package:pilipala/common/widgets/badge.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/http/user.dart'; -import 'package:pilipala/utils/utils.dart'; -import 'package:pilipala/common/widgets/network_img_layer.dart'; +import '../../http/search.dart'; +import '../../http/user.dart'; +import '../../utils/utils.dart'; +import '../constants.dart'; +import 'badge.dart'; +import 'network_img_layer.dart'; +import 'stat/danmu.dart'; +import 'stat/view.dart'; // 视频卡片 - 水平布局 class VideoCardH extends StatelessWidget { + const VideoCardH({ + super.key, + required this.videoItem, + this.longPress, + this.longPressEnd, + this.source = 'normal', + this.showOwner = true, + this.showView = true, + this.showDanmaku = true, + this.showPubdate = false, + }); // ignore: prefer_typing_uninitialized_variables final videoItem; final Function()? longPress; @@ -22,23 +33,11 @@ class VideoCardH extends StatelessWidget { final bool showDanmaku; final bool showPubdate; - const VideoCardH({ - Key? key, - required this.videoItem, - this.longPress, - this.longPressEnd, - this.source = 'normal', - this.showOwner = true, - this.showView = true, - this.showDanmaku = true, - this.showPubdate = false, - }) : super(key: key); - @override Widget build(BuildContext context) { - int aid = videoItem.aid; - String bvid = videoItem.bvid; - String heroTag = Utils.makeHeroTag(aid); + final int aid = videoItem.aid; + final String bvid = videoItem.bvid; + final String heroTag = Utils.makeHeroTag(aid); return GestureDetector( onLongPress: () { if (longPress != null) { @@ -53,7 +52,7 @@ class VideoCardH extends StatelessWidget { child: InkWell( onTap: () async { try { - int cid = + final int cid = videoItem.cid ?? await SearchHttp.ab2c(aid: aid, bvid: bvid); Get.toNamed('/video?bvid=$bvid&cid=$cid', arguments: {'videoItem': videoItem, 'heroTag': heroTag}); @@ -65,8 +64,8 @@ class VideoCardH extends StatelessWidget { padding: const EdgeInsets.fromLTRB( StyleString.safeSpace, 5, StyleString.safeSpace, 5), child: LayoutBuilder( - builder: (context, boxConstraints) { - double width = (boxConstraints.maxWidth - + builder: (BuildContext context, BoxConstraints boxConstraints) { + final double width = (boxConstraints.maxWidth - StyleString.cardSpace * 6 / MediaQuery.of(context).textScaleFactor) / @@ -77,29 +76,28 @@ class VideoCardH extends StatelessWidget { child: Row( mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start, - children: [ + children: [ AspectRatio( aspectRatio: StyleString.aspectRatio, child: LayoutBuilder( - builder: (context, boxConstraints) { - double maxWidth = boxConstraints.maxWidth; - double maxHeight = boxConstraints.maxHeight; + builder: (BuildContext context, + BoxConstraints boxConstraints) { + final double maxWidth = boxConstraints.maxWidth; + final double maxHeight = boxConstraints.maxHeight; return Stack( children: [ Hero( tag: heroTag, child: NetworkImgLayer( - src: videoItem.pic, + src: videoItem.pic as String, width: maxWidth, height: maxHeight, ), ), PBadge( text: Utils.timeFormat(videoItem.duration!), - top: null, right: 6.0, bottom: 6.0, - left: null, type: 'gray', ), // if (videoItem.rcmdReason != null && @@ -159,7 +157,7 @@ class VideoContent extends StatelessWidget { children: [ if (videoItem.title is String) ...[ Text( - videoItem.title, + videoItem.title as String, textAlign: TextAlign.start, style: const TextStyle( fontWeight: FontWeight.w500, @@ -172,9 +170,9 @@ class VideoContent extends StatelessWidget { maxLines: 2, text: TextSpan( children: [ - for (var i in videoItem.title) ...[ + for (final i in videoItem.title) ...[ TextSpan( - text: i['text'], + text: i['text'] as String, style: TextStyle( fontWeight: FontWeight.w500, letterSpacing: 0.3, @@ -216,7 +214,7 @@ class VideoContent extends StatelessWidget { Row( children: [ Text( - videoItem.owner.name, + videoItem.owner.name as String, style: TextStyle( fontSize: Theme.of(context).textTheme.labelMedium!.fontSize, @@ -230,14 +228,14 @@ class VideoContent extends StatelessWidget { if (showView) ...[ StatView( theme: 'gray', - view: videoItem.stat.view, + view: videoItem.stat.view as int, ), const SizedBox(width: 8), ], if (showDanmaku) StatDanMu( theme: 'gray', - danmu: videoItem.stat.danmaku, + danmu: videoItem.stat.danmaku as int, ), const Spacer(), @@ -281,8 +279,8 @@ class VideoContent extends StatelessWidget { PopupMenuItem( onTap: () async { var res = await UserHttp.toViewLater( - bvid: videoItem.bvid); - SmartDialog.showToast(res['msg']); + bvid: videoItem.bvid as String); + SmartDialog.showToast(res['msg'] as String); }, value: 'pause', height: 35, diff --git a/lib/common/widgets/video_card_v.dart b/lib/common/widgets/video_card_v.dart index 5c827f84..1b6edbbf 100644 --- a/lib/common/widgets/video_card_v.dart +++ b/lib/common/widgets/video_card_v.dart @@ -1,17 +1,15 @@ +import 'package:flutter/material.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:get/get.dart'; -import 'package:flutter/material.dart'; -import 'package:pilipala/common/constants.dart'; -import 'package:pilipala/common/widgets/badge.dart'; -import 'package:pilipala/common/widgets/stat/danmu.dart'; -import 'package:pilipala/common/widgets/stat/view.dart'; -import 'package:pilipala/http/dynamics.dart'; -import 'package:pilipala/http/search.dart'; -import 'package:pilipala/http/user.dart'; -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 '../../http/dynamics.dart'; +import '../../http/search.dart'; +import '../../http/user.dart'; +import '../../models/common/search_type.dart'; +import '../../utils/id_utils.dart'; +import '../../utils/utils.dart'; +import '../constants.dart'; +import 'badge.dart'; +import 'network_img_layer.dart'; // 视频卡片 - 垂直布局 class VideoCardV extends StatelessWidget { diff --git a/lib/http/bangumi.dart b/lib/http/bangumi.dart index bd20366c..91508682 100644 --- a/lib/http/bangumi.dart +++ b/lib/http/bangumi.dart @@ -1,5 +1,5 @@ -import 'package:pilipala/http/index.dart'; -import 'package:pilipala/models/bangumi/list.dart'; +import '../models/bangumi/list.dart'; +import 'index.dart'; class BangumiHttp { static Future bangumiList({int? page}) async { diff --git a/lib/http/black.dart b/lib/http/black.dart index 81a7c0c9..0c6a63ab 100644 --- a/lib/http/black.dart +++ b/lib/http/black.dart @@ -1,5 +1,5 @@ -import 'package:pilipala/http/index.dart'; -import 'package:pilipala/models/user/black.dart'; +import '../models/user/black.dart'; +import 'index.dart'; class BlackHttp { static Future blackList({required int pn, int? ps}) async { diff --git a/lib/http/danmaku.dart b/lib/http/danmaku.dart index e34320e7..0b108755 100644 --- a/lib/http/danmaku.dart +++ b/lib/http/danmaku.dart @@ -1,9 +1,6 @@ import 'package:dio/dio.dart'; -import 'package:flutter/foundation.dart'; -import 'package:pilipala/http/index.dart'; -import 'package:pilipala/models/danmaku/dm.pb.dart'; - -import 'constants.dart'; +import '../models/danmaku/dm.pb.dart'; +import 'index.dart'; class DanmakaHttp { // 获取视频弹幕 @@ -24,21 +21,23 @@ class DanmakaHttp { ); return DmSegMobileReply.fromBuffer(response.data); } + static Future shootDanmaku({ - int type = 1,//弹幕类选择(1：视频弹幕 2：漫画弹幕) - required int oid,// 视频cid - required String msg,//弹幕文本(长度小于 100 字符) - int mode = 1,// 弹幕类型(1：滚动弹幕 4：底端弹幕 5：顶端弹幕 6：逆向弹幕(不能使用） 7：高级弹幕 8：代码弹幕（不能使用） 9：BAS弹幕（pool必须为2）) + int type = 1, //弹幕类选择(1：视频弹幕 2：漫画弹幕) + required int oid, // 视频cid + required String msg, //弹幕文本(长度小于 100 字符) + int mode = + 1, // 弹幕类型(1：滚动弹幕 4：底端弹幕 5：顶端弹幕 6：逆向弹幕(不能使用） 7：高级弹幕 8：代码弹幕（不能使用） 9：BAS弹幕（pool必须为2）) // String? aid,// 稿件avid // String? bvid,// bvid与aid必须有一个 required String bvid, - int? progress,// 弹幕出现在视频内的时间（单位为毫秒，默认为0） - int? color,// 弹幕颜色(默认白色，16777215） - int? fontsize,// 弹幕字号（默认25） - int? pool,// 弹幕池选择（0：普通池 1：字幕池 2：特殊池（代码/BAS弹幕）默认普通池，0） + int? progress, // 弹幕出现在视频内的时间（单位为毫秒，默认为0） + int? color, // 弹幕颜色(默认白色，16777215） + int? fontsize, // 弹幕字号（默认25） + int? pool, // 弹幕池选择（0：普通池 1：字幕池 2：特殊池（代码/BAS弹幕）默认普通池，0） //int? rnd,// 当前时间戳*1000000（若无此项，则发送弹幕冷却时间限制为90s；若有此项，则发送弹幕冷却时间限制为5s） - int? colorful,//60001：专属渐变彩色（需要会员） - int? checkbox_type,//是否带 UP 身份标识（0：普通；4：带有标识） + int? colorful, //60001：专属渐变彩色（需要会员） + int? checkbox_type, //是否带 UP 身份标识（0：普通；4：带有标识） // String? csrf,//CSRF Token（位于 Cookie） Cookie 方式必要 // String? access_key,// APP 登录 Token APP 方式必要 }) async { diff --git a/lib/http/dynamics.dart b/lib/http/dynamics.dart index 7a22ab13..d62de12f 100644 --- a/lib/http/dynamics.dart +++ b/lib/http/dynamics.dart @@ -1,6 +1,6 @@ -import 'package:pilipala/http/index.dart'; -import 'package:pilipala/models/dynamics/result.dart'; -import 'package:pilipala/models/dynamics/up.dart'; +import '../models/dynamics/result.dart'; +import '../models/dynamics/up.dart'; +import 'index.dart'; class DynamicsHttp { static Future followDynamic({ diff --git a/lib/http/fan.dart b/lib/http/fan.dart index 932cc79f..a69f58c8 100644 --- a/lib/http/fan.dart +++ b/lib/http/fan.dart @@ -1,5 +1,5 @@ -import 'package:pilipala/http/index.dart'; -import 'package:pilipala/models/fans/result.dart'; +import '../models/fans/result.dart'; +import 'index.dart'; class FanHttp { static Future fans({int? vmid, int? pn, int? ps, String? orderType}) async { diff --git a/lib/http/follow.dart b/lib/http/follow.dart index f50762c4..316aa95a 100644 --- a/lib/http/follow.dart +++ b/lib/http/follow.dart @@ -1,5 +1,5 @@ -import 'package:pilipala/http/index.dart'; -import 'package:pilipala/models/follow/result.dart'; +import '../models/follow/result.dart'; +import 'index.dart'; class FollowHttp { static Future followings( diff --git a/lib/http/html.dart b/lib/http/html.dart index 52b228a5..eb1401c9 100644 --- a/lib/http/html.dart +++ b/lib/http/html.dart @@ -1,6 +1,6 @@ import 'package:html/dom.dart'; import 'package:html/parser.dart'; -import 'package:pilipala/http/index.dart'; +import 'index.dart'; class HtmlHttp { // article diff --git a/lib/http/init.dart b/lib/http/init.dart index 69a1d0b3..a6f3a5d1 100644 --- a/lib/http/init.dart +++ b/lib/http/init.dart @@ -1,17 +1,17 @@ // ignore_for_file: avoid_print +import 'dart:async'; import 'dart:developer'; import 'dart:io'; -import 'dart:async'; -import 'package:dio/dio.dart'; import 'package:cookie_jar/cookie_jar.dart'; +import 'package:dio/dio.dart'; 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/storage.dart'; -import 'package:pilipala/utils/utils.dart'; -import 'package:pilipala/http/constants.dart'; -import 'package:pilipala/http/interceptor.dart'; -import 'package:dio_cookie_manager/dio_cookie_manager.dart'; +import '../utils/storage.dart'; +import '../utils/utils.dart'; +import 'constants.dart'; +import 'interceptor.dart'; class Request { static final Request _instance = Request._internal(); @@ -20,25 +20,25 @@ class Request { factory Request() => _instance; Box setting = GStrorage.setting; static Box localCache = GStrorage.localCache; - late dynamic enableSystemProxy; + late bool enableSystemProxy; late String systemProxyHost; late String systemProxyPort; /// 设置cookie static setCookie() async { Box userInfoCache = GStrorage.userInfo; - var cookiePath = await Utils.getCookiePath(); - var cookieJar = PersistCookieJar( + final String cookiePath = await Utils.getCookiePath(); + final PersistCookieJar cookieJar = PersistCookieJar( ignoreExpires: true, storage: FileStorage(cookiePath), ); cookieManager = CookieManager(cookieJar); dio.interceptors.add(cookieManager); - var cookie = await cookieManager.cookieJar + final List cookie = await cookieManager.cookieJar .loadForRequest(Uri.parse(HttpString.baseUrl)); - var userInfo = userInfoCache.get('userInfoCache'); + final userInfo = userInfoCache.get('userInfoCache'); if (userInfo != null && userInfo.mid != null) { - var cookie2 = await cookieManager.cookieJar + final List cookie2 = await cookieManager.cookieJar .loadForRequest(Uri.parse(HttpString.tUrl)); if (cookie2.isEmpty) { try { @@ -57,14 +57,15 @@ class Request { log("setCookie, ${e.toString()}"); } } - var cookieString = - cookie.map((cookie) => '${cookie.name}=${cookie.value}').join('; '); + final String cookieString = cookie + .map((Cookie cookie) => '${cookie.name}=${cookie.value}') + .join('; '); dio.options.headers['cookie'] = cookieString; } // 从cookie中获取 csrf token static Future getCsrf() async { - var cookies = await cookieManager.cookieJar + List cookies = await cookieManager.cookieJar .loadForRequest(Uri.parse(HttpString.apiBaseUrl)); String token = ''; if (cookies.where((e) => e.name == 'bili_jct').isNotEmpty) { @@ -73,7 +74,7 @@ class Request { return token; } - static setOptionsHeaders(userInfo, status) { + static setOptionsHeaders(userInfo, bool status) { if (status) { dio.options.headers['x-bili-mid'] = userInfo.mid.toString(); } @@ -100,8 +101,8 @@ class Request { headers: {}, ); - enableSystemProxy = - setting.get(SettingBoxKey.enableSystemProxy, defaultValue: false); + enableSystemProxy = setting.get(SettingBoxKey.enableSystemProxy, + defaultValue: false) as bool; systemProxyHost = localCache.get(LocalCacheKey.systemProxyHost, defaultValue: ''); systemProxyPort = @@ -113,7 +114,8 @@ class Request { ..httpClientAdapter = Http2Adapter( ConnectionManager( idleTimeout: const Duration(milliseconds: 10000), - onClientCreate: (_, config) => config.onBadCertificate = (_) => true, + onClientCreate: (_, ClientSetting config) => + config.onBadCertificate = (_) => true, ), ); @@ -121,9 +123,9 @@ class Request { if (enableSystemProxy) { dio.httpClientAdapter = IOHttpClientAdapter( createHttpClient: () { - final client = HttpClient(); + final HttpClient client = HttpClient(); // Config the client. - client.findProxy = (uri) { + client.findProxy = (Uri uri) { // return 'PROXY host:port'; return 'PROXY $systemProxyHost:$systemProxyPort'; }; @@ -145,7 +147,7 @@ class Request { )); dio.transformer = BackgroundTransformer(); - dio.options.validateStatus = (status) { + dio.options.validateStatus = (int? status) { return status! >= 200 && status < 300 || HttpString.validateStatusCodes.contains(status); }; @@ -156,7 +158,7 @@ class Request { */ get(url, {data, options, cancelToken, extra}) async { Response response; - Options options = Options(); + final Options options = Options(); ResponseType resType = ResponseType.json; if (extra != null) { resType = extra!['resType'] ?? ResponseType.json; diff --git a/lib/http/interceptor.dart b/lib/http/interceptor.dart index 7b398caa..68f5742d 100644 --- a/lib/http/interceptor.dart +++ b/lib/http/interceptor.dart @@ -1,10 +1,10 @@ // ignore_for_file: avoid_print -import 'package:dio/dio.dart'; import 'package:connectivity_plus/connectivity_plus.dart'; +import 'package:dio/dio.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:hive/hive.dart'; -import 'package:pilipala/utils/storage.dart'; +import '../utils/storage.dart'; // import 'package:get/get.dart' hide Response; class ApiInterceptor extends Interceptor { @@ -21,16 +21,16 @@ class ApiInterceptor extends Interceptor { void onResponse(Response response, ResponseInterceptorHandler handler) { try { if (response.statusCode == 302) { - List locations = response.headers['location']!; + final List locations = response.headers['location']!; if (locations.isNotEmpty) { if (locations.first.startsWith('https://www.mcbbs.net')) { - final uri = Uri.parse(locations.first); - final accessKey = uri.queryParameters['access_key']; - final mid = uri.queryParameters['mid']; + final Uri uri = Uri.parse(locations.first); + final String? accessKey = uri.queryParameters['access_key']; + final String? mid = uri.queryParameters['mid']; try { Box localCache = GStrorage.localCache; - localCache.put( - LocalCacheKey.accessKey, {'mid': mid, 'value': accessKey}); + localCache.put(LocalCacheKey.accessKey, + {'mid': mid, 'value': accessKey}); } catch (_) {} } } @@ -53,47 +53,53 @@ class ApiInterceptor extends Interceptor { super.onError(err, handler); } - static Future dioError(DioException error) async { + static Future dioError(DioException error) async { switch (error.type) { case DioExceptionType.badCertificate: return '证书有误！'; case DioExceptionType.badResponse: return '服务器异常，请稍后重试！'; case DioExceptionType.cancel: - return "请求已被取消，请重新请求"; + return '请求已被取消，请重新请求'; case DioExceptionType.connectionError: return '连接错误，请检查网络设置'; case DioExceptionType.connectionTimeout: - return "网络连接超时，请检查网络设置"; + return '网络连接超时，请检查网络设置'; case DioExceptionType.receiveTimeout: - return "响应超时，请稍后重试！"; + return '响应超时，请稍后重试！'; case DioExceptionType.sendTimeout: - return "发送请求超时，请检查网络设置"; + return '发送请求超时，请检查网络设置'; case DioExceptionType.unknown: - var res = await checkConect(); - return res + " \n 网络异常，请稍后重试！"; - default: - return "Dio异常"; + final String res = await checkConect(); + return '$res \n 网络异常，请稍后重试！'; + // default: + // return 'Dio异常'; } } - static Future checkConect() async { - final connectivityResult = await (Connectivity().checkConnectivity()); + static Future checkConect() 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 ''; } } } diff --git a/lib/http/live.dart b/lib/http/live.dart index 2ae9aad7..c62fb6bd 100644 --- a/lib/http/live.dart +++ b/lib/http/live.dart @@ -1,7 +1,7 @@ -import 'package:pilipala/http/api.dart'; -import 'package:pilipala/http/init.dart'; -import 'package:pilipala/models/live/item.dart'; -import 'package:pilipala/models/live/room_info.dart'; +import '../models/live/item.dart'; +import '../models/live/room_info.dart'; +import 'api.dart'; +import 'init.dart'; class LiveHttp { static Future liveList( diff --git a/lib/http/login.dart b/lib/http/login.dart index 8d2a254e..ff3fee23 100644 --- a/lib/http/login.dart +++ b/lib/http/login.dart @@ -1,13 +1,12 @@ import 'dart:convert'; import 'dart:math'; import 'package:crypto/crypto.dart'; - import 'package:dio/dio.dart'; import 'package:encrypt/encrypt.dart'; -import 'package:pilipala/http/index.dart'; -import 'package:pilipala/models/login/index.dart'; -import 'package:pilipala/utils/login.dart'; import 'package:uuid/uuid.dart'; +import '../models/login/index.dart'; +import '../utils/login.dart'; +import 'index.dart'; class LoginHttp { static Future queryCaptcha() async { diff --git a/lib/http/member.dart b/lib/http/member.dart index 20826451..bf84b6eb 100644 --- a/lib/http/member.dart +++ b/lib/http/member.dart @@ -1,17 +1,17 @@ import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:hive/hive.dart'; -import 'package:pilipala/common/constants.dart'; -import 'package:pilipala/http/index.dart'; -import 'package:pilipala/models/dynamics/result.dart'; -import 'package:pilipala/models/follow/result.dart'; -import 'package:pilipala/models/member/archive.dart'; -import 'package:pilipala/models/member/coin.dart'; -import 'package:pilipala/models/member/info.dart'; -import 'package:pilipala/models/member/seasons.dart'; -import 'package:pilipala/models/member/tags.dart'; -import 'package:pilipala/utils/storage.dart'; -import 'package:pilipala/utils/utils.dart'; -import 'package:pilipala/utils/wbi_sign.dart'; +import '../common/constants.dart'; +import '../models/dynamics/result.dart'; +import '../models/follow/result.dart'; +import '../models/member/archive.dart'; +import '../models/member/coin.dart'; +import '../models/member/info.dart'; +import '../models/member/seasons.dart'; +import '../models/member/tags.dart'; +import '../utils/storage.dart'; +import '../utils/utils.dart'; +import '../utils/wbi_sign.dart'; +import 'index.dart'; class MemberHttp { static Future memberInfo({ diff --git a/lib/http/msg.dart b/lib/http/msg.dart index 7055d260..70af5b55 100644 --- a/lib/http/msg.dart +++ b/lib/http/msg.dart @@ -1,8 +1,8 @@ -import 'package:pilipala/http/api.dart'; -import 'package:pilipala/http/init.dart'; -import 'package:pilipala/models/msg/account.dart'; -import 'package:pilipala/models/msg/session.dart'; -import 'package:pilipala/utils/wbi_sign.dart'; +import '../models/msg/account.dart'; +import '../models/msg/session.dart'; +import '../utils/wbi_sign.dart'; +import 'api.dart'; +import 'init.dart'; class MsgHttp { // 会话列表 diff --git a/lib/http/reply.dart b/lib/http/reply.dart index 790a017f..fab433fc 100644 --- a/lib/http/reply.dart +++ b/lib/http/reply.dart @@ -1,6 +1,6 @@ -import 'package:pilipala/http/api.dart'; -import 'package:pilipala/http/init.dart'; -import 'package:pilipala/models/video/reply/data.dart'; +import '../models/video/reply/data.dart'; +import 'api.dart'; +import 'init.dart'; class ReplyHttp { static Future replyList({ diff --git a/lib/http/search.dart b/lib/http/search.dart index b94ace2c..7239f435 100644 --- a/lib/http/search.dart +++ b/lib/http/search.dart @@ -1,13 +1,12 @@ import 'dart:convert'; - import 'package:hive/hive.dart'; -import 'package:pilipala/http/index.dart'; -import 'package:pilipala/models/bangumi/info.dart'; -import 'package:pilipala/models/common/search_type.dart'; -import 'package:pilipala/models/search/hot.dart'; -import 'package:pilipala/models/search/result.dart'; -import 'package:pilipala/models/search/suggest.dart'; -import 'package:pilipala/utils/storage.dart'; +import '../models/bangumi/info.dart'; +import '../models/common/search_type.dart'; +import '../models/search/hot.dart'; +import '../models/search/result.dart'; +import '../models/search/suggest.dart'; +import '../utils/storage.dart'; +import 'index.dart'; class SearchHttp { static Box setting = GStrorage.setting; @@ -129,25 +128,28 @@ class SearchHttp { } } - static Future ab2c({int? aid, String? bvid}) async { + static Future ab2c({int? aid, String? bvid}) async { Map data = {}; if (aid != null) { data['aid'] = aid; } else if (bvid != null) { data['bvid'] = bvid; } - var res = await Request().get(Api.ab2c, data: {...data}); + final dynamic res = + await Request().get(Api.ab2c, data: {...data}); return res.data['data'].first['cid']; } - static Future bangumiInfo({int? seasonId, int? epId}) async { - Map data = {}; + static Future> bangumiInfo( + {int? seasonId, int? epId}) async { + final Map data = {}; if (seasonId != null) { data['season_id'] = seasonId; } else if (epId != null) { data['ep_id'] = epId; } - var res = await Request().get(Api.bangumiInfo, data: {...data}); + final dynamic res = + await Request().get(Api.bangumiInfo, data: {...data}); if (res.data['code'] == 0) { return { 'status': true, diff --git a/lib/http/user.dart b/lib/http/user.dart index 45da72e4..c1f86285 100644 --- a/lib/http/user.dart +++ b/lib/http/user.dart @@ -1,14 +1,13 @@ import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; -import 'package:pilipala/common/constants.dart'; -import 'package:pilipala/http/api.dart'; -import 'package:pilipala/http/init.dart'; -import 'package:pilipala/models/model_hot_video_item.dart'; -import 'package:pilipala/models/user/fav_detail.dart'; -import 'package:pilipala/models/user/fav_folder.dart'; -import 'package:pilipala/models/user/history.dart'; -import 'package:pilipala/models/user/info.dart'; -import 'package:pilipala/models/user/stat.dart'; -import 'package:pilipala/utils/wbi_sign.dart'; +import '../common/constants.dart'; +import '../models/model_hot_video_item.dart'; +import '../models/user/fav_detail.dart'; +import '../models/user/fav_folder.dart'; +import '../models/user/history.dart'; +import '../models/user/info.dart'; +import '../models/user/stat.dart'; +import 'api.dart'; +import 'init.dart'; class UserHttp { static Future userStat({required int mid}) async { diff --git a/lib/http/video.dart b/lib/http/video.dart index f97ac277..0f9ecfb3 100644 --- a/lib/http/video.dart +++ b/lib/http/video.dart @@ -1,19 +1,18 @@ import 'dart:developer'; - import 'package:hive/hive.dart'; -import 'package:pilipala/common/constants.dart'; -import 'package:pilipala/http/api.dart'; -import 'package:pilipala/http/init.dart'; -import 'package:pilipala/models/common/reply_type.dart'; -import 'package:pilipala/models/home/rcmd/result.dart'; -import 'package:pilipala/models/model_hot_video_item.dart'; -import 'package:pilipala/models/model_rec_video_item.dart'; -import 'package:pilipala/models/user/fav_folder.dart'; -import 'package:pilipala/models/video/ai.dart'; -import 'package:pilipala/models/video/play/url.dart'; -import 'package:pilipala/models/video_detail_res.dart'; -import 'package:pilipala/utils/storage.dart'; -import 'package:pilipala/utils/wbi_sign.dart'; +import '../common/constants.dart'; +import '../models/common/reply_type.dart'; +import '../models/home/rcmd/result.dart'; +import '../models/model_hot_video_item.dart'; +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_detail_res.dart'; +import '../utils/storage.dart'; +import '../utils/wbi_sign.dart'; +import 'api.dart'; +import 'init.dart'; /// res.data['code'] == 0 请求正常返回结果 /// res.data['data'] 为结果 diff --git a/lib/pages/about/index.dart b/lib/pages/about/index.dart index 17eabee5..5acfb7f3 100644 --- a/lib/pages/about/index.dart +++ b/lib/pages/about/index.dart @@ -20,7 +20,7 @@ class _AboutPageState extends State { @override Widget build(BuildContext context) { - Color outline = Theme.of(context).colorScheme.outline; + final Color outline = Theme.of(context).colorScheme.outline; TextStyle subTitleStyle = TextStyle(fontSize: 13, color: Theme.of(context).colorScheme.outline); return Scaffold( @@ -29,7 +29,6 @@ class _AboutPageState extends State { ), body: SingleChildScrollView( child: Column( - crossAxisAlignment: CrossAxisAlignment.center, children: [ Image.asset( 'assets/images/logo/logo_android_2.png', @@ -47,7 +46,7 @@ class _AboutPageState extends State { const SizedBox(height: 20), Obx( () => ListTile( - title: const Text("当前版本"), + title: const Text('当前版本'), trailing: Text(_aboutController.currentVersion.value, style: subTitleStyle), ), diff --git a/lib/pages/bangumi/introduction/controller.dart b/lib/pages/bangumi/introduction/controller.dart index f37a3310..13dd50c0 100644 --- a/lib/pages/bangumi/introduction/controller.dart +++ b/lib/pages/bangumi/introduction/controller.dart @@ -63,8 +63,8 @@ class BangumiIntroController extends GetxController { @override void onInit() { super.onInit(); - if (Get.arguments.isNotEmpty) { - if (Get.arguments.containsKey('bangumiItem')) { + if (Get.arguments.isNotEmpty as bool) { + if (Get.arguments.containsKey('bangumiItem') as bool) { preRender = true; bangumiItem = Get.arguments['bangumiItem']; // bangumiItem!['pic'] = args.pic; diff --git a/lib/pages/bangumi/introduction/view.dart b/lib/pages/bangumi/introduction/view.dart index 63c66515..f9efc66c 100644 --- a/lib/pages/bangumi/introduction/view.dart +++ b/lib/pages/bangumi/introduction/view.dart @@ -51,12 +51,11 @@ class _BangumiIntroPanelState extends State cid = widget.cid!; bangumiIntroController = Get.put(BangumiIntroController(), tag: heroTag); videoDetailCtr = Get.find(tag: heroTag); - bangumiIntroController.bangumiDetail.listen((value) { + bangumiIntroController.bangumiDetail.listen((BangumiInfoModel value) { bangumiDetail = value; }); _futureBuilderFuture = bangumiIntroController.queryBangumiIntro(); - videoDetailCtr.cid.listen((p0) { - print('🐶🐶$p0'); + videoDetailCtr.cid.listen((int p0) { cid = p0; setState(() {}); }); @@ -67,7 +66,7 @@ class _BangumiIntroPanelState extends State super.build(context); return FutureBuilder( future: _futureBuilderFuture, - builder: (context, snapshot) { + builder: (BuildContext context, AsyncSnapshot snapshot) { if (snapshot.connectionState == ConnectionState.done) { if (snapshot.data['status']) { // 请求成功 @@ -83,7 +82,7 @@ class _BangumiIntroPanelState extends State // errMsg: snapshot.data['msg'], // fn: () => Get.back(), // ); - return SizedBox(); + return const SizedBox(); } } else { return BangumiInfo( @@ -98,16 +97,16 @@ class _BangumiIntroPanelState extends State } class BangumiInfo extends StatefulWidget { - final bool loadingStatus; - final BangumiInfoModel? bangumiDetail; - final int? cid; - const BangumiInfo({ - Key? key, + super.key, this.loadingStatus = false, this.bangumiDetail, this.cid, - }) : super(key: key); + }); + + final bool loadingStatus; + final BangumiInfoModel? bangumiDetail; + final int? cid; @override State createState() => _BangumiInfoState(); @@ -123,12 +122,15 @@ class _BangumiInfoState extends State { int? cid; bool isProcessing = false; void Function()? handleState(Future Function() action) { - return isProcessing ? null : () async { - setState(() => isProcessing = true); - await action(); - setState(() => isProcessing = false); - }; + return isProcessing + ? null + : () async { + setState(() => isProcessing = true); + await action(); + setState(() => isProcessing = false); + }; } + @override void initState() { super.initState(); @@ -155,7 +157,7 @@ class _BangumiInfoState extends State { context: context, useRootNavigator: true, isScrollControlled: true, - builder: (context) { + builder: (BuildContext context) { return FavPanel(ctr: bangumiIntroController); }, ); @@ -175,7 +177,7 @@ class _BangumiInfoState extends State { @override Widget build(BuildContext context) { - ThemeData t = Theme.of(context); + final ThemeData t = Theme.of(context); return SliverPadding( padding: const EdgeInsets.only( left: StyleString.safeSpace, right: StyleString.safeSpace, top: 20), @@ -185,7 +187,6 @@ class _BangumiInfoState extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ Row( - mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start, children: [ Stack( @@ -244,7 +245,7 @@ class _BangumiInfoState extends State { EdgeInsets.zero), backgroundColor: MaterialStateProperty.resolveWith( - (states) { + (Set states) { return t .colorScheme.primaryContainer .withOpacity(0.7); @@ -386,7 +387,8 @@ class _BangumiInfoState extends State { } Widget actionGrid(BuildContext context, bangumiIntroController) { - return LayoutBuilder(builder: (context, constraints) { + return LayoutBuilder( + builder: (BuildContext context, BoxConstraints constraints) { return Material( child: Padding( padding: const EdgeInsets.only(top: 16, bottom: 8), @@ -394,7 +396,7 @@ class _BangumiInfoState extends State { height: constraints.maxWidth / 5 * 0.8, child: GridView.count( primary: false, - padding: const EdgeInsets.all(0), + padding: EdgeInsets.zero, crossAxisCount: 5, childAspectRatio: 1.25, children: [ @@ -402,7 +404,8 @@ class _BangumiInfoState extends State { () => ActionItem( icon: const Icon(FontAwesomeIcons.thumbsUp), selectIcon: const Icon(FontAwesomeIcons.solidThumbsUp), - onTap: handleState(bangumiIntroController.actionLikeVideo), + onTap: + handleState(bangumiIntroController.actionLikeVideo), selectStatus: bangumiIntroController.hasLike.value, loadingStatus: false, text: !widget.loadingStatus @@ -413,7 +416,8 @@ class _BangumiInfoState extends State { () => ActionItem( icon: const Icon(FontAwesomeIcons.b), selectIcon: const Icon(FontAwesomeIcons.b), - onTap: handleState(bangumiIntroController.actionCoinVideo), + onTap: + handleState(bangumiIntroController.actionCoinVideo), selectStatus: bangumiIntroController.hasCoin.value, loadingStatus: false, text: !widget.loadingStatus diff --git a/lib/pages/bangumi/view.dart b/lib/pages/bangumi/view.dart index a2e8ae0f..9a101f16 100644 --- a/lib/pages/bangumi/view.dart +++ b/lib/pages/bangumi/view.dart @@ -4,6 +4,7 @@ import 'package:easy_debounce/easy_throttle.dart'; import 'package:flutter/material.dart'; import 'package:flutter/rendering.dart'; import 'package:get/get.dart'; +import 'package:nil/nil.dart'; import 'package:pilipala/common/constants.dart'; import 'package:pilipala/common/widgets/http_error.dart'; import 'package:pilipala/pages/home/index.dart'; @@ -74,7 +75,7 @@ class _BangumiPageState extends State super.build(context); return RefreshIndicator( onRefresh: () async { - await _bangumidController.queryBangumiListFeed(type: 'init'); + await _bangumidController.queryBangumiListFeed(); return _bangumidController.queryBangumiFollow(); }, child: CustomScrollView( @@ -112,10 +113,11 @@ class _BangumiPageState extends State ), ), SizedBox( - height: 258, + height: 268, child: FutureBuilder( future: _futureBuilderFutureFollow, - builder: (context, snapshot) { + builder: + (BuildContext context, AsyncSnapshot snapshot) { if (snapshot.connectionState == ConnectionState.done) { if (snapshot.data == null) { @@ -156,10 +158,10 @@ class _BangumiPageState extends State ), ); } else { - return const SizedBox(); + return nil; } } else { - return const SizedBox(); + return nil; } }, ), @@ -188,7 +190,7 @@ class _BangumiPageState extends State StyleString.safeSpace, 0, StyleString.safeSpace, 0), sliver: FutureBuilder( future: _futureBuilderFuture, - builder: (context, snapshot) { + builder: (BuildContext context, AsyncSnapshot snapshot) { if (snapshot.connectionState == ConnectionState.done) { Map data = snapshot.data as Map; if (data['status']) { @@ -206,7 +208,7 @@ class _BangumiPageState extends State }, ), ), - LoadingMore() + const LoadingMore() ], ), ); @@ -228,7 +230,7 @@ class _BangumiPageState extends State (BuildContext context, int index) { return bangumiList!.isNotEmpty ? BangumiCardV(bangumiItem: bangumiList[index]) - : const SizedBox(); + : nil; }, childCount: bangumiList!.isNotEmpty ? bangumiList!.length : 10, ), diff --git a/lib/pages/bangumi/widgets/bangumi_panel.dart b/lib/pages/bangumi/widgets/bangumi_panel.dart index 6948172f..b5ec4efe 100644 --- a/lib/pages/bangumi/widgets/bangumi_panel.dart +++ b/lib/pages/bangumi/widgets/bangumi_panel.dart @@ -8,11 +8,6 @@ import 'package:pilipala/utils/storage.dart'; import 'package:scrollable_positioned_list/scrollable_positioned_list.dart'; class BangumiPanel extends StatefulWidget { - final List pages; - final int? cid; - final double? sheetHeight; - final Function? changeFuc; - const BangumiPanel({ super.key, required this.pages, @@ -21,6 +16,11 @@ class BangumiPanel extends StatefulWidget { this.changeFuc, }); + final List pages; + final int? cid; + final double? sheetHeight; + final Function? changeFuc; + @override State createState() => _BangumiPanelState(); } @@ -50,10 +50,10 @@ class _BangumiPanelState extends State { } videoDetailCtr = Get.find(tag: heroTag); - videoDetailCtr.cid.listen((p0) { + videoDetailCtr.cid.listen((int p0) { cid = p0; setState(() {}); - currentIndex = widget.pages.indexWhere((e) => e.cid == cid); + currentIndex = widget.pages.indexWhere((EpisodeItem e) => e.cid == cid); scrollToIndex(); }); } @@ -106,7 +106,8 @@ class _BangumiPanelState extends State { child: Material( child: ScrollablePositionedList.builder( itemCount: widget.pages.length, - itemBuilder: (context, index) => ListTile( + itemBuilder: (BuildContext context, int index) => + ListTile( onTap: () { setState(() { changeFucCall(widget.pages[index], index); @@ -212,78 +213,74 @@ class _BangumiPanelState extends State { SizedBox( height: 60, child: ListView.builder( - controller: listViewScrollCtr, - scrollDirection: Axis.horizontal, - itemCount: widget.pages.length, - itemExtent: 150, - itemBuilder: ((context, i) { - return Container( - width: 150, - margin: const EdgeInsets.only(right: 10), - child: Material( - color: Theme.of(context).colorScheme.onInverseSurface, - borderRadius: BorderRadius.circular(6), - clipBehavior: Clip.hardEdge, - child: InkWell( - onTap: () => changeFucCall(widget.pages[i], i), - child: Padding( - padding: const EdgeInsets.symmetric( - vertical: 8, horizontal: 10), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Row( - children: [ - if (i == currentIndex) ...[ - Image.asset( - 'assets/images/live.png', - color: - Theme.of(context).colorScheme.primary, - height: 12, - ), - const SizedBox(width: 6) - ], - Text( - '第${i + 1}话', - style: TextStyle( - fontSize: 13, - color: i == currentIndex - ? Theme.of(context) - .colorScheme - .primary - : Theme.of(context) - .colorScheme - .onSurface), + controller: listViewScrollCtr, + scrollDirection: Axis.horizontal, + itemCount: widget.pages.length, + itemExtent: 150, + itemBuilder: (BuildContext context, int i) { + return Container( + width: 150, + margin: const EdgeInsets.only(right: 10), + child: Material( + color: Theme.of(context).colorScheme.onInverseSurface, + borderRadius: BorderRadius.circular(6), + clipBehavior: Clip.hardEdge, + child: InkWell( + onTap: () => changeFucCall(widget.pages[i], i), + child: Padding( + padding: const EdgeInsets.symmetric( + vertical: 8, horizontal: 10), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + children: [ + if (i == currentIndex) ...[ + Image.asset( + 'assets/images/live.png', + color: Theme.of(context).colorScheme.primary, + height: 12, ), - const SizedBox(width: 2), - if (widget.pages[i].badge != null) ...[ - Image.asset( - 'assets/images/big-vip.png', - height: 16, - ), - ], + const SizedBox(width: 6) ], - ), - const SizedBox(height: 3), - Text( - widget.pages[i].longTitle!, - maxLines: 1, - style: TextStyle( - fontSize: 13, - color: i == currentIndex - ? Theme.of(context).colorScheme.primary - : Theme.of(context) - .colorScheme - .onSurface), - overflow: TextOverflow.ellipsis, - ) - ], - ), + Text( + '第${i + 1}话', + style: TextStyle( + fontSize: 13, + color: i == currentIndex + ? Theme.of(context).colorScheme.primary + : Theme.of(context) + .colorScheme + .onSurface), + ), + const SizedBox(width: 2), + if (widget.pages[i].badge != null) ...[ + Image.asset( + 'assets/images/big-vip.png', + height: 16, + ), + ], + ], + ), + const SizedBox(height: 3), + Text( + widget.pages[i].longTitle!, + maxLines: 1, + style: TextStyle( + fontSize: 13, + color: i == currentIndex + ? Theme.of(context).colorScheme.primary + : Theme.of(context).colorScheme.onSurface), + overflow: TextOverflow.ellipsis, + ) + ], ), ), ), - ); - })), + ), + ); + }, + ), ) ], ); diff --git a/lib/pages/bangumi/widgets/bangumu_card_v.dart b/lib/pages/bangumi/widgets/bangumu_card_v.dart index 937d9d40..c1233ddf 100644 --- a/lib/pages/bangumi/widgets/bangumu_card_v.dart +++ b/lib/pages/bangumi/widgets/bangumu_card_v.dart @@ -11,17 +11,16 @@ import 'package:pilipala/common/widgets/network_img_layer.dart'; // 视频卡片 - 垂直布局 class BangumiCardV extends StatelessWidget { - // ignore: prefer_typing_uninitialized_variables - final bangumiItem; - final Function()? longPress; - final Function()? longPressEnd; - const BangumiCardV({ - Key? key, + super.key, required this.bangumiItem, this.longPress, this.longPressEnd, - }) : super(key: key); + }); + + final bangumiItem; + final Function()? longPress; + final Function()? longPressEnd; @override Widget build(BuildContext context) { @@ -43,9 +42,9 @@ class BangumiCardV extends StatelessWidget { // }, child: InkWell( onTap: () async { - int seasonId = bangumiItem.seasonId; + final int seasonId = bangumiItem.seasonId; SmartDialog.showLoading(msg: '获取中...'); - var res = await SearchHttp.bangumiInfo(seasonId: seasonId); + final res = await SearchHttp.bangumiInfo(seasonId: seasonId); SmartDialog.dismiss().then((value) { if (res['status']) { if (res['data'].episodes.isEmpty) { @@ -81,8 +80,8 @@ class BangumiCardV extends StatelessWidget { child: AspectRatio( aspectRatio: 0.65, child: LayoutBuilder(builder: (context, boxConstraints) { - double maxWidth = boxConstraints.maxWidth; - double maxHeight = boxConstraints.maxHeight; + final double maxWidth = boxConstraints.maxWidth; + final double maxHeight = boxConstraints.maxHeight; return Stack( children: [ Hero( @@ -124,9 +123,9 @@ class BangumiCardV extends StatelessWidget { } class BangumiContent extends StatelessWidget { + const BangumiContent({super.key, required this.bangumiItem}); // ignore: prefer_typing_uninitialized_variables final bangumiItem; - const BangumiContent({Key? key, required this.bangumiItem}) : super(key: key); @override Widget build(BuildContext context) { return Expanded( diff --git a/lib/pages/blacklist/index.dart b/lib/pages/blacklist/index.dart index 09cbaee8..3bf64146 100644 --- a/lib/pages/blacklist/index.dart +++ b/lib/pages/blacklist/index.dart @@ -70,7 +70,7 @@ class _BlackListPageState extends State { onRefresh: () async => await _blackListController.queryBlacklist(), child: FutureBuilder( future: _futureBuilderFuture, - builder: (context, snapshot) { + builder: (BuildContext context, AsyncSnapshot snapshot) { if (snapshot.connectionState == ConnectionState.done) { var data = snapshot.data; if (data['status']) { diff --git a/lib/pages/danmaku/controller.dart b/lib/pages/danmaku/controller.dart index c7d627a8..11e097e1 100644 --- a/lib/pages/danmaku/controller.dart +++ b/lib/pages/danmaku/controller.dart @@ -1,26 +1,23 @@ import 'package:pilipala/http/danmaku.dart'; import 'package:pilipala/models/danmaku/dm.pb.dart'; -import 'package:pilipala/plugin/pl_player/index.dart'; class PlDanmakuController { PlDanmakuController(this.cid); final int cid; - Map> dmSegMap = {}; + Map> dmSegMap = {}; // 已请求的段落标记 List requestedSeg = []; bool get initiated => requestedSeg.isNotEmpty; - static int SEGMENT_LENGTH = 60 * 6 * 1000; + static int segmentLength = 60 * 6 * 1000; void initiate(int videoDuration, int progress) { if (requestedSeg.isEmpty) { - int segCount = (videoDuration / SEGMENT_LENGTH).ceil(); + int segCount = (videoDuration / segmentLength).ceil(); requestedSeg = List.generate(segCount, (index) => false); } - queryDanmaku( - calcSegment(progress) - ); + queryDanmaku(calcSegment(progress)); } void dispose() { @@ -29,17 +26,17 @@ class PlDanmakuController { } int calcSegment(int progress) { - return progress ~/ SEGMENT_LENGTH; + return progress ~/ segmentLength; } void queryDanmaku(int segmentIndex) async { assert(requestedSeg[segmentIndex] == false); requestedSeg[segmentIndex] = true; - DmSegMobileReply result = - await DanmakaHttp.queryDanmaku(cid: cid, segmentIndex: segmentIndex + 1); + final DmSegMobileReply result = await DanmakaHttp.queryDanmaku( + cid: cid, segmentIndex: segmentIndex + 1); if (result.elems.isNotEmpty) { for (var element in result.elems) { - int pos = element.progress ~/ 100;//每0.1秒存储一次 + int pos = element.progress ~/ 100; //每0.1秒存储一次 if (dmSegMap[pos] == null) { dmSegMap[pos] = []; } diff --git a/lib/pages/danmaku/view.dart b/lib/pages/danmaku/view.dart index 027b9dfa..5c3f97d0 100644 --- a/lib/pages/danmaku/view.dart +++ b/lib/pages/danmaku/view.dart @@ -1,4 +1,3 @@ -import 'package:easy_debounce/easy_throttle.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:hive/hive.dart'; @@ -43,15 +42,13 @@ class _PlDanmakuState extends State { super.initState(); enableShowDanmaku = setting.get(SettingBoxKey.enableShowDanmaku, defaultValue: false); - _plDanmakuController = - PlDanmakuController(widget.cid); + _plDanmakuController = PlDanmakuController(widget.cid); if (mounted) { playerController = widget.playerController; if (enableShowDanmaku || playerController.isOpenDanmu.value) { _plDanmakuController.initiate( playerController.duration.value.inMilliseconds, - playerController.position.value.inMilliseconds - ); + playerController.position.value.inMilliseconds); } playerController ..addStatusLister(playerListener) @@ -61,8 +58,7 @@ class _PlDanmakuState extends State { if (p0 && !_plDanmakuController.initiated) { _plDanmakuController.initiate( playerController.duration.value.inMilliseconds, - playerController.position.value.inMilliseconds - ); + playerController.position.value.inMilliseconds); } }); blockTypes = playerController.blockTypes; @@ -87,7 +83,7 @@ class _PlDanmakuState extends State { return; } int currentPosition = position.inMilliseconds; - currentPosition -= currentPosition % 100;//取整百的毫秒数 + currentPosition -= currentPosition % 100; //取整百的毫秒数 if (currentPosition == latestAddedPosition) { return; @@ -98,17 +94,18 @@ class _PlDanmakuState extends State { _plDanmakuController.getCurrentDanmaku(currentPosition); if (currentDanmakuList != null) { - Color? defaultColor = playerController.blockTypes.contains(6) ? - DmUtils.decimalToColor(16777215) : null; + Color? defaultColor = playerController.blockTypes.contains(6) + ? DmUtils.decimalToColor(16777215) + : null; - _controller!.addItems( - currentDanmakuList.map((e) => DanmakuItem( - e.content, - color: defaultColor ?? DmUtils.decimalToColor(e.color), - time: e.progress, - type: DmUtils.getPosition(e.mode), - )).toList() - ); + _controller!.addItems(currentDanmakuList + .map((e) => DanmakuItem( + e.content, + color: defaultColor ?? DmUtils.decimalToColor(e.color), + time: e.progress, + type: DmUtils.getPosition(e.mode), + )) + .toList()); } } @@ -137,7 +134,8 @@ class _PlDanmakuState extends State { hideTop: blockTypes.contains(5), hideScroll: blockTypes.contains(2), hideBottom: blockTypes.contains(4), - duration: danmakuDurationVal / widget.playerController.playbackSpeed, + duration: + danmakuDurationVal / widget.playerController.playbackSpeed, // initDuration / // (danmakuSpeedVal * widget.playerController.playbackSpeed), ), diff --git a/lib/pages/dynamics/deatil/controller.dart b/lib/pages/dynamics/detail/controller.dart similarity index 100% rename from lib/pages/dynamics/deatil/controller.dart rename to lib/pages/dynamics/detail/controller.dart diff --git a/lib/pages/dynamics/deatil/index.dart b/lib/pages/dynamics/detail/index.dart similarity index 100% rename from lib/pages/dynamics/deatil/index.dart rename to lib/pages/dynamics/detail/index.dart diff --git a/lib/pages/dynamics/deatil/view.dart b/lib/pages/dynamics/detail/view.dart similarity index 98% rename from lib/pages/dynamics/deatil/view.dart rename to lib/pages/dynamics/detail/view.dart index 28f70bcf..840cd33f 100644 --- a/lib/pages/dynamics/deatil/view.dart +++ b/lib/pages/dynamics/detail/view.dart @@ -8,11 +8,11 @@ import 'package:pilipala/common/skeleton/video_reply.dart'; import 'package:pilipala/common/widgets/http_error.dart'; import 'package:pilipala/models/common/reply_type.dart'; import 'package:pilipala/models/dynamics/result.dart'; -import 'package:pilipala/pages/dynamics/deatil/index.dart'; +import 'package:pilipala/pages/dynamics/detail/index.dart'; import 'package:pilipala/pages/dynamics/widgets/author_panel.dart'; import 'package:pilipala/pages/video/detail/reply/widgets/reply_item.dart'; -import 'package:pilipala/pages/video/detail/replyNew/index.dart'; -import 'package:pilipala/pages/video/detail/replyReply/index.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'; diff --git a/lib/pages/dynamics/widgets/author_panel.dart b/lib/pages/dynamics/widgets/author_panel.dart index 5276d390..0d3baecd 100644 --- a/lib/pages/dynamics/widgets/author_panel.dart +++ b/lib/pages/dynamics/widgets/author_panel.dart @@ -1,7 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.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/http/user.dart'; import 'package:pilipala/utils/feed_back.dart'; diff --git a/lib/pages/dynamics/widgets/up_panel.dart b/lib/pages/dynamics/widgets/up_panel.dart index 8a2c5dac..ba4a562d 100644 --- a/lib/pages/dynamics/widgets/up_panel.dart +++ b/lib/pages/dynamics/widgets/up_panel.dart @@ -139,7 +139,7 @@ class _UpPanelState extends State { int liveLen = liveList.length; int upLen = upList.length; double itemWidth = contentWidth + itemPadding.horizontal; - double screenWidth = MediaQuery.of(context).size.width; + double screenWidth = MediaQuery.sizeOf(context).width; double moveDistance = 0.0; if (itemWidth * (upList.length + liveList.length) <= screenWidth) { } else if ((upLen - i - 0.5) * itemWidth > screenWidth / 2) { diff --git a/lib/pages/favDetail/controller.dart b/lib/pages/fav_detail/controller.dart similarity index 100% rename from lib/pages/favDetail/controller.dart rename to lib/pages/fav_detail/controller.dart diff --git a/lib/pages/favDetail/index.dart b/lib/pages/fav_detail/index.dart similarity index 100% rename from lib/pages/favDetail/index.dart rename to lib/pages/fav_detail/index.dart diff --git a/lib/pages/favDetail/view.dart b/lib/pages/fav_detail/view.dart similarity index 99% rename from lib/pages/favDetail/view.dart rename to lib/pages/fav_detail/view.dart index fedc85fd..f5897550 100644 --- a/lib/pages/favDetail/view.dart +++ b/lib/pages/fav_detail/view.dart @@ -7,7 +7,7 @@ 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 'package:pilipala/pages/favDetail/index.dart'; +import 'package:pilipala/pages/fav_detail/index.dart'; import 'widget/fav_video_card.dart'; diff --git a/lib/pages/favDetail/widget/fav_video_card.dart b/lib/pages/fav_detail/widget/fav_video_card.dart similarity index 100% rename from lib/pages/favDetail/widget/fav_video_card.dart rename to lib/pages/fav_detail/widget/fav_video_card.dart diff --git a/lib/pages/fav_search/view.dart b/lib/pages/fav_search/view.dart index 83c2440b..37e3046f 100644 --- a/lib/pages/fav_search/view.dart +++ b/lib/pages/fav_search/view.dart @@ -3,7 +3,7 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:pilipala/common/skeleton/video_card_h.dart'; import 'package:pilipala/common/widgets/no_data.dart'; -import 'package:pilipala/pages/favDetail/widget/fav_video_card.dart'; +import 'package:pilipala/pages/fav_detail/widget/fav_video_card.dart'; import 'controller.dart'; diff --git a/lib/pages/html/view.dart b/lib/pages/html/view.dart index 478626af..9f0c865c 100644 --- a/lib/pages/html/view.dart +++ b/lib/pages/html/view.dart @@ -10,8 +10,8 @@ import 'package:pilipala/common/widgets/http_error.dart'; import 'package:pilipala/common/widgets/network_img_layer.dart'; import 'package:pilipala/models/common/reply_type.dart'; import 'package:pilipala/pages/video/detail/reply/widgets/reply_item.dart'; -import 'package:pilipala/pages/video/detail/replyNew/index.dart'; -import 'package:pilipala/pages/video/detail/replyReply/index.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 'controller.dart'; diff --git a/lib/pages/liveRoom/controller.dart b/lib/pages/live_room/controller.dart similarity index 100% rename from lib/pages/liveRoom/controller.dart rename to lib/pages/live_room/controller.dart diff --git a/lib/pages/liveRoom/index.dart b/lib/pages/live_room/index.dart similarity index 100% rename from lib/pages/liveRoom/index.dart rename to lib/pages/live_room/index.dart diff --git a/lib/pages/liveRoom/view.dart b/lib/pages/live_room/view.dart similarity index 100% rename from lib/pages/liveRoom/view.dart rename to lib/pages/live_room/view.dart diff --git a/lib/pages/liveRoom/widgets/bottom_control.dart b/lib/pages/live_room/widgets/bottom_control.dart similarity index 98% rename from lib/pages/liveRoom/widgets/bottom_control.dart rename to lib/pages/live_room/widgets/bottom_control.dart index 7347a8fc..a00f3d92 100644 --- a/lib/pages/liveRoom/widgets/bottom_control.dart +++ b/lib/pages/live_room/widgets/bottom_control.dart @@ -5,7 +5,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:hive/hive.dart'; import 'package:pilipala/models/video/play/url.dart'; -import 'package:pilipala/pages/liveRoom/index.dart'; +import 'package:pilipala/pages/live_room/index.dart'; import 'package:pilipala/plugin/pl_player/index.dart'; import 'package:pilipala/utils/storage.dart'; diff --git a/lib/pages/main/view.dart b/lib/pages/main/view.dart index 6e93bcbc..eb3444e1 100644 --- a/lib/pages/main/view.dart +++ b/lib/pages/main/view.dart @@ -88,9 +88,9 @@ class _MainAppState extends State with SingleTickerProviderStateMixin { Widget build(BuildContext context) { Box localCache = GStrorage.localCache; double statusBarHeight = MediaQuery.of(context).padding.top; - double sheetHeight = MediaQuery.of(context).size.height - + double sheetHeight = MediaQuery.sizeOf(context).height - MediaQuery.of(context).padding.top - - MediaQuery.of(context).size.width * 9 / 16; + MediaQuery.sizeOf(context).width * 9 / 16; localCache.put('sheetHeight', sheetHeight); localCache.put('statusBarHeight', statusBarHeight); return PopScope( diff --git a/lib/pages/member/view.dart b/lib/pages/member/view.dart index 785be4ee..1d3cd5c4 100644 --- a/lib/pages/member/view.dart +++ b/lib/pages/member/view.dart @@ -41,7 +41,7 @@ class _MemberPageState extends State _memberCoinsFuture = _memberController.getRecentCoinVideo(); _extendNestCtr.addListener( () { - double offset = _extendNestCtr.position.pixels; + final double offset = _extendNestCtr.position.pixels; if (offset > 100) { appbarStream.add(true); } else { @@ -67,7 +67,7 @@ class _MemberPageState extends State title: StreamBuilder( stream: appbarStream.stream, initialData: false, - builder: (context, AsyncSnapshot snapshot) { + builder: (BuildContext context, AsyncSnapshot snapshot) { return AnimatedOpacity( opacity: snapshot.data ? 1 : 0, curve: Curves.easeOut, diff --git a/lib/pages/member_archive/view.dart b/lib/pages/member_archive/view.dart index a3dd4c66..5091026e 100644 --- a/lib/pages/member_archive/view.dart +++ b/lib/pages/member_archive/view.dart @@ -87,7 +87,7 @@ class _MemberArchivePageState extends State { slivers: [ FutureBuilder( future: _futureBuilderFuture, - builder: (context, snapshot) { + builder: (BuildContext context, snapshot) { if (snapshot.connectionState == ConnectionState.done) { if (snapshot.data != null) { Map data = snapshot.data as Map; @@ -97,7 +97,7 @@ class _MemberArchivePageState extends State { () => list.isNotEmpty ? SliverList( delegate: SliverChildBuilderDelegate( - (context, index) { + (BuildContext context, index) { return VideoCardH( videoItem: list[index], showOwner: false, diff --git a/lib/pages/searchPanel/controller.dart b/lib/pages/search_panel/controller.dart similarity index 100% rename from lib/pages/searchPanel/controller.dart rename to lib/pages/search_panel/controller.dart diff --git a/lib/pages/searchPanel/index.dart b/lib/pages/search_panel/index.dart similarity index 100% rename from lib/pages/searchPanel/index.dart rename to lib/pages/search_panel/index.dart diff --git a/lib/pages/searchPanel/view.dart b/lib/pages/search_panel/view.dart similarity index 100% rename from lib/pages/searchPanel/view.dart rename to lib/pages/search_panel/view.dart diff --git a/lib/pages/searchPanel/widgets/article_panel.dart b/lib/pages/search_panel/widgets/article_panel.dart similarity index 100% rename from lib/pages/searchPanel/widgets/article_panel.dart rename to lib/pages/search_panel/widgets/article_panel.dart diff --git a/lib/pages/searchPanel/widgets/live_panel.dart b/lib/pages/search_panel/widgets/live_panel.dart similarity index 98% rename from lib/pages/searchPanel/widgets/live_panel.dart rename to lib/pages/search_panel/widgets/live_panel.dart index 6cd9f4c2..606b44f6 100644 --- a/lib/pages/searchPanel/widgets/live_panel.dart +++ b/lib/pages/search_panel/widgets/live_panel.dart @@ -16,7 +16,7 @@ Widget searchLivePanel(BuildContext context, ctr, list) { crossAxisSpacing: StyleString.cardSpace + 2, mainAxisSpacing: StyleString.cardSpace + 3, mainAxisExtent: - MediaQuery.of(context).size.width / 2 / StyleString.aspectRatio + + MediaQuery.sizeOf(context).width / 2 / StyleString.aspectRatio + 66 * MediaQuery.of(context).textScaleFactor), itemCount: list.length, itemBuilder: (context, index) { diff --git a/lib/pages/searchPanel/widgets/media_bangumi_panel.dart b/lib/pages/search_panel/widgets/media_bangumi_panel.dart similarity index 100% rename from lib/pages/searchPanel/widgets/media_bangumi_panel.dart rename to lib/pages/search_panel/widgets/media_bangumi_panel.dart diff --git a/lib/pages/searchPanel/widgets/user_panel.dart b/lib/pages/search_panel/widgets/user_panel.dart similarity index 100% rename from lib/pages/searchPanel/widgets/user_panel.dart rename to lib/pages/search_panel/widgets/user_panel.dart diff --git a/lib/pages/searchPanel/widgets/video_panel.dart b/lib/pages/search_panel/widgets/video_panel.dart similarity index 99% rename from lib/pages/searchPanel/widgets/video_panel.dart rename to lib/pages/search_panel/widgets/video_panel.dart index 6cdc7868..0b5d5eb8 100644 --- a/lib/pages/searchPanel/widgets/video_panel.dart +++ b/lib/pages/search_panel/widgets/video_panel.dart @@ -3,7 +3,7 @@ import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:get/get.dart'; import 'package:pilipala/common/widgets/video_card_h.dart'; import 'package:pilipala/models/common/search_type.dart'; -import 'package:pilipala/pages/searchPanel/index.dart'; +import 'package:pilipala/pages/search_panel/index.dart'; class SearchVideoPanel extends StatelessWidget { SearchVideoPanel({ diff --git a/lib/pages/searchResult/controller.dart b/lib/pages/search_result/controller.dart similarity index 100% rename from lib/pages/searchResult/controller.dart rename to lib/pages/search_result/controller.dart diff --git a/lib/pages/searchResult/index.dart b/lib/pages/search_result/index.dart similarity index 100% rename from lib/pages/searchResult/index.dart rename to lib/pages/search_result/index.dart diff --git a/lib/pages/searchResult/view.dart b/lib/pages/search_result/view.dart similarity index 98% rename from lib/pages/searchResult/view.dart rename to lib/pages/search_result/view.dart index ceb77190..054e2a78 100644 --- a/lib/pages/searchResult/view.dart +++ b/lib/pages/search_result/view.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:pilipala/models/common/search_type.dart'; -import 'package:pilipala/pages/searchPanel/index.dart'; +import 'package:pilipala/pages/search_panel/index.dart'; import 'controller.dart'; class SearchResultPage extends StatefulWidget { diff --git a/lib/pages/video/detail/controller.dart b/lib/pages/video/detail/controller.dart index c3bb7b4b..f36eb589 100644 --- a/lib/pages/video/detail/controller.dart +++ b/lib/pages/video/detail/controller.dart @@ -12,7 +12,7 @@ import 'package:pilipala/models/common/search_type.dart'; import 'package:pilipala/models/video/play/quality.dart'; import 'package:pilipala/models/video/play/url.dart'; import 'package:pilipala/models/video/reply/item.dart'; -import 'package:pilipala/pages/video/detail/replyReply/index.dart'; +import 'package:pilipala/pages/video/detail/reply_reply/index.dart'; import 'package:pilipala/plugin/pl_player/index.dart'; import 'package:pilipala/utils/storage.dart'; import 'package:pilipala/utils/utils.dart'; @@ -92,7 +92,7 @@ class VideoDetailController extends GetxController @override void onInit() { super.onInit(); - Map argMap = Get.arguments; + final Map argMap = Get.arguments; userInfo = userInfoCache.get('userInfoCache'); var keys = argMap.keys.toList(); if (keys.isNotEmpty) { @@ -188,8 +188,8 @@ class VideoDetailController extends GetxController /// 根据currentAudioQa 重新设置audioUrl if (currentAudioQa != null) { - AudioItem firstAudio = data.dash!.audio!.firstWhere( - (i) => i.id == currentAudioQa!.code, + final AudioItem firstAudio = data.dash!.audio!.firstWhere( + (AudioItem i) => i.id == currentAudioQa!.code, orElse: () => data.dash!.audio!.first, ); audioUrl = firstAudio.baseUrl ?? ''; @@ -246,7 +246,7 @@ class VideoDetailController extends GetxController var result = await VideoHttp.videoUrl(cid: cid.value, bvid: bvid); if (result['status']) { data = result['data']; - List allVideosList = data.dash!.video!; + final List allVideosList = data.dash!.video!; try { // 当前可播放的最高质量视频 int currentHighVideoQa = allVideosList.first.quality!.code; @@ -255,7 +255,7 @@ class VideoDetailController extends GetxController int resVideoQa = currentHighVideoQa; if (cacheVideoQa! <= currentHighVideoQa) { // 如果预设的画质低于当前最高 - List numbers = data.acceptQuality! + final List numbers = data.acceptQuality! .where((e) => e <= currentHighVideoQa) .toList(); resVideoQa = Utils.findClosestNumber(cacheVideoQa!, numbers); @@ -263,13 +263,13 @@ class VideoDetailController extends GetxController currentVideoQa = VideoQualityCode.fromCode(resVideoQa)!; /// 取出符合当前画质的videoList - List videosList = + final List videosList = allVideosList.where((e) => e.quality!.code == resVideoQa).toList(); /// 优先顺序 设置中指定解码格式 -> 当前可选的首个解码格式 - List supportFormats = data.supportFormats!; + final List supportFormats = data.supportFormats!; // 根据画质选编码格式 - List supportDecodeFormats = + final List supportDecodeFormats = supportFormats.firstWhere((e) => e.quality == resVideoQa).codecs!; // 默认从设置中取AVC currentDecodeFormats = VideoDecodeFormatsCode.fromString(cacheDecode)!; @@ -304,7 +304,7 @@ class VideoDetailController extends GetxController /// 优先顺序 设置中指定质量 -> 当前可选的最高质量 late AudioItem? firstAudio; - List audiosList = data.dash!.audio!; + final List audiosList = data.dash!.audio!; try { if (data.dash!.dolby?.audio?.isNotEmpty == true) { @@ -318,7 +318,7 @@ class VideoDetailController extends GetxController } if (audiosList.isNotEmpty) { - List numbers = audiosList.map((map) => map.id!).toList(); + final List numbers = audiosList.map((map) => map.id!).toList(); int closestNumber = Utils.findClosestNumber(cacheAudioQa, numbers); if (!numbers.contains(cacheAudioQa) && numbers.any((e) => e > cacheAudioQa)) { diff --git a/lib/pages/video/detail/introduction/controller.dart b/lib/pages/video/detail/introduction/controller.dart index 6bed1267..1230a94b 100644 --- a/lib/pages/video/detail/introduction/controller.dart +++ b/lib/pages/video/detail/introduction/controller.dart @@ -389,7 +389,7 @@ class VideoIntroController extends GetxController { SmartDialog.showToast('账号未登录'); return; } - int currentStatus = followStatus['attribute']; + final int currentStatus = followStatus['attribute']; int actionStatus = 0; switch (currentStatus) { case 0: @@ -467,7 +467,7 @@ class VideoIntroController extends GetxController { // 修改分P或番剧分集 Future changeSeasonOrbangu(bvid, cid, aid) async { // 重新获取视频资源 - VideoDetailController videoDetailCtr = + final VideoDetailController videoDetailCtr = Get.find(tag: heroTag); videoDetailCtr.bvid = bvid; videoDetailCtr.cid.value = cid; @@ -476,7 +476,7 @@ class VideoIntroController extends GetxController { // 重新请求评论 try { /// 未渲染回复组件时可能异常 - VideoReplyController videoReplyCtr = + final VideoReplyController videoReplyCtr = Get.find(tag: heroTag); videoReplyCtr.aid = aid; videoReplyCtr.queryReplyList(type: 'init'); @@ -517,29 +517,27 @@ class VideoIntroController extends GetxController { /// 列表循环或者顺序播放时，自动播放下一个 void nextPlay() { - late List episodes; + final List episodes = []; bool isPages = false; if (videoDetail.value.ugcSeason != null) { - UgcSeason ugcSeason = videoDetail.value.ugcSeason!; - List sections = ugcSeason.sections!; - episodes = []; - + final UgcSeason ugcSeason = videoDetail.value.ugcSeason!; + final List sections = ugcSeason.sections!; for (int i = 0; i < sections.length; i++) { - List episodesList = sections[i].episodes!; + final List episodesList = sections[i].episodes!; episodes.addAll(episodesList); } } else if (videoDetail.value.pages != null) { isPages = true; - List pages = videoDetail.value.pages!; - episodes = []; + final List pages = videoDetail.value.pages!; episodes.addAll(pages); } - int currentIndex = episodes.indexWhere((e) => e.cid == lastPlayCid.value); + final int currentIndex = + episodes.indexWhere((e) => e.cid == lastPlayCid.value); int nextIndex = currentIndex + 1; - VideoDetailController videoDetailCtr = + final VideoDetailController videoDetailCtr = Get.find(tag: heroTag); - PlayRepeat platRepeat = videoDetailCtr.plPlayerController.playRepeat; + final PlayRepeat platRepeat = videoDetailCtr.plPlayerController.playRepeat; // 列表循环 if (nextIndex >= episodes.length) { @@ -550,9 +548,9 @@ class VideoIntroController extends GetxController { return; } } - int cid = episodes[nextIndex].cid!; - String rBvid = isPages ? bvid : episodes[nextIndex].bvid; - int rAid = isPages ? IdUtils.bv2av(bvid) : episodes[nextIndex].aid!; + final int cid = episodes[nextIndex].cid!; + final String rBvid = isPages ? bvid : episodes[nextIndex].bvid; + final int rAid = isPages ? IdUtils.bv2av(bvid) : episodes[nextIndex].aid!; changeSeasonOrbangu(rBvid, cid, rAid); } @@ -567,7 +565,7 @@ class VideoIntroController extends GetxController { // ai总结 Future aiConclusion() async { SmartDialog.showLoading(msg: '正在生产ai总结'); - var res = await VideoHttp.aiConclusion( + final res = await VideoHttp.aiConclusion( bvid: bvid, cid: lastPlayCid.value, upMid: videoDetail.value.owner!.mid!, diff --git a/lib/pages/video/detail/introduction/view.dart b/lib/pages/video/detail/introduction/view.dart index a0d4adde..85a24cc5 100644 --- a/lib/pages/video/detail/introduction/view.dart +++ b/lib/pages/video/detail/introduction/view.dart @@ -1,5 +1,3 @@ -import 'dart:io'; - import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; import 'package:get/get.dart'; @@ -26,7 +24,7 @@ import 'widgets/page.dart'; import 'widgets/season.dart'; class VideoIntroPanel extends StatefulWidget { - const VideoIntroPanel({Key? key}) : super(key: key); + const VideoIntroPanel({super.key}); @override State createState() => _VideoIntroPanelState(); @@ -124,8 +122,8 @@ class _VideoInfoState extends State with TickerProviderStateMixin { late final VideoDetailController videoDetailCtr; late final Map videoItem; - Box localCache = GStrorage.localCache; - Box setting = GStrorage.setting; + final Box localCache = GStrorage.localCache; + final Box setting = GStrorage.setting; late double sheetHeight; late final bool loadingStatus; // 加载状态 @@ -138,12 +136,15 @@ class _VideoInfoState extends State with TickerProviderStateMixin { late bool enableAi; bool isProcessing = false; void Function()? handleState(Future Function() action) { - return isProcessing ? null : () async { - setState(() => isProcessing = true); - await action(); - setState(() => isProcessing = false); - }; + return isProcessing + ? null + : () async { + setState(() => isProcessing = true); + await action(); + setState(() => isProcessing = false); + }; } + @override void initState() { super.initState(); @@ -168,7 +169,7 @@ class _VideoInfoState extends State with TickerProviderStateMixin { SmartDialog.showToast('账号未登录'); return; } - bool enableDragQuickFav = + final bool enableDragQuickFav = setting.get(SettingBoxKey.enableQuickFav, defaultValue: false); // 快速收藏 & // 点按 收藏至默认文件夹 @@ -182,7 +183,7 @@ class _VideoInfoState extends State with TickerProviderStateMixin { context: context, useRootNavigator: true, isScrollControlled: true, - builder: (context) { + builder: (BuildContext context) { return FavPanel(ctr: videoIntroController); }, ); @@ -192,7 +193,7 @@ class _VideoInfoState extends State with TickerProviderStateMixin { context: context, useRootNavigator: true, isScrollControlled: true, - builder: (context) { + builder: (BuildContext context) { return FavPanel(ctr: videoIntroController); }, ); @@ -202,7 +203,7 @@ class _VideoInfoState extends State with TickerProviderStateMixin { context: context, useRootNavigator: true, isScrollControlled: true, - builder: (context) { + builder: (BuildContext context) { return FavPanel(ctr: videoIntroController); }, ); @@ -251,8 +252,8 @@ class _VideoInfoState extends State with TickerProviderStateMixin { @override Widget build(BuildContext context) { - ThemeData t = Theme.of(context); - Color outline = t.colorScheme.outline; + final ThemeData t = Theme.of(context); + final Color outline = t.colorScheme.outline; return SliverPadding( padding: const EdgeInsets.only( left: StyleString.safeSpace, right: StyleString.safeSpace, top: 10), @@ -333,7 +334,7 @@ class _VideoInfoState extends State with TickerProviderStateMixin { top: 6, child: GestureDetector( onTap: () async { - var res = + final res = await videoIntroController.aiConclusion(); if (res['status']) { showAiBottomSheet(); @@ -472,13 +473,14 @@ class _VideoInfoState extends State with TickerProviderStateMixin { } Widget actionGrid(BuildContext context, videoIntroController) { - return LayoutBuilder(builder: (context, constraints) { + return LayoutBuilder( + builder: (BuildContext context, BoxConstraints constraints) { return Container( margin: const EdgeInsets.only(top: 6, bottom: 4), height: constraints.maxWidth / 5 * 0.8, child: GridView.count( primary: false, - padding: const EdgeInsets.all(0), + padding: EdgeInsets.zero, crossAxisCount: 5, childAspectRatio: 1.25, children: [ @@ -543,7 +545,7 @@ class _VideoInfoState extends State with TickerProviderStateMixin { } Widget actionRow(BuildContext context, videoIntroController, videoDetailCtr) { - return Row(children: [ + return Row(children: [ Obx( () => ActionRowItem( icon: const Icon(FontAwesomeIcons.thumbsUp), diff --git a/lib/pages/video/detail/introduction/widgets/fav_panel.dart b/lib/pages/video/detail/introduction/widgets/fav_panel.dart index 68f53772..517caeaa 100644 --- a/lib/pages/video/detail/introduction/widgets/fav_panel.dart +++ b/lib/pages/video/detail/introduction/widgets/fav_panel.dart @@ -6,15 +6,15 @@ import 'package:pilipala/utils/feed_back.dart'; import 'package:pilipala/utils/storage.dart'; class FavPanel extends StatefulWidget { - final dynamic ctr; const FavPanel({super.key, this.ctr}); + final dynamic ctr; @override State createState() => _FavPanelState(); } class _FavPanelState extends State { - Box localCache = GStrorage.localCache; + final Box localCache = GStrorage.localCache; late double sheetHeight; late Future _futureBuilderFuture; @@ -45,7 +45,7 @@ class _FavPanelState extends State { child: Material( child: FutureBuilder( future: _futureBuilderFuture, - builder: (context, snapshot) { + builder: (BuildContext context, AsyncSnapshot snapshot) { if (snapshot.connectionState == ConnectionState.done) { Map data = snapshot.data as Map; if (data['status']) { @@ -109,7 +109,7 @@ class _FavPanelState extends State { ), child: Row( mainAxisAlignment: MainAxisAlignment.end, - children: [ + children: [ TextButton( onPressed: () => Get.back(), style: TextButton.styleFrom( diff --git a/lib/pages/video/detail/introduction/widgets/group_panel.dart b/lib/pages/video/detail/introduction/widgets/group_panel.dart index 0a105f9d..64ff913d 100644 --- a/lib/pages/video/detail/introduction/widgets/group_panel.dart +++ b/lib/pages/video/detail/introduction/widgets/group_panel.dart @@ -17,7 +17,7 @@ class GroupPanel extends StatefulWidget { } class _GroupPanelState extends State { - Box localCache = GStrorage.localCache; + final Box localCache = GStrorage.localCache; late double sheetHeight; late Future _futureBuilderFuture; late List tagsList; @@ -33,17 +33,20 @@ class _GroupPanelState extends State { void onSave() async { feedBack(); // 是否有选中的 有选中的带id，没选使用默认0 - bool anyHasChecked = tagsList.any((e) => e.checked == true); + final bool anyHasChecked = + tagsList.any((MemberTagItemModel e) => e.checked == true); late String tagids; if (anyHasChecked) { - List checkedList = tagsList.where((e) => e.checked == true).toList(); - List tagidList = checkedList.map((e) => e.tagid).toList(); + final List checkedList = + tagsList.where((MemberTagItemModel e) => e.checked == true).toList(); + final List tagidList = + checkedList.map((e) => e.tagid!).toList(); tagids = tagidList.join(','); } else { tagids = '0'; } // 保存 - var res = await MemberHttp.addUsers(widget.mid, tagids); + final res = await MemberHttp.addUsers(widget.mid, tagids); SmartDialog.showToast(res['msg']); if (res['status']) { Get.back(); @@ -56,7 +59,7 @@ class _GroupPanelState extends State { height: sheetHeight, color: Theme.of(context).colorScheme.background, child: Column( - children: [ + children: [ AppBar( centerTitle: false, elevation: 0, @@ -70,7 +73,7 @@ class _GroupPanelState extends State { child: Material( child: FutureBuilder( future: _futureBuilderFuture, - builder: (context, snapshot) { + builder: (BuildContext context, AsyncSnapshot snapshot) { if (snapshot.connectionState == ConnectionState.done) { Map data = snapshot.data as Map; if (data['status']) { diff --git a/lib/pages/video/detail/introduction/widgets/intro_detail.dart b/lib/pages/video/detail/introduction/widgets/intro_detail.dart index 1db23a1d..59ed10a3 100644 --- a/lib/pages/video/detail/introduction/widgets/intro_detail.dart +++ b/lib/pages/video/detail/introduction/widgets/intro_detail.dart @@ -12,12 +12,11 @@ Box localCache = GStrorage.localCache; late double sheetHeight; class IntroDetail extends StatelessWidget { - final dynamic videoDetail; - const IntroDetail({ - Key? key, + super.key, this.videoDetail, - }) : super(key: key); + }); + final dynamic videoDetail; @override Widget build(BuildContext context) { @@ -86,13 +85,11 @@ class IntroDetail extends StatelessWidget { SizedBox( width: double.infinity, child: SelectableRegion( - magnifierConfiguration: - const TextMagnifierConfiguration(), focusNode: FocusNode(), selectionControls: MaterialTextSelectionControls(), child: Column( crossAxisAlignment: CrossAxisAlignment.start, - children: [ + children: [ Text( videoDetail!.bvid!, style: const TextStyle(fontSize: 13), @@ -122,20 +119,21 @@ class IntroDetail extends StatelessWidget { } InlineSpan buildContent(BuildContext context, content) { - List descV2 = content.descV2; + final List descV2 = content.descV2; // type // 1 普通文本 // 2 @用户 - List spanChilds = List.generate(descV2.length, (index) { + final List spanChilds = List.generate(descV2.length, (index) { final currentDesc = descV2[index]; switch (currentDesc.type) { case 1: - List spanChildren = []; - RegExp urlRegExp = RegExp(r'https?://\S+\b'); - Iterable matches = urlRegExp.allMatches(currentDesc.rawText); + final List spanChildren = []; + final RegExp urlRegExp = RegExp(r'https?://\S+\b'); + final Iterable matches = + urlRegExp.allMatches(currentDesc.rawText); int previousEndIndex = 0; - for (Match match in matches) { + for (final Match match in matches) { if (match.start > previousEndIndex) { spanChildren.add(TextSpan( text: currentDesc.rawText @@ -172,11 +170,12 @@ class IntroDetail extends StatelessWidget { text: currentDesc.rawText.substring(previousEndIndex))); } - TextSpan result = TextSpan(children: spanChildren); + final TextSpan result = TextSpan(children: spanChildren); return result; case 2: - final colorSchemePrimary = Theme.of(context).colorScheme.primary; - final heroTag = Utils.makeHeroTag(currentDesc.bizId); + final Color colorSchemePrimary = + Theme.of(context).colorScheme.primary; + final String heroTag = Utils.makeHeroTag(currentDesc.bizId); return TextSpan( text: '@${currentDesc.rawText}', style: TextStyle(color: colorSchemePrimary), diff --git a/lib/pages/video/detail/introduction/widgets/menu_row.dart b/lib/pages/video/detail/introduction/widgets/menu_row.dart index 6f9cf51b..c175aff1 100644 --- a/lib/pages/video/detail/introduction/widgets/menu_row.dart +++ b/lib/pages/video/detail/introduction/widgets/menu_row.dart @@ -2,11 +2,11 @@ import 'package:flutter/material.dart'; import 'package:pilipala/utils/feed_back.dart'; class MenuRow extends StatelessWidget { - final bool? loadingStatus; const MenuRow({ - Key? key, + super.key, this.loadingStatus, - }) : super(key: key); + }); + final bool? loadingStatus; @override Widget build(BuildContext context) { @@ -50,7 +50,7 @@ class MenuRow extends StatelessWidget { } Widget actionRowLineItem( - context, Function? onTap, bool? loadingStatus, String? text, + BuildContext context, Function? onTap, bool? loadingStatus, String? text, {bool selectStatus = false}) { return Material( color: selectStatus @@ -97,18 +97,18 @@ class MenuRow extends StatelessWidget { } class ActionRowLineItem extends StatelessWidget { + const ActionRowLineItem({ + super.key, + this.selectStatus, + this.onTap, + this.text, + this.loadingStatus = false, + }); final bool? selectStatus; final Function? onTap; final bool? loadingStatus; final String? text; - const ActionRowLineItem( - {super.key, - this.selectStatus, - this.onTap, - this.text, - this.loadingStatus = false}); - @override Widget build(BuildContext context) { return Material( diff --git a/lib/pages/video/detail/introduction/widgets/page.dart b/lib/pages/video/detail/introduction/widgets/page.dart index e1fdaf09..2ba7f507 100644 --- a/lib/pages/video/detail/introduction/widgets/page.dart +++ b/lib/pages/video/detail/introduction/widgets/page.dart @@ -4,11 +4,6 @@ import 'package:pilipala/models/video_detail_res.dart'; import 'package:pilipala/pages/video/detail/index.dart'; class PagesPanel extends StatefulWidget { - final List pages; - final int? cid; - final double? sheetHeight; - final Function? changeFuc; - const PagesPanel({ super.key, required this.pages, @@ -16,6 +11,10 @@ class PagesPanel extends StatefulWidget { this.sheetHeight, this.changeFuc, }); + final List pages; + final int? cid; + final double? sheetHeight; + final Function? changeFuc; @override State createState() => _PagesPanelState(); @@ -25,7 +24,7 @@ class _PagesPanelState extends State { late List episodes; late int cid; late int currentIndex; - String heroTag = Get.arguments['heroTag']; + final String heroTag = Get.arguments['heroTag']; late VideoDetailController _videoDetailController; final ScrollController _scrollController = ScrollController(); @@ -35,11 +34,11 @@ class _PagesPanelState extends State { cid = widget.cid!; episodes = widget.pages; _videoDetailController = Get.find(tag: heroTag); - currentIndex = episodes.indexWhere((e) => e.cid == cid); - _videoDetailController.cid.listen((p0) { + currentIndex = episodes.indexWhere((Part e) => e.cid == cid); + _videoDetailController.cid.listen((int p0) { cid = p0; setState(() {}); - currentIndex = episodes.indexWhere((e) => e.cid == cid); + currentIndex = episodes.indexWhere((Part e) => e.cid == cid); }); } @@ -60,7 +59,7 @@ class _PagesPanelState extends State { @override Widget build(BuildContext context) { return Column( - children: [ + children: [ Padding( padding: const EdgeInsets.only(top: 10, bottom: 2), child: Row( @@ -133,7 +132,8 @@ class _PagesPanelState extends State { child: ListView.builder( controller: _scrollController, itemCount: episodes.length, - itemBuilder: (context, index) { + itemBuilder: + (BuildContext context, int index) { return ListTile( onTap: () { changeFucCall( @@ -191,7 +191,7 @@ class _PagesPanelState extends State { scrollDirection: Axis.horizontal, itemCount: widget.pages.length, itemExtent: 150, - itemBuilder: ((context, i) { + itemBuilder: (BuildContext context, int i) { return Container( width: 150, margin: const EdgeInsets.only(right: 10), @@ -205,8 +205,8 @@ class _PagesPanelState extends State { padding: const EdgeInsets.symmetric( vertical: 8, horizontal: 8), child: Row( - children: [ - if (i == currentIndex) ...[ + children: [ + if (i == currentIndex) ...[ Image.asset( 'assets/images/live.gif', color: Theme.of(context).colorScheme.primary, @@ -231,7 +231,7 @@ class _PagesPanelState extends State { ), ), ); - }), + }, ), ) ], diff --git a/lib/pages/video/detail/introduction/widgets/season.dart b/lib/pages/video/detail/introduction/widgets/season.dart index cb83f69c..9e5dd34f 100644 --- a/lib/pages/video/detail/introduction/widgets/season.dart +++ b/lib/pages/video/detail/introduction/widgets/season.dart @@ -6,11 +6,6 @@ import 'package:pilipala/utils/id_utils.dart'; import 'package:scrollable_positioned_list/scrollable_positioned_list.dart'; class SeasonPanel extends StatefulWidget { - final UgcSeason ugcSeason; - final int? cid; - final double? sheetHeight; - final Function? changeFuc; - const SeasonPanel({ super.key, required this.ugcSeason, @@ -18,6 +13,10 @@ class SeasonPanel extends StatefulWidget { this.sheetHeight, this.changeFuc, }); + final UgcSeason ugcSeason; + final int? cid; + final double? sheetHeight; + final Function? changeFuc; @override State createState() => _SeasonPanelState(); @@ -27,7 +26,7 @@ class _SeasonPanelState extends State { late List episodes; late int cid; late int currentIndex; - String heroTag = Get.arguments['heroTag']; + final String heroTag = Get.arguments['heroTag']; late VideoDetailController _videoDetailController; final ScrollController _scrollController = ScrollController(); final ItemScrollController itemScrollController = ItemScrollController(); @@ -41,9 +40,9 @@ class _SeasonPanelState extends State { /// 根据 cid 找到对应集，找到对应 episodes /// 有多个episodes时，只显示其中一个 /// TODO 同时显示多个合集 - List sections = widget.ugcSeason.sections!; + final List sections = widget.ugcSeason.sections!; for (int i = 0; i < sections.length; i++) { - List episodesList = sections[i].episodes!; + final List episodesList = sections[i].episodes!; for (int j = 0; j < episodesList.length; j++) { if (episodesList[j].cid == cid) { episodes = episodesList; @@ -56,22 +55,21 @@ class _SeasonPanelState extends State { // episodes = widget.ugcSeason.sections! // .firstWhere((e) => e.seasonId == widget.ugcSeason.id) // .episodes!; - currentIndex = episodes.indexWhere((e) => e.cid == cid); - _videoDetailController.cid.listen((p0) { + currentIndex = episodes.indexWhere((EpisodeItem e) => e.cid == cid); + _videoDetailController.cid.listen((int p0) { cid = p0; setState(() {}); - currentIndex = episodes.indexWhere((e) => e.cid == cid); + currentIndex = episodes.indexWhere((EpisodeItem e) => e.cid == cid); }); } - void changeFucCall(item, i) async { + void changeFucCall(item, int i) async { await widget.changeFuc!( IdUtils.av2bv(item.aid), item.cid, item.aid, ); currentIndex = i; - setState(() {}); Get.back(); setState(() {}); } @@ -84,7 +82,7 @@ class _SeasonPanelState extends State { @override Widget build(BuildContext context) { - return Builder(builder: (context) { + return Builder(builder: (BuildContext context) { return Container( margin: const EdgeInsets.only( top: 8, @@ -136,7 +134,8 @@ class _SeasonPanelState extends State { child: Material( child: ScrollablePositionedList.builder( itemCount: episodes.length, - itemBuilder: (context, index) => ListTile( + itemBuilder: (BuildContext context, int index) => + ListTile( onTap: () => changeFucCall(episodes[index], index), dense: false, @@ -174,7 +173,7 @@ class _SeasonPanelState extends State { child: Padding( padding: const EdgeInsets.fromLTRB(8, 12, 8, 12), child: Row( - children: [ + children: [ Expanded( child: Text( '合集：${widget.ugcSeason.title!}', diff --git a/lib/pages/video/detail/related/view.dart b/lib/pages/video/detail/related/view.dart index aea1abdc..5b6fdc96 100644 --- a/lib/pages/video/detail/related/view.dart +++ b/lib/pages/video/detail/related/view.dart @@ -7,13 +7,7 @@ import 'package:pilipala/common/widgets/overlay_pop.dart'; import 'package:pilipala/common/widgets/video_card_h.dart'; import './controller.dart'; -class RelatedVideoPanel extends StatefulWidget { - const RelatedVideoPanel({super.key}); - @override - State createState() => _RelatedVideoPanelState(); -} - -class _RelatedVideoPanelState extends State { +class RelatedVideoPanel extends StatelessWidget { final ReleatedController _releatedController = Get.put(ReleatedController(), tag: Get.arguments['heroTag']); @@ -21,7 +15,7 @@ class _RelatedVideoPanelState extends State { Widget build(BuildContext context) { return FutureBuilder( future: _releatedController.queryRelatedVideo(), - builder: (context, snapshot) { + builder: (BuildContext context, AsyncSnapshot snapshot) { if (snapshot.connectionState == ConnectionState.done) { if (snapshot.data == null) { return const SliverToBoxAdapter(child: SizedBox()); @@ -72,7 +66,7 @@ class _RelatedVideoPanelState extends State { OverlayEntry _createPopupDialog(videoItem) { return OverlayEntry( - builder: (context) => AnimatedDialog( + builder: (BuildContext context) => AnimatedDialog( closeFn: _releatedController.popupDialog?.remove, child: OverlayPop( videoItem: videoItem, diff --git a/lib/pages/video/detail/reply/controller.dart b/lib/pages/video/detail/reply/controller.dart index 40c26875..9e05542b 100644 --- a/lib/pages/video/detail/reply/controller.dart +++ b/lib/pages/video/detail/reply/controller.dart @@ -41,8 +41,8 @@ class VideoReplyController extends GetxController { @override void onInit() { super.onInit(); - int deaultReplySortIndex = - setting.get(SettingBoxKey.replySortType, defaultValue: 0); + final int deaultReplySortIndex = + setting.get(SettingBoxKey.replySortType, defaultValue: 0) as int; _sortType = ReplySortType.values[deaultReplySortIndex]; sortTypeTitle.value = _sortType.titles; sortTypeLabel.value = _sortType.labels; @@ -56,7 +56,7 @@ class VideoReplyController extends GetxController { if (noMore.value == '没有更多了') { return; } - var res = await ReplyHttp.replyList( + final res = await ReplyHttp.replyList( oid: aid!, pageNum: currentPage + 1, ps: ps, @@ -64,7 +64,7 @@ class VideoReplyController extends GetxController { sort: _sortType.index, ); if (res['status']) { - List replies = res['data'].replies; + final List replies = res['data'].replies; if (replies.isNotEmpty) { noMore.value = '加载中...'; @@ -84,9 +84,8 @@ class VideoReplyController extends GetxController { if (type == 'init') { // 添加置顶回复 if (res['data'].upper.top != null) { - bool flag = res['data'] - .topReplies - .any((reply) => reply.rpid == res['data'].upper.top.rpid); + final bool flag = res['data'].topReplies.any((ReplyItemModel reply) => + reply.rpid == res['data'].upper.top.rpid) as bool; if (!flag) { replies.insert(0, res['data'].upper.top); } diff --git a/lib/pages/video/detail/reply/view.dart b/lib/pages/video/detail/reply/view.dart index 827fc3f9..7232ebab 100644 --- a/lib/pages/video/detail/reply/view.dart +++ b/lib/pages/video/detail/reply/view.dart @@ -8,7 +8,7 @@ import 'package:pilipala/common/skeleton/video_reply.dart'; import 'package:pilipala/common/widgets/http_error.dart'; import 'package:pilipala/models/common/reply_type.dart'; import 'package:pilipala/pages/video/detail/index.dart'; -import 'package:pilipala/pages/video/detail/replyNew/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 'controller.dart'; @@ -107,7 +107,7 @@ class _VideoReplyPanelState extends State // 展示二级回复 void replyReply(replyItem) { - VideoDetailController videoDetailCtr = + final VideoDetailController videoDetailCtr = Get.find(tag: heroTag); if (replyItem != null) { videoDetailCtr.oid = replyItem.oid; @@ -193,7 +193,7 @@ class _VideoReplyPanelState extends State ), FutureBuilder( future: _futureBuilderFuture, - builder: (context, snapshot) { + builder: (BuildContext context, snapshot) { if (snapshot.connectionState == ConnectionState.done) { var data = snapshot.data; if (data['status']) { @@ -203,13 +203,13 @@ class _VideoReplyPanelState extends State _videoReplyController.replyList.isEmpty ? SliverList( delegate: SliverChildBuilderDelegate( - (context, index) { + (BuildContext context, index) { return const VideoReplySkeleton(); }, childCount: 5), ) : SliverList( delegate: SliverChildBuilderDelegate( - (context, index) { + (BuildContext context, index) { double bottom = MediaQuery.of(context).padding.bottom; if (index == @@ -262,7 +262,8 @@ class _VideoReplyPanelState extends State } else { // 骨架屏 return SliverList( - delegate: SliverChildBuilderDelegate((context, index) { + delegate: SliverChildBuilderDelegate( + (BuildContext context, index) { return const VideoReplySkeleton(); }, childCount: 5), ); @@ -318,12 +319,11 @@ class _VideoReplyPanelState extends State } class _MySliverPersistentHeaderDelegate extends SliverPersistentHeaderDelegate { + _MySliverPersistentHeaderDelegate({required this.child}); final double _minExtent = 45; final double _maxExtent = 45; final Widget child; - _MySliverPersistentHeaderDelegate({required this.child}); - @override Widget build( BuildContext context, double shrinkOffset, bool overlapsContent) { diff --git a/lib/pages/video/detail/reply/widgets/reply_item.dart b/lib/pages/video/detail/reply/widgets/reply_item.dart index cf172877..7a30074b 100644 --- a/lib/pages/video/detail/reply/widgets/reply_item.dart +++ b/lib/pages/video/detail/reply/widgets/reply_item.dart @@ -9,7 +9,7 @@ import 'package:pilipala/models/common/reply_type.dart'; import 'package:pilipala/models/video/reply/item.dart'; import 'package:pilipala/pages/preview/index.dart'; import 'package:pilipala/pages/video/detail/index.dart'; -import 'package:pilipala/pages/video/detail/replyNew/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'; @@ -27,8 +27,8 @@ class ReplyItem extends StatelessWidget { this.showReplyRow = true, this.replyReply, this.replyType, - Key? key, - }) : super(key: key); + super.key, + }); final ReplyItemModel? replyItem; final Function? addReply; final String? replyLevel; @@ -68,7 +68,7 @@ class ReplyItem extends StatelessWidget { ); } - Widget lfAvtar(context, heroTag) { + Widget lfAvtar(BuildContext context, String heroTag) { return Stack( children: [ Hero( @@ -117,8 +117,8 @@ class ReplyItem extends StatelessWidget { ); } - Widget content(context) { - String heroTag = Utils.makeHeroTag(replyItem!.mid); + Widget content(BuildContext context) { + final String heroTag = Utils.makeHeroTag(replyItem!.mid); return Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ @@ -260,7 +260,7 @@ class ReplyItem extends StatelessWidget { ], ), Row( - children: [ + children: [ Text( Utils.dateFormat(replyItem!.ctime), style: TextStyle( @@ -291,7 +291,6 @@ class ReplyItem extends StatelessWidget { Container( margin: const EdgeInsets.only(top: 10, left: 45, right: 6, bottom: 4), child: SelectableRegion( - magnifierConfiguration: const TextMagnifierConfiguration(), focusNode: FocusNode(), selectionControls: MaterialTextSelectionControls(), child: Text.rich( @@ -340,9 +339,9 @@ class ReplyItem extends StatelessWidget { } // 感谢、回复、复制 - Widget bottonAction(context, replyControl) { + Widget bottonAction(BuildContext context, replyControl) { return Row( - children: [ + children: [ const SizedBox(width: 32), SizedBox( height: 32, @@ -422,7 +421,7 @@ class ReplyItemRow extends StatelessWidget { this.replyItem, this.replyReply, }); - List? replies; + final List? replies; ReplyControl? replyControl; // int? f_rpid; ReplyItemModel? replyItem; @@ -430,8 +429,8 @@ class ReplyItemRow extends StatelessWidget { @override Widget build(BuildContext context) { - bool isShow = replyControl!.isShow!; - int extraRow = replyControl != null && isShow ? 1 : 0; + final bool isShow = replyControl!.isShow!; + final int extraRow = replyControl != null && isShow ? 1 : 0; return Container( margin: const EdgeInsets.only(left: 42, right: 4, top: 0), child: Material( @@ -443,7 +442,7 @@ class ReplyItemRow extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ if (replies!.isNotEmpty) - for (var i = 0; i < replies!.length; i++) ...[ + for (int i = 0; i < replies!.length; i++) ...[ InkWell( // 一楼点击评论展开评论详情 onTap: () => replyReply!(replyItem), @@ -472,7 +471,7 @@ class ReplyItemRow extends StatelessWidget { recognizer: TapGestureRecognizer() ..onTap = () { feedBack(); - String heroTag = + final String heroTag = Utils.makeHeroTag(replies![i].member.mid); Get.toNamed( '/member?mid=${replies![i].member.mid}', @@ -539,7 +538,7 @@ InlineSpan buildContent( // replyItem 当前回复内容 // replyReply 查看二楼回复（回复详情）回调 // fReplyItem 父级回复内容，用作二楼回复（回复详情）展示 - var content = replyItem.content; + final content = replyItem.content; if (content.emote.isEmpty && content.atNameToMid.isEmpty && content.jumpUrl.isEmpty && @@ -552,7 +551,7 @@ InlineSpan buildContent( () => replyReply(replyItem.root == 0 ? replyItem : fReplyItem), ); } - List spanChilds = []; + final List spanChilds = []; bool hasMatchMember = true; // 投票 @@ -590,11 +589,11 @@ InlineSpan buildContent( content.message.splitMapJoin( RegExp(r"\[.*?\]"), onMatch: (Match match) { - String matchStr = match[0]!; + final String matchStr = match[0]!; if (content.emote.isNotEmpty && matchStr.indexOf('[') == matchStr.lastIndexOf('[') && matchStr.indexOf(']') == matchStr.lastIndexOf(']')) { - int size = content.emote[matchStr]['meta']['size']; + final int size = content.emote[matchStr]['meta']['size']; if (content.emote.keys.contains(matchStr)) { spanChilds.add( WidgetSpan( @@ -628,7 +627,7 @@ InlineSpan buildContent( // 匹配@用户 String matchMember = str; if (content.atNameToMid.isNotEmpty) { - List atNameToMidKeys = content.atNameToMid.keys.toList(); + final List atNameToMidKeys = content.atNameToMid.keys.toList(); RegExp reg = RegExp(atNameToMidKeys.map((key) => key).join('|')); // if (!content.message.contains(':')) { // reg = RegExp(r"@.*( |:)"); @@ -667,7 +666,7 @@ InlineSpan buildContent( ), recognizer: TapGestureRecognizer() ..onTap = () { - String heroTag = Utils.makeHeroTag(value); + final String heroTag = Utils.makeHeroTag(value); Get.toNamed( '/member?mid=$value', arguments: {'face': '', 'heroTag': heroTag}, @@ -693,8 +692,8 @@ InlineSpan buildContent( // 匹配 jumpUrl String matchUrl = matchMember; if (content.jumpUrl.isNotEmpty && hasMatchMember) { - List urlKeys = content.jumpUrl.keys.toList().reversed.toList(); - for (var index = 0; index < urlKeys.length; index++) { + 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('?', '\\?'); @@ -711,14 +710,14 @@ InlineSpan buildContent( RegExp(urlKeys.map((key) => key).join("|")), // RegExp('What does the fox say\\?'), onMatch: (Match match) { - String matchStr = match[0]!; + final String matchStr = match[0]!; String appUrlSchema = ''; if (content.jumpUrl[matchStr] != null) { appUrlSchema = content.jumpUrl[matchStr]['app_url_schema']; } // 默认不显示关键词 - bool enableWordRe = - setting.get(SettingBoxKey.enableWordRe, defaultValue: false); + final bool enableWordRe = setting.get(SettingBoxKey.enableWordRe, + defaultValue: false) as bool; if (content.jumpUrl[matchStr] != null) { spanChilds.add( TextSpan( @@ -731,9 +730,9 @@ InlineSpan buildContent( recognizer: TapGestureRecognizer() ..onTap = () { if (appUrlSchema == '') { - String str = Uri.parse(matchStr).pathSegments[0]; - Map matchRes = IdUtils.matchAvorBv(input: str); - List matchKeys = matchRes.keys.toList(); + 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( @@ -834,8 +833,8 @@ InlineSpan buildContent( // 图片渲染 if (content.pictures.isNotEmpty) { - List picList = []; - int len = content.pictures.length; + final List picList = []; + final int len = content.pictures.length; if (len == 1) { Map pictureItem = content.pictures.first; picList.add(pictureItem['img_src']); @@ -843,13 +842,13 @@ InlineSpan buildContent( spanChilds.add( WidgetSpan( child: LayoutBuilder( - builder: (context, BoxConstraints box) { + builder: (BuildContext context, BoxConstraints box) { return GestureDetector( onTap: () { showDialog( useSafeArea: false, context: context, - builder: (context) { + builder: (BuildContext context) { return ImagePreview(initialPage: 0, imgList: picList); }, ); diff --git a/lib/pages/video/detail/reply/widgets/zan.dart b/lib/pages/video/detail/reply/widgets/zan.dart index b9ead14e..234550be 100644 --- a/lib/pages/video/detail/reply/widgets/zan.dart +++ b/lib/pages/video/detail/reply/widgets/zan.dart @@ -25,12 +25,12 @@ class _ZanButtonState extends State { Future onLikeReply() async { feedBack(); // SmartDialog.showLoading(msg: 'pilipala ...'); - ReplyItemModel replyItem = widget.replyItem!; - int oid = replyItem.oid!; - int rpid = replyItem.rpid!; + final ReplyItemModel replyItem = widget.replyItem!; + final int oid = replyItem.oid!; + final int rpid = replyItem.rpid!; // 1 已点赞 2 不喜欢 0 未操作 - int action = replyItem.action == 0 ? 1 : 0; - var res = await ReplyHttp.likeReply( + final int action = replyItem.action == 0 ? 1 : 0; + final res = await ReplyHttp.likeReply( type: widget.replyType!.index, oid: oid, rpid: rpid, action: action); // SmartDialog.dismiss(); if (res['status']) { @@ -47,19 +47,23 @@ class _ZanButtonState extends State { SmartDialog.showToast(res['msg']); } } + bool isProcessing = false; void Function()? handleState(Future Function() action) { - return isProcessing ? null : () async { - setState(() => isProcessing = true); - await action(); - setState(() => isProcessing = false); - }; + return isProcessing + ? null + : () async { + setState(() => isProcessing = true); + await action(); + setState(() => isProcessing = false); + }; } @override Widget build(BuildContext context) { - var color = Theme.of(context).colorScheme.outline; - var primary = Theme.of(context).colorScheme.primary; + final ThemeData t = Theme.of(context); + final Color color = t.colorScheme.outline; + final Color primary = t.colorScheme.primary; return SizedBox( height: 32, child: TextButton( @@ -79,12 +83,14 @@ class _ZanButtonState extends State { transitionBuilder: (Widget child, Animation animation) { return ScaleTransition(scale: animation, child: child); }, - child: Text(widget.replyItem!.like.toString(), - key: ValueKey(widget.replyItem!.like!), - style: TextStyle( - color: widget.replyItem!.action == 1 ? primary : color, - fontSize: - Theme.of(context).textTheme.labelSmall!.fontSize)), + child: Text( + widget.replyItem!.like.toString(), + key: ValueKey(widget.replyItem!.like!), + style: TextStyle( + color: widget.replyItem!.action == 1 ? primary : color, + fontSize: t.textTheme.labelSmall!.fontSize, + ), + ), ), ], ), diff --git a/lib/pages/video/detail/replyNew/index.dart b/lib/pages/video/detail/reply_new/index.dart similarity index 100% rename from lib/pages/video/detail/replyNew/index.dart rename to lib/pages/video/detail/reply_new/index.dart diff --git a/lib/pages/video/detail/replyNew/view.dart b/lib/pages/video/detail/reply_new/view.dart similarity index 100% rename from lib/pages/video/detail/replyNew/view.dart rename to lib/pages/video/detail/reply_new/view.dart diff --git a/lib/pages/video/detail/replyReply/controller.dart b/lib/pages/video/detail/reply_reply/controller.dart similarity index 95% rename from lib/pages/video/detail/replyReply/controller.dart rename to lib/pages/video/detail/reply_reply/controller.dart index 6ce3722f..0d5b4488 100644 --- a/lib/pages/video/detail/replyReply/controller.dart +++ b/lib/pages/video/detail/reply_reply/controller.dart @@ -31,14 +31,14 @@ class VideoReplyReplyController extends GetxController { currentPage = 0; } isLoadingMore = true; - var res = await ReplyHttp.replyReplyList( + final res = await ReplyHttp.replyReplyList( oid: aid!, root: rpid!, pageNum: currentPage + 1, type: replyType.index, ); if (res['status']) { - List replies = res['data'].replies; + final List replies = res['data'].replies; if (replies.isNotEmpty) { noMore.value = '加载中...'; if (replyList.length == res['data'].page.count) { diff --git a/lib/pages/video/detail/replyReply/index.dart b/lib/pages/video/detail/reply_reply/index.dart similarity index 100% rename from lib/pages/video/detail/replyReply/index.dart rename to lib/pages/video/detail/reply_reply/index.dart diff --git a/lib/pages/video/detail/replyReply/view.dart b/lib/pages/video/detail/reply_reply/view.dart similarity index 95% rename from lib/pages/video/detail/replyReply/view.dart rename to lib/pages/video/detail/reply_reply/view.dart index f2a72faf..c08c81cc 100644 --- a/lib/pages/video/detail/replyReply/view.dart +++ b/lib/pages/video/detail/reply_reply/view.dart @@ -12,13 +12,6 @@ import 'package:pilipala/utils/storage.dart'; import 'controller.dart'; class VideoReplyReplyPanel extends StatefulWidget { - final int? oid; - final int? rpid; - final Function? closePanel; - final ReplyItemModel? firstFloor; - final String? source; - final ReplyType? replyType; - const VideoReplyReplyPanel({ this.oid, this.rpid, @@ -28,6 +21,12 @@ class VideoReplyReplyPanel extends StatefulWidget { this.replyType, super.key, }); + final int? oid; + final int? rpid; + final Function? closePanel; + final ReplyItemModel? firstFloor; + final String? source; + final ReplyType? replyType; @override State createState() => _VideoReplyReplyPanelState(); @@ -36,7 +35,7 @@ class VideoReplyReplyPanel extends StatefulWidget { class _VideoReplyReplyPanelState extends State { late VideoReplyReplyController _videoReplyReplyController; late AnimationController replyAnimationCtl; - Box localCache = GStrorage.localCache; + final Box localCache = GStrorage.localCache; late double sheetHeight; Future? _futureBuilderFuture; late ScrollController scrollController; @@ -87,7 +86,7 @@ class _VideoReplyReplyPanelState extends State { padding: const EdgeInsets.only(left: 12, right: 2), child: Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ + children: [ const Text('评论详情'), IconButton( icon: const Icon(Icons.close, size: 20), @@ -138,15 +137,15 @@ class _VideoReplyReplyPanelState extends State { ], FutureBuilder( future: _futureBuilderFuture, - builder: (context, snapshot) { + builder: (BuildContext context, snapshot) { if (snapshot.connectionState == ConnectionState.done) { - Map data = snapshot.data as Map; + final Map data = snapshot.data as Map; if (data['status']) { // 请求成功 return Obx( () => SliverList( delegate: SliverChildBuilderDelegate( - (context, index) { + (BuildContext context, int index) { if (index == _videoReplyReplyController .replyList.length) { @@ -204,8 +203,8 @@ class _VideoReplyReplyPanelState extends State { } else { // 骨架屏 return SliverList( - delegate: - SliverChildBuilderDelegate((context, index) { + delegate: SliverChildBuilderDelegate( + (BuildContext context, int index) { return const VideoReplySkeleton(); }, childCount: 8), ); diff --git a/lib/pages/video/detail/view.dart b/lib/pages/video/detail/view.dart index cd66d50c..04d600dc 100644 --- a/lib/pages/video/detail/view.dart +++ b/lib/pages/video/detail/view.dart @@ -8,6 +8,7 @@ import 'package:flutter_smart_dialog/flutter_smart_dialog.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'; @@ -47,16 +48,16 @@ class _VideoDetailPageState extends State PlayerStatus playerStatus = PlayerStatus.playing; double doubleOffset = 0; - Box localCache = GStrorage.localCache; - Box setting = GStrorage.setting; + final Box localCache = GStrorage.localCache; + final Box setting = GStrorage.setting; late double statusBarHeight; - final videoHeight = Get.size.width * 9 / 16; + final double videoHeight = Get.size.width * 9 / 16; late Future _futureBuilderFuture; // 自动退出全屏 late bool autoExitFullcreen; late bool autoPlayEnable; late bool autoPiP; - final floating = Floating(); + final Floating floating = Floating(); // 生命周期监听 late final AppLifecycleListener _lifecycleListener; @@ -105,7 +106,7 @@ class _VideoDetailPageState extends State appbarStream = StreamController(); _extendNestCtr.addListener( () { - double offset = _extendNestCtr.position.pixels; + final double offset = _extendNestCtr.position.pixels; appbarStream.add(offset); }, ); @@ -202,7 +203,8 @@ class _VideoDetailPageState extends State // 离开当前页面时 void didPushNext() async { /// 开启 - if (setting.get(SettingBoxKey.enableAutoBrightness, defaultValue: false)) { + if (setting.get(SettingBoxKey.enableAutoBrightness, defaultValue: false) + as bool) { videoDetailController.brightness = plPlayerController!.brightness.value; } if (plPlayerController != null) { @@ -218,7 +220,7 @@ class _VideoDetailPageState extends State // 返回当前页面时 void didPopNext() async { videoDetailController.isFirstTime = false; - bool autoplay = autoPlayEnable; + final bool autoplay = autoPlayEnable; videoDetailController.playerInit(autoplay: autoplay); /// 未开启自动播放时，未播放跳转下一页返回/播放后跳转下一页返回 @@ -238,7 +240,7 @@ class _VideoDetailPageState extends State void didChangeDependencies() { super.didChangeDependencies(); VideoDetailPage.routeObserver - .subscribe(this, ModalRoute.of(context) as PageRoute); + .subscribe(this, ModalRoute.of(context)! as PageRoute); } void _handleTransition(String name) { @@ -253,8 +255,8 @@ class _VideoDetailPageState extends State } void autoEnterPip() { - var routePath = Get.currentRoute; - bool isPortrait = + final String routePath = Get.currentRoute; + final bool isPortrait = MediaQuery.of(context).orientation == Orientation.portrait; /// TODO 横屏全屏状态下误触pip @@ -269,7 +271,7 @@ class _VideoDetailPageState extends State @override Widget build(BuildContext context) { - final videoHeight = MediaQuery.of(context).size.width * 9 / 16; + final double videoHeight = MediaQuery.sizeOf(context).width * 9 / 16; final double pinnedHeaderHeight = statusBarHeight + kToolbarHeight + videoHeight; if (MediaQuery.of(context).orientation == Orientation.landscape || @@ -303,19 +305,20 @@ class _VideoDetailPageState extends State headerSliverBuilder: (BuildContext _context, bool innerBoxIsScrolled) { return [ - Obx(() => SliverAppBar( + Obx( + () => SliverAppBar( automaticallyImplyLeading: false, // 假装使用一个非空变量，避免Obx检测不到而罢工 - pinned: videoDetailController - .autoPlay.value ^ false ^ videoDetailController - .autoPlay.value, + 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.of(context).size.height - + ? MediaQuery.sizeOf(context).height - (MediaQuery.of(context).orientation == Orientation.landscape ? 0 @@ -338,14 +341,17 @@ class _VideoDetailPageState extends State } }, child: LayoutBuilder( - builder: (context, boxConstraints) { - double maxWidth = boxConstraints.maxWidth; - double maxHeight = boxConstraints.maxHeight; + builder: (BuildContext context, + BoxConstraints boxConstraints) { + final double maxWidth = boxConstraints.maxWidth; + final double maxHeight = + boxConstraints.maxHeight; return Stack( - children: [ + children: [ FutureBuilder( future: _futureBuilderFuture, - builder: ((context, snapshot) { + builder: (BuildContext context, + AsyncSnapshot snapshot) { if (snapshot.hasData && snapshot.data['status']) { return Obx( @@ -378,7 +384,7 @@ class _VideoDetailPageState extends State } else { return const SizedBox(); } - }), + }, ), Obx( @@ -418,6 +424,8 @@ class _VideoDetailPageState extends State child: AppBar( primary: false, foregroundColor: Colors.white, + elevation: 0, + scrolledUnderElevation: 0, backgroundColor: Colors.transparent, actions: [ @@ -468,7 +476,9 @@ class _VideoDetailPageState extends State ); }, )), - ))), + ), + ), + ), ]; }, // pinnedHeaderSliverHeightBuilder: () { @@ -479,11 +489,11 @@ class _VideoDetailPageState extends State /// 不收回 pinnedHeaderSliverHeightBuilder: () { return plPlayerController?.isFullScreen.value == true - ? MediaQuery.of(context).size.height + ? MediaQuery.sizeOf(context).height : pinnedHeaderHeight; }, onlyOneScrollInBody: true, - body: Container( + body: ColoredBox( key: Key(heroTag), color: Theme.of(context).colorScheme.background, child: Column( @@ -509,9 +519,9 @@ class _VideoDetailPageState extends State Expanded( child: TabBarView( controller: videoDetailController.tabCtr, - children: [ + children: [ Builder( - builder: (context) { + builder: (BuildContext context) { return CustomScrollView( key: const PageStorageKey('简介'), slivers: [ @@ -544,7 +554,7 @@ class _VideoDetailPageState extends State .withOpacity(0.06), ), ), - const RelatedVideoPanel(), + RelatedVideoPanel(), ], ); }, @@ -581,7 +591,7 @@ class _VideoDetailPageState extends State Widget childWhenEnabled = FutureBuilder( key: Key(heroTag), future: _futureBuilderFuture, - builder: ((context, snapshot) { + builder: (BuildContext context, AsyncSnapshot snapshot) { if (snapshot.hasData && snapshot.data['status']) { return Obx( () => !videoDetailController.autoPlay.value @@ -603,9 +613,9 @@ class _VideoDetailPageState extends State ), ); } else { - return const SizedBox(); + return nil; } - }), + }, ); if (Platform.isAndroid) { return PiPSwitcher( diff --git a/lib/pages/video/detail/widgets/app_bar.dart b/lib/pages/video/detail/widgets/app_bar.dart index fb7822fb..17f4bec7 100644 --- a/lib/pages/video/detail/widgets/app_bar.dart +++ b/lib/pages/video/detail/widgets/app_bar.dart @@ -16,7 +16,7 @@ class ScrollAppBar extends StatelessWidget { @override Widget build(BuildContext context) { final double statusBarHeight = MediaQuery.of(context).padding.top; - final videoHeight = MediaQuery.of(context).size.width * 9 / 16; + final videoHeight = MediaQuery.sizeOf(context).width * 9 / 16; return Positioned( top: -videoHeight + scrollVal + kToolbarHeight + 0.5, left: 0, diff --git a/lib/pages/video/detail/widgets/header_control.dart b/lib/pages/video/detail/widgets/header_control.dart index c07afbb6..0fb3c373 100644 --- a/lib/pages/video/detail/widgets/header_control.dart +++ b/lib/pages/video/detail/widgets/header_control.dart @@ -19,15 +19,15 @@ import 'package:pilipala/utils/storage.dart'; import 'package:pilipala/http/danmaku.dart'; class HeaderControl extends StatefulWidget implements PreferredSizeWidget { - final PlPlayerController? controller; - final VideoDetailController? videoDetailCtr; - final Floating? floating; const HeaderControl({ this.controller, this.videoDetailCtr, this.floating, - Key? key, - }) : super(key: key); + super.key, + }); + final PlPlayerController? controller; + final VideoDetailController? videoDetailCtr; + final Floating? floating; @override State createState() => _HeaderControlState(); @@ -42,9 +42,9 @@ class _HeaderControlState extends State { TextStyle subTitleStyle = const TextStyle(fontSize: 12); TextStyle titleStyle = const TextStyle(fontSize: 14); Size get preferredSize => const Size(double.infinity, kToolbarHeight); - Box localCache = GStrorage.localCache; - Box videoStorage = GStrorage.video; - late List speedsList; + final Box localCache = GStrorage.localCache; + final Box videoStorage = GStrorage.video; + late List speedsList; double buttonSpace = 8; @override @@ -71,7 +71,7 @@ class _HeaderControlState extends State { ), margin: const EdgeInsets.all(12), child: Column( - children: [ + children: [ SizedBox( height: 35, child: Center( @@ -118,7 +118,7 @@ class _HeaderControlState extends State { // ), ListTile( onTap: () async { - var res = await UserHttp.toViewLater( + final res = await UserHttp.toViewLater( bvid: widget.videoDetailCtr!.bvid); SmartDialog.showToast(res['msg']); Get.back(); @@ -187,11 +187,12 @@ class _HeaderControlState extends State { bool isSending = false; // 追踪是否正在发送 showDialog( context: Get.context!, - builder: (context) { + builder: (BuildContext context) { // TODO: 支持更多类型和颜色的弹幕 return AlertDialog( title: const Text('发送弹幕（测试）'), - content: StatefulBuilder(builder: (context, StateSetter setState) { + content: StatefulBuilder( + builder: (BuildContext context, StateSetter setState) { return TextField( controller: textController, ); @@ -204,12 +205,13 @@ class _HeaderControlState extends State { style: TextStyle(color: Theme.of(context).colorScheme.outline), ), ), - StatefulBuilder(builder: (context, StateSetter setState) { + StatefulBuilder( + builder: (BuildContext context, StateSetter setState) { return TextButton( onPressed: isSending ? null : () async { - String msg = textController.text; + final String msg = textController.text; if (msg.isEmpty) { SmartDialog.showToast('弹幕内容不能为空'); return; @@ -222,10 +224,10 @@ class _HeaderControlState extends State { }); //修改按钮文字 // SmartDialog.showToast('弹幕发送中,\n$msg'); - dynamic res = await DanmakaHttp.shootDanmaku( - oid: widget.videoDetailCtr!.cid!.value, + final dynamic res = await DanmakaHttp.shootDanmaku( + oid: widget.videoDetailCtr!.cid.value, msg: textController.text, - bvid: widget.videoDetailCtr!.bvid!, + bvid: widget.videoDetailCtr!.bvid, progress: widget.controller!.position.value.inMilliseconds, type: 1, @@ -262,20 +264,20 @@ class _HeaderControlState extends State { /// 选择倍速 void showSetSpeedSheet() { - double currentSpeed = widget.controller!.playbackSpeed; + final double currentSpeed = widget.controller!.playbackSpeed; showDialog( context: Get.context!, - builder: (context) { + builder: (BuildContext context) { return AlertDialog( title: const Text('播放速度'), - content: StatefulBuilder(builder: (context, StateSetter setState) { + content: StatefulBuilder( + builder: (BuildContext context, StateSetter setState) { return Wrap( - alignment: WrapAlignment.start, spacing: 8, runSpacing: 2, children: [ - for (var i in speedsList) ...[ - if (i == currentSpeed) ...[ + for (final double i in speedsList) ...[ + if (i == currentSpeed) ...[ FilledButton( onPressed: () async { // setState(() => currentSpeed = i), @@ -298,7 +300,7 @@ class _HeaderControlState extends State { ], ); }), - actions: [ + actions: [ TextButton( onPressed: () => SmartDialog.dismiss(), child: Text( @@ -321,18 +323,18 @@ class _HeaderControlState extends State { /// 选择画质 void showSetVideoQa() { - List videoFormat = videoInfo.supportFormats!; - VideoQuality currentVideoQa = widget.videoDetailCtr!.currentVideoQa; + final List videoFormat = videoInfo.supportFormats!; + final VideoQuality currentVideoQa = widget.videoDetailCtr!.currentVideoQa; /// 总质量分类 - int totalQaSam = videoFormat.length; + final int totalQaSam = videoFormat.length; /// 可用的质量分类 int userfulQaSam = 0; - List video = videoInfo.dash!.video!; - Set idSet = {}; - for (var item in video) { - int id = item.id!; + final List video = videoInfo.dash!.video!; + final Set idSet = {}; + for (final VideoItem item in video) { + final int id = item.id!; if (!idSet.contains(id)) { idSet.add(id); userfulQaSam++; @@ -354,7 +356,7 @@ class _HeaderControlState extends State { ), margin: const EdgeInsets.all(12), child: Column( - children: [ + children: [ SizedBox( height: 45, child: GestureDetector( @@ -380,7 +382,7 @@ class _HeaderControlState extends State { child: Scrollbar( child: ListView( children: [ - for (var i = 0; i < totalQaSam; i++) ...[ + for (int i = 0; i < totalQaSam; i++) ...[ ListTile( onTap: () { if (currentVideoQa.code == @@ -427,9 +429,8 @@ class _HeaderControlState extends State { /// 选择音质 void showSetAudioQa() { - AudioQuality currentAudioQa = widget.videoDetailCtr!.currentAudioQa!; - - List audio = videoInfo.dash!.audio!; + final AudioQuality currentAudioQa = widget.videoDetailCtr!.currentAudioQa!; + final List audio = videoInfo.dash!.audio!; showModalBottomSheet( context: context, elevation: 0, @@ -445,18 +446,20 @@ class _HeaderControlState extends State { ), margin: const EdgeInsets.all(12), child: Column( - children: [ + children: [ SizedBox( height: 45, child: Center(child: Text('选择音质', style: titleStyle))), Expanded( child: Material( child: ListView( - children: [ - for (var i in audio) ...[ + children: [ + for (final AudioItem i in audio) ...[ ListTile( onTap: () { - if (currentAudioQa.code == i.id) return; + if (currentAudioQa.code == i.id) { + return; + } final int quality = i.id!; widget.videoDetailCtr!.currentAudioQa = AudioQualityCode.fromCode(quality)!; @@ -493,13 +496,13 @@ class _HeaderControlState extends State { // 选择解码格式 void showSetDecodeFormats() { // 当前选中的解码格式 - VideoDecodeFormats currentDecodeFormats = + final VideoDecodeFormats currentDecodeFormats = widget.videoDetailCtr!.currentDecodeFormats; - VideoItem firstVideo = widget.videoDetailCtr!.firstVideo; + final VideoItem firstVideo = widget.videoDetailCtr!.firstVideo; // 当前视频可用的解码格式 - List videoFormat = videoInfo.supportFormats!; - List list = videoFormat - .firstWhere((e) => e.quality == firstVideo.quality!.code) + final List videoFormat = videoInfo.supportFormats!; + final List list = videoFormat + .firstWhere((FormatItem e) => e.quality == firstVideo.quality!.code) .codecs!; showModalBottomSheet( @@ -565,15 +568,15 @@ class _HeaderControlState extends State { /// 弹幕功能 void showSetDanmaku() async { // 屏蔽类型 - List> blockTypesList = [ + final List> blockTypesList = [ {'value': 5, 'label': '顶部'}, {'value': 2, 'label': '滚动'}, {'value': 4, 'label': '底部'}, {'value': 6, 'label': '彩色'}, ]; - List blockTypes = widget.controller!.blockTypes; + final List blockTypes = widget.controller!.blockTypes; // 显示区域 - List> showAreas = [ + final List> showAreas = [ {'value': 0.25, 'label': '1/4屏'}, {'value': 0.5, 'label': '半屏'}, {'value': 0.75, 'label': '3/4屏'}, @@ -587,13 +590,15 @@ class _HeaderControlState extends State { // 弹幕速度 double danmakuDurationVal = widget.controller!.danmakuDurationVal; - DanmakuController danmakuController = widget.controller!.danmakuController!; + final DanmakuController danmakuController = + widget.controller!.danmakuController!; await showModalBottomSheet( context: context, elevation: 0, backgroundColor: Colors.transparent, builder: (BuildContext context) { - return StatefulBuilder(builder: (context, StateSetter setState) { + return StatefulBuilder( + builder: (BuildContext context, StateSetter setState) { return Container( width: double.infinity, height: 580, @@ -617,11 +622,13 @@ class _HeaderControlState extends State { Padding( padding: const EdgeInsets.only(top: 12, bottom: 18), child: Row( - children: [ - for (var i in blockTypesList) ...[ + children: [ + for (final Map i + in blockTypesList) ...[ ActionRowLineItem( onTap: () async { - bool isChoose = blockTypes.contains(i['value']); + final bool isChoose = + blockTypes.contains(i['value']); if (isChoose) { blockTypes.remove(i['value']); } else { @@ -630,9 +637,9 @@ class _HeaderControlState extends State { widget.controller!.blockTypes = blockTypes; setState(() {}); try { - DanmakuOption currentOption = + final DanmakuOption currentOption = danmakuController.option; - DanmakuOption updatedOption = + final DanmakuOption updatedOption = currentOption.copyWith( hideTop: blockTypes.contains(5), hideBottom: blockTypes.contains(4), @@ -655,16 +662,16 @@ class _HeaderControlState extends State { padding: const EdgeInsets.only(top: 12, bottom: 18), child: Row( children: [ - for (var i in showAreas) ...[ + for (final Map i in showAreas) ...[ ActionRowLineItem( onTap: () { showArea = i['value']; widget.controller!.showArea = showArea; setState(() {}); try { - DanmakuOption currentOption = + final DanmakuOption currentOption = danmakuController.option; - DanmakuOption updatedOption = + final DanmakuOption updatedOption = currentOption.copyWith(area: i['value']); danmakuController.updateOption(updatedOption); } catch (_) {} @@ -705,9 +712,9 @@ class _HeaderControlState extends State { widget.controller!.opacityVal = opacityVal; setState(() {}); try { - DanmakuOption currentOption = + final DanmakuOption currentOption = danmakuController.option; - DanmakuOption updatedOption = + final DanmakuOption updatedOption = currentOption.copyWith(opacity: val); danmakuController.updateOption(updatedOption); } catch (_) {} @@ -743,9 +750,9 @@ class _HeaderControlState extends State { widget.controller!.fontSizeVal = fontSizeVal; setState(() {}); try { - DanmakuOption currentOption = + final DanmakuOption currentOption = danmakuController.option; - DanmakuOption updatedOption = + final DanmakuOption updatedOption = currentOption.copyWith( fontSize: (15 * fontSizeVal).toDouble(), ); @@ -780,14 +787,16 @@ class _HeaderControlState extends State { label: danmakuDurationVal.toString(), onChanged: (double val) { danmakuDurationVal = val; - widget.controller!.danmakuDurationVal = danmakuDurationVal; + widget.controller!.danmakuDurationVal = + danmakuDurationVal; setState(() {}); try { - DanmakuOption currentOption = + final DanmakuOption currentOption = danmakuController.option; - DanmakuOption updatedOption = - currentOption.copyWith(duration: - val/widget.controller!.playbackSpeed); + final DanmakuOption updatedOption = + currentOption.copyWith( + duration: + val / widget.controller!.playbackSpeed); danmakuController.updateOption(updatedOption); } catch (_) {} }, @@ -827,8 +836,8 @@ class _HeaderControlState extends State { Expanded( child: Material( child: ListView( - children: [ - for (var i in PlayRepeat.values) ...[ + children: [ + for (final PlayRepeat i in PlayRepeat.values) ...[ ListTile( onTap: () { widget.controller!.setPlayRepeat(i); @@ -860,7 +869,7 @@ class _HeaderControlState extends State { @override Widget build(BuildContext context) { final _ = widget.controller!; - const textStyle = TextStyle( + const TextStyle textStyle = TextStyle( color: Colors.white, fontSize: 12, ); @@ -881,17 +890,20 @@ class _HeaderControlState extends State { size: 15, color: Colors.white, ), - fuc: () => { - if (widget.controller!.isFullScreen.value){ - widget.controller!.triggerFullScreen(status: false) - } else { - if (MediaQuery.of(context).orientation == Orientation.landscape){ - SystemChrome.setPreferredOrientations([ - DeviceOrientation.portraitUp, - ]) - }, - Get.back() - } + fuc: () => >{ + if (widget.controller!.isFullScreen.value) + {widget.controller!.triggerFullScreen(status: false)} + else + { + if (MediaQuery.of(context).orientation == + Orientation.landscape) + { + SystemChrome.setPreferredOrientations([ + DeviceOrientation.portraitUp, + ]) + }, + Get.back() + } }, ), SizedBox(width: buttonSpace), @@ -905,7 +917,8 @@ class _HeaderControlState extends State { // 销毁播放器实例 await widget.controller!.dispose(type: 'all'); if (mounted) { - Navigator.popUntil(context, (route) => route.isFirst); + Navigator.popUntil( + context, (Route route) => route.isFirst); } }, ), @@ -954,7 +967,7 @@ class _HeaderControlState extends State { ), ), SizedBox(width: buttonSpace), - if (Platform.isAndroid) ...[ + if (Platform.isAndroid) ...[ SizedBox( width: 34, height: 34, @@ -971,7 +984,7 @@ class _HeaderControlState extends State { canUsePiP = false; } if (canUsePiP) { - final aspectRatio = Rational( + final Rational aspectRatio = Rational( widget.videoDetailCtr!.data.dash!.video!.first.width!, widget.videoDetailCtr!.data.dash!.video!.first.height!, ); @@ -997,7 +1010,7 @@ class _HeaderControlState extends State { ), onPressed: () => showSetSpeedSheet(), child: Text( - '${_.playbackSpeed.toString()}X', + '${_.playbackSpeed}X', style: textStyle, ), ), diff --git a/lib/pages/webview/controller.dart b/lib/pages/webview/controller.dart index 447693e2..37600ea7 100644 --- a/lib/pages/webview/controller.dart +++ b/lib/pages/webview/controller.dart @@ -6,7 +6,6 @@ import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:get/get.dart'; import 'package:hive/hive.dart'; import 'package:pilipala/http/init.dart'; -import 'package:pilipala/http/member.dart'; import 'package:pilipala/http/user.dart'; import 'package:pilipala/pages/home/index.dart'; import 'package:pilipala/pages/media/index.dart'; @@ -53,9 +52,9 @@ class WebviewController extends GetxController { loadProgress.value = progress; }, onPageStarted: (String url) { - String str = Uri.parse(url).pathSegments[0]; - Map matchRes = IdUtils.matchAvorBv(input: str); - List matchKeys = matchRes.keys.toList(); + final String str = Uri.parse(url).pathSegments[0]; + final Map matchRes = IdUtils.matchAvorBv(input: str); + final List matchKeys = matchRes.keys.toList(); if (matchKeys.isNotEmpty) { if (matchKeys.first == 'BV') { Get.offAndToNamed( @@ -102,21 +101,21 @@ class WebviewController extends GetxController { } try { await SetCookie.onSet(); - var result = await UserHttp.userInfo(); + final result = await UserHttp.userInfo(); if (result['status'] && result['data'].isLogin) { SmartDialog.showToast('登录成功'); try { Box userInfoCache = GStrorage.userInfo; await userInfoCache.put('userInfoCache', result['data']); - HomeController homeCtr = Get.find(); + final HomeController homeCtr = Get.find(); homeCtr.updateLoginStatus(true); homeCtr.userFace.value = result['data'].face; - MediaController mediaCtr = Get.find(); + final MediaController mediaCtr = Get.find(); mediaCtr.mid = result['data'].mid; await LoginUtils.refreshLoginStatus(true); } catch (err) { - SmartDialog.show(builder: (context) { + SmartDialog.show(builder: (BuildContext context) { return AlertDialog( title: const Text('登录遇到问题'), content: Text(err.toString()), diff --git a/lib/pages/whisperDetail/controller.dart b/lib/pages/whisper_detail/controller.dart similarity index 100% rename from lib/pages/whisperDetail/controller.dart rename to lib/pages/whisper_detail/controller.dart diff --git a/lib/pages/whisperDetail/index.dart b/lib/pages/whisper_detail/index.dart similarity index 100% rename from lib/pages/whisperDetail/index.dart rename to lib/pages/whisper_detail/index.dart diff --git a/lib/pages/whisperDetail/view.dart b/lib/pages/whisper_detail/view.dart similarity index 94% rename from lib/pages/whisperDetail/view.dart rename to lib/pages/whisper_detail/view.dart index 18d2d439..5d108037 100644 --- a/lib/pages/whisperDetail/view.dart +++ b/lib/pages/whisper_detail/view.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:pilipala/common/widgets/network_img_layer.dart'; -import 'package:pilipala/pages/whisperDetail/controller.dart'; +import 'package:pilipala/pages/whisper_detail/controller.dart'; import 'package:pilipala/utils/feed_back.dart'; import 'widget/chat_item.dart'; @@ -41,8 +41,8 @@ class _WhisperDetailPageState extends State { child: IconButton( style: ButtonStyle( padding: MaterialStateProperty.all(EdgeInsets.zero), - backgroundColor: - MaterialStateProperty.resolveWith((states) { + backgroundColor: MaterialStateProperty.resolveWith( + (Set states) { return Theme.of(context) .colorScheme .primaryContainer @@ -69,7 +69,7 @@ class _WhisperDetailPageState extends State { ); }, child: Row( - children: [ + children: [ NetworkImgLayer( width: 34, height: 34, @@ -91,12 +91,12 @@ class _WhisperDetailPageState extends State { ), body: FutureBuilder( future: _futureBuilderFuture, - builder: (context, snapshot) { + builder: (BuildContext context, snapshot) { if (snapshot.connectionState == ConnectionState.done) { if (snapshot.data == null) { return const SizedBox(); } - Map data = snapshot.data as Map; + final Map data = snapshot.data as Map; if (data['status']) { List messageList = _whisperDetailController.messageList; return Obx( diff --git a/lib/pages/whisperDetail/widget/chat_item.dart b/lib/pages/whisper_detail/widget/chat_item.dart similarity index 97% rename from lib/pages/whisperDetail/widget/chat_item.dart rename to lib/pages/whisper_detail/widget/chat_item.dart index e39796cb..9ea6bf2a 100644 --- a/lib/pages/whisperDetail/widget/chat_item.dart +++ b/lib/pages/whisper_detail/widget/chat_item.dart @@ -15,11 +15,12 @@ class ChatItem extends StatelessWidget { @override Widget build(BuildContext context) { - bool isOwner = item.senderUid == GStrorage.userInfo.get('userInfoCache').mid; + 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 isArticle = item.msgType == 12; // 专栏 + // bool isAchive = item.msgType == 11; // 投稿 + // bool isArticle = item.msgType == 12; // 专栏 bool isRevoke = item.msgType == 5; // 撤回消息 bool isSystem = diff --git a/lib/plugin/pl_player/controller.dart b/lib/plugin/pl_player/controller.dart index eee652b9..14827222 100644 --- a/lib/plugin/pl_player/controller.dart +++ b/lib/plugin/pl_player/controller.dart @@ -222,7 +222,7 @@ class PlPlayerController { late double opacityVal; late double fontSizeVal; late double danmakuDurationVal; - late List speedsList; + late List speedsList; // 缓存 double? defaultDuration; late bool enableAutoLongPressSpeed = false; @@ -236,24 +236,28 @@ class PlPlayerController { sliderPositionSeconds.value = newSecond; } } + void updatePositionSecond() { int newSecond = _position.value.inSeconds; if (positionSeconds.value != newSecond) { positionSeconds.value = newSecond; } } + void updateDurationSecond() { int newSecond = _duration.value.inSeconds; if (durationSeconds.value != newSecond) { durationSeconds.value = newSecond; } } + void updateBufferedSecond() { int newSecond = _buffered.value.inSeconds; if (bufferedSeconds.value != newSecond) { bufferedSeconds.value = newSecond; } } + // 添加一个私有构造函数 PlPlayerController._() { _videoType = videoType; @@ -285,10 +289,10 @@ class PlPlayerController { _longPressSpeed.value = videoStorage .get(VideoBoxKey.longPressSpeedDefault, defaultValue: 2.0); } - List speedsListTemp = - videoStorage.get(VideoBoxKey.customSpeedsList, defaultValue: []); - speedsList = List.from(speedsListTemp); - for (var i in PlaySpeed.values) { + final List speedsListTemp = videoStorage + .get(VideoBoxKey.customSpeedsList, defaultValue: []); + speedsList = List.from(speedsListTemp); + for (final PlaySpeed i in PlaySpeed.values) { speedsList.add(i.value); } @@ -937,9 +941,10 @@ class PlPlayerController { if (!isFullScreen.value && status) { /// 按照视频宽高比决定全屏方向 toggleFullScreen(true); + /// 进入全屏 await enterFullScreen(); - if(mode == FullScreenMode.vertical || + if (mode == FullScreenMode.vertical || (mode == FullScreenMode.auto && direction.value == 'vertical')) { await verticalScreen(); } else { diff --git a/lib/plugin/pl_player/models/play_repeat.dart b/lib/plugin/pl_player/models/play_repeat.dart index e68196c7..89ee68e4 100644 --- a/lib/plugin/pl_player/models/play_repeat.dart +++ b/lib/plugin/pl_player/models/play_repeat.dart @@ -6,13 +6,13 @@ enum PlayRepeat { } extension PlayRepeatExtension on PlayRepeat { - static final List _descList = [ + static final List _descList = [ '播完暂停', '顺序播放', '单个循环', '列表循环', ]; - get description => _descList[index]; + String get description => _descList[index]; static final List _valueList = [ 1, @@ -20,6 +20,6 @@ extension PlayRepeatExtension on PlayRepeat { 3, 4, ]; - get value => _valueList[index]; - get defaultValue => _valueList[1]; + double get value => _valueList[index]; + double get defaultValue => _valueList[1]; } diff --git a/lib/plugin/pl_player/models/play_speed.dart b/lib/plugin/pl_player/models/play_speed.dart index 533e0254..fd699eaf 100644 --- a/lib/plugin/pl_player/models/play_speed.dart +++ b/lib/plugin/pl_player/models/play_speed.dart @@ -22,7 +22,7 @@ extension PlaySpeedExtension on PlaySpeed { '1.75', '2.0', ]; - get description => _descList[index]; + String get description => _descList[index]; static final List _valueList = [ 0.25, @@ -34,6 +34,6 @@ extension PlaySpeedExtension on PlaySpeed { 1.75, 2.0, ]; - get value => _valueList[index]; - get defaultValue => _valueList[3]; + double get value => _valueList[index]; + double get defaultValue => _valueList[3]; } diff --git a/lib/plugin/pl_player/view.dart b/lib/plugin/pl_player/view.dart index 781fa614..bb6b8fe9 100644 --- a/lib/plugin/pl_player/view.dart +++ b/lib/plugin/pl_player/view.dart @@ -9,30 +9,23 @@ 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/plugin/pl_player/controller.dart'; import 'package:pilipala/plugin/pl_player/models/duration.dart'; import 'package:pilipala/plugin/pl_player/models/fullscreen_mode.dart'; -import 'package:pilipala/plugin/pl_player/models/play_status.dart'; 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 'utils/fullscreen.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 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; class PLVideoPlayer extends StatefulWidget { - final PlPlayerController controller; - final PreferredSizeWidget? headerControl; - final PreferredSizeWidget? bottomControl; - final Widget? danmuWidget; - const PLVideoPlayer({ required this.controller, this.headerControl, @@ -41,6 +34,11 @@ class PLVideoPlayer extends StatefulWidget { super.key, }); + final PlPlayerController controller; + final PreferredSizeWidget? headerControl; + final PreferredSizeWidget? bottomControl; + final Widget? danmuWidget; + @override State createState() => _PLVideoPlayerState(); } @@ -66,7 +64,7 @@ class _PLVideoPlayerState extends State double _distance = 0.0; // 初始手指落下位置 - double _initTapPositoin = 0.0; + // double _initTapPositoin = 0.0; // bool _volumeInterceptEventStream = false; @@ -90,7 +88,7 @@ class _PLVideoPlayerState extends State // 双击播放、暂停 void onDoubleTapCenter() { - final _ = widget.controller; + final PlPlayerController _ = widget.controller; if (_.videoPlayerController!.state.playing) { _.pause(); } else { @@ -98,7 +96,7 @@ class _PLVideoPlayerState extends State } } - doubleTapFuc(String type) { + void doubleTapFuc(String type) { if (!enableQuickDouble) { onDoubleTapCenter(); return; @@ -138,7 +136,7 @@ class _PLVideoPlayerState extends State try { FlutterVolumeController.showSystemUI = true; _ctr.volumeValue.value = (await FlutterVolumeController.getVolume())!; - FlutterVolumeController.addListener((value) { + FlutterVolumeController.addListener((double value) { if (mounted && !_ctr.volumeInterceptEventStream.value) { _ctr.volumeValue.value = value; } @@ -149,7 +147,7 @@ class _PLVideoPlayerState extends State Future.microtask(() async { try { _ctr.brightnessValue.value = await ScreenBrightness().current; - ScreenBrightness().onCurrentBrightnessChanged.listen((value) { + ScreenBrightness().onCurrentBrightnessChanged.listen((double value) { if (mounted) { _ctr.brightnessValue.value = value; } @@ -198,9 +196,9 @@ class _PLVideoPlayerState extends State @override Widget build(BuildContext context) { - final _ = widget.controller; - Color colorTheme = Theme.of(context).colorScheme.primary; - TextStyle subTitleStyle = const TextStyle( + final PlPlayerController _ = widget.controller; + final Color colorTheme = Theme.of(context).colorScheme.primary; + const TextStyle subTitleStyle = TextStyle( height: 1.5, fontSize: 40.0, letterSpacing: 0.0, @@ -209,24 +207,22 @@ class _PLVideoPlayerState extends State fontWeight: FontWeight.normal, backgroundColor: Color(0xaa000000), ); - const textStyle = TextStyle( + const TextStyle textStyle = TextStyle( color: Colors.white, fontSize: 12, ); return Stack( - clipBehavior: Clip.hardEdge, fit: StackFit.passthrough, - children: [ + children: [ Obx( () => Video( controller: videoController, controls: NoVideoControls, pauseUponEnteringBackgroundMode: !enableBackgroundPlay, resumeUponEnteringForegroundMode: true, - subtitleViewConfiguration: SubtitleViewConfiguration( + subtitleViewConfiguration: const SubtitleViewConfiguration( style: subTitleStyle, - textAlign: TextAlign.center, - padding: const EdgeInsets.all(24.0), + padding: EdgeInsets.all(24.0), ), fit: _.videoFit.value, ), @@ -315,7 +311,6 @@ class _PLVideoPlayerState extends State /// 音量🔊 控制条展示 Obx( () => Align( - alignment: Alignment.center, child: AnimatedOpacity( curve: Curves.easeInOut, opacity: _ctr.volumeIndicator.value ? 1.0 : 0.0, @@ -331,8 +326,7 @@ class _PLVideoPlayerState extends State child: Row( mainAxisSize: MainAxisSize.min, mainAxisAlignment: MainAxisAlignment.center, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ + children: [ Container( height: 34.0, width: 28.0, @@ -368,7 +362,6 @@ class _PLVideoPlayerState extends State /// 亮度🌞 控制条展示 Obx( () => Align( - alignment: Alignment.center, child: AnimatedOpacity( curve: Curves.easeInOut, opacity: _ctr.brightnessIndicator.value ? 1.0 : 0.0, @@ -384,8 +377,7 @@ class _PLVideoPlayerState extends State child: Row( mainAxisSize: MainAxisSize.min, mainAxisAlignment: MainAxisAlignment.center, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ + children: [ Container( height: 30.0, width: 28.0, @@ -451,14 +443,14 @@ class _PLVideoPlayerState extends State onTap: () { _.controls = !_.showControls.value; }, - onDoubleTapDown: (details) { + onDoubleTapDown: (TapDownDetails details) { // live模式下禁用 锁定时🔒禁用 if (_.videoType.value == 'live' || _.controlsLock.value) { return; } - final totalWidth = MediaQuery.of(context).size.width; - final tapPosition = details.localPosition.dx; - final sectionWidth = totalWidth / 3; + final double totalWidth = MediaQuery.sizeOf(context).width; + final double tapPosition = details.localPosition.dx; + final double sectionWidth = totalWidth / 3; String type = 'left'; if (tapPosition < sectionWidth) { type = 'left'; @@ -469,11 +461,11 @@ class _PLVideoPlayerState extends State } doubleTapFuc(type); }, - onLongPressStart: (detail) { + onLongPressStart: (LongPressStartDetails detail) { feedBack(); _.setDoubleSpeedStatus(true); }, - onLongPressEnd: (details) { + onLongPressEnd: (LongPressEndDetails details) { _.setDoubleSpeedStatus(false); }, @@ -483,16 +475,18 @@ class _PLVideoPlayerState extends State if (_.videoType.value == 'live' || _.controlsLock.value) { return; } - final tapPosition = details.localPosition.dx; - int curSliderPosition = _.sliderPosition.value.inMilliseconds; - double scale = 90000 / MediaQuery.of(context).size.width; - Duration pos = Duration( + // final double tapPosition = details.localPosition.dx; + final int curSliderPosition = + _.sliderPosition.value.inMilliseconds; + final double scale = 90000 / MediaQuery.sizeOf(context).width; + final Duration pos = Duration( milliseconds: curSliderPosition + (details.delta.dx * scale).round()); - Duration result = pos.clamp(Duration.zero, _.duration.value); + final Duration result = + pos.clamp(Duration.zero, _.duration.value); _.onUpdatedSliderProgress(result); _.onChangedSliderStart(); - _initTapPositoin = tapPosition; + // _initTapPositoin = tapPosition; }, onHorizontalDragEnd: (DragEndDetails details) { if (_.videoType.value == 'live' || _.controlsLock.value) { @@ -503,10 +497,11 @@ class _PLVideoPlayerState extends State }, // 垂直方向 音量/亮度调节 onVerticalDragUpdate: (DragUpdateDetails details) async { - final totalWidth = MediaQuery.of(context).size.width; - final tapPosition = details.localPosition.dx; - final sectionWidth = totalWidth / 3; - final delta = details.delta.dy; + final double totalWidth = MediaQuery.sizeOf(context).width; + final double tapPosition = details.localPosition.dx; + final double sectionWidth = totalWidth / 3; + final double delta = details.delta.dy; + /// 锁定时禁用 if (_.controlsLock.value) { return; @@ -518,12 +513,13 @@ class _PLVideoPlayerState extends State } if (tapPosition < sectionWidth) { // 左边区域 👈 - double level = (_.isFullScreen.value + final double level = (_.isFullScreen.value ? Get.size.height : screenWidth * 9 / 16) * 3; - final brightness = _ctr.brightnessValue.value - delta / level; - final result = brightness.clamp(0.0, 1.0); + final double brightness = + _ctr.brightnessValue.value - delta / level; + final double result = brightness.clamp(0.0, 1.0); setBrightness(result); } else if (tapPosition < sectionWidth * 2) { // 全屏 @@ -547,12 +543,12 @@ class _PLVideoPlayerState extends State _distance = dy; } else { // 右边区域 👈 - double level = (_.isFullScreen.value + final double level = (_.isFullScreen.value ? Get.size.height : screenWidth * 9 / 16) * 3; - final volume = _ctr.volumeValue.value - delta / level; - final result = volume.clamp(0.0, 1.0); + final double volume = _ctr.volumeValue.value - delta / level; + final double result = volume.clamp(0.0, 1.0); setVolume(result); } }, @@ -569,7 +565,6 @@ class _PLVideoPlayerState extends State children: [ if (widget.headerControl != null || _.headerControl != null) ClipRect( - clipBehavior: Clip.hardEdge, child: AppBarAni( controller: animationController, visible: !_.controlsLock.value && _.showControls.value, @@ -579,7 +574,6 @@ class _PLVideoPlayerState extends State ), const Spacer(), ClipRect( - clipBehavior: Clip.hardEdge, child: AppBarAni( controller: animationController, visible: !_.controlsLock.value && _.showControls.value, @@ -604,23 +598,23 @@ class _PLVideoPlayerState extends State final int buffer = _.bufferedSeconds.value; if (defaultBtmProgressBehavior == BtmProgresBehavior.alwaysHide.code) { - return Container(); + return nil; } if (defaultBtmProgressBehavior == BtmProgresBehavior.onlyShowFullScreen.code && !_.isFullScreen.value) { - return Container(); + return nil; } else if (defaultBtmProgressBehavior == BtmProgresBehavior.onlyHideFullScreen.code && _.isFullScreen.value) { - return Container(); + return nil; } if (_.videoType.value == 'live') { - return Container(); + return nil; } if (value > max || max <= 0) { - return Container(); + return nil; } return Positioned( bottom: -1.5, @@ -633,7 +627,7 @@ class _PLVideoPlayerState extends State progressBarColor: colorTheme, baseBarColor: Colors.white.withOpacity(0.2), bufferedBarColor: - Theme.of(context).colorScheme.primary.withOpacity(0.4), + Theme.of(context).colorScheme.primary.withOpacity(0.4), timeLabelLocation: TimeLabelLocation.none, thumbColor: colorTheme, barHeight: 3, @@ -700,7 +694,6 @@ class _PLVideoPlayerState extends State decoration: const BoxDecoration( shape: BoxShape.circle, gradient: RadialGradient( - center: Alignment.center, colors: [Colors.black26, Colors.transparent], ), ), @@ -711,7 +704,7 @@ class _PLVideoPlayerState extends State ), ); } else { - return Container(); + return nil; } }), @@ -732,7 +725,9 @@ class _PLVideoPlayerState extends State _ctr.hideSeekBackwardButton.value ? 0.0 : 1.0, ), duration: const Duration(milliseconds: 500), - builder: (context, value, child) => Opacity( + builder: (BuildContext context, double value, + Widget? child) => + Opacity( opacity: value, child: child, ), @@ -743,14 +738,14 @@ class _PLVideoPlayerState extends State } }, child: BackwardSeekIndicator( - onChanged: (value) { + onChanged: (Duration value) { // _seekBarDeltaValueNotifier.value = -value; }, - onSubmitted: (value) { + onSubmitted: (Duration value) { _ctr.hideSeekBackwardButton.value = true; - Player player = + final Player player = widget.controller.videoPlayerController!; - var result = player.state.position - value; + Duration result = player.state.position - value; result = result.clamp( Duration.zero, player.state.duration, @@ -760,11 +755,11 @@ class _PLVideoPlayerState extends State }, ), ) - : const SizedBox(), + : nil, ), Expanded( child: SizedBox( - width: MediaQuery.of(context).size.width / 4, + width: MediaQuery.sizeOf(context).width / 4, ), ), Expanded( @@ -775,7 +770,9 @@ class _PLVideoPlayerState extends State end: _ctr.hideSeekForwardButton.value ? 0.0 : 1.0, ), duration: const Duration(milliseconds: 500), - builder: (context, value, child) => Opacity( + builder: (BuildContext context, double value, + Widget? child) => + Opacity( opacity: value, child: child, ), @@ -786,14 +783,14 @@ class _PLVideoPlayerState extends State } }, child: ForwardSeekIndicator( - onChanged: (value) { + onChanged: (Duration value) { // _seekBarDeltaValueNotifier.value = value; }, - onSubmitted: (value) { + onSubmitted: (Duration value) { _ctr.hideSeekForwardButton.value = true; - Player player = + final Player player = widget.controller.videoPlayerController!; - var result = player.state.position + value; + Duration result = player.state.position + value; result = result.clamp( Duration.zero, player.state.duration, @@ -803,7 +800,7 @@ class _PLVideoPlayerState extends State }, ), ) - : const SizedBox(), + : nil, ), ], ), diff --git a/lib/plugin/pl_player/widgets/bottom_control.dart b/lib/plugin/pl_player/widgets/bottom_control.dart index 1fd8aa65..8f21fc17 100644 --- a/lib/plugin/pl_player/widgets/bottom_control.dart +++ b/lib/plugin/pl_player/widgets/bottom_control.dart @@ -2,6 +2,7 @@ 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'; @@ -37,7 +38,7 @@ class BottomControl extends StatelessWidget implements PreferredSizeWidget { final int max = _.durationSeconds.value; final int buffer = _.bufferedSeconds.value; if (value > max || max <= 0) { - return Container(); + return nil; } return Padding( padding: const EdgeInsets.only(left: 7, right: 7, bottom: 6), @@ -79,8 +80,10 @@ class BottomControl extends StatelessWidget implements PreferredSizeWidget { Obx(() { return Text( _.durationSeconds.value >= 3600 - ? printDurationWithHours(Duration(seconds: _.positionSeconds.value)) - : printDuration(Duration(seconds: _.positionSeconds.value)), + ? printDurationWithHours( + Duration(seconds: _.positionSeconds.value)) + : printDuration( + Duration(seconds: _.positionSeconds.value)), style: textStyle, ); }), @@ -90,8 +93,10 @@ class BottomControl extends StatelessWidget implements PreferredSizeWidget { Obx( () => Text( _.durationSeconds.value >= 3600 - ? printDurationWithHours(Duration(seconds: _.durationSeconds.value)) - : printDuration(Duration(seconds: _.durationSeconds.value)), + ? printDurationWithHours( + Duration(seconds: _.durationSeconds.value)) + : printDuration( + Duration(seconds: _.durationSeconds.value)), style: textStyle, ), ), diff --git a/lib/router/app_pages.dart b/lib/router/app_pages.dart index 50f6a262..996869be 100644 --- a/lib/router/app_pages.dart +++ b/lib/router/app_pages.dart @@ -3,53 +3,54 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:hive/hive.dart'; -import 'package:pilipala/pages/about/index.dart'; -import 'package:pilipala/pages/blacklist/index.dart'; -import 'package:pilipala/pages/dynamics/deatil/index.dart'; -import 'package:pilipala/pages/dynamics/index.dart'; -import 'package:pilipala/pages/fan/index.dart'; -import 'package:pilipala/pages/fav/index.dart'; -import 'package:pilipala/pages/favDetail/index.dart'; -import 'package:pilipala/pages/fav_search/index.dart'; -import 'package:pilipala/pages/follow/index.dart'; -import 'package:pilipala/pages/history/index.dart'; -import 'package:pilipala/pages/history_search/index.dart'; -import 'package:pilipala/pages/home/index.dart'; -import 'package:pilipala/pages/hot/index.dart'; -import 'package:pilipala/pages/html/index.dart'; -import 'package:pilipala/pages/later/index.dart'; -import 'package:pilipala/pages/liveRoom/view.dart'; -import 'package:pilipala/pages/login/index.dart'; -import 'package:pilipala/pages/member/index.dart'; -import 'package:pilipala/pages/member_archive/index.dart'; -import 'package:pilipala/pages/member_coin/index.dart'; -import 'package:pilipala/pages/member_dynamics/index.dart'; -import 'package:pilipala/pages/member_like/index.dart'; -import 'package:pilipala/pages/member_search/index.dart'; -import 'package:pilipala/pages/member_seasons/index.dart'; -import 'package:pilipala/pages/search/index.dart'; -import 'package:pilipala/pages/searchResult/index.dart'; -import 'package:pilipala/pages/setting/extra_setting.dart'; -import 'package:pilipala/pages/setting/pages/color_select.dart'; -import 'package:pilipala/pages/setting/pages/display_mode.dart'; -import 'package:pilipala/pages/setting/pages/font_size_select.dart'; -import 'package:pilipala/pages/setting/pages/play_speed_set.dart'; -import 'package:pilipala/pages/setting/play_setting.dart'; -import 'package:pilipala/pages/setting/privacy_setting.dart'; -import 'package:pilipala/pages/setting/style_setting.dart'; -import 'package:pilipala/pages/video/detail/index.dart'; -import 'package:pilipala/pages/video/detail/replyReply/index.dart'; -import 'package:pilipala/pages/webview/index.dart'; -import 'package:pilipala/pages/setting/index.dart'; -import 'package:pilipala/pages/media/index.dart'; -import 'package:pilipala/pages/whisper/index.dart'; -import 'package:pilipala/pages/whisperDetail/index.dart'; -import 'package:pilipala/utils/storage.dart'; -Box setting = GStrorage.setting; +import '../pages/about/index.dart'; +import '../pages/blacklist/index.dart'; +import '../pages/dynamics/detail/index.dart'; +import '../pages/dynamics/index.dart'; +import '../pages/fan/index.dart'; +import '../pages/fav/index.dart'; +import '../pages/fav_detail/index.dart'; +import '../pages/fav_search/index.dart'; +import '../pages/follow/index.dart'; +import '../pages/history/index.dart'; +import '../pages/history_search/index.dart'; +import '../pages/home/index.dart'; +import '../pages/hot/index.dart'; +import '../pages/html/index.dart'; +import '../pages/later/index.dart'; +import '../pages/live_room/view.dart'; +import '../pages/login/index.dart'; +import '../pages/media/index.dart'; +import '../pages/member/index.dart'; +import '../pages/member_archive/index.dart'; +import '../pages/member_coin/index.dart'; +import '../pages/member_dynamics/index.dart'; +import '../pages/member_like/index.dart'; +import '../pages/member_search/index.dart'; +import '../pages/member_seasons/index.dart'; +import '../pages/search/index.dart'; +import '../pages/search_result/index.dart'; +import '../pages/setting/extra_setting.dart'; +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/play_speed_set.dart'; +import '../pages/setting/play_setting.dart'; +import '../pages/setting/privacy_setting.dart'; +import '../pages/setting/style_setting.dart'; +import '../pages/video/detail/index.dart'; +import '../pages/video/detail/reply_reply/index.dart'; +import '../pages/webview/index.dart'; +import '../pages/whisper/index.dart'; +import '../pages/whisper_detail/index.dart'; +import '../utils/storage.dart'; + +Box setting = GStrorage.setting; class Routes { - static final List getPages = [ + static final List> getPages = [ // 首页(推荐) CustomGetPage(name: '/', page: () => const HomePage()), // 热门 @@ -150,22 +151,18 @@ class Routes { ]; } -class CustomGetPage extends GetPage { - bool? fullscreen = false; - +class CustomGetPage extends GetPage { CustomGetPage({ - name, - page, + required super.name, + required super.page, this.fullscreen, - transitionDuration, + super.transitionDuration, }) : super( - name: name, - page: page, curve: Curves.linear, transition: Transition.native, showCupertinoParallax: false, popGesture: false, - transitionDuration: transitionDuration, fullscreenDialog: fullscreen != null && fullscreen, ); + bool? fullscreen = false; } diff --git a/lib/utils/app_scheme.dart b/lib/utils/app_scheme.dart index 8055d512..6820050c 100644 --- a/lib/utils/app_scheme.dart +++ b/lib/utils/app_scheme.dart @@ -2,15 +2,14 @@ import 'package:appscheme/appscheme.dart'; import 'package:flutter/material.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:get/get.dart'; -import 'package:pilipala/http/search.dart'; -import 'package:pilipala/models/common/search_type.dart'; - +import '../http/search.dart'; +import '../models/common/search_type.dart'; import 'id_utils.dart'; import 'utils.dart'; class PiliSchame { - static AppScheme appScheme = AppSchemeImpl.getInstance() as AppScheme; - static void init() async { + static AppScheme appScheme = AppSchemeImpl.getInstance()!; + static Future init() async { /// final SchemeEntity? value = await appScheme.getInitScheme(); if (value != null) { @@ -18,14 +17,14 @@ class PiliSchame { } /// 完整链接进入 b23.无效 - appScheme.getLatestScheme().then((value) { + appScheme.getLatestScheme().then((SchemeEntity? value) { if (value != null) { _fullPathPush(value); } }); /// 注册从外部打开的Scheme监听信息 # - appScheme.registerSchemeListener().listen((event) { + appScheme.registerSchemeListener().listen((SchemeEntity? event) { if (event != null) { _routePush(event); } @@ -41,15 +40,16 @@ class PiliSchame { if (scheme == 'bilibili') { // bilibili://root if (host == 'root') { - Navigator.popUntil(Get.context!, (route) => route.isFirst); + Navigator.popUntil( + Get.context!, (Route route) => route.isFirst); } // bilibili://space/{uid} else if (host == 'space') { - var mid = path.split('/').last; - Get.toNamed( + final String mid = path.split('/').last; + Get.toNamed( '/member?mid=$mid', - arguments: {'face': null}, + arguments: {'face': null}, ); } @@ -72,15 +72,15 @@ class PiliSchame { // bilibili://live/{roomid} else if (host == 'live') { - var roomId = path.split('/').last; - Get.toNamed('/liveRoom?roomid=$roomId', - arguments: {'liveItem': null, 'heroTag': roomId.toString()}); + final String roomId = path.split('/').last; + Get.toNamed('/liveRoom?roomid=$roomId', + arguments: {'liveItem': null, 'heroTag': roomId}); } // bilibili://bangumi/season/${ssid} else if (host == 'bangumi') { if (path.startsWith('/season')) { - var seasonId = path.split('/').last; + final String seasonId = path.split('/').last; _bangumiPush(int.parse(seasonId)); } } @@ -104,8 +104,8 @@ class PiliSchame { } // 投稿跳转 - static void _videoPush(int? aidVal, String? bvidVal) async { - SmartDialog.showLoading(msg: '获取中...'); + static Future _videoPush(int? aidVal, String? bvidVal) async { + SmartDialog.showLoading(msg: '获取中...'); try { int? aid = aidVal; String? bvid = bvidVal; @@ -115,22 +115,24 @@ class PiliSchame { if (bvidVal == null) { bvid = IdUtils.av2bv(aidVal!); } - int cid = await SearchHttp.ab2c(bvid: bvidVal, aid: aidVal); - String heroTag = Utils.makeHeroTag(aid); - SmartDialog.dismiss().then( - (e) => Get.toNamed('/video?bvid=$bvid&cid=$cid', arguments: { - 'pic': null, - 'heroTag': heroTag, - }), + final int cid = await SearchHttp.ab2c(bvid: bvidVal, aid: aidVal); + final String heroTag = Utils.makeHeroTag(aid); + SmartDialog.dismiss().then( + // ignore: always_specify_types + (e) => Get.toNamed('/video?bvid=$bvid&cid=$cid', + arguments: { + 'pic': null, + 'heroTag': heroTag, + }), ); } catch (e) { - SmartDialog.showToast('video获取失败：${e.toString()}'); + SmartDialog.showToast('video获取失败: $e'); } } // 番剧跳转 - static void _bangumiPush(int seasonId) async { - SmartDialog.showLoading(msg: '获取中...'); + static Future _bangumiPush(int seasonId) async { + SmartDialog.showLoading(msg: '获取中...'); try { var result = await SearchHttp.bangumiInfo(seasonId: seasonId, epId: null); if (result['status']) { @@ -142,7 +144,7 @@ class PiliSchame { SmartDialog.dismiss().then( (e) => Get.toNamed( '/video?bvid=$bvid&cid=$cid&epId=$epId', - arguments: { + arguments: { 'pic': bangumiDetail.cover, 'heroTag': heroTag, 'videoType': SearchType.media_bangumi, @@ -151,14 +153,14 @@ class PiliSchame { ); } } catch (e) { - SmartDialog.showToast('番剧获取失败：${e.toString()}'); + SmartDialog.showToast('番剧获取失败：$e'); } } - static void _fullPathPush(value) async { + static Future _fullPathPush(SchemeEntity value) async { // https://m.bilibili.com/bangumi/play/ss39708 // https | m.bilibili.com | /bangumi/play/ss39708 - final String scheme = value.scheme!; + // final String scheme = value.scheme!; final String host = value.host!; final String? path = value.path; // Map query = value.query!; @@ -173,6 +175,7 @@ class PiliSchame { print('个人空间'); return; } + if (path != null) { final String area = path.split('/')[1]; switch (area) { @@ -183,11 +186,11 @@ class PiliSchame { break; case 'video': // print('投稿'); - Map map = IdUtils.matchAvorBv(input: path); + final Map map = IdUtils.matchAvorBv(input: path); if (map.containsKey('AV')) { - _videoPush(map['AV'], null); + _videoPush(map['AV']! as int, null); } else if (map.containsKey('BV')) { - _videoPush(null, map['BV']); + _videoPush(null, map['BV'] as String); } else { SmartDialog.showToast('投稿匹配失败'); } diff --git a/lib/utils/feed_back.dart b/lib/utils/feed_back.dart index cb3a693c..b0f9f035 100644 --- a/lib/utils/feed_back.dart +++ b/lib/utils/feed_back.dart @@ -1,11 +1,12 @@ import 'package:flutter/services.dart'; import 'package:hive/hive.dart'; -import 'package:pilipala/utils/storage.dart'; +import 'storage.dart'; -Box setting = GStrorage.setting; +Box setting = GStrorage.setting; void feedBack() { // 设置中是否开启 - bool enable = setting.get(SettingBoxKey.feedBackEnable, defaultValue: false); + final bool enable = + setting.get(SettingBoxKey.feedBackEnable, defaultValue: false) as bool; if (enable) { HapticFeedback.lightImpact(); } diff --git a/lib/utils/id_utils.dart b/lib/utils/id_utils.dart index 61e55737..42b474f5 100644 --- a/lib/utils/id_utils.dart +++ b/lib/utils/id_utils.dart @@ -48,19 +48,21 @@ class IdUtils { } // 匹配 - static Map matchAvorBv({String? input}) { - Map result = {}; + static Map matchAvorBv({String? input}) { + final Map result = {'': null}; if (input == null || input == '') { return result; } - RegExp bvRegex = RegExp(r'BV[0-9A-Za-z]{10}', caseSensitive: false); - RegExp avRegex = RegExp(r'AV\d+', caseSensitive: false); + final RegExp bvRegex = RegExp(r'BV[0-9A-Za-z]{10}', caseSensitive: false); + final RegExp avRegex = RegExp(r'AV\d+', caseSensitive: false); - Iterable bvMatches = bvRegex.allMatches(input); - Iterable avMatches = avRegex.allMatches(input); + final Iterable bvMatches = bvRegex.allMatches(input); + final Iterable avMatches = avRegex.allMatches(input); - List bvs = bvMatches.map((match) => match.group(0)!).toList(); - List avs = avMatches.map((match) => match.group(0)!).toList(); + final List bvs = + bvMatches.map((Match match) => match.group(0)!).toList(); + final List avs = + avMatches.map((Match match) => match.group(0)!).toList(); if (bvs.isNotEmpty) { result['BV'] = bvs[0].substring(0, 2).toUpperCase() + bvs[0].substring(2); diff --git a/lib/utils/storage.dart b/lib/utils/storage.dart index e3a50881..f59a7bc1 100644 --- a/lib/utils/storage.dart +++ b/lib/utils/storage.dart @@ -1,4 +1,6 @@ // 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/home/rcmd/result.dart'; @@ -7,36 +9,36 @@ 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; - static late final Box setting; - static late final Box video; + static late final Box recVideo; + static late final Box userInfo; + static late final Box historyword; + static late final Box localCache; + static late final Box setting; + static late final Box video; static Future init() async { - final dir = await getApplicationSupportDirectory(); - final path = dir.path; + final Directory dir = await getApplicationSupportDirectory(); + final String path = dir.path; await Hive.initFlutter('$path/hive'); regAdapter(); // 首页推荐视频 recVideo = await Hive.openBox( 'recVideo', - compactionStrategy: (entries, deletedEntries) { + compactionStrategy: (int entries, int deletedEntries) { return deletedEntries > 12; }, ); // 登录用户信息 userInfo = await Hive.openBox( 'userInfo', - compactionStrategy: (entries, deletedEntries) { + compactionStrategy: (int entries, int deletedEntries) { return deletedEntries > 2; }, ); // 本地缓存 localCache = await Hive.openBox( 'localCache', - compactionStrategy: (entries, deletedEntries) { + compactionStrategy: (int entries, int deletedEntries) { return deletedEntries > 4; }, ); @@ -45,13 +47,13 @@ class GStrorage { // 搜索历史 historyword = await Hive.openBox( 'historyWord', - compactionStrategy: (entries, deletedEntries) { + compactionStrategy: (int entries, int deletedEntries) { return deletedEntries > 10; }, ); } - static regAdapter() { + static void regAdapter() { Hive.registerAdapter(RecVideoItemAppModelAdapter()); Hive.registerAdapter(RcmdReasonAdapter()); Hive.registerAdapter(RcmdStatAdapter()); @@ -88,7 +90,7 @@ class GStrorage { class SettingBoxKey { /// 播放器 - static const btmProgressBehavior = 'btmProgressBehavior', + static const String btmProgressBehavior = 'btmProgressBehavior', defaultVideoSpeed = 'defaultVideoSpeed', autoUpgradeEnable = 'autoUpgradeEnable', feedBackEnable = 'feedBackEnable', diff --git a/lib/utils/utils.dart b/lib/utils/utils.dart index 25488d59..08693d24 100644 --- a/lib/utils/utils.dart +++ b/lib/utils/utils.dart @@ -12,16 +12,16 @@ 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:pilipala/http/index.dart'; -import 'package:pilipala/models/github/latest.dart'; import 'package:url_launcher/url_launcher.dart'; +import '../http/index.dart'; +import '../models/github/latest.dart'; class Utils { static Future getCookiePath() async { - Directory tempDir = await getApplicationSupportDirectory(); - String tempPath = "${tempDir.path}/.plpl/"; - Directory dir = Directory(tempPath); - bool b = await dir.exists(); + final Directory tempDir = await getApplicationSupportDirectory(); + final String tempPath = "${tempDir.path}/.plpl/"; + final Directory dir = Directory(tempPath); + final bool b = await dir.exists(); if (!b) { dir.createSync(recursive: true); } @@ -29,7 +29,7 @@ class Utils { } static String numFormat(int number) { - String res = (number / 10000).toString(); + final String res = (number / 10000).toString(); if (int.parse(res.split('.')[0]) >= 1) { return '${(number / 10000).toPrecision(1)}万'; } else { @@ -43,16 +43,16 @@ class Utils { return time; } if (time < 3600) { - int minute = time ~/ 60; - double res = time / 60; + final int minute = time ~/ 60; + final double res = time / 60; if (minute != res) { return '${minute < 10 ? '0$minute' : minute}:${(time - minute * 60) < 10 ? '0${(time - minute * 60)}' : (time - minute * 60)}'; } else { return '$minute:00'; } } else { - int hour = time ~/ 3600; - String hourStr = hour < 10 ? '0$hour' : hour.toString(); + final int hour = time ~/ 3600; + final String hourStr = hour < 10 ? '0$hour' : hour.toString(); var a = timeFormat(time - hour * 3600); return '$hourStr:$a'; } diff --git a/lib/utils/wbi_sign.dart b/lib/utils/wbi_sign.dart index 84065964..68e2bf0f 100644 --- a/lib/utils/wbi_sign.dart +++ b/lib/utils/wbi_sign.dart @@ -2,16 +2,15 @@ // https://github.com/SocialSisterYi/bilibili-API-collect/blob/master/docs/misc/sign/wbi.md // import md5 from 'md5' // import axios from 'axios' -import 'package:hive/hive.dart'; -import 'package:pilipala/http/index.dart'; -import 'package:crypto/crypto.dart'; import 'dart:convert'; - -import 'package:pilipala/utils/storage.dart'; +import 'package:crypto/crypto.dart'; +import 'package:hive/hive.dart'; +import '../http/index.dart'; +import 'storage.dart'; class WbiSign { - static Box localCache = GStrorage.localCache; - List mixinKeyEncTab = [ + static Box localCache = GStrorage.localCache; + final List mixinKeyEncTab = [ 46, 47, 18, @@ -78,52 +77,54 @@ class WbiSign { 52 ]; // 对 imgKey 和 subKey 进行字符顺序打乱编码 - String getMixinKey(orig) { + String getMixinKey(String orig) { String temp = ''; for (int i = 0; i < mixinKeyEncTab.length; i++) { - temp += orig.split('')[mixinKeyEncTab[i]]; + temp += orig.split('')[mixinKeyEncTab[i] as int]; } return temp.substring(0, 32); } // 为请求参数进行 wbi 签名 - Map encWbi(params, imgKey, subKey) { - String mixinKey = getMixinKey(imgKey + subKey); - DateTime now = DateTime.now(); - int currTime = (now.millisecondsSinceEpoch / 1000).round(); - RegExp chrFilter = RegExp(r"[!\'\(\)*]"); - List query = []; - Map newParams = Map.from(params)..addAll({"wts": currTime}); // 添加 wts 字段 + Map encWbi( + Map params, String imgKey, String subKey) { + final String mixinKey = getMixinKey(imgKey + subKey); + final DateTime now = DateTime.now(); + final int currTime = (now.millisecondsSinceEpoch / 1000).round(); + final RegExp chrFilter = RegExp(r"[!\'\(\)*]"); + final List query = []; + final Map newParams = Map.from(params) + ..addAll({"wts": currTime}); // 添加 wts 字段 // 按照 key 重排参数 - List keys = newParams.keys.toList()..sort(); - for (var i in keys) { + final List keys = newParams.keys.toList()..sort(); + for (String i in keys) { query.add( '${Uri.encodeComponent(i)}=${Uri.encodeComponent(newParams[i].toString().replaceAll(chrFilter, ''))}'); } - String queryStr = query.join('&'); - String wbiSign = + final String queryStr = query.join('&'); + final String wbiSign = md5.convert(utf8.encode(queryStr + mixinKey)).toString(); // 计算 w_rid return {'wts': currTime.toString(), 'w_rid': wbiSign}; } // 获取最新的 img_key 和 sub_key 可以从缓存中获取 static Future> getWbiKeys() async { - DateTime nowDate = DateTime.now(); + final DateTime nowDate = DateTime.now(); if (localCache.get(LocalCacheKey.wbiKeys) != null && DateTime.fromMillisecondsSinceEpoch( - localCache.get(LocalCacheKey.timeStamp)) + localCache.get(LocalCacheKey.timeStamp) as int) .day == nowDate.day) { - Map cacheWbiKeys = localCache.get('wbiKeys'); + final Map cacheWbiKeys = localCache.get('wbiKeys'); return Map.from(cacheWbiKeys); } var resp = await Request().get('https://api.bilibili.com/x/web-interface/nav'); var jsonContent = resp.data['data']; - String imgUrl = jsonContent['wbi_img']['img_url']; - String subUrl = jsonContent['wbi_img']['sub_url']; - Map wbiKeys = { + final String imgUrl = jsonContent['wbi_img']['img_url']; + final String subUrl = jsonContent['wbi_img']['sub_url']; + final Map wbiKeys = { 'imgKey': imgUrl .substring(imgUrl.lastIndexOf('/') + 1, imgUrl.length) .split('.')[0], @@ -136,10 +137,10 @@ class WbiSign { return wbiKeys; } - makSign(Map params) async { + Future> makSign(Map params) async { // params 为需要加密的请求参数 - Map wbiKeys = await getWbiKeys(); - Map query = params + final Map wbiKeys = await getWbiKeys(); + final Map query = params ..addAll(encWbi(params, wbiKeys['imgKey'], wbiKeys['subKey'])); return query; } diff --git a/pubspec.lock b/pubspec.lock index c16788c0..72dfc752 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -893,6 +893,14 @@ packages: url: "https://pub.flutter-io.cn" source: hosted version: "1.0.4" + nil: + dependency: "direct main" + description: + name: nil + sha256: ef05770c48942876d843bf6a4822d35e5da0ff893a61f1d5ad96d15c4a659136 + url: "https://pub.flutter-io.cn" + source: hosted + version: "1.1.1" nm: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 9545e8cc..22d08355 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -133,6 +133,7 @@ dependencies: gt3_flutter_plugin: ^0.0.8 uuid: ^3.0.7 scrollable_positioned_list: ^0.3.8 + nil: ^1.1.1 dev_dependencies: