From d9fd4c59bea0f21d4c8241920cef90440cf53f43 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期六, 28 八月 2021 17:20:45 +0800
Subject: [PATCH] 2021-8-28-05
---
HDL_ON/Entity/DB_ResidenceData.cs | 37 +++++++++++++++++++++++++++++++++----
1 files changed, 33 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index af8b657..712bbb5 100644
--- a/HDL_ON/Entity/DB_ResidenceData.cs
+++ b/HDL_ON/Entity/DB_ResidenceData.cs
@@ -19,7 +19,6 @@
/// </summary>
public string MasterToken;
- //RegionInfoRes _residecenInfo;
RegionInfoRes _residecenInfo = new RegionInfoRes();
/// <summary>
/// 浣忓畢鍩虹淇℃伅
@@ -68,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();
@@ -130,6 +155,10 @@
HDL_ON.UI.UI2.Intelligence.Automation.Logic.LogicList.Clear();
DAL.Mqtt.MqttClient.DisConnectRemote("閫�鍑虹櫥褰曪紝鎴栬�呭垏鎹綇瀹�");
}
+ /// <summary>
+ /// 鏄惁鏀寔浜鸿劯閫氳
+ /// </summary>
+ public bool SupportFacePass = false;
/// <summary>
/// 缃戝叧璇︾粏淇℃伅
@@ -137,8 +166,8 @@
public HomeGatewayInfo HomeGateway;
/// <summary>
- /// 0:bus缃戝叧
- /// 1:A鍗忚缃戝叧
+ /// 0:涓�绔彛
+ /// 1:Link鍗忚缃戝叧
/// </summary>
public int GatewayType
{
@@ -149,7 +178,7 @@
//#endif
if (HomeGateway == null)
return -1;
- if (HomeGateway.gatewayType == "AGATEWAY")
+ if (HomeGateway.gatewayType != "BUSUDPGATEWAY")
{
return 1;
}
--
Gitblit v1.8.0