Merge branch 'CJL-NEW'

wxr

2020-12-11 1bb8683aef25143048e572b65734de4772bfc712

 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;
                }