2020-12-12 1.解锁逻辑优化

JLChen

2020-12-12 b3abfd30576871c32f2839a322fa3bb783f96498

 HDL_ON/Entity/DB_ResidenceData.cs

@@ -142,10 +142,11 @@
        public void EixtAccount()
        {
            instance = null;
            Rooms = null;
            ins_OidList = null;
            functionList = null;
            HomeGateway = null;
            SpatialInfo.CurrentSpatial.ClearRooms();
            //UserInfo.Current.ClearUserInfo();
            if (MainPage.IsRemote)
            {
                DAL.Mqtt.MqttClient.DisConnectRemote("退出登录，或者切换住宅");
@@ -180,6 +181,24 @@
                }
            }
        }

        /// <summary>
        /// 检测住宅是否绑定了网关
        /// gatewayId 判空
        /// </summary>
        /// <returns></returns>
        public bool CheckWhetherGatewayIdIsNull()
        {
            if (HomeGateway != null && !string.IsNullOrEmpty(HomeGateway.gatewayId))
            {
                return true;
            }
            else
            {
                return false;
            }
        }

        /// <summary>
        /// 检测住宅是否绑定了网关
        /// </summary>
@@ -251,11 +270,11 @@
        /// </summary>
        public string CurFoor = Language.StringByID(StringId.All);

        /// <summary>
        /// 房间列表
        /// </summary>
        [Newtonsoft.Json.JsonIgnore]
        public List<Room> Rooms = SpatialInfo.CurrentSpatial.RoomList;
        ///// <summary>
        ///// 房间列表
        ///// </summary>
        //[Newtonsoft.Json.JsonIgnore]
        //public List<Room> Rooms = SpatialInfo.CurrentSpatial.RoomList;

        #region 功能数据
        static FunctionList _functionList;