From af1cb3ecd0f4b0589e00b28f7f9edccf39e6e12b Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 10 九月 2020 16:15:11 +0800
Subject: [PATCH] 202009101
---
HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs | 40 +++++++++++++++++++++++++++++-----------
1 files changed, 29 insertions(+), 11 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
index 639ad66..4f4e38d 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
@@ -22,8 +22,8 @@
{
bodyView.dimmerBar.Progress = uFunction.brightness;
}
- bodyView.dimmerBar.ProgressBarColor = uFunction.on_off == "on" ? CSS.CSS_Color.AuxiliaryColor1 : CSS.CSS_Color.PromptingColor2;
- bodyView.btnSwitch.IsSelected = uFunction.on_off == "on";
+ bodyView.dimmerBar.ProgressBarColor = uFunction.trait_on_off.value.ToString() == "on" ? CSS.CSS_Color.AuxiliaryColor1 : CSS.CSS_Color.PromptingColor2;
+ bodyView.btnSwitch.IsSelected = uFunction.trait_on_off.value.ToString() == "on";
bodyView.btnCurColor.BackgroundColor = (uint)(0xFF000000 + bodyView.light.redColor * 256 * 256 + bodyView.light.greenColor * 256 + bodyView.light.blueColor);
}
}
@@ -63,7 +63,10 @@
light.blueColor = e2[2];
colorChangeTime = DateTime.Now;
btnCurColor.BackgroundColor = (uint)(0xFF000000 + light.redColor * 256 * 256 + light.greenColor * 256 + light.blueColor);
- Control.Send(CommandType_A.write, this.light);
+ //Control.Send(CommandType_A.write, this.light);
+ System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+ d.Add("color", (light.redColor * 256 * 256 + light.greenColor * 256 + light.blueColor).ToString());
+ Control.SendWriteCommand(light, d);
}
};
colorPicker.MouseUpEventHandler = (sender, e) =>
@@ -81,7 +84,7 @@
{
btnCollection.MouseUpEventHandler += (sender, e) => {
btnCollection.IsSelected = light.collection = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
- DB_ResidenceData.residenceData.SaveResidenceData();
+ light.SaveFunctionData();
};
}
@@ -96,7 +99,10 @@
dimmerBar.OnStopTrackingTouchEvent = (sender, e) => {
onDimmerBar = false;
light.brightness = dimmerBar.Progress;
- Control.Send(CommandType_A.write, light);
+ System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+ d.Add("brightness", light.brightness.ToString());
+ Control.SendWriteCommand(light, d);
+ //Control.Send(CommandType_A.write, light);
};
dimmerBar.OnProgressChangedEvent = (sender, e) => {
if (!btnSwitch.IsSelected)
@@ -105,11 +111,14 @@
}
btnSwitch.IsSelected = e > 0 ? true : false;
light.brightness = e;
- light.on_off = e > 0 ? "on" : "off";
+ light.trait_on_off.value = e > 0 ? "on" : "off";
if (e == 0 || e == 100)
{
- Control.Send(CommandType_A.write, this.light);
+ //Control.Send(CommandType_A.write, this.light);
+ System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+ d.Add("brightness", light.brightness.ToString());
+ Control.SendWriteCommand(light, d);
}
else
{
@@ -118,7 +127,10 @@
light.refreshTime = DateTime.Now;
new System.Threading.Thread(() =>
{
- Control.Send(CommandType_A.write, light);
+ //Control.Send(CommandType_A.write, light);
+ System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+ d.Add("brightness", light.brightness.ToString());
+ Control.SendWriteCommand(light, d);
})
{ IsBackground = true }.Start();
}
@@ -141,8 +153,11 @@
dimmerBar.ProgressBarColor = btnSwitch.IsSelected ? CSS.CSS_Color.AuxiliaryColor1 : CSS.CSS_Color.PromptingColor2;
new System.Threading.Thread(() =>
{
- light.on_off = btnSwitch.IsSelected ? "on" : "off";
- Control.Send(CommandType_A.write, this.light);
+ light.trait_on_off.value = btnSwitch.IsSelected ? "on" : "off";
+ System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+ d.Add("on_off", light.trait_on_off.value.ToString());
+ Control.SendWriteCommand(light, d);
+ //Control.Send(CommandType_A.write, this.light);
})
{ IsBackground = true }.Start();
};
@@ -156,7 +171,10 @@
{
light.color = 0xFFFFFF;
btnCurColor.BackgroundColor = 0xFFFFFFFF;
- Control.Send(CommandType_A.write, this.light);
+ //Control.Send(CommandType_A.write, this.light);
+ System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+ d.Add("color", "FFFFFF");
+ Control.SendWriteCommand(light, d);
};
}
--
Gitblit v1.8.0