From 43b0d5870d528f23ecd6aeceb6cfd4325188b46f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 01 七月 2021 15:50:43 +0800
Subject: [PATCH] Revert "1"
---
HDL_ON/Entity/DB_ResidenceData.cs | 288 +++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 196 insertions(+), 92 deletions(-)
diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index f11328a..896cb34 100644
--- a/HDL_ON/Entity/DB_ResidenceData.cs
+++ b/HDL_ON/Entity/DB_ResidenceData.cs
@@ -1,11 +1,13 @@
-锘縰sing System;
+using System;
using System.Collections.Generic;
+using System.IO;
using System.Threading;
using HDL_ON.DAL.Server;
using Shared;
namespace HDL_ON.Entity
{
+ [System.Serializable]
public class DB_ResidenceData
{
public DB_ResidenceData()
@@ -16,95 +18,85 @@
/// 涓讳汉token
/// </summary>
public string MasterToken;
+
+ //RegionInfoRes _residecenInfo;
+ RegionInfoRes _residecenInfo = new RegionInfoRes();
/// <summary>
/// 浣忓畢鍩虹淇℃伅
/// </summary>
- public RegionInfoRes residecenInfo
+ public RegionInfoRes CurrentRegion
{
get
{
if (MainPage.NoLoginMode)
{
- return new RegionInfoRes() { Name = "鏈湴妯″紡" };
+ return new RegionInfoRes() { homeName = "HDL Home" ,id = "text000001"};
}
else
{
- var curRegion = UserInfo.Current.regionList.Find((obj) => obj.RegionID == CurReginID);
- if (curRegion == null)
+ if (_residecenInfo == null)
{
if (UserInfo.Current.regionList != null && UserInfo.Current.regionList.Count > 0)
{
- CurReginID = UserInfo.Current.regionList[0].RegionID;
- //鎭㈠澶囦唤
- HDLCommon.Current.RestoreHomeBackup(CurReginID);
-
- return UserInfo.Current.regionList[0];
+ _residecenInfo = UserInfo.Current.regionList[0];
}
else
{
- return new RegionInfoRes();
+ _residecenInfo = new RegionInfoRes();
+ HDLCommon.Current.Logout();
}
}
-
- //if (curRegion == null)
- //{
- // CurReginID = UserInfo.Current.regionList[0].RegionID;
- // return UserInfo.Current.regionList[0];
- //}
- return curRegion;
+ return _residecenInfo;
}
+ }
+ set
+ {
+ _residecenInfo = value;
}
}
- ///// <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>
- public string CurReginID = "";
/// <summary>
/// 鍔熻兘绫诲瀷鍒楄〃
/// </summary>
+ [Newtonsoft.Json.JsonIgnore]
public List<ShowFunction> functionTypeList = new List<ShowFunction>();
static DB_ResidenceData instance;
- public static DB_ResidenceData residenceData
+ public static DB_ResidenceData Instance
{
get
{
if (instance == null)
{
+ if(MainPage.NoLoginMode)
+ {
+ instance = new DB_ResidenceData();
+ instance.functionTypeList.AddRange(new List<ShowFunction> {
+ ShowFunction.Light,ShowFunction.AC,ShowFunction.Curtain,
+ ShowFunction.FloorHeating,ShowFunction.Music,
+ ShowFunction.Electric,ShowFunction.Environmental,
+ ShowFunction.EnergyMonitoring,
+ ShowFunction.FreshAir,ShowFunction.DoorLock,
+ ShowFunction.Panel,ShowFunction.SecurityMonitoring,
+ ShowFunction.Sensor,ShowFunction.VideoIntercom,
+ ShowFunction.SecurityCenter
+ });
+ instance.SaveResidenceData();
+ instance.residenceImage = "Classification/Room/Roombg.png";
+ instance.HomeGateway = new HomeGatewayInfo()
+ {
+ homeId = "1396717478877241345",
+ gatewayId = "1396997079658602498",
+ mac = "123457890123456",
+ };
+ //鍒濆鍖栦綇瀹呭姛鑳芥暟鎹�
+ SpatialInfo.CurrentSpatial.InitRoomListFunctions();
+ return instance;
+ }
+
try
{
- var residenceDataBytes = FileUtils.ReadFile("DB_ResidenceData");
+ var residenceDataBytes = ReadResidenceInfo();
var userConfigString = System.Text.Encoding.UTF8.GetString(residenceDataBytes);
DB_ResidenceData temp = null;
@@ -120,29 +112,27 @@
{
instance = temp;
}
- if (instance.functionTypeList.Count == 0)
- {
- instance.functionTypeList.AddRange(new List<ShowFunction> {
+ instance.functionTypeList.AddRange(new List<ShowFunction> {
ShowFunction.Light,ShowFunction.AC,ShowFunction.Curtain,
- ShowFunction.FloorHeating,ShowFunction.DoorLock,
- ShowFunction.Electric,ShowFunction.EnergyMonitoring,
- ShowFunction.Environmental,
- ShowFunction.FreshAir,ShowFunction.Music,
+ ShowFunction.FloorHeating,ShowFunction.Music,
+ ShowFunction.Electric,ShowFunction.Environmental,
+ ShowFunction.EnergyMonitoring,
+ ShowFunction.FreshAir,ShowFunction.DoorLock,
ShowFunction.Panel,ShowFunction.SecurityMonitoring,
- ShowFunction.Sensor,ShowFunction.VideoIntercom
+ ShowFunction.Sensor,ShowFunction.VideoIntercom,
+ ShowFunction.SecurityCenter
});
- instance.SaveResidenceData();
- }
-
-
+ instance.SaveResidenceData();
}
catch (Exception ex)
{
MainPage.Log($"浣忓畢鏁版嵁鍒濆鍖栧け璐ワ細{ex.Message}");
+ instance = new DB_ResidenceData { };
+ return instance;
}
instance.residenceImage = "Classification/Room/Roombg.png";
//鍒濆鍖栦綇瀹呭姛鑳芥暟鎹�
- SpatialInfo.CurrentSpatial.InitRoomFunction();
+ SpatialInfo.CurrentSpatial.InitRoomListFunctions();
}
return instance;
@@ -154,13 +144,17 @@
public void EixtAccount()
{
instance = null;
- Rooms = null;
ins_OidList = null;
- functionList = null;
- if (MainPage.IsRemote)
- {
- DAL.Mqtt.MqttClient.DisConnectRemote("閫�鍑虹櫥褰曪紝鎴栬�呭垏鎹綇瀹�");
- }
+ HomeGateway = null;
+ //閲嶇疆缃戝叧鐘舵��
+ DriverLayer.Control.Ins.GatewayOnline_Cloud = false;
+ DriverLayer.Control.Ins.GatewayOnline_Local = false;
+ SpatialInfo.CurrentSpatial.Clear();
+ FunctionList.List.Clear();
+
+ ///鍒囨崲浣忓畢娓呯┖鍓嶄綇瀹呯紦瀛樿嚜鍔ㄥ寲鍒楄〃锛�
+ HDL_ON.UI.UI2.Intelligence.Automation.Logic.LogicList.Clear();
+ DAL.Mqtt.MqttClient.DisConnectRemote("閫�鍑虹櫥褰曪紝鎴栬�呭垏鎹綇瀹�");
}
/// <summary>
@@ -191,6 +185,27 @@
}
}
}
+ /// <summary>
+ /// 璁板綍绐楀笜鍏ㄥ紑鍏ㄥ叧鐘舵��
+ /// </summary>
+ public bool GlobalCurtainStatus = false;
+ /// <summary>
+ /// 妫�娴嬩綇瀹呮槸鍚︾粦瀹氫簡缃戝叧
+ /// gatewayId 鍒ょ┖
+ /// </summary>
+ /// <returns></returns>
+ public bool CheckWhetherGatewayIdIsNull()
+ {
+ if (HomeGateway != null && !string.IsNullOrEmpty(HomeGateway.gatewayId))
+ {
+ return false;
+ }
+ else
+ {
+ return true;
+ }
+ }
+
/// <summary>
/// 妫�娴嬩綇瀹呮槸鍚︾粦瀹氫簡缃戝叧
/// </summary>
@@ -250,41 +265,130 @@
/// </summary>
public void SaveResidenceData()
{
- if (this == null || this.residecenInfo == null)
+ if (this == null || this.CurrentRegion == null)
return;
var ssd = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this));
- FileUtils.WriteFileByBytes("DB_ResidenceData", ssd);
- MainPage.Log("Save DB_ResidenceData");
+ WirteResidenceInfo(ssd);
}
-
/// <summary>
/// 褰撳墠閫夋嫨鐨勬ゼ灞�
/// </summary>
public string CurFoor = Language.StringByID(StringId.All);
/// <summary>
- /// 鎴块棿鍒楄〃
+ /// 褰撳墠閫夋嫨鐨勬ゼ灞�
/// </summary>
- public List<Room> Rooms = SpatialInfo.CurrentSpatial.RoomList;
+ [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) };
- #region 鍔熻兘鏁版嵁
- static FunctionList _functionList;
- public static FunctionList functionList {
- get
+ /// <summary>
+ /// 鏍圭洰褰�
+ /// </summary>
+ static string RootPath = Environment.GetFolderPath(System.Environment.SpecialFolder.Personal) + "/";
+ /// <summary>
+ /// 璇诲彇ResidenceInfo鏂囦欢
+ /// </summary>
+ /// <returns></returns>
+ static byte[] ReadResidenceInfo()
+ {
+ var fileName = "DB_ResidenceData";
+ FileStream fs = null;
+ try
{
- if(_functionList == null)
+ var temp = CreateUserFloder(OnAppConfig.Instance.LastLoginUserId);
+ if (File.Exists(Path.Combine(temp, fileName)))
{
- _functionList = FunctionList.List;
+ fs = new FileStream(Path.Combine(temp, fileName), FileMode.Open, FileAccess.Read);
}
- return _functionList;
+ else if (File.Exists(fileName))
+ {
+ fs = new FileStream(fileName, FileMode.Open, FileAccess.Read);
+ }
+ else
+ {
+ return new byte[0];
+ }
+ byte[] bytes = new byte[fs.Length];
+ fs.Read(bytes, 0, bytes.Length);
+ return bytes;
}
- set
+ catch
{
- _functionList = value;
+ return new byte[0];
+ }
+ finally
+ {
+ try
+ {
+ if (fs != null)
+ {
+ fs.Close();
+ }
+ }
+ catch
+ {
+
+ }
+ }
+
+ }
+ /// <summary>
+ /// 淇濆瓨ResidenceInfo
+ /// </summary>
+ /// <param name="bytes"></param>
+ /// <returns></returns>
+ static bool WirteResidenceInfo(byte[] bytes)
+ {
+ var fileName = "DB_ResidenceData";
+ FileStream fs = null;
+
+ try
+ {
+ var temp = CreateUserFloder(OnAppConfig.Instance.LastLoginUserId);
+ fs = new FileStream(Path.Combine(temp, fileName), FileMode.Create, FileAccess.Write);
+ fs.Write(bytes, 0, bytes.Length);
+ fs.Flush();
+ MainPage.Log("SaveFile:" + fileName);
+ return true;
+ }
+ catch (Exception ex)
+ {
+ MainPage.Log("FileUtiles Code 113:" + ex.ToString());
+ return false;
+ }
+ finally
+ {
+ try
+ {
+ if (fs != null)
+ {
+ fs.Close();
+ }
+ }
+ catch (Exception ex)
+ {
+ MainPage.Log("FileUtils Code 121 :" + ex.ToString());
+ }
}
}
+ /// <summary>
+ /// 鍒涘缓涓�涓綇瀹呯殑璐﹀彿鏂囦欢澶�
+ /// </summary>
+ static string CreateUserFloder(string userId)
+ {
+ var path = Path.Combine(RootPath, userId);
+ if (!Directory.Exists(path))
+ {
+ Directory.CreateDirectory(path);
+ }
+ return path + "/";
+ }
- #endregion
#region oid鍒楄〃 a鍗忚杞琤us鍗忚鎺у埗浣跨敤
/// <summary>
@@ -299,7 +403,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>();
@@ -335,9 +439,9 @@
{
var oidBytes = System.Text.Encoding.UTF8.GetBytes(oidJsonString);
- FileUtils.WriteFileByBytes(OidSavePathName, oidBytes);
+ Common.FileUtlis.Files.WriteFileByBytes(OidSavePathName, oidBytes);
}
#endregion
}
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0