From 9f326f4000847e6167d8166fa2f6a66f53cb3734 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 17 十二月 2020 09:07:13 +0800
Subject: [PATCH] 新云端Ver1.3
---
ZigbeeApp/Shared/Common/SceneUI.cs | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/ZigbeeApp/Shared/Common/SceneUI.cs b/ZigbeeApp/Shared/Common/SceneUI.cs
index fa908a3..124a28a 100755
--- a/ZigbeeApp/Shared/Common/SceneUI.cs
+++ b/ZigbeeApp/Shared/Common/SceneUI.cs
@@ -1,6 +1,6 @@
锘縰sing System;
using System.Collections.Generic;
-using Shared.Phone.Device.Category;
+using Shared.Phone;
using Shared.Phone.UserCenter;
namespace Shared.Common
@@ -9,9 +9,9 @@
/// 鍦烘櫙
/// </summary>
[System.Serializable]
- public class SceneUI : ZigBee.Device.CommonDevice
+ public class SceneUI
{
- #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
@@ -77,11 +82,10 @@
Global.WriteFileByBytesByHomeId(FileName, System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this)));
if (autoBackup == true)
{
- HdlAutoBackupLogic.AddOrEditorFile(FileName);
+ HdlBackupLogic.Current.AddOrEditorAutoBackFileStatu(FileName);
}
- }
-
+ }
+
#endregion
-
}
}
--
Gitblit v1.8.0