|
@@ -145,13 +145,7 @@ export const toggleMutePlayAudio = (source: IPlayState, muted: boolean) => {
|
|
|
/** 切换节拍器音源 */
|
|
|
export const changeSongSourceByBate = (isDisBate:boolean) => {
|
|
|
// isDisBate 为true 切换到不带节拍的,为false 切换到带节拍的
|
|
|
- let songEleCurrentTime = audioData.songEle?.currentTime || 0
|
|
|
- let backgroundEleCurrentTime = audioData.backgroundEle?.currentTime || 0
|
|
|
- let mingSongEleCurrentTime = audioData.mingSongEle?.currentTime || 0
|
|
|
- // 有一种场景,默认模式没有文件内容的时候,songEle,backgroundEle,mingSongEle都为空,在设置音源之前点击跳转位置,这时候以audioData.progress的时间为准
|
|
|
- if(!audioData.songEle&&!audioData.backgroundEle&&!audioData.mingSongEle){
|
|
|
- songEleCurrentTime = backgroundEleCurrentTime = mingSongEleCurrentTime = audioData.progress || 0
|
|
|
- }
|
|
|
+ const currentTime = audioData.songEle?.currentTime || audioData.backgroundEle?.currentTime || audioData.mingSongEle?.currentTime || audioData.progress || 0
|
|
|
if (isDisBate) {
|
|
|
if(state.playType === "play"){
|
|
|
audioData.songEle = audioData.songCollection.songEle
|
|
@@ -172,9 +166,9 @@ export const changeSongSourceByBate = (isDisBate:boolean) => {
|
|
|
audioData.mingSongEle = audioData.songCollection.betaMingSongEle || audioData.songCollection.mingSongEle
|
|
|
}
|
|
|
}
|
|
|
- audioData.songEle && (audioData.songEle.currentTime = songEleCurrentTime)
|
|
|
- audioData.backgroundEle && (audioData.backgroundEle.currentTime = backgroundEleCurrentTime)
|
|
|
- audioData.mingSongEle && (audioData.mingSongEle.currentTime = mingSongEleCurrentTime)
|
|
|
+ audioData.songEle && (audioData.songEle.currentTime = currentTime)
|
|
|
+ audioData.backgroundEle && (audioData.backgroundEle.currentTime = currentTime)
|
|
|
+ audioData.mingSongEle && (audioData.mingSongEle.currentTime = currentTime)
|
|
|
// 设置静音与取消静音
|
|
|
if (state.playSource === "music") {
|
|
|
audioData.songEle && (audioData.songEle.muted = false);
|