From e5f993f52e09eb46878baced83bb8492f147d41c Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期一, 04 十一月 2019 17:58:40 +0800
Subject: [PATCH] 2019-11-04-1

---
 ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs
index 722c666..e88eec2 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs
@@ -144,7 +144,7 @@
 
             middle = new VerticalScrolViewLayout();
             middle.Y = devicetypehorizontalScrol.Bottom + Application.GetRealHeight(40);
-            middle.Height = Application.GetRealHeight(1920) - devicetypehorizontalScrol.Y;
+            middle.Height =Application.GetRealHeight(1920-40) - devicetypehorizontalScrol.Bottom;
             middle.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
             middle.X = Application.GetRealWidth(58);
             middle.Radius = (uint)Application.GetRealHeight(50);
@@ -1407,12 +1407,13 @@
                     break;
                 case DeviceType.DoorLock:
                     {
-                       
+
 
                         var memberList = new MemberList();
                         UserView.HomePage.Instance.AddChidren(memberList);
                         UserView.HomePage.Instance.PageIndex += 1;
                         MemberList.action += () => { flMain.RemoveFromParent(); };
+                        MemberList.edit = false;
                         memberList.Show(common);
                     }
                     break;

--
Gitblit v1.8.0