From 985abd7ee6049147119518aa41fb2d08c0cfc40d Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 10 一月 2020 17:56:12 +0800
Subject: [PATCH] 合并代码
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs | 124 +++++++++++++++++++++-------------------
1 files changed, 65 insertions(+), 59 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
index 675be01..3c9579d 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
@@ -66,37 +66,20 @@
btnFuncSetFrameLayout.AddChidren(btnFuncSet);
btnFuncSet.MouseDownEventHandler += (sender, e) =>
{
- if (UserCenterResourse.UserInfo.AuthorityNo == 1)
+ var functionSetting = new Shared.Phone.UserCenter.DoorLock.FunctionSetting(doorLock);
+ Shared.Phone.UserView.HomePage.Instance.AddChidren(functionSetting);
+ Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
+ functionSetting.Show();
+ functionSetting.devicNameAction += (deviceRename) =>
{
- var functionSetting = new Shared.Phone.UserCenter.DoorLock.FunctionSetting(doorLock);
- Shared.Phone.UserView.HomePage.Instance.AddChidren(functionSetting);
- Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
- functionSetting.Show();
- functionSetting.devicNameAction += (deviceRename) =>
+ if (!string.IsNullOrEmpty(deviceRename))
{
- if (!string.IsNullOrEmpty(deviceRename))
- {
- btnDoorLockTitle.Text = deviceRename;
- //鏀规埧闂�
- Shared.Common.Room.CurrentRoom.ChangedRoom(deviceUI.CommonDevice, currentRoom.Id);
- deviceUI.CommonDevice.ReSave();
- }
- };
- }
- else
- {
- var functionSettingSub = new Shared.Phone.UserCenter.DoorLock.FunctionSettingSub(doorLock);
- Shared.Phone.UserView.HomePage.Instance.AddChidren(functionSettingSub);
- Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
- functionSettingSub.Show();
- functionSettingSub.devicNameAction += (deviceRename) =>
- {
- if (!string.IsNullOrEmpty(deviceRename))
- {
- btnDoorLockTitle.Text = deviceRename;
- }
- };
- }
+ btnDoorLockTitle.Text = deviceRename;
+ //鏀规埧闂�
+ Shared.Common.Room.CurrentRoom.ChangedRoom(deviceUI.CommonDevice, currentRoom.Id);
+ deviceUI.CommonDevice.ReSave();
+ }
+ };
};
btnShare.MouseDownEventHandler += (sender, e) =>
@@ -117,6 +100,7 @@
Height = Application.GetRealHeight(1238),
Width = Application.GetRealWidth(965),
BackgroundColor = Shared.Common.ZigbeeColor.Current.XMWhite,
+ Radius = 6,
};
this.midFrameLayout.AddChidren(midTopFrameLayout);
@@ -126,12 +110,14 @@
Height = Application.GetRealHeight(60),
X = Application.GetRealWidth(372),
Y = Application.GetRealHeight(46),
- TextColor = Shared.Common.ZigbeeColor.Current.XMGray3,
- Text = string.IsNullOrEmpty(doorLock.DeviceName) ? Language.StringByID(R.MyInternationalizationString.UNKnown) : doorLock.DeviceName,
+ TextColor = Shared.Common.ZigbeeColor.Current.XMBlack,
TextSize = 15,
TextAlignment = TextAlignment.Center,
+ IsBold = true,
};
midTopFrameLayout.AddChidren(btnDoorLockTitle);
+ //鑾峰彇Mac鍚嶅瓧
+ btnDoorLockTitle.Text = Common.LocalDevice.Current.GetDeviceMacName(doorLock);
var btnRecord = new Button()
{
@@ -286,12 +272,22 @@
};
closeFrameLayout.AddChidren(btnDoorClosePic);
+ var btnCurrentTopFrameLayout = new FrameLayout()
+ {
+ Height = Application.GetRealHeight(50),
+ Width = Application.GetRealWidth(965),
+ BackgroundColor = ZigbeeColor.Current.XMBlack,
+ Y = Application.GetRealHeight(1100),
+ };
+ midTopFrameLayout.AddChidren(btnCurrentTopFrameLayout);
+
var btnCurrentFrameLayout = new FrameLayout()
{
Width = Application.GetRealWidth(965),
Height = Application.GetRealHeight(138),
Y = Application.GetRealHeight(1100),
BackgroundColor = ZigbeeColor.Current.XMBlack,
+ Radius = 6,
};
midTopFrameLayout.AddChidren(btnCurrentFrameLayout);
@@ -320,17 +316,19 @@
#endregion
EventHandler<MouseEventArgs> hander1 = async (sender, e) =>
- {
- if (UserCenterResourse.UserInfo.AuthorityNo != 1)
- {
- var result = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetDoorLockOperateAccess(doorLock, Shared.Common.Config.Instance.Guid);
- if (result == false)
- {
- var result1 = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetDoorLockUnlockAccess(doorLock, Shared.Common.Config.Instance.Guid);
- if (result1 == true)
- {
- RemoteUnlockRequest(doorLock, action, progressButton, btnDoorLockPic, btnStatus, btnDoorLockTitle);
- devicNameSecAction += (deviceRename) =>
+ {
+ openFrameLayout.Enable = false;
+ btnDoorOpenPic.Enable = false;
+ if (UserCenterResourse.UserInfo.AuthorityNo != 1)
+ {
+ var result = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetDoorLockOperateAccess(doorLock, Shared.Common.Config.Instance.Guid);
+ if (result == false)
+ {
+ var result1 = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetDoorLockUnlockAccess(doorLock, Shared.Common.Config.Instance.Guid);
+ if (result1 == true)
+ {
+ RemoteUnlockRequest(doorLock, action, progressButton, btnDoorLockPic, btnStatus, btnDoorLockTitle);
+ devicNameSecAction += (deviceRename) =>
{
if (!string.IsNullOrEmpty(deviceRename))
{
@@ -340,21 +338,27 @@
deviceUI.CommonDevice.ReSave();
}
};
- }
- else
- {
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.NoAccess), Direction = AMPopTipDirection.Down, CloseTime = 1 }.Show(Common.CommonPage.Instance);
- }
- }
- else
- {
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.AccountIsFreezed), Direction = AMPopTipDirection.Down, CloseTime = 1 }.Show(Common.CommonPage.Instance);
- }
- }
- else
- {
- RemoteUnlockRequest(doorLock, action, progressButton, btnDoorLockPic, btnStatus, btnDoorLockTitle);
- devicNameSecAction += (deviceRename) =>
+ openFrameLayout.Enable = true;
+ btnDoorOpenPic.Enable = true;
+ }
+ else
+ {
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.NoAccess), Direction = AMPopTipDirection.Down, CloseTime = 1 }.Show(Common.CommonPage.Instance);
+ openFrameLayout.Enable = true;
+ btnDoorOpenPic.Enable = true;
+ }
+ }
+ else
+ {
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.AccountIsFreezed), Direction = AMPopTipDirection.Down, CloseTime = 1 }.Show(Common.CommonPage.Instance);
+ openFrameLayout.Enable = true;
+ btnDoorOpenPic.Enable = true;
+ }
+ }
+ else
+ {
+ RemoteUnlockRequest(doorLock, action, progressButton, btnDoorLockPic, btnStatus, btnDoorLockTitle);
+ devicNameSecAction += (deviceRename) =>
{
if (!string.IsNullOrEmpty(deviceRename))
{
@@ -364,8 +368,10 @@
deviceUI.CommonDevice.ReSave();
}
};
- }
- };
+ openFrameLayout.Enable = true;
+ btnDoorOpenPic.Enable = true;
+ }
+ };
openFrameLayout.MouseUpEventHandler += hander1;
btnDoorOpenPic.MouseUpEventHandler += hander1;
EventHandler<MouseEventArgs> hander2 = (sender, e) =>
--
Gitblit v1.8.0