Merge remote-tracking branch 'origin/wxr4' into dev-tzy

tzy

2021-05-14 ee5f2543624a0e3ae9d046062b822727a31685e1

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

@@ -257,11 +257,11 @@
                {
                    if (musicView.collectIconBtn.IsSelected)
                    {
                        a31player.collection = true;
                        a31player.collect = true;
                    }
                    else
                    {
                        a31player.collection = false;
                        a31player.collect = false;
                    }
                }
                A31MusicModel.Save();
@@ -372,7 +372,7 @@
                        }
                        else
                        {
                            if (a31player.collection)
                            if (a31player.collect)
                            {
                                musicView.collectIconBtn.IsSelected = true;
                            }