From d21ef6135c295e9bfa5ac7c0858ef55f5627479c Mon Sep 17 00:00:00 2001
From: Tong <1025782220@qq.com>
Date: 星期二, 31 八月 2021 10:04:05 +0800
Subject: [PATCH] 修改全局秘钥
---
HDL_ON/Entity/DB_ResidenceData.cs | 75 ++++++++++++++++++++++++++-----------
1 files changed, 52 insertions(+), 23 deletions(-)
diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index 04ffcb9..712bbb5 100644
--- a/HDL_ON/Entity/DB_ResidenceData.cs
+++ b/HDL_ON/Entity/DB_ResidenceData.cs
@@ -1,4 +1,4 @@
-锘縰sing System;
+using System;
using System.Collections.Generic;
using System.IO;
using System.Threading;
@@ -19,7 +19,6 @@
/// </summary>
public string MasterToken;
- //RegionInfoRes _residecenInfo;
RegionInfoRes _residecenInfo = new RegionInfoRes();
/// <summary>
/// 浣忓畢鍩虹淇℃伅
@@ -30,7 +29,7 @@
{
if (MainPage.NoLoginMode)
{
- return new RegionInfoRes() { Name = "鏈湴妯″紡" };
+ return new RegionInfoRes() { homeName = "HDL Home" ,id = "text000001"};
}
else
{
@@ -58,6 +57,7 @@
/// <summary>
/// 鍔熻兘绫诲瀷鍒楄〃
/// </summary>
+ [Newtonsoft.Json.JsonIgnore]
public List<ShowFunction> functionTypeList = new List<ShowFunction>();
static DB_ResidenceData instance;
@@ -67,6 +67,32 @@
{
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 = ReadResidenceInfo();
@@ -85,19 +111,17 @@
{
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.Music,
ShowFunction.Electric,ShowFunction.Environmental,
- //ShowFunction.EnergyMonitoring,
- //ShowFunction.FreshAir,ShowFunction.DoorLock,
- //ShowFunction.Panel,ShowFunction.SecurityMonitoring,
- //ShowFunction.Sensor,ShowFunction.VideoIntercom
+ ShowFunction.EnergyMonitoring,
+ ShowFunction.FreshAir,ShowFunction.DoorLock,
+ ShowFunction.Panel,ShowFunction.SecurityMonitoring,
+ ShowFunction.Sensor,ShowFunction.VideoIntercom,
+ ShowFunction.SecurityCenter
});
- instance.SaveResidenceData();
- }
+ instance.SaveResidenceData();
}
catch (Exception ex)
{
@@ -107,7 +131,7 @@
}
instance.residenceImage = "Classification/Room/Roombg.png";
//鍒濆鍖栦綇瀹呭姛鑳芥暟鎹�
- SpatialInfo.CurrentSpatial.InitRoomFunction();
+ SpatialInfo.CurrentSpatial.InitRoomListFunctions();
}
return instance;
@@ -121,13 +145,20 @@
instance = null;
ins_OidList = null;
HomeGateway = null;
+ //閲嶇疆缃戝叧鐘舵��
+ DriverLayer.Control.Ins.GatewayOnline_Cloud = false;
+ DriverLayer.Control.Ins.GatewayOnline_Local = false;
SpatialInfo.CurrentSpatial.Clear();
FunctionList.List.Clear();
- if (MainPage.IsRemote)
- {
- DAL.Mqtt.MqttClient.DisConnectRemote("閫�鍑虹櫥褰曪紝鎴栬�呭垏鎹綇瀹�");
- }
+
+ ///鍒囨崲浣忓畢娓呯┖鍓嶄綇瀹呯紦瀛樿嚜鍔ㄥ寲鍒楄〃锛�
+ HDL_ON.UI.UI2.Intelligence.Automation.Logic.LogicList.Clear();
+ DAL.Mqtt.MqttClient.DisConnectRemote("閫�鍑虹櫥褰曪紝鎴栬�呭垏鎹綇瀹�");
}
+ /// <summary>
+ /// 鏄惁鏀寔浜鸿劯閫氳
+ /// </summary>
+ public bool SupportFacePass = false;
/// <summary>
/// 缃戝叧璇︾粏淇℃伅
@@ -135,8 +166,8 @@
public HomeGatewayInfo HomeGateway;
/// <summary>
- /// 0:bus缃戝叧
- /// 1:A鍗忚缃戝叧
+ /// 0:涓�绔彛
+ /// 1:Link鍗忚缃戝叧
/// </summary>
public int GatewayType
{
@@ -147,7 +178,7 @@
//#endif
if (HomeGateway == null)
return -1;
- if (HomeGateway.gatewayType == "AGATEWAY")
+ if (HomeGateway.gatewayType != "BUSUDPGATEWAY")
{
return 1;
}
@@ -268,7 +299,6 @@
/// <returns></returns>
static byte[] ReadResidenceInfo()
{
- MainPage.Log("get file Instance ");
var fileName = "DB_ResidenceData";
FileStream fs = null;
try
@@ -296,7 +326,6 @@
}
finally
{
- MainPage.Log("get file ");
try
{
if (fs != null)
@@ -418,4 +447,4 @@
#endregion
}
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0