From 4b378188ce972df432b23d9cb73babb6cc0679c6 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 17 一月 2020 14:56:15 +0800
Subject: [PATCH] 合并代码 ver.10086
---
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 a962515..8a3264a 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs
@@ -206,7 +206,7 @@
}
- }
+ }
/// <summary>
/// 褰撳墠鎴愬憳淇℃伅鐨勬柟娉�
/// </summary>
@@ -302,7 +302,7 @@
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++)
{
var userifon = user.UserIdMode[i];
@@ -331,7 +331,31 @@
Text = userifon.ModeName,
TextSize = 14,
};
- doorlockRow.AddChidren(doorlockBtn);
+ 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("AccountName", accountname);//鐢ㄦ潵鏄剧ず鍚嶇О
userdictionary.Add("Type", "1");
userdictionary.Add("UserId", userId);
if (edit)
--
Gitblit v1.8.0