From e90209beae6a4e822cecb18e6889f8bda23f630e Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 14 十二月 2020 11:16:06 +0800
Subject: [PATCH] 合并了晾衣架(非新云端)
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserManagement.cs | 41 ++++++++++++++++++++++++-----------------
1 files changed, 24 insertions(+), 17 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserManagement.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserManagement.cs
index 0f4b5ed..621c157 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserManagement.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserManagement.cs
@@ -24,7 +24,7 @@
#region 鈼� 鍙橀噺鐢虫槑__________________________
ZigBee.Device.DoorLock doorLock;
VerticalRefreshLayout midVerticalScrolViewLayout;
- public List<MemberInfoRes> localAllAccountListTemp = new List<MemberInfoRes> { };
+ public List<Shared.Phone.UserCenter.MemberInfoRes> localAllAccountListTemp = new List<Shared.Phone.UserCenter.MemberInfoRes> { };
public Dictionary<int, DoorLockCommonInfo.LocaDoorLockObj> localDoorLockUserListTemp = new Dictionary<int, DoorLockCommonInfo.LocaDoorLockObj>();
@@ -49,19 +49,18 @@
//鍒濆鍖栨潈闄愪俊鎭�
foreach (var sub in localAccountListTemp)
{
- //鈽嗐優銉笺偗鈽�
- //if (doorLock.IsFreezeAccount.ContainsKey(sub.SubAccountDistributedMark) == false)
- //{
- // doorLock.IsFreezeAccount.Add(sub.SubAccountDistributedMark, false);
- //}
- //if (doorLock.HasRemoteUnlockAccess.ContainsKey(sub.SubAccountDistributedMark) == false)
- //{
- // doorLock.HasRemoteUnlockAccess.Add(sub.SubAccountDistributedMark, false);
- //}
- //if (doorLock.IsFailedToGetDoorLockInfo.ContainsKey(sub.SubAccountDistributedMark) == false)
- //{
- // doorLock.IsFailedToGetDoorLockInfo.Add(sub.SubAccountDistributedMark, false);
- //}
+ if (doorLock.IsFreezeAccount.ContainsKey(sub.SubAccountDistributedMark) == false)
+ {
+ doorLock.IsFreezeAccount.Add(sub.SubAccountDistributedMark, false);
+ }
+ if (doorLock.HasRemoteUnlockAccess.ContainsKey(sub.SubAccountDistributedMark) == false)
+ {
+ doorLock.HasRemoteUnlockAccess.Add(sub.SubAccountDistributedMark, false);
+ }
+ if (doorLock.IsFailedToGetDoorLockInfo.ContainsKey(sub.SubAccountDistributedMark) == false)
+ {
+ doorLock.IsFailedToGetDoorLockInfo.Add(sub.SubAccountDistributedMark, false);
+ }
}
//鑾峰彇鏈湴闂ㄩ攣鍒楄〃
@@ -124,10 +123,11 @@
};
btnAddFrameLayout.AddChidren(btnUndistributeIcon);
+ btnAddFrameLayout.Width = Application.GetRealWidth(190 + 50);
var btnUndistributeText = new Button
{
Height = Application.GetRealHeight(72),
- Width = Application.GetRealWidth(150),
+ Width = Application.GetRealWidth(200),
TextID = R.MyInternationalizationString.Undistributed,
TextColor = Shared.Common.ZigbeeColor.Current.XMTopTitleText,
X = btnUndistributeIcon.Right,
@@ -136,7 +136,7 @@
TextAlignment = TextAlignment.CenterLeft,
};
btnAddFrameLayout.AddChidren(btnUndistributeText);
- if (HdlUserCenterResourse.ResidenceOption.AuthorityNo != 1)
+ if (UserCenterResourse.UserInfo.AuthorityNo != 1)
{
btnAddFrameLayout.Width = 0;
btnUndistributeIcon.Width = 0;
@@ -232,7 +232,14 @@
line2.Visible = false;
}
- btnText.Text = currentAccount.ShowName;
+ if (!string.IsNullOrEmpty(currentAccount.UserName))
+ {
+ btnText.Text = currentAccount.UserName;
+ }
+ else
+ {
+ btnText.Text = currentAccount.Account;
+ }
EventHandler<MouseEventArgs> eHandler = (sender, e) =>
{
--
Gitblit v1.8.0