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/SceneCategoryView.cs | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/CommonForm/SceneCategoryView.cs b/ZigbeeApp/Shared/Phone/Device/CommonForm/SceneCategoryView.cs
index 7fe0130..5f8edaa 100755
--- a/ZigbeeApp/Shared/Phone/Device/CommonForm/SceneCategoryView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/CommonForm/SceneCategoryView.cs
@@ -373,6 +373,8 @@
{
scene.SceneDelayTime = t;
delayTimeBtn.Text = CommonFormResouce.GetTimeString(t);
+
+ room.ModifySceneDelayTime(scene);
};
};
}
@@ -422,6 +424,7 @@
scene.RemainTime = scene.SceneDelayTime;
scene.SceneDelayTime = 0;
+ room.ModifySceneDelayTime(scene);
new System.Threading.Thread(() =>
{
while (scene.RemainTime > 0)
--
Gitblit v1.8.0