From 1bb8683aef25143048e572b65734de4772bfc712 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 11 十二月 2020 10:48:17 +0800
Subject: [PATCH] Merge branch 'CJL-NEW'
---
HDL_ON/Entity/DB_ResidenceData.cs | 14 ++++----------
1 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index f11328a..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,8 +127,6 @@
});
instance.SaveResidenceData();
}
-
-
}
catch (Exception ex)
{
@@ -157,6 +149,7 @@
Rooms = null;
ins_OidList = null;
functionList = null;
+ HomeGateway = null;
if (MainPage.IsRemote)
{
DAL.Mqtt.MqttClient.DisConnectRemote("閫�鍑虹櫥褰曪紝鎴栬�呭垏鎹綇瀹�");
@@ -269,10 +262,11 @@
#region 鍔熻兘鏁版嵁
static FunctionList _functionList;
- public static FunctionList functionList {
+ public static FunctionList functionList
+ {
get
{
- if(_functionList == null)
+ if (_functionList == null)
{
_functionList = FunctionList.List;
}
--
Gitblit v1.8.0