基于自定义规则的番剧采集APP,支持流媒体在线观看,支持弹幕,支持实时超分辨率。
Add a gradient background to the top and bottom edges.
AnxuNA48c8d260fc06
diff --git a/lib/pages/player/player_item.dart b/lib/pages/player/player_item.dartindex 3a0bff79..9bba256f 100644--- a/lib/pages/player/player_item.dart+++ b/lib/pages/player/player_item.dart@@ -32,8 +32,7 @@ import 'package:kazumi/pages/settings/danmaku/danmaku_settings_window.dart';import 'package:kazumi/utils/constants.dart';class PlayerItem extends StatefulWidget {- const PlayerItem(- {super.key, required this.openMenu, required this.locateEpisode});+ const PlayerItem({super.key, required this.openMenu, required this.locateEpisode});final VoidCallback openMenu;final VoidCallback locateEpisode;@@ -43,18 +42,13 @@ class PlayerItem extends StatefulWidget {}class _PlayerItemState extends State<PlayerItem>- with- WindowListener,- WidgetsBindingObserver,- SingleTickerProviderStateMixin {+ with WindowListener, WidgetsBindingObserver, SingleTickerProviderStateMixin {Box setting = GStorage.setting;final PlayerController playerController = Modular.get<PlayerController>();- final VideoPageController videoPageController =- Modular.get<VideoPageController>();+ final VideoPageController videoPageController = Modular.get<VideoPageController>();final HistoryController historyController = Modular.get<HistoryController>();final InfoController infoController = Modular.get<InfoController>();- final FavoriteController favoriteController =- Modular.get<FavoriteController>();+ final FavoriteController favoriteController = Modular.get<FavoriteController>();final FocusNode _focusNode = FocusNode();late DanmakuController danmakuController;late bool isFavorite;@@ -208,8 +202,7 @@ class _PlayerItemState extends State<PlayerItem>content: SelectableText.rich(TextSpan(children: [- TextSpan(- text: '规则: ${videoPageController.currentPlugin.name}\n'),+ TextSpan(text: '规则: ${videoPageController.currentPlugin.name}\n'),TextSpan(text: '硬件解码: ${haEnable ? '启用' : '禁用'}\n'),TextSpan(text: '解复用器: $currentDemux\n'),const TextSpan(text: '资源地址: '),@@ -230,24 +223,18 @@ class _PlayerItemState extends State<PlayerItem>getPlayerTimer() {return Timer.periodic(const Duration(seconds: 1), (timer) {playerController.playing = playerController.mediaPlayer.value.isPlaying;- playerController.isBuffering =- playerController.mediaPlayer.value.isBuffering;- playerController.currentPosition =- playerController.mediaPlayer.value.position;- playerController.buffer =- playerController.mediaPlayer.value.buffered.isEmpty- ? Duration.zero- : playerController.mediaPlayer.value.buffered[0].end;+ playerController.isBuffering = playerController.mediaPlayer.value.isBuffering;+ playerController.currentPosition = playerController.mediaPlayer.value.position;+ playerController.buffer = playerController.mediaPlayer.value.buffered.isEmpty+ ? Duration.zero+ : playerController.mediaPlayer.value.buffered[0].end;playerController.duration = playerController.mediaPlayer.value.duration;- playerController.completed =- playerController.mediaPlayer.value.isCompleted;+ playerController.completed = playerController.mediaPlayer.value.isCompleted;// 弹幕相关if (playerController.currentPosition.inMicroseconds != 0 &&playerController.mediaPlayer.value.isPlaying == true &&playerController.danmakuOn == true) {- playerController.danDanmakus[playerController.currentPosition.inSeconds]- ?.asMap()- .forEach((idx, danmaku) async {+ playerController.danDanmakus[playerController.currentPosition.inSeconds]?.asMap().forEach((idx, danmaku) async {if (!_danmakuColor) {danmaku.color = Colors.white;}@@ -257,31 +244,22 @@ class _PlayerItemState extends State<PlayerItem>if (!_danmakuGamerSource && danmaku.source.contains('Gamer')) {return;}- if (!_danmakuDanDanSource &&- !(danmaku.source.contains('BiliBili') ||- danmaku.source.contains('Gamer'))) {+ if (!_danmakuDanDanSource && !(danmaku.source.contains('BiliBili') || danmaku.source.contains('Gamer'))) {return;}await Future.delayed(Duration(- milliseconds: idx *- 1000 ~/- playerController- .danDanmakus[- playerController.currentPosition.inSeconds]!- .length),+ milliseconds:+ idx * 1000 ~/ playerController.danDanmakus[playerController.currentPosition.inSeconds]!.length),() => mounted &&playerController.mediaPlayer.value.isPlaying &&!playerController.mediaPlayer.value.isBuffering &&playerController.danmakuOn- ? danmakuController.addDanmaku(DanmakuContentItem(- danmaku.message,+ ? danmakuController.addDanmaku(DanmakuContentItem(danmaku.message,color: danmaku.color,type: danmaku.type == 4? DanmakuItemType.bottom- : (danmaku.type == 5- ? DanmakuItemType.top- : DanmakuItemType.scroll)))+ : (danmaku.type == 5 ? DanmakuItemType.top : DanmakuItemType.scroll))): null);});}@@ -292,17 +270,13 @@ class _PlayerItemState extends State<PlayerItem>});}// 亮度相关- if (!Platform.isWindows &&- !Platform.isMacOS &&- !Platform.isLinux &&- !brightnessSeeking) {+ if (!Platform.isWindows && !Platform.isMacOS && !Platform.isLinux && !brightnessSeeking) {ScreenBrightness().current.then((value) {playerController.brightness = value;});}// 历史记录相关- if (playerController.mediaPlayer.value.isPlaying &&- !videoPageController.loading) {+ if (playerController.mediaPlayer.value.isPlaying && !videoPageController.loading) {historyController.updateHistory(videoPageController.currentEpisode,videoPageController.currentRoad,@@ -310,22 +284,20 @@ class _PlayerItemState extends State<PlayerItem>infoController.bangumiItem,playerController.mediaPlayer.value.position,videoPageController.src,- videoPageController.roadList[videoPageController.currentRoad]- .identifier[videoPageController.currentEpisode - 1]);+ videoPageController+ .roadList[videoPageController.currentRoad].identifier[videoPageController.currentEpisode - 1]);}// 自动播放下一集if (playerController.completed &&videoPageController.currentEpisode <- videoPageController- .roadList[videoPageController.currentRoad].data.length &&+ videoPageController.roadList[videoPageController.currentRoad].data.length &&!videoPageController.loading) {SmartDialog.showToast('正在加载${videoPageController.roadList[videoPageController.currentRoad].identifier[videoPageController.currentEpisode]}');try {playerTimer!.cancel();} catch (_) {}- videoPageController.changeEpisode(- videoPageController.currentEpisode + 1,+ videoPageController.changeEpisode(videoPageController.currentEpisode + 1,currentRoad: videoPageController.currentRoad);}});@@ -380,14 +352,12 @@ class _PlayerItemState extends State<PlayerItem>Utils.enterFullScreen();videoPageController.showTabBody = false;}- videoPageController.androidFullscreen =- !videoPageController.androidFullscreen;+ videoPageController.androidFullscreen = !videoPageController.androidFullscreen;}void _handleDanmaku() {if (playerController.danDanmakus.isEmpty) {- SmartDialog.showToast('当前剧集没有找到弹幕的说 尝试手动检索',- displayType: SmartToastType.last);+ SmartDialog.showToast('当前剧集没有找到弹幕的说 尝试手动检索', displayType: SmartToastType.last);showDanmakuSwitch();return;}@@ -404,8 +374,7 @@ class _PlayerItemState extends State<PlayerItem>builder: (context) {return AlertDialog(title: const Text('发送弹幕'),- content: StatefulBuilder(- builder: (BuildContext context, StateSetter setState) {+ content: StatefulBuilder(builder: (BuildContext context, StateSetter setState) {return TextField(controller: textController,);@@ -415,12 +384,10 @@ class _PlayerItemState extends State<PlayerItem>onPressed: () => SmartDialog.dismiss(),child: Text('取消',- style:- TextStyle(color: Theme.of(context).colorScheme.outline),+ style: TextStyle(color: Theme.of(context).colorScheme.outline),),),- StatefulBuilder(- builder: (BuildContext context, StateSetter setState) {+ StatefulBuilder(builder: (BuildContext context, StateSetter setState) {return TextButton(onPressed: isSending? null@@ -442,8 +409,7 @@ class _PlayerItemState extends State<PlayerItem>isSending = false; // 发送结束,更新状态});SmartDialog.showToast('发送成功');- danmakuController.addDanmaku(- DanmakuContentItem(msg, selfSend: true));+ danmakuController.addDanmaku(DanmakuContentItem(msg, selfSend: true));SmartDialog.dismiss();},child: Text(isSending ? '发送中' : '发送'),@@ -462,8 +428,7 @@ class _PlayerItemState extends State<PlayerItem>builder: (context) {return AlertDialog(title: const Text('播放速度'),- content: StatefulBuilder(- builder: (BuildContext context, StateSetter setState) {+ content: StatefulBuilder(builder: (BuildContext context, StateSetter setState) {return Wrap(spacing: 8,runSpacing: 2,@@ -495,8 +460,7 @@ class _PlayerItemState extends State<PlayerItem>onPressed: () => SmartDialog.dismiss(),child: Text('取消',- style:- TextStyle(color: Theme.of(context).colorScheme.outline),+ style: TextStyle(color: Theme.of(context).colorScheme.outline),),),TextButton(@@ -517,8 +481,7 @@ class _PlayerItemState extends State<PlayerItem>DanmakuSearchResponse danmakuSearchResponse;DanmakuEpisodeResponse danmakuEpisodeResponse;try {- danmakuSearchResponse =- await DanmakuRequest.getDanmakuSearchResponse(keyword);+ danmakuSearchResponse = await DanmakuRequest.getDanmakuSearchResponse(keyword);} catch (e) {SmartDialog.dismiss();SmartDialog.showToast('检索弹幕失败 ${e.toString()}');@@ -542,9 +505,7 @@ class _PlayerItemState extends State<PlayerItem>SmartDialog.dismiss();SmartDialog.showLoading(msg: '弹幕检索中');try {- danmakuEpisodeResponse =- await DanmakuRequest.getDanDanEpisodesByBangumiID(- danmakuInfo.animeId);+ danmakuEpisodeResponse = await DanmakuRequest.getDanDanEpisodesByBangumiID(danmakuInfo.animeId);} catch (e) {SmartDialog.dismiss();SmartDialog.showToast('检索弹幕失败 ${e.toString()}');@@ -561,15 +522,13 @@ class _PlayerItemState extends State<PlayerItem>return Dialog(child: ListView(shrinkWrap: true,- children: danmakuEpisodeResponse.episodes- .map((episode) {+ children: danmakuEpisodeResponse.episodes.map((episode) {return ListTile(title: Text(episode.episodeTitle),onTap: () {SmartDialog.dismiss();SmartDialog.showToast('弹幕切换中');- playerController.getDanDanmakuByEpisodeID(- episode.episodeId);+ playerController.getDanDanmakuByEpisodeID(episode.episodeId);},);}).toList(),@@ -594,8 +553,7 @@ class _PlayerItemState extends State<PlayerItem>_focusNode.requestFocus();},builder: (context) {- final TextEditingController searchTextController =- TextEditingController();+ final TextEditingController searchTextController = TextEditingController();return AlertDialog(title: const Text('弹幕检索'),content: TextField(@@ -675,8 +633,7 @@ class _PlayerItemState extends State<PlayerItem>super.initState();// workaround for #214if (Platform.isIOS) {- FlutterVolumeController.setIOSAudioSessionCategory(- category: AudioSessionCategory.playback);+ FlutterVolumeController.setIOSAudioSessionCategory(category: AudioSessionCategory.playback);}WidgetsBinding.instance.addObserver(this);_animationController = AnimationController(@@ -705,33 +662,25 @@ class _PlayerItemState extends State<PlayerItem>curve: Curves.easeInOut,));webDavEnable = setting.get(SettingBoxKey.webDavEnable, defaultValue: false);- playerController.danmakuOn =- setting.get(SettingBoxKey.danmakuEnabledByDefault, defaultValue: false);+ playerController.danmakuOn = setting.get(SettingBoxKey.danmakuEnabledByDefault, defaultValue: false);_border = setting.get(SettingBoxKey.danmakuBorder, defaultValue: true);_opacity = setting.get(SettingBoxKey.danmakuOpacity, defaultValue: 1.0);_duration = 8;- _fontSize = setting.get(SettingBoxKey.danmakuFontSize,- defaultValue: (Utils.isCompact()) ? 16.0 : 25.0);+ _fontSize = setting.get(SettingBoxKey.danmakuFontSize, defaultValue: (Utils.isCompact()) ? 16.0 : 25.0);danmakuArea = setting.get(SettingBoxKey.danmakuArea, defaultValue: 1.0);_hideTop = !setting.get(SettingBoxKey.danmakuTop, defaultValue: true);- _hideBottom =- !setting.get(SettingBoxKey.danmakuBottom, defaultValue: false);+ _hideBottom = !setting.get(SettingBoxKey.danmakuBottom, defaultValue: false);_hideScroll = !setting.get(SettingBoxKey.danmakuScroll, defaultValue: true);- _massiveMode =- setting.get(SettingBoxKey.danmakuMassive, defaultValue: false);+ _massiveMode = setting.get(SettingBoxKey.danmakuMassive, defaultValue: false);_danmakuColor = setting.get(SettingBoxKey.danmakuColor, defaultValue: true);- _danmakuBiliBiliSource =- setting.get(SettingBoxKey.danmakuBiliBiliSource, defaultValue: true);- _danmakuGamerSource =- setting.get(SettingBoxKey.danmakuGamerSource, defaultValue: true);- _danmakuDanDanSource =- setting.get(SettingBoxKey.danmakuDanDanSource, defaultValue: true);+ _danmakuBiliBiliSource = setting.get(SettingBoxKey.danmakuBiliBiliSource, defaultValue: true);+ _danmakuGamerSource = setting.get(SettingBoxKey.danmakuGamerSource, defaultValue: true);+ _danmakuDanDanSource = setting.get(SettingBoxKey.danmakuDanDanSource, defaultValue: true);_danmakuFontWeight = setting.get(SettingBoxKey.danmakuFontWeight, defaultValue: 4);haEnable = setting.get(SettingBoxKey.hAenable, defaultValue: true);playerTimer = getPlayerTimer();windowManager.addListener(this);- if (Platform.isIOS &&- setting.get(SettingBoxKey.hAenable, defaultValue: true)) {+ if (Platform.isIOS && setting.get(SettingBoxKey.hAenable, defaultValue: true)) {playSpeedList = defaultPlaySpeedList;} else {playSpeedList = defaultPlaySpeedList + extendPlaySpeedList;@@ -786,8 +735,7 @@ class _PlayerItemState extends State<PlayerItem>if (pointerSignal is PointerScrollEvent) {_handleMouseScroller();final scrollDelta = pointerSignal.scrollDelta;- final double volume =- playerController.volume - scrollDelta.dy / 6000;+ final double volume = playerController.volume - scrollDelta.dy / 6000;final double result = volume.clamp(0.0, 1.0);setVolume(result);playerController.volume = result;@@ -804,13 +752,11 @@ class _PlayerItemState extends State<PlayerItem>try {playerController.playOrPause();} catch (e) {- KazumiLogger()- .log(Level.error, '播放器内部错误 ${e.toString()}');+ KazumiLogger().log(Level.error, '播放器内部错误 ${e.toString()}');}}// 右方向键被按下- if (event.logicalKey ==- LogicalKeyboardKey.arrowRight) {+ if (event.logicalKey == LogicalKeyboardKey.arrowRight) {lastPlayerSpeed = playerController.playerSpeed;if (keyShortPressTimer != null) {keyShortPressTimer!.cancel();@@ -820,10 +766,8 @@ class _PlayerItemState extends State<PlayerItem>});}// 左方向键被按下- if (event.logicalKey ==- LogicalKeyboardKey.arrowLeft) {- int targetPosition =- playerController.currentPosition.inSeconds - 10;+ if (event.logicalKey == LogicalKeyboardKey.arrowLeft) {+ int targetPosition = playerController.currentPosition.inSeconds - 10;if (targetPosition < 0) {targetPosition = 0;}@@ -831,24 +775,20 @@ class _PlayerItemState extends State<PlayerItem>if (playerTimer != null) {playerTimer!.cancel();}- playerController.currentPosition =- Duration(seconds: targetPosition);- playerController- .seek(playerController.currentPosition);+ playerController.currentPosition = Duration(seconds: targetPosition);+ playerController.seek(playerController.currentPosition);playerTimer = getPlayerTimer();} catch (e) {KazumiLogger().log(Level.error, e.toString());}}// 上方向键被按下- if (event.logicalKey ==- LogicalKeyboardKey.arrowUp) {+ if (event.logicalKey == LogicalKeyboardKey.arrowUp) {increaseVolume();_handleKeyChangingVolume();}// 下方向键被按下- if (event.logicalKey ==- LogicalKeyboardKey.arrowDown) {+ if (event.logicalKey == LogicalKeyboardKey.arrowDown) {decreaseVolume();_handleKeyChangingVolume();}@@ -859,8 +799,7 @@ class _PlayerItemState extends State<PlayerItem>danmakuController.onClear();} catch (_) {}Utils.exitFullScreen();- videoPageController.androidFullscreen =- !videoPageController.androidFullscreen;+ videoPageController.androidFullscreen = !videoPageController.androidFullscreen;} else if (!Platform.isMacOS) {windowManager.hide();}@@ -875,8 +814,7 @@ class _PlayerItemState extends State<PlayerItem>}} else if (event is KeyRepeatEvent) {// 右方向键长按- if (event.logicalKey ==- LogicalKeyboardKey.arrowRight) {+ if (event.logicalKey == LogicalKeyboardKey.arrowRight) {if (playerController.playerSpeed < 2.0) {setState(() {showPlaySpeed = true;@@ -886,31 +824,24 @@ class _PlayerItemState extends State<PlayerItem>}} else if (event is KeyUpEvent) {// 右方向键抬起- if (event.logicalKey ==- LogicalKeyboardKey.arrowRight) {+ if (event.logicalKey == LogicalKeyboardKey.arrowRight) {if (keyShortPressTimer == null) {setState(() {showPlaySpeed = false;});- playerController- .setPlaybackSpeed(lastPlayerSpeed);+ playerController.setPlaybackSpeed(lastPlayerSpeed);} else {keyShortPressTimer = null;try {if (playerTimer != null) {playerTimer!.cancel();}- playerController.currentPosition = Duration(- seconds: playerController- .currentPosition.inSeconds +- 10);- playerController- .seek(playerController.currentPosition);+ playerController.currentPosition =+ Duration(seconds: playerController.currentPosition.inSeconds + 10);+ playerController.seek(playerController.currentPosition);playerTimer = getPlayerTimer();} catch (e) {- KazumiLogger()- .log(Level.error,- '播放器内部错误 ${e.toString()}');+ KazumiLogger().log(Level.error, '播放器内部错误 ${e.toString()}');}}}@@ -919,14 +850,11 @@ class _PlayerItemState extends State<PlayerItem>child: SizedBox(height: videoPageController.androidFullscreen? (MediaQuery.of(context).size.height)- : (MediaQuery.of(context).size.width *- 9.0 /- (16.0)),+ : (MediaQuery.of(context).size.width * 9.0 / (16.0)),width: MediaQuery.of(context).size.width,child: Stack(alignment: Alignment.center, children: [Center(child: playerSurface),- (playerController.isBuffering ||- videoPageController.loading)+ (playerController.isBuffering || videoPageController.loading)? const Positioned.fill(child: Center(child: CircularProgressIndicator(),@@ -967,8 +895,7 @@ class _PlayerItemState extends State<PlayerItem>setState(() {showPlaySpeed = false;});- playerController- .setPlaybackSpeed(lastPlayerSpeed);+ playerController.setPlaybackSpeed(lastPlayerSpeed);},child: Container(color: Colors.transparent,@@ -977,6 +904,60 @@ class _PlayerItemState extends State<PlayerItem>),),+ //顶部渐变区域+ AnimatedPositioned(+ duration: const Duration(seconds: 1),+ top: 0,+ left: 0,+ right: 0,+ child: Visibility(+ visible: !lockPanel,+ child: SlideTransition(+ position: _topOffsetAnimation,+ child: Container(+ height: 50,+ decoration: BoxDecoration(+ gradient: LinearGradient(+ begin: Alignment.topCenter,+ end: Alignment.bottomCenter,+ colors: [+ Colors.black.withOpacity(0.9),+ Colors.transparent,+ ],+ ),+ ),+ ),+ ),+ ),+ ),++ //底部渐变区域+ AnimatedPositioned(+ duration: const Duration(seconds: 1),+ bottom: 0,+ left: 0,+ right: 0,+ child: Visibility(+ visible: !lockPanel,+ child: SlideTransition(+ position: _bottomOffsetAnimation,+ child: Container(+ height: 50,+ decoration: BoxDecoration(+ gradient: LinearGradient(+ begin: Alignment.topCenter,+ end: Alignment.bottomCenter,+ colors: [+ Colors.transparent,+ Colors.black.withOpacity(0.9),+ ],+ ),+ ),+ ),+ ),+ ),+ ),+// 播放器手势控制Positioned.fill(left: 16,@@ -985,8 +966,7 @@ class _PlayerItemState extends State<PlayerItem>bottom: 15,child: (Utils.isDesktop() || lockPanel)? Container()- : GestureDetector(onHorizontalDragUpdate:- (DragUpdateDetails details) {+ : GestureDetector(onHorizontalDragUpdate: (DragUpdateDetails details) {setState(() {showPosition = true;});@@ -994,39 +974,26 @@ class _PlayerItemState extends State<PlayerItem>playerTimer!.cancel();}playerController.pause();- final double scale = 180000 /- MediaQuery.sizeOf(context).width;- playerController.currentPosition =- Duration(- milliseconds: playerController- .currentPosition- .inMilliseconds +- (details.delta.dx * scale)- .round());- }, onHorizontalDragEnd:- (DragEndDetails details) {+ final double scale = 180000 / MediaQuery.sizeOf(context).width;+ playerController.currentPosition = Duration(+ milliseconds: playerController.currentPosition.inMilliseconds ++ (details.delta.dx * scale).round());+ }, onHorizontalDragEnd: (DragEndDetails details) {playerController.play();- playerController.seek(- playerController.currentPosition);+ playerController.seek(playerController.currentPosition);playerTimer = getPlayerTimer();setState(() {showPosition = false;});- }, onVerticalDragUpdate:- (DragUpdateDetails details) async {- final double totalWidth =- MediaQuery.sizeOf(context).width;- final double totalHeight =- MediaQuery.sizeOf(context).height;- final double tapPosition =- details.localPosition.dx;- final double sectionWidth =- totalWidth / 2;+ }, onVerticalDragUpdate: (DragUpdateDetails details) async {+ final double totalWidth = MediaQuery.sizeOf(context).width;+ final double totalHeight = MediaQuery.sizeOf(context).height;+ final double tapPosition = details.localPosition.dx;+ final double sectionWidth = totalWidth / 2;final double delta = details.delta.dy;/// 非全屏时禁用- if (!videoPageController- .androidFullscreen) {+ if (!videoPageController.androidFullscreen) {return;}if (tapPosition < sectionWidth) {@@ -1036,11 +1003,8 @@ class _PlayerItemState extends State<PlayerItem>showBrightness = true;});final double level = (totalHeight) * 2;- final double brightness =- playerController.brightness -- delta / level;- final double result =- brightness.clamp(0.0, 1.0);+ final double brightness = playerController.brightness - delta / level;+ final double result = brightness.clamp(0.0, 1.0);setBrightness(result);playerController.brightness = result;} else {@@ -1050,16 +1014,12 @@ class _PlayerItemState extends State<PlayerItem>showVolume = true;});final double level = (totalHeight) * 3;- final double volume =- playerController.volume -- delta / level;- final double result =- volume.clamp(0.0, 1.0);+ final double volume = playerController.volume - delta / level;+ final double result = volume.clamp(0.0, 1.0);setVolume(result);playerController.volume = result;}- }, onVerticalDragEnd:- (DragEndDetails details) {+ }, onVerticalDragEnd: (DragEndDetails details) {if (volumeSeeking) {volumeSeeking = false;}@@ -1081,18 +1041,12 @@ class _PlayerItemState extends State<PlayerItem>Container(padding: const EdgeInsets.all(8.0),decoration: BoxDecoration(- color:- Colors.black.withOpacity(0.5),- borderRadius: BorderRadius.circular(- 8.0), // 圆角+ color: Colors.black.withOpacity(0.5),+ borderRadius: BorderRadius.circular(8.0), // 圆角),child: Text(playerController.currentPosition- .compareTo(- playerController- .mediaPlayer- .value- .position) >+ .compareTo(playerController.mediaPlayer.value.position) >0? '快进 ${playerController.currentPosition.inSeconds - playerController.mediaPlayer.value.position.inSeconds} 秒': '快退 ${playerController.mediaPlayer.value.position.inSeconds - playerController.currentPosition.inSeconds} 秒',@@ -1114,15 +1068,12 @@ class _PlayerItemState extends State<PlayerItem>Container(padding: const EdgeInsets.all(8.0),decoration: BoxDecoration(- color:- Colors.black.withOpacity(0.5),- borderRadius: BorderRadius.circular(- 8.0), // 圆角+ color: Colors.black.withOpacity(0.5),+ borderRadius: BorderRadius.circular(8.0), // 圆角),child: const Row(children: <Widget>[- Icon(Icons.fast_forward,- color: Colors.white),+ Icon(Icons.fast_forward, color: Colors.white),Text(' 倍速播放',style: TextStyle(@@ -1145,16 +1096,12 @@ class _PlayerItemState extends State<PlayerItem>Container(padding: const EdgeInsets.all(8.0),decoration: BoxDecoration(- color:- Colors.black.withOpacity(0.5),- borderRadius:- BorderRadius.circular(- 8.0), // 圆角+ color: Colors.black.withOpacity(0.5),+ borderRadius: BorderRadius.circular(8.0), // 圆角),child: Row(children: <Widget>[- const Icon(Icons.brightness_7,- color: Colors.white),+ const Icon(Icons.brightness_7, color: Colors.white),Text(' ${(playerController.brightness * 100).toInt()} %',style: const TextStyle(@@ -1176,16 +1123,12 @@ class _PlayerItemState extends State<PlayerItem>Container(padding: const EdgeInsets.all(8.0),decoration: BoxDecoration(- color:- Colors.black.withOpacity(0.5),- borderRadius:- BorderRadius.circular(- 8.0), // 圆角+ color: Colors.black.withOpacity(0.5),+ borderRadius: BorderRadius.circular(8.0), // 圆角),child: Row(children: <Widget>[- const Icon(Icons.volume_down,- color: Colors.white),+ const Icon(Icons.volume_down, color: Colors.white),Text(' ${(playerController.volume * 100).toInt()}%',style: const TextStyle(@@ -1228,8 +1171,7 @@ class _PlayerItemState extends State<PlayerItem>),// 右侧锁定按钮- (Utils.isDesktop() ||- !videoPageController.androidFullscreen)+ (Utils.isDesktop() || !videoPageController.androidFullscreen)? Container(): Positioned(right: 0,@@ -1239,9 +1181,7 @@ class _PlayerItemState extends State<PlayerItem>position: _leftOffsetAnimation,child: IconButton(icon: Icon(- lockPanel- ? Icons.lock_outline- : Icons.lock_open,+ lockPanel ? Icons.lock_outline : Icons.lock_open,color: Colors.white,),onPressed: () {@@ -1276,21 +1216,16 @@ class _PlayerItemState extends State<PlayerItem>' ${videoPageController.title} [${videoPageController.roadList[videoPageController.currentRoad].identifier[videoPageController.currentEpisode - 1]}]',style: TextStyle(color: Colors.white,- fontSize: Theme.of(context)- .textTheme- .titleMedium!- .fontSize),+ fontSize: Theme.of(context).textTheme.titleMedium!.fontSize),): Container(),// 拖动条const Expanded(- child: dtb.DragToMoveArea(- child: SizedBox(height: 40)),+ child: dtb.DragToMoveArea(child: SizedBox(height: 40)),),TextButton(style: ButtonStyle(- padding: WidgetStateProperty.all(- EdgeInsets.zero),+ padding: WidgetStateProperty.all(EdgeInsets.zero),),onPressed: () {// 倍速播放@@ -1308,33 +1243,24 @@ class _PlayerItemState extends State<PlayerItem>color: Colors.white,icon: const Icon(Icons.cast),onPressed: () {- if (videoPageController- .currentPlugin.referer ==- '') {+ if (videoPageController.currentPlugin.referer == '') {playerController.pause();RemotePlay().castVideo(context);} else {- SmartDialog.showToast('暂不支持该播放源',- displayType:- SmartToastType.onlyRefresh);+ SmartDialog.showToast('暂不支持该播放源', displayType: SmartToastType.onlyRefresh);}},),// 追番IconButton(- icon: Icon(- isFavorite- ? Icons.favorite- : Icons.favorite_outline,+ icon: Icon(isFavorite ? Icons.favorite : Icons.favorite_outline,color: Colors.white),onPressed: () async {if (isFavorite) {- favoriteController.deleteFavorite(- infoController.bangumiItem);+ favoriteController.deleteFavorite(infoController.bangumiItem);SmartDialog.showToast('取消追番成功');} else {- favoriteController.addFavorite(- infoController.bangumiItem);+ favoriteController.addFavorite(infoController.bangumiItem);SmartDialog.showToast('自己追的番要好好看完哦');}setState(() {@@ -1380,9 +1306,7 @@ class _PlayerItemState extends State<PlayerItem>builder: (context) {return SizedBox(height: 440,- child: DanmakuSettingsWindow(- danmakuController:- danmakuController));+ child: DanmakuSettingsWindow(danmakuController: danmakuController));});}if (value == 1) {@@ -1411,9 +1335,7 @@ class _PlayerItemState extends State<PlayerItem>children: [IconButton(color: Colors.white,- icon: Icon(playerController.playing- ? Icons.pause- : Icons.play_arrow),+ icon: Icon(playerController.playing ? Icons.pause : Icons.play_arrow),onPressed: () {if (playerController.playing) {playerController.pause();@@ -1423,9 +1345,7 @@ class _PlayerItemState extends State<PlayerItem>},),// 更换选集- (videoPageController.androidFullscreen ||- Utils.isTablet() ||- Utils.isDesktop())+ (videoPageController.androidFullscreen || Utils.isTablet() || Utils.isDesktop())? IconButton(color: Colors.white,icon: const Icon(Icons.skip_next),@@ -1433,65 +1353,44 @@ class _PlayerItemState extends State<PlayerItem>if (videoPageController.loading) {return;}- if (videoPageController- .currentEpisode ==+ if (videoPageController.currentEpisode ==videoPageController- .roadList[- videoPageController- .currentRoad]- .data- .length) {- SmartDialog.showToast('已经是最新一集',- displayType:- SmartToastType.last);+ .roadList[videoPageController.currentRoad].data.length) {+ SmartDialog.showToast('已经是最新一集', displayType: SmartToastType.last);return;}SmartDialog.showToast('正在加载${videoPageController.roadList[videoPageController.currentRoad].identifier[videoPageController.currentEpisode]}');- videoPageController.changeEpisode(- videoPageController- .currentEpisode +- 1,- currentRoad:- videoPageController- .currentRoad);+ videoPageController.changeEpisode(videoPageController.currentEpisode + 1,+ currentRoad: videoPageController.currentRoad);},): Container(),Expanded(child: ProgressBar(- timeLabelLocation:- TimeLabelLocation.none,- progress:- playerController.currentPosition,+ timeLabelLocation: TimeLabelLocation.none,+ progress: playerController.currentPosition,buffered: playerController.buffer,total: playerController.duration,onSeek: (duration) {if (playerTimer != null) {playerTimer!.cancel();}- playerController.currentPosition =- duration;+ playerController.currentPosition = duration;playerController.seek(duration);- playerTimer =- getPlayerTimer(); //Bug_time+ playerTimer = getPlayerTimer(); //Bug_time},),),- ((Utils.isCompact()) &&- !videoPageController- .androidFullscreen)+ ((Utils.isCompact()) && !videoPageController.androidFullscreen)? Container(): Container(- padding: const EdgeInsets.only(- left: 10.0),+ padding: const EdgeInsets.only(left: 10.0),child: Text("${Utils.durationToString(playerController.currentPosition)} / ${Utils.durationToString(playerController.duration)}",style: TextStyle(color: Colors.white,- fontSize: !Utils.isCompact()- ? 16.0- : 12.0,+ fontSize: !Utils.isCompact() ? 16.0 : 12.0,),),),@@ -1501,12 +1400,9 @@ class _PlayerItemState extends State<PlayerItem>color: Colors.white,icon: const Icon(Icons.notes),onPressed: () {- if (playerController- .danDanmakus.isEmpty) {- SmartDialog.showToast(- '当前剧集不支持弹幕发送的说',- displayType:- SmartToastType.last);+ if (playerController.danDanmakus.isEmpty) {+ SmartDialog.showToast('当前剧集不支持弹幕发送的说',+ displayType: SmartToastType.last);return;}showShootDanmakuSheet();@@ -1515,45 +1411,36 @@ class _PlayerItemState extends State<PlayerItem>: Container(),IconButton(color: Colors.white,- icon: Icon(playerController.danmakuOn- ? Icons.comment- : Icons.comments_disabled),+ icon: Icon(playerController.danmakuOn ? Icons.comment : Icons.comments_disabled),onPressed: () {_handleDanmaku();},),- (!videoPageController.androidFullscreen &&- !Utils.isTablet() &&- !Utils.isDesktop())+ (!videoPageController.androidFullscreen && !Utils.isTablet() && !Utils.isDesktop())? Container(): IconButton(color: Colors.white,- icon: Icon(- videoPageController.showTabBody- ? Icons.menu_open- : Icons.menu_open_outlined),+ icon: Icon(videoPageController.showTabBody+ ? Icons.menu_open+ : Icons.menu_open_outlined),onPressed: () {- videoPageController.showTabBody =- !videoPageController- .showTabBody;+ videoPageController.showTabBody = !videoPageController.showTabBody;widget.openMenu();},),(Utils.isTablet() &&- videoPageController.androidFullscreen &&- MediaQuery.of(context).size.height <- MediaQuery.of(context).size.width)+ videoPageController.androidFullscreen &&+ MediaQuery.of(context).size.height < MediaQuery.of(context).size.width)? Container()- : IconButton(- color: Colors.white,- icon: Icon(- videoPageController.androidFullscreen- ? Icons.fullscreen_exit- : Icons.fullscreen),- onPressed: () {- _handleFullscreen();- },- ),+ : IconButton(+ color: Colors.white,+ icon: Icon(videoPageController.androidFullscreen+ ? Icons.fullscreen_exit+ : Icons.fullscreen),+ onPressed: () {+ _handleFullscreen();+ },+ ),],),),