From e98dd6fa77e40c43fd6758f19250243a16d1e284 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 26 二月 2021 14:22:23 +0800
Subject: [PATCH] 再次上传
---
HDL_ON/Entity/DB_ResidenceData.cs | 72 ++++++++++++++---------------------
1 files changed, 29 insertions(+), 43 deletions(-)
diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index 8b64843..8cbd2a2 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;
@@ -55,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>
@@ -121,10 +91,10 @@
ShowFunction.Light,ShowFunction.AC,ShowFunction.Curtain,
ShowFunction.FloorHeating,ShowFunction.Music,
ShowFunction.Electric,ShowFunction.Environmental,
- //ShowFunction.EnergyMonitoring,
- //ShowFunction.FreshAir,ShowFunction.DoorLock,
- //ShowFunction.Panel,ShowFunction.SecurityMonitoring,
- //ShowFunction.Sensor,ShowFunction.VideoIntercom
+ ShowFunction.EnergyMonitoring,
+ ShowFunction.FreshAir,ShowFunction.DoorLock,
+ ShowFunction.Panel,ShowFunction.SecurityMonitoring,
+ ShowFunction.Sensor,ShowFunction.VideoIntercom
});
instance.SaveResidenceData();
}
@@ -137,7 +107,7 @@
}
instance.residenceImage = "Classification/Room/Roombg.png";
//鍒濆鍖栦綇瀹呭姛鑳芥暟鎹�
- SpatialInfo.CurrentSpatial.InitRoomFunction();
+ SpatialInfo.CurrentSpatial.InitRoomListFunctions();
}
return instance;
@@ -151,12 +121,15 @@
instance = null;
ins_OidList = null;
HomeGateway = null;
+ //閲嶇疆缃戝叧鐘舵��
+ DriverLayer.Control.Ins.GatewayOnline_Cloud = false;
+ DriverLayer.Control.Ins.GatewayOnline_Local = false;
SpatialInfo.CurrentSpatial.Clear();
FunctionList.List.Clear();
- if (MainPage.IsRemote)
- {
- DAL.Mqtt.MqttClient.DisConnectRemote("閫�鍑虹櫥褰曪紝鎴栬�呭垏鎹綇瀹�");
- }
+
+ ///鍒囨崲浣忓畢娓呯┖鍓嶄綇瀹呯紦瀛樿嚜鍔ㄥ寲鍒楄〃锛�
+ HDL_ON.UI.UI2.Intelligence.Automation.Logic.LogicList.Clear();
+ DAL.Mqtt.MqttClient.DisConnectRemote("閫�鍑虹櫥褰曪紝鎴栬�呭垏鎹綇瀹�");
}
/// <summary>
@@ -187,7 +160,10 @@
}
}
}
-
+ /// <summary>
+ /// 璁板綍绐楀笜鍏ㄥ紑鍏ㄥ叧鐘舵��
+ /// </summary>
+ public bool GlobalCurtainStatus = false;
/// <summary>
/// 妫�娴嬩綇瀹呮槸鍚︾粦瀹氫簡缃戝叧
/// gatewayId 鍒ょ┖
@@ -269,11 +245,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>
/// 鏍圭洰褰�
@@ -433,4 +419,4 @@
#endregion
}
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0