~wxr/HDL_APP_Project.git

			@@ -19,7 +19,7 @@
			{
			get
			{
			if(apiUtlis == null)
			if (apiUtlis == null)
			{
			apiUtlis = new ApiUtlis();
			}
			@@ -33,7 +33,7 @@
			{
			get
			{
			if(httpRequest == null)
			if (httpRequest == null)
			{
			httpRequest = new HttpServerRequest();
			}
			@@ -47,7 +47,7 @@
			{
			bool result = DB_ResidenceData.Instance.HomeGateway.gatewayStatus;

			if(!result)
			if (!result)
			{

			}
			@@ -64,7 +64,7 @@
			if (MainPage.InternetStatus == 0)
			return;
			//线程开始时间
			var endTime = DateTime.Now.AddSeconds(6);
			var endTime = DateTime.Now.AddSeconds(5);

			MainPage.Log($"开始同步云端数据");

			@@ -86,6 +86,7 @@
			MainPage.Log($"刷新token失败");
			return;
			}
			endTime = DateTime.Now.AddSeconds(5);
			MainPage.Log($"刷新token成功");
			//===================刷新住宅信息=======================
			code = Ins.HttpRequest.GetHomePager();
			@@ -94,6 +95,7 @@
			MainPage.Log($"刷新住宅信息失败");
			return;
			}
			endTime = DateTime.Now.AddSeconds(5);
			MainPage.Log($"刷新住宅信息成功");
			//===================刷新个人信息=======================
			code = Ins.HttpRequest.GetUserInfo();
			@@ -102,25 +104,26 @@
			MainPage.Log($"刷新个人信息失败");
			return;
			}
			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;
			}
			//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
			@@ -129,12 +132,17 @@
			var roomResult = Ins.HttpRequest.GetRoomList();
			if (roomResult.Code == StateCode.SUCCESS)
			{
			endTime = DateTime.Now.AddSeconds(100);
			MainPage.Log($"读取房间信息成功");
			var revData = Newtonsoft.Json.JsonConvert.DeserializeObject<SpatialApiPack>(roomResult.Data.ToString());
			if (revData != null)
			if (revData == null)
			{
			SpatialInfo.CurrentSpatial.UpdateSpatialList(revData.list, OptionType.Cover);
			revData = new SpatialApiPack();
			}
			{
			SpatialInfo.CurrentSpatial.UpdateSpatialList(revData.list);
			}
			endTime = DateTime.Now.AddSeconds(5);
			}
			else
			{
			@@ -144,49 +152,53 @@
			var deviceResult = Ins.HttpRequest.GetDeviceList();
			if (deviceResult.Code == StateCode.SUCCESS)
			{
			endTime = DateTime.Now.AddSeconds(100);
			MainPage.Log($"读取设备信息成功");
			var deviceList = Newtonsoft.Json.JsonConvert.DeserializeObject<DevcieApiPack>(deviceResult.Data.ToString());
			if (deviceList != null)
			if (deviceList == null)
			{
			if (FunctionList.List.GetDeviceFunctionList().Count > 0)
			deviceList = new DevcieApiPack();
			}
			if (FunctionList.List.GetDeviceFunctionList().Count > 0)
			{
			for (int i = 0; i < FunctionList.List.GetDeviceFunctionList().Count;)
			{
			for (int i = 0; i < FunctionList.List.GetDeviceFunctionList().Count;)
			var localFunction = FunctionList.List.GetDeviceFunctionList()[i];
			if (localFunction.Spk_Prefix == FunctionCategory.Music)
			{
			var localFunction = FunctionList.List.GetDeviceFunctionList()[i];
			if (localFunction.functionCategory == FunctionCategory.Music)
			i++;
			continue;
			}
			var newFunction = deviceList.list.Find((obj) => obj.deviceId == localFunction.deviceId);
			if (newFunction == null)//如果云端最新数据没有该条数据，则本地需要删掉该数据记录
			{
			FunctionList.List.DeleteFunction(localFunction);
			}
			else
			{
			MainPage.Log($"deviceType:{localFunction.spk} local:{localFunction.modifyTime} server:{newFunction.modifyTime}");
			i++;
			if (localFunction.modifyTime != newFunction.modifyTime)
			{
			i++;
			continue;
			//可优化
			localFunction.name = newFunction.name;
			localFunction.collect = newFunction.collect;
			localFunction.modifyTime = newFunction.modifyTime;
			localFunction.roomIds = newFunction.roomIds;
			localFunction.bus = newFunction.bus;
			localFunction.SaveFunctionFile();
			}
			var newFunction = deviceList.list.Find((obj) => obj.deviceId == localFunction.deviceId);
			if (newFunction == null)//如果云端最新数据没有该条数据，则本地需要删掉该数据记录
			{
			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.SaveFunctionData(false);
			}
			deviceList.list.Remove(newFunction);//操作完的数据清理掉，剩下的就是新增的功能
			}
			deviceList.list.Remove(newFunction);//操作完的数据清理掉，剩下的就是新增的功能
			}
			}
			//处理剩下的新增功能
			foreach (var newFunction in deviceList.list)
			{
			newFunction.SaveFunctionData(false);
			FunctionList.List.IniFunctionList(newFunction.savePath);
			}
			}
			//处理剩下的新增功能
			foreach (var newFunction in deviceList.list)
			{
			newFunction.SaveFunctionFile();
			FunctionList.List.IniFunctionList(newFunction.savePath);
			}
			endTime = DateTime.Now.AddSeconds(5);
			}
			else
			{
			@@ -197,44 +209,75 @@
			var pack = Ins.HttpRequest.GetSceneList();
			if (pack.Code == StateCode.SUCCESS)
			{
			endTime = DateTime.Now.AddSeconds(100);
			MainPage.Log($"读取场景数据成功");
			var sceneList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Scene>>(pack.Data.ToString());
			if (sceneList != null)
			if (sceneList == null)
			{
			for (int i = 0; i < FunctionList.List.scenes.Count;)
			sceneList = new List<Scene>();
			}
			for (int i = 0; i < FunctionList.List.scenes.Count;)
			{
			var localScene = FunctionList.List.scenes[i];
			if (localScene == null)
			{
			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.SaveSceneData(false);
			}
			sceneList.Remove(newScene);//操作完的数据清理掉，剩下的就是新增的功能
			}
			FunctionList.List.scenes.Remove(localScene);
			continue;
			}
			//处理剩下的新增功能
			foreach (var newScene in sceneList)
			var newScene = sceneList.Find((obj) => obj.userSceneId == localScene.userSceneId);
			if (newScene == null)//如果云端最新数据没有该条数据，则本地需要删掉该数据记录
			{
			newScene.SaveSceneData(false);
			FunctionList.List.scenes.Add(newScene);
			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);//操作完的数据清理掉，剩下的就是新增的功能
			}
			}
			//处理剩下的新增功能
			foreach (var tempScene in sceneList)
			{
			tempScene.SaveSceneFile();
			FunctionList.List.scenes.Add(tempScene);
			}
			//如果是一端口需要提前下载场景数据，否则控制不了一端口场景
			if (DB_ResidenceData.Instance.GatewayType == 0)
			{
			var sceneIds = new List<string>();
			foreach (var tempScene in FunctionList.List.scenes)
			{
			sceneIds.Add(tempScene.userSceneId);
			}
			var packInfo = HttpRequest.GetSceneListInfo(sceneIds);
			if (packInfo.Code == StateCode.SUCCESS)
			{
			var serverTempList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Scene>>(packInfo.Data.ToString());
			foreach (var localScene in FunctionList.List.scenes)
			{
			var serverTemp = serverTempList.Find((obj) => obj.userSceneId == localScene.userSceneId);
			if (serverTemp != null)
			{
			localScene.functions = serverTemp.functions;
			localScene.SaveSceneFile();
			}
			}
			}
			else
			{
			IMessageCommon.Current.ShowErrorInfoAlter(packInfo.Code);
			}
			}
			endTime = DateTime.Now.AddSeconds(5);
			}
			else
			{
			@@ -305,4 +348,4 @@
			{ IsBackground = true }.Start();
			}
			}
			}
			}