From 6fa9d69da922c8049f5acfcbb9ce9fd26811024c Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期四, 16 四月 2020 17:10:57 +0800
Subject: [PATCH] 请合并代码
---
ZigbeeApp/Shared/Common/SceneUI.cs | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/ZigbeeApp/Shared/Common/SceneUI.cs b/ZigbeeApp/Shared/Common/SceneUI.cs
index fa908a3..9bd6282 100755
--- a/ZigbeeApp/Shared/Common/SceneUI.cs
+++ b/ZigbeeApp/Shared/Common/SceneUI.cs
@@ -11,7 +11,7 @@
[System.Serializable]
public class SceneUI : ZigBee.Device.CommonDevice
{
- #region 鈻� 鍙橀噺澹版槑___________________________
+ #region 鈻� 鍙橀噺澹版槑_________________________
/// <summary>
/// 鍦烘櫙鏂囦欢
/// </summary>
@@ -60,9 +60,14 @@
[Newtonsoft.Json.JsonIgnore]
public int RemainTime;
/// <summary>
+ /// 寤舵椂鏃堕棿绾跨▼鏄惁杩愯
+ /// </summary>
+ [Newtonsoft.Json.JsonIgnore]
+ public bool RemainThreadAction = false;
+ /// <summary>
/// 鍦烘櫙鎵ц鐩爣
/// </summary>
- public List<ZigBee.Device.Scene.AddSceneMemberData> AddSceneMemberDataList = new List<ZigBee.Device.Scene.AddSceneMemberData> { };
+ public List<ZigBee.Device.Scene.DeviceListData> AdjustTargetList = new List<ZigBee.Device.Scene.DeviceListData>();
#endregion
@@ -79,9 +84,8 @@
{
HdlAutoBackupLogic.AddOrEditorFile(FileName);
}
- }
-
+ }
+
#endregion
-
}
}
--
Gitblit v1.8.0