合并嘉乐lc代码

wxr

2021-07-01 adc150efb13a0506f45a3c344c3ee2ef2dba8e90

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

@@ -163,12 +163,12 @@
            {
                colorPicker.ColorImagePath = "FunctionIcon/Light/ColorWheelGray.png";
            }
            colorPicker.MouseDownEventHandler = (sender, e) => {
                MainPage.BasePageView.ScrollEnabled = false;
            };
            colorPicker.MouseUpEventHandler = (sender, e) => {
                MainPage.BasePageView.ScrollEnabled = true;
            };
            //colorPicker.MouseDownEventHandler = (sender, e) => {
            //    MainPage.BasePageView.ScrollEnabled = false;
            //};
            //colorPicker.MouseUpEventHandler = (sender, e) => {
            //    MainPage.BasePageView.ScrollEnabled = true;
            //};

            //白点控件
            this.btnWhiteRound = new Button();