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/Room.cs | 19 ++++++++-----------
1 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/ZigbeeApp/Shared/Common/Room.cs b/ZigbeeApp/Shared/Common/Room.cs
index c17db61..27fe0df 100755
--- a/ZigbeeApp/Shared/Common/Room.cs
+++ b/ZigbeeApp/Shared/Common/Room.cs
@@ -4,7 +4,8 @@
using System.Text;
using ZigBee.Device;
using System.Linq;
-
+using Shared.Phone;
+
namespace Shared.Common
{
/// <summary>
@@ -61,15 +62,7 @@
/// <summary>
/// 婀垮害浼犳劅鍣�(璁惧涓婚敭)
/// </summary>
- public string HumidityDevice = string.Empty;
- /// <summary>
- /// 娓╁害
- /// </summary>
- public decimal Temperatrue;
- /// <summary>
- /// 婀垮害
- /// </summary>
- public decimal Humidity;
+ public string HumidityDevice = string.Empty;
/// <summary>
/// 鏄惁鏄垎浜繃鏉ョ殑鎴块棿
/// 娉細鍒嗕韩杩囨潵鐨勬埧闂翠笉鑳藉垹闄わ紝涓嶈兘缂栬緫璇ユ埧闂达紝涓嶈兘瀵硅澶囷紙鍔熻兘锛夈�佸満鏅繘琛屽鍒犳敼
@@ -84,6 +77,10 @@
/// 鎴块棿閲屾墍鏈夌殑璁惧鍒楄〃(璁惧鐨勪富閿�:mac鍦板潃_绔彛)
/// </summary>
public List<string> ListDevice = new List<string>();
+ /// <summary>
+ /// 鎴块棿鍐呮墍鏈夎澶囩殑Mac鍒楄〃(鐗╃悊璁惧鎵�鍦ㄧ殑鍖哄煙涓撶敤,鍚綉鍏�)
+ /// </summary>
+ public List<string> ListDeviceMac = new List<string>();
/// <summary>
///鍦烘櫙鍒楄〃(鍦烘櫙鐨処D)
/// </summary>
@@ -103,7 +100,7 @@
Global.WriteFileByBytesByHomeId(FileName, Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this)));
if (autoBackup == true)
{
- HdlAutoBackupLogic.AddOrEditorFile(FileName);
+ HdlBackupLogic.Current.AddOrEditorAutoBackFileStatu(FileName);
}
}
--
Gitblit v1.8.0