From 06696e6f225733a60b03eea4a7c6374053d92c1d Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期二, 14 四月 2020 14:15:35 +0800 Subject: [PATCH] 20200414 --- HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs | 72 ++++------------------------------- 1 files changed, 9 insertions(+), 63 deletions(-) diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs b/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs index fb6cccb..156712d 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; @@ -91,19 +84,18 @@ var light = function as Light; dimmerControlBar.OnProgressChangedEvent += (sender, e) => { - dimmerControlBar.Tag = DateTime.Now; - if ((DateTime.Now - (DateTime)(dimmerControlBar.Tag)).TotalMilliseconds < 200)//璋冨厜鍛戒护鍙戦�侀棿闅斾簨浠� + if ((DateTime.Now - light.refreshTime).TotalMilliseconds > 200)//璋冨厜鍛戒护鍙戦�侀棿闅斾簨浠� { new System.Threading.Thread(() => { + light.refreshTime = DateTime.Now; light.brightness = e; Control.Send(CommandType_A.write, function); - dimmerControlBar.Tag = DateTime.Now; }) { IsBackground = true }.Start(); } }; - dimmerControlBar.MouseUpEventHandler += (sender, e) => + dimmerControlBar.OnStopTrackingTouchEvent += (sender, e) => { light.brightness = dimmerControlBar.Progress; Control.Send(CommandType_A.write, function); @@ -165,56 +157,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