From d3189eaa6be7c70ed5ac783efe68f43211a90d27 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 20 七月 2023 08:58:56 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' of http://172.16.1.23:6688/r/~wxr/OnPro into Dev-Branch

---
 HDL_ON/DAL/Mqtt/MqttClient.cs |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/HDL_ON/DAL/Mqtt/MqttClient.cs b/HDL_ON/DAL/Mqtt/MqttClient.cs
index d5cd85e..bf5dd53 100644
--- a/HDL_ON/DAL/Mqtt/MqttClient.cs
+++ b/HDL_ON/DAL/Mqtt/MqttClient.cs
@@ -110,6 +110,7 @@
             {
                 MqttInfoConfig.Current.IfGetMqttInfoSuccess = false;
             }
+            Control.Ins.GatewayOnline_Cloud = Control.Ins.GatewayOnline_Local = false;
             await DisConnectRemoteMqttClient(s);
         }
 
@@ -159,7 +160,7 @@
             StartCloudMqtt();
         }
 
-        static bool isSubscribeSuccess;
+        public static bool isSubscribeSuccess;
         /// <summary>
         /// 璁㈤槄涓婚
         /// </summary>
@@ -261,8 +262,8 @@
                     #endregion
 
 
-                    Utlis.WriteLine("寮�濮嬭闃咃紒");
-                    var result = await RemoteMqttClient.SubscribeAsync(new MqttTopicFilter[] {
+                    Utlis.WriteLine("寮�濮嬭闃咃紒"); 
+                     var result = await RemoteMqttClient.SubscribeAsync(new MqttTopicFilter[] {
                         pirStatus,pirStudy,
                         appDeviceRefresh,appHomeRefresh,appRoomRefresh,residenceChange,
                         topicFilterPush2, topicAlinkStatus ,mqttkeyChange,
@@ -683,7 +684,7 @@
                 }
                 catch (Exception ex)
                 {
-                    Utlis.WriteLine($"error:" + ex.Message);
+                    Utlis.WriteLine($"mqtt杩炴帴寮傚父 error:" + ex.Message);
                     //mqtt杩炴帴寮傚父锛屾竻绌烘湰鍦癿qtt淇℃伅锛屽彲鑳介渶瑕侀噸鏂拌幏鍙栵細wxr
                     MqttInfoConfig.Current.Refresh();
                 }

--
Gitblit v1.8.0