From b74c052b43d7c4a830386940a036eb7c2ec9abc2 Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期二, 14 一月 2020 13:37:26 +0800
Subject: [PATCH] 2020-1-14-01
---
ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs | 33 +++++++++++++++++++++++++++++----
1 files changed, 29 insertions(+), 4 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs b/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs
index 6a9b586..0c4a737 100644
--- 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++)
@@ -332,6 +332,30 @@
TextSize = 14,
};
doorlockRow.AddChidren(doorlockBtn);
+ if (string.IsNullOrEmpty(doorlockBtn.Text))
+ {
+ string strname = "";
+ switch (userifon.OpenMode)
+ {
+ case 0:
+ {
+ strname = Language.StringByID(MyInternationalizationString.lockpassword);
+ }
+ break;
+ case 3:
+ {
+ strname = Language.StringByID(MyInternationalizationString.ic);
+ }
+ break;
+ case 15:
+ {
+ strname = Language.StringByID(MyInternationalizationString.fingerprint);
+ }
+ break;
+ }
+ doorlockBtn.Text = strname + "ID" + userifon.UserId;
+ }
+
var doorlockSelected = new Button
{
@@ -391,7 +415,8 @@
deviceConditionsInfo.Add("Range", "0");
deviceConditionsInfo.Add("AttriButeId", openMode);
deviceConditionsInfo.Add("AttriButeData2", userId);
- userdictionary.Add("Account", accountname);
+ userdictionary.Add("Account", Config.Instance.Guid);
+ userdictionary.Add("Option3", accountname);//鐢ㄦ潵鏄剧ず鍚嶇О
userdictionary.Add("Type", "1");
userdictionary.Add("UserId", userId);
if (edit)
--
Gitblit v1.8.0