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

wxr

2020-12-18 f2d122dc78c58925a05d770d716e7fefcbd784ef

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

old mode 100644
new mode 100755
@@ -45,6 +45,10 @@
        /// 渐变时间进度条
        /// </summary>
        DiyImageSeekBar barFadeTime;
        /// <summary>
        /// 色盘里面那个会滑动的球
        /// </summary>
        Button btnWhiteRound;
        #endregion

        #region 区域变量
@@ -141,20 +145,32 @@
                controlView.AddChidren(btnCollection);
            }

            //色盘的桌布控件(限制那个白色滑动球使用)
            var framePickerBack = new FrameLayout();
            framePickerBack.Gravity = Gravity.CenterHorizontal;
            framePickerBack.Y = btnFromFoorAndRoom.Bottom + Application.GetRealHeight(1);
            framePickerBack.Width = Application.GetMinRealAverage(216);
            framePickerBack.Height = Application.GetMinRealAverage(216);
            controlView.AddChidren(framePickerBack);

            colorPicker = new ColorPicker()
            {
                Gravity = Gravity.CenterHorizontal,
                Y = btnFromFoorAndRoom.Bottom + Application.GetRealHeight(1),
                Width = Application.GetMinRealAverage(216),
                Height = Application.GetMinRealAverage(216),
                ColorImagePath = "FunctionIcon/Light/ColorWheel.png",
            };
            controlView.AddChidren(colorPicker);
            framePickerBack.AddChidren(colorPicker);
            if(light.trait_on_off.curValue.ToString() == "off")
            {
                colorPicker.ColorImagePath = "FunctionIcon/Light/ColorWheelGray.png";
            }

            //白点控件
            this.btnWhiteRound = new Button();
            btnWhiteRound.Width = Application.GetRealWidth(24);
            btnWhiteRound.Height = Application.GetRealWidth(24);
            btnWhiteRound.UnSelectedImagePath = "FunctionIcon/Light/ColorWheelTip.png";
            btnWhiteRound.Visible = false;
            framePickerBack.AddChidren(btnWhiteRound);

            #region 亮度调节
            var btnBrightnessText = new Button()
            {