~wxr/HDL_APP_Project.git

			@@ -191,7 +191,7 @@
			}
			if (filePath.StartsWith("SceneData_"))
			{
			var sceneDataBytes = Common.FileUtlis.Files.ReadFile(filePath);
			var sceneDataBytes = FileUtlis.Files.ReadFile(filePath);
			var sceneDataString = System.Text.Encoding.UTF8.GetString(sceneDataBytes);
			var tempScene = Newtonsoft.Json.JsonConvert.DeserializeObject<Scene>(sceneDataString);
			List.scenes.Add(tempScene);
			@@ -254,41 +254,41 @@
			case FunctionType.AC:
			var sidObj = Newtonsoft.Json.JsonConvert.DeserializeObject<AC>(Newtonsoft.Json.JsonConvert.SerializeObject(sidObj0));
			List.aCs.Add(sidObj);
			sidObj.SaveFunctionData(false);
			sidObj.SaveFunctionFile();
			break;
			case FunctionType.FloorHeating:
			var sidObj1 = Newtonsoft.Json.JsonConvert.DeserializeObject<FloorHeating>(Newtonsoft.Json.JsonConvert.SerializeObject(sidObj0));
			List.floorHeatings.Add(sidObj1);
			sidObj1.SaveFunctionData(false);
			sidObj1.SaveFunctionFile();
			break;
			case FunctionType.Dimmer:
			case FunctionType.RGB:
			case FunctionType.Relay:
			var sidObj2 = Newtonsoft.Json.JsonConvert.DeserializeObject<Light>(Newtonsoft.Json.JsonConvert.SerializeObject(sidObj0));
			List.lights.Add(sidObj2);
			sidObj2.SaveFunctionData(false);
			sidObj2.SaveFunctionFile();
			break;
			case FunctionType.Curtain:
			case FunctionType.RollingShutter:
			case FunctionType.MotorCurtain:
			var sidObj3 = Newtonsoft.Json.JsonConvert.DeserializeObject<Curtain>(Newtonsoft.Json.JsonConvert.SerializeObject(sidObj0));
			List.curtains.Add(sidObj3 );
			sidObj3.SaveFunctionData(false);
			sidObj3.SaveFunctionFile();
			break;
			case FunctionType.TV:
			var sidObj4 = Newtonsoft.Json.JsonConvert.DeserializeObject<TV>(Newtonsoft.Json.JsonConvert.SerializeObject(sidObj0));
			List.tVs.Add(sidObj4);
			sidObj4.SaveFunctionData(false);
			sidObj4.SaveFunctionFile();
			break;
			case FunctionType.Socket:
			var sidObj5 = Newtonsoft.Json.JsonConvert.DeserializeObject<SwitchSocket>(Newtonsoft.Json.JsonConvert.SerializeObject(sidObj0));
			List.switchSockets.Add(sidObj5);
			sidObj5.SaveFunctionData(false);
			sidObj5.SaveFunctionFile();
			break;
			case FunctionType.Fan:
			var sidObj6 = Newtonsoft.Json.JsonConvert.DeserializeObject<Fan>(Newtonsoft.Json.JsonConvert.SerializeObject(sidObj0));
			List.fans.Add(sidObj6);
			sidObj6.SaveFunctionData(false);
			sidObj6.SaveFunctionFile();
			break;
			case FunctionType.CO2:
			case FunctionType.TVOC:
			@@ -297,7 +297,7 @@
			case FunctionType.Humidity:
			var sidObj7 = Newtonsoft.Json.JsonConvert.DeserializeObject<Sensor>(Newtonsoft.Json.JsonConvert.SerializeObject(sidObj0));
			List.sensorsEnvironmentalScience.Add(sidObj7);
			sidObj7.SaveFunctionData(false);
			sidObj7.SaveFunctionFile();
			break;
			}
			}
			@@ -378,129 +378,8 @@
			}

			/// <summary>
			/// 下来云端设备数据
			/// </summary>
			public void DownloadFunctionList()
			{
			new Thread(() =>
			{
			var pm = new HttpServerRequest();
			var pack = pm.GetDeviceList();
			if (pack.Code == StateCode.SUCCESS)
			{
			var deviceList = Newtonsoft.Json.JsonConvert.DeserializeObject<DevcieApiPack>(pack.Data.ToString());
			if (deviceList != null)
			{
			if (List.GetDeviceFunctionList().Count > 0)
			{
			for (int i = 0; i < List.GetDeviceFunctionList().Count;)
			{
			var localFunction = List.GetDeviceFunctionList()[i];
			if (localFunction.functionCategory == FunctionCategory.Music)
			{
			i++;
			continue;
			}
			var newFunction = deviceList.list.Find((obj) => obj.deviceId == localFunction.deviceId);
			if (newFunction == null)//如果云端最新数据没有该条数据，则本地需要删掉该数据记录
			{
			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);//操作完的数据清理掉，剩下的就是新增的功能
			}
			}
			}
			//处理剩下的新增功能
			foreach (var newFunction in deviceList.list)
			{
			newFunction.SaveFunctionData(false);
			List.IniFunctionList(newFunction.savePath);
			}
			}
			//MainPage.Log($"读取云端设备数据:\r\n{ pack.Data.ToString()}");
			}
			else
			{
			MainPage.Log($"读取云端设备数据失败:\r\nCode:{pack.Code}; Msg:{pack.message}");
			}
			})
			{ IsBackground = true }.Start();
			}

			/// <summary>
			/// 下载云端场景数据
			/// </summary>
			public void DownloadSceneList()
			{
			new Thread(() =>
			{
			var pm = new HttpServerRequest();
			var pack = pm.GetSceneList();
			if(pack.Code == StateCode.SUCCESS)
			{
			//MainPage.Log($"读取云端场景数据:\r\n{pack.Data.ToString()}");
			var sceneList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Scene>>(pack.Data.ToString());
			if (sceneList != null)
			{
			for (int i=0;i<List.scenes.Count;)
			{
			var localScene = List.scenes[i];
			if (localScene == null)
			{
			List.scenes.Remove(localScene);
			continue;
			}
			var newScene = sceneList.Find((obj) => obj.userSceneId == localScene.userSceneId);
			if (newScene == null)//如果云端最新数据没有该条数据，则本地需要删掉该数据记录
			{
			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);//操作完的数据清理掉，剩下的就是新增的功能
			}
			}
			//处理剩下的新增功能
			foreach (var newScene in sceneList)
			{
			newScene.SaveSceneData(false);
			List.scenes.Add(newScene);
			}
			}
			}
			else
			{
			MainPage.Log($"读取云端场景数据失败:\r\nCode:{pack.Code}; Msg:{pack.message}");
			}
			})
			{ IsBackground = true }.Start();
			}


			/// <summary>
			/// 删除场景
			/// todo
			/// </summary>
			public void DeleteScene(Scene scene,bool upSevser)
			{
			@@ -510,22 +389,22 @@
			var packCode = pm.DeleteScene(scene.userSceneId);
			if (packCode == StateCode.SUCCESS)
			{
			Common.FileUtlis.Files.DeleteFile(scene.savePath);
			FileUtlis.Files.DeleteFile(scene.savePath);
			List.scenes.Remove(scene);
			}
			else
			{
			Utlis.ShowTip(Shared.Language.StringByID(StringId.DeleteSceneFail) + "Code:" + packCode);
			IMessageCommon.Current.ShowErrorInfoAlter(packCode);
			}
			}
			else
			{
			Common.FileUtlis.Files.DeleteFile(scene.savePath);
			FileUtlis.Files.DeleteFile(scene.savePath);
			List.scenes.Remove(scene);
			}
			}
			/// <summary>
			/// 删除本地功能文件
			/// 删除本地功能及文件
			/// </summary>
			public void DeleteFunction(Function delTemp)
			{