lxh2875931338/QingTing-Player
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化下一曲检测时长，窗口放宽到800ms

Browse Source
This commit is contained in:
lxh2875931338
2026-08-28 20:52:03 +08:00
parent bb74cd1351
commit f91846be9a
2 changed files with 45 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/services/audio_service.dart
+44 -18
View File
@@ -443,11 +443,16 @@ class AudioService extends ChangeNotifier {
// ════════════════════════════════════════════════════════════
Future<void> next() async {
if (_queue.isEmpty) return;
debugPrint(
'🎵 [next] CALLED: index=$_currentIndex, total=${_queue.length}, isChangingTrack=$_isChangingTrack');
if (_queue.isEmpty) {
debugPrint('⚠️ [next] queue is empty');
return;
}
// ⭐ 如果正在切换歌曲，忽略本次请求
if (_isChangingTrack) {
debugPrint('⚠️ [AudioService] next() ignored: track switch in progress');
debugPrint('⚠️ [next] REJECTED: track switch in progress');
return;
}
@@ -611,38 +616,41 @@ class AudioService extends ChangeNotifier {
// ⭐ 完整生命周期校验的 completed 监听
_subscriptions.add(
player.stream.completed.listen((_) {
debugPrint(
'🎵 [completed event] RAW: index=$_currentIndex, isChangingTrack=$_isChangingTrack');
if (_isChangingTrack) {
debugPrint('⚠️ [AudioService] completed ignored during track switch');
debugPrint('⚠️ [completed] REJECTED: track switch in progress');
return;
}
if (!_hasStartedCurrentPlayback) {
debugPrint(
'⚠️ [AudioService] completed ignored: playback never started');
debugPrint('⚠️ [completed] REJECTED: playback never started');
return;
}
if (_handlingCompletion) {
debugPrint('⚠️ [service] completed ignored: already handling');
debugPrint('⚠️ [completed] REJECTED: already handling');
return;
}
final pos = player.state.position;
final dur = player.state.duration;
debugPrint('🎵 [completed] pos=$pos, dur=$dur');
if (dur.inMilliseconds <= 0) {
debugPrint(
'⚠️ [AudioService] completed ignored: invalid duration $dur');
debugPrint('⚠️ [completed] REJECTED: invalid duration $dur');
return;
}
if (pos.inMilliseconds < dur.inMilliseconds - 500) {
debugPrint(
'⚠️ [AudioService] completed ignored: position=$pos, duration=$dur');
final diff = dur.inMilliseconds - pos.inMilliseconds;
debugPrint('🎵 [completed] diff=${diff}ms');
if (pos.inMilliseconds < dur.inMilliseconds - 800) {
debugPrint('⚠️ [completed] REJECTED: not at end, diff=${diff}ms');
return;
}
debugPrint(
'🎵 [AudioService] valid completed: index=$_currentIndex, pos=$pos, dur=$dur');
debugPrint('✅ [completed] ACCEPTED: index=$_currentIndex');
_handlingCompletion = true;
_onPlaybackCompleted();
}),
@@ -658,23 +666,41 @@ class AudioService extends ChangeNotifier {
}
void _onPlaybackCompleted() {
if (_queue.isEmpty || _currentIndex < 0 || _currentIndex >= _queue.length) {
debugPrint('⚠️ [service] completed ignored: invalid queue');
debugPrint(
'🎵 [onPlaybackCompleted] ENTERED: index=$_currentIndex, total=${_queue.length}, mode=$_playMode');
if (_queue.isEmpty) {
debugPrint('⚠️ [onPlaybackCompleted] queue is empty, returning');
_handlingCompletion = false;
return;
}
if (_currentIndex + 1 >= _queue.length && _playMode != PlayMode.repeatOne) {
debugPrint('⚠️ [service] completed ignored: last song in queue');
if (_currentIndex < 0 || _currentIndex >= _queue.length) {
debugPrint(
'⚠️ [onPlaybackCompleted] invalid index: $_currentIndex, total=${_queue.length}');
_handlingCompletion = false;
return;
}
// ⭐ 关键判断：是否是最后一首
final isLastSong = _currentIndex + 1 >= _queue.length;
if (isLastSong && _playMode != PlayMode.repeatOne) {
debugPrint(
'⚠️ [onPlaybackCompleted] LAST SONG: index=$_currentIndex, mode=$_playMode, no next()');
_handlingCompletion = false;
return;
}
debugPrint(
'🎵 [onPlaybackCompleted] will call next(), index=$_currentIndex');
try {
if (_playMode == PlayMode.repeatOne) {
debugPrint(
'🎵 [onPlaybackCompleted] repeatOne mode, calling _playCurrent()');
_playCurrent();
return;
}
debugPrint('🎵 [onPlaybackCompleted] calling next()');
next();
} finally {
_handlingCompletion = false;