From 98d002e55304e5c8ff13b7cd195920975bef69f5 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 23 二月 2021 17:16:57 +0800
Subject: [PATCH] Merge branch 'CJL' into temp-wxr
---
HDL_ON/Entity/DB_ResidenceData.cs | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index 5f624a1..7efc81b 100644
--- a/HDL_ON/Entity/DB_ResidenceData.cs
+++ b/HDL_ON/Entity/DB_ResidenceData.cs
@@ -94,7 +94,7 @@
//ShowFunction.EnergyMonitoring,
//ShowFunction.FreshAir,ShowFunction.DoorLock,
//ShowFunction.Panel,ShowFunction.SecurityMonitoring,
- ShowFunction.Sensor//,ShowFunction.VideoIntercom
+ 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