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

wxr

2022-01-14 0c1b0cdf903114c4214f6b9298ecd440972a42b5

 HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs

@@ -156,12 +156,12 @@
                                    else if (SPK.MusicSpkList().Contains(updataFunction.spk))
                                    {
                                        #region 音乐更新
                                        var uMusic = updataFunction as Music.A31MusicModel;
                                        var uMusic = updataFunction;
                                        if (cTag == updataFunction.spk + "_State_" + updataFunction.sid)
                                        {
                                            try
                                            {
                                                (fcView.GetChildren(j) as Button).IsSelected = uMusic.A31PlayStatus.status == "play";
                                                (fcView.GetChildren(j) as Button).IsSelected = uMusic.GetAttrState("on_off") == "on";
                                            }
                                            catch (Exception ex)
                                            {