From 6828e6dffa299b6249af99ce9c1d3992963f7c18 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期四, 28 一月 2021 17:41:23 +0800
Subject: [PATCH] 20210128:第三方品牌界面
---
HDL_ON/DAL/Mqtt/MqttClient.cs | 38 ++++++++++++++++++++++++--------------
1 files changed, 24 insertions(+), 14 deletions(-)
diff --git a/HDL_ON/DAL/Mqtt/MqttClient.cs b/HDL_ON/DAL/Mqtt/MqttClient.cs
index ec55e61..2a95958 100644
--- a/HDL_ON/DAL/Mqtt/MqttClient.cs
+++ b/HDL_ON/DAL/Mqtt/MqttClient.cs
@@ -132,7 +132,7 @@
static void InitMqtt()
{
new System.Threading.Thread(async () => {
- while (hadGateway)
+ while (true)
{
try
{
@@ -160,6 +160,10 @@
}
static bool isSubscribeSuccess;
+ /// <summary>
+ /// 璁㈤槄涓婚
+ /// </summary>
+ /// <returns></returns>
static async Task SubscribeTopics()
{
if (remoteIsConnected && !isSubscribeSuccess)
@@ -186,16 +190,17 @@
Topic = $"/user/{MqttInfoConfig.Current.HomeGatewayInfo.gatewayId}/app/thing/property/send",
QualityOfServiceLevel = MQTTnet.Protocol.MqttQualityOfServiceLevel.AtMostOnce
};
- var topicBusStatus = new MqttTopicFilter()
- {
- Topic = $"/BusGateWayToClient/MacMask/Common",
- QualityOfServiceLevel = MQTTnet.Protocol.MqttQualityOfServiceLevel.AtMostOnce
- };
+ //var topicBusStatus = new MqttTopicFilter()
+ //{
+ // Topic = $"/BusGateWayToClient/{}/Common",
+ // QualityOfServiceLevel = MQTTnet.Protocol.MqttQualityOfServiceLevel.AtMostOnce
+ //};
Utlis.WriteLine("寮�濮嬭闃咃紒");
- var result = await RemoteMqttClient.SubscribeAsync(new MqttTopicFilter[] { topicFilterBusGateWayToClient, topicFilterPush2, topicAlinkStatus, topicBusStatus });
+ var result = await RemoteMqttClient.SubscribeAsync(new MqttTopicFilter[] { topicFilterBusGateWayToClient, topicFilterPush2, topicAlinkStatus });
if (result.Items[0].ResultCode == MQTTnet.Client.Subscribing.MqttClientSubscribeResultCode.GrantedQoS0)
{
+ Control.Ins.GatewayOnline = true;
isSubscribeSuccess = true;
Utlis.WriteLine("璁㈤槄鎴愬姛锛�");
@@ -269,6 +274,7 @@
}
else if (topic == $"/BusGateWayToClient/{MqttInfoConfig.Current.HomeGatewayInfo.gatewayId}/Common/CheckGateway")
{
+
var ss = Encoding.UTF8.GetString(e.ApplicationMessage.Payload);
ReceiveCheckGateway(ss);
}
@@ -327,7 +333,6 @@
{
RemoteMqttClient.UseConnectedHandler(async (e) =>
{
- Control.Ins.GatewayOnline = true;
IfNeedReadAllDeviceStatus = true;
Utlis.WriteLine($"============>Mqtt杩滅▼杩炴帴鎴愬姛");
SendPushSignOut();
@@ -540,9 +545,6 @@
/// </summary>
static void ReceiveNotifySqueezeAsync(string mMes)
{
-#if DEBUG
- return;
-#endif
if (mMes == PushSignStr) return;//鏄嚜宸辩殑鐧诲綍鎺ㄩ�佷笉澶勭悊
//鏂紑杩滅▼杩炴帴
@@ -605,8 +607,6 @@
/// <returns></returns>
public static async Task MqttRemoteSend(byte[] message, int optionType = 0)
{
- //return;
-
try
{
string topicName;
@@ -661,7 +661,17 @@
if (Control.Ins.IsRemote)
{
if (!Control.Ins.GatewayOnline)
- Control.Ins.GatewayOnline = true;
+ {
+ try
+ {
+ if (DB_ResidenceData.Instance.HomeGateway != null)
+ {
+ DB_ResidenceData.Instance.HomeGateway.gatewayStatus = true;
+ }
+ Control.Ins.GatewayOnline = true;
+ }
+ catch { }
+ }
}
}
--
Gitblit v1.8.0