~wxr/HDL_APP_Project.git

			@@ -189,38 +189,38 @@
			};
			var topicAlinkStatus = new MqttTopicFilter()
			{
			Topic = $"/user/{DB_ResidenceData.Instance.CurrentRegion.RegionID}/app/thing/property/send",
			Topic = $"/user/{DB_ResidenceData.Instance.CurrentRegion.id}/app/thing/property/send",
			QualityOfServiceLevel = MQTTnet.Protocol.MqttQualityOfServiceLevel.AtMostOnce
			};
			//App订阅红外宝 / 网关遥控器添加成功通知
			var pirStatus = new MqttTopicFilter()
			{
			Topic = $"/user/{DB_ResidenceData.Instance.CurrentRegion.RegionID}/app/thing/topo/found",
			Topic = $"/user/{DB_ResidenceData.Instance.CurrentRegion.id}/app/thing/topo/found",
			QualityOfServiceLevel = MQTTnet.Protocol.MqttQualityOfServiceLevel.AtMostOnce
			};
			//App订阅遥控器自学按键学习成功通知
			var pirStudy = new MqttTopicFilter()
			{
			Topic = $"/user/{DB_ResidenceData.Instance.CurrentRegion.RegionID}/app/thing/event/irCodeStudyDone/up",
			Topic = $"/user/{DB_ResidenceData.Instance.CurrentRegion.id}/app/thing/event/irCodeStudyDone/up",
			QualityOfServiceLevel = MQTTnet.Protocol.MqttQualityOfServiceLevel.AtMostOnce
			};
			#region 数据更新推送主题
			//appHomeRefresh：住宅数据刷新通知
			var appHomeRefresh = new MqttTopicFilter()
			{
			Topic = $"/user/{DB_ResidenceData.Instance.CurrentRegion.RegionID}/app/thing/event/appHomeRefresh/up",
			Topic = $"/user/{DB_ResidenceData.Instance.CurrentRegion.id}/app/thing/event/appHomeRefresh/up",
			QualityOfServiceLevel = MQTTnet.Protocol.MqttQualityOfServiceLevel.AtMostOnce
			};
			//appRoomRefresh：房间数据刷新通知
			var appRoomRefresh = new MqttTopicFilter()
			{
			Topic = $"/user/{DB_ResidenceData.Instance.CurrentRegion.RegionID}/app/thing/event/appRoomRefresh/up",
			Topic = $"/user/{DB_ResidenceData.Instance.CurrentRegion.id}/app/thing/event/appRoomRefresh/up",
			QualityOfServiceLevel = MQTTnet.Protocol.MqttQualityOfServiceLevel.AtMostOnce
			};
			//appDeviceRefresh：设备数据刷新通知
			var appDeviceRefresh = new MqttTopicFilter()
			{
			Topic = $"/user/{DB_ResidenceData.Instance.CurrentRegion.RegionID}/app/thing/event/appDeviceRefresh/up",
			Topic = $"/user/{DB_ResidenceData.Instance.CurrentRegion.id}/app/thing/event/appDeviceRefresh/up",
			QualityOfServiceLevel = MQTTnet.Protocol.MqttQualityOfServiceLevel.AtMostOnce
			};
			#endregion
			@@ -258,7 +258,7 @@
			{
			return;
			}
			if (DB_ResidenceData.Instance.CurrentRegion == null \|\| DB_ResidenceData.Instance.CurrentRegion.RegionID == null)
			if (DB_ResidenceData.Instance.CurrentRegion == null \|\| DB_ResidenceData.Instance.CurrentRegion.id == null)
			{
			return;
			}
			@@ -287,7 +287,7 @@
			try
			{
			var topic = e.ApplicationMessage.Topic;
			MainPage.Log($"收到mqtt主题:{topic}");
			//MainPage.Log($"收到mqtt主题:{topic}");
			//一端口主题处理
			if (DB_ResidenceData.Instance.GatewayType == 0 && !DB_ResidenceData.Instance.CheckWhetherGatewayIdIsNull())
			{
			@@ -326,14 +326,14 @@
			ReceiveNotifySqueezeAsync(mMes);
			}
			//App订阅红外宝/网关遥控器添加成功通知
			else if (topic == $"/user/{DB_ResidenceData.Instance.CurrentRegion.RegionID}/app/thing/topo/found")
			else if (topic == $"/user/{DB_ResidenceData.Instance.CurrentRegion.id}/app/thing/topo/found")
			{
			var bytes = Securitys.EncryptionService.AesDecryptPayload(e.ApplicationMessage.Payload, tuyaEncryptKey);
			var revString = Encoding.UTF8.GetString(bytes);
			HDL_ON.UI.UI2.PersonalCenter.PirDevice.Method.controldata = revString;
			}
			//App订阅遥控器自学按键学习成功通知
			else if (topic == $"/user/{DB_ResidenceData.Instance.CurrentRegion.RegionID}/app/thing/event/irCodeStudyDone/up")
			else if (topic == $"/user/{DB_ResidenceData.Instance.CurrentRegion.id}/app/thing/event/irCodeStudyDone/up")
			{
			var bytes = Securitys.EncryptionService.AesDecryptPayload(e.ApplicationMessage.Payload, tuyaEncryptKey);
			var revString = Encoding.UTF8.GetString(bytes);
			@@ -341,13 +341,13 @@
			}
			#region 数据更新推送主题
			//appHomeRefresh：住宅数据刷新通知
			else if (topic == $"/user/{DB_ResidenceData.Instance.CurrentRegion.RegionID}/app/thing/event/appHomeRefresh/up")
			else if (topic == $"/user/{DB_ResidenceData.Instance.CurrentRegion.id}/app/thing/event/appHomeRefresh/up")
			{
			MainPage.Log("住宅数据刷新通知");
			new HttpServerRequest().GetHomePager();
			}
			//appRoomRefresh：房间数据刷新通知
			else if (topic == $"/user/{DB_ResidenceData.Instance.CurrentRegion.RegionID}/app/thing/event/appRoomRefresh/up")
			else if (topic == $"/user/{DB_ResidenceData.Instance.CurrentRegion.id}/app/thing/event/appRoomRefresh/up")
			{
			MainPage.Log("房间数据刷新通知");
			var roomResult = new HttpServerRequest().GetRoomList();
			@@ -369,7 +369,7 @@
			}
			}
			//appDeviceRefresh：设备数据刷新通知
			else if (topic == $"/user/{DB_ResidenceData.Instance.CurrentRegion.RegionID}/app/thing/event/appDeviceRefresh/up")
			else if (topic == $"/user/{DB_ResidenceData.Instance.CurrentRegion.id}/app/thing/event/appDeviceRefresh/up")
			{
			MainPage.Log("设备数据刷新通知");
			var deviceResult = new HttpServerRequest().GetDeviceList();
			@@ -417,7 +417,7 @@
			}
			#endregion
			//A网关设备状态-包含涂鸦设备
			else if (topic == $"/user/{DB_ResidenceData.Instance.CurrentRegion.RegionID}/app/thing/property/send")
			else if (topic == $"/user/{DB_ResidenceData.Instance.CurrentRegion.id}/app/thing/property/send")
			{
			var bytes = Securitys.EncryptionService.AesDecryptPayload(e.ApplicationMessage.Payload, tuyaEncryptKey);
			var revString = Encoding.UTF8.GetString(bytes);
			@@ -585,9 +585,9 @@
			mqttEncryptKey = MqttInfoConfig.Current.HomeGatewayInfo.aesKey;
			//解密密钥规则：已现有的住宅ID为基准,从右边一一获取值,最后如果不够16位,则往右补零
			string aesKey = string.Empty;
			for (int i = DB_ResidenceData.Instance.CurrentRegion.RegionID.Length - 1; i >= 0; i--)
			for (int i = DB_ResidenceData.Instance.CurrentRegion.id.Length - 1; i >= 0; i--)
			{
			aesKey += DB_ResidenceData.Instance.CurrentRegion.RegionID[i].ToString();
			aesKey += DB_ResidenceData.Instance.CurrentRegion.id[i].ToString();
			if (aesKey.Length == 16) { break; }
			}
			aesKey = aesKey.PadRight(16, '0');
			@@ -685,6 +685,7 @@
			case "13602944661":
			case "18778381374":
			case "18316672920":
			case "15971583093":
			return;
			}