Skip to content

Commit

Permalink
fix(player): 插队曲目切换后下一首曲目丢失 (#2118)
Browse files Browse the repository at this point in the history
  • Loading branch information
runnableAir committed Aug 26, 2023
1 parent f2efc4e commit f2f4e2c
Showing 1 changed file with 10 additions and 3 deletions.
13 changes: 10 additions & 3 deletions src/utils/Player.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ import { decode as base642Buffer } from '@/utils/base64';

const PLAY_PAUSE_FADE_DURATION = 200;

const INDEX_IN_PLAY_NEXT = -1;

/**
* @readonly
* @enum {string}
Expand Down Expand Up @@ -255,8 +257,8 @@ export default class {
const next = this._reversed ? this.current - 1 : this.current + 1;

if (this._playNextList.length > 0) {
let trackID = this._playNextList.shift();
return [trackID, this.current];
let trackID = this._playNextList[0];
return [trackID, INDEX_IN_PLAY_NEXT];
}

// 循环模式开启,则重新播放当前模式下的相对的下一首
Expand Down Expand Up @@ -704,7 +706,12 @@ export default class {
this._setPlaying(false);
return false;
}
this.current = index;
let next = index;
if (index === INDEX_IN_PLAY_NEXT) {
this._playNextList.shift();
next = this.current;
}
this.current = next;
this._replaceCurrentTrack(trackID);
return true;
}
Expand Down

0 comments on commit f2f4e2c

Please sign in to comment.