EchoZenith/PiliPlus
1
0
Fork 0
mirror of https://github.com/bggRGjQaUbCoE/PiliPlus.git synced 2026-06-01 00:28:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

add static2Scroll option

Browse Source 
Signed-off-by: bggRGjQaUbCoE <githubaccount56556@proton.me>
This commit is contained in:
bggRGjQaUbCoE
2026-01-01 12:44:08 +08:00
parent 87c7699324
commit 80e007bac6
6 changed files with 93 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/grpc/reply.dart
View File

@@ -62,15 +62,14 @@ abstract final class ReplyGrpc {
), ),
MainListReply.fromBuffer, MainListReply.fromBuffer,
); );
if (res.isSuccess) { if (res case Success(:final response)) {
final mainListReply = res.data;
// keyword filter // keyword filter
if (mainListReply.hasUpTop() && needRemoveGrpc(mainListReply.upTop)) { if (response.hasUpTop() && needRemoveGrpc(response.upTop)) {
mainListReply.clearUpTop(); response.clearUpTop();
} }
if (mainListReply.replies.isNotEmpty) { if (response.replies.isNotEmpty) {
mainListReply.replies.removeWhere((item) { response.replies.removeWhere((item) {
final hasMatch = needRemoveGrpc(item); final hasMatch = needRemoveGrpc(item);
if (!hasMatch && item.replies.isNotEmpty) { if (!hasMatch && item.replies.isNotEmpty) {
item.replies.removeWhere(needRemoveGrpc); item.replies.removeWhere(needRemoveGrpc);

109
lib/pages/video/widgets/header_mixin.dart
View File

@@ -1,5 +1,4 @@
import 'package:PiliPlus/common/widgets/button/icon_button.dart'; import 'package:PiliPlus/common/widgets/button/icon_button.dart';
import 'package:PiliPlus/pages/setting/widgets/switch_item.dart';
import 'package:PiliPlus/pages/video/introduction/ugc/widgets/menu_row.dart'; import 'package:PiliPlus/pages/video/introduction/ugc/widgets/menu_row.dart';
import 'package:PiliPlus/plugin/pl_player/controller.dart'; import 'package:PiliPlus/plugin/pl_player/controller.dart';
import 'package:PiliPlus/plugin/pl_player/utils/danmaku_options.dart'; import 'package:PiliPlus/plugin/pl_player/utils/danmaku_options.dart';
@@ -147,6 +146,11 @@ mixin HeaderMixin<T extends StatefulWidget> on State<T> {
setOptions(); setOptions();
} }
void updateDanmakuWeight(double val) {
plPlayerController.danmakuWeight = val.toInt();
setState(() {});
}
void onUpdateBlockType(int blockType, bool blocked) { void onUpdateBlockType(int blockType, bool blocked) {
if (blocked) { if (blocked) {
DanmakuOptions.blockTypes.remove(blockType); DanmakuOptions.blockTypes.remove(blockType);
@@ -178,9 +182,9 @@ mixin HeaderMixin<T extends StatefulWidget> on State<T> {
const SizedBox(height: 10), const SizedBox(height: 10),
if (!isLive) ...[ if (!isLive) ...[
Row( Row(
mainAxisAlignment: .spaceBetween,
children: [ children: [
Text('智能云屏蔽 ${plPlayerController.danmakuWeight} 级'), Text('智能云屏蔽 ${plPlayerController.danmakuWeight} 级'),
const Spacer(),
TextButton( TextButton(
style: TextButton.styleFrom( style: TextButton.styleFrom(
padding: EdgeInsets.zero, padding: EdgeInsets.zero,
@@ -214,8 +218,7 @@ mixin HeaderMixin<T extends StatefulWidget> on State<T> {
value: plPlayerController.danmakuWeight.toDouble(), value: plPlayerController.danmakuWeight.toDouble(),
divisions: 10, divisions: 10,
label: '${plPlayerController.danmakuWeight}', label: '${plPlayerController.danmakuWeight}',
onChanged: (val) => onChanged: updateDanmakuWeight,
plPlayerController.danmakuWeight = val.toInt(),
onChangeEnd: (val) => GStorage.setting.put( onChangeEnd: (val) => GStorage.setting.put(
SettingBoxKey.danmakuWeight, SettingBoxKey.danmakuWeight,
val.toInt(), val.toInt(),
@@ -225,50 +228,64 @@ mixin HeaderMixin<T extends StatefulWidget> on State<T> {
), ),
], ],
const Text('按类型屏蔽'), const Text('按类型屏蔽'),
Padding( SingleChildScrollView(
padding: const EdgeInsets.only(top: 12), scrollDirection: .horizontal,
child: SingleChildScrollView( padding: const .symmetric(vertical: 10),
scrollDirection: Axis.horizontal, child: Row(
child: Row( spacing: 10,
spacing: 10, children: blockTypesList.map(
children: blockTypesList.map( (e) {
(e) { final blocked = DanmakuOptions.blockTypes.contains(
final blocked = DanmakuOptions.blockTypes.contains( e.value,
e.value, );
); return ActionRowLineItem(
return ActionRowLineItem( onTap: () => onUpdateBlockType(e.value, blocked),
onTap: () => onUpdateBlockType(e.value, blocked), text: e.label,
text: e.label, selectStatus: blocked,
selectStatus: blocked, );
); },
}, ).toList(),
).toList(),
),
), ),
), ),
SetSwitchItem( const Text('其他'),
title: '海量弹幕', SingleChildScrollView(
contentPadding: EdgeInsets.zero, scrollDirection: .horizontal,
titleStyle: const TextStyle(fontSize: 14), padding: const .symmetric(vertical: 10),
defaultVal: DanmakuOptions.massiveMode, child: Row(
setKey: SettingBoxKey.danmakuMassiveMode, spacing: 10,
onChanged: (value) { children: [
DanmakuOptions.massiveMode = value; ActionRowLineItem(
setState(() {}); selectStatus: DanmakuOptions.massiveMode,
setOptions(); onTap: () {
}, DanmakuOptions.massiveMode =
), !DanmakuOptions.massiveMode;
SetSwitchItem( setState(() {});
title: '滚动弹幕固定速度', setOptions();
contentPadding: EdgeInsets.zero, },
titleStyle: const TextStyle(fontSize: 14), text: '海量弹幕',
defaultVal: DanmakuOptions.scrollFixedVelocity, ),
setKey: SettingBoxKey.danmakuFixedV, ActionRowLineItem(
onChanged: (value) { selectStatus: DanmakuOptions.static2Scroll,
DanmakuOptions.scrollFixedVelocity = value; onTap: () {
setState(() {}); DanmakuOptions.static2Scroll =
setOptions(); !DanmakuOptions.static2Scroll;
}, setState(() {});
setOptions();
},
text: '固定转滚动',
),
ActionRowLineItem(
selectStatus: DanmakuOptions.scrollFixedVelocity,
onTap: () {
DanmakuOptions.scrollFixedVelocity =
!DanmakuOptions.scrollFixedVelocity;
setState(() {});
setOptions();
},
text: '滚动弹幕固定速度',
),
],
),
), ),
Row( Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,

40
lib/pages/whisper_block/view.dart
View File

@@ -69,28 +69,26 @@ class _WhisperBlockPageState extends State<WhisperBlockPage> {
), ),
), ),
Expanded( Expanded(
child: Padding( child: SingleChildScrollView(
padding: const EdgeInsets.all(12), padding: const EdgeInsets.all(12),
child: SingleChildScrollView( child: Wrap(
child: Wrap( spacing: 12,
spacing: 12, runSpacing: 12,
runSpacing: 12, children: response
children: response .map(
.map( (e) => SearchText(
(e) => SearchText( text: e.keyword,
text: e.keyword, onTap: (keyword) {
onTap: (keyword) { showConfirmDialog(
showConfirmDialog( context: context,
context: context, title: '删除屏蔽词？',
title: '删除屏蔽词？', content: '该屏蔽词将不再生效',
content: '该屏蔽词将不再生效', onConfirm: () => _controller.onRemove(e),
onConfirm: () => _controller.onRemove(e), );
); },
}, ),
), )
) .toList(),
.toList(),
),
), ),
), ),
), ),

3
lib/plugin/pl_player/utils/danmaku_options.dart
View File

@@ -16,6 +16,7 @@ abstract final class DanmakuOptions {
static double danmakuStaticDuration = Pref.danmakuStaticDuration; static double danmakuStaticDuration = Pref.danmakuStaticDuration;
static double danmakuStrokeWidth = Pref.strokeWidth; static double danmakuStrokeWidth = Pref.strokeWidth;
static bool scrollFixedVelocity = Pref.danmakuFixedV; static bool scrollFixedVelocity = Pref.danmakuFixedV;
static bool static2Scroll = Pref.static2Scroll;
static bool massiveMode = Pref.danmakuMassiveMode; static bool massiveMode = Pref.danmakuMassiveMode;
static double danmakuLineHeight = Pref.danmakuLineHeight; static double danmakuLineHeight = Pref.danmakuLineHeight;
@@ -38,7 +39,7 @@ abstract final class DanmakuOptions {
strokeWidth: danmakuStrokeWidth, strokeWidth: danmakuStrokeWidth,
scrollFixedVelocity: scrollFixedVelocity, scrollFixedVelocity: scrollFixedVelocity,
massiveMode: massiveMode, massiveMode: massiveMode,
static2Scroll: true, static2Scroll: static2Scroll,
safeArea: true, safeArea: true,
lineHeight: danmakuLineHeight, lineHeight: danmakuLineHeight,
); );

1
lib/utils/storage_key.dart
View File

@@ -192,6 +192,7 @@ abstract final class SettingBoxKey {
danmakuStaticDuration = 'danmakuStaticDuration', danmakuStaticDuration = 'danmakuStaticDuration',
danmakuMassiveMode = 'danmakuMassiveMode', danmakuMassiveMode = 'danmakuMassiveMode',
danmakuFixedV = 'danmakuFixedV', danmakuFixedV = 'danmakuFixedV',
static2Scroll = 'static2Scroll',
danmakuLineHeight = 'danmakuLineHeight', danmakuLineHeight = 'danmakuLineHeight',
strokeWidth = 'strokeWidth', strokeWidth = 'strokeWidth',
fontWeight = 'fontWeight'; fontWeight = 'fontWeight';

3
lib/utils/storage_pref.dart
View File

@@ -322,6 +322,9 @@ abstract final class Pref {
static bool get danmakuFixedV => static bool get danmakuFixedV =>
_setting.get(SettingBoxKey.danmakuFixedV, defaultValue: false); _setting.get(SettingBoxKey.danmakuFixedV, defaultValue: false);
static bool get static2Scroll =>
_setting.get(SettingBoxKey.static2Scroll, defaultValue: false);
static double get subtitleFontScale => static double get subtitleFontScale =>
_setting.get(SettingBoxKey.subtitleFontScale, defaultValue: 1.0); _setting.get(SettingBoxKey.subtitleFontScale, defaultValue: 1.0);