~wxr/HDL_APP_Project.git

			@@ -46,7 +46,7 @@
			public bool GatewayOnlineVerification()
			{
			bool result = DB_ResidenceData.Instance.HomeGateway.gatewayStatus;

			DriverLayer.Control.Ins.GatewayOnline_Cloud = result;
			if (!result)
			{

			@@ -106,26 +106,6 @@
			}
			endTime = DateTime.Now.AddSeconds(5);
			MainPage.Log($"刷新个人信息成功");

			//int count = 0;
			//while (count < 10)
			//{
			// if (DB_ResidenceData.Instance.CheckWhetherGatewayIdIsNull())
			// {
			// System.Threading.Thread.Sleep(200);
			// }
			// else
			// {
			// break;
			// }
			// count++;
			//}
			//if (DB_ResidenceData.Instance.CheckWhetherGatewayIdIsNull())
			//{
			// return;
			//}


			try
			{
			//===================房间=======================
			@@ -159,6 +139,7 @@
			{
			deviceList = new DevcieApiPack();
			}
			string delFile = "";
			if (FunctionList.List.GetDeviceFunctionList().Count > 0)
			{

			@@ -171,35 +152,20 @@
			continue;
			}
			var newFunction = deviceList.list.Find((obj) => obj.deviceId == localFunction.deviceId);
			if (newFunction == null)//如果云端最新数据没有该条数据，则本地需要删掉该数据记录

			if (delFile == localFunction.savePath)
			{
			FunctionList.List.DeleteFunction(localFunction);
			}
			else
			{
			MainPage.Log($"deviceType:{localFunction.spk} local:{localFunction.modifyTime} server:{newFunction.modifyTime}");
			i++;
			//if (localFunction.modifyTime != newFunction.modifyTime)
			//{
			// //可优化
			// localFunction.name = newFunction.name;
			// localFunction.collect = newFunction.collect;
			// localFunction.modifyTime = newFunction.modifyTime;
			// localFunction.roomIds = newFunction.roomIds;
			// localFunction.bus = newFunction.bus;
			// localFunction.SaveFunctionFile();
			//}
			localFunction = newFunction;
			localFunction.SaveFunctionFile();
			deviceList.list.Remove(newFunction);//操作完的数据清理掉，剩下的就是新增的功能
			continue;
			}
			delFile = localFunction.savePath;
			FunctionList.List.DeleteFunction(localFunction);
			}


			}
			//处理剩下的新增功能
			foreach (var newFunction in deviceList.list)
			foreach (var newFunction in deviceList.list)
			{
			MainPage.Log(newFunction.savePath);
			newFunction.SaveFunctionFile();
			FunctionList.List.IniFunctionList(newFunction.savePath);
			}
			@@ -221,34 +187,37 @@
			{
			sceneList = new List<Scene>();
			}
			for (int i = 0; i < FunctionList.List.scenes.Count;)
			{
			var localScene = FunctionList.List.scenes[i];
			if (localScene == null)
			{
			FunctionList.List.scenes.Remove(localScene);
			continue;
			}
			var newScene = sceneList.Find((obj) => obj.userSceneId == localScene.userSceneId);
			if (newScene == null)//如果云端最新数据没有该条数据，则本地需要删掉该数据记录
			{
			FunctionList.List.DeleteScene(localScene, false);
			}
			else
			{
			i++;
			if (localScene.modifyTime != newScene.modifyTime)
			{
			localScene.name = newScene.name;
			localScene.collect = newScene.collect;
			localScene.modifyTime = newScene.modifyTime;
			localScene.roomIds = newScene.roomIds;
			localScene.image = newScene.image;
			localScene.SaveSceneFile();
			}
			sceneList.Remove(newScene);//操作完的数据清理掉，剩下的就是新增的功能
			}
			}
			//for (int i = 0; i < FunctionList.List.scenes.Count;)
			//{
			// var localScene = FunctionList.List.scenes[i];
			// if (localScene == null)
			// {
			// FunctionList.List.scenes.Remove(localScene);
			// continue;
			// }
			// var newScene = sceneList.Find((obj) => obj.userSceneId == localScene.userSceneId);
			// if (newScene == null)//如果云端最新数据没有该条数据，则本地需要删掉该数据记录
			// {
			// FunctionList.List.DeleteScene(localScene, false);
			// }
			// else
			// {
			// i++;
			// if (localScene.modifyTime != newScene.modifyTime)
			// {
			// localScene.name = newScene.name;
			// localScene.collect = newScene.collect;
			// localScene.modifyTime = newScene.modifyTime;
			// localScene.roomIds = newScene.roomIds;
			// localScene.image = newScene.image;
			// localScene.SaveSceneFile();
			// }
			// sceneList.Remove(newScene);//操作完的数据清理掉，剩下的就是新增的功能
			// }
			//}

			FunctionList.List.scenes.Clear();

			//处理剩下的新增功能
			foreach (var tempScene in sceneList)
			{
			@@ -289,8 +258,17 @@
			MainPage.Log($"读取云端场景数据失败:Code:{pack.Code}; Msg:{pack.message}");
			}

			//===================读取安防列表==========================
			GetSecurityList();
			//===================读取逻辑列表==========================
			UI.UI2.Intelligence.Automation.MainView.GetLogicList();
			//===================读取可视对讲数据==========================
			var flVideoInfo = HttpRequest.CheckFlVideo();
			if(flVideoInfo.Code == StateCode.SUCCESS)
			{
			FunctionList.List.videoIntercom = Newtonsoft.Json.JsonConvert.DeserializeObject<UI.UI2.FuntionControlView.Video.VideoClouds>(flVideoInfo.Data.ToString());
			}

			}
			catch (Exception ex)
			{
			@@ -346,15 +324,66 @@
			catch { }
			finally
			{
			#region 读取本地数据
			//读取音乐信息
			UI.Music.A31MusicModel.ReadMusicStates();
			//搜索网关
			DriverLayer.Control.Ins.SearchLoaclGateway();
			#endregion
			if (DB_ResidenceData.Instance.CurrentRegion != null)
			{
			#region 读取本地数据
			//读取音乐信息
			UI.Music.A31MusicModel.ReadMusicStates();
			//搜索网关
			DriverLayer.Control.Ins.SearchLoaclGateway();
			#endregion
			}
			}
			})
			{ IsBackground = true }.Start();
			}

			/// <summary>
			/// 获取功能信息
			/// </summary>
			public void GetFunctionInfo(string functionId)
			{
			var deviceResult = Ins.HttpRequest.GetDeviceInfo(functionId);
			if (deviceResult.Code == StateCode.SUCCESS)
			{
			MainPage.Log($"读取设备信息成功");
			var packList = Newtonsoft.Json.JsonConvert.DeserializeObject<DevcieApiPack>(deviceResult.Data.ToString());

			foreach(var function in packList.list)
			{
			function.SaveFunctionFile();
			FunctionList.List.IniFunctionList(function.savePath,true);
			}
			}
			}

			/// <summary>
			/// 获取安防列表
			/// </summary>
			public void GetSecurityList()
			{
			var pack = Ins.HttpRequest.GetSecurityList();
			if (pack.Code == StateCode.SUCCESS)
			{
			var packList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<SecurityAlarm>>(pack.Data.ToString());
			var sidList = new List<string>();
			foreach (var function in packList)
			{
			sidList.Add(function.sid);
			}
			var infoListPack = Ins.httpRequest.GetSecurityInfo(sidList, new List<string>());
			var infoList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<SecurityAlarm>>(infoListPack.Data.ToString());
			foreach (var function in infoList)
			{
			function.SaveFile();
			FunctionList.List.IniFunctionList(function.savePath, true);
			}
			}
			else
			{
			MainPage.Log($"读取安防列表失败:Code:{pack.Code}; Msg:{pack.message}");
			}

			}
			}
			}