From 9f326f4000847e6167d8166fa2f6a66f53cb3734 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 17 十二月 2020 09:07:13 +0800
Subject: [PATCH] 新云端Ver1.3
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserManagement.cs | 62 ++++++++----------------------
1 files changed, 17 insertions(+), 45 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserManagement.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserManagement.cs
index f7b5d99..0f4b5ed 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserManagement.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserManagement.cs
@@ -9,18 +9,8 @@
/// <summary>
/// 闂ㄩ攣绠＄悊
/// </summary>
- public class UserManagement : DoorLockCommonLayout, ZigBee.Common.IStatus
+ public class UserManagement : DoorLockCommonLayout
{
- /// <summary>
- /// 鎸夐敭妯″紡鎺ユ敹
- /// </summary>
- /// <param name="common">Common.</param>
- public void Changed(CommonDevice common)
- {
- Shared.Application.RunOnMainThread(() =>
- {
- });
- }
/// 鏋勯�犲嚱鏁�
/// </summary>
/// <param name="doorLock"></param>
@@ -34,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>();
@@ -59,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);
+ //}
}
//鑾峰彇鏈湴闂ㄩ攣鍒楄〃
@@ -145,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;
@@ -241,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) =>
{
@@ -271,18 +255,6 @@
RowView.MouseUpEventHandler += eHandler;
btnText.MouseUpEventHandler += eHandler;
}
- }
-
- public void DeviceInfoChange(CommonDevice common, string typeTag)
- {
- }
-
- public void ChangedILogicStatus(ZigBee.Device.Logic logic)
- {
- }
-
- public void ChangedISceneStatus(Scene scene)
- {
}
}
}
--
Gitblit v1.8.0