From b1b339264a5b4f419fcab381c342bfae560f4f2d Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 09 十二月 2020 15:40:09 +0800
Subject: [PATCH] 2020-12-09 1.修改退出登录方法。
---
HDL_ON/Entity/DB_ResidenceData.cs | 79 ++++++++++++++-------------------------
1 files changed, 29 insertions(+), 50 deletions(-)
diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index f733b0e..0b13ff5 100644
--- a/HDL_ON/Entity/DB_ResidenceData.cs
+++ b/HDL_ON/Entity/DB_ResidenceData.cs
@@ -134,25 +134,6 @@
instance.SaveResidenceData();
}
- new Light()
- {
- sid = "030101123456780202010005ABCD",
- name = "鐏厜1",
- attributes = new List<FunctionAttributes>() {
- new FunctionAttributes { key="on_off", max=100,min = 0, value= new List<string> { "on","off"} },
- },
- roomIds = new List<string>() { "0001" },
- bus_Data = new BusData
- {
- addresses = "2A06",
- loopId = 1,
- },
- }.SaveFunctionData();
-
-
-
-
-
}
catch (Exception ex)
@@ -287,43 +268,41 @@
public List<Room> Rooms = SpatialInfo.CurrentSpatial.RoomList;
#region 鍔熻兘鏁版嵁
- public static FunctionList functionList = FunctionList.List;
-
- /// <summary>
- /// 鍒锋柊浣忓畢閲岄潰鐨勬悳绱㈣澶囩姸鎬�
- /// </summary>
- public void RefreshResidenceFunctionStatus()
+ static FunctionList _functionList;
+ public static FunctionList functionList
{
- new Thread(() =>
+ get
{
- try
+ if (_functionList == null)
{
- foreach (var function in functionList.GetAllDeviceFunctionList())
- {
- Thread.Sleep(100);
- switch (function.functionCategory)
- {
- case FunctionCategory.Light:
- case FunctionCategory.Electrical:
- case FunctionCategory.SwitchDevice:
- case FunctionCategory.Curtain:
- case FunctionCategory.Thermostat:
- if (DB_ResidenceData.residenceData.GatewayType == 0)
- {
- DriverLayer.Control.Ins.SendReadCommand(function);
- }
- break;
- }
- }
+ _functionList = FunctionList.List;
}
- catch (Exception ex)
- {
- MainPage.Log($"Refresh Residence Function Status Error : {ex.Message}");
- }
- })
- { IsBackground = true }.Start();
+ return _functionList;
+ }
+ set
+ {
+ _functionList = value;
+ }
}
+ ///// <summary>
+ ///// 鍒锋柊浣忓畢閲岄潰鐨勬悳绱㈣澶囩姸鎬�
+ ///// </summary>
+ //public void RefreshResidenceFunctionStatus()
+ //{
+ // new Thread(() =>
+ // {
+ // if(_functionList == null)
+ // {
+ // _functionList = FunctionList.List;
+ // }
+ // return _functionList;
+ // }
+ // set
+ // {
+ // _functionList = value;
+ // }
+ //}
#endregion
--
Gitblit v1.8.0