From bb6ad792b598927a5459a5fb6f6c27fb1aa9e94e Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期四, 17 十二月 2020 14:06:36 +0800
Subject: [PATCH] 20201217-1
---
HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs | 178 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 161 insertions(+), 17 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
index b4c5dd0..15c1c32 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
@@ -1,20 +1,64 @@
锘縰sing System;
+using HDL_ON.DriverLayer;
using HDL_ON.Entity;
-
+using Shared;
namespace HDL_ON.UI
{
public partial class RGBPage
{
+ /// <summary>
+ /// 鏇存柊鍔熻兘鐘舵��
+ /// </summary>
+ public static void UpdataStates(Light uFunction)
+ {
+ Application.RunOnMainThread(() =>
+ {
+ try
+ {
+ if (bodyView == null)
+ return;
+ if (uFunction.functionType == bodyView.light.functionType && uFunction.sid == bodyView.light.sid)
+ {
+ if (!bodyView.onDimmerBar)
+ {
+ bodyView.dimmerBar.Progress = uFunction.brightness;
+ }
+ if (uFunction.trait_on_off.curValue.ToString() == "on")
+ {
+ bodyView.colorPicker.ColorImagePath = "FunctionIcon/Light/ColorWheel.png";
+ bodyView.dimmerBar.ProgressBarColor = CSS.CSS_Color.AuxiliaryColor1;
+ bodyView.btnSwitch.IsSelected = true;
+ bodyView.btnCurColor.BackgroundColor = (uint)(0xFF000000 + bodyView.light.GetRGBcolor());
+ }
+ else
+ {
+ bodyView.colorPicker.ColorImagePath = "FunctionIcon/Light/ColorWheelGray.png";
+ bodyView.dimmerBar.ProgressBarColor = CSS.CSS_Color.PromptingColor2;
+ bodyView.btnSwitch.IsSelected = false;
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ MainPage.Log($"{bodyView.GetType().Name } UpdataStates error : {ex.Message}");
+ }
+ });
+ }
+
+
void LoadEventList()
{
LoadColorChangeEvent();
LoadCollectionEvent();
LoadSwitchEvent();
-
+ LoadEvent_BackCenterColor();
+ LoadEvent_DimmerBar();
+ LoadEvet_ChangeFadeTime();
//鍥為��鍒锋柊淇℃伅浜嬩欢
actionRefresh = () => {
btnFunctionName.Text = btnFunctionName_Out.Text = light.name;
btnFromFloor_Out.Text = btnFromFoorAndRoom.Text = light.GetRoomListName();
+ //light.SaveFunctionData(true);
};
}
@@ -25,15 +69,24 @@
{
DateTime colorChangeTime = DateTime.MinValue;
colorPicker.ColorChaged += (sender2, e2) => {
- if ((DateTime.Now - colorChangeTime).TotalMilliseconds > 50)
+ if(light.trait_on_off.curValue.ToString() == "off")
{
- //lightLigicBytes[6] = e2[0];
- //lightLigicBytes[7] = e2[1];
- //lightLigicBytes[8] = e2[2];
- //Control.ControlBytesSend(Command.SetLogicLoopColor, lightRGB.SubnetID, lightRGB.DeviceID, lightLigicBytes, SendCount.Zero);
- colorChangeTime = DateTime.Now;
- btnCurColor.BackgroundColor = (uint)(0xFF000000 + e2[0] * 256 * 256 + e2[1] * 256 + e2[2]);
+ return;
}
+ if ((DateTime.Now - colorChangeTime).TotalMilliseconds > 200)
+ {
+ light.SetRGBcolor(e2);
+ colorChangeTime = DateTime.Now;
+ btnCurColor.BackgroundColor = (uint)(0xFF000000 + light.GetRGBcolor());
+ //Control.Send(CommandType_A.write, this.light);
+ System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+ d.Add(FunctionAttributeKey.RGB, light.GetRGBcolorString());
+ Control.Ins.SendWriteCommand(light, d);
+ }
+ };
+ colorPicker.MouseUpEventHandler = (sender, e) =>
+ {
+ var ss = btnCurColor.BackgroundColor;
};
}
@@ -45,11 +98,81 @@
void LoadCollectionEvent()
{
btnCollection.MouseUpEventHandler += (sender, e) => {
- btnCollection.IsSelected = light.collection = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
- DB_ResidenceData.residenceData.SaveResidenceData();
+ btnCollection.IsSelected = light.collect = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
+ light.SaveFunctionData(true);
};
}
+ /// <summary>
+ /// 鐏厜璋冨厜浜嬩欢
+ /// </summary>
+ void LoadEvent_DimmerBar()
+ {
+ dimmerBar.OnStartTrackingTouchEvent = (sender, e)=>{
+ onDimmerBar = true;
+ };
+ dimmerBar.OnStopTrackingTouchEvent = (sender, e) => {
+ new System.Threading.Thread(() => {
+ System.Threading.Thread.Sleep(100);
+ onDimmerBar = false;
+ })
+ { IsBackground = true }.Start();
+ light.brightness = dimmerBar.Progress;
+ System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+ d.Add(FunctionAttributeKey.Brightness, light.brightness.ToString());
+ Control.Ins.SendWriteCommand(light, d);
+ light.fadeTime = barFadeTime.Progress;
+ };
+ dimmerBar.OnProgressChangedEvent = (sender, e) => {
+ light.fadeTime = 0;
+ if (!btnSwitch.IsSelected)
+ {
+ dimmerBar.ProgressBarColor = CSS.CSS_Color.AuxiliaryColor1;
+ }
+ btnSwitch.IsSelected = e > 0 ? true : false;
+ light.brightness = e;
+ light.trait_on_off.curValue = e > 0 ? "on" : "off";
+
+ if (e == 0 || e == 100)
+ {
+ //Control.Send(CommandType_A.write, this.light);
+ System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+ d.Add(FunctionAttributeKey.Brightness, light.brightness.ToString());
+ Control.Ins.SendWriteCommand(light, d);
+ }
+ else
+ {
+ if (200 < (DateTime.Now - light.refreshTime).TotalMilliseconds)
+ {
+ light.refreshTime = DateTime.Now;
+ new System.Threading.Thread(() =>
+ {
+ //Control.Send(CommandType_A.write, light);
+ System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+ d.Add(FunctionAttributeKey.Brightness, light.brightness.ToString());
+ Control.Ins.SendWriteCommand(light, d);
+ })
+ { IsBackground = true }.Start();
+ }
+ else
+ {
+ MainPage.Log("skip dimmer control!!");
+ }
+ }
+ };
+ }
+
+ /// <summary>
+ /// 淇敼鐏厜娓愬彉鏃堕棿
+ /// </summary>
+ void LoadEvet_ChangeFadeTime()
+ {
+ barFadeTime.MouseUpEventHandler = (sender, e) =>
+ {
+ light.fadeTime = barFadeTime.Progress;
+ light.SaveFunctionData(true);
+ };
+ }
/// <summary>
/// 鍔犺浇寮�鍏充簨浠�
/// </summary>
@@ -58,17 +181,38 @@
btnSwitch.MouseUpEventHandler += (sender, e) =>
{
btnSwitch.IsSelected = !btnSwitch.IsSelected;
-
+ dimmerBar.ProgressBarColor = btnSwitch.IsSelected ? CSS.CSS_Color.AuxiliaryColor1 : CSS.CSS_Color.PromptingColor2;
new System.Threading.Thread(() =>
{
- var light = this.light as Light;
- light.state = btnSwitch.IsSelected ? 1 : 0;
- Control.Send("write", this.light, 3);
+ light.trait_on_off.curValue = btnSwitch.IsSelected ? "on" : "off";
+ System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+ d.Add(FunctionAttributeKey.OnOff, light.trait_on_off.curValue.ToString());
+ if (btnSwitch.IsSelected)
+ {
+ d.Add(FunctionAttributeKey.Brightness, light.lastBrightness.ToString());
+ }
+ else
+ {
+ light.lastBrightness = light.brightness;
+ }
+ Control.Ins.SendWriteCommand(light, d);
})
{ IsBackground = true }.Start();
};
-
}
-
+ /// <summary>
+ /// 鎭㈠榛樿棰滆壊
+ /// </summary>
+ void LoadEvent_BackCenterColor()
+ {
+ btnRestoredPoint.MouseUpEventHandler = (sender, e) =>
+ {
+ light.SetRGBcolor(new byte[] { 255, 255, 255 });
+ btnCurColor.BackgroundColor = 0xFFFFFFFF;
+ System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+ d.Add(FunctionAttributeKey.RGB, light.GetRGBcolorString());
+ Control.Ins.SendWriteCommand(light, d);
+ };
+ }
}
}
--
Gitblit v1.8.0