专辑播放器 测试
parent
d67f2f40e6
commit
674b313ae0
|
|
@ -98,15 +98,17 @@ public class AudioCri: AudioBase
|
|||
Stop();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public override void Pause()
|
||||
{
|
||||
_criAtomSource.Pause(true);
|
||||
playState = PlayState.Paused;
|
||||
}
|
||||
|
||||
public override void Resume()
|
||||
{
|
||||
_criAtomSource.Pause(false);
|
||||
playState = PlayState.Playing;
|
||||
}
|
||||
|
||||
public override void Play(float volume = 1f)
|
||||
|
|
|
|||
|
|
@ -75,10 +75,11 @@ public class AlbumManager : Singlenton<AlbumManager>
|
|||
curPlayMode = (PlayMode)_saveData.curOrderMode;
|
||||
SetPlayMode(curPlayMode);
|
||||
SetPlayList();
|
||||
var curAudio = CurPlayAudio();
|
||||
var curAudio = CurPlayingAudioName();//CurPlayAudio();
|
||||
if (curAudio != null)
|
||||
{
|
||||
curMusicKey = curAudio.Key;
|
||||
curMusicKey = curAudio;//.Key
|
||||
DebugUtil.Log("CurAudio: " + curAudio);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -285,19 +286,33 @@ public class AlbumManager : Singlenton<AlbumManager>
|
|||
return AlbumPlayList(_saveData.curAlbumId);
|
||||
}
|
||||
|
||||
public DataAudio CurPlayAudio()
|
||||
public string CurPlayingAudioName()
|
||||
{
|
||||
loadSaveData();
|
||||
var playList = CurAlbumPlayListOld();
|
||||
var playList = CurAlbumPlayList();
|
||||
if (playList != null && playList.Count > 0)
|
||||
{
|
||||
return TableManager.Instance.Tables.Audios.GetByID(playList[_saveData.curPlayAudioIndex]);
|
||||
return playList[_saveData.curPlayAudioIndex];
|
||||
}
|
||||
else
|
||||
{
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
//public DataAudio CurPlayAudio()
|
||||
//{
|
||||
// loadSaveData();
|
||||
// var playList = CurAlbumPlayListOld();
|
||||
// if (playList != null && playList.Count > 0)
|
||||
// {
|
||||
// return TableManager.Instance.Tables.Audios.GetByID(playList[_saveData.curPlayAudioIndex]);
|
||||
// }
|
||||
// else
|
||||
// {
|
||||
// return null;
|
||||
// }
|
||||
//}
|
||||
public int CurPlayAudioIndex()
|
||||
{
|
||||
loadSaveData();
|
||||
|
|
@ -457,7 +472,7 @@ public class AlbumManager : Singlenton<AlbumManager>
|
|||
}
|
||||
|
||||
var name = playList[audioIndex];
|
||||
AudioManager.Instance.PlayAudio(name);
|
||||
AudioManager.Instance.PlayAudio(name, AudioCriManager.EPlayType.Music);
|
||||
curMusicKey = name;
|
||||
totalSeconds = AlbumManager.Instance.GetAlbumLength(name);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -201,10 +201,10 @@ public class UI_MusicPannelController : UIWindow
|
|||
protected override void OnShowWindow(object data = null)
|
||||
{
|
||||
//bool isPlaying = AudioManager.Instance.IsPlayingAlbum;
|
||||
PauseAndResume();
|
||||
//PauseAndResume();
|
||||
//if (!isPlaying)
|
||||
//{
|
||||
PauseAndResume();//用于加载音频
|
||||
//PauseAndResume();//用于加载音频
|
||||
//}
|
||||
curAudioLength = AlbumManager.Instance.GetAlbumLength(AlbumManager.Instance.curMusicKey);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue