Merge remote-tracking branch 'origin/WJC'

wxr

2020-12-01 a46cd0adb5af29e8a9cf47c219475acaedfcf839

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

@@ -77,7 +77,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();
            };
        }