From 0bd4d1702248641f180345a086e5b3f58e6eb04c Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 15 十二月 2020 17:13:23 +0800
Subject: [PATCH] 2020-12-15 1.更新
---
HDL_ON/Entity/DB_ResidenceData.cs | 48 ++++++++++++++++--------------------------------
1 files changed, 16 insertions(+), 32 deletions(-)
diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index c14cdec..1478f42 100644
--- a/HDL_ON/Entity/DB_ResidenceData.cs
+++ b/HDL_ON/Entity/DB_ResidenceData.cs
@@ -7,6 +7,7 @@
namespace HDL_ON.Entity
{
+ [System.Serializable]
public class DB_ResidenceData
{
public DB_ResidenceData()
@@ -18,7 +19,8 @@
/// </summary>
public string MasterToken;
- RegionInfoRes _residecenInfo;
+ //RegionInfoRes _residecenInfo;
+ RegionInfoRes _residecenInfo = new RegionInfoRes();
/// <summary>
/// 浣忓畢鍩虹淇℃伅
/// </summary>
@@ -53,36 +55,6 @@
}
}
- ///// <summary>
- ///// 鑾峰彇缃戝叧鍒楄〃
- ///// </summary>
- //void GetHomeGatewayList()
- //{
- // new Thread(() =>
- // {
- // //鍒囨崲浣忓畢鍚庯紝鏌ヨ涓�娆＄綉鍏冲垪琛�
- // new HttpServerRequest().GetHomeGatewayList();
- // })
- // { IsBackground = true }.Start();
-
- //}
-
- //string curReginID;
- ///// <summary>
- ///// 褰撳墠閫夋嫨鐨勪綇瀹呯储寮�
- ///// </summary>
- //public string CurReginID
- //{
- // set
- // {
- // curReginID = value;
- // GetHomeGatewayList();
- // }
- // get
- // {
- // return curReginID;
- // }
- //}
/// <summary>
/// 鍔熻兘绫诲瀷鍒楄〃
/// </summary>
@@ -267,11 +239,21 @@
var ssd = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this));
WirteResidenceInfo(ssd);
}
-
/// <summary>
/// 褰撳墠閫夋嫨鐨勬ゼ灞�
/// </summary>
public string CurFoor = Language.StringByID(StringId.All);
+
+ /// <summary>
+ /// 褰撳墠閫夋嫨鐨勬ゼ灞�
+ /// </summary>
+ [Newtonsoft.Json.JsonIgnore]
+ public SpatialInfo CurFloor = new SpatialInfo() { roomId = "", roomName = Language.StringByID(StringId.All)};
+ /// <summary>
+ /// 鍒嗙被鐣岄潰鏄剧ず鐨勬ゼ灞�
+ /// </summary>
+ [Newtonsoft.Json.JsonIgnore]
+ public SpatialInfo ClassificationChooseFloor = new SpatialInfo() { roomId = "", roomName = Language.StringByID(StringId.All) };
/// <summary>
/// 鏍圭洰褰�
@@ -283,6 +265,7 @@
/// <returns></returns>
static byte[] ReadResidenceInfo()
{
+ MainPage.Log("get file Instance ");
var fileName = "DB_ResidenceData";
FileStream fs = null;
try
@@ -310,6 +293,7 @@
}
finally
{
+ MainPage.Log("get file ");
try
{
if (fs != null)
--
Gitblit v1.8.0