~wjc/HomeApp.git

			@@ -96,7 +96,7 @@
			/// </summary>
			/// <param name="residenceId"></param>
			/// <returns></returns>
			public void SwitchResidence(string residenceId)
			public bool SwitchResidence(string residenceId)
			{
			//打开进度条
			ProgressBar.Show();
			@@ -106,10 +106,12 @@
			Config.Instance.Home = this.GetHouseByHouseId(residenceId);
			Config.Instance.Save();
			//刷新个人中心的内存及线程
			UserCenterLogic.InitUserCenterMenmoryAndThread(false);
			bool result = UserCenterLogic.InitUserCenterMenmoryAndThread(false);

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

			return result;
			}

			#endregion
			@@ -160,7 +162,7 @@
			home.Name = residenceName;
			home.Save();
			//住宅修改名称的话,主页需要重新刷新
			UserView.UserPage.Instance.RefreshForm = true;
			UserView.UserPage.Instance.RefreshAllForm = true;
			}


			@@ -176,7 +178,7 @@
			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);
			var file = HdlFileLogic.Current.ReadFileByteContent(path);
			if (file == null)
			{
			return null;
			@@ -192,7 +194,7 @@
			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);
			var file = HdlFileLogic.Current.ReadFileByteContent(path);
			if (file == null)
			{
			return null;
			@@ -206,9 +208,11 @@
			/// <summary>
			/// 获取云端住宅列表
			/// </summary>
			public List<string> GetHomeListsFromDb()
			/// <param name="checkNetwork">是否检测网络,如果设置检测的话,当不能联网时,直接返回本地住宅</param>
			/// <returns></returns>
			public List<string> GetHomeListsFromDb(bool checkNetwork)
			{
			if (HdlWifiLogic.Current.CanAccessHttp == false)
			if (checkNetwork == true && HdlWifiLogic.Current.CanAccessHttp == false)
			{
			//当前无法联网
			return Config.Instance.HomeFilePathList;
			@@ -225,7 +229,7 @@
			try
			{
			var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(requestObj);
			var revertObj = CommonPage.Instance.RequestHttpsZigbeeAsync("App/GetHomePager", System.Text.Encoding.UTF8.GetBytes(requestJson));
			var revertObj = CommonPage.Instance.RequestHttpsZigbeeAsync("App/GetHomePager", System.Text.Encoding.UTF8.GetBytes(requestJson), 5);
			if (revertObj == null)
			{
			return null;
			@@ -269,20 +273,26 @@
			house.Save(false);
			listHouse.Add(house);
			}
			//检测本地的住宅文件是否合法
			var listLocal = this.GetAllLocalResidenceListByDirectory();
			foreach (var myHouse in listLocal)
			{
			//如果本地存在不属于他的住宅文件,则删除
			if (myHouse.HouseDataDiv == 1 && Config.Instance.HomeFilePathList.Contains(myHouse.FileName) == false)
			{
			string housePath = System.IO.Path.Combine(Shared.IO.FileUtils.RootPath, Config.Instance.Guid, myHouse.Id);
			HdlFileLogic.Current.DeleteDirectory(housePath);
			}
			}
			//如果切换了账号,或者原来的id不存在,则重置住宅ID
			if (Config.Instance.TheSameLoginAccount == false \|\|
			Config.Instance.HomeFilePathList.Find((obj) => obj == $"House_{Config.Instance.HomeId}.json") == null)
			Config.Instance.HomeFilePathList.Contains($"House_{Config.Instance.HomeId}.json") == false)
			{
			Config.Instance.HomeId = listHouse[0].Id;
			foreach (var house in listHouse)
			if (listHouse.Count > 0)
			{
			//初始选择它自己的住宅
			if (house.IsOthreShare == false)
			{
			Config.Instance.HomeId = house.Id;
			Config.Instance.Home = GetHouseByHouseId(house.Id);
			break;
			}
			Config.Instance.HomeId = listHouse[0].Id;
			Config.Instance.Home = GetHouseByHouseId(listHouse[0].Id);
			}
			}
			Config.Instance.Save();
			@@ -323,7 +333,7 @@
			}
			listHome.Add(home);
			}
			return listHome;
			return this.SortHouse(listHome);
			}

			/// <summary>
			@@ -350,7 +360,7 @@
			if (arryHouse.Length > 0)
			{
			//读取文件内容
			var textValue = UserCenterLogic.LoadFileContent(System.IO.Path.Combine(nowPath, arryHouse[0]));
			var textValue = HdlFileLogic.Current.ReadFileTextContent(System.IO.Path.Combine(nowPath, arryHouse[0]));
			if (textValue == null)
			{
			continue;
			@@ -359,7 +369,183 @@
			listHome.Add(myHouse);
			}
			}
			return listHome;
			return this.SortHouse(listHome);
			}

			#endregion

			#region ■ 住宅排序___________________________

			/// <summary>
			/// 住宅排序
			/// </summary>
			/// <param name="i_listHouse"></param>
			/// <returns></returns>
			public List<House> SortHouse(List<House> i_listHouse)
			{
			//从一堆文字中,获取这一堆文字里面数字字符串的最长长度
			var listName = new List<string>();
			foreach (var house in i_listHouse)
			{
			listName.Add(house.Name);
			}
			int numberLength = this.GetNumberMaxLength(listName);

			var listSort = new List<string[]>();
			var dicHouse = new Dictionary<string, House>();
			foreach (var house in i_listHouse)
			{
			//临时缓存
			dicHouse[house.Id] = house;

			var strArry = new string[2];
			strArry[0] = house.Id;
			strArry[1] = string.Empty;

			string value = string.Empty;
			foreach (var c in house.Name)
			{
			if (char.IsNumber(c) == true)
			{
			//数字
			value += c.ToString();
			continue;
			}
			else if (value != string.Empty)
			{
			//如果房间名字带有数字的话,则左边加零,因为这里有个排序的问题
			strArry[1] += value.PadLeft(numberLength, '0');
			value = string.Empty;
			}
			strArry[1] += c.ToString();
			}
			if (value != string.Empty)
			{
			//以数字结尾的话
			strArry[1] += value.PadLeft(numberLength, '0');
			}
			listSort.Add(strArry);
			}
			//排序
			listSort.Sort((obj1, obj2) =>
			{
			if (obj1[1].CompareTo(obj2[1]) > 0)
			{
			return 1;
			}
			return -1;
			});
			var listSortHouse = new List<House>();
			foreach (var strArry in listSort)
			{
			listSortHouse.Add(dicHouse[strArry[0]]);
			}
			return listSortHouse;
			}

			/// <summary>
			/// 云端住宅排序
			/// </summary>
			/// <param name="i_listData"></param>
			/// <returns></returns>
			public List<Common.ResponseEntity.ResidenceObj> SortHouse(List<Common.ResponseEntity.ResidenceObj> i_listData)
			{
			//从一堆文字中,获取这一堆文字里面数字字符串的最长长度
			var listName = new List<string>();
			foreach (var house in i_listData)
			{
			listName.Add(house.Name);
			}
			int numberLength = this.GetNumberMaxLength(listName);

			var listSort = new List<string[]>();
			var dicHouse = new Dictionary<string, Common.ResponseEntity.ResidenceObj>();
			foreach (var house in i_listData)
			{
			//临时缓存
			dicHouse[house.Id] = house;

			var strArry = new string[2];
			strArry[0] = house.Id;
			strArry[1] = string.Empty;

			string value = string.Empty;
			foreach (var c in house.Name)
			{
			if (char.IsNumber(c) == true)
			{
			//数字
			value += c.ToString();
			continue;
			}
			else if (value != string.Empty)
			{
			//如果房间名字带有数字的话,则左边加零,因为这里有个排序的问题
			strArry[1] += value.PadLeft(numberLength, '0');
			value = string.Empty;
			}
			strArry[1] += c.ToString();
			}
			if (value != string.Empty)
			{
			//以数字结尾的话
			strArry[1] += value.PadLeft(numberLength, '0');
			}
			listSort.Add(strArry);
			}
			//排序
			listSort.Sort((obj1, obj2) =>
			{
			if (obj1[1].CompareTo(obj2[1]) > 0)
			{
			return 1;
			}
			return -1;
			});
			var listSortHouse = new List<Common.ResponseEntity.ResidenceObj>();
			foreach (var strArry in listSort)
			{
			listSortHouse.Add(dicHouse[strArry[0]]);
			}
			return listSortHouse;
			}

			/// <summary>
			/// 从一堆文字中,获取这一堆文字里面数字字符串的最长长度
			/// </summary>
			/// <param name="listText"></param>
			/// <returns></returns>
			private int GetNumberMaxLength(List<string> listText)
			{
			int maxLength = 0;
			foreach (var text in listText)
			{
			string value = string.Empty;
			foreach (var c in text)
			{
			if (char.IsNumber(c) == true)
			{
			//数字
			value += c.ToString();
			continue;
			}
			else if (value != string.Empty)
			{
			//判断数字长度
			if (maxLength <= value.Length)
			{
			maxLength = value.Length;
			}
			value = string.Empty;
			}
			}
			//判断数字长度
			if (maxLength <= value.Length)
			{
			maxLength = value.Length;
			}
			}
			return maxLength;
			}

			#endregion