From 6bf515816c3c971f57722c5195208f65446ef335 Mon Sep 17 00:00:00 2001
From: tzy <274116637@qq.com>
Date: 星期一, 29 三月 2021 17:49:15 +0800
Subject: [PATCH] 完成新风功能
---
HDL_ON/Entity/DB_ResidenceData.cs | 32 ++++++++++++++++++--------------
1 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index 1478f42..8cbd2a2 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;
@@ -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;
@@ -121,12 +121,15 @@
instance = null;
ins_OidList = null;
HomeGateway = null;
+ //閲嶇疆缃戝叧鐘舵��
+ DriverLayer.Control.Ins.GatewayOnline_Cloud = false;
+ DriverLayer.Control.Ins.GatewayOnline_Local = false;
SpatialInfo.CurrentSpatial.Clear();
FunctionList.List.Clear();
- if (MainPage.IsRemote)
- {
- DAL.Mqtt.MqttClient.DisConnectRemote("閫�鍑虹櫥褰曪紝鎴栬�呭垏鎹綇瀹�");
- }
+
+ ///鍒囨崲浣忓畢娓呯┖鍓嶄綇瀹呯紦瀛樿嚜鍔ㄥ寲鍒楄〃锛�
+ HDL_ON.UI.UI2.Intelligence.Automation.Logic.LogicList.Clear();
+ DAL.Mqtt.MqttClient.DisConnectRemote("閫�鍑虹櫥褰曪紝鎴栬�呭垏鎹綇瀹�");
}
/// <summary>
@@ -157,7 +160,10 @@
}
}
}
-
+ /// <summary>
+ /// 璁板綍绐楀笜鍏ㄥ紑鍏ㄥ叧鐘舵��
+ /// </summary>
+ public bool GlobalCurtainStatus = false;
/// <summary>
/// 妫�娴嬩綇瀹呮槸鍚︾粦瀹氫簡缃戝叧
/// gatewayId 鍒ょ┖
@@ -265,7 +271,6 @@
/// <returns></returns>
static byte[] ReadResidenceInfo()
{
- MainPage.Log("get file Instance ");
var fileName = "DB_ResidenceData";
FileStream fs = null;
try
@@ -293,7 +298,6 @@
}
finally
{
- MainPage.Log("get file ");
try
{
if (fs != null)
@@ -415,4 +419,4 @@
#endregion
}
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0