From 488efb508eb0648773fe7b68e810e04bcd7ca075 Mon Sep 17 00:00:00 2001 From: wei <kaede@kaededeMacBook-Air.local> Date: 星期五, 11 十二月 2020 15:58:15 +0800 Subject: [PATCH] 20201211 --- HDL_ON/Entity/DB_ResidenceData.cs | 46 ++++++++-------------------------------------- 1 files changed, 8 insertions(+), 38 deletions(-) diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs index 5cb0446..ed3d96a 100644 --- a/HDL_ON/Entity/DB_ResidenceData.cs +++ b/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]; } @@ -45,12 +45,6 @@ return new RegionInfoRes(); } } - - //if (curRegion == null) - //{ - // CurReginID = UserInfo.Current.regionList[0].RegionID; - // return UserInfo.Current.regionList[0]; - //} return curRegion; } } @@ -87,10 +81,6 @@ // } //} /// <summary> - /// 褰撳墠閫夋嫨鐨勪綇瀹呯储寮� - /// </summary> - public string CurReginID = ""; - /// <summary> /// 鍔熻兘绫诲瀷鍒楄〃 /// </summary> public List<ShowFunction> functionTypeList = new List<ShowFunction>(); @@ -104,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; @@ -133,8 +123,6 @@ }); instance.SaveResidenceData(); } - - } catch (Exception ex) { @@ -157,6 +145,7 @@ Rooms = null; ins_OidList = null; functionList = null; + HomeGateway = null; if (MainPage.IsRemote) { DAL.Mqtt.MqttClient.DisConnectRemote("閫�鍑虹櫥褰曪紝鎴栬�呭垏鎹綇瀹�"); @@ -253,7 +242,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"); } @@ -285,25 +274,6 @@ } } - /// <summary> - /// 鍒锋柊浣忓畢閲岄潰鐨勬悳绱㈣澶囩姸鎬� - /// </summary> - public void RefreshResidenceFunctionStatus() - { - new Thread(() => - { - if(_functionList == null) - { - _functionList = FunctionList.List; - } - return _functionList; - } - set - { - _functionList = value; - } - } - #endregion #region oid鍒楄〃 a鍗忚杞琤us鍗忚鎺у埗浣跨敤 @@ -319,7 +289,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>(); @@ -355,7 +325,7 @@ { var oidBytes = System.Text.Encoding.UTF8.GetBytes(oidJsonString); - FileUtils.WriteFileByBytes(OidSavePathName, oidBytes); + Common.FileUtlis.Files.WriteFileByBytes(OidSavePathName, oidBytes); } #endregion -- Gitblit v1.8.0