From b9cb076fe6127160c96c35bf9c8cebcffe1d5ccd Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期五, 10 一月 2020 17:35:23 +0800
Subject: [PATCH] 2020.1.10
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs | 187 ++++++++++++++++++++++++++++++++--------------
1 files changed, 131 insertions(+), 56 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
old mode 100755
new mode 100644
index 4044118..0f9bbce
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
@@ -6,10 +6,12 @@
{
public class UserDoorLockPage : DoorLockCommonLayout, ZigBee.Common.IStatus
{
- public UserDoorLockPage(ZigBee.Device.DoorLock doorLock, Shared.Phone.UserCenter.MemberInfoRes accountObj)
+
+ public UserDoorLockPage(Shared.Common.Room room, DeviceUI doorLock)
{
- this.doorLock = doorLock;
- //currentRoom = room;Shared.Common.Room room,
+ this.doorLock = doorLock.CommonDevice as ZigBee.Device.DoorLock;
+ currentRoom = room;
+ deviceUI = doorLock;
BackgroundColor = Shared.Common.ZigbeeColor.Current.GXCTopViewBackgroundColor;
ZigBee.Device.ZbGateway.StatusList.Add(this);
}
@@ -18,15 +20,17 @@
ZigBee.Device.DoorLock doorLock;
FrameLayout bottomFrameLayout;
Shared.Common.Room currentRoom;
+ DeviceUI deviceUI;
Action action;
+ Button btnDoorLockTitle;
#endregion
/// <summary>
- /// UI鏄剧ず
+ /// UI鏄剧ず
/// </summary>
public void Show()
{
- this.TopFrameLayout(this, Language.StringByID(R.MyInternationalizationString.DoorLock));
+ this.TopFrameLayout(this, "");
EventHandler<MouseEventArgs> eHandlerBack = (sender, e) =>
{
@@ -34,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),
@@ -44,39 +48,60 @@
};
this.titleFrameLayout.AddChidren(btnShare);
+ var btnFuncSetFrameLayout = new FrameLayout
+ {
+ X = Application.GetRealWidth(850 - 116),
+ Height = Application.GetRealHeight(69),
+ Width = Application.GetRealWidth(69 * 2 + 58),
+ };
+ this.titleFrameLayout.AddChidren(btnFuncSetFrameLayout);
+
var btnFuncSet = new Button
{
- X = Application.GetRealWidth(953 - 116),
+ X = Application.GetRealWidth(103),
Height = Application.GetRealHeight(69),
Width = Application.GetRealWidth(69),
UnSelectedImagePath = "DoorLock/SettingIcon.png",
};
- this.titleFrameLayout.AddChidren(btnFuncSet);
+ btnFuncSetFrameLayout.AddChidren(btnFuncSet);
btnFuncSet.MouseDownEventHandler += (sender, e) =>
{
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();
@@ -92,21 +117,24 @@
Height = Application.GetRealHeight(1238),
Width = Application.GetRealWidth(965),
BackgroundColor = Shared.Common.ZigbeeColor.Current.XMWhite,
+ Radius = 6,
};
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),
+ 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()
{
@@ -119,11 +147,9 @@
midTopFrameLayout.AddChidren(btnRecord);
btnRecord.MouseDownEventHandler += (sender, e) =>
{
- var doorLock = new ZigBee.Device.DoorLock();
- var doorLockRecord = new Shared.Phone.UserCenter.DoorLock.HistoryRecordPage(doorLock);
- Shared.Phone.UserView.HomePage.Instance.AddChidren(doorLockRecord);
- Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
- doorLockRecord.Show();
+ //鍘嗗彶璁板綍 ---- stan
+ var form = new DeviceDoorLock.DoorLockHistoryLogForm();
+ form.AddForm(this.doorLock.DeviceAddr);
};
var btnCollect = new Button()
@@ -135,17 +161,26 @@
UnSelectedImagePath = "Item/Collection.png",
SelectedImagePath = "Item/CollectionSelected.png"
};
- midTopFrameLayout.AddChidren(btnCollect);
+ midTopFrameLayout.AddChidren(btnCollect);
+ var de = Shared.Common.Room.LoveRoomDeviceUIFilePathList.Find((obj) => obj == deviceUI.FileName);
+ if (de == null)
+ {
+ btnCollect.IsSelected = false;
+ }
+ else
+ {
+ btnCollect.IsSelected = true;
+ }
btnCollect.MouseDownEventHandler += (sender, e) =>
{
btnCollect.IsSelected = !btnCollect.IsSelected;
if (btnCollect.IsSelected)
{
- // Shared.Common.Room.CurrentRoom.GetLoveRoom().DeleteDevice(doorLock.FileName); //鍙栨秷鏀惰棌
+ Shared.Common.Room.CurrentRoom.GetLoveRoom().AddDevice(deviceUI.FileName);//鏀惰棌
}
else
- {
- //Shared.Common.Room.CurrentRoom.GetLoveRoom().AddDevice(doorLock.FileName);//鏀惰棌
+ {
+ Shared.Common.Room.CurrentRoom.GetLoveRoom().DeleteDevice(deviceUI.FileName); //鍙栨秷鏀惰棌
}
};
@@ -188,7 +223,7 @@
var btnFrameLayout = new FrameLayout()
{
- Width = Application.GetRealWidth(420 - 46),//639-35
+ Width = Application.GetRealWidth(420 - 46),
Height = Application.GetRealHeight(446),
X = btnDoorLockPic.Right,
Y = Application.GetRealHeight(354),
@@ -254,12 +289,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);
@@ -279,7 +324,7 @@
Height = Application.GetRealHeight(49),
X = Application.GetRealWidth(150),
Y = Application.GetRealHeight(46),
- // Text = currentRoom.Name,
+ Text = currentRoom.Name,
TextColor = Shared.Common.ZigbeeColor.Current.XMWhite,
TextSize = 12,
TextAlignment = TextAlignment.CenterLeft,
@@ -288,32 +333,62 @@
#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)
+ {
+ 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))
+ {
+ btnDoorLockTitle.Text = deviceRename;
+ //鏀规埧闂�
+ Shared.Common.Room.CurrentRoom.ChangedRoom(deviceUI.CommonDevice, currentRoom.Id);
+ deviceUI.CommonDevice.ReSave();
+ }
+ };
+ 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) =>
{
- var result1 = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetDoorLockUnlockAccess(doorLock, Shared.Common.Config.Instance.Guid);
- if (result1 == true)
+ if (!string.IsNullOrEmpty(deviceRename))
{
- RemoteUnlockRequest(doorLock, action, progressButton, btnDoorLockPic, btnStatus);
+ btnDoorLockTitle.Text = deviceRename;
+ //鏀规埧闂�
+ Shared.Common.Room.CurrentRoom.ChangedRoom(deviceUI.CommonDevice, currentRoom.Id);
+ deviceUI.CommonDevice.ReSave();
}
- else
- {
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.NoAccess), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(this.btnTip);
- }
- }
- else
- {
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.AccountIsFreezed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(this.btnTip);
- }
- }
- else
- {
- RemoteUnlockRequest(doorLock, action, progressButton, btnDoorLockPic, btnStatus);
- }
- };
+ };
+ openFrameLayout.Enable = true;
+ btnDoorOpenPic.Enable = true;
+ }
+ };
openFrameLayout.MouseUpEventHandler += hander1;
btnDoorOpenPic.MouseUpEventHandler += hander1;
EventHandler<MouseEventArgs> hander2 = (sender, e) =>
--
Gitblit v1.8.0