From bbaae33cad1dadaad27eeac712d30fff248bffa5 Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期二, 17 三月 2020 17:46:25 +0800
Subject: [PATCH] 2020-03-17-2
---
ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs | 51 +++++++++++++++++++++++++--------------------------
1 files changed, 25 insertions(+), 26 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs b/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs
old mode 100644
new mode 100755
index 0c4a737..a4a3a77
--- a/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs
@@ -332,30 +332,6 @@
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
{
@@ -388,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)
{
@@ -415,8 +415,7 @@
deviceConditionsInfo.Add("Range", "0");
deviceConditionsInfo.Add("AttriButeId", openMode);
deviceConditionsInfo.Add("AttriButeData2", userId);
- userdictionary.Add("Account", Config.Instance.Guid);
- userdictionary.Add("Option3", accountname);//鐢ㄦ潵鏄剧ず鍚嶇О
+ userdictionary.Add("Account", accountname);
userdictionary.Add("Type", "1");
userdictionary.Add("UserId", userId);
if (edit)
--
Gitblit v1.8.0