From d41f1d4a478c1afcc43f3a5abb0ba76e376bc7c1 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期二, 09 三月 2021 15:23:25 +0800
Subject: [PATCH] 2
---
HDL_ON/Entity/DB_ResidenceData.cs | 19 ++++++++-----------
1 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index 5f624a1..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();
}
@@ -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>
--
Gitblit v1.8.0