From 3a26f6025130dcaae4aa82ea19b16ad902450eb8 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 28 十一月 2019 11:43:47 +0800
Subject: [PATCH] 合并全部代码完成
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs | 68 +++++++++++++++++++++++++--------
1 files changed, 51 insertions(+), 17 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
index 504a952..675be01 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
@@ -22,6 +22,7 @@
Shared.Common.Room currentRoom;
DeviceUI deviceUI;
Action action;
+ Button btnDoorLockTitle;
#endregion
/// <summary>
@@ -29,7 +30,7 @@
/// </summary>
public void Show()
{
- this.TopFrameLayout(this, Language.StringByID(R.MyInternationalizationString.DoorLock));
+ this.TopFrameLayout(this, "");
EventHandler<MouseEventArgs> eHandlerBack = (sender, e) =>
{
@@ -37,8 +38,8 @@
};
this.btnBack.MouseUpEventHandler += eHandlerBack;
this.btnBackFrameLayout.MouseUpEventHandler += eHandlerBack;
- this.MidFrameLayout(this);
+ this.MidFrameLayout(this);
var btnShare = new Button
{
X = Application.GetRealWidth(850 - 116),
@@ -67,27 +68,40 @@
{
if (UserCenterResourse.UserInfo.AuthorityNo == 1)
{
- var userDoorLockPage = new Shared.Phone.UserCenter.DoorLock.FunctionSetting(doorLock);
- Shared.Phone.UserView.HomePage.Instance.AddChidren(userDoorLockPage);
+ var functionSetting = new Shared.Phone.UserCenter.DoorLock.FunctionSetting(doorLock);
+ Shared.Phone.UserView.HomePage.Instance.AddChidren(functionSetting);
Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
- userDoorLockPage.Show();
+ functionSetting.Show();
+ functionSetting.devicNameAction += (deviceRename) =>
+ {
+ if (!string.IsNullOrEmpty(deviceRename))
+ {
+ btnDoorLockTitle.Text = deviceRename;
+ //鏀规埧闂�
+ Shared.Common.Room.CurrentRoom.ChangedRoom(deviceUI.CommonDevice, currentRoom.Id);
+ deviceUI.CommonDevice.ReSave();
+ }
+ };
}
else
{
- var userDoorLockPage = new Shared.Phone.UserCenter.DoorLock.FunctionSettingSub(doorLock);
- Shared.Phone.UserView.HomePage.Instance.AddChidren(userDoorLockPage);
+ var functionSettingSub = new Shared.Phone.UserCenter.DoorLock.FunctionSettingSub(doorLock);
+ Shared.Phone.UserView.HomePage.Instance.AddChidren(functionSettingSub);
Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
- userDoorLockPage.Show();
+ functionSettingSub.Show();
+ functionSettingSub.devicNameAction += (deviceRename) =>
+ {
+ if (!string.IsNullOrEmpty(deviceRename))
+ {
+ btnDoorLockTitle.Text = deviceRename;
+ }
+ };
}
};
btnShare.MouseDownEventHandler += (sender, e) =>
{
- var doorLock = new ZigBee.Device.DoorLock();
- var memberManagement = new Shared.Phone.UserCenter.DoorLock.MemberManagement(doorLock);
- Shared.Phone.UserView.HomePage.Instance.AddChidren(memberManagement);
- Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
- memberManagement.Show();
+
};
MidFrameLayoutContent();
@@ -106,14 +120,14 @@
};
this.midFrameLayout.AddChidren(midTopFrameLayout);
- var btnDoorLockTitle = new Button()
+ btnDoorLockTitle = new Button()
{
Width = Application.GetRealWidth(250),
Height = Application.GetRealHeight(60),
X = Application.GetRealWidth(372),
Y = Application.GetRealHeight(46),
TextColor = Shared.Common.ZigbeeColor.Current.XMGray3,
- Text = Language.StringByID(R.MyInternationalizationString.SmartDoorLock),
+ Text = string.IsNullOrEmpty(doorLock.DeviceName) ? Language.StringByID(R.MyInternationalizationString.UNKnown) : doorLock.DeviceName,
TextSize = 15,
TextAlignment = TextAlignment.Center,
};
@@ -315,7 +329,17 @@
var result1 = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetDoorLockUnlockAccess(doorLock, Shared.Common.Config.Instance.Guid);
if (result1 == true)
{
- RemoteUnlockRequest(doorLock, action, progressButton, btnDoorLockPic, btnStatus);
+ RemoteUnlockRequest(doorLock, action, progressButton, btnDoorLockPic, btnStatus, btnDoorLockTitle);
+ devicNameSecAction += (deviceRename) =>
+ {
+ if (!string.IsNullOrEmpty(deviceRename))
+ {
+ btnDoorLockTitle.Text = deviceRename;
+ //鏀规埧闂�
+ Shared.Common.Room.CurrentRoom.ChangedRoom(deviceUI.CommonDevice, currentRoom.Id);
+ deviceUI.CommonDevice.ReSave();
+ }
+ };
}
else
{
@@ -329,7 +353,17 @@
}
else
{
- RemoteUnlockRequest(doorLock, action, progressButton, btnDoorLockPic, btnStatus);
+ RemoteUnlockRequest(doorLock, action, progressButton, btnDoorLockPic, btnStatus, btnDoorLockTitle);
+ devicNameSecAction += (deviceRename) =>
+ {
+ if (!string.IsNullOrEmpty(deviceRename))
+ {
+ btnDoorLockTitle.Text = deviceRename;
+ //鏀规埧闂�
+ Shared.Common.Room.CurrentRoom.ChangedRoom(deviceUI.CommonDevice, currentRoom.Id);
+ deviceUI.CommonDevice.ReSave();
+ }
+ };
}
};
openFrameLayout.MouseUpEventHandler += hander1;
--
Gitblit v1.8.0