~wxr/HDL_APP_Project.git

			@@ -204,11 +204,18 @@
			Topic = $"/user/{DB_ResidenceData.Instance.CurrentRegion.id}/app/thing/event/irCodeStudyDone/up",
			QualityOfServiceLevel = MQTTnet.Protocol.MqttQualityOfServiceLevel.AtMostOnce
			};

			#region 数据更新推送主题
			//appHomeRefresh：住宅数据刷新通知
			//appHomeRefresh：住宅数据刷新通知--杨涛
			var appHomeRefresh = new MqttTopicFilter()
			{
			Topic = $"/user/{DB_ResidenceData.Instance.CurrentRegion.id}/app/thing/event/appHomeRefresh/up",
			QualityOfServiceLevel = MQTTnet.Protocol.MqttQualityOfServiceLevel.AtMostOnce
			};
			//住宅消息变更推送--豆豆
			var residenceChange = new MqttTopicFilter()
			{
			Topic = $"/user/{DB_ResidenceData.Instance.CurrentRegion.id}/app/thing/event/appDeviceRefresh/up",
			QualityOfServiceLevel = MQTTnet.Protocol.MqttQualityOfServiceLevel.AtMostOnce
			};
			//appRoomRefresh：房间数据刷新通知
			@@ -220,17 +227,24 @@
			//appDeviceRefresh：设备数据刷新通知
			var appDeviceRefresh = new MqttTopicFilter()
			{
			Topic = $"/user/{DB_ResidenceData.Instance.CurrentRegion.id}/app/thing/event/appDeviceRefresh/up",
			Topic = $"/user/{MqttInfoConfig.Current.HomeGatewayInfo.gatewayId}/app/thing/event/appHomeRefresh/up",
			QualityOfServiceLevel = MQTTnet.Protocol.MqttQualityOfServiceLevel.AtMostOnce
			};
			//一端口密钥更新通知
			var mqttkeyChange = new MqttTopicFilter()
			{
			Topic = $"/user/{MqttInfoConfig.Current.HomeGatewayInfo.gatewayId}/custom/mqtt/secret/change",
			QualityOfServiceLevel = MQTTnet.Protocol.MqttQualityOfServiceLevel.AtMostOnce
			};

			#endregion


			Utlis.WriteLine("开始订阅！");
			var result = await RemoteMqttClient.SubscribeAsync(new MqttTopicFilter[] {
			pirStatus,pirStudy,
			appDeviceRefresh,appHomeRefresh,appRoomRefresh,
			topicFilterPush2, topicAlinkStatus });
			appDeviceRefresh,appHomeRefresh,appRoomRefresh,residenceChange,
			topicFilterPush2, topicAlinkStatus ,mqttkeyChange});
			if (result.Items[0].ResultCode == MQTTnet.Client.Subscribing.MqttClientSubscribeResultCode.GrantedQoS0)
			{
			isSubscribeSuccess = true;
			@@ -314,10 +328,7 @@
			}

			//一些特殊的主题处理(为了执行速度,尽可能的别加耗时的操作 true:执行了特殊处理 false:没有执行特殊处理)
			if (Stan.HdlCloudReceiveLogic.Current.CloudOverallMsgReceiveEx(topic, e.ApplicationMessage.Payload, mqttEncryptKey, tuyaEncryptKey) == true)
			{
			return;
			}
			Stan.HdlCloudReceiveLogic.Current.CloudOverallMsgReceiveEx(topic, e.ApplicationMessage.Payload, mqttEncryptKey, tuyaEncryptKey);

			if (topic == $"/BusGateWayToClient/{UserInfo.Current.ID}" + PushNotifySqueeze)
			{
			@@ -341,7 +352,8 @@
			}
			#region 数据更新推送主题
			//appHomeRefresh：住宅数据刷新通知
			else if (topic == $"/user/{DB_ResidenceData.Instance.CurrentRegion.id}/app/thing/event/appHomeRefresh/up")
			else if (topic == $"/user/{DB_ResidenceData.Instance.CurrentRegion.id}/app/thing/event/appHomeRefresh/up"
			\|\| topic == $"/user/{DB_ResidenceData.Instance.CurrentRegion.id}/app/thing/event/appDeviceRefresh/up")
			{
			MainPage.Log("住宅数据刷新通知");
			new HttpServerRequest().GetHomePager();
			@@ -415,6 +427,17 @@
			MainPage.Log($"读取云端设备数据失败:Code:{deviceResult.Code}; Msg:{deviceResult.message}");
			}
			}
			//网关密钥变化
			else if (topic == $"/user/{DB_ResidenceData.Instance.CurrentRegion.id}/custom/mqtt/secret/change")
			{
			var pm = new HttpServerRequest();
			pm.GetHomeGatewayList();
			MainPage.Log($"网关密钥变更");
			MainPage.Log($"旧密钥：{mqttEncryptKey}");
			mqttEncryptKey = MqttInfoConfig.Current.HomeGatewayInfo.aesKey;
			MainPage.Log($"新密钥：{mqttEncryptKey}");
			}

			#endregion
			//A网关设备状态-包含涂鸦设备
			else if (topic == $"/user/{DB_ResidenceData.Instance.CurrentRegion.id}/app/thing/property/send")
			@@ -469,6 +492,25 @@
			#endregion

			//(4)===========开始连接过程==========

			////一端口每次都要刷新密钥
			//if (DB_ResidenceData.Instance.HomeGateway != null && DB_ResidenceData.Instance.HomeGateway.gatewayType == "BUSUDPGATEWAY") {
			// var pm = new HttpServerRequest();
			// var result = pm.GetHomeGatewayList();
			// if(result == StateCode.SUCCESS)
			// {
			// MainPage.Log($"刷新一端口密钥");
			// MainPage.Log($"旧密钥：{mqttEncryptKey}");
			// mqttEncryptKey = MqttInfoConfig.Current.HomeGatewayInfo.aesKey;
			// MainPage.Log($"新密钥：{mqttEncryptKey}");
			// }else
			// {
			// return;
			// }
			//}



			//之前已经获取参数成功过
			if (MqttInfoConfig.Current.IfGetMqttInfoSuccess)
			{
			@@ -675,7 +717,7 @@
			{
			if (mMes == PushSignStr) return;//是自己的登录推送不处理//或者当前不是远程链接状态
			//测试账号，不挤下线
			switch (UserInfo.Current.AccountString)
			switch (UserInfo.Current.userMobileInfo)
			{
			case "13415629083":
			case "18316120654":
			@@ -690,6 +732,8 @@
			case "18778381374":
			case "18316672920":
			case "15971583093":
			case "15626203746":
			case "551775569@qq.com":
			return;
			}

			@@ -821,9 +865,12 @@
			/// <returns></returns>
			static async Task GetMqttInfoAndMQTTConnectAsync()
			{
			var mqttInfoRequestResult_Obj = new Server.HttpServerRequest().GetMqttRemoteInfo(GetRandomKey());
			var mqttInfoRequestResult_Obj = new HttpServerRequest().GetMqttRemoteInfo(GetRandomKey());
			if (mqttInfoRequestResult_Obj != null)
			{
			MainPage.Log($"获取mqtt info 成功 /r/n clientId:{mqttInfoRequestResult_Obj.clientId}/r/n passWord:{mqttInfoRequestResult_Obj.passWord} /r/n url:{mqttInfoRequestResult_Obj.url}/r/n userName:{mqttInfoRequestResult_Obj.userName}");


			MqttInfoConfig.Current.mMqttInfo = mqttInfoRequestResult_Obj;
			await MQTTConnectAsync();
			//1.判断是否绑定了网关，获取网关远程连接的加密KEY