20210705-1 代码备份

wei

2021-07-05 992cc7d4433f8f9e9b0a930ec095973e056abe1c

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

@@ -58,6 +58,11 @@
        Button btnFromFloor_Out;
        bool onDimmerBar = false;
        Function function;

        /// <summary>
        /// 最后打开的颜色
        /// </summary>
        byte[] lastColor = new byte[3] { 255, 255, 255 };
        /// <summary>
        /// 刷新显示信息
        /// </summary>
@@ -139,7 +144,7 @@
                UnSelectedImagePath = "Collection/CollectionGrayIcon.png",
                IsSelected = function.collect
            };
            //controlView.AddChidren(btnCollection);
            controlView.AddChidren(btnCollection);
            //2020-12-16 如果是成员隐藏收藏功能
            //if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
            //{
@@ -163,12 +168,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();