~wxr/OnPro.git - Gitblit

			@@ -111,7 +111,7 @@
			{
			MqttInfoConfig.Current.IfGetMqttInfoSuccess = false;
			}
			Control.Ins.GatewayOnline_Cloud = Control.Ins.GatewayOnline_Local = false;
			//Control.Ins.GatewayOnline_Cloud = Control.Ins.GatewayOnline_Local = false;
			await DisConnectRemoteMqttClient(s);
			}

			@@ -145,6 +145,7 @@

			await StartCloudMqtt();
			await SubscribeTopics();

			}
			catch { }
			}
			@@ -491,48 +492,6 @@
			else if (topic == $"/user/{DB_ResidenceData.Instance.CurrentRegion.id}/app/thing/event/appDeviceRefresh/up")
			{
			MainPage.Log("设备数据刷新通知");
			var deviceResult = new HttpServerRequest().GetDeviceList();
			if (deviceResult.Code == StateCode.SUCCESS)
			{
			MainPage.Log($"读取设备信息成功");
			var deviceList = Newtonsoft.Json.JsonConvert.DeserializeObject<DevcieApiPack>(deviceResult.Data.ToString());
			if (deviceList == null)
			{
			deviceList = new DevcieApiPack();
			}
			string delFile = "";
			if (FunctionList.List.GetDeviceFunctionList().Count > 0)
			{
			for (int i = 0; i < FunctionList.List.GetDeviceFunctionList().Count;)
			{
			var localFunction = FunctionList.List.GetDeviceFunctionList()[i];
			if (SPK.MusicSpkList().Contains(localFunction.spk))
			{
			i++;
			continue;
			}
			var newFunction = deviceList.list.Find((obj) => obj.deviceId == localFunction.deviceId);

			if (delFile == localFunction.savePath)
			{
			i++;
			continue;
			}
			delFile = localFunction.savePath;
			FunctionList.List.DeleteFunction(localFunction);
			}
			}
			//处理剩下的新增功能
			foreach (var newFunction in deviceList.list)
			{
			newFunction.SaveFunctionFile();
			FunctionList.List.IniFunctionList(newFunction.savePath);
			}
			}
			else
			{
			MainPage.Log($"读取云端设备数据失败:Code:{deviceResult.Code}; Msg:{deviceResult.message}");
			}
			}
			//网关密钥变化
			else if (topic == $"/user/{DB_ResidenceData.Instance.CurrentRegion.id}/custom/mqtt/secret/change")
			@@ -591,7 +550,7 @@
			{
			var bytes = Securitys.EncryptionService.AesDecryptPayload(e.ApplicationMessage.Payload, tuyaEncryptKey);
			var revString = Encoding.UTF8.GetString(bytes);
			MainPage.Log($"mqtt 状态更新:{revString}");
			//MainPage.Log($"mqtt 状态更新:{revString}");
			Control.Ins.UpdataFunctionStatus(revString, null, true);
			//Control.Ins.MsgInfoList.Add($"mqtt 状态更新:{revString}");
			//Control.Ins.MsgInfoList.Add(revString + "\r\n");
			@@ -1022,7 +981,7 @@


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