From 2bec9c838d2d688025698de8ec1de401ffd7dd1f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 11 八月 2020 14:13:55 +0800
Subject: [PATCH] 20200811
---
HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs | 30 ++++++++++++++++++++++++------
1 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
index 639ad66..00cd0d1 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
@@ -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) =>
@@ -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)
@@ -109,7 +115,10 @@
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();
}
@@ -142,7 +154,10 @@
new System.Threading.Thread(() =>
{
light.on_off = btnSwitch.IsSelected ? "on" : "off";
- Control.Send(CommandType_A.write, this.light);
+ System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+ d.Add("on_off", light.on_off.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