From 5986f63b75bd81c6cef262c670e9251c038cbf5d Mon Sep 17 00:00:00 2001 From: 黄学彪 <hxb@hdlchina.com.cn> Date: 星期二, 17 十二月 2019 17:21:07 +0800 Subject: [PATCH] 合并一个版本 --- ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MemberFrozenPage.cs | 75 +++++++++++++++++++++++-------------- 1 files changed, 47 insertions(+), 28 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MemberFrozenPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MemberFrozenPage.cs index c5f73f9..2a71d4b 100755 --- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MemberFrozenPage.cs +++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MemberFrozenPage.cs @@ -21,8 +21,29 @@ #region 鈼� 鍙橀噺鐢虫槑__________________________ ZigBee.Device.DoorLock doorLock; Shared.Phone.UserCenter.MemberInfoRes curAccountObj; - VerticalScrolViewLayout bodyView; + VerticalRefreshLayout bodyView; #endregion + + void ReadDoorLockUserInfo() + { + System.Threading.Tasks.Task.Run(async () => + { + try + { + var list = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetDoorLockAllAcountUserlist(doorLock); + var result = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetDoorLockOperateAccess(doorLock, curAccountObj.SubAccountDistributedMark); + var result1 = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetDoorLockUnlockAccess(doorLock, curAccountObj.SubAccountDistributedMark); + } + catch { } + finally + { + Application.RunOnMainThread(() => + { + MidRefresh(); + }); + } + }); + } /// <summary> /// UI鏄剧ず @@ -48,12 +69,18 @@ this.btnBackFrameLayout.MouseUpEventHandler += eHandlerBack; this.MidFrameLayout(this); - bodyView = new VerticalScrolViewLayout() + bodyView = new VerticalRefreshLayout() { }; this.midFrameLayout.AddChidren(bodyView); + MidRefresh(); - ReadDoorLockUserInfo(); + bodyView.BeginHeaderRefreshingAction += () => + { + bodyView.BeginHeaderRefreshing(); + ReadDoorLockUserInfo(); + bodyView.EndHeaderRefreshing(); + }; } public async void MidRefresh() @@ -200,10 +227,23 @@ } } }; - btnRightFrameLayout.MouseUpEventHandler += eHandler; - btnRight.MouseUpEventHandler += eHandler; - RowView.MouseUpEventHandler += eHandler; - btnText.MouseUpEventHandler += eHandler; + if (i == 0) + { + btnRightFrameLayout.MouseUpEventHandler += eHandler; + btnRight.MouseUpEventHandler += eHandler; + RowView.MouseUpEventHandler += eHandler; + btnText.MouseUpEventHandler += eHandler; + } + else if (i == 1) + { + btnRightFrameLayout.MouseUpEventHandler += eHandler; + btnRight.MouseUpEventHandler += eHandler; + } + else if (i == 2) + { + btnRightFrameLayout.MouseUpEventHandler += eHandler; + btnRight.MouseUpEventHandler += eHandler; + } } } @@ -746,27 +786,6 @@ MidRefresh(); } }; - } - - void ReadDoorLockUserInfo() - { - System.Threading.Tasks.Task.Run(async () => - { - Application.RunOnMainThread(() => { CommonPage.Loading.Start("Loading..."); }); - try - { - //await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetLocaDoorLocklist(doorLock, curAccountObj); - } - catch { } - finally - { - Application.RunOnMainThread(() => - { - MidRefresh(); - CommonPage.Loading.Hide(); - }); - } - }); } #region 鈼� 鎺ュ彛瀹炵幇__________________________ -- Gitblit v1.8.0