Merge branch 'master' into WJC

陈嘉乐

2020-12-01 4a5e9d0447aae9b264a98ea1f4c95417d0f4aa91

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

@@ -75,11 +75,11 @@
                playView.collectIconBtn.IsSelected = !playView.collectIconBtn.IsSelected;
                if (playView.collectIconBtn.IsSelected)
                {
                    A31MusicModel.Current.collection = true;
                    A31MusicModel.Current.collect = true;
                }
                else
                {
                    A31MusicModel.Current.collection = false;
                    A31MusicModel.Current.collect = false;
                }

            };
@@ -365,7 +365,7 @@
                                }
                            }
                            playView.regionBtn.Text = A31MusicModel.Current.GetRoomListName();
                            if (A31MusicModel.Current.collection)
                            if (A31MusicModel.Current.collect)
                            {
                                playView.collectIconBtn.IsSelected = true;
                            }