From 068c68295cad1967f7aafb4e5e951260ef03d4ce Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 09 七月 2021 09:16:43 +0800
Subject: [PATCH] 状态属性更改，不要轻易合并
---
HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
index b0c2522..e040d64 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
@@ -11,7 +11,7 @@
/// </summary>
public static void UpdataStates(Function updateTemp)
{
- Application.RunOnMainThread((() =>
+ Application.RunOnMainThread((Action)(() =>
{
try
{
@@ -20,7 +20,7 @@
if (updateTemp.spk == bodyView.function.spk && updateTemp.sid == bodyView.function.sid)
{
- if (updateTemp.trait_on_off.curValue.ToString() == "on")
+ if (updateTemp.trait_on_off.state.ToString() == "on")
{
//瑙ｅ喅閮ㄥ垎瀹夊崜鎵嬫満锛屽埛鏂板浘鐗囨椂浼氬彉灏忛棶棰�
if (bodyView.colorPicker.ColorImagePath != "FunctionIcon/Light/ColorWheel.png")
@@ -35,7 +35,7 @@
}
}
//鐘舵�佷竴鏍锋椂,涓嶅啀鍒锋柊瑙嗗浘
- else if (updateTemp.trait_on_off.curValue.ToString() == "off" && bodyView.btnSwitch.IsSelected == true)
+ else if (updateTemp.trait_on_off.state.ToString() == "off" && bodyView.btnSwitch.IsSelected == true)
{
//瑙ｅ喅閮ㄥ垎瀹夊崜鎵嬫満锛屽埛鏂板浘鐗囨椂浼氬彉灏忛棶棰�
if (bodyView.colorPicker.ColorImagePath != "FunctionIcon/Light/ColorWheelGray.png")
@@ -95,7 +95,7 @@
int circleR = colorPicker.Width / 2 - Application.GetRealWidth(12);
colorPicker.ColorChaged += (sender2, e2) => {
- if (function.trait_on_off.curValue.ToString() == "off" || pointIsRight == false)
+ if (function.trait_on_off.state.ToString() == "off" || pointIsRight == false)
{
//pointIsRight:鐐圭殑鍖哄煙涓嶆槸鍦嗙洏鍐�
return;
@@ -104,7 +104,7 @@
};
colorPicker.MouseDownEventHandler += (sender, e) =>
{
- if (function.trait_on_off.curValue.ToString() == "off")
+ if (function.trait_on_off.state.ToString() == "off")
{
return;
}
@@ -150,7 +150,7 @@
var colorChangeEvent = new System.Threading.Thread(() => {
while (this.Parent != null)
{
- if (function.trait_on_off.curValue.ToString() == "off" || pointIsRight == false)
+ if (function.trait_on_off.state.ToString() == "off" || pointIsRight == false)
{
//pointIsRight:鐐圭殑鍖哄煙涓嶆槸鍦嗙洏鍐�
continue;
@@ -267,9 +267,9 @@
bodyView.colorPicker.ColorImagePath = btnSwitch.IsSelected ? "FunctionIcon/Light/ColorWheel.png" : "FunctionIcon/Light/ColorWheelGray.png";
new System.Threading.Thread(() =>
{
- function.trait_on_off.curValue = btnSwitch.IsSelected ? "on" : "off";
+ function.trait_on_off.state = btnSwitch.IsSelected ? "on" : "off";
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- d.Add(FunctionAttributeKey.OnOff, function.trait_on_off.curValue.ToString());
+ d.Add(FunctionAttributeKey.OnOff, function.trait_on_off.state.ToString());
d.Add(FunctionAttributeKey.FadeTime, function.GetAttrState(FunctionAttributeKey.FadeTime));
if (btnSwitch.IsSelected)
{
@@ -296,7 +296,7 @@
{
btnRestoredPoint.MouseUpEventHandler = (sender, e) =>
{
- if(function.trait_on_off.curValue.ToString() == "off")
+ if(function.trait_on_off.state.ToString() == "off")
{
return;
}
--
Gitblit v1.8.0