From 1540af2a5c0ddeb8c4389c437b71f64b3c4b45ea Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 17 十一月 2022 10:01:55 +0800
Subject: [PATCH] 组合调光RGB功能修复
---
HDL_ON/UI/UI2/FuntionControlView/Light/LightScene/AddLightScene.cs | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/LightScene/AddLightScene.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/LightScene/AddLightScene.cs
index 656fa5f..c462573 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/LightScene/AddLightScene.cs
+++ b/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()
{
--
Gitblit v1.8.0