From a5b3c4bae726ef6770d4bfcbf2f4b50a37ed4a15 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 06 三月 2020 15:31:36 +0800
Subject: [PATCH] 删除了郭雪城的 DeviceUi 这个类
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs | 29 ++++++++++++++---------------
1 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
index da5c1cc..dd33da8 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
@@ -11,9 +11,9 @@
/// </summary>
/// <param name="room"></param>
/// <param name="doorLock"></param>
- public UserDoorLockPage(Shared.Common.Room room, DeviceUI doorLock)
+ public UserDoorLockPage(Shared.Common.Room room, CommonDevice doorLock)
{
- this.doorLock = doorLock.CommonDevice as ZigBee.Device.DoorLock;
+ this.doorLock = doorLock as ZigBee.Device.DoorLock;
currentRoom = room;
deviceUI = doorLock;
BackgroundColor = Shared.Common.ZigbeeColor.Current.GXCTopViewBackgroundColor;
@@ -36,7 +36,7 @@
/// <summary>
/// 璁惧UI瀵硅薄
/// </summary>
- DeviceUI deviceUI;
+ CommonDevice deviceUI;
/// <summary>
/// 璁剧疆浜屾楠岃瘉Action
/// </summary>
@@ -97,8 +97,8 @@
{
btnDoorLockTitle.Text = deviceRename;
//鏀规埧闂�
- Shared.Common.Room.CurrentRoom.ChangedRoom(deviceUI.CommonDevice, currentRoom.Id);
- deviceUI.CommonDevice.ReSave();
+ HdlRoomLogic.Current.ChangedRoom(deviceUI, currentRoom.Id);
+ deviceUI.ReSave();
}
};
};
@@ -182,8 +182,7 @@
SelectedImagePath = "Item/CollectionSelected.png"
};
btnCollectFrameLayout.AddChidren(btnCollect);
- var de = Shared.Common.Room.LoveRoomDeviceUIFilePathList.Find((obj) => obj == deviceUI.FileName);
- if (de == null)
+ if (HdlRoomLogic.Current.IsCollectInRoom(deviceUI) == false)
{
btnCollect.IsSelected = false;
}
@@ -196,11 +195,11 @@
btnCollect.IsSelected = !btnCollect.IsSelected;
if (btnCollect.IsSelected)
{
- Shared.Common.Room.CurrentRoom.GetLoveRoom().AddDevice(deviceUI.FileName);//鏀惰棌
+ HdlRoomLogic.Current.AddLoveDevice(deviceUI);//鏀惰棌
}
else
{
- Shared.Common.Room.CurrentRoom.GetLoveRoom().DeleteDevice(deviceUI.FileName); //鍙栨秷鏀惰棌
+ HdlRoomLogic.Current.DeleteLoveDevice(deviceUI);//鍙栨秷鏀惰棌
}
};
btnCollectFrameLayout.MouseDownEventHandler += handerCollect;
@@ -373,8 +372,8 @@
{
btnDoorLockTitle.Text = deviceRename;
//鏀规埧闂�
- Shared.Common.Room.CurrentRoom.ChangedRoom(deviceUI.CommonDevice, currentRoom.Id);
- deviceUI.CommonDevice.ReSave();
+ HdlRoomLogic.Current.ChangedRoom(deviceUI, currentRoom.Id);
+ deviceUI.ReSave();
}
};
openFrameLayout.Enable = true;
@@ -401,10 +400,10 @@
{
if (!string.IsNullOrEmpty(deviceRename))
{
- btnDoorLockTitle.Text = deviceRename;
- //鏀规埧闂�
- Shared.Common.Room.CurrentRoom.ChangedRoom(deviceUI.CommonDevice, currentRoom.Id);
- deviceUI.CommonDevice.ReSave();
+ btnDoorLockTitle.Text = deviceRename;
+ //鏀规埧闂�
+ HdlRoomLogic.Current.ChangedRoom(deviceUI, currentRoom.Id);
+ deviceUI.ReSave();
}
};
openFrameLayout.Enable = true;
--
Gitblit v1.8.0