Merge remote-tracking branch 'origin/wjc' into wxr0114

wxr

2022-01-14 0c1b0cdf903114c4214f6b9298ecd440972a42b5

 HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs

@@ -244,11 +244,11 @@
                function.collect = false;
                if (SPK.MusicSpkList().Contains(function.spk))//处理音乐主从关系
                {
                    if ((function as Music.A31MusicModel).ServerClientType == 1)
                    {
                        (function as Music.A31MusicModel).MainPlayCollection = false;
                        Music.A31MusicModel.Save();
                    }
                    //if ((function as Music.A31MusicModel).ServerClientType == 1)
                    //{
                    //    (function as Music.A31MusicModel).MainPlayCollection = false;
                    //    Music.A31MusicModel.Save();
                    //}
                }
                string msg = function.name + Language.StringByID(StringId.CollectionCancelled);
                LoadDeviceFunctionControlZone();
@@ -374,7 +374,7 @@
                                        {
                                            if (SPK.MusicSpkList().Contains(function.spk))
                                            {
                                                btn.Text = (function as Music.A31MusicModel).A31PlayStatus.Title;
                                                btn.Text =function.GetAttrState("song_name");
                                            }
                                            else
                                            {