From abf4a98837e43e542701c60b7ec6a088cd5236da Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期一, 22 二月 2021 09:10:35 +0800
Subject: [PATCH] 20210222
---
HDL_ON/Entity/DB_ResidenceData.cs | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index 16fb651..5f624a1 100644
--- a/HDL_ON/Entity/DB_ResidenceData.cs
+++ b/HDL_ON/Entity/DB_ResidenceData.cs
@@ -1,4 +1,4 @@
-锘縰sing System;
+using System;
using System.Collections.Generic;
using System.IO;
using System.Threading;
@@ -94,7 +94,7 @@
//ShowFunction.EnergyMonitoring,
//ShowFunction.FreshAir,ShowFunction.DoorLock,
//ShowFunction.Panel,ShowFunction.SecurityMonitoring,
- //ShowFunction.Sensor,ShowFunction.VideoIntercom
+ ShowFunction.Sensor//,ShowFunction.VideoIntercom
});
instance.SaveResidenceData();
}
@@ -107,7 +107,7 @@
}
instance.residenceImage = "Classification/Room/Roombg.png";
//鍒濆鍖栦綇瀹呭姛鑳芥暟鎹�
- SpatialInfo.CurrentSpatial.InitRoomFunction();
+ SpatialInfo.CurrentSpatial.InitRoomListFunctions();
}
return instance;
@@ -121,12 +121,16 @@
instance = null;
ins_OidList = null;
HomeGateway = null;
+ //閲嶇疆缃戝叧鐘舵��
+ DriverLayer.Control.Ins.GatewayOnline = false;
SpatialInfo.CurrentSpatial.Clear();
FunctionList.List.Clear();
+
///鍒囨崲浣忓畢娓呯┖鍓嶄綇瀹呯紦瀛樿嚜鍔ㄥ寲鍒楄〃锛�
HDL_ON.UI.UI2.Intelligence.Automation.Logic.LogicList.Clear();
- if (MainPage.IsRemote)
+ if (HDL_ON.DriverLayer.Control.Ins.IsRemote)
{
+ DriverLayer.Control.Ins.IsRemote = false;
DAL.Mqtt.MqttClient.DisConnectRemote("閫�鍑虹櫥褰曪紝鎴栬�呭垏鎹綇瀹�");
}
}
@@ -270,7 +274,6 @@
/// <returns></returns>
static byte[] ReadResidenceInfo()
{
- MainPage.Log("get file Instance ");
var fileName = "DB_ResidenceData";
FileStream fs = null;
try
@@ -298,7 +301,6 @@
}
finally
{
- MainPage.Log("get file ");
try
{
if (fs != null)
@@ -420,4 +422,4 @@
#endregion
}
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0