Skip to content

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

fix: ui lag caused by updating volume (#2110)

LiggMaxaff01cf16146
diff --git a/lib/pages/player/controller/player_playback_controller.dart b/lib/pages/player/controller/player_playback_controller.dart
index 5a688673..0160ceb1 100644
--- a/lib/pages/player/controller/player_playback_controller.dart
+++ b/lib/pages/player/controller/player_playback_controller.dart
@@ -61,6 +61,9 @@ abstract class _PlayerPlaybackController with Store {
@observable
double volume = -1;
+ /// 手势调节时的精确音量,避免 UI 节流导致累计误差
+ double preciseVolume = -1;
+
@observable
bool loading = true;
@observable
@@ -379,13 +382,39 @@ abstract class _PlayerPlaybackController with Store {
}
Future<void> setVolume(double value) async {
+ updateVolume(value);
+ await syncVolumeToDevice(preciseVolume >= 0 ? preciseVolume : volume);
+ }
+
+ @action
+ void updateVolume(double value) {
value = value.clamp(0.0, 100.0);
+ preciseVolume = value;
+ if (volume.toInt() == value.toInt()) {
+ return;
+ }
volume = value;
+ }
+
+ /// 外部来源(硬件键、系统面板等)变更音量时同步,并清除手势缓存
+ @action
+ void applyExternalVolume(double value) {
+ value = value.clamp(0.0, 100.0);
+ preciseVolume = -1;
+ volume = value;
+ }
+
+ void invalidatePreciseVolume() {
+ preciseVolume = -1;
+ }
+
+ Future<void> syncVolumeToDevice([double? value]) async {
+ final vol = (value ?? volume).clamp(0.0, 100.0);
try {
if (isDesktop()) {
- await mediaPlayer!.setVolume(value);
+ await mediaPlayer!.setVolume(vol);
} else {
- await FlutterVolumeController.setVolume(value / 100);
+ await FlutterVolumeController.setVolume(vol / 100);
}
} catch (_) {}
}
diff --git a/lib/pages/player/controller/player_playback_controller.g.dart b/lib/pages/player/controller/player_playback_controller.g.dart
index 672ca3ac..3eed8db6 100644
--- a/lib/pages/player/controller/player_playback_controller.g.dart
+++ b/lib/pages/player/controller/player_playback_controller.g.dart
@@ -183,6 +183,28 @@ mixin _$PlayerPlaybackController on _PlayerPlaybackController, Store {
}
}
+ @override
+ void updateVolume(double value) {
+ final _$actionInfo = _$_PlayerPlaybackControllerActionController
+ .startAction(name: '_PlayerPlaybackController.updateVolume');
+ try {
+ return super.updateVolume(value);
+ } finally {
+ _$_PlayerPlaybackControllerActionController.endAction(_$actionInfo);
+ }
+ }
+
+ @override
+ void applyExternalVolume(double value) {
+ final _$actionInfo = _$_PlayerPlaybackControllerActionController
+ .startAction(name: '_PlayerPlaybackController.applyExternalVolume');
+ try {
+ return super.applyExternalVolume(value);
+ } finally {
+ _$_PlayerPlaybackControllerActionController.endAction(_$actionInfo);
+ }
+ }
+
@override
void syncPlaybackState() {
final _$actionInfo = _$_PlayerPlaybackControllerActionController
diff --git a/lib/pages/player/player_controller.dart b/lib/pages/player/player_controller.dart
index dc3b73fb..5c4ee036 100644
--- a/lib/pages/player/player_controller.dart
+++ b/lib/pages/player/player_controller.dart
@@ -64,6 +64,33 @@ class PlayerController {
String videoUrl = '';
bool isLocalPlayback = false;
Timer? hideVolumeUITimer;
+ Timer? _volumeGestureSyncTimer;
+ double? _pendingGestureVolume;
+
+ void setVolumeDuringGesture(double value) {
+ _pendingGestureVolume = value.clamp(0.0, 100.0);
+ playback.updateVolume(_pendingGestureVolume!);
+ _volumeGestureSyncTimer?.cancel();
+ _volumeGestureSyncTimer = Timer(const Duration(milliseconds: 80), () {
+ final vol = _pendingGestureVolume;
+ if (vol == null) {
+ return;
+ }
+ unawaited(playback.syncVolumeToDevice(vol));
+ });
+ }
+
+ Future<void> finishVolumeGesture() async {
+ _volumeGestureSyncTimer?.cancel();
+ _volumeGestureSyncTimer = null;
+ final vol = _pendingGestureVolume;
+ _pendingGestureVolume = null;
+ if (vol != null) {
+ playback.volume = vol;
+ }
+ playback.invalidatePreciseVolume();
+ await playback.syncVolumeToDevice(vol);
+ }
Future<bool> init(PlaybackInitParams params) async {
videoUrl = params.videoUrl;
@@ -134,7 +161,10 @@ class PlayerController {
if (player == null || !playback.isCurrentPlayer(player)) {
return;
}
- playback.volume = volume * 100;
+ if (panel.volumeSeeking) {
+ return;
+ }
+ playback.applyExternalVolume(volume * 100);
if (!Platform.isAndroid && !panel.volumeSeeking) {
panel.showVolume = true;
hideVolumeUITimer?.cancel();
@@ -257,6 +287,7 @@ class PlayerController {
bool disposeSyncPlayController = true,
}) async {
hideVolumeUITimer?.cancel();
+ _volumeGestureSyncTimer?.cancel();
FlutterVolumeController.removeListener();
await FlutterVolumeController.updateShowSystemUI(true);
await playback.dispose(
diff --git a/lib/pages/player/player_item.dart b/lib/pages/player/player_item.dart
index afa76cdc..4154a99a 100644
--- a/lib/pages/player/player_item.dart
+++ b/lib/pages/player/player_item.dart
@@ -951,8 +951,8 @@ class _PlayerItemState extends State<PlayerItem>
// 音量相关
if (!playerController.panel.volumeSeeking) {
if (isDesktop()) {
- playerController.playback.volume =
- playerController.playback.playerVolume;
+ playerController.playback.applyExternalVolume(
+ playerController.playback.playerVolume);
}
}
// 亮度相关
@@ -1938,13 +1938,21 @@ class _PlayerItemState extends State<PlayerItem>
playerController.panel.brightness = result;
} else {
// 右边区域
- playerController.panel.volumeSeeking = true;
- playerController.panel.showVolume = true;
+ if (!playerController.panel.volumeSeeking) {
+ playerController.panel.volumeSeeking = true;
+ playerController.panel.showVolume = true;
+ playerController.playback
+ .invalidatePreciseVolume();
+ }
+ final double baseVolume = playerController
+ .playback.preciseVolume >= 0
+ ? playerController.playback.preciseVolume
+ : playerController.playback.volume;
final double level = (totalHeight) * 0.03;
final double volume =
- playerController.playback.volume -
- delta / level;
- playerController.setVolume(volume);
+ baseVolume - delta / level;
+ playerController
+ .setVolumeDuringGesture(volume);
}
},
onVerticalDragEnd: (_) {
@@ -1953,6 +1961,8 @@ class _PlayerItemState extends State<PlayerItem>
}
if (playerController.panel.volumeSeeking) {
playerController.panel.volumeSeeking = false;
+ unawaited(
+ playerController.finishVolumeGesture());
}
if (playerController.panel.brightnessSeeking) {
playerController.panel.brightnessSeeking =
diff --git a/lib/pages/player/player_item_panel.dart b/lib/pages/player/player_item_panel.dart
index 0df44b2c..87810f33 100644
--- a/lib/pages/player/player_item_panel.dart
+++ b/lib/pages/player/player_item_panel.dart
@@ -589,31 +589,34 @@ class _PlayerItemPanelState extends State<PlayerItemPanel> {
Positioned(
top: 25,
child: Observer(builder: (context) {
- return playerController.panel.showVolume
- ? Wrap(
- alignment: WrapAlignment.center,
- children: <Widget>[
- Container(
- padding: const EdgeInsets.all(8.0),
- decoration: BoxDecoration(
- color: Colors.black54,
- borderRadius: BorderRadius.circular(8.0),
- ),
- child: Row(
- children: <Widget>[
- const Icon(Icons.volume_down,
- color: Colors.white),
- Text(
- ' ${playerController.playback.volume.toInt()}%',
- style: const TextStyle(
- color: Colors.white,
- ),
- ),
- ],
- )),
- ],
- )
- : Container();
+ if (!playerController.panel.showVolume) {
+ return const SizedBox.shrink();
+ }
+ return Wrap(
+ alignment: WrapAlignment.center,
+ children: <Widget>[
+ Container(
+ padding: const EdgeInsets.all(8.0),
+ decoration: BoxDecoration(
+ color: Colors.black54,
+ borderRadius: BorderRadius.circular(8.0),
+ ),
+ child: Row(
+ mainAxisSize: MainAxisSize.min,
+ children: <Widget>[
+ const Icon(Icons.volume_down, color: Colors.white),
+ Observer(builder: (context) {
+ return Text(
+ ' ${playerController.playback.volume.toInt()}%',
+ style: const TextStyle(
+ color: Colors.white,
+ ),
+ );
+ }),
+ ],
+ )),
+ ],
+ );
})),
(isDesktop() || !videoPageController.isFullscreen)
? Container()
diff --git a/lib/pages/player/smallest_player_item_panel.dart b/lib/pages/player/smallest_player_item_panel.dart
index a524f636..b9670055 100644
--- a/lib/pages/player/smallest_player_item_panel.dart
+++ b/lib/pages/player/smallest_player_item_panel.dart
@@ -425,31 +425,34 @@ class _SmallestPlayerItemPanelState extends State<SmallestPlayerItemPanel> {
Positioned(
top: 25,
child: Observer(builder: (context) {
- return playerController.panel.showVolume
- ? Wrap(
- alignment: WrapAlignment.center,
- children: <Widget>[
- Container(
- padding: const EdgeInsets.all(8.0),
- decoration: BoxDecoration(
- color: Colors.black54,
- borderRadius: BorderRadius.circular(8.0),
- ),
- child: Row(
- children: <Widget>[
- const Icon(Icons.volume_down,
- color: Colors.white),
- Text(
- ' ${playerController.playback.volume.toInt()}%',
- style: const TextStyle(
- color: Colors.white,
- ),
- ),
- ],
- )),
- ],
- )
- : Container();
+ if (!playerController.panel.showVolume) {
+ return const SizedBox.shrink();
+ }
+ return Wrap(
+ alignment: WrapAlignment.center,
+ children: <Widget>[
+ Container(
+ padding: const EdgeInsets.all(8.0),
+ decoration: BoxDecoration(
+ color: Colors.black54,
+ borderRadius: BorderRadius.circular(8.0),
+ ),
+ child: Row(
+ mainAxisSize: MainAxisSize.min,
+ children: <Widget>[
+ const Icon(Icons.volume_down, color: Colors.white),
+ Observer(builder: (context) {
+ return Text(
+ ' ${playerController.playback.volume.toInt()}%',
+ style: const TextStyle(
+ color: Colors.white,
+ ),
+ );
+ }),
+ ],
+ )),
+ ],
+ );
})),
Positioned(
top: 0,