Skip to content

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

fix danmaku (#720)

ErBW_se1cbf54f38f9
diff --git a/lib/pages/player/player_item.dart b/lib/pages/player/player_item.dart
index 87a21ab6..52928e66 100644
--- a/lib/pages/player/player_item.dart
+++ b/lib/pages/player/player_item.dart
@@ -167,14 +167,23 @@ class _PlayerItemState extends State<PlayerItem>
});
}
- void _handleDanmaku() {
+ void handleDanmaku() {
+ danmakuController.clear();
+ // if true, turn off danmaku.
+ if (playerController.danmakuOn) {
+ setState(() {
+ playerController.danmakuOn = false;
+ });
+ return;
+ }
+ // if false and empty, show dialog.
if (playerController.danDanmakus.isEmpty) {
showDanmakuSwitch();
return;
}
- danmakuController.clear();
+ // turn on danmaku.
setState(() {
- playerController.danmakuOn = !playerController.danmakuOn;
+ playerController.danmakuOn = true;
});
}
@@ -692,7 +701,7 @@ class _PlayerItemState extends State<PlayerItem>
// D键盘被按下
if (event.logicalKey ==
LogicalKeyboardKey.keyD) {
- _handleDanmaku();
+ handleDanmaku();
}
} else if (event is KeyRepeatEvent) {
// 右方向键长按
@@ -815,6 +824,7 @@ class _PlayerItemState extends State<PlayerItem>
sendDanmaku: widget.sendDanmaku,
startHideTimer: startHideTimer,
cancelHideTimer: cancelHideTimer,
+ handleDanmaku: handleDanmaku,
)
: SmallestPlayerItemPanel(
onBackPressed: widget.onBackPressed,
@@ -829,6 +839,7 @@ class _PlayerItemState extends State<PlayerItem>
handleHove: _handleHove,
startHideTimer: startHideTimer,
cancelHideTimer: cancelHideTimer,
+ handleDanmaku: handleDanmaku,
),
// 播放器手势控制
Positioned.fill(
diff --git a/lib/pages/player/player_item_panel.dart b/lib/pages/player/player_item_panel.dart
index 3072a994..64198ade 100644
--- a/lib/pages/player/player_item_panel.dart
+++ b/lib/pages/player/player_item_panel.dart
@@ -34,6 +34,7 @@ class PlayerItemPanel extends StatefulWidget {
required this.sendDanmaku,
required this.startHideTimer,
required this.cancelHideTimer,
+ required this.handleDanmaku,
});
final void Function(BuildContext) onBackPressed;
@@ -48,6 +49,7 @@ class PlayerItemPanel extends StatefulWidget {
final FocusNode keyboardFocus;
final void Function() startHideTimer;
final void Function() cancelHideTimer;
+ final void Function() handleDanmaku;
final void Function(String) sendDanmaku;
@override
@@ -84,15 +86,6 @@ class _PlayerItemPanelState extends State<PlayerItemPanel> {
}
}
- void _handleDanmaku() {
- if (playerController.danDanmakus.isEmpty) {
- widget.showDanmakuSwitch();
- return;
- }
- playerController.danmakuController.onClear();
- playerController.danmakuOn = !playerController.danmakuOn;
- }
-
Widget get danmakuTextField {
return Container(
constraints: Utils.isDesktop()
@@ -859,8 +852,7 @@ class _PlayerItemPanelState extends State<PlayerItemPanel> {
: Icons
.subtitles_off_rounded),
onPressed: () {
- _handleDanmaku();
- setState(() {});
+ widget.handleDanmaku();
},
tooltip:
playerController.danmakuOn
@@ -918,8 +910,7 @@ class _PlayerItemPanelState extends State<PlayerItemPanel> {
? Icons.subtitles_rounded
: Icons.subtitles_off_rounded),
onPressed: () {
- _handleDanmaku();
- setState(() {});
+ widget.handleDanmaku();
},
tooltip: playerController.danmakuOn
? '关闭弹幕(d)'
diff --git a/lib/pages/player/smallest_player_item_panel.dart b/lib/pages/player/smallest_player_item_panel.dart
index d238f044..72e0b4c5 100644
--- a/lib/pages/player/smallest_player_item_panel.dart
+++ b/lib/pages/player/smallest_player_item_panel.dart
@@ -31,11 +31,13 @@ class SmallestPlayerItemPanel extends StatefulWidget {
required this.handleHove,
required this.startHideTimer,
required this.cancelHideTimer,
+ required this.handleDanmaku,
});
final void Function(BuildContext) onBackPressed;
final Future<void> Function(double) setPlaybackSpeed;
final void Function() showDanmakuSwitch;
+ final void Function() handleDanmaku;
final void Function() handleFullscreen;
final void Function(ThumbDragDetails details) handleProgressBarDragStart;
final void Function() handleProgressBarDragEnd;
@@ -62,15 +64,6 @@ class _SmallestPlayerItemPanelState extends State<SmallestPlayerItemPanel> {
final PlayerController playerController = Modular.get<PlayerController>();
final TextEditingController textController = TextEditingController();
- void _handleDanmaku() {
- if (playerController.danDanmakus.isEmpty) {
- widget.showDanmakuSwitch();
- return;
- }
- playerController.danmakuController.onClear();
- playerController.danmakuOn = !playerController.danmakuOn;
- }
-
void showVideoInfo() async {
String currentDemux = await Utils.getCurrentDemux();
KazumiDialog.show(
@@ -408,8 +401,7 @@ class _SmallestPlayerItemPanelState extends State<SmallestPlayerItemPanel> {
? Icons.subtitles_rounded
: Icons.subtitles_off_rounded),
onPressed: () {
- _handleDanmaku();
- setState(() {});
+ widget.handleDanmaku();
},
tooltip: playerController.danmakuOn ? '关闭弹幕' : '打开弹幕',
),