20201215-1

wei

2020-12-15 7d9e5d946d08f0b53ff25d1c25dcf83efb68b734

 HDL_ON/Entity/DB_ResidenceData.cs

@@ -49,43 +49,12 @@
                    return _residecenInfo;
                }
            }
            set
            {
                _residecenInfo = value;
            }
        }

        public void SetCurrentRegion(int index)
        {
            _residecenInfo = UserInfo.Current.regionList[index];
        }

        ///// <summary>
        ///// 获取网关列表
        ///// </summary>
        //void GetHomeGatewayList()
        //{
        //    new Thread(() =>
        //    {
        //        //切换住宅后，查询一次网关列表
        //        new HttpServerRequest().GetHomeGatewayList();
        //    })
        //    { IsBackground = true }.Start();

        //}

        //string curReginID;
        ///// <summary>
        ///// 当前选择的住宅索引
        ///// </summary>
        //public string CurReginID
        //{
        //    set
        //    {
        //        curReginID = value;
        //        GetHomeGatewayList();
        //    }
        //    get
        //    {
        //        return curReginID;
        //    }
        //}
        /// <summary>
        /// 功能类型列表
        /// </summary>
@@ -270,11 +239,21 @@
            var ssd = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this));
            WirteResidenceInfo(ssd);
        }

        /// <summary>
        /// 当前选择的楼层
        /// </summary>
        public string CurFoor = Language.StringByID(StringId.All);

        /// <summary>
        /// 当前选择的楼层
        /// </summary>
        [Newtonsoft.Json.JsonIgnore]
        public SpatialInfo CurFloor = new SpatialInfo() { roomId = "", roomName = Language.StringByID(StringId.All)};
        /// <summary>
        /// 分类界面显示的楼层
        /// </summary>
        [Newtonsoft.Json.JsonIgnore]
        public SpatialInfo ClassificationChooseFloor = new SpatialInfo() { roomId = "", roomName = Language.StringByID(StringId.All) };

        /// <summary>
        /// 根目录
@@ -286,6 +265,7 @@
        /// <returns></returns>
        static byte[] ReadResidenceInfo()
        {
                MainPage.Log("get file Instance ");
            var fileName = "DB_ResidenceData";
            FileStream fs = null;
            try
@@ -313,6 +293,7 @@
            }
            finally
            {
                MainPage.Log("get file  ");
                try
                {
                    if (fs != null)