2020-07-23

wxr

2020-07-23 5de5a26d3825b3182a7d3a18ed1cbdbb78a3f9aa

 HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs

@@ -210,15 +210,14 @@
        /// </summary>
        void MusicListView(A31MusicModel a31player)
        {


            MusicView musicView = new MusicView();
            musicView.View(verticalRefresh);
            musicView.singerBtn.Text = a31player.A31PlayStatus.Artist;
            musicView.songNameBtn.Text = a31player.A31PlayStatus.Title;
            musicView.musicNameBtn.Text = new View.DialogView { }.NamePlayer(a31player);
            musicView.regionBtn.TextID = StringId.region;
            if (a31player.IsEnd) {
            if (a31player.IsEnd)
            {
                musicView.muiscFl.Height =Application.GetRealHeight(12 + 139 + 12);
            }
            EventHandler<MouseEventArgs> clickMergence = (sender, e) =>
@@ -230,13 +229,11 @@
                else if (a31player.ServerClientType == 1)
                {
                    new View.DialogView { }.DetachPlayMergence(a31player);

                }
            };
            musicView.mergeBjBtn.MouseUpEventHandler += clickMergence;
            musicView.mergeBtn.MouseUpEventHandler += clickMergence;
            musicView.mergeIconBtn.MouseUpEventHandler += clickMergence;


            musicView.clickBtn.MouseUpEventHandler += (sender, e) =>
             {
@@ -281,6 +278,12 @@
            musicView.nextBtn.MouseUpEventHandler += (sender, e) =>
            {
                musicView.nextBtn.IsSelected = false;
            };

            musicView.collectIconBtn.MouseUpEventHandler = (sender, e) =>
            {
                musicView.collectIconBtn.IsSelected = !musicView.collectIconBtn.IsSelected;
                a31player.collection = musicView.collectIconBtn.IsSelected ? true : false;
            };

            System.Threading.Tasks.Task.Run(() =>
@@ -363,7 +366,6 @@
                            string str = a31player.Name;
                            for (int j = 0; j < a31player.Slave.slave_list.Count; j++)
                            {

                                var slave = a31player.Slave.slave_list[j];
                                str = str + "+" + slave.name;
                                var tempA31Player = A31MusicModel.A31MusicModelList.Find((obj) => slave.uuid.Replace("uuid:", "") == obj.UniqueDeviceName);
@@ -390,7 +392,6 @@
                                    tempA31Player.UniqueDeviceName = slave.uuid.Replace("uuid:", "");
                                    tempA31Player.IsCanShow = false;
                                    tempA31Player.IsOnLine = false;//true作用为了读取从播放器的音量

                                }
                            }
                            a31player.MainPlayName = str;
@@ -401,11 +402,8 @@
                        var ss = e.Message;
                    }
                }

            }
            catch { }
        }

    }

}