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 | 86 ++++++++++++-------------------------------
1 files changed, 24 insertions(+), 62 deletions(-)
diff --git a/ZigbeeApp/Shared/Common/SceneUI.cs b/ZigbeeApp/Shared/Common/SceneUI.cs
index 3c02d15..124a28a 100755
--- a/ZigbeeApp/Shared/Common/SceneUI.cs
+++ b/ZigbeeApp/Shared/Common/SceneUI.cs
@@ -1,5 +1,6 @@
锘縰sing System;
using System.Collections.Generic;
+using Shared.Phone;
using Shared.Phone.UserCenter;
namespace Shared.Common
@@ -8,9 +9,9 @@
/// 鍦烘櫙
/// </summary>
[System.Serializable]
- public class SceneUI : ZigBee.Device.CommonDevice
- {
- #region 鈼� 鍙橀噺____________________________
+ public class SceneUI
+ {
+ #region 鈻� 鍙橀噺澹版槑_________________________
/// <summary>
/// 鍦烘櫙鏂囦欢
/// </summary>
@@ -26,90 +27,52 @@
/// <summary>
/// 鍦烘櫙id
/// </summary>
- public int Id = int.MaxValue;
-
+ public int Id = -1;
/// <summary>
/// 鍦烘櫙鍚�
/// </summary>
public string Name = string.Empty;
-
/// <summary>
/// 鍥剧墖璺緞
/// </summary>
public string IconPath = "Scene/SceneDefault.png";
/// <summary>
- /// 鍥剧墖鏉ユ簮 0--鏈湴鍥惧簱 1--鎷嶇収 2--绯荤粺鍥惧簱
+ /// 鍥剧墖鏉ユ簮 0--鏈湴鍥惧簱 1--鎷嶇収 2--绯荤粺鍥惧簱
/// </summary>
public int IconPathType = 0;
-
- /// <summary>
- /// 鍔熻兘璺緞鍒楄〃---澶囩敤
- /// </summary>
- public List<string> FunctionFilePathList = new List<string> { };
-
- /// <summary>
- /// 閫氱敤鏍囪瘑--澶囩敤
- /// </summary>
- public object Tag;
-
/// <summary>
/// 寤舵椂鎵ц鏃堕棿--璁惧寤舵椂
/// </summary>
public int DelayTime = 0;
-
/// <summary>
/// 鏍囪瘑褰撳墠鍦烘櫙鏄惁鏄垎浜殑鍦烘櫙
/// </summary>
public bool IsSharedScene = false;
/// <summary>
- /// 鏄惁鏀惰棌
- /// </summary>
- public bool IsCollected = false;
-
- /// <summary>
/// 寤舵椂鎵ц鏃堕棿--鏁翠釜鍦烘櫙寤舵椂(涓嶆槸寤舵椂鍦烘櫙閲岄潰鐨勬墽琛岀洰鏍�)
/// 涓嶅簭鍒楀寲锛岄噸鏂版墦寮�APP缃�傚嵆鍙鏈缂栬緫鍦烘櫙寤舵椂鎵ц鏈夋晥
/// </summary>
[Newtonsoft.Json.JsonIgnore]
- public int SceneDelayTime = 0;
-
+ public int SceneDelayTime = 0;
+ /// <summary>
+ /// 鍓╀綑瑙﹀彂鏃堕棿锛屽崟浣嶇
+ /// </summary>
+ [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
-
- #region 鈼� 閫氳繃鍦烘櫙id鑾峰彇鍦烘櫙璺緞_____________
- /// <summary>
- /// GetSceneFilePathBySceneId
- /// </summary>
- /// <param name="sceneId"></param>
- /// <returns></returns>
- public static string GetSceneFilePathBySceneId(int sceneId)
- {
- return $"Scene_{sceneId}.json";
- }
-
- #endregion
-
- #region 鈼� 鏀惰棌____________________________
-
- /// <summary>
- /// collect
- /// </summary>
- /// <param name="collected"></param>
- /// <param name="autoBackup"></param>
- public void Collect(bool collected, bool autoBackup = true)
- {
- IsCollected = collected;
- Save(autoBackup);
- }
-
- #endregion
-
- #region 鈼� 淇濆瓨____________________________
-
+
+ #region 鈻� 淇濆瓨_____________________________
+
/// <summary>
/// 淇濆瓨
/// </summary>
@@ -119,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