From ddbf195df596cf94bf77b7e38a659cb5d14b3f95 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期五, 22 十一月 2019 17:48:08 +0800
Subject: [PATCH] 优化门锁类型查找方式（请合并最新代码）
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 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 891421a..f6f6f0b
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
@@ -7,12 +7,12 @@
public class UserDoorLockPage : DoorLockCommonLayout, ZigBee.Common.IStatus
{
- public UserDoorLockPage(Shared.Common.Room room ,DeviceUI doorLock)
+ public UserDoorLockPage(Shared.Common.Room room, DeviceUI doorLock)
{
this.doorLock = doorLock.CommonDevice as ZigBee.Device.DoorLock;
currentRoom = room;
deviceUI = doorLock;
- BackgroundColor = Shared.Common.ZigbeeColor.Current.GXCTopViewBackgroundColor;
+ BackgroundColor = Shared.Common.ZigbeeColor.Current.GXCTopViewBackgroundColor;
ZigBee.Device.ZbGateway.StatusList.Add(this);
}
@@ -83,11 +83,7 @@
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();
@@ -145,16 +141,25 @@
SelectedImagePath = "Item/CollectionSelected.png"
};
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(deviceUI.FileName); //鍙栨秷鏀惰棌
+ Shared.Common.Room.CurrentRoom.GetLoveRoom().AddDevice(deviceUI.FileName);//鏀惰棌
}
else
{
- Shared.Common.Room.CurrentRoom.GetLoveRoom().AddDevice(deviceUI.FileName);//鏀惰棌
+ Shared.Common.Room.CurrentRoom.GetLoveRoom().DeleteDevice(deviceUI.FileName); //鍙栨秷鏀惰棌
}
};
--
Gitblit v1.8.0