Merge branch 'Dev-Branch' into wxr1215

wxr

2022-05-18 46719b11d11b6544b57cf966cf498fbedf9b613e

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

@@ -49,6 +49,7 @@
        /// </summary>
        static void clearA31Threads()
        {

            var threads = threadLists.FindAll((obj) => { return obj.Name == "A31"; });
            foreach (var thread in threads)
            {
@@ -166,6 +167,7 @@
                    {
                        try
                        {
                            
                            SendMethod.mMethod.RefreshDeviceStatus(new List<string> { a31player.functionMusic.deviceId });
                            System.Threading.Thread.Sleep(500);
                        }
@@ -191,7 +193,7 @@
            musicView.singerBtn.Text = player.functionMusic.GetAttrState(KeyProperty.song_name);
            musicView.songNameBtn.Text = player.functionMusic.GetAttrState(KeyProperty.song_name);
            musicView.musicNameBtn.Text = player.functionMusic.name;

            musicView.collectIconBtn.Visible = false;//先暂时隐藏收藏功能
            ///收藏事件
            musicView.collectIconBtn.MouseUpEventHandler += (sender, e) =>
            {
@@ -289,6 +291,7 @@
                        musicView.musicNameBtn.Text = player.functionMusic.name;
                        if (player.functionMusic.GetAttrState(KeyProperty.on_off) == ValueProperty.on)
                        {

                            musicView.playBtn.IsSelected = true;
                        }
                        else