From 7167334c0e89dd84827d59e726123d14776e3a09 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 16 六月 2020 11:14:13 +0800
Subject: [PATCH] 2020-06-16-1
---
HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs | 140 ++++++++++++++++++++--------------------------
1 files changed, 62 insertions(+), 78 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs b/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs
index fb6cccb..99f2f6e 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs
@@ -9,7 +9,7 @@
/// <summary>
/// 鍔犺浇鍔熻兘鏀惰棌鎸夐挳浜嬩欢
/// </summary>
- void LoadCollectionEvent()
+ void LoadEvent_FunctionCollection()
{
btnCollectionIcon.MouseUpEventHandler += (sender, e) =>
{
@@ -23,16 +23,9 @@
void LoadEvent_ControlScene()
{
EventHandler<MouseEventArgs> upEvent = (sender, e) => {
- bodyDiv.BorderColor = CSS.CSS_Color.MainColor;
- bodyDiv.BorderWidth = (uint)Application.GetRealWidth(5);
Control.Send(function);
- new System.Threading.Thread(() => {
- System.Threading.Thread.Sleep(1000);
- Application.RunOnMainThread(() => {
- bodyDiv.BorderColor = CSS.CSS_Color.MainColor;
- bodyDiv.BorderWidth = (uint)Application.GetRealWidth(0);
- });
- }) { IsBackground = true }.Start();
+ string msg = function.name + Language.StringByID(StringId.AlreadyOpened);
+ new PublicAssmebly().TipMsgAutoClose(msg, false);
};
btnName.MouseUpEventHandler = upEvent;
btnFromFloor.MouseUpEventHandler = upEvent;
@@ -83,32 +76,69 @@
/// </summary>
void LoadEvent_LightDimming(DiyImageSeekBar dimmerControlBar)
{
- if (function.functionType == FunctionType.Dimmer || function.functionType == FunctionType.RGB)
+ //if (function.functionType == FunctionType.Dimmer || function.functionType == FunctionType.RGB)
+ //{
+ // if (dimmerControlBar == null)
+ // return;
+ // var light = function as Light;
+ // dimmerControlBar.OnProgressChangedEvent += (sender, e) =>
+ // {
+ // if ((DateTime.Now - light.refreshTime).TotalMilliseconds > 200)//璋冨厜鍛戒护鍙戦�侀棿闅斾簨浠�
+ // {
+ // new System.Threading.Thread(() =>
+ // {
+ // light.refreshTime = DateTime.Now;
+ // light.brightness = e;
+ // Control.Send(CommandType_A.write, function);
+ // })
+ // { IsBackground = true }.Start();
+ // }
+ // };
+ // dimmerControlBar.OnStopTrackingTouchEvent += (sender, e) =>
+ // {
+ // light.brightness = dimmerControlBar.Progress;
+ // Control.Send(CommandType_A.write, function);
+ // };
+ //}
+ if(function.functionType == FunctionType.Dimmer || function.functionType == FunctionType.RGB)
{
- if (dimmerControlBar == null)
- return;
-
var light = function as Light;
- dimmerControlBar.OnProgressChangedEvent += (sender, e) =>
- {
- dimmerControlBar.Tag = DateTime.Now;
- if ((DateTime.Now - (DateTime)(dimmerControlBar.Tag)).TotalMilliseconds < 200)//璋冨厜鍛戒护鍙戦�侀棿闅斾簨浠�
+ dimmerControlBar.OnStartTrackingTouchEvent = (sender, e) => {
+ onDimmerBar = true;
+ };
+ dimmerControlBar.OnStopTrackingTouchEvent = (sender, e) => {
+ onDimmerBar = false;
+ light.brightness = dimmerControlBar.Progress;
+ Control.Send(CommandType_A.write, light);
+ };
+ dimmerControlBar.OnProgressChangedEvent = (sender, e) => {
+ light.brightness = e;
+ light.on_off = e > 0 ? "on" : "off";
+
+ if (e == 0 || e == 100)
{
- new System.Threading.Thread(() =>
+ Control.Send(CommandType_A.write, light);
+ }
+ else
+ {
+ if (200 < (DateTime.Now - light.refreshTime).TotalMilliseconds)
{
- light.brightness = e;
- Control.Send(CommandType_A.write, function);
- dimmerControlBar.Tag = DateTime.Now;
- })
- { IsBackground = true }.Start();
+ light.refreshTime = DateTime.Now;
+ new System.Threading.Thread(() =>
+ {
+ Control.Send(CommandType_A.write, light);
+ })
+ { IsBackground = true }.Start();
+ }
+ else
+ {
+ MainPage.Log("skip dimmer control!!");
+ }
}
};
- dimmerControlBar.MouseUpEventHandler += (sender, e) =>
- {
- light.brightness = dimmerControlBar.Progress;
- Control.Send(CommandType_A.write, function);
- };
+
}
+
}
#endregion
@@ -165,56 +195,10 @@
/// </summary>
void LoadEvent_DivSkipEvent()
{
- EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
- {
- //璺宠浆鍒板姛鑳戒俊鎭缃〉闈�
- switch (function.functionType)
- {
- case FunctionType.Relay:
- var relayView = new RelayPage(function as Light);
- MainPage.BasePageView.AddChidren(relayView);
- relayView.LoadPage(btnCollectionIcon, btnName, btnFromFloor);
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- break;
- case FunctionType.RGB:
- var rgbView = new RGBPage(function as Light);
- MainPage.BasePageView.AddChidren(rgbView);
- rgbView.LoadPage(btnCollectionIcon, btnName, btnFromFloor);
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- break;
- case FunctionType.Dimmer:
- var dimmerView = new DimmerPage(function as Light);
- MainPage.BasePageView.AddChidren(dimmerView);
- dimmerView.LoadPage(btnCollectionIcon, btnName, btnFromFloor);
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- break;
- case FunctionType.MotorCurtain:
- var skinView = new MotorCurtainPage(function as Curtain);
- MainPage.BasePageView.AddChidren(skinView);
- skinView.LoadPage(btnCollectionIcon, btnName, btnFromFloor);
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- break;
- case FunctionType.Curtain:
- var curtainView = new CurtainModulePage(function as Curtain);
- MainPage.BasePageView.AddChidren(curtainView);
- curtainView.LoadPage(btnCollectionIcon, btnName, btnFromFloor);
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- break;
- case FunctionType.RollingShutter:
- var rollingShutterView = new RollingShutterPage(function as Curtain);
- MainPage.BasePageView.AddChidren(rollingShutterView);
- rollingShutterView.LoadPage(btnCollectionIcon, btnName, btnFromFloor);
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- break;
- case FunctionType.AC:
- var acView = new ACPage(function as AC);
- MainPage.BasePageView.AddChidren(acView);
- acView.LoadPage(btnCollectionIcon, btnName, btnFromFloor);
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- break;
- }
- };
+ var eventHandler = new PublicAssmebly().LoadEvent_SkipFunctionControlPage(function, btnCollectionIcon, btnName, btnFromFloor);
this.MouseUpEventHandler = eventHandler;
}
+
+
}
}
--
Gitblit v1.8.0