From 72be4f06a683de33ddd563c8447c39f7f17e5b7d Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 06 一月 2020 13:03:50 +0800
Subject: [PATCH] 合并代码
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserManagement.cs | 32 +++++++++++++++++++++++++-------
1 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserManagement.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserManagement.cs
index 381fa8d..f224f74 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserManagement.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserManagement.cs
@@ -27,11 +27,17 @@
public UserManagement(ZigBee.Device.DoorLock doorLock)
{
this.doorLock = doorLock;
+ localAllAccountListTemp = doorLock.localAllAccountList;
+ localDoorLockUserListTemp = doorLock.localDoorLockUserList;
}
#region 鈼� 鍙橀噺鐢虫槑__________________________
ZigBee.Device.DoorLock doorLock;
VerticalRefreshLayout midVerticalScrolViewLayout;
+ public List<Shared.Phone.UserCenter.MemberInfoRes> localAllAccountListTemp = new List<Shared.Phone.UserCenter.MemberInfoRes> { };
+ public Dictionary<int, DoorLockCommonInfo.LocaDoorLockObj> localDoorLockUserListTemp = new Dictionary<int, DoorLockCommonInfo.LocaDoorLockObj>();
+
+
#endregion
/// <summary>
@@ -48,6 +54,7 @@
{
doorLock.localAllAccountList.Clear();
doorLock.localAllAccountList = localAccountListTemp;
+ localAllAccountListTemp = doorLock.localAllAccountList;
//鍒濆鍖栨潈闄愪俊鎭�
foreach (var sub in localAccountListTemp)
@@ -67,7 +74,11 @@
}
//鑾峰彇鏈湴闂ㄩ攣鍒楄〃
- 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
@@ -129,10 +140,10 @@
TextID = R.MyInternationalizationString.Undistributed,
TextColor = Shared.Common.ZigbeeColor.Current.XMTopTitleText,
X = btnUndistributeIcon.Right,
- IsBold =true,
- TextSize =13,
- TextAlignment = TextAlignment.CenterLeft,
- };
+ IsBold = true,
+ TextSize = 13,
+ TextAlignment = TextAlignment.CenterLeft,
+ };
btnAddFrameLayout.AddChidren(btnUndistributeText);
if (UserCenterResourse.UserInfo.AuthorityNo != 1)
{
@@ -154,8 +165,15 @@
};
this.midFrameLayout.AddChidren(midVerticalScrolViewLayout);
- CommonPage.Loading.Start("Loading...");
- ReadAccountDoorLockInfoList();
+ if (localAllAccountListTemp.Count == 0)
+ {
+ CommonPage.Loading.Start("Loading...");
+ ReadAccountDoorLockInfoList();
+ }
+ else
+ {
+ MidFrameLayoutContent();
+ }
midVerticalScrolViewLayout.BeginHeaderRefreshingAction += () =>
{
--
Gitblit v1.8.0