From 9064c76e6a795ae735cac52d98bed178a27c2a87 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 10 一月 2020 16:38:16 +0800
Subject: [PATCH] 合并代码
---
ZigbeeApp/Shared/Phone/Device/CommonForm/SceneMainView.cs | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/CommonForm/SceneMainView.cs b/ZigbeeApp/Shared/Phone/Device/CommonForm/SceneMainView.cs
index 90b6b05..0defd1b 100755
--- a/ZigbeeApp/Shared/Phone/Device/CommonForm/SceneMainView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/CommonForm/SceneMainView.cs
@@ -37,6 +37,10 @@
/// scene
/// </summary>
public SceneUI scene;
+ /// <summary>
+ /// CollectionAction
+ /// </summary>
+ public Action CollectionAction;
/// <summary>
/// IsSelected
@@ -284,6 +288,7 @@
scene.RemainTime = scene.SceneDelayTime;
scene.SceneDelayTime = 0;
+ Common.Room.CurrentRoom.ModifySceneDelayTime(scene);
new System.Threading.Thread(() =>
{
while (scene.RemainTime > 0)
@@ -310,16 +315,23 @@
/// <param name="mouseEventArgs"></param>
private void CollectionEvent(object sender,MouseEventArgs mouseEventArgs)
{
- (sender as Button).IsSelected = !(sender as Button).IsSelected;
- if ((sender as Button).IsSelected)
+ if (Common.Room.CurrentRoom.IsLove)
{
- Shared.Common.Room.CurrentRoom.GetLoveRoom().AddScene(scene);
+ Common.Room.CurrentRoom.GetLoveRoom().DeleteScene(scene);
+ CollectionAction?.Invoke();
}
else
{
- Shared.Common.Room.CurrentRoom.GetLoveRoom().RemoveScene(scene);
+ (sender as Button).IsSelected = !(sender as Button).IsSelected;
+ if ((sender as Button).IsSelected)
+ {
+ Common.Room.CurrentRoom.GetLoveRoom().AddScene(scene);
+ }
+ else
+ {
+ Common.Room.CurrentRoom.GetLoveRoom().DeleteScene(scene);
+ }
}
- scene.Save();
}
/// <summary>
@@ -342,6 +354,8 @@
{
scene.SceneDelayTime = t;
SetTimeByDelayTime(t);
+
+ Common.Room.CurrentRoom.ModifySceneDelayTime(scene);
};
}
--
Gitblit v1.8.0