~wxr/HDL_APP_Project.git

			@@ -21,7 +21,7 @@
			/// </summary>
			static string mqttEncryptKey = "";
			//static string checkGatewayTopicBase64 = "";

			static bool hadGateway = true;
			/// <summary>
			/// 挤下线主题
			/// </summary>
			@@ -132,7 +132,7 @@
			static void InitMqtt()
			{
			new System.Threading.Thread(async () => {
			while (true)
			while (hadGateway)
			{
			try
			{
			@@ -181,7 +181,7 @@

			var topicAlinkStatus = new MqttTopicFilter()
			{
			Topic = $"/user/{MqttInfoConfig.Current.HomeGatewayInfo.gatewayId}/app/thing/property/#",
			Topic = $"/user/{MqttInfoConfig.Current.HomeGatewayInfo.gatewayId}/app/thing/property/send",
			QualityOfServiceLevel = MQTTnet.Protocol.MqttQualityOfServiceLevel.AtMostOnce
			};

			@@ -210,8 +210,7 @@
			/// </summary>
			public static async Task StartCloudMqtt()
			{

			if (OnAppConfig.Instance.internetStatus == 0)
			if (MainPage.InternetStatus == 0)
			{
			return;
			}
			@@ -233,7 +232,7 @@
			try
			{
			#region 初始化远程Mqtt

			remoteMqttIsConnecting = true;
			RemoteMqttClient = new MqttFactory().CreateMqttClient();


			@@ -269,7 +268,10 @@
			else
			{
			SetGatewayOnlineResetCheck();
			if (Entity.DB_ResidenceData.residenceData.GatewayType == 0)
			var bytes = Securitys.EncryptionService.AesDecryptPayload(e.ApplicationMessage.Payload, DB_ResidenceData.Instance.HomeGateway.aesKey);

			//bus数据解析
			if (DB_ResidenceData.Instance.GatewayType == 0)
			{
			var packet = new Packet();

			@@ -286,161 +288,8 @@
			else
			{
			//A协议数据处理
			var revString = System.Text.Encoding.UTF8.GetString(e.ApplicationMessage.Payload);
			var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<GatewayAlinkControlObj>(revString);
			if (temp != null)
			{
			var allLocalFuntion = FunctionList.List.GetAllDeviceFunctionList();
			foreach (var updateTemp in temp.objects)
			{
			bool hadChange = false;//状态有变化再更新界面
			var updataObj = allLocalFuntion.Find((obj) => obj.sid == updateTemp.sid);
			if (updataObj != null)
			{
			foreach (var attr in updateTemp.status)
			{
			foreach (var locatAttr in updataObj.attributes)
			{
			if (attr.key == locatAttr.key)
			{
			if (locatAttr.curValue.ToString() == attr.value)
			{
			continue;
			}
			locatAttr.curValue = attr.value;
			hadChange = true;
			}
			}
			}
			if(!hadChange)//状态有变化再更新界面
			{
			continue;
			}
			//更新界面状态
			switch (updataObj.spk)
			{
			case SPK.LightSwitch:
			RelayPage.UpdataState(updataObj as Light);
			break;
			case SPK.LightDimming:
			var dimming = updataObj as Light;
			dimming.lastState = Language.StringByID(StringId.Brightness) + " : " + dimming.brightness + "%";
			DimmerPage.UpdataStates(dimming);
			break;
			case SPK.ElectricFan:
			var fan = updataObj as Fan;
			fan.lastState = Language.StringByID(StringId.Level) + " : " + fan.openLevel;
			FanPage.UpdataState(fan);
			break;
			case SPK.LightRGB:
			var rgb = updataObj as Light;
			rgb.lastState = Language.StringByID(StringId.Brightness) + " : " + rgb.brightness + "%";
			RGBPage.UpdataStates(rgb);
			break;
			case SPK.LightRGBW:
			case SPK.LightCCT:
			break;
			case SPK.CurtainSwitch:
			var curtain = updataObj as Curtain;
			curtain.lastState = curtain.trait_on_off.curValue.ToString() == "on" ? Language.StringByID(StringId.Open) : Language.StringByID(StringId.Close);
			CurtainModulePage.UpdataState(curtain);
			break;
			case SPK.CurtainTrietex:
			var trietex = updataObj as Curtain;
			trietex.lastState = Language.StringByID(StringId.Open) + trietex.percent + "%";
			MotorCurtainPage.UpdataState(trietex);
			break;
			case SPK.CurtainRoller:
			var roller = updataObj as Curtain;
			roller.lastState = Language.StringByID(StringId.Open) + roller.percent + "%";
			RollingShutterPage.UpdataState(roller);
			break;
			case SPK.CurtainShades:
			break;
			case SPK.AcStandard:
			var ac = updataObj as AC;
			ac.lastState = "";
			switch (ac.trait_mode.curValue.ToString())
			{
			case "cool":
			ac.lastState = Language.StringByID(StringId.Cool);
			break;
			case "heat":
			ac.lastState = Language.StringByID(StringId.Heat);
			break;
			case "dry":
			ac.lastState = Language.StringByID(StringId.Dry);
			break;
			case "auto":
			ac.lastState = Language.StringByID(StringId.Auto);
			break;
			case "fan":
			ac.lastState = Language.StringByID(StringId.AirSupply);
			break;
			}
			switch (ac.trait_fan.curValue.ToString())
			{
			case "high":
			ac.lastState += " " + Language.StringByID(StringId.HighWindSpeed);
			break;
			case "medium":
			ac.lastState += " " + Language.StringByID(StringId.MiddleWindSpeed);
			break;
			case "low":
			ac.lastState += " " + Language.StringByID(StringId.LowWindSpeed);
			break;
			case "auto":
			ac.lastState += " " + Language.StringByID(StringId.Auto);
			break;
			}
			ac.lastState += " " + ac.trait_temp.curValue + ac.tempUnitString;
			ACPage.UpdataStates(ac);
			break;
			case SPK.FloorHeatStandard:
			var fh = updataObj as FloorHeating;
			switch (fh.trait_mode.curValue)
			{
			case "normal":
			fh.lastState = Language.StringByID(StringId.Normal);
			break;
			case "day":
			fh.lastState = Language.StringByID(StringId.Day);
			break;
			case "night":
			fh.lastState = Language.StringByID(StringId.Night);
			break;
			case "timer":
			fh.lastState = Language.StringByID(StringId.Auto);
			break;
			case "away":
			fh.lastState = Language.StringByID(StringId.Away);
			break;
			}
			fh.lastState += " " + fh.trait_temp.curValue + fh.tempUnitString;
			FloorHeatingPage.UpdataStates(fh);
			break;
			case SPK.SensorPm25:
			case SPK.SensorCO2:
			case SPK.SensorTVOC:
			case SPK.SensorTemperature:
			case SPK.SensorHumidity:
			var sensor = updataObj as Sensor;
			EnvironmentalSciencePage.LoadEvent_UpdataStatus(sensor);
			break;
			case SPK.ElectricSocket:
			break;
			case SPK.ElectricTV:
			break;
			default:
			break;
			}
			HomePage.UpdataFunctionStates(updataObj);
			RoomPage.UpdataStates(updataObj);
			FunctionPage.UpdataStates(updataObj);
			ClassificationPage.UpdataInfo(updataObj);
			}
			}
			}
			var revString = Encoding.UTF8.GetString(bytes);
			Control.Ins.UpdataFunctionStatus(revString,null);
			}
			}
			}
			@@ -461,10 +310,27 @@
			if (RemoteMqttClient.ConnectedHandler == null)
			{
			RemoteMqttClient.UseConnectedHandler(async (e) => {
			if (DB_ResidenceData.Instance.HomeGateway.gatewayStatus)
			{
			Control.Ins.GatewayOnline = true;
			}
			else
			{
			//new System.Threading.Thread(() => {
			// while(true)
			// {
			// System.Threading.Thread.Sleep(1000);
			// if (DB_ResidenceData.Instance.HomeGateway.GatewayOnline)
			// {
			// Control.Ins.GatewayOnline = true;
			// break;
			// }
			// }
			//}) { IsBackground = true }.Start();
			}
			IfNeedReadAllDeviceStatus = true;
			Utlis.WriteLine($"============>Mqtt远程连接成功");
			SendPushSignOut();
			FunctionList.List.ReadAllFunctionStatus();
			});
			}
			#endregion
			@@ -521,7 +387,7 @@
			{
			try
			{
			if (MqttInfoConfig.Current.HomeGatewayInfo != null && MqttInfoConfig.Current.HomeGatewayInfo.mac == Entity.DB_ResidenceData.residenceData.residenceGatewayMAC)
			if (MqttInfoConfig.Current.HomeGatewayInfo != null && MqttInfoConfig.Current.HomeGatewayInfo.mac == Entity.DB_ResidenceData.Instance.residenceGatewayMAC)
			{
			await MQTTConnectAsync();
			}
			@@ -674,7 +540,9 @@
			/// </summary>
			static void ReceiveNotifySqueezeAsync(string mMes)
			{

			#if DEBUG
			return;
			#endif
			if (mMes == PushSignStr) return;//是自己的登录推送不处理

			//断开远程连接
			@@ -686,13 +554,15 @@

			DisConnectRemoteMqttClient("挤下线");

			UserInfo.Current.LastTime = DateTime.MinValue;
			UserInfo.Current.SaveUserInfo();
			HDLCommon.Current.CheckLogout();

			Application.RunOnMainThread(() => {
			MainPage.GoLoginPage(UserInfo.Current);
			//弹窗提示被挤下线
			});
			//UserInfo.Current.LastTime = DateTime.MinValue;
			//UserInfo.Current.SaveUserInfo();

			//Application.RunOnMainThread(() => {
			// MainPage.GoLoginPage(UserInfo.Current);
			// //弹窗提示被挤下线
			//});

			//2020-08-11 删除推送数据
			//HDLRequest.Current.PushserivceSignOut ();
			@@ -786,7 +656,8 @@
			{
			if (Control.Ins.IsRemote)
			{
			Control.Ins.GatewayOnline = true;
			if (!Control.Ins.GatewayOnline)
			Control.Ins.GatewayOnline = true;
			}
			}

			@@ -803,16 +674,17 @@
			MqttInfoConfig.Current.mMqttInfo = mqttInfoRequestResult_Obj;
			await MQTTConnectAsync();
			//1.判断是否绑定了网关，获取网关远程连接的加密KEY
			if (DB_ResidenceData.residenceData.CheckWhetherGatewayIsBound())
			if (DB_ResidenceData.Instance.CheckWhetherGatewayIsBound())
			{
			//2.找出是否存在匹配当前住宅的mac，存在再进行远程。
			MqttInfoConfig.Current.HomeGatewayInfo = DB_ResidenceData.residenceData.HomeGateway;
			MqttInfoConfig.Current.HomeGatewayInfo = DB_ResidenceData.Instance.HomeGateway;
			//3.开始连接
			await MQTTConnectAsync();
			}
			else
			{
			Utlis.WriteLine("============>还没绑定网关");
			hadGateway = false;
			}
			}
			}