From 3a26f6025130dcaae4aa82ea19b16ad902450eb8 Mon Sep 17 00:00:00 2001 From: 黄学彪 <hxb@hdlchina.com.cn> Date: 星期四, 28 十一月 2019 11:43:47 +0800 Subject: [PATCH] 合并全部代码完成 --- ZigbeeApp/Shared/Phone/Device/Light/AirSwitchControl.cs | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/Device/Light/AirSwitchControl.cs b/ZigbeeApp/Shared/Phone/Device/Light/AirSwitchControl.cs index a9a1676..b1115fc 100755 --- a/ZigbeeApp/Shared/Phone/Device/Light/AirSwitchControl.cs +++ b/ZigbeeApp/Shared/Phone/Device/Light/AirSwitchControl.cs @@ -62,6 +62,11 @@ private Button StatuBtn; + /// <summary> + /// IsDrawerLockMode + /// </summary> + public bool IsDrawerLockMode; + #endregion #region 鈼� 鎺ュ彛__________________________ @@ -160,6 +165,10 @@ //action(); //action = null; RemoveUpdateControlDeviceStatuAction(); + if (IsDrawerLockMode) + { + CommonPage.Instance.IsDrawerLockMode = false; + } base.RemoveFromParent(); } @@ -462,7 +471,6 @@ /// <param name="e">E.</param> private void Collection(object sender, MouseEventArgs e) { - //collection if ((sender as Button).IsSelected) { Shared.Common.Room.CurrentRoom.GetLoveRoom().DeleteDevice(device.FileName); -- Gitblit v1.8.0