现阶段通知中心播放暂停切换功能已实现,但是上下一曲功能暂时消失,需要后续优化,这个commit是snapshot

This commit is contained in:
2026-08-21 22:58:44 +08:00
parent 94a4906671
commit 89c4ba8191
5 changed files with 201 additions and 156 deletions
+72
View File
@@ -0,0 +1,72 @@
// lib/audio/playback_state_manager.dart
import 'package:audio_service/audio_service.dart' as audio_service;
class PlaybackStateManager {
static final PlaybackStateManager _instance =
PlaybackStateManager._internal();
factory PlaybackStateManager() => _instance;
PlaybackStateManager._internal();
bool _playing = false;
bool get playing => _playing;
Duration _position = Duration.zero;
Duration get position => _position;
Duration _duration = Duration.zero;
Duration get duration => _duration;
// ⭐ 核心改动:使用 playPause 替代 play/pause 分离
audio_service.PlaybackState get playbackState {
// ⭐ 固定使用 playPause,不再动态切换
final playControl = audio_service.MediaControl(
androidIcon: _playing ? 'drawable/ic_pause' : 'drawable/ic_play',
label: _playing ? '暂停' : '播放',
action: audio_service.MediaAction.playPause, // 固定
);
final controls = [
audio_service.MediaControl(
androidIcon: 'drawable/ic_previous',
label: '上一曲',
action: audio_service.MediaAction.skipToPrevious,
),
playControl,
audio_service.MediaControl(
androidIcon: 'drawable/ic_next',
label: '下一曲',
action: audio_service.MediaAction.skipToNext,
),
];
return audio_service.PlaybackState(
controls: controls,
processingState: audio_service.AudioProcessingState.ready,
playing: _playing, // ⭐ 这里才是真正的播放状态,通知栏会根据它显示正确的图标
androidCompactActionIndices: const [0, 1, 2],
updateTime: DateTime.now(),
//extras: {'_refresh': DateTime.now().millisecondsSinceEpoch},
);
}
// ---- 状态更新方法保持不变 ----
void updatePlaying(bool playing) {
if (_playing != playing) {
_playing = playing;
}
}
void updatePosition(Duration position) {
_position = position;
}
void updateDuration(Duration duration) {
_duration = duration;
}
void reset() {
_playing = false;
_position = Duration.zero;
_duration = Duration.zero;
}
}
+33
View File
@@ -0,0 +1,33 @@
// lib/audio/player_controller.dart
import 'package:media_kit/media_kit.dart';
import '../services/playback_service.dart'; // ⭐ 修正路径
class PlayerController {
static final PlayerController _instance = PlayerController._internal();
factory PlayerController() => _instance;
PlayerController._internal();
final PlaybackService _playback = PlaybackService();
// ---- 状态流(只读) ----
Stream<bool> get playingStream => _playback.player.stream.playing;
Stream<Duration> get positionStream => _playback.player.stream.position;
Stream<Duration> get durationStream => _playback.player.stream.duration;
Stream<void> get completedStream => _playback.player.stream.completed;
// ---- 当前状态快照 ----
bool get isPlaying => _playback.player.state.playing;
Duration get position => _playback.player.state.position;
Duration get duration => _playback.player.state.duration;
// ---- 控制命令 ----
Future<void> play() => _playback.resume();
Future<void> pause() => _playback.pause();
Future<void> stop() => _playback.stop();
Future<void> seek(Duration position) => _playback.seek(position);
// ---- 加载歌曲 ----
void load(String url, {Map<String, String>? headers}) {
_playback.play(url, headers: headers);
}
}
+3
View File
@@ -287,18 +287,21 @@ class _QTPlayerAppState extends State<QTPlayerApp> {
'🎨 [QTPlayerApp] build #$_buildCount ${stopwatch.elapsedMilliseconds}ms'); '🎨 [QTPlayerApp] build #$_buildCount ${stopwatch.elapsedMilliseconds}ms');
// 监听歌曲变化,更新通知栏 // 监听歌曲变化,更新通知栏
// main.dart 中 build 方法里的这部分
final audioService = context.watch<AudioService>(); final audioService = context.watch<AudioService>();
final handler = context.read<AudioPlayerHandler>(); final handler = context.read<AudioPlayerHandler>();
final song = audioService.currentSong; final song = audioService.currentSong;
WidgetsBinding.instance.addPostFrameCallback((_) { WidgetsBinding.instance.addPostFrameCallback((_) {
if (song != null) { if (song != null) {
// ⭐ song 不为空时才调用
handler.updateNotification( handler.updateNotification(
id: song.id, id: song.id,
title: song.title, title: song.title,
artist: song.artist, artist: song.artist,
); );
} else { } else {
// 清空通知
handler.mediaItem.add(null); handler.mediaItem.add(null);
} }
}); });
+76 -139
View File
@@ -1,78 +1,53 @@
import 'package:flutter/material.dart'; // lib/services/audio_player_handler.dart
import 'package:audio_service/audio_service.dart'; import 'package:flutter/foundation.dart';
import 'playback_service.dart'; import 'package:audio_service/audio_service.dart' as audio_service;
import 'audio_service.dart' as local_audio; import '../audio/player_controller.dart';
import '../audio/playback_state_manager.dart';
import '../services/audio_service.dart'; // 你的业务 AudioService
class AudioPlayerHandler extends BaseAudioHandler { class AudioPlayerHandler extends audio_service.BaseAudioHandler {
final PlaybackService _playback = PlaybackService(); final PlayerController _player = PlayerController();
late final local_audio.AudioService _localAudio; final PlaybackStateManager _state = PlaybackStateManager();
// ⭐ 切歌锁,防止重复命令
bool _switchingTrack = false;
AudioPlayerHandler() { AudioPlayerHandler() {
_localAudio = local_audio.AudioService(); _player.playingStream.listen((playing) {
_state.updatePlaying(playing);
// ⭐ 唯一状态来源:media_kit 的 playing 流 _publishState();
_playback.player.stream.playing.listen((playing) {
debugPrint('🎵 [stream] playing changed: $playing');
_updatePlaybackState(playing: playing);
}); });
// ⭐ 播放完成 → 触发下一首(不直接广播状态) _player.positionStream.listen((position) {
_playback.player.stream.completed.listen((_) { _state.updatePosition(position);
debugPrint('🎵 [stream] completed, auto next'); final current = playbackState.value;
_localAudio.next(); // 触发切歌,playing 流会自然变化 playbackState.add(audio_service.PlaybackState(
// 不调用 _updatePlaybackState() controls: current.controls,
}); processingState: current.processingState,
playing: current.playing,
// ⭐ 歌曲变化 → 更新媒体信息(独立于播放状态) androidCompactActionIndices: current.androidCompactActionIndices,
// 这里用 duration 变化作为“歌曲已切换”的信号
_playback.player.stream.duration.listen((duration) {
if (duration.inMilliseconds > 0) {
_syncMediaItem();
}
});
}
// ============================================================
// 状态同步链(只能由 playing 流触发)
// ============================================================
void _updatePlaybackState({bool? playing}) {
final isPlaying = playing ?? _playback.player.state.playing;
debugPrint('🎵 _updatePlaybackState: isPlaying=$isPlaying');
final controls = [
MediaControl.skipToPrevious,
if (isPlaying) MediaControl.pause else MediaControl.play,
MediaControl.skipToNext,
];
debugPrint('🎵 controls: ${controls.map((c) => c.action).join(', ')}');
playbackState.add(PlaybackState(
controls: controls,
processingState: AudioProcessingState.ready,
playing: isPlaying,
androidCompactActionIndices: const [0, 1, 2],
updateTime: DateTime.now(), updateTime: DateTime.now(),
)); ));
});
_player.durationStream.listen((duration) {
_state.updateDuration(duration);
_publishState();
});
_player.completedStream.listen((_) {
debugPrint('⏭️ [handler] completed, auto next');
AudioService().next();
});
} }
// ============================================================ void _publishState() {
// 媒体信息同步链(独立于播放状态) final state = _state.playbackState;
// ============================================================
void _syncMediaItem() { debugPrint(
final song = _localAudio.currentSong; '📡 [publish] '
if (song != null) { 'playing=${state.playing}, '
debugPrint('🎵 [sync] media item: ${song.title}'); 'controls=${state.controls.map((e) => e.action).toList()}',
mediaItem.add(MediaItem( );
id: song.id,
title: song.title, playbackState.add(state);
artist: song.artist,
duration: _playback.player.state.duration,
));
}
} }
void updateNotification({ void updateNotification({
@@ -80,115 +55,77 @@ class AudioPlayerHandler extends BaseAudioHandler {
required String title, required String title,
required String artist, required String artist,
}) { }) {
mediaItem.add(MediaItem( debugPrint('📢 [handler] updateNotification: $title');
mediaItem.add(audio_service.MediaItem(
id: id, id: id,
title: title, title: title,
artist: artist, artist: artist,
duration: _playback.player.state.duration, duration: _player.duration,
)); ));
_updatePlaybackState();
} }
// ============================================================ // ---- 控制命令(系统回调) ----
// 控制命令(只发命令,不宣布状态)
// ============================================================
@override @override
Future<void> play() async { Future<void> play() async {
debugPrint('🎵 [audio_service] play() called'); debugPrint('▶️ [handler] play() called');
await _playback.resume(); await _player.play();
// ⭐ 不调用 _updatePlaybackState()
// 等待 playing 流触发
} }
@override @override
Future<void> pause() async { Future<void> pause() async {
debugPrint('🎵 [audio_service] pause() called'); debugPrint('⏸️ [handler] pause() called');
await _playback.pause(); await _player.pause();
// ⭐ 不调用 _updatePlaybackState()
} }
@override @override
Future<void> stop() async { Future<void> stop() async {
debugPrint('🎵 [audio_service] stop() called'); debugPrint('⏹️ [handler] stop() called');
await _playback.stop(); _player.stop();
// ⭐ 不调用 _updatePlaybackState()
} }
@override @override
Future<void> seek(Duration position) async { Future<void> seek(Duration position) async {
debugPrint('🎵 [audio_service] seek() called: $position'); debugPrint(' [handler] seek() called: $position');
await _playback.seek(position); _player.seek(position);
} }
@override @override
Future<void> skipToNext() async { Future<void> skipToNext() async {
if (_switchingTrack) { debugPrint('⏭️ [handler] skipToNext() called');
debugPrint('🎵 skipToNext ignored: already switching'); AudioService().next();
return;
}
_switchingTrack = true;
try {
debugPrint('🎵 [audio_service] skipToNext() called');
await _localAudio.next();
// ⭐ 不调用 _updatePlaybackState()
// playing 流和 duration 流会自然触发状态更新
} finally {
// ⭐ 用真实状态释放锁,不用时间
await Future.delayed(const Duration(milliseconds: 50));
_switchingTrack = false;
}
} }
@override @override
Future<void> skipToPrevious() async { Future<void> skipToPrevious() async {
if (_switchingTrack) { debugPrint('⏮️ [handler] skipToPrevious() called');
debugPrint('🎵 skipToPrevious ignored: already switching'); AudioService().previous();
return;
}
_switchingTrack = true;
try {
debugPrint('🎵 [audio_service] skipToPrevious() called');
await _localAudio.previous();
} finally {
await Future.delayed(const Duration(milliseconds: 50));
_switchingTrack = false;
}
} }
// ============================================================ // ⭐ 统一点击处理(仅使用 MediaButton 存在的枚举)
// click():薄路由层,不操作播放器
// ============================================================
@override @override
Future<void> click([MediaButton button = MediaButton.media]) async { Future<void> click(
debugPrint('🎵 [audio_service] click(): ${button.name} (index: ${button.index})'); [audio_service.MediaButton button =
audio_service.MediaButton.media]) async {
// ⭐ 用 button.name 判断,不用 index debugPrint('🎯 [handler] click() called with button: ${button.name}');
final name = button.name.toLowerCase(); switch (button) {
case audio_service.MediaButton.next:
// 路由到标准方法
if (name.contains('next') || name == 'next') {
await skipToNext(); await skipToNext();
return; break;
} case audio_service.MediaButton.previous:
if (name.contains('previous') || name == 'previous') {
await skipToPrevious(); await skipToPrevious();
return; break;
} case audio_service.MediaButton.media:
if (name.contains('pause')) { // 播放/暂停切换
await pause(); if (_player.isPlaying) {
return;
}
if (name.contains('play') || name.contains('media')) {
await play();
return;
}
// fallback: 根据当前播放状态 toggle
debugPrint('🎵 → fallback toggle');
if (_playback.player.state.playing) {
await pause(); await pause();
} else { } else {
await play(); await play();
} }
break;
default:
// 其他按钮(fastForward, rewind等)忽略或fallback
debugPrint('⚠️ [handler] unhandled MediaButton: $button');
break;
}
} }
} }
+8 -8
View File
@@ -44,27 +44,27 @@ class PlaybackService {
} }
// ---------- 控制 ---------- // ---------- 控制 ----------
void pause() { Future<void> pause() async {
if (_initialized && _player != null) { if (_initialized && _player != null) {
_player!.pause(); await _player!.pause();
} }
} }
void resume() { Future<void> resume() async {
if (_initialized && _player != null) { if (_initialized && _player != null) {
_player!.play(); await _player!.play();
} }
} }
void stop() { Future<void> stop() async {
if (_initialized && _player != null) { if (_initialized && _player != null) {
_player!.stop(); await _player!.stop();
} }
} }
void seek(Duration position) { Future<void> seek(Duration position) async {
if (_initialized && _player != null) { if (_initialized && _player != null) {
_player!.seek(position); await _player!.seek(position);
} }
} }