From 171bf03f3664226eeff2b20ee9bd2e914b63a17d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 13 三月 2020 09:18:50 +0800
Subject: [PATCH] 20200313
---
HDL_ON/UI/UI2/2-Classification/Room/FunctionDivBLL.cs | 85 +++++++++++++++++++++++++-----------------
1 files changed, 50 insertions(+), 35 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/Room/FunctionDivBLL.cs b/HDL_ON/UI/UI2/2-Classification/Room/FunctionDivBLL.cs
index 1e3751e..5e845c5 100644
--- a/HDL_ON/UI/UI2/2-Classification/Room/FunctionDivBLL.cs
+++ b/HDL_ON/UI/UI2/2-Classification/Room/FunctionDivBLL.cs
@@ -1,44 +1,30 @@
锘縰sing System;
using HDL_ON.Entity;
+using Shared;
namespace HDL_ON.UI
{
- public partial class FunctionDiv
+ public partial class RoomControlZone
{
/// <summary>
- /// 鍔犺浇浜嬩欢鍒楄〃
- /// </summary>
- void LoadEventList()
- {
- LoadCollectionEvent();
- }
-
- /// <summary>
- /// 鍔犺浇鏀惰棌鎸夐挳浜嬩欢
+ /// 鍔犺浇鍔熻兘鏀惰棌鎸夐挳浜嬩欢
/// </summary>
void LoadCollectionEvent()
{
- btnCollectionIcon.MouseUpEventHandler += (sender, e) => {
+ btnCollectionIcon.MouseUpEventHandler += (sender, e) =>
+ {
btnCollectionIcon.IsSelected = function.collection = !btnCollectionIcon.IsSelected;
DB_ResidenceData.residenceData.SaveResidenceData();
};
}
#region 鐏厜鐨勪簨浠跺垪琛�
/// <summary>
- /// 鍔犺浇鐏厜鎺т欢鐨勪簨浠�
- /// </summary>
- void LoadLightEventList()
- {
- LightSwitchEvent();
- LightDivSkipEvent();
- LightDimmingEvent();
- }
- /// <summary>
/// 鐏厜寮�鍏充簨浠�
/// </summary>
- void LightSwitchEvent()
+ void LoadEvent_LightSwitch(Button btnSwitch)
{
- btnSwitch.MouseUpEventHandler += (sender, e) => {
+ btnSwitch.MouseUpEventHandler += (sender, e) =>
+ {
btnSwitch.IsSelected = !btnSwitch.IsSelected;
new System.Threading.Thread(() =>
{
@@ -53,7 +39,7 @@
/// <summary>
/// 鐏厜浜害璋冭妭浜嬩欢
/// </summary>
- void LightDimmingEvent()
+ void LoadEvent_LightDimming(DiyImageSeekBar dimmerControlBar)
{
if (function.functionType == "Dimmer" || function.functionType == "RGB")
{
@@ -64,10 +50,15 @@
dimmerControlBar.OnProgressChangedEvent += (sender, e) =>
{
dimmerControlBar.Tag = DateTime.Now;
- if ((DateTime.Now - (DateTime)(dimmerControlBar.Tag)).TotalMilliseconds < 100)//璋冨厜鍛戒护鍙戦�侀棿闅斾簨浠�
+ if ((DateTime.Now - (DateTime)(dimmerControlBar.Tag)).TotalMilliseconds < 200)//璋冨厜鍛戒护鍙戦�侀棿闅斾簨浠�
{
- light.dicPropert["brightness"] = (byte)e;
- Control.Send("write", function, 3);
+ new System.Threading.Thread(() =>
+ {
+ light.dicPropert["brightness"] = (byte)e;
+ Control.Send("write", function, 3);
+ dimmerControlBar.Tag = DateTime.Now;
+ })
+ { IsBackground = true }.Start();
}
};
dimmerControlBar.MouseUpEventHandler += (sender, e) =>
@@ -77,33 +68,57 @@
};
}
}
+ #endregion
+
+
+ #region 绐楀笜鐨勪簨浠跺垪琛�
+
+
+ #endregion
/// <summary>
- /// 鐏厜鎺у埗鐣岄潰璺宠浆
+ /// 鎺у埗鐣岄潰璺宠浆
/// </summary>
- void LightDivSkipEvent()
+ void LoadEvent_DivSkipEvent()
{
- this.MouseUpEventHandler += (sender, e) =>
+ EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
{
//璺宠浆鍒板姛鑳戒俊鎭缃〉闈�
switch (function.functionType)
{
case "Relay":
- var relayView = new RelayFragment(function);
+ var relayView = new RelayPage(function as Light);
MainPage.BasePageView.AddChidren(relayView);
- relayView.LoadPage();
+ relayView.LoadPage(btnCollectionIcon, btnName, btnFromFloor);
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
break;
case "RGB":
- var rgbView = new RGBFragment(function);
+ var rgbView = new RGBPage(function as Light);
MainPage.BasePageView.AddChidren(rgbView);
- rgbView.LoadPage();
+ rgbView.LoadPage(btnCollectionIcon, btnName, btnFromFloor);
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ break;
+ case "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 "MotorCurtain":
+ var skinView = new MotorCurtainPage(function);
+ MainPage.BasePageView.AddChidren(skinView);
+ skinView.LoadPage(btnCollectionIcon, btnName, btnFromFloor);
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ break;
+ case "Curtain":
+ var curtainView = new CurtainModulePage (function);
+ MainPage.BasePageView.AddChidren(curtainView);
+ curtainView.LoadPage(btnCollectionIcon, btnName, btnFromFloor);
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
break;
}
};
+ this.MouseUpEventHandler = eventHandler;
}
-
- #endregion
}
}
--
Gitblit v1.8.0