From a4f57bf9dda3d52e04f537a2ca24db95761eb888 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 11 十二月 2020 11:34:14 +0800
Subject: [PATCH] Revert "Merge branch 'CJL-NEW' into NewFilePath"
---
HDL_ON/Entity/DB_ResidenceData.cs | 45 +++++++++++++++++----------------------------
1 files changed, 17 insertions(+), 28 deletions(-)
diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index 0d6b029..fba65b2 100644
--- a/HDL_ON/Entity/DB_ResidenceData.cs
+++ b/HDL_ON/Entity/DB_ResidenceData.cs
@@ -45,12 +45,6 @@
return new RegionInfoRes();
}
}
-
- //if (curRegion == null)
- //{
- // CurReginID = UserInfo.Current.regionList[0].RegionID;
- // return UserInfo.Current.regionList[0];
- //}
return curRegion;
}
}
@@ -133,27 +127,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)
{
@@ -176,6 +149,7 @@
Rooms = null;
ins_OidList = null;
functionList = null;
+ HomeGateway = null;
if (MainPage.IsRemote)
{
DAL.Mqtt.MqttClient.DisConnectRemote("閫�鍑虹櫥褰曪紝鎴栬�呭垏鎹綇瀹�");
@@ -287,7 +261,22 @@
public List<Room> Rooms = SpatialInfo.CurrentSpatial.RoomList;
#region 鍔熻兘鏁版嵁
- public static FunctionList functionList = FunctionList.List;
+ static FunctionList _functionList;
+ public static FunctionList functionList
+ {
+ get
+ {
+ if (_functionList == null)
+ {
+ _functionList = FunctionList.List;
+ }
+ return _functionList;
+ }
+ set
+ {
+ _functionList = value;
+ }
+ }
#endregion
--
Gitblit v1.8.0