Merge branch 'wjc'

JLChen

2021-03-04 ac3c6b64df51443519d3a27fa8cf0d25dd6ff6d7

 Crabtree/SmartHome/UI/SimpleControl/MqttCommon.cs

@@ -1,7 +1,6 @@
/*
更新了EMQ连接方式
*/
using System.Collections.Generic;
using System;
using MQTTnet.Client;
using System.Threading.Tasks;
@@ -10,7 +9,6 @@
using MQTTnet;
using System.Text;
using System.Security.Cryptography;
using System.IO;

namespace SmartHome
{
@@ -68,7 +66,7 @@
        /// <summary>
        /// 断开远程Mqtt的链接
        /// </summary>
        static async System.Threading.Tasks.Task DisConnectRemoteMqttClient (string s = "")
     public   static async System.Threading.Tasks.Task DisConnectRemoteMqttClient (string s = "")
        {
            try {
                if (remoteIsConnected) {