From 25429f085093d89d543a0b90e30d0d62d1b7dac9 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 30 八月 2022 09:37:38 +0800
Subject: [PATCH] 合并了IOS的代码
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserManagement.cs | 43 +++++++++++++++----------------------------
1 files changed, 15 insertions(+), 28 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserManagement.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserManagement.cs
index f224f74..dfaf6ae 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserManagement.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserManagement.cs
@@ -9,18 +9,8 @@
/// <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)
- {
- Shared.Application.RunOnMainThread(() =>
- {
- });
- }
/// 鏋勯�犲嚱鏁�
/// </summary>
/// <param name="doorLock"></param>
@@ -133,10 +123,11 @@
};
btnAddFrameLayout.AddChidren(btnUndistributeIcon);
+ btnAddFrameLayout.Width = Application.GetRealWidth(190 + 50);
var btnUndistributeText = new Button
{
Height = Application.GetRealHeight(72),
- Width = Application.GetRealWidth(150),
+ Width = Application.GetRealWidth(200),
TextID = R.MyInternationalizationString.Undistributed,
TextColor = Shared.Common.ZigbeeColor.Current.XMTopTitleText,
X = btnUndistributeIcon.Right,
@@ -147,6 +138,7 @@
btnAddFrameLayout.AddChidren(btnUndistributeText);
if (UserCenterResourse.UserInfo.AuthorityNo != 1)
{
+ btnAddFrameLayout.Width = 0;
btnUndistributeIcon.Width = 0;
btnUndistributeText.Width = 0;
}
@@ -160,9 +152,7 @@
btnAddFrameLayout.MouseDownEventHandler += eHandler;
btnUndistributeText.MouseDownEventHandler += eHandler;
btnUndistributeIcon.MouseDownEventHandler += eHandler;
- midVerticalScrolViewLayout = new VerticalRefreshLayout()
- {
- };
+ midVerticalScrolViewLayout = new VerticalRefreshLayout() { };
this.midFrameLayout.AddChidren(midVerticalScrolViewLayout);
if (localAllAccountListTemp.Count == 0)
@@ -172,7 +162,16 @@
}
else
{
- MidFrameLayoutContent();
+ //鍒囨崲璐︽埛鐨勬儏鍐碉細
+ if (localAllAccountListTemp[0].SubAccountDistributedMark != Shared.Common.Config.Instance.Guid)
+ {
+ CommonPage.Loading.Start("Loading...");
+ ReadAccountDoorLockInfoList();
+ }
+ else
+ {
+ MidFrameLayoutContent();
+ }
}
midVerticalScrolViewLayout.BeginHeaderRefreshingAction += () =>
@@ -272,18 +271,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