From 98c998ca98ee014266f65a517d672df0cd97f244 Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期三, 25 三月 2020 17:51:18 +0800
Subject: [PATCH] 2020-03-25-1
---
ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs | 37 +++++++++++++++++++++++++++++++------
1 files changed, 31 insertions(+), 6 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs b/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs
index 6a9b586..44f682c 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++)
@@ -364,6 +364,30 @@
doorlockSelected.MouseUpEventHandler += doorlockclick;
doorlockfra.MouseUpEventHandler += doorlockclick;
+ 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 = userifon.UserId + strname;
+ }
+
if (edit && editdeviceConditionsInfo != null)
{
@@ -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("AccountName", accountname);
userdictionary.Add("Type", "1");
userdictionary.Add("UserId", userId);
if (edit)
@@ -438,11 +463,11 @@
}
}
if (!addConditions)
- {
+ {//娌℃湁瀛樺湪鏁版嵁鏂板姞
Common.Logic.CurrentLogic.Conditions.Add(deviceConditionsInfo);
}
if (!addAccounts)
- {
+ {//娌℃湁瀛樺湪鏁版嵁鏂板姞
Common.Logic.CurrentLogic.Accounts.Add(userdictionary);
}
}
--
Gitblit v1.8.0