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 | 139 ++++++++++++++++++++++++---------------------
1 files changed, 74 insertions(+), 65 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserManagement.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserManagement.cs
index 191071a..0f4b5ed 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserManagement.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserManagement.cs
@@ -9,42 +9,34 @@
/// <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)
- {
- //if (common.Type != ZigBee.Device.DeviceType.OnOffSwitch)
- //{
- // return;
- //}
-
- Shared.Application.RunOnMainThread(() =>
- {
- //var dev = common as Panel;
- });
- }
/// 鏋勯�犲嚱鏁�
/// </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;
- VerticalScrolViewLayout midVerticalScrolViewLayout;
+ VerticalRefreshLayout midVerticalScrolViewLayout;
+ public List<MemberInfoRes> localAllAccountListTemp = new List<MemberInfoRes> { };
+ public Dictionary<int, DoorLockCommonInfo.LocaDoorLockObj> localDoorLockUserListTemp = new Dictionary<int, DoorLockCommonInfo.LocaDoorLockObj>();
+
+
#endregion
- void ReadAccountList()
+ /// <summary>
+ /// 鏁版嵁鍒锋柊
+ /// </summary>
+ void ReadAccountDoorLockInfoList()
{
System.Threading.Tasks.Task.Run(async () =>
{
- Application.RunOnMainThread(() => { CommonPage.Loading.Start("Loading..."); });
try
{
var localAccountListTemp = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.LocalAccountList();
@@ -52,21 +44,31 @@
{
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);
+ //}
+ }
+
+ //鑾峰彇鏈湴闂ㄩ攣鍒楄〃
+ if (localDoorLockUserListTemp.Count == 0)
+ {
+ var list = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetDoorLockAllAcountUserlist(doorLock);
+ localDoorLockUserListTemp = doorLock.localDoorLockUserList;
}
doorLock.ReSave();
}
@@ -74,7 +76,7 @@
{
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);
});
}
}
@@ -85,11 +87,15 @@
{
MidFrameLayoutContent();
CommonPage.Loading.Hide();
+ midVerticalScrolViewLayout.EndHeaderRefreshing();
});
}
});
}
+ /// <summary>
+ /// 鏄剧ず鐣岄潰
+ /// </summary>
public void Show()
{
this.TopFrameLayout(this, Language.StringByID(R.MyInternationalizationString.UserManagement));
@@ -104,7 +110,7 @@
var btnAddFrameLayout = new FrameLayout
{
- X = Application.GetRealWidth(829),
+ X = Application.GetRealWidth(829 - 116),
Height = Application.GetRealHeight(72),
Width = Application.GetRealWidth(190),
};
@@ -121,14 +127,21 @@
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 (HdlUserCenterResourse.ResidenceOption.AuthorityNo != 1)
+ {
+ btnAddFrameLayout.Width = 0;
+ btnUndistributeIcon.Width = 0;
+ btnUndistributeText.Width = 0;
+ }
EventHandler<MouseEventArgs> eHandler = (sender, e) =>
{
var undistributeDoorlockUserPage = new Shared.Phone.UserCenter.DoorLock.UndistributeDoorlockUserPage(doorLock, doorLock.localAllAccountList);
@@ -139,14 +152,29 @@
btnAddFrameLayout.MouseDownEventHandler += eHandler;
btnUndistributeText.MouseDownEventHandler += eHandler;
btnUndistributeIcon.MouseDownEventHandler += eHandler;
- midVerticalScrolViewLayout = new VerticalScrolViewLayout()
- {
- };
+ midVerticalScrolViewLayout = new VerticalRefreshLayout() { };
this.midFrameLayout.AddChidren(midVerticalScrolViewLayout);
- ReadAccountList();
- // MidFrameLayoutContent();
+
+ if (localAllAccountListTemp.Count == 0)
+ {
+ CommonPage.Loading.Start("Loading...");
+ ReadAccountDoorLockInfoList();
+ }
+ else
+ {
+ MidFrameLayoutContent();
+ }
+
+ midVerticalScrolViewLayout.BeginHeaderRefreshingAction += () =>
+ {
+ midVerticalScrolViewLayout.BeginHeaderRefreshing();
+ ReadAccountDoorLockInfoList();
+ };
}
+ /// <summary>
+ /// 涓儴甯冨眬鏄剧ず
+ /// </summary>
async void MidFrameLayoutContent()
{
midVerticalScrolViewLayout.RemoveAll();
@@ -155,8 +183,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);
@@ -165,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,
};
@@ -204,14 +232,7 @@
line2.Visible = false;
}
- if (currentAccount.UserName != null)
- {
- btnText.Text = currentAccount.UserName;
- }
- else
- {
- btnText.Text = currentAccount.Account;
- }
+ btnText.Text = currentAccount.ShowName;
EventHandler<MouseEventArgs> eHandler = (sender, e) =>
{
@@ -234,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