2020-05-26-1

陈嘉乐

2020-05-26 c209a50cabf524c146fb2d02ce09cfc46c7c2f70

 HDL_ON/UI/Music/A31PlayMusicPage.cs

@@ -64,17 +64,17 @@
                    playView.loveBtn.IsSelected = !playView.loveBtn.IsSelected;
                    if (playView.loveBtn.IsSelected)
                    {
                        if (null == A31MusicModel.Current.CnLoveRadioInfoList.Find((musicInfo) =>
                        if (null == A31MusicModel.Current.LoveRadioInfoList.Find((musicInfo) =>
                        {
                            return url == musicInfo.URL;
                        }))
                        {
                            A31MusicModel.Current.CnLoveRadioInfoList.Add(new MusicInfo { Title = song, URL = url, });
                            A31MusicModel.Current.LoveRadioInfoList.Add(new MusicInfo { Title = song, URL = url, });
                        }
                    }
                    else
                    {
                        A31MusicModel.Current.CnLoveRadioInfoList.RemoveAll((musicInfo) =>
                        A31MusicModel.Current.LoveRadioInfoList.RemoveAll((musicInfo) =>
                        {
                            return url == musicInfo.URL;
                        });
@@ -261,7 +261,7 @@
                            A31MusicModel.Current.CurrentPlayMusicInfoList = new List<MusicInfo>();
                            return;
                        }
                        var playString = SendMethod.GetCurrentPlayList();
                        var playString = SendMethod.GetCurrentPlayList(A31MusicModel.Current);
                        A31MusicModel.Current.CurrentPlayMusicInfoList = new List<MusicInfo>();
                        var se = System.Security.SecurityElement.FromString(playString);
                        while (se.Children != null)
@@ -318,7 +318,7 @@
            EventHandler<int> progressClick = (sender, e) =>
            {
                playView.volValueBtn.Text = playView.volSeekBar.Progress + "%";
                A31MusicModel.Current.ControlVolume(playView.volSeekBar.Progress);
                SendMethod.ControlVolume(playView.volSeekBar.Progress,A31MusicModel.Current);
                A31MusicModel.Current.A31PlayStatus.vol = playView.volSeekBar.Progress.ToString();
            };
            playView.volSeekBar.OnProgressChangedEvent += progressClick;
@@ -327,7 +327,7 @@
            playView.prevBtn.MouseDownEventHandler += (sender, e) =>
            {
                playView.prevBtn.IsSelected = true;
                SendMethod.Previous();
                SendMethod.Previous(A31MusicModel.Current);
            };
            playView.prevBtn.MouseUpEventHandler += (sender, e) =>
            {
@@ -339,13 +339,13 @@
                if (playView.playBtn.IsSelected)
                {
                    playView.playBtn.IsSelected = false;
                    SendMethod.Pause();
                    SendMethod.Pause(A31MusicModel.Current);
                    A31MusicModel.Current.A31PlayStatus.status = "pause";
                }
                else
                {
                    playView.playBtn.IsSelected = true;
                    SendMethod.Play();
                    SendMethod.Play(A31MusicModel.Current);
                    A31MusicModel.Current.A31PlayStatus.status = "play";
                }
            };
@@ -353,7 +353,7 @@
            playView.nextBtn.MouseDownEventHandler += (sender, e) =>
            {
                playView.nextBtn.IsSelected = true;
                SendMethod.Next();
                SendMethod.Next(A31MusicModel.Current);
            };
            playView.nextBtn.MouseUpEventHandler += (sender, e) =>
            {
@@ -367,7 +367,7 @@
                    return;
                }
                playView.volSeekBar.Progress = volume;
                A31MusicModel.Current.ControlVolume(playView.volSeekBar.Progress);
                SendMethod.ControlVolume(playView.volSeekBar.Progress,A31MusicModel.Current);
                A31MusicModel.Current.A31PlayStatus.vol = playView.volSeekBar.Progress.ToString();
            };

@@ -403,22 +403,21 @@

                            switch (A31MusicModel.Current.A31PlayStatus.loop)
                            {

                                case "0"://列表循环
                                    playView.playOrderBtn.UnSelectedImagePath = "MusicIcon/list.png";
                                    break;
                                case "1"://单曲顺环
                                    playView.playOrderBtn.UnSelectedImagePath = "MusicIcon/single.png";
                                    break;
                                case "2"://随机播放
                                    playView.playOrderBtn.UnSelectedImagePath = "MusicIcon/random.png";
                                    break;
                                case "0"://列表循环
                                    playView.playOrderBtn.UnSelectedImagePath = "MusicIcon/list.png";
                                    break;
                            }


                            if (A31MusicModel.Current.A31PlayStatus.Source == "RADIO-NETWORK")
                            {
                                var v = A31MusicModel.Current.CnLoveRadioInfoList.Find((like) =>
                                var v = A31MusicModel.Current.LoveRadioInfoList.Find((like) =>
                                {
                                    return like.URL == A31MusicModel.Current.A31PlayStatus.TrackURL;
                                });
@@ -637,7 +636,7 @@
                            A31MusicModel.Current.A31PlayStatus.Title = songBtn.Text;
                            System.Threading.Tasks.Task.Run(() =>
                            {
                                SendMethod.ListMusicPlay(playListName, clickBtn.Tag);
                                SendMethod.ListMusicPlay(playListName, clickBtn.Tag,A31MusicModel.Current);
                            });
                        });
                    });