~wxr/CrabtreeOn.git

			@@ -65,6 +65,8 @@
			System.Threading.Thread.Sleep (200);
			if (!CommonPage.IsRemote) continue;

			if (Control.IsEnterBackground) continue;

			await StartCloudMqtt ();
			await CheckingSubscribeTopics ();
			} catch { }
			@@ -98,6 +100,7 @@
			try {
			if (!isSubscribeTopicSuccess) {


			var topicFilterCommon = new TopicFilter () {
			Topic = $"/BusGateWayToClient/{CurRemoteMACInfo.macMark}/Common/#",
			QualityOfServiceLevel = MQTTnet.Protocol.MqttQualityOfServiceLevel.ExactlyOnce
			@@ -121,12 +124,30 @@
			QualityOfServiceLevel = MQTTnet.Protocol.MqttQualityOfServiceLevel.ExactlyOnce
			};



			var topicFilters = new TopicFilter [] { topicFilterCommon, topicFilterGateWayInfoChange, topicFilterNotifySqueeze, topicFilterNotifyGateWayOffline };
			var result = await RemoteMqttClient.SubscribeAsync (topicFilters);
			if (result.Items [0].ResultCode == MQTTnet.Client.Subscribing.MqttClientSubscribeResultCode.GrantedQoS2) {
			isSubscribeTopicSuccess = true;
			}

			////2020-06-22 通用主题
			//var topicFilterMacMark = new TopicFilter () {
			// Topic = $"/BusGateWayToClient/{CurRemoteMACInfo.macMark}/#",
			// QualityOfServiceLevel = MQTTnet.Protocol.MqttQualityOfServiceLevel.ExactlyOnce
			//};

			////挤下线主题
			//var topicFilterNotifySqueeze = new TopicFilter () {
			// Topic = $"/BusGateWayToClient/{mMqttInfo.connEmqClientId}/Push/NotifySqueeze",
			// QualityOfServiceLevel = MQTTnet.Protocol.MqttQualityOfServiceLevel.ExactlyOnce
			//};

			//var topicFilters = new TopicFilter [] { topicFilterMacMark, topicFilterNotifySqueeze };
			//var result = await RemoteMqttClient.SubscribeAsync (topicFilters);
			//if (result.Items [0].ResultCode == MQTTnet.Client.Subscribing.MqttClientSubscribeResultCode.GrantedQoS2) {
			// isSubscribeTopicSuccess = true;
			//}
			}
			} catch (Exception ex) {

			@@ -190,6 +211,9 @@
			//表示后面将进行连接

			#region 初始化远程Mqtt
			//2020-06-22 增加
			RemoteMqttClient = new MqttFactory ().CreateMqttClient ();

			//(3)当[连接云端的Mqtt成功后]或者[以及后面App通过云端Mqtt转发数据给网关成功后],处理接收到云端数据包响应时在mqttServerClient_ApplicationMessageReceived这个方法处理
			if (RemoteMqttClient.ApplicationMessageReceivedHandler == null) {
			RemoteMqttClient.UseApplicationMessageReceivedHandler (async (e) => {
			@@ -289,7 +313,7 @@
			} catch (Exception ex) {
			//Utlis.WriteLine ($"============>Mqtt 远程连接通讯连接出异常:{ex.Message}");

			MainPage.LoadingSetText ("Connect error, trying to reconnect.");
			MainPage.LoadingTipShow ("Connect error, trying to reconnect.");

			if (IfDEBUG) {
			MainPage.ShowAlertOnMainThread ("error: " + ex.Message);
			@@ -299,7 +323,9 @@
			//最终要释放连接状态
			remoteMqttIsConnecting = false;

			MainPage.LoadingHide ();
			MainPage.LoadingTipHide ();

			//MainPage.LoadingHide ();
			}
			});
			}
			@@ -340,15 +366,15 @@
			} else {
			//Utlis.WriteLine ("============>Mqtt CurRemoteMACInfo null");

			MainPage.LoadingSetText ("Please wait, failed to get gateway parameters.");
			MainPage.LoadingTipShow ("Please wait, failed to get gateway parameters.");
			}
			}

			} else {
			//Utlis.WriteLine ("============>Mqtt mqttInfoRequestResult_Obj null");

			MainPage.LoadingSetText ("Please wait, failed to get user parameters.");
			//MainPage.LoadingSetText ("Please wait, failed to get parameters.");
			MainPage.LoadingTipShow ("Please wait, failed to get user parameters.");
			//MainPage.LoadingTipShow ("Please wait, failed to get parameters.");
			}
			} catch {

			@@ -356,7 +382,7 @@
			} else {
			//Utlis.WriteLine ("============>Mqtt GetInfo 失败");
			MainPage.AddTip ("Please wait, failed to get parameters.");
			//MainPage.LoadingSetText ("Please wait, failed to get parameters.");
			//MainPage.LoadingTipShow ("Please wait, failed to get parameters.");
			}

			}
			@@ -383,7 +409,7 @@
			//--第二步：获取当前住分享宅网关信息并连接MQTT
			await GetSingleHomeGatewayPaggerAndMQTTConnectAsync ();
			} else {
			MainPage.LoadingSetText ("Please wait, failed to get user parameters.");
			MainPage.LoadingTipShow ("Please wait, failed to get user parameters.");
			}
			}
			}
			@@ -399,7 +425,7 @@
			//获取参数成功，开始连接...
			//MainPage.AddTip ("Successfully obtained parameters, starting to connect...");

			MainPage.LoadingStart ("Please wait, connecting remotely...");
			MainPage.LoadingTipShow ("Please wait, connecting remotely...");

			//try {
			// var url = mMqttInfo.connEmqDomainPort;
			@@ -454,7 +480,7 @@
			remoteIsConnected = true;
			IsDisConnectingWithSendCatch = false;

			MainPage.LoadingSetText ("Remote connection succeeded.");
			MainPage.LoadingTipShow ("Remote connection succeeded.");

			//MainPage.AddTip ("Connection succeeded!");
			//await MqttRemoteSend (new byte [] { 0 }, 1);
			@@ -466,7 +492,7 @@
			//options1 异常提示
			//Console.WriteLine ("Connect error: " + ex.Message);

			MainPage.LoadingSetText ("Connect error.");
			MainPage.LoadingTipShow ("Connect error.");

			if (IfDEBUG) {
			MainPage.ShowAlertOnMainThread ("Connect error: " + ex.Message);
			@@ -492,7 +518,7 @@
			bNeedStartTip = false;
			if (CommonPage.IsRemote) {
			//MainPage.AddTip ("Getting remote connection parameters...");
			MainPage.LoadingStart ("Please wait, getting connection parameters...");
			MainPage.LoadingTipShow ("Please wait, getting connection parameters...");
			}
			}
			}
			@@ -591,7 +617,7 @@
			CurRemoteMACInfo.aesKey = mGatewayRes.AesKey;
			mqttEncryptKey = CurRemoteMACInfo.aesKey;
			} else {
			MainPage.LoadingSetText ("Please wait, failed to get gateway parameters.");
			MainPage.LoadingTipShow ("Please wait, failed to get gateway parameters.");
			}

			}