From 330e3ae4cdd1e9facb14b6ea2b3e609166c04fd3 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 12 一月 2021 16:00:27 +0800
Subject: [PATCH] 2021-1-12-1
---
HDL_ON/Entity/DB_ResidenceData.cs | 65 ++++++++++++++------------------
1 files changed, 28 insertions(+), 37 deletions(-)
diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index c14cdec..8553884 100644
--- a/HDL_ON/Entity/DB_ResidenceData.cs
+++ b/HDL_ON/Entity/DB_ResidenceData.cs
@@ -1,4 +1,4 @@
-锘縰sing System;
+using System;
using System.Collections.Generic;
using System.IO;
using System.Threading;
@@ -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>
@@ -135,7 +107,7 @@
}
instance.residenceImage = "Classification/Room/Roombg.png";
//鍒濆鍖栦綇瀹呭姛鑳芥暟鎹�
- SpatialInfo.CurrentSpatial.InitRoomFunction();
+ SpatialInfo.CurrentSpatial.InitRoomListFunctions();
}
return instance;
@@ -149,10 +121,16 @@
instance = null;
ins_OidList = null;
HomeGateway = null;
+ //閲嶇疆缃戝叧鐘舵��
+ DriverLayer.Control.Ins.GatewayOnline = false;
SpatialInfo.CurrentSpatial.Clear();
FunctionList.List.Clear();
- if (MainPage.IsRemote)
+
+ ///鍒囨崲浣忓畢娓呯┖鍓嶄綇瀹呯紦瀛樿嚜鍔ㄥ寲鍒楄〃锛�
+ HDL_ON.UI.UI2.Intelligence.Automation.Logic.LogicList.Clear();
+ if (HDL_ON.DriverLayer.Control.Ins.IsRemote)
{
+ DriverLayer.Control.Ins.IsRemote = false;
DAL.Mqtt.MqttClient.DisConnectRemote("閫�鍑虹櫥褰曪紝鎴栬�呭垏鎹綇瀹�");
}
}
@@ -185,7 +163,10 @@
}
}
}
-
+ /// <summary>
+ /// 璁板綍绐楀笜鍏ㄥ紑鍏ㄥ叧鐘舵��
+ /// </summary>
+ public bool GlobalCurtainStatus = false;
/// <summary>
/// 妫�娴嬩綇瀹呮槸鍚︾粦瀹氫簡缃戝叧
/// gatewayId 鍒ょ┖
@@ -267,11 +248,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>
/// 鏍圭洰褰�
@@ -431,4 +422,4 @@
#endregion
}
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0