组合调光RGB功能修复

wxr

2022-11-17 1540af2a5c0ddeb8c4389c437b71f64b3c4b45ea

 HDL_ON/UI/UI2/FuntionControlView/Light/LightScene/AddLightScene.cs

@@ -888,7 +888,7 @@
        void LoadDimmingAttrView(VerticalScrolViewLayout attrView)
        {
            string briValue = "";
            commandDic.TryGetValue(FunctionAttributeKey.Percent,out briValue);
            commandDic.TryGetValue(FunctionAttributeKey.Brightness,out briValue);

            var dimmingView = new FrameLayout()
            {
@@ -908,7 +908,7 @@
                TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
                TextID = StringId.Brightness,
            };
            btnBrightnessText.Text = Language.StringByID(StringId.Brightness) + " " + commandDic[FunctionAttributeKey.Percent] + "%";
            btnBrightnessText.Text = Language.StringByID(StringId.Brightness) + " " + commandDic[FunctionAttributeKey.Brightness] + "%";
            dimmingView.AddChidren(btnBrightnessText);


@@ -938,7 +938,7 @@
                ProgressTextSize = CSS_FontSize.PromptFontSize_FirstLevel,
                ProgressBarColor = CSS_Color.AuxiliaryColor1,
                MaxValue = 100,
                Progress = Convert.ToInt32(commandDic[FunctionAttributeKey.Percent]),
                Progress = Convert.ToInt32(commandDic[FunctionAttributeKey.Brightness]),
                SeekBarPadding = Application.GetRealWidth(20),
                IsProgressTextShow = false,
                ProgressChangeDelayTime = 0,
@@ -948,7 +948,7 @@
                btnBrightnessText.Text = Language.StringByID(StringId.Brightness) + " " + e + "%";
            };
            dimmerBar.OnStopTrackingTouchEvent = (sender, e) => {
                commandDic[FunctionAttributeKey.Percent] = dimmerBar.Progress.ToString();
                commandDic[FunctionAttributeKey.Brightness] = dimmerBar.Progress.ToString();
                btnBrightnessText.Text = Language.StringByID(StringId.Brightness) + " " + e + "%";
                
                foreach (var light in lights)
@@ -994,7 +994,7 @@
            #region 色温

            string valueStr = "2700";
            commandDic.TryGetValue(FunctionAttributeKey.Percent, out valueStr);
            commandDic.TryGetValue(FunctionAttributeKey.CCT, out valueStr);
            int value = Convert.ToInt32(valueStr) / 100;

            var cctView = new FrameLayout()
@@ -1110,7 +1110,7 @@
            #region RGB

            string value = "255,255,255";
            commandDic.TryGetValue(FunctionAttributeKey.Percent, out value);
            commandDic.TryGetValue(FunctionAttributeKey.RGB, out value);

            var rgbView = new FrameLayout()
            {