From 315e336680efe5c654726c2cdae630146fe5c99c Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期五, 29 十一月 2019 10:06:19 +0800
Subject: [PATCH] 合并代码
---
ZigbeeApp/Shared/Phone/Device/Curtain/RollerShadeControl.cs | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Curtain/RollerShadeControl.cs b/ZigbeeApp/Shared/Phone/Device/Curtain/RollerShadeControl.cs
index 442628a..efbd1ec 100755
--- a/ZigbeeApp/Shared/Phone/Device/Curtain/RollerShadeControl.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Curtain/RollerShadeControl.cs
@@ -74,6 +74,11 @@
/// </summary>
private CurtainRollSeekBar curtainRollSeekBar = new CurtainRollSeekBar { };
+ /// <summary>
+ /// IsDrawerLockMode
+ /// </summary>
+ public bool IsDrawerLockMode;
+
#endregion
#region 鈼� 鎺ュ彛___________________________
@@ -232,6 +237,10 @@
//action();
//action = null;
RemoveUpdateControlDeviceStatuAction();
+ if (IsDrawerLockMode)
+ {
+ CommonPage.Instance.IsDrawerLockMode = false;
+ }
base.RemoveFromParent();
}
--
Gitblit v1.8.0