Merge branch 'tzy' into NewFilePath

wxr

2020-12-17 6ec12a036c96a200fc0a941967d6b4d07592f863

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

@@ -110,10 +110,6 @@
            };
            controlView.AddChidren(btnFromFoorAndRoom);

            if(light.redColor==0&&light.greenColor == 0&& light.blueColor == 0)
            {
            }

            btnCurColor = new Button()
            {
                X = Application.GetRealWidth(16),
@@ -123,13 +119,9 @@
                Radius = (uint)Application.GetMinRealAverage(8),
                BorderColor = CSS_Color.PromptingColor2,
                BorderWidth = 1,
                BackgroundColor = (uint)(0xFF000000 + light.redColor * 256 * 256 + light.greenColor * 256 + light.blueColor)
                BackgroundColor = (uint)(0xFF000000 + light.GetRGBcolor())
            };

            if (light.redColor == 0 && light.greenColor == 0 && light.blueColor == 0)
            {
                btnCurColor.BackgroundColor = 0x00000000;
            }
            controlView.AddChidren(btnCurColor);

            btnCollection = new Button()
@@ -140,9 +132,14 @@
                Height = Application.GetMinRealAverage(40),
                SelectedImagePath = "Collection/CollectionIcon.png",
                UnSelectedImagePath = "Collection/CollectionGrayIcon.png",
                IsSelected = light.collection
                IsSelected = light.collect
            };
            controlView.AddChidren(btnCollection);
            //controlView.AddChidren(btnCollection);
            //2020-12-16 如果是成员隐藏收藏功能
            if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
            {
                controlView.AddChidren(btnCollection);
            }

            colorPicker = new ColorPicker()
            {
@@ -153,6 +150,10 @@
                ColorImagePath = "FunctionIcon/Light/ColorWheel.png",
            };
            controlView.AddChidren(colorPicker);
            if(light.trait_on_off.curValue.ToString() == "off")
            {
                colorPicker.ColorImagePath = "FunctionIcon/Light/ColorWheelGray.png";
            }

            #region 亮度调节
            var btnBrightnessText = new Button()
@@ -192,7 +193,7 @@
                ThumbImageHeight = Application.GetRealHeight(54),
                ProgressTextColor = CSS_Color.FirstLevelTitleColor,
                ProgressTextSize = CSS_FontSize.PromptFontSize_FirstLevel,
                ProgressBarColor = light.trait_on_off.value.ToString() == "on" ? CSS_Color.AuxiliaryColor1 : CSS_Color.DividingLineColor,
                ProgressBarColor = light.trait_on_off.curValue.ToString() == "on" ? CSS_Color.AuxiliaryColor1 : CSS_Color.DividingLineColor,
                MaxValue = 100,
                Progress = light.brightness,
                SeekBarPadding = Application.GetRealWidth(20),
@@ -293,7 +294,7 @@
                Height = Application.GetMinRealAverage(40),
                UnSelectedImagePath = "Public/PowerClose.png",
                SelectedImagePath = "Public/PowerOpen.png",
                IsSelected = light.trait_on_off.value.ToString() == "on"
                IsSelected = light.trait_on_off.curValue.ToString() == "on"
            };
            controlView.AddChidren(btnSwitch);