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

JLChen

2020-12-12 b3abfd30576871c32f2839a322fa3bb783f96498

 HDL_ON/Entity/DB_ResidenceData.cs

@@ -29,14 +29,14 @@
                }
                else
                {
                    var curRegion = UserInfo.Current.regionList.Find((obj) => obj.RegionID == CurReginID);
                    var curRegion = UserInfo.Current.regionList.Find((obj) => obj.RegionID == UserInfo.Current.CurReginID);
                    if (curRegion == null)
                    {
                        if (UserInfo.Current.regionList != null && UserInfo.Current.regionList.Count > 0)
                        {
                            CurReginID = UserInfo.Current.regionList[0].RegionID;
                            UserInfo.Current.CurReginID = UserInfo.Current.regionList[0].RegionID;
                            //恢复备份
                            HDLCommon.Current.RestoreHomeBackup(CurReginID);
                            //HDLCommon.Current.RestoreHomeBackup(CurReginID);

                            return UserInfo.Current.regionList[0];
                        }
@@ -81,10 +81,6 @@
        //    }
        //}
        /// <summary>
        /// 当前选择的住宅索引
        /// </summary>
        public string CurReginID = "";
        /// <summary>
        /// 功能类型列表
        /// </summary>
        public List<ShowFunction> functionTypeList = new List<ShowFunction>();
@@ -98,7 +94,7 @@
                {
                    try
                    {
                        var residenceDataBytes = FileUtils.ReadFile("DB_ResidenceData");
                        var residenceDataBytes = Common.FileUtlis.Files.ReadFile("DB_ResidenceData");
                        var userConfigString = System.Text.Encoding.UTF8.GetString(residenceDataBytes);
                        DB_ResidenceData temp = null;

@@ -146,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("退出登录，或者切换住宅");
@@ -184,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>
@@ -246,7 +261,7 @@
            if (this == null || this.residecenInfo == null)
                return;
            var ssd = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this));
            FileUtils.WriteFileByBytes("DB_ResidenceData", ssd);
            Common.FileUtlis.Files.WriteFileByBytes("DB_ResidenceData", ssd);
            MainPage.Log("Save DB_ResidenceData");
        }

@@ -255,10 +270,11 @@
        /// </summary>
        public string CurFoor = Language.StringByID(StringId.All);

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

        #region 功能数据
        static FunctionList _functionList;
@@ -293,7 +309,7 @@
            {
                if (ins_OidList == null)
                {
                    var bytes = FileUtils.ReadFile(OidSavePathName);
                    var bytes = Common.FileUtlis.Files.ReadFile(OidSavePathName);
                    if (bytes == null || bytes.Length == 0)
                    {
                        ins_OidList = new List<FunctionOid>();
@@ -329,7 +345,7 @@
        {
            var oidBytes = System.Text.Encoding.UTF8.GetBytes(oidJsonString);

            FileUtils.WriteFileByBytes(OidSavePathName, oidBytes);
            Common.FileUtlis.Files.WriteFileByBytes(OidSavePathName, oidBytes);
        }

        #endregion