From a1b0ab7044100daaa7e0f1da2d2ca45e38098963 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 29 三月 2021 09:13:25 +0800
Subject: [PATCH] 2021-3-29-2
---
HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs | 191 ++++++++++++++++++++++++++++-------------------
1 files changed, 112 insertions(+), 79 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs b/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs
index 913f630..1c22cb3 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs
@@ -1,4 +1,5 @@
锘縰sing System;
+using System.Collections.Generic;
using HDL_ON.DriverLayer;
using HDL_ON.Entity;
using HDL_ON.UI.Music;
@@ -28,7 +29,7 @@
{
if (btn.Tag.ToString() == upfunc.sid + "_Switch")// + "_DimmerBar")
{
- btn.IsSelected = upfunc.trait_on_off.value.ToString() == "on";
+ btn.IsSelected = upfunc.trait_on_off.curValue.ToString() == "on";
}
}
}
@@ -39,7 +40,7 @@
{
if (btn.Tag.ToString() == upfunc.sid + "_DimmerBar")
{
- //btn.Progress = (upfunc as Light).trait_brightness.value.value.ToString() == "on";
+ btn.Progress = Convert.ToInt32(upfunc.GetAttrState(FunctionAttributeKey.Brightness));
}
}
}
@@ -65,39 +66,30 @@
{
btnCollectionIcon.MouseUpEventHandler += (sender, e) =>
{
- btnCollectionIcon.IsSelected = function.collection = !btnCollectionIcon.IsSelected;
- function.SaveFunctionData();
+ btnCollectionIcon.IsSelected = function.collect = !btnCollectionIcon.IsSelected;
+ function.CollectFunction();
};
- }
- /// <summary>
- /// 鍔犺浇鍦烘櫙鎺у埗浜嬩欢
- /// </summary>
- void LoadEvent_ControlScene()
- {
- EventHandler<MouseEventArgs> upEvent = (sender, e) => {
- Control.Ins.ControlScene(function as Scene);
- string msg = function.name + Language.StringByID(StringId.AlreadyOpened);
- new PublicAssmebly().TipMsgAutoClose(msg, false);
- };
- btnName.MouseUpEventHandler = upEvent;
- btnFromFloor.MouseUpEventHandler = upEvent;
- bodyDiv.MouseUpEventHandler = upEvent;
}
/// <summary>
/// 寮�鍏充簨浠�
/// </summary>
- void LoadEvent_SwitchFunction(Button btnSwitch)
+ void LoadEvent_SwitchFunction(Button btnSwitch,FunctionAttributes fadeTime = null)
{
btnSwitch.MouseUpEventHandler = (sender, e) =>
{
btnSwitch.IsSelected = !btnSwitch.IsSelected;
new System.Threading.Thread(() =>
{
- function.trait_on_off.value = btnSwitch.IsSelected ? "on" : "off";
- //Control.Send(CommandType_A.write, function);
+ function.trait_on_off.curValue = btnSwitch.IsSelected ? "on" : "off";
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- d.Add("on_off", function.trait_on_off.value.ToString());
+ d.Add(FunctionAttributeKey.OnOff, function.trait_on_off.curValue.ToString());
+ if(fadeTime!= null)
+ {
+ int result = 0;
+ int.TryParse(fadeTime.curValue.ToString(), out result);
+ d.Add(FunctionAttributeKey.FadeTime, result.ToString());
+ }
Control.Ins.SendWriteCommand(function, d);
})
{ IsBackground = true }.Start();
@@ -115,13 +107,11 @@
btnSwitch.IsSelected = !btnSwitch.IsSelected;
new System.Threading.Thread(() =>
{
- if (function.functionCategory == FunctionCategory.Light)
+ if (function.Spk_Prefix == FunctionCategory.Light)
{
- var light = function as Light;
- light.trait_on_off.value = btnSwitch.IsSelected ? "on" : "off";
- //Control.Send(CommandType_A.write, function);
- System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- d.Add("on_off", function.trait_on_off.value.ToString());
+ function.trait_on_off.curValue = btnSwitch.IsSelected ? "on" : "off";
+ Dictionary<string, string> d = new Dictionary<string, string>();
+ d.Add("on_off", function.trait_on_off.curValue.ToString());
Control.Ins.SendWriteCommand(function, d);
}
})
@@ -134,9 +124,8 @@
/// </summary>
void LoadEvent_LightDimming(DiyImageSeekBar dimmerControlBar)
{
- if(function.functionType == FunctionType.Dimmer || function.functionType == FunctionType.RGB)
+ if(function.spk == SPK.LightDimming || function.spk == SPK.LightRGB)
{
- var light = function as Light;
dimmerControlBar.OnStartTrackingTouchEvent = (sender, e) => {
onDimmerBar = true;
(bodyDiv.Parent as VerticalScrolViewLayout).ScrollEnabled = false;
@@ -144,38 +133,39 @@
dimmerControlBar.OnStopTrackingTouchEvent = (sender, e) => {
onDimmerBar = false;
(bodyDiv.Parent as VerticalScrolViewLayout).ScrollEnabled = true;
- light.brightness = dimmerControlBar.Progress;
- System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- d.Add("brightness", light.brightness.ToString());
- Control.Ins.SendWriteCommand(light, d);
+ function.SetAttrState(FunctionAttributeKey.Brightness, dimmerControlBar.Progress.ToString());
+ Dictionary<string, string> d = new Dictionary<string, string>();
+ d.Add(FunctionAttributeKey.Brightness, dimmerControlBar.Progress.ToString());
+ Control.Ins.SendWriteCommand(function, d);
};
dimmerControlBar.OnProgressChangedEvent = (sender, e) => {
- light.brightness = e;
- light.trait_on_off.value = e > 0 ? "on" : "off";
+ dimmerControlBar.ProgressBarColor = CSS.CSS_Color.AuxiliaryColor1;
+ //light.brightness = e;
+ //light.trait_on_off.curValue = e > 0 ? "on" : "off";
- if (e == 0 || e == 100)
- {
- //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.Ins.SendWriteCommand(light, d);
- }
- else
- {
- var tm = (DateTime.Now - light.refreshTime).TotalMilliseconds;
- Console.WriteLine("skip time "+tm);
- if (300 < tm)
- {
- light.refreshTime = DateTime.Now;
- new System.Threading.Thread(() =>
- {
- System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- d.Add("brightness", light.brightness.ToString());
- Control.Ins.SendWriteCommand(light, d);
- })
- { IsBackground = true }.Start();
- }
- }
+ //if (e == 0 || e == 100)
+ //{
+ // //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.Ins.SendWriteCommand(light, d);
+ //}
+ //else
+ //{
+ // var tm = (DateTime.Now - light.refreshTime).TotalMilliseconds;
+ // Console.WriteLine("skip time "+tm);
+ // if (300 < tm)
+ // {
+ // light.refreshTime = DateTime.Now;
+ // new System.Threading.Thread(() =>
+ // {
+ // System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+ // d.Add("brightness", light.brightness.ToString());
+ // Control.Ins.SendWriteCommand(light, d);
+ // })
+ // { IsBackground = true }.Start();
+ // }
+ //}
};
}
@@ -190,35 +180,28 @@
/// <param name="btnStop"></param>
/// <param name="btnOpen"></param>
/// <param name="btnClose"></param>
- void LoadEvent_ControlCurtain(Button btnStop, Button btnOpen, Button btnClose, Curtain curtain)
+ void LoadEvent_ControlCurtain(Button btnStop, Button btnOpen, Button btnClose, Function curtain)
{
btnClose.MouseUpEventHandler = (sender, e) =>
{
btnClose.IsSelected = true;
btnStop.IsSelected = false;
btnOpen.IsSelected = false;
- curtain.trait_on_off.value = "off";
- curtain.percent = 0;
- System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- d.Add("on_off", curtain.trait_on_off.value.ToString());
+ curtain.trait_on_off.curValue = "off";
+ curtain.SetAttrState(FunctionAttributeKey.Percent, 0);
+ Dictionary<string, string> d = new Dictionary<string, string>();
+ d.Add(FunctionAttributeKey.OnOff, curtain.trait_on_off.curValue.ToString());
Control.Ins.SendWriteCommand(curtain, d);
};
- btnStop.MouseDownEventHandler = (sender, e) =>
+ btnStop.MouseUpEventHandler = (sender, e) =>
{
btnStop.IsSelected = true;
btnClose.IsSelected = false;
btnOpen.IsSelected = false;
- };
- btnStop.MouseUpEventHandler = (sender, e) =>
- {
- btnOpen.IsSelected = true;
- btnClose.IsSelected = false;
- btnStop.IsSelected = false;
- curtain.trait_on_off.value = "stop";
- //curtain.percent = 0;
- System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- d.Add("on_off", curtain.trait_on_off.value.ToString());
+ curtain.trait_on_off.curValue = "stop";
+ Dictionary<string, string> d = new Dictionary<string, string>();
+ d.Add(FunctionAttributeKey.OnOff, curtain.trait_on_off.curValue.ToString());
Control.Ins.SendWriteCommand(curtain, d);
};
@@ -227,15 +210,65 @@
btnOpen.IsSelected = true;
btnClose.IsSelected = false;
btnStop.IsSelected = false;
- curtain.trait_on_off.value = "on";
- curtain.percent = 100;
- System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- d.Add("on_off", curtain.trait_on_off.value.ToString());
+ curtain.trait_on_off.curValue = "on";
+ curtain.SetAttrState(FunctionAttributeKey.Percent, 100);
+ Dictionary<string, string> d = new Dictionary<string, string>();
+ d.Add(FunctionAttributeKey.OnOff, curtain.trait_on_off.curValue.ToString());
Control.Ins.SendWriteCommand(curtain, d);
};
}
#endregion
+
+ /// <summary>
+ /// 鍔犺浇鏅捐。鏋舵帶鍒朵簨浠�
+ /// </summary>
+ void LoadEvent_ControlClothesHanger(Function function, Button btnUp, Button btnDown)
+ {
+ btnUp.MouseDownEventHandler = (sender, e) =>
+ {
+ btnUp.IsSelected = true;
+ };
+ btnUp.MouseUpEventHandler = (sender, e) =>
+ {
+ new System.Threading.Thread(() =>
+ {
+ System.Threading.Thread.Sleep(2000);
+ Application.RunOnMainThread(() =>
+ {
+ btnUp.IsSelected = false;
+ });
+ })
+ { IsBackground = true }.Start();
+ function.SetAttrState(FunctionAttributeKey.Position, "up");
+ Dictionary<string, string> d = new Dictionary<string, string>();
+ d.Add(FunctionAttributeKey.Position, "up");
+ Control.Ins.SendWriteCommand(function, d);
+ };
+
+ btnDown.MouseDownEventHandler = (sender, e) =>
+ {
+ btnDown.IsSelected = true;
+ };
+ btnDown.MouseUpEventHandler = (sender, e) =>
+ {
+ new System.Threading.Thread(() =>
+ {
+ System.Threading.Thread.Sleep(2000);
+ Application.RunOnMainThread(() =>
+ {
+ btnDown.IsSelected = false;
+ });
+ })
+ { IsBackground = true }.Start();
+ function.SetAttrState(FunctionAttributeKey.Position, "down");
+ Dictionary<string, string> d = new Dictionary<string, string>();
+ d.Add(FunctionAttributeKey.Position, "down");
+ Control.Ins.SendWriteCommand(function, d);
+ };
+ }
+
+
#region 绌鸿皟浜嬩欢
#endregion
--
Gitblit v1.8.0