Skip to content

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

feat: danmaku line height

Predidit29cb583ccdb8
diff --git a/lib/pages/player/player_item.dart b/lib/pages/player/player_item.dart
index 4bd0b686..37ce2869 100644
--- a/lib/pages/player/player_item.dart
+++ b/lib/pages/player/player_item.dart
@@ -93,6 +93,7 @@ class _PlayerItemState extends State<PlayerItem>
late bool _danmakuGamerSource;
late bool _danmakuDanDanSource;
late double _danmakuDuration;
+ late double _danmakuLineHeight;
late int _danmakuFontWeight;
// 硬件解码
@@ -1011,6 +1012,8 @@ class _PlayerItemState extends State<PlayerItem>
_danmakuColor = setting.get(SettingBoxKey.danmakuColor, defaultValue: true);
_danmakuDuration =
setting.get(SettingBoxKey.danmakuDuration, defaultValue: 8.0);
+ _danmakuLineHeight =
+ setting.get(SettingBoxKey.danmakuLineHeight, defaultValue: 1.6);
_danmakuBiliBiliSource =
setting.get(SettingBoxKey.danmakuBiliBiliSource, defaultValue: true);
_danmakuGamerSource =
@@ -1285,6 +1288,7 @@ class _PlayerItemState extends State<PlayerItem>
fontSize: _fontSize,
duration:
_danmakuDuration / playerController.playerSpeed,
+ lineHeight: _danmakuLineHeight,
strokeWidth: _border ? 1.5 : 0.0,
fontWeight: _danmakuFontWeight,
massiveMode: _massiveMode,
diff --git a/lib/pages/settings/danmaku/danmaku_settings.dart b/lib/pages/settings/danmaku/danmaku_settings.dart
index 150e0e53..9f94b322 100644
--- a/lib/pages/settings/danmaku/danmaku_settings.dart
+++ b/lib/pages/settings/danmaku/danmaku_settings.dart
@@ -22,6 +22,7 @@ class _DanmakuSettingsPageState extends State<DanmakuSettingsPage> {
late dynamic defaultDanmakuFontSize;
late int defaultDanmakuFontWeight;
late double defaultDanmakuDuration;
+ late double defaultDanmakuLineHeight;
final PopularController popularController = Modular.get<PopularController>();
late bool danmakuEnabledByDefault;
late bool danmakuBorder;
@@ -48,6 +49,8 @@ class _DanmakuSettingsPageState extends State<DanmakuSettingsPage> {
setting.get(SettingBoxKey.danmakuFontWeight, defaultValue: 4);
defaultDanmakuDuration =
setting.get(SettingBoxKey.danmakuDuration, defaultValue: 8.0);
+ defaultDanmakuLineHeight =
+ setting.get(SettingBoxKey.danmakuLineHeight, defaultValue: 1.6);
danmakuEnabledByDefault =
setting.get(SettingBoxKey.danmakuEnabledByDefault, defaultValue: false);
danmakuBorder =
@@ -105,6 +108,13 @@ class _DanmakuSettingsPageState extends State<DanmakuSettingsPage> {
});
}
+ void updateDanmakuLineHeight(double i) async {
+ await setting.put(SettingBoxKey.danmakuLineHeight, i);
+ setState(() {
+ defaultDanmakuLineHeight = i;
+ });
+ }
+
void updateDanmakuFontWeight(int i) async {
await setting.put(SettingBoxKey.danmakuFontWeight, i);
setState(() {
@@ -216,6 +226,19 @@ class _DanmakuSettingsPageState extends State<DanmakuSettingsPage> {
},
),
),
+ SettingsTile(
+ title: Text('弹幕行高', style: TextStyle(fontFamily: fontFamily)),
+ description: Slider(
+ value: defaultDanmakuLineHeight,
+ min: 0,
+ max: 3,
+ divisions: 30,
+ label: defaultDanmakuLineHeight.toStringAsFixed(1),
+ onChanged: (value) {
+ updateDanmakuLineHeight(double.parse(value.toStringAsFixed(1)));
+ },
+ ),
+ ),
SettingsTile.switchTile(
onToggle: (value) async {
danmakuFollowSpeed = value ?? !danmakuFollowSpeed;
diff --git a/lib/pages/settings/danmaku/danmaku_settings_sheet.dart b/lib/pages/settings/danmaku/danmaku_settings_sheet.dart
index 381cf423..8d59ecd9 100644
--- a/lib/pages/settings/danmaku/danmaku_settings_sheet.dart
+++ b/lib/pages/settings/danmaku/danmaku_settings_sheet.dart
@@ -137,6 +137,24 @@ class _DanmakuSettingsSheetState extends State<DanmakuSettingsSheet> {
},
),
),
+ SettingsTile(
+ title: Text('行高', style: TextStyle(fontFamily: fontFamily)),
+ description: Slider(
+ value: widget.danmakuController.option.lineHeight,
+ min: 0,
+ max: 3,
+ divisions: 30,
+ label: widget.danmakuController.option.lineHeight.toStringAsFixed(1),
+ onChanged: (value) {
+ setState(() => widget.danmakuController.updateOption(
+ widget.danmakuController.option.copyWith(
+ lineHeight: double.parse(value.toStringAsFixed(1)),
+ ),
+ ));
+ setting.put(SettingBoxKey.danmakuLineHeight, double.parse(value.toStringAsFixed(1)));
+ },
+ ),
+ ),
SettingsTile.switchTile(
onToggle: (value) async {
bool show = value ?? widget.danmakuController.option.hideTop;
diff --git a/lib/utils/storage.dart b/lib/utils/storage.dart
index b50b8bee..45f917b3 100644
--- a/lib/utils/storage.dart
+++ b/lib/utils/storage.dart
@@ -225,6 +225,7 @@ class SettingBoxKey {
danmakuArea = 'danmakuArea',
danmakuColor = 'danmakuColor',
danmakuDuration = 'danmakuDuration',
+ danmakuLineHeight = 'danmakuLineHeight',
danmakuEnabledByDefault = 'danmakuEnabledByDefault',
danmakuBiliBiliSource = 'danmakuBiliBiliSource',
danmakuGamerSource = 'danmakuGamerSource',