From 66a9965c44ecc32a6696abca876ab9d1cd091584 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期五, 28 二月 2020 15:25:13 +0800
Subject: [PATCH] 2020.2.28
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs | 83 ++++++++++++++++++++++++-----------------
1 files changed, 49 insertions(+), 34 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs
index 1b9661e..b1e0ddb 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs
@@ -21,33 +21,21 @@
Shared.Phone.UserCenter.MemberInfoRes accountObj;
#endregion
- void ReadDoorLockUserInfo()
- {
- System.Threading.Tasks.Task.Run(async () =>
- {
- Application.RunOnMainThread(() => { CommonPage.Loading.Start("Loading..."); });
- try
- {
- await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetLocaDoorLocklist(doorLock, accountObj);
- }
- catch { }
- finally
- {
- Application.RunOnMainThread(() =>
- {
- MidFrameLayoutContent();
- CommonPage.Loading.Hide();
- });
- }
- });
- }
-
/// <summary>
/// UI鏄剧ず
/// </summary>
public void Show()
{
- this.TopFrameLayout(this, accountObj.Account);
+ string accountTitle = "";
+ if (accountObj.UserName != null)
+ {
+ accountTitle = accountObj.UserName;
+ }
+ else
+ {
+ accountTitle = accountObj.Account;
+ }
+ this.TopFrameLayout(this, accountTitle);
EventHandler<MouseEventArgs> eHandlerBack = (sender, e) =>
{
@@ -56,23 +44,28 @@
this.btnBack.MouseUpEventHandler += eHandlerBack;
this.btnBackFrameLayout.MouseUpEventHandler += eHandlerBack;
this.MidFrameLayout(this);
-
- ReadDoorLockUserInfo();
-
+ MidFrameLayoutContent();
}
public void MidFrameLayoutContent()
{
- var bodyView = new VerticalScrolViewLayout()
+ var bodyView = new VerticalRefreshLayout()
{
};
this.midFrameLayout.AddChidren(bodyView);
+ bodyView.BeginHeaderRefreshingAction += async () =>
+ {
+ bodyView.BeginHeaderRefreshing();
+ await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetDoorLockAllAcountUserlist(doorLock);
+ bodyView.EndHeaderRefreshing();
+ };
for (int i = 0; i < 2; i++)
{
var RowView = new FrameLayout()
{
- Height = Application.GetRealHeight(161),
+ Height = Application.GetRealHeight(127 + 23),
+ BackgroundColor = Shared.Common.ZigbeeColor.Current.XMWhite,
};
bodyView.AddChidren(RowView);
@@ -94,7 +87,7 @@
Y = Application.GetRealHeight(58),
Height = Application.GetRealHeight(58),
Width = Application.GetRealWidth(58),
- UnSelectedImagePath = "Item/Next.png",
+ UnSelectedImagePath = "Item/RightNext.png",
SelectedImagePath = "Item/Down.png",
};
RowView.AddChidren(btnRight);
@@ -117,6 +110,7 @@
else
{
btnMemberName.Text = Language.StringByID(R.MyInternationalizationString.LinkageEvent);
+ line2.Visible = false;
}
EventHandler<MouseEventArgs> eHandler = (sender, e) =>
@@ -129,15 +123,36 @@
unLockMethod.Show();
}
else
- {
- var userDoorLockPage = new UserDoorLockPage(doorLock, accountObj);
- Shared.Phone.UserView.HomePage.Instance.AddChidren(userDoorLockPage);
- Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
- userDoorLockPage.Show();
+ {
+ ///澶囨敞锛歐JC鐨�
+ ///璁板綍褰撳墠鐢ㄦ埛淇℃伅
+ Phone.Device.Logic.Send.UserMemberInfoRes = accountObj;
+ Phone.Device.Logic.Send.CurrentDoorLock = doorLock;
+ if (accountObj == null)
+ {
+ ///闃叉鎶涘紓甯�
+ Phone.Device.Logic.Send.UserMemberInfoRes = new MemberInfoRes();
+ }
+ if (doorLock == null)
+ {
+ ///闃叉鎶涘紓甯�
+ Phone.Device.Logic.Send.CurrentDoorLock = new ZigBee.Device.DoorLock();
+ }
+ ///杩涙潵鍒锋柊涓�娆¤澶囧垪琛紱
+ Common.Logic.LogicDviceList.Clear();
+ if (Common.Logic.LogicDviceList.Count == 0)
+ {
+ Common.Logic.LogicDviceList.AddRange(LocalDevice.Current.listAllDevice.ToArray());
+ }
+ var doorLockLogicList = new Phone.Device.Logic.DoorLockLogic.LockLogicList();
+ UserView.HomePage.Instance.AddChidren(doorLockLogicList);
+ UserView.HomePage.Instance.PageIndex += 1;
+ doorLockLogicList.Show();
}
};
btnRight.MouseUpEventHandler += eHandler;
- RowView.MouseUpEventHandler += eHandler;
+ RowView.MouseUpEventHandler += eHandler;
+ btnMemberName.MouseUpEventHandler += eHandler;
}
}
--
Gitblit v1.8.0