From fe3b2466c68b5db70d38e78039703add3b8b1dfe Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 31 十二月 2020 19:29:43 +0800
Subject: [PATCH] 合并了代码
---
ZigbeeApp/Shared/Common/Room.cs | 9 ++-------
1 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/ZigbeeApp/Shared/Common/Room.cs b/ZigbeeApp/Shared/Common/Room.cs
index 27fe0df..d702206 100755
--- a/ZigbeeApp/Shared/Common/Room.cs
+++ b/ZigbeeApp/Shared/Common/Room.cs
@@ -4,8 +4,7 @@
using System.Text;
using ZigBee.Device;
using System.Linq;
-using Shared.Phone;
-
+
namespace Shared.Common
{
/// <summary>
@@ -77,10 +76,6 @@
/// 鎴块棿閲屾墍鏈夌殑璁惧鍒楄〃(璁惧鐨勪富閿�:mac鍦板潃_绔彛)
/// </summary>
public List<string> ListDevice = new List<string>();
- /// <summary>
- /// 鎴块棿鍐呮墍鏈夎澶囩殑Mac鍒楄〃(鐗╃悊璁惧鎵�鍦ㄧ殑鍖哄煙涓撶敤,鍚綉鍏�)
- /// </summary>
- public List<string> ListDeviceMac = new List<string>();
/// <summary>
///鍦烘櫙鍒楄〃(鍦烘櫙鐨処D)
/// </summary>
@@ -100,7 +95,7 @@
Global.WriteFileByBytesByHomeId(FileName, Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this)));
if (autoBackup == true)
{
- HdlBackupLogic.Current.AddOrEditorAutoBackFileStatu(FileName);
+ HdlAutoBackupLogic.AddOrEditorFile(FileName);
}
}
--
Gitblit v1.8.0