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/DoorLockLogic/AddCondition.cs | 30 +++++++++++++++++++++++++++---
1 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs
index 931f2e0..6f952da 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs
@@ -324,7 +324,30 @@
Text = userIdmode.ModeName,
TextSize = 14,
};
- doorlockRow.AddChidren(doorlockBtn);
+ doorlockRow.AddChidren(doorlockBtn);
+ if (string.IsNullOrEmpty(doorlockBtn.Text))
+ {
+ string strname = "";
+ switch (userIdmode.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" + userIdmode.UserId;
+ }
var doorlockSelected = new Button
{
@@ -350,7 +373,7 @@
//doorlockBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
attriButeId = userIdmode.OpenMode.ToString();
attriButeData2 = userIdmode.UserId;
- modeName = userIdmode.ModeName;
+ modeName = doorlockBtn.Text;
};
doorlockRow.MouseUpEventHandler += doorlockclick;
doorlockBtn.MouseUpEventHandler += doorlockclick;
@@ -386,7 +409,8 @@
lockConditionsInfo.Add("Range", "0");
var accounts = new Dictionary<string, string>();
accounts.Add("Type", "1");
- accounts.Add("Account", membershipIfon.UserName + modeName);
+ accounts.Add("Account", Config.Instance.Guid);
+ accounts.Add("AccountName", membershipIfon.UserName + modeName);//鐢ㄦ潵鏄剧ず鍚嶇О
accounts.Add("UserId", attriButeData2);
if (SelectedLockStatus != "")
{
--
Gitblit v1.8.0