Merge branch 'master' into WJC

陈嘉乐

2020-12-01 4a5e9d0447aae9b264a98ea1f4c95417d0f4aa91

 HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs

@@ -86,7 +86,7 @@
        void LoadCollectionEvent()
        {
            btnCollection.MouseUpEventHandler += (sender, e) => {
                btnCollection.IsSelected = light.collection = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
                btnCollection.IsSelected = light.collect = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
                light.SaveFunctionData();
            };
        }