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 | 54 +++++++++++++++++++++++++++---------------------------
1 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs b/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs
index 0c4a737..44f682c 100644
--- 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)
{
@@ -416,7 +416,7 @@
deviceConditionsInfo.Add("AttriButeId", openMode);
deviceConditionsInfo.Add("AttriButeData2", userId);
userdictionary.Add("Account", Config.Instance.Guid);
- userdictionary.Add("Option3", accountname);//鐢ㄦ潵鏄剧ず鍚嶇О
+ userdictionary.Add("AccountName", accountname);
userdictionary.Add("Type", "1");
userdictionary.Add("UserId", userId);
if (edit)
@@ -463,11 +463,11 @@
}
}
if (!addConditions)
- {
+ {//娌℃湁瀛樺湪鏁版嵁鏂板姞
Common.Logic.CurrentLogic.Conditions.Add(deviceConditionsInfo);
}
if (!addAccounts)
- {
+ {//娌℃湁瀛樺湪鏁版嵁鏂板姞
Common.Logic.CurrentLogic.Accounts.Add(userdictionary);
}
}
--
Gitblit v1.8.0