From f35f1397c980efdc2542dff7aaa23b1a7dbb65e7 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期三, 16 十二月 2020 10:53:34 +0800
Subject: [PATCH] 2020-12-16-1
---
HDL_ON/Entity/DB_ResidenceData.cs | 55 ++++++++++++++++++++++---------------------------------
1 files changed, 22 insertions(+), 33 deletions(-)
diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index c14cdec..16fb651 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>
@@ -151,6 +123,8 @@
HomeGateway = null;
SpatialInfo.CurrentSpatial.Clear();
FunctionList.List.Clear();
+ ///鍒囨崲浣忓畢娓呯┖鍓嶄綇瀹呯紦瀛樿嚜鍔ㄥ寲鍒楄〃锛�
+ HDL_ON.UI.UI2.Intelligence.Automation.Logic.LogicList.Clear();
if (MainPage.IsRemote)
{
DAL.Mqtt.MqttClient.DisConnectRemote("閫�鍑虹櫥褰曪紝鎴栬�呭垏鎹綇瀹�");
@@ -185,7 +159,10 @@
}
}
}
-
+ /// <summary>
+ /// 璁板綍绐楀笜鍏ㄥ紑鍏ㄥ叧鐘舵��
+ /// </summary>
+ public bool GlobalCurtainStatus = false;
/// <summary>
/// 妫�娴嬩綇瀹呮槸鍚︾粦瀹氫簡缃戝叧
/// gatewayId 鍒ょ┖
@@ -267,11 +244,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 +270,7 @@
/// <returns></returns>
static byte[] ReadResidenceInfo()
{
+ MainPage.Log("get file Instance ");
var fileName = "DB_ResidenceData";
FileStream fs = null;
try
@@ -310,6 +298,7 @@
}
finally
{
+ MainPage.Log("get file ");
try
{
if (fs != null)
--
Gitblit v1.8.0