From 489d3bd60ad7dc2fecb398b09cf4c52df16f0fc2 Mon Sep 17 00:00:00 2001
From: Davin <591807572@qq.com>
Date: 星期三, 26 七月 2023 15:55:30 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' of http://59.41.255.150:6688/r/~wxr/OnPro into Dev-Branch
---
HDL_ON/UI/UI2/FuntionControlView/Light/ColorfulSettingPage.cs | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/ColorfulSettingPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/ColorfulSettingPage.cs
index 8bb2a15..eaec6ee 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/ColorfulSettingPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/ColorfulSettingPage.cs
@@ -333,26 +333,26 @@
btnConfrim.MouseUpEventHandler = (sender, e) =>
{
backAction?.Invoke(curColor) ;
- System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+ var d = new System.Collections.Generic.Dictionary<string, string>();
if (isSatrtColor)
{
d.Add(FunctionAttributeKey.ColorfulBegin, redColor + "," + greenColor + "," + blueColor);
function.SetAttrState(FunctionAttributeKey.ColorfulBegin, redColor + "," + greenColor + "," + blueColor);
- var color = function.GetAttrState(FunctionAttributeKey.ColorfulEnd).Split(",");
- var sendColorString = color[0] + "," + color[1] + "," + color[2];
- d.Add(FunctionAttributeKey.ColorfulEnd, sendColorString);
- d.Add(FunctionAttributeKey.ColorfulTime, function.GetAttrState(FunctionAttributeKey.ColorfulTime));
-
+ //var color = function.GetAttrState(FunctionAttributeKey.ColorfulEnd).Split(",");
+ //var sendColorString = color[0] + "," + color[1] + "," + color[2];
+ //d.Add(FunctionAttributeKey.ColorfulEnd, sendColorString);
+ //d.Add(FunctionAttributeKey.ColorfulTime, function.GetAttrState(FunctionAttributeKey.ColorfulTime));
}
else
{
- var color = function.GetAttrState(FunctionAttributeKey.ColorfulBegin).Split(",");
- var sendColorString = color[0] + "," + color[1] + "," + color[2];
- d.Add(FunctionAttributeKey.ColorfulBegin, sendColorString);
- d.Add(FunctionAttributeKey.ColorfulTime, function.GetAttrState(FunctionAttributeKey.ColorfulTime));
+ //var color = function.GetAttrState(FunctionAttributeKey.ColorfulBegin).Split(",");
+ //var sendColorString = color[0] + "," + color[1] + "," + color[2];
+ //d.Add(FunctionAttributeKey.ColorfulBegin, sendColorString);
+ //d.Add(FunctionAttributeKey.ColorfulTime, function.GetAttrState(FunctionAttributeKey.ColorfulTime));
d.Add(FunctionAttributeKey.ColorfulEnd, redColor + "," + greenColor + "," + blueColor);
function.SetAttrState(FunctionAttributeKey.ColorfulEnd, redColor + "," + greenColor + "," + blueColor);
}
+ //d.Add(FunctionAttributeKey.Colorful, "off");
Control.Ins.SendWriteCommand(function, d);
this.RemoveFromParent();
};
--
Gitblit v1.8.0