From e22fdb94322e6cec38e5e4a9aec13d431a133fde Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 28 四月 2020 16:32:35 +0800
Subject: [PATCH] 上传合并后的代码
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlResidenceLogic.cs | 65 ++++++++++++++++++++++++++++++++
1 files changed, 65 insertions(+), 0 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlResidenceLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlResidenceLogic.cs
index 50863d1..997240b 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlResidenceLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlResidenceLogic.cs
@@ -32,6 +32,71 @@
#endregion
+ #region 鈻� 鑾峰彇鏈湴浣忓畢鍒楄〃___________________
+
+ /// <summary>
+ /// 鑾峰彇鏈湴浣忓畢鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ public List<Common.House> GetLocalResidenceList()
+ {
+ //濡傛灉鏄櫄鎷熶綇瀹�,鍒欎粠鏍圭洰褰曚腑鑾峰彇
+ if (Common.Config.Instance.Home.IsVirtually == true)
+ {
+ //浠庢枃浠跺す涓幏鍙栧叏閮ㄧ殑浣忓畢瀵硅薄
+ return this.GetAllLocalResidenceListByDirectory();
+ }
+
+ var listHome = new List<Common.House>();
+ foreach (var housePath in Common.Config.Instance.HomeFilePathList)
+ {
+ var home = Common.House.GetHouseByFilePath(housePath);
+ if (home == null)
+ {
+ continue;
+ }
+ listHome.Add(home);
+ }
+ return listHome;
+ }
+
+ /// <summary>
+ /// 浠庢枃浠跺す涓幏鍙栧叏閮ㄧ殑浣忓畢瀵硅薄
+ /// </summary>
+ /// <returns></returns>
+ public List<Common.House> GetAllLocalResidenceListByDirectory()
+ {
+ var strPath = System.IO.Path.Combine(Shared.IO.FileUtils.RootPath, Common.Config.Instance.Guid);
+ var listHome = new List<Common.House>();
+ //鑾峰彇鍏ㄩ儴鐨勬枃浠跺す
+ var listDirectory = new List<string>();
+ var arryDirs = System.IO.Directory.GetDirectories(strPath);
+ foreach (var file in arryDirs)
+ {
+ string[] arry = file.Split(new string[] { "/" }, StringSplitOptions.RemoveEmptyEntries);
+ listDirectory.Add(arry[arry.Length - 1]);
+ }
+ foreach (var myDir in listDirectory)
+ {
+ //鑾峰彇鍚勪釜鏂囦欢澶归噷闈㈢殑浣忓畢鏂囦欢
+ string nowPath = System.IO.Path.Combine(strPath, myDir);
+ var arryHouse = System.IO.Directory.GetFiles(nowPath, "House_*");
+ if (arryHouse.Length > 0)
+ {
+ //璇诲彇鏂囦欢鍐呭
+ var textValue = UserCenterLogic.LoadFileContent(System.IO.Path.Combine(nowPath, arryHouse[0]));
+ if (textValue != null)
+ {
+ var myHouse = Newtonsoft.Json.JsonConvert.DeserializeObject<Common.House>(textValue);
+ listHome.Add(myHouse);
+ }
+ }
+ }
+ return listHome;
+ }
+
+ #endregion
+
#region 鈻� 涓�鑸柟娉昣__________________________
/// <summary>
--
Gitblit v1.8.0