From d2666457d16f6171785596a8a9cb2fb9fb35f84b Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 16 四月 2021 18:03:54 +0800
Subject: [PATCH] 2021-4-16-1
---
HDL_ON/Entity/DB_ResidenceData.cs | 23 +++++++++--------------
1 files changed, 9 insertions(+), 14 deletions(-)
diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index 81306ec..8cbd2a2 100644
--- a/HDL_ON/Entity/DB_ResidenceData.cs
+++ b/HDL_ON/Entity/DB_ResidenceData.cs
@@ -91,10 +91,10 @@
ShowFunction.Light,ShowFunction.AC,ShowFunction.Curtain,
ShowFunction.FloorHeating,ShowFunction.Music,
ShowFunction.Electric,ShowFunction.Environmental,
- //ShowFunction.EnergyMonitoring,
- //ShowFunction.FreshAir,ShowFunction.DoorLock,
- //ShowFunction.Panel,ShowFunction.SecurityMonitoring,
- //ShowFunction.Sensor,ShowFunction.VideoIntercom
+ ShowFunction.EnergyMonitoring,
+ ShowFunction.FreshAir,ShowFunction.DoorLock,
+ ShowFunction.Panel,ShowFunction.SecurityMonitoring,
+ ShowFunction.Sensor,ShowFunction.VideoIntercom
});
instance.SaveResidenceData();
}
@@ -107,7 +107,7 @@
}
instance.residenceImage = "Classification/Room/Roombg.png";
//鍒濆鍖栦綇瀹呭姛鑳芥暟鎹�
- SpatialInfo.CurrentSpatial.InitRoomFunction();
+ SpatialInfo.CurrentSpatial.InitRoomListFunctions();
}
return instance;
@@ -122,17 +122,14 @@
ins_OidList = null;
HomeGateway = null;
//閲嶇疆缃戝叧鐘舵��
- DriverLayer.Control.Ins.GatewayOnline = false;
+ DriverLayer.Control.Ins.GatewayOnline_Cloud = false;
+ DriverLayer.Control.Ins.GatewayOnline_Local = false;
SpatialInfo.CurrentSpatial.Clear();
FunctionList.List.Clear();
-
+
///鍒囨崲浣忓畢娓呯┖鍓嶄綇瀹呯紦瀛樿嚜鍔ㄥ寲鍒楄〃锛�
HDL_ON.UI.UI2.Intelligence.Automation.Logic.LogicList.Clear();
- if (HDL_ON.DriverLayer.Control.Ins.IsRemote)
- {
- DriverLayer.Control.Ins.IsRemote = false;
- DAL.Mqtt.MqttClient.DisConnectRemote("閫�鍑虹櫥褰曪紝鎴栬�呭垏鎹綇瀹�");
- }
+ DAL.Mqtt.MqttClient.DisConnectRemote("閫�鍑虹櫥褰曪紝鎴栬�呭垏鎹綇瀹�");
}
/// <summary>
@@ -274,7 +271,6 @@
/// <returns></returns>
static byte[] ReadResidenceInfo()
{
- MainPage.Log("get file Instance ");
var fileName = "DB_ResidenceData";
FileStream fs = null;
try
@@ -302,7 +298,6 @@
}
finally
{
- MainPage.Log("get file ");
try
{
if (fs != null)
--
Gitblit v1.8.0