Skip to content

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

feat: danmaku speed follow switch (#1233) (#1461)

林晨6b9a45ecdb48
diff --git a/lib/pages/player/player_controller.dart b/lib/pages/player/player_controller.dart
index c8f063fe..32ccf0cc 100644
--- a/lib/pages/player/player_controller.dart
+++ b/lib/pages/player/player_controller.dart
@@ -402,11 +402,20 @@ abstract class _PlayerController with Store {
this.playerSpeed = playerSpeed;
try {
mediaPlayer!.setRate(playerSpeed);
+ updateDanmakuSpeed();
} catch (e) {
KazumiLogger().log(Level.error, '设置播放速度失败 ${e.toString()}');
}
}
+ void updateDanmakuSpeed() {
+ final baseDuration = setting.get(SettingBoxKey.danmakuDuration, defaultValue: 8.0);
+ final followSpeed = setting.get(SettingBoxKey.danmakuFollowSpeed, defaultValue: true);
+
+ final duration = followSpeed ? (baseDuration ~/ playerSpeed) : baseDuration.toInt();
+ danmakuController.updateOption(danmakuController.option.copyWith(duration: duration));
+ }
+
Future<void> setVolume(double value) async {
value = value.clamp(0.0, 100.0);
volume = value;
diff --git a/lib/pages/player/player_item.dart b/lib/pages/player/player_item.dart
index 8c74efca..4851d266 100644
--- a/lib/pages/player/player_item.dart
+++ b/lib/pages/player/player_item.dart
@@ -94,6 +94,7 @@ class _PlayerItemState extends State<PlayerItem>
late bool _danmakuDanDanSource;
late double _danmakuDuration;
late int _danmakuFontWeight;
+ late bool _danmakuFollowSpeed;
// 硬件解码
late bool haEnable;
@@ -321,10 +322,6 @@ class _PlayerItemState extends State<PlayerItem>
Future<void> setPlaybackSpeed(double speed) async {
await playerController.setPlaybackSpeed(speed);
- playerController.danmakuController.updateOption(
- playerController.danmakuController.option
- .copyWith(duration: _danmakuDuration ~/ speed),
- );
}
Future<void> increaseVolume() async {
@@ -1013,6 +1010,8 @@ class _PlayerItemState extends State<PlayerItem>
setting.get(SettingBoxKey.danmakuDanDanSource, defaultValue: true);
_danmakuFontWeight =
setting.get(SettingBoxKey.danmakuFontWeight, defaultValue: 4);
+ _danmakuFollowSpeed =
+ setting.get(SettingBoxKey.danmakuFollowSpeed, defaultValue: true);
haEnable = setting.get(SettingBoxKey.hAenable, defaultValue: true);
playerTimer = getPlayerTimer();
windowManager.addListener(this);
diff --git a/lib/pages/player/player_item_panel.dart b/lib/pages/player/player_item_panel.dart
index 38e31d81..5dba0380 100644
--- a/lib/pages/player/player_item_panel.dart
+++ b/lib/pages/player/player_item_panel.dart
@@ -756,9 +756,12 @@ class _PlayerItemPanelState extends State<PlayerItemPanel> {
context: context,
builder: (context) {
return DanmakuSettingsSheet(
- danmakuController:
- playerController
- .danmakuController);
+ danmakuController:
+ playerController
+ .danmakuController,
+ onUpdateDanmakuSpeed:
+ playerController.updateDanmakuSpeed,
+ );
});
},
color: Colors.white,
@@ -812,8 +815,11 @@ class _PlayerItemPanelState extends State<PlayerItemPanel> {
context: context,
builder: (context) {
return DanmakuSettingsSheet(
- danmakuController:
- playerController.danmakuController);
+ danmakuController:
+ playerController.danmakuController,
+ onUpdateDanmakuSpeed:
+ playerController.updateDanmakuSpeed,
+ );
});
},
color: Colors.white,
diff --git a/lib/pages/player/smallest_player_item_panel.dart b/lib/pages/player/smallest_player_item_panel.dart
index 21864a84..4564ff87 100644
--- a/lib/pages/player/smallest_player_item_panel.dart
+++ b/lib/pages/player/smallest_player_item_panel.dart
@@ -769,8 +769,11 @@ class _SmallestPlayerItemPanelState extends State<SmallestPlayerItemPanel> {
context: context,
builder: (context) {
return DanmakuSettingsSheet(
- danmakuController:
- playerController.danmakuController);
+ danmakuController:
+ playerController.danmakuController,
+ onUpdateDanmakuSpeed:
+ playerController.updateDanmakuSpeed,
+ );
},
);
},
diff --git a/lib/pages/search/search_controller.g.dart b/lib/pages/search/search_controller.g.dart
index 209288ec..a4670193 100644
--- a/lib/pages/search/search_controller.g.dart
+++ b/lib/pages/search/search_controller.g.dart
@@ -41,24 +41,26 @@ mixin _$SearchPageController on _SearchPageController, Store {
});
}
- late final _$showWatchedBangumisAtom =
- Atom(name: '_SearchPageController.showWatchedBangumis', context: context);
+ late final _$notShowWatchedBangumisAtom = Atom(
+ name: '_SearchPageController.notShowWatchedBangumis', context: context);
@override
bool get notShowWatchedBangumis {
- _$showWatchedBangumisAtom.reportRead();
+ _$notShowWatchedBangumisAtom.reportRead();
return super.notShowWatchedBangumis;
}
- bool _showWatchedBangumisIsInitialized = false;
+ bool _notShowWatchedBangumisIsInitialized = false;
@override
set notShowWatchedBangumis(bool value) {
- _$showWatchedBangumisAtom.reportWrite(value,
- _showWatchedBangumisIsInitialized ? super.notShowWatchedBangumis : null,
- () {
+ _$notShowWatchedBangumisAtom.reportWrite(
+ value,
+ _notShowWatchedBangumisIsInitialized
+ ? super.notShowWatchedBangumis
+ : null, () {
super.notShowWatchedBangumis = value;
- _showWatchedBangumisIsInitialized = true;
+ _notShowWatchedBangumisIsInitialized = true;
});
}
@@ -122,13 +124,13 @@ mixin _$SearchPageController on _SearchPageController, Store {
.run(() => super.clearSearchHistory());
}
- late final _$setShowWatchedBangumisAsyncAction = AsyncAction(
- '_SearchPageController.setShowWatchedBangumis',
+ late final _$setNotShowWatchedBangumisAsyncAction = AsyncAction(
+ '_SearchPageController.setNotShowWatchedBangumis',
context: context);
@override
Future<void> setNotShowWatchedBangumis(bool value) {
- return _$setShowWatchedBangumisAsyncAction
+ return _$setNotShowWatchedBangumisAsyncAction
.run(() => super.setNotShowWatchedBangumis(value));
}
@@ -162,7 +164,7 @@ mixin _$SearchPageController on _SearchPageController, Store {
return '''
isLoading: ${isLoading},
isTimeOut: ${isTimeOut},
-showWatchedBangumis: ${notShowWatchedBangumis},
+notShowWatchedBangumis: ${notShowWatchedBangumis},
bangumiList: ${bangumiList},
searchHistories: ${searchHistories}
''';
diff --git a/lib/pages/settings/danmaku/danmaku_settings.dart b/lib/pages/settings/danmaku/danmaku_settings.dart
index dbb86bf1..1d80ba6b 100644
--- a/lib/pages/settings/danmaku/danmaku_settings.dart
+++ b/lib/pages/settings/danmaku/danmaku_settings.dart
@@ -33,6 +33,7 @@ class _DanmakuSettingsPageState extends State<DanmakuSettingsPage> {
late bool danmakuBiliBiliSource;
late bool danmakuGamerSource;
late bool danmakuDanDanSource;
+ late bool danmakuFollowSpeed;
@override
void initState() {
@@ -65,6 +66,8 @@ class _DanmakuSettingsPageState extends State<DanmakuSettingsPage> {
setting.get(SettingBoxKey.danmakuGamerSource, defaultValue: true);
danmakuDanDanSource =
setting.get(SettingBoxKey.danmakuDanDanSource, defaultValue: true);
+ danmakuFollowSpeed =
+ setting.get(SettingBoxKey.danmakuFollowSpeed, defaultValue: true);
}
void onBackPressed(BuildContext context) {
@@ -213,6 +216,17 @@ class _DanmakuSettingsPageState extends State<DanmakuSettingsPage> {
},
),
),
+ SettingsTile.switchTile(
+ onToggle: (value) async {
+ danmakuFollowSpeed = value ?? !danmakuFollowSpeed;
+ await setting.put(
+ SettingBoxKey.danmakuFollowSpeed, danmakuFollowSpeed);
+ setState(() {});
+ },
+ title: const Text('弹幕跟随视频倍速'),
+ description: const Text('开启后弹幕速度会随视频倍速而改变'),
+ initialValue: danmakuFollowSpeed,
+ ),
SettingsTile.switchTile(
onToggle: (value) async {
danmakuTop = value ?? !danmakuTop;
diff --git a/lib/pages/settings/danmaku/danmaku_settings_sheet.dart b/lib/pages/settings/danmaku/danmaku_settings_sheet.dart
index d764b2ca..e0be6f73 100644
--- a/lib/pages/settings/danmaku/danmaku_settings_sheet.dart
+++ b/lib/pages/settings/danmaku/danmaku_settings_sheet.dart
@@ -8,8 +8,13 @@ import 'package:card_settings_ui/card_settings_ui.dart';
class DanmakuSettingsSheet extends StatefulWidget {
final DanmakuController danmakuController;
+ final VoidCallback? onUpdateDanmakuSpeed;
- const DanmakuSettingsSheet({super.key, required this.danmakuController});
+ const DanmakuSettingsSheet({
+ super.key,
+ required this.danmakuController,
+ this.onUpdateDanmakuSpeed,
+ });
@override
State<DanmakuSettingsSheet> createState() => _DanmakuSettingsSheetState();
@@ -170,6 +175,17 @@ class _DanmakuSettingsSheetState extends State<DanmakuSettingsSheet> {
title: const Text('滚动弹幕'),
initialValue: !widget.danmakuController.option.hideScroll,
),
+ SettingsTile.switchTile(
+ onToggle: (value) async {
+ bool followSpeed = value ?? !setting.get(SettingBoxKey.danmakuFollowSpeed, defaultValue: true);
+ setting.put(SettingBoxKey.danmakuFollowSpeed, followSpeed);
+ widget.onUpdateDanmakuSpeed?.call();
+ setState(() {});
+ },
+ title: const Text('跟随视频倍速'),
+ description: const Text('弹幕速度随视频倍速变化'),
+ initialValue: setting.get(SettingBoxKey.danmakuFollowSpeed, defaultValue: true),
+ ),
],
),
],
diff --git a/lib/utils/storage.dart b/lib/utils/storage.dart
index abcfa6d2..c934d3ca 100644
--- a/lib/utils/storage.dart
+++ b/lib/utils/storage.dart
@@ -230,6 +230,7 @@ class SettingBoxKey {
danmakuGamerSource = 'danmakuGamerSource',
danmakuDanDanSource = 'danmakuDanDanSource',
danmakuFontWeight = 'danmakuFontWeight',
+ danmakuFollowSpeed = 'danmakuFollowSpeed',
themeMode = 'themeMode',
themeColor = 'themeColor',
privateMode = 'privateMode',