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/MemberList.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs b/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs
index 6a9b586..a962515 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs
@@ -296,11 +296,11 @@
string SelectedDeviceStatuscondition = "";
lockcolorfra1.Y = Application.GetRealHeight(1920 - 140 - (160 * user.UserIdMode.Count) - 20 - 50);
lockcolorfra1.Height = Application.GetRealHeight(140 + (160 * user.UserIdMode.Count) + 20 + 50);
- if (user.UserIdMode.Count > 10)
+ if (user.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);
}
for (int i = 0; i < user.UserIdMode.Count; i++)
--
Gitblit v1.8.0