From 0d9f64668fd7350d6a21fd157e32009a96d98134 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期三, 16 十二月 2020 13:09:08 +0800
Subject: [PATCH] 新云端代码Ver1.2
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserManagement.cs | 41 +++++++++++++++++------------------------
1 files changed, 17 insertions(+), 24 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserManagement.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserManagement.cs
index 621c157..0f4b5ed 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<Shared.Phone.UserCenter.MemberInfoRes> localAllAccountListTemp = new List<Shared.Phone.UserCenter.MemberInfoRes> { };
+ public List<MemberInfoRes> localAllAccountListTemp = new List<MemberInfoRes> { };
public Dictionary<int, DoorLockCommonInfo.LocaDoorLockObj> localDoorLockUserListTemp = new Dictionary<int, DoorLockCommonInfo.LocaDoorLockObj>();
@@ -49,18 +49,19 @@
//鍒濆鍖栨潈闄愪俊鎭�
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);
+ //}
}
//鑾峰彇鏈湴闂ㄩ攣鍒楄〃
@@ -123,11 +124,10 @@
};
btnAddFrameLayout.AddChidren(btnUndistributeIcon);
- btnAddFrameLayout.Width = Application.GetRealWidth(190 + 50);
var btnUndistributeText = new Button
{
Height = Application.GetRealHeight(72),
- Width = Application.GetRealWidth(200),
+ Width = Application.GetRealWidth(150),
TextID = R.MyInternationalizationString.Undistributed,
TextColor = Shared.Common.ZigbeeColor.Current.XMTopTitleText,
X = btnUndistributeIcon.Right,
@@ -136,7 +136,7 @@
TextAlignment = TextAlignment.CenterLeft,
};
btnAddFrameLayout.AddChidren(btnUndistributeText);
- if (UserCenterResourse.UserInfo.AuthorityNo != 1)
+ if (HdlUserCenterResourse.ResidenceOption.AuthorityNo != 1)
{
btnAddFrameLayout.Width = 0;
btnUndistributeIcon.Width = 0;
@@ -232,14 +232,7 @@
line2.Visible = false;
}
- if (!string.IsNullOrEmpty(currentAccount.UserName))
- {
- btnText.Text = currentAccount.UserName;
- }
- else
- {
- btnText.Text = currentAccount.Account;
- }
+ btnText.Text = currentAccount.ShowName;
EventHandler<MouseEventArgs> eHandler = (sender, e) =>
{
--
Gitblit v1.8.0