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/Device/CommonForm/SceneMainView.cs | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/CommonForm/SceneMainView.cs b/ZigbeeApp/Shared/Phone/Device/CommonForm/SceneMainView.cs
index 0defd1b..f70df74 100755
--- a/ZigbeeApp/Shared/Phone/Device/CommonForm/SceneMainView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/CommonForm/SceneMainView.cs
@@ -167,7 +167,7 @@
SetTimeByDelayTime(scene.SceneDelayTime);
SetSceneNameText(scene.Name);
SetIcon(scene.IconPath);
- SetCollect(Common.Room.CurrentRoom.GetLoveRoom().SceneUIFilePathList.Contains(scene.FileName));
+ SetCollect(UserCenter.HdlRoomLogic.Current.IsCollectInRoom(scene));
TimeButton.MouseUpEventHandler += SetTimeEvents;
CollectButton.MouseUpEventHandler += CollectionEvent;
@@ -288,7 +288,6 @@
scene.RemainTime = scene.SceneDelayTime;
scene.SceneDelayTime = 0;
- Common.Room.CurrentRoom.ModifySceneDelayTime(scene);
new System.Threading.Thread(() =>
{
while (scene.RemainTime > 0)
@@ -315,21 +314,22 @@
/// <param name="mouseEventArgs"></param>
private void CollectionEvent(object sender,MouseEventArgs mouseEventArgs)
{
- if (Common.Room.CurrentRoom.IsLove)
+ var roomLove = UserCenter.HdlRoomLogic.Current.GetLoveRoom();
+ if (UserCenter.HdlRoomLogic.Current.CurrentRoom.IsLove)
{
- Common.Room.CurrentRoom.GetLoveRoom().DeleteScene(scene);
+ UserCenter.HdlSceneLogic.Current.DeleteScene(roomLove, scene);
CollectionAction?.Invoke();
}
else
{
(sender as Button).IsSelected = !(sender as Button).IsSelected;
if ((sender as Button).IsSelected)
- {
- Common.Room.CurrentRoom.GetLoveRoom().AddScene(scene);
+ {
+ UserCenter.HdlSceneLogic.Current.AddScene(roomLove, scene);
}
else
- {
- Common.Room.CurrentRoom.GetLoveRoom().DeleteScene(scene);
+ {
+ UserCenter.HdlSceneLogic.Current.DeleteScene(roomLove, scene);
}
}
}
@@ -354,8 +354,6 @@
{
scene.SceneDelayTime = t;
SetTimeByDelayTime(t);
-
- Common.Room.CurrentRoom.ModifySceneDelayTime(scene);
};
}
--
Gitblit v1.8.0