From 652243206427f35a256400a149a1734085824cb9 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期三, 02 九月 2020 17:35:03 +0800
Subject: [PATCH] 2020-09-02-4
---
ZigbeeApp/Shared/Common/House.cs | 478 ++++++++++-------------------------------------------------
1 files changed, 81 insertions(+), 397 deletions(-)
diff --git a/ZigbeeApp/Shared/Common/House.cs b/ZigbeeApp/Shared/Common/House.cs
index 436c302..ae86e44 100755
--- a/ZigbeeApp/Shared/Common/House.cs
+++ b/ZigbeeApp/Shared/Common/House.cs
@@ -23,17 +23,14 @@
return $"House_{Id}.json";
}
}
-
/// <summary>
/// 浣忓畢id--浣跨敤浜戠鎻愪緵鐨勪綇瀹呭敮涓�Id
/// </summary>
public string Id = string.Empty;
-
/// <summary>
/// 浣忓畢鍚嶇О
/// </summary>
public string Name = string.Empty;
-
/// <summary>
/// 鏄惁涓哄叾浠栦富鐢ㄦ埛鍒嗕韩杩囨潵鐨勪綇瀹�
/// </summary>
@@ -42,7 +39,10 @@
/// 褰撳墠浣忓畢鏄叾浠栦富甯愬彿鍒嗕韩杩囨潵鐨勪富甯愬彿鐨勫垎甯冨紡Id
/// </summary>
public string MainUserDistributedMark;
-
+ /// <summary>
+ /// 璇ヤ綇瀹呮槸鍚︽槸铏氭嫙鐨�,true鐨勮瘽浠ｈ〃缃戝叧鍜岃澶囬兘鏄櫄鎷熺殑(榛樿涓篺alse)
+ /// </summary>
+ public bool IsVirtually = false;
/// <summary>
/// 浠呭瓙璐﹀彿鐧婚檰鐨勬椂鍊欎娇鐢�,褰撱�怚sOthreShare銆戜负"true"锛屽苟涓斻�怉ccountType銆戜负"1"鏃讹紝璇ヨ处鍙锋嫢鏈夌鐞嗗憳鏉冮檺
/// </summary>
@@ -55,12 +55,10 @@
/// 绾害
/// </summary>
public double Latitude = 0;
-
- /// <summary>
- /// 鎴块棿璺緞鍒楄〃
+ /// <summary>
+ /// 浣忓畢鎵�鍦ㄧ殑鍦扮悊浣嶇疆鐨勫悕绉�
/// </summary>
- public List<string> RoomFilePathList = new List<string> { };
-
+ public string ResidenceAddressName = string.Empty;
/// <summary>
/// 妤煎眰瀛楀吀
/// key:FloorId
@@ -68,348 +66,57 @@
/// </summary>
public Dictionary<string,string> FloorDics = new Dictionary<string,string> { };
/// <summary>
- /// 褰撳墠妤煎眰
+ /// -1:鏈厤缃�(闇�瑕侀噸鏂伴�夋嫨) 1:鏃犳ā鏉挎湁璁惧 2:鏈夋ā鏉挎湁璁惧 3:鏃犳ā鏉挎棤璁惧(璇锋棤瑙嗚繖涓彉閲�)
/// </summary>
- public string CurrentFloorId;
-
+ public int TemplateMode = -1;
/// <summary>
- /// 鍏ㄥ眬鍦烘櫙璺緞鍒楄〃---澶囩敤
+ /// 璇ヤ綇瀹呮槸鍚︽槸灞曠ず妯℃澘(姝ゅ彉閲忔槸缁欐煡鐪嬫ā鏉挎暟鎹椂浣跨敤鐨�,璇锋棤瑙嗚繖涓彉閲�)
/// </summary>
- public List<string> SceneFilePathList = new List<string> { };
+ [Newtonsoft.Json.JsonIgnore]
+ public bool IsShowTemplate = false;
/// <summary>
- /// 璁惧璺緞鍒楄〃---澶囩敤
+ /// 褰撳墠浣忓畢閫夋嫨鐨勬ā鏉垮悕瀛�(璇锋棤瑙嗚繖涓彉閲�)
/// </summary>
- public List<string> DeviceFilePathList = new List<string> { };
+ public string SelectTemplate = string.Empty;
/// <summary>
- /// 鍔熻兘璺緞鍒楄〃---澶囩敤
+ /// 鑷畾涔夊崟鍏冪殑鏍囬鍚嶇О(涓嶭istUintContent涓暟鍖归厤,璇锋棤瑙嗚繖涓彉閲�)
/// </summary>
- public List<string> FunctionFilePathList = new List<string> { };
+ public List<string> ListUintName = new List<string>();
/// <summary>
- /// 閫氱敤鏍囪瘑--澶囩敤
+ /// 鑷畾涔夊崟鍏冪殑鍐呭(涓嶭istUintName涓暟鍖归厤,璇锋棤瑙嗚繖涓彉閲�)
/// </summary>
- public object Tag;
+ public List<string> ListUintContent = new List<string>();
/// <summary>
- /// 鏈熴�佹爧銆佸眰绛夊尯鍩�---澶囩敤
+ /// 鏈�鍚庣紪杈戠殑浜嬩欢(2020.05.26杩藉姞) 1970/12/31 23:59鏍煎紡
/// </summary>
- public Dictionary<string, string> LocationInfoList = new Dictionary<string, string> { };
-
- #endregion
-
- #region 鈼� 浣忓畢____________________________
-
- #region 鈼� 娣诲姞浣忓畢_________________________
-
+ public string LastEditorTime = "1970/12/31 23:59";
/// <summary>
- /// 娣诲姞浣忓畢
+ /// 鏍囪瘑姝や綇瀹呯殑鏁版嵁鏄惁宸茬粡鍙戦�佽繃妯℃澘鏁版嵁缁欑綉鍏�(鍙拡瀵筎emplateMode=2,璇锋棤瑙嗚繖涓彉閲�)
/// </summary>
- /// <param name="houseId">浣忓畢id</param>
- /// <param name="houseName">浣忓畢鍚嶇О.</param>
- /// <param name="numHomeId">浣忓畢鏁板瓧鍨媔d</param>
- public static void AddHouse(string houseId, string houseName, int numHomeId)
- {
- AddHouse(houseId, houseName, false, 0);
- }
-
+ public bool SendTemplateSuccess = false;
/// <summary>
- /// 娣诲姞浣忓畢
+ /// 杩欎釜浣忓畢涓嬫墍鎷ユ湁鐨勭綉鍏砳d(2020.05.26杩藉姞,null浠ｈ〃娌℃湁澶勭悊杩�,璇锋棤瑙嗚繖涓彉閲�)
/// </summary>
- /// <param name="houseId">浣忓畢id</param>
- /// <param name="houseName">浣忓畢鍚嶇О.</param>
- /// <param name="isOthreShare">鏄惁涓哄叾浠栦富鐢ㄦ埛鍒嗕韩杩囨潵鐨勪綇瀹�</param>
- /// <param name="accountType">浠呭瓙璐﹀彿鐧婚檰鐨勬椂鍊欎娇鐢�,褰撱�怚sOthreShare銆戜负"true"锛屽苟涓斻�怉ccountType銆戜负"1"鏃讹紝璇ヨ处鍙锋嫢鏈夌鐞嗗憳鏉冮檺</param>
- public static void AddHouse(string houseId, string houseName, bool isOthreShare, int accountType)
- {
- var home = new House
- {
- Id = houseId,
- Name = houseName,
- IsOthreShare = isOthreShare,
- AccountType = accountType
- };
- //鍒涘缓鏂囦欢澶�
- Global.CreateHomeDirectory(houseId);
- home.Save();
- Config.Instance.HomeFilePathList.Add(home.FileName);
- Config.Instance.Save();
- }
-
-
- #endregion
-
- #region 鈼� 鍒犻櫎浣忓畢_________________________
-
+ [Newtonsoft.Json.JsonIgnore]
+ public List<string> listGatewayId = null;
/// <summary>
- /// 鍒犻櫎浣忓畢
+ /// <para>鏍囪瘑浣忓畢鏁版嵁鐨勫尯鍒�(鏂囦欢璇诲彇鏃堕厤缃�,璇锋棤瑙嗚繖涓彉閲�)锛�</para>
+ /// <para>1:鏈韩鑷繁鐨勬暟鎹�(鏂囦欢澶瑰悕瀛椾负浣忓畢id)</para>
+ /// <para>2:鑷繁鎵嬪姩鍒涘缓鐨勪繚瀛樺湪鏈満鐨勫浠�(鏂囦欢澶瑰悕瀛椾互銆怋ackupResidenceData銆戝紑澶�)</para>
+ /// <para>3:姝ゆ暟鎹粠浜戠涓嬭浇鑰屾潵(鏂囦欢澶瑰悕瀛椾互銆怐ownLoadResidenceData銆戝紑澶�)</para>
/// </summary>
- /// <param name="filePath">File path.</param>
- public static void DeleteHouse(string filePath)
- {
- 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 = GetHouseFileListByFilePath(filePath);
- 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();
- }
-
+ [Newtonsoft.Json.JsonIgnore]
+ public int HouseDataDiv = 1;
/// <summary>
- /// 鍒犻櫎浣忓畢
+ /// 褰撳墠浣忓畢鐨勫湪绾跨姸鎬� -1:铏氭嫙 0:绂荤嚎 1:鏈湴 2:杩滅▼ 3:璇诲彇涓�(璇锋棤瑙嗚繖涓彉閲�)
/// </summary>
- /// <param name="houseId">House identifier.</param>
- public static void DeleteHouseByHouseId(string houseId)
- {
- DeleteHouse(GetHouseFilePathByHouseId(houseId));
- }
-
- #endregion
-
- #region 鈼� 淇敼浣忓畢_________________________
-
+ [Newtonsoft.Json.JsonIgnore]
+ public string NowHomeOnlineStatu = "3";
/// <summary>
- /// 淇敼浣忓畢.
+ /// 褰撳墠瀛樻斁浣忓畢鏁版嵁鐨勬枃浠跺す鍚嶅瓧(姝ゅ彉閲忔槸缁欐湰鏈哄浠�,鎴栬�呬簯绔笅杞藉浠戒娇鐢ㄧ殑,璇锋棤瑙嗚繖涓彉閲�)
/// </summary>
- /// <param name="houseId">House identifier.</param>
- /// <param name="houseName">House name.</param>
- public static void EditorHouseByHouseId(string houseId, string houseName)
- {
- var home = GetHouseByHouseId(houseId);
- if (home == null)
- {
- return;
- }
- home.Name = houseName;
- home.Save();
- Config.Instance.Save();
- }
-
- #endregion
-
- #region 鈼� 鑾峰彇浣忓畢_________________________
- /// <summary>
- /// 閫氳繃銆恑d銆戣幏鍙栦綇瀹�
- /// </summary>
- /// <returns>The house by house identifier.</returns>
- /// <param name="houseId">浣忓畢id</param>
- public static 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 static 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>
- /// Gets the home lists.鑾峰彇浣忓畢鍒楄〃
- /// </summary>
- public static async System.Threading.Tasks.Task<List<string>> GetHomeLists()
- {
- //娓呯┖褰撳墠浣忓畢鍒楄〃
- Config.Instance.HomeFilePathList.Clear();
- 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)
- {
- //褰撲綇瀹呬负绌烘椂鍏堟彁绀虹敤鎴锋柊寤轰綇瀹�
- var alert = new Alert(Language.StringByID(R.MyInternationalizationString.TIP), Language.StringByID(R.MyInternationalizationString.CurrentlyTheUserIshHouseIsEmptyPleaseBuildANewHouseFirst), Language.StringByID(R.MyInternationalizationString.Close), Language.StringByID(R.MyInternationalizationString.OK));
- alert.Show();
- alert.ResultEventHandler += (sender, e) =>
- {
- if (e)
- {
- //
- }
- };
- }
- else
- {
- if (Config.Instance.HomeId == string.Empty && responseDataObj.PageData.Count > 0)
- {
- //璧嬩竴涓垵濮嬪��
- Config.Instance.HomeId = responseDataObj.PageData[0].Id;
- }
- 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();
- }
- //鍖归厤褰撳墠浣忓畢
- if (Config.Instance.HomeFilePathList.Find((obj) => obj == $"House_{Config.Instance.HomeId}.json") == null)
- {
- Config.Instance.HomeId = GetHouseIdByFilePath(Config.Instance.HomeFilePathList[0]);
- }
- Config.Instance.Save();
- //妫�娴嬩綇瀹呭璞�
- if (Config.Instance.Home.Id == string.Empty)
- {
- Config.Instance.Home = House.GetHouseByHouseId(Config.Instance.HomeId);
- }
- }
- }
- }
- catch (Exception ex)
- {
- System.Console.WriteLine($"鑾峰彇澶辫触{ex.Message}");
- }
- finally
- {
- }
- return Config.Instance.HomeFilePathList;
- }
-
- #endregion
-
- #region 鈼� 鑾峰彇浣忓畢id_______________________
- /// <summary>
- /// 閫氳繃銆愭枃浠惰矾寰勩�戣幏鍙栦綇瀹卛d
- /// </summary>
- /// <returns>The house identifier by file path.</returns>
- /// <param name="filePath">鏂囦欢璺緞</param>
- public static string GetHouseIdByFilePath(string filePath)
- {
- string[] sArray = filePath.Split(new string[] { "House_", ".json" }, StringSplitOptions.RemoveEmptyEntries);
- if (sArray.Length >= 1)
- {
- return sArray[0];
- }
- return null;
- }
-
- #endregion
-
- #region 鈼� 鑾峰彇浣忓畢璺緞_____________________
- /// <summary>
- /// 閫氳繃銆愪綇瀹卛d銆戣幏鍙栦綇瀹呰矾寰�
- /// </summary>
- /// <returns>The house identifier by file path.</returns>
- /// <param name="houseId">浣忓畢id</param>
- public static string GetHouseFilePathByHouseId(string houseId)
- {
- if (string.IsNullOrEmpty(houseId))
- {
- return null;
- }
- return $"House_{houseId}.json";
- }
-
- #endregion
-
- #region 鈼� 鑾峰彇璇ヤ綇瀹呯殑鏂囦欢鍒楄〃______________
-
- /// <summary>
- /// 閫氳繃銆恏ouseId銆戣幏鍙栬浣忓畢鐨勬枃浠跺垪琛�
- /// </summary>
- /// <returns>The house file list by home identifier.</returns>
- /// <param name="houseId">House identifier.</param>
- public static 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;
- }
-
- /// <summary>
- /// 閫氳繃銆愭枃浠惰矾寰勩�戣幏鍙栦綇瀹呬笅鏂囦欢鍒楄〃
- /// </summary>
- /// <returns>The house file list by file path.</returns>
- /// <param name="filePath">File path.</param>
- public static List<string> GetHouseFileListByFilePath(string filePath)
- {
- return GetHouseFileListByHomeId(GetHouseIdByFilePath(filePath));
- }
-
- #endregion
+ [Newtonsoft.Json.JsonIgnore]
+ public string SaveDirctoryName = string.Empty;
#endregion
@@ -419,79 +126,48 @@
/// GetCurrentFloorName
/// </summary>
/// <returns></returns>
+ [Newtonsoft.Json.JsonIgnore]
public string GetCurrentFloorName
{
get
- {
- return GetFloorNameById(CurrentFloorId);
+ {
+ return HdlResidenceLogic.Current.GetFloorNameById(CurrentFloorId);
}
- }
-
+ }
+ /// <summary>
+ /// 褰撳墠妤煎眰id
+ /// </summary>
+ private string m_CurrentFloorId = string.Empty;
/// <summary>
- /// 鑾峰彇妤煎眰鍚嶇О
+ /// 褰撳墠妤煎眰Id
/// </summary>
- /// <param name="floorId"></param>
- /// <returns></returns>
- public string GetFloorNameById(string floorId)
- {
- if (Config.Instance.Home.FloorDics.Count == 0)
- {
- return null;
- }
-
- foreach (var floor in Config.Instance.Home.FloorDics)
- {
- if (floorId == floor.Key)
- {
- return floor.Value;
- }
- }
- return null;
+ [Newtonsoft.Json.JsonIgnore]
+ public string CurrentFloorId
+ {
+ //鏉ュ洖鍒囨崲澶囦唤,浼氬嚭鐜伴棶棰�,妤煎眰id娌℃竻闄�
+ get
+ {
+ //娌℃湁妤煎眰
+ if (this.FloorDics.Count == 0) { return string.Empty; }
+
+ if (this.FloorDics.ContainsKey(m_CurrentFloorId) == true)
+ {
+ //褰撳墠鐨勬ゼ灞俰d娌￠棶棰�
+ return m_CurrentFloorId;
+ }
+ //濡傛灉褰撳墠璁剧疆鐨勬ゼ灞俰d骞朵笉瀛樺湪鐨勮瘽,閲嶆柊璁剧疆
+ m_CurrentFloorId = string.Empty;
+ var dicFloor = HdlRoomLogic.Current.GetFloorSortList();
+ foreach (var floorId in dicFloor.Keys)
+ {
+ //缁欎竴涓繃鍘诲嵆鍙�
+ m_CurrentFloorId = floorId;
+ break;
+ }
+ return m_CurrentFloorId;
+ }
+ set { m_CurrentFloorId = value; }
}
-
- #endregion
-
- #region 鈼� 鎴块棿____________________________
-
- #region 鈼� 娣诲姞鎴块棿璺緞_________________________
-
- /// <summary>
- /// 娣诲姞銆愭埧闂磋矾寰勩�戝埌鎴块棿璺緞鍒楄〃
- /// </summary>
- /// <returns><c>true</c>, if room list file path was added, <c>false</c> otherwise.</returns>
- /// <param name="roomFilePath">Room file path.</param>
- public bool AddRoomListFilePath(string roomFilePath)
- {
- if (RoomFilePathList.Contains(roomFilePath))
- {
- return false;
- }
- RoomFilePathList.Add(roomFilePath);
- Save();
- return true;
- }
-
- #endregion
-
- #region 鈼� 鍒犻櫎鎴块棿璺緞_________________________
-
- /// <summary>
- /// 绉婚櫎鎴块棿璺緞
- /// </summary>
- /// <returns><c>true</c>, if room list file path was added, <c>false</c> otherwise.</returns>
- /// <param name="roomFilePath">Room file path.</param>
- public bool RemoveRoomListFilePath(string roomFilePath)
- {
- if (!RoomFilePathList.Contains(roomFilePath))
- {
- return false;
- }
- RoomFilePathList.Remove(roomFilePath);
- Save();
- return true;
- }
-
- #endregion
#endregion
@@ -503,6 +179,13 @@
/// <param name="autoBackup">鏄惁澶囦唤</param>
public void Save(bool autoBackup = true)
{
+ //濡傛灉褰撳墠鏄睍绀烘ā鏉�,鍒欎笉鍏佽淇濆瓨
+ if (this.IsShowTemplate == true)
+ {
+ return;
+ }
+ //淇敼鏃堕棿
+ this.LastEditorTime = DateTime.Now.ToString("yyyy/MM/dd HH:mm");
var path = System.IO.Path.Combine(Shared.IO.FileUtils.RootPath, Config.Instance.Guid, Id);
//濡傛灉娌℃湁瀛樺湪浣忓畢鐩綍锛屽厛鍒涘缓
if (!System.IO.Directory.Exists(path))
@@ -510,7 +193,8 @@
System.IO.Directory.CreateDirectory(path);
}
path = System.IO.Path.Combine(path, FileName);
- Shared.IO.FileUtils.WriteFileByBytes(path, System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this)));
+ HdlFileLogic.Current.SaveFileContent(path, this);
+
if (autoBackup == true && Id == Config.Instance.HomeId)
{
HdlAutoBackupLogic.AddOrEditorFile(FileName);
--
Gitblit v1.8.0