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 | 95 +++++++++++++++++++++--------------------------
1 files changed, 43 insertions(+), 52 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserManagement.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserManagement.cs
index 194f8d7..0f4b5ed 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserManagement.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserManagement.cs
@@ -9,29 +9,25 @@
/// <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>
public UserManagement(ZigBee.Device.DoorLock doorLock)
{
this.doorLock = doorLock;
+ localAllAccountListTemp = doorLock.localAllAccountList;
+ localDoorLockUserListTemp = doorLock.localDoorLockUserList;
}
#region 鈼� 鍙橀噺鐢虫槑__________________________
ZigBee.Device.DoorLock doorLock;
VerticalRefreshLayout midVerticalScrolViewLayout;
+ public List<MemberInfoRes> localAllAccountListTemp = new List<MemberInfoRes> { };
+ public Dictionary<int, DoorLockCommonInfo.LocaDoorLockObj> localDoorLockUserListTemp = new Dictionary<int, DoorLockCommonInfo.LocaDoorLockObj>();
+
+
#endregion
/// <summary>
@@ -48,26 +44,32 @@
{
doorLock.localAllAccountList.Clear();
doorLock.localAllAccountList = localAccountListTemp;
+ localAllAccountListTemp = doorLock.localAllAccountList;
//鍒濆鍖栨潈闄愪俊鎭�
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);
+ //}
}
//鑾峰彇鏈湴闂ㄩ攣鍒楄〃
- var list = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetDoorLockAllAcountUserlist(doorLock);
+ if (localDoorLockUserListTemp.Count == 0)
+ {
+ var list = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetDoorLockAllAcountUserlist(doorLock);
+ localDoorLockUserListTemp = doorLock.localDoorLockUserList;
+ }
doorLock.ReSave();
}
else
@@ -125,15 +127,18 @@
var btnUndistributeText = new Button
{
Height = Application.GetRealHeight(72),
- Width = Application.GetRealWidth(121),
+ Width = Application.GetRealWidth(150),
TextID = R.MyInternationalizationString.Undistributed,
TextColor = Shared.Common.ZigbeeColor.Current.XMTopTitleText,
X = btnUndistributeIcon.Right,
+ IsBold = true,
+ TextSize = 13,
TextAlignment = TextAlignment.CenterLeft,
};
btnAddFrameLayout.AddChidren(btnUndistributeText);
- if (UserCenterResourse.UserInfo.AuthorityNo != 1)
+ if (HdlUserCenterResourse.ResidenceOption.AuthorityNo != 1)
{
+ btnAddFrameLayout.Width = 0;
btnUndistributeIcon.Width = 0;
btnUndistributeText.Width = 0;
}
@@ -147,13 +152,18 @@
btnAddFrameLayout.MouseDownEventHandler += eHandler;
btnUndistributeText.MouseDownEventHandler += eHandler;
btnUndistributeIcon.MouseDownEventHandler += eHandler;
- midVerticalScrolViewLayout = new VerticalRefreshLayout()
- {
- };
+ midVerticalScrolViewLayout = new VerticalRefreshLayout() { };
this.midFrameLayout.AddChidren(midVerticalScrolViewLayout);
- CommonPage.Loading.Start("Loading...");
- ReadAccountDoorLockInfoList();
+ if (localAllAccountListTemp.Count == 0)
+ {
+ CommonPage.Loading.Start("Loading...");
+ ReadAccountDoorLockInfoList();
+ }
+ else
+ {
+ MidFrameLayoutContent();
+ }
midVerticalScrolViewLayout.BeginHeaderRefreshingAction += () =>
{
@@ -183,7 +193,7 @@
X = Application.GetRealWidth(58),
Width = Application.GetRealWidth(300),
TextAlignment = TextAlignment.CenterLeft,
- TextColor = Shared.Common.ZigbeeColor.Current.XMTopTitleText,
+ TextColor = Shared.Common.ZigbeeColor.Current.XMBlack,
Gravity = Gravity.CenterVertical,
TextSize = 14,
};
@@ -222,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) =>
{
@@ -252,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