From 3a26f6025130dcaae4aa82ea19b16ad902450eb8 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 28 十一月 2019 11:43:47 +0800
Subject: [PATCH] 合并全部代码完成
---
ZigbeeApp/Shared/Common/SceneUI.cs | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/ZigbeeApp/Shared/Common/SceneUI.cs b/ZigbeeApp/Shared/Common/SceneUI.cs
index 364b4bb..eee86e6 100755
--- a/ZigbeeApp/Shared/Common/SceneUI.cs
+++ b/ZigbeeApp/Shared/Common/SceneUI.cs
@@ -27,7 +27,7 @@
/// <summary>
/// 鍦烘櫙id
/// </summary>
- public int Id = int.MaxValue;
+ public int Id = -1;
/// <summary>
/// 鍦烘櫙鍚�
@@ -73,6 +73,12 @@
/// </summary>
[Newtonsoft.Json.JsonIgnore]
public int SceneDelayTime = 0;
+
+ /// <summary>
+ /// 鍓╀綑瑙﹀彂鏃堕棿锛屽崟浣嶇
+ /// </summary>
+ [Newtonsoft.Json.JsonIgnore]
+ public int RemainTime;
/// <summary>
/// 鍦烘櫙鎵ц鐩爣
--
Gitblit v1.8.0