From e87985ec1dcb69beedaf9f95e8e7aba14b7c08d6 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 09 十二月 2020 18:50:14 +0800
Subject: [PATCH] 2020-12-09 1.信息中心，增加下划线和点击Alter提醒详情。
---
HDL_ON/Entity/DB_ResidenceData.cs | 302 ++++++++++++++++++++++++++++++++++++--------------
1 files changed, 216 insertions(+), 86 deletions(-)
diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index 7b0c7cb..a6e4901 100644
--- a/HDL_ON/Entity/DB_ResidenceData.cs
+++ b/HDL_ON/Entity/DB_ResidenceData.cs
@@ -1,6 +1,8 @@
锘縰sing System;
using System.Collections.Generic;
-using HDL_ON.DAL;
+using System.Threading;
+using HDL_ON.DAL.Server;
+using Shared;
namespace HDL_ON.Entity
{
@@ -11,12 +13,9 @@
}
/// <summary>
- /// 0:A鍗忚缃戝叧
- /// 1:bus缃戝叧
- /// 2:knx缃戝叧
+ /// 涓讳汉token
/// </summary>
- public int GatewayType = 0;
-
+ public string MasterToken;
/// <summary>
/// 浣忓畢鍩虹淇℃伅
/// </summary>
@@ -24,40 +23,73 @@
{
get
{
- if (MainPage.LocalMode)
+ if (MainPage.NoLoginMode)
{
return new RegionInfoRes() { Name = "鏈湴妯″紡" };
}
else
{
- return MainPage.LoginUser.regionList.Find((obj) => obj.RegionID == CurReginID);
+ var curRegion = UserInfo.Current.regionList.Find((obj) => obj.RegionID == CurReginID);
+ if (curRegion == 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];
+ }
+ else
+ {
+ return new RegionInfoRes();
+ }
+ }
+
+ //if (curRegion == null)
+ //{
+ // CurReginID = UserInfo.Current.regionList[0].RegionID;
+ // return UserInfo.Current.regionList[0];
+ //}
+ return curRegion;
}
}
}
+ ///// <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>
- public List<Floor> floors = new List<Floor>();
-
- /// <summary>
- /// 鎴块棿鍒楄〃
- /// </summary>
- public List<Room> rooms = new List<Room>();
- /// <summary>
- /// 鍔熻兘鍒楄〃
- /// </summary>
- public FunctionList functionList = new FunctionList();
- /// <summary>
- /// 鍔熻兘oid鍒楄〃
- /// </summary>
- public List<FunctionOid> functionOidList = new List<FunctionOid>();
-
/// <summary>
/// 鍔熻兘绫诲瀷鍒楄〃
/// </summary>
@@ -73,8 +105,9 @@
try
{
var residenceDataBytes = FileUtils.ReadFile("DB_ResidenceData");
- var userConfigString = CommonPage.MyEncodingUTF8.GetString(residenceDataBytes);
+ var userConfigString = System.Text.Encoding.UTF8.GetString(residenceDataBytes);
DB_ResidenceData temp = null;
+
if (!string.IsNullOrEmpty(userConfigString))
{
temp = Newtonsoft.Json.JsonConvert.DeserializeObject<DB_ResidenceData>(userConfigString);
@@ -98,7 +131,9 @@
ShowFunction.Panel,ShowFunction.SecurityMonitoring,
ShowFunction.Sensor,ShowFunction.VideoIntercom
});
+ instance.SaveResidenceData();
}
+
}
catch (Exception ex)
@@ -107,7 +142,7 @@
}
instance.residenceImage = "Classification/Room/Roombg.png";
//鍒濆鍖栦綇瀹呭姛鑳芥暟鎹�
- InitRoomFunction();
+ SpatialInfo.CurrentSpatial.InitRoomFunction();
}
return instance;
@@ -119,6 +154,88 @@
public void EixtAccount()
{
instance = null;
+ Rooms = null;
+ ins_OidList = null;
+ functionList = null;
+ HomeGateway = null;
+ if (MainPage.IsRemote)
+ {
+ DAL.Mqtt.MqttClient.DisConnectRemote("閫�鍑虹櫥褰曪紝鎴栬�呭垏鎹綇瀹�");
+ }
+ }
+
+ /// <summary>
+ /// 缃戝叧璇︾粏淇℃伅
+ /// </summary>
+ public HomeGatewayInfo HomeGateway;
+
+ /// <summary>
+ /// 0:bus缃戝叧
+ /// 1:A鍗忚缃戝叧
+ /// </summary>
+ public int GatewayType
+ {
+ get
+ {
+ //#if DEBUG
+ //return 0;
+ //#endif
+ if (HomeGateway == null)
+ return -1;
+ if (HomeGateway.gatewayType == "AGATEWAY")
+ {
+ return 1;
+ }
+ else
+ {
+ return 0;
+ }
+ }
+ }
+ /// <summary>
+ /// 妫�娴嬩綇瀹呮槸鍚︾粦瀹氫簡缃戝叧
+ /// </summary>
+ /// <returns></returns>
+ public bool CheckWhetherGatewayIsBound()
+ {
+ if (HomeGateway != null && !string.IsNullOrEmpty(HomeGateway.mac))
+ {
+ return true;
+ }
+ else
+ {
+ return false;
+ }
+ }
+
+ /// <summary>
+ /// 褰撳墠浣忓畢鐨勭綉鍏矼AC
+ /// </summary>
+ public string residenceGatewayMAC
+ {
+ get
+ {
+ if (CheckWhetherGatewayIsBound())
+ {
+ return HomeGateway.mac.ToUpper();
+ }
+ else
+ {
+ return "";
+ }
+ }
+ set
+ {
+ if (CheckWhetherGatewayIsBound())
+ {
+ HomeGateway.mac = value;
+ }
+ else
+ {
+ HomeGateway = new HomeGatewayInfo() { mac = value };
+ }
+ }
+
}
/// <summary>
@@ -126,90 +243,103 @@
/// </summary>
public string residenceImage;
/// <summary>
- /// 浣忓畢鏁版嵁鏄惁瀛樺湪鍙樺寲
- /// </summary>
- bool hasChange = false;
- /// <summary>
/// 褰撳墠浣忓畢鐨勭綉鍏矼AC
/// </summary>
- public string residenceGatewayMAC = "4E47323347591243";
+ //public string residenceGatewayMAC = "4E47323347591243";//"0281B9078C000000";// "00964E19C4467B1E";
/// <summary>
/// 淇濆瓨浣忓畢鏁版嵁
/// </summary>
public void SaveResidenceData()
{
- if (this == null|| this.residecenInfo==null)
+ if (this == null || this.residecenInfo == null)
return;
- var ssd = CommonPage.MyEncodingUTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this));
+ var ssd = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this));
FileUtils.WriteFileByBytes("DB_ResidenceData", ssd);
MainPage.Log("Save DB_ResidenceData");
}
/// <summary>
- /// 鍒锋柊浣忓畢閲岄潰鐨勬悳绱㈣澶囩姸鎬�
+ /// 褰撳墠閫夋嫨鐨勬ゼ灞�
/// </summary>
- public void RefreshResidenceFunctionStatus()
- {
- new System.Threading.Thread(() =>
- {
- try
- {
- foreach (var function in functionList.functions)
- {
- System.Threading.Thread.Sleep(100);
- //if (function.bus_Data != null)
- {
- switch (function.functionCategory)
- {
- case FunctionCategory.Light:
- case FunctionCategory.Electrical:
- case FunctionCategory.SwitchDevice:
- case FunctionCategory.Curtain:
- case FunctionCategory.Thermostat:
- Control.SendReadCommand(function);
- break;
- }
- }
- }
- }
- catch (Exception ex)
- {
- MainPage.Log($"Refresh Residence Function Status Error : {ex.Message}");
- }
- })
- { IsBackground = true }.Start();
- }
+ public string CurFoor = Language.StringByID(StringId.All);
/// <summary>
- /// 鍒濆鍖栨瘡涓埧闂寸殑鍔熻兘鏁版嵁
+ /// 鎴块棿鍒楄〃
/// </summary>
- public static void InitRoomFunction()
+ public List<Room> Rooms = SpatialInfo.CurrentSpatial.RoomList;
+
+ #region 鍔熻兘鏁版嵁
+ static FunctionList _functionList;
+ public static FunctionList functionList
{
- new System.Threading.Thread(() =>
+ get
{
- try
+ if (_functionList == null)
{
- //鍒濆鍖栦綇瀹呭姛鑳芥暟鎹�
- instance.functionList.GetAllFunction();
- //鍒濆鍖栦綇瀹呮墍鏈夋埧闂村姛鑳芥暟鎹�
- foreach (var r in instance.rooms)
+ _functionList = FunctionList.List;
+ }
+ return _functionList;
+ }
+ set
+ {
+ _functionList = value;
+ }
+ }
+
+ #endregion
+
+ #region oid鍒楄〃 a鍗忚杞琤us鍗忚鎺у埗浣跨敤
+ /// <summary>
+ /// oid鏁版嵁淇濆瓨鐨勬枃浠跺悕
+ /// </summary>
+ [Newtonsoft.Json.JsonIgnore]
+ public static string OidSavePathName = "AProtocolData_FunctionOid";
+ static List<FunctionOid> ins_OidList;
+ public static List<FunctionOid> functionOidList
+ {
+ get
+ {
+ if (ins_OidList == null)
+ {
+ var bytes = FileUtils.ReadFile(OidSavePathName);
+ if (bytes == null || bytes.Length == 0)
{
- r.functions.Clear();
- foreach (var func in instance.functionList.functions)
+ ins_OidList = new List<FunctionOid>();
+ }
+ else
+ {
+ var jsonString = System.Text.Encoding.UTF8.GetString(bytes);
+ if (string.IsNullOrEmpty(jsonString))
{
- MainPage.Log($"init room function sid {func.functionCategory.ToString()}:{r.sid}");
- if (func.roomIdList.Contains(r.sid))
+ ins_OidList = new List<FunctionOid>();
+ }
+ else
+ {
+ var list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<FunctionOid>>(jsonString);
+ if (list == null)
{
- r.functions.Add(func);
+ ins_OidList = new List<FunctionOid>();
+ }
+ else
+ {
+ ins_OidList = list;
}
}
}
- }catch(Exception ex)
- {
- MainPage.Log($"Init room function error : {ex.Message}");
}
- })
- { IsBackground = true }.Start();
+ return ins_OidList;
+ }
}
+ /// <summary>
+ /// 淇濆瓨oid鏁版嵁锛屾瘡娆′繚瀛橀兘浼氳鐩�
+ /// </summary>
+ public static void SaveOidList(string oidJsonString)
+ {
+ var oidBytes = System.Text.Encoding.UTF8.GetBytes(oidJsonString);
+
+ FileUtils.WriteFileByBytes(OidSavePathName, oidBytes);
+ }
+
+ #endregion
}
}
\ No newline at end of file
--
Gitblit v1.8.0