From 35c4bc03ee8da50317cd3f33e9f52f0a4259affd Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 23 十二月 2020 15:53:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/WJC' into NewFilePath
---
HDL_ON/DAL/DriverLayer/Control.cs | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/DAL/DriverLayer/Control.cs b/HDL_ON/DAL/DriverLayer/Control.cs
index 8e434c9..8546d1d 100644
--- a/HDL_ON/DAL/DriverLayer/Control.cs
+++ b/HDL_ON/DAL/DriverLayer/Control.cs
@@ -225,8 +225,6 @@
//鏈湴鎼滅储涓嶅埌缃戝叧
if (!Ins.IsRemote)
{
- //杩炴帴mqtt鍓嶏紝鍏堟柇寮�--2020-12-21
- DAL.Mqtt.MqttClient.DisConnectRemote();
Ins.IsRemote = true;
DAL.Mqtt.MqttClient.InitState();
}
@@ -243,7 +241,11 @@
{
if (Ins.IsRemote || DB_ResidenceData.Instance.GatewayType == 1)
{
- ControlAProtocolScene(scene);
+ new System.Threading.Thread(() =>
+ {
+ ControlAProtocolScene(scene);
+ })
+ { IsBackground = true }.Start();
}
else
{
@@ -264,7 +266,7 @@
/// <returns></returns>
public void SendWriteCommand(Function function, Dictionary<string, string> commandDictionary)
{
- function.usageCount++;
+ function.controlCounter++;
function.refreshTime = DateTime.Now;
//濡傛灉鏄帶鍒惰皟鍏夌殑寮�鏃讹紝浜害鍊间笉鑳戒负0
--
Gitblit v1.8.0