~wjc/HomeApp.git

			@@ -1,4 +1,5 @@
			using System;
			using Shared.Common;
			using System;
			using System.Collections.Generic;
			using System.Text;

			@@ -32,6 +33,272 @@

			#endregion

			#region ■ 创建新住宅_________________________

			/// <summary>
			/// 创建新的住宅(返回住宅id,null代表失败)
			/// </summary>
			/// <param name="residenceName">住宅名称</param>
			public async System.Threading.Tasks.Task<string> CreatNewResidence(string residenceName)
			{
			var Pra = new AddResidencePra();
			Pra.Name = residenceName;
			//添加住宅
			string resultData = await UserCenterLogic.GetResponseDataByRequestHttps("App/AddHome", false, Pra);
			if (resultData == null)
			{
			return null;
			}
			var newInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<List<NewResidenceInfo>>(resultData);

			//添加住宅到缓存
			this.AddHouseToMemmory(newInfo[0].Id, residenceName);

			return newInfo[0].Id;
			}

			/// <summary>
			/// 添加住宅到缓存
			/// </summary>
			/// <param name="houseId">住宅id</param>
			/// <param name="houseName">住宅名称.</param>
			/// <param name="isOthreShare">是否为其他主用户分享过来的住宅</param>
			/// <param name="accountType">仅子账号登陆的时候使用,当【IsOthreShare】为"true"，并且【AccountType】为"1"时，该账号拥有管理员权限</param>
			public void AddHouseToMemmory(string houseId, string houseName,
			bool isOthreShare = false, int accountType = 0)
			{
			var home = new Common.House();
			home.Id = houseId;
			home.Name = houseName;
			home.IsOthreShare = isOthreShare;
			home.AccountType = accountType;

			//创建文件夹
			Common.Global.CreateHomeDirectory(houseId);
			home.Save();
			Common.Config.Instance.HomeFilePathList.Add(home.FileName);
			Common.Config.Instance.Save();
			//如果当前没有住宅的话
			if (Common.Config.Instance.Home.Id == string.Empty)
			{
			Common.Config.Instance.Home = this.GetHouseByFilePath(home.FileName);
			Common.Config.Instance.HomeId = home.Id;
			}
			}


			#endregion

			#region ■ 切换住宅___________________________

			/// <summary>
			/// 切换住宅(注:它只切换内存,界面并未处理)
			/// </summary>
			/// <param name="residenceId"></param>
			/// <returns></returns>
			public async System.Threading.Tasks.Task SwitchResidence(string residenceId)
			{
			//打开进度条
			ProgressBar.Show();

			Config.Instance.HomeId = residenceId;
			//重新初始化住宅对象
			Config.Instance.Home = this.GetHouseByHouseId(residenceId);
			Config.Instance.Save();
			//刷新个人中心的内存及线程
			await UserCenterLogic.InitUserCenterMenmoryAndThread(false);

			//关闭进度条
			ProgressBar.Close();
			}

			#endregion

			#region ■ 编辑住宅___________________________

			/// <summary>
			/// 编辑住宅
			/// </summary>
			/// <param name="residenceId">住宅id</param>
			/// <param name="residenceName">住宅名称</param>
			/// <returns></returns>
			public async System.Threading.Tasks.Task<bool> EditorResidenceName(string residenceId, string residenceName)
			{
			var Pra = new EditorResidencePra();
			Pra.HomeId = residenceId;
			Pra.Name = residenceName;
			Pra.IsOtherAccountCtrl = false;
			Pra.LoginAccessToken = Config.Instance.Token;

			//编辑住宅
			bool flage = await UserCenterLogic.GetResultStatuByRequestHttps("App/EditHome", false, Pra);
			if (flage == true)
			{
			//刷新内存的住宅名
			this.EditorHouseByHouseId(residenceId, residenceName);
			}
			return flage;
			}

			/// <summary>
			/// 编辑缓存住宅
			/// </summary>
			/// <param name="residenceId">住宅id</param>
			/// <param name="residenceName">住宅名称</param>
			public void EditorHouseByHouseId(string residenceId, string residenceName)
			{
			if (Config.Instance.Home.Id == residenceId)
			{
			Config.Instance.Home.Name = residenceName;
			}

			var home = GetHouseByHouseId(residenceId);
			if (home == null)
			{
			return;
			}
			home.Name = residenceName;
			home.Save();
			//住宅修改名称的话,主页需要重新刷新
			UserView.UserPage.Instance.RefreshForm = true;
			}


			#endregion

			#region ■ 获取住宅___________________________

			/// <summary>
			/// 通过【id】获取住宅
			/// </summary>
			/// <returns>The house by house identifier.</returns>
			/// <param name="houseId">住宅id</param>
			public House GetHouseByHouseId(string houseId)
			{
			var path = System.IO.Path.Combine(Shared.IO.FileUtils.RootPath, Config.Instance.Guid, houseId, $"House_{houseId}.json");
			var file = Shared.IO.FileUtils.ReadFile(path);
			if (file == null)
			{
			return null;
			}
			return Newtonsoft.Json.JsonConvert.DeserializeObject<House>(System.Text.Encoding.UTF8.GetString(file));
			}

			/// <summary>
			/// 通过【文件路径】获取住宅
			/// </summary>
			/// <returns>The house by file path.</returns>
			/// <param name="filePath">文件路径</param>
			public House GetHouseByFilePath(string filePath)
			{
			var path = System.IO.Path.Combine(Shared.IO.FileUtils.RootPath, Config.Instance.Guid, GetHouseIdByFilePath(filePath), filePath);
			var file = Shared.IO.FileUtils.ReadFile(path);
			if (file == null)
			{
			return null;
			}
			return Newtonsoft.Json.JsonConvert.DeserializeObject<House>(System.Text.Encoding.UTF8.GetString(file));
			}

			#endregion

			#region ■ 获取云端住宅列表___________________
			/// <summary>
			/// 获取云端住宅列表
			/// </summary>
			public async System.Threading.Tasks.Task<List<string>> GetHomeListsFromDb()
			{
			var pageSetting = new SendDataToServer.ResidenceListPageSettingObj()
			{
			PageSize = CommonPage.PageSize
			};

			var reqDto = new SendDataToServer.ResidenceListObj()
			{
			LoginAccessToken = Config.Instance.Token,
			PageSetting = pageSetting
			};
			var requestObj = new SendDataToServer.ResidenceListReqDto()
			{
			ReqDto = reqDto,
			RequestVersion = CommonPage.RequestVersion,
			};
			try
			{
			var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(requestObj);
			var revertObj = await CommonPage.Instance.RequestHttpsZigbeeAsync("App/GetHomePager", System.Text.Encoding.UTF8.GetBytes(requestJson));
			if (revertObj == null)
			{
			return null;
			}
			if (revertObj.StateCode.ToUpper() == "SUCCESS")
			{
			var responseDataObj = Newtonsoft.Json.JsonConvert.DeserializeObject<Shared.Common.ResponseEntity.ResidenceRes>(revertObj.ResponseData.ToString());
			if(responseDataObj.TotalCount>0)
			{
			//清空当前住宅列表
			Config.Instance.HomeFilePathList.Clear();
			var listHouse = new List<House>();
			foreach (var residence in responseDataObj.PageData)
			{
			Config.Instance.HomeFilePathList.Add($"House_{residence.Id}.json");
			var house = GetHouseByHouseId(residence.Id);
			if (house == null)
			{
			house = new House
			{
			Id = residence.Id,
			Name = residence.Name,
			IsOthreShare = residence.IsOthreShare,
			AccountType = residence.AccountType,
			MainUserDistributedMark = residence.MainUserDistributedMark,
			Longitude = residence.Longitude,
			Latitude = residence.Latitude
			};
			}
			else
			{
			house.Id = residence.Id;
			house.Name = residence.Name;
			house.IsOthreShare = residence.IsOthreShare;
			house.AccountType = residence.AccountType;
			house.MainUserDistributedMark = residence.MainUserDistributedMark;
			house.Longitude = residence.Longitude;
			house.Latitude = residence.Latitude;
			}
			Global.CreateHomeDirectory(residence.Id);
			house.Save(false);
			listHouse.Add(house);
			}
			//如果切换了账号,或者原来的id不存在,则重置住宅ID
			if (Config.Instance.TheSameLoginAccount == false \|\|
			Config.Instance.HomeFilePathList.Find((obj) => obj == $"House_{Config.Instance.HomeId}.json") == null)
			{
			Config.Instance.HomeId = listHouse[0].Id;
			foreach (var house in listHouse)
			{
			//初始选择它自己的住宅
			if (house.IsOthreShare == false)
			{
			Config.Instance.HomeId = house.Id;
			Config.Instance.Home = GetHouseByHouseId(house.Id);
			break;
			}
			}
			}
			Config.Instance.Save();
			}
			}
			}
			catch (Exception ex)
			{
			HdlLogLogic.Current.WriteLog(ex);
			}
			return Config.Instance.HomeFilePathList;
			}

			#endregion

			#region ■ 获取本地住宅列表___________________

			/// <summary>
			@@ -50,7 +317,7 @@
			var listHome = new List<Common.House>();
			foreach (var housePath in Common.Config.Instance.HomeFilePathList)
			{
			var home = Common.House.GetHouseByFilePath(housePath);
			var home =this.GetHouseByFilePath(housePath);
			if (home == null)
			{
			continue;
			@@ -85,14 +352,71 @@
			{
			//读取文件内容
			var textValue = UserCenterLogic.LoadFileContent(System.IO.Path.Combine(nowPath, arryHouse[0]));
			if (textValue != null)
			if (textValue == null)
			{
			var myHouse = Newtonsoft.Json.JsonConvert.DeserializeObject<Common.House>(textValue);
			listHome.Add(myHouse);
			continue;
			}
			var myHouse = Newtonsoft.Json.JsonConvert.DeserializeObject<Common.House>(textValue);
			listHome.Add(myHouse);
			}
			}
			return listHome;
			}

			#endregion

			#region ■ 删除住宅___________________________

			/// <summary>
			/// 删除住宅
			/// </summary>
			/// <param name="filePath">File path.</param>
			public void DeleteHouseMemmory(string houseId)
			{
			string filePath = this.GetHouseFilePathByHouseId(houseId);
			var delPath = System.IO.Path.Combine(Shared.IO.FileUtils.RootPath, Config.Instance.Guid, GetHouseIdByFilePath(filePath));
			if (System.IO.Directory.Exists(delPath) == false)
			{
			return;
			}
			var fileList = GetHouseFileListByHomeId(houseId);
			foreach (var file in fileList)
			{
			//删除文件
			System.IO.File.Delete(System.IO.Path.Combine(delPath, file));
			}
			//删除文件夹
			System.IO.Directory.Delete(delPath, true);
			//HomeFilePathList中删除该列表
			Common.Config.Instance.HomeFilePathList.RemoveAll((obj) => obj == filePath);
			Config.Instance.Save();
			}

			#endregion

			#region ■ 获取该住宅的文件列表_______________

			/// <summary>
			/// 通过【houseId】获取该住宅的文件列表
			/// </summary>
			/// <returns>The house file list by home identifier.</returns>
			/// <param name="houseId">House identifier.</param>
			public List<string> GetHouseFileListByHomeId(string houseId)
			{
			var list = new List<string> { };
			var path = System.IO.Path.Combine(Shared.IO.FileUtils.RootPath, Config.Instance.Guid, houseId);
			if (!System.IO.Directory.Exists(path))
			{
			return new List<string> { };
			}
			var files = System.IO.Directory.GetFiles(path);
			foreach (var file in files)
			{
			var f = file.Substring(path.Length + 1);
			System.Console.WriteLine(f);
			list.Add(f);
			}
			return list;
			}

			#endregion
			@@ -106,9 +430,72 @@
			/// <returns></returns>
			public string GetFloorNameById(string i_FloorId)
			{
			return Common.Config.Instance.Home.GetFloorNameById(i_FloorId);
			if (i_FloorId == null) { return string.Empty; }
			if (Config.Instance.Home.FloorDics.ContainsKey(i_FloorId) == false)
			{
			return string.Empty;
			}
			return Config.Instance.Home.FloorDics[i_FloorId];
			}

			/// <summary>
			/// 通过【文件路径】获取住宅id
			/// </summary>
			/// <returns>The house identifier by file path.</returns>
			/// <param name="filePath">文件路径</param>
			public string GetHouseIdByFilePath(string filePath)
			{
			string[] sArray = filePath.Split(new string[] { "House_", ".json" }, StringSplitOptions.RemoveEmptyEntries);
			if (sArray.Length >= 1)
			{
			return sArray[0];
			}
			return null;
			}

			/// <summary>
			/// 通过【住宅id】获取住宅路径
			/// </summary>
			/// <returns>The house identifier by file path.</returns>
			/// <param name="houseId">住宅id</param>
			public string GetHouseFilePathByHouseId(string houseId)
			{
			return $"House_{houseId}.json";
			}

			#endregion

			#region ■ 结构体_____________________________

			/// <summary>
			/// 添加住宅的启动参数
			/// </summary>
			private class AddResidencePra : IfacePraCommon
			{
			/// <summary>
			/// RequestVersion
			/// </summary>
			public string RequestVersion = Common.CommonPage.RequestVersion;
			/// <summary>
			/// LoginAccessToken
			/// </summary>
			public string LoginAccessToken = Common.Config.Instance.Token;
			/// <summary>
			/// Name
			/// </summary>
			public string Name = string.Empty;
			}

			/// <summary>
			/// 新住宅的信息
			/// </summary>
			private class NewResidenceInfo
			{
			/// <summary>
			/// ZigbeeHomeGuid
			/// </summary>
			public string Id = string.Empty;
			}
			#endregion
			}
			}