From f718d23a262a5a8e1241fdeaeb4153399f95e79d Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期二, 21 四月 2020 09:19:05 +0800 Subject: [PATCH] 20200421 --- HDL_ON/Entity/DB_ResidenceData.cs | 26 +++++++++++++++++++------- 1 files changed, 19 insertions(+), 7 deletions(-) diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs index 82843cc..d1c38bc 100644 --- a/HDL_ON/Entity/DB_ResidenceData.cs +++ b/HDL_ON/Entity/DB_ResidenceData.cs @@ -9,10 +9,21 @@ public DB_ResidenceData() { } + /// <summary> - /// 浣忓畢鍚嶇О + /// 褰撳墠閫夋嫨鐨勪綇瀹呯储寮� /// </summary> - public string residenceName; + public int CurReginIndex = 0; + + /// <summary> + /// 浣忓畢鍩虹淇℃伅 + /// </summary> + public RegionInfoRes residecenInfo { + get + { + return MainPage.LoginUser.regionList[CurReginIndex]; + } + } /// <summary> /// 妤煎眰鍒楄〃 @@ -262,7 +273,6 @@ { MainPage.Log($"浣忓畢鏁版嵁鍒濆鍖栧け璐ワ細{ex.Message}"); } - instance.residenceName = "濡効鐨勫"; instance.residenceImage = "Classification/Room/Roombg.png"; //鍒濆鍖栦綇瀹呭姛鑳芥暟鎹� InitRoomFunction(); @@ -271,7 +281,7 @@ return instance; } } - public RegionInfoRes residecenInfo; + /// <summary> @@ -293,9 +303,11 @@ //new System.Threading.Thread(() => //{ // System.Threading.Thread.Sleep(5000); - var ssd = CommonPage.MyEncodingUTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this)); - FileUtils.WriteFileByBytes("DB_ResidenceData", ssd); - MainPage.Log("Save DB_ResidenceData"); + if (this == null|| this.residecenInfo==null) + return; + var ssd = CommonPage.MyEncodingUTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this)); + FileUtils.WriteFileByBytes("DB_ResidenceData", ssd); + MainPage.Log("Save DB_ResidenceData"); // hasChange = false; //}) //{ IsBackground = true }.Start(); -- Gitblit v1.8.0