From d724f7f21c5cc8c5dd5aa0cf7345a62a662eb2bf Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 16 十二月 2020 15:12:18 +0800
Subject: [PATCH] 2020-12-16 1.子账号和解锁部分接口增加Loading处理
---
HDL_ON/Entity/DB_ResidenceData.cs | 388 ++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 298 insertions(+), 90 deletions(-)
diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index 7b0c7cb..16fb651 100644
--- a/HDL_ON/Entity/DB_ResidenceData.cs
+++ b/HDL_ON/Entity/DB_ResidenceData.cs
@@ -1,9 +1,13 @@
锘縰sing System;
using System.Collections.Generic;
-using HDL_ON.DAL;
+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()
@@ -11,52 +15,45 @@
}
/// <summary>
- /// 0:A鍗忚缃戝叧
- /// 1:bus缃戝叧
- /// 2:knx缃戝叧
+ /// 涓讳汉token
/// </summary>
- public int GatewayType = 0;
+ public string MasterToken;
+ //RegionInfoRes _residecenInfo;
+ RegionInfoRes _residecenInfo = new RegionInfoRes();
/// <summary>
/// 浣忓畢鍩虹淇℃伅
/// </summary>
- public RegionInfoRes residecenInfo
+ public RegionInfoRes CurrentRegion
{
get
{
- if (MainPage.LocalMode)
+ if (MainPage.NoLoginMode)
{
return new RegionInfoRes() { Name = "鏈湴妯″紡" };
}
else
{
- return MainPage.LoginUser.regionList.Find((obj) => obj.RegionID == CurReginID);
+ if (_residecenInfo == null)
+ {
+ if (UserInfo.Current.regionList != null && UserInfo.Current.regionList.Count > 0)
+ {
+ _residecenInfo = UserInfo.Current.regionList[0];
+ }
+ else
+ {
+ _residecenInfo = new RegionInfoRes();
+ HDLCommon.Current.Logout();
+ }
+ }
+ return _residecenInfo;
}
}
+ set
+ {
+ _residecenInfo = value;
+ }
}
-
- /// <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>
/// 鍔熻兘绫诲瀷鍒楄〃
@@ -64,7 +61,7 @@
public List<ShowFunction> functionTypeList = new List<ShowFunction>();
static DB_ResidenceData instance;
- public static DB_ResidenceData residenceData
+ public static DB_ResidenceData Instance
{
get
{
@@ -72,9 +69,10 @@
{
try
{
- var residenceDataBytes = FileUtils.ReadFile("DB_ResidenceData");
- var userConfigString = CommonPage.MyEncodingUTF8.GetString(residenceDataBytes);
+ var residenceDataBytes = ReadResidenceInfo();
+ var userConfigString = System.Text.Encoding.UTF8.GetString(residenceDataBytes);
DB_ResidenceData temp = null;
+
if (!string.IsNullOrEmpty(userConfigString))
{
temp = Newtonsoft.Json.JsonConvert.DeserializeObject<DB_ResidenceData>(userConfigString);
@@ -91,23 +89,25 @@
{
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.Panel,ShowFunction.SecurityMonitoring,
- ShowFunction.Sensor,ShowFunction.VideoIntercom
+ ShowFunction.FloorHeating,ShowFunction.Music,
+ ShowFunction.Electric,ShowFunction.Environmental,
+ //ShowFunction.EnergyMonitoring,
+ //ShowFunction.FreshAir,ShowFunction.DoorLock,
+ //ShowFunction.Panel,ShowFunction.SecurityMonitoring,
+ //ShowFunction.Sensor,ShowFunction.VideoIntercom
});
+ instance.SaveResidenceData();
}
-
}
catch (Exception ex)
{
MainPage.Log($"浣忓畢鏁版嵁鍒濆鍖栧け璐ワ細{ex.Message}");
+ instance = new DB_ResidenceData { };
+ return instance;
}
instance.residenceImage = "Classification/Room/Roombg.png";
//鍒濆鍖栦綇瀹呭姛鑳芥暟鎹�
- InitRoomFunction();
+ SpatialInfo.CurrentSpatial.InitRoomFunction();
}
return instance;
@@ -119,6 +119,111 @@
public void EixtAccount()
{
instance = null;
+ ins_OidList = null;
+ HomeGateway = null;
+ SpatialInfo.CurrentSpatial.Clear();
+ FunctionList.List.Clear();
+ ///鍒囨崲浣忓畢娓呯┖鍓嶄綇瀹呯紦瀛樿嚜鍔ㄥ寲鍒楄〃锛�
+ HDL_ON.UI.UI2.Intelligence.Automation.Logic.LogicList.Clear();
+ 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>
+ 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>
+ /// <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 +231,193 @@
/// </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.CurrentRegion == null)
return;
- var ssd = CommonPage.MyEncodingUTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this));
- FileUtils.WriteFileByBytes("DB_ResidenceData", ssd);
- MainPage.Log("Save DB_ResidenceData");
+ 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>
- public void RefreshResidenceFunctionStatus()
+ [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>
+ /// 鏍圭洰褰�
+ /// </summary>
+ static string RootPath = Environment.GetFolderPath(System.Environment.SpecialFolder.Personal) + "/";
+ /// <summary>
+ /// 璇诲彇ResidenceInfo鏂囦欢
+ /// </summary>
+ /// <returns></returns>
+ static byte[] ReadResidenceInfo()
{
- new System.Threading.Thread(() =>
+ MainPage.Log("get file Instance ");
+ var fileName = "DB_ResidenceData";
+ FileStream fs = null;
+ try
+ {
+ var temp = CreateUserFloder(OnAppConfig.Instance.LastLoginUserId);
+ if (File.Exists(Path.Combine(temp, fileName)))
+ {
+ fs = new FileStream(Path.Combine(temp, fileName), FileMode.Open, FileAccess.Read);
+ }
+ 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;
+ }
+ catch
+ {
+ return new byte[0];
+ }
+ finally
+ {
+ MainPage.Log("get file ");
+ 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
{
- foreach (var function in functionList.functions)
+ if (fs != null)
{
- 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;
- }
- }
+ fs.Close();
}
}
catch (Exception ex)
{
- MainPage.Log($"Refresh Residence Function Status Error : {ex.Message}");
+ MainPage.Log("FileUtils Code 121 :" + ex.ToString());
}
- })
- { IsBackground = true }.Start();
+ }
+ }
+ /// <summary>
+ /// 鍒涘缓涓�涓綇瀹呯殑璐﹀彿鏂囦欢澶�
+ /// </summary>
+ static string CreateUserFloder(string userId)
+ {
+ var path = Path.Combine(RootPath, userId);
+ if (!Directory.Exists(path))
+ {
+ Directory.CreateDirectory(path);
+ }
+ return path + "/";
}
+
+ #region oid鍒楄〃 a鍗忚杞琤us鍗忚鎺у埗浣跨敤
/// <summary>
- /// 鍒濆鍖栨瘡涓埧闂寸殑鍔熻兘鏁版嵁
+ /// oid鏁版嵁淇濆瓨鐨勬枃浠跺悕
/// </summary>
- public static void InitRoomFunction()
+ [Newtonsoft.Json.JsonIgnore]
+ public static string OidSavePathName = "AProtocolData_FunctionOid";
+ static List<FunctionOid> ins_OidList;
+ public static List<FunctionOid> functionOidList
{
- new System.Threading.Thread(() =>
+ get
{
- try
+ if (ins_OidList == null)
{
- //鍒濆鍖栦綇瀹呭姛鑳芥暟鎹�
- instance.functionList.GetAllFunction();
- //鍒濆鍖栦綇瀹呮墍鏈夋埧闂村姛鑳芥暟鎹�
- foreach (var r in instance.rooms)
+ var bytes = Common.FileUtlis.Files.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);
+
+ Common.FileUtlis.Files.WriteFileByBytes(OidSavePathName, oidBytes);
+ }
+
+ #endregion
}
}
\ No newline at end of file
--
Gitblit v1.8.0