From 4a9318077bd095fbc7c57c593e5ca8185603dac4 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期六, 19 十二月 2020 18:35:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into NewFilePath
---
HDL_ON/DAL/DriverLayer/Control.cs | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/DAL/DriverLayer/Control.cs b/HDL_ON/DAL/DriverLayer/Control.cs
old mode 100755
new mode 100644
index 1149ee5..13b5269
--- a/HDL_ON/DAL/DriverLayer/Control.cs
+++ b/HDL_ON/DAL/DriverLayer/Control.cs
@@ -181,6 +181,9 @@
/// </summary>
public void SearchLoaclGateway()
{
+ MainPage.Log($"鎼滅储鏈湴缃戝叧鍒楄〃锛岀綉鍏崇被鍨�:{DB_ResidenceData.Instance.GatewayType}");
+ if (MainPage.InternetStatus == 0)
+ return;
OpenUdp(DB_ResidenceData.Instance.GatewayType == 0 ? 6000 : 8585);
new System.Threading.Thread(() =>
{
@@ -198,13 +201,13 @@
}
System.Threading.Thread.Sleep(500);
}
+ if (!GatewayOnline)//缃戝叧涓嶅湪绾跨殑鏃跺�欐墠鍙皾璇曡繙绋嬭繛鎺�
+ {
+ Ins.IsRemote = true;
+ DAL.Mqtt.MqttClient.InitState();
+ }
})
{ IsBackground = true }.Start();
- if (!GatewayOnline)//缃戝叧涓嶅湪绾跨殑鏃跺�欐墠鍙皾璇曡繙绋嬭繛鎺�
- {
- Ins.IsRemote = true;
- DAL.Mqtt.MqttClient.InitState();
- }
}
/// <summary>
--
Gitblit v1.8.0