From 160785587667cc0d927f85e44c139ec9dde13a9e Mon Sep 17 00:00:00 2001 From: 黄学彪 <hxb@hdlchina.com.cn> Date: 星期一, 25 十一月 2019 14:30:13 +0800 Subject: [PATCH] 原来的 IOS 工程舍弃(注:没有合并其他组员的代码) --- ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserManagement.cs | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserManagement.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserManagement.cs index 7727d38..a34d257 100755 --- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserManagement.cs +++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserManagement.cs @@ -34,7 +34,7 @@ VerticalScrolViewLayout midVerticalScrolViewLayout; #endregion - void ReadAccountList() + void ReadAccountDoorLockInfoList() { System.Threading.Tasks.Task.Run(async () => { @@ -46,9 +46,10 @@ { doorLock.localAllAccountList.Clear(); doorLock.localAllAccountList = localAccountListTemp; + + //鍒濆鍖栨潈闄愪俊鎭� foreach (var sub in localAccountListTemp) { - //鍒濆鍖栨潈闄愪俊鎭� if (doorLock.IsFreezeAccount.ContainsKey(sub.SubAccountDistributedMark) == false) { doorLock.IsFreezeAccount.Add(sub.SubAccountDistributedMark, false); @@ -62,13 +63,16 @@ doorLock.IsFailedToGetDoorLockInfo.Add(sub.SubAccountDistributedMark, false); } } + + //鑾峰彇鏈湴闂ㄩ攣鍒楄〃 + var list = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetDoorLockAllAcountUserlist(doorLock); doorLock.ReSave(); } else { Application.RunOnMainThread(() => { - new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.CloudServerResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(this.btnTip); + new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.CloudServerResponseOvertime), Direction = AMPopTipDirection.Down, CloseTime = 1 }.Show(Common.CommonPage.Instance); }); } } @@ -141,7 +145,7 @@ { }; this.midFrameLayout.AddChidren(midVerticalScrolViewLayout); - ReadAccountList(); + ReadAccountDoorLockInfoList(); } async void MidFrameLayoutContent() @@ -152,8 +156,8 @@ var currentAccount = doorLock.localAllAccountList[i]; var RowView = new FrameLayout() { - Height = Application.GetRealHeight(161), - BackgroundColor = Shared.Common.ZigbeeColor.Current.XMTopFrameLayout, + Height = Application.GetRealHeight(127 + 23), + BackgroundColor = Shared.Common.ZigbeeColor.Current.XMWhite, }; midVerticalScrolViewLayout.AddChidren(RowView); -- Gitblit v1.8.0