From 72be4f06a683de33ddd563c8447c39f7f17e5b7d Mon Sep 17 00:00:00 2001 From: 黄学彪 <hxb@hdlchina.com.cn> Date: 星期一, 06 一月 2020 13:03:50 +0800 Subject: [PATCH] 合并代码 --- ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs index e83c213..931f2e0 100755 --- a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs +++ b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs @@ -284,11 +284,11 @@ lockcolorfra1.Y = Application.GetRealHeight(1920 - 140 - (160 * membershipIfon.UserIdMode.Count) - 20 - 50); lockcolorfra1.Height = Application.GetRealHeight(140 + (160 * membershipIfon.UserIdMode.Count) + 20 + 50); - if (membershipIfon.UserIdMode.Count > 10) + if (membershipIfon.UserIdMode.Count > 9) { ///鍏冪礌瓒呭嚭10涓紝鏆傛椂榛樿鏄剧ず10; - lockcolorfra1.Y = Application.GetRealHeight(1920 - 140 - (160 * 10) - 20 - 50); - lockcolorfra1.Height = Application.GetRealHeight(140 + (160 * 10) + 20 + 50); + lockcolorfra1.Y = Application.GetRealHeight(1920 - 140 - (160 * 9) - 20 - 50); + lockcolorfra1.Height = Application.GetRealHeight(140 + (160 * 9) + 20 + 50); } string SelectedLockStatus = ""; ///瀹氫箟涓や釜鍙橀噺璁板綍閫変腑鐘舵�侊紱 -- Gitblit v1.8.0