From 264f86c363a6a019fac8eb138877fee9e4734e2d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期六, 21 八月 2021 17:45:44 +0800
Subject: [PATCH] Merge branch 'WJC' into wxr7
---
HDL_ON/Entity/DB_ResidenceData.cs | 43 +++++++++++++++++++++++++++++++++----------
1 files changed, 33 insertions(+), 10 deletions(-)
diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index 5b12778..0f6ca28 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>
/// 浣忓畢鍩虹淇℃伅
@@ -30,7 +29,7 @@
{
if (MainPage.NoLoginMode)
{
- return new RegionInfoRes() { homeName = "鏈湴妯″紡" };
+ 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,9 +111,7 @@
{
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,
@@ -97,8 +121,7 @@
ShowFunction.Sensor,ShowFunction.VideoIntercom,
ShowFunction.SecurityCenter
});
- instance.SaveResidenceData();
- }
+ instance.SaveResidenceData();
}
catch (Exception ex)
{
@@ -139,8 +162,8 @@
public HomeGatewayInfo HomeGateway;
/// <summary>
- /// 0:bus缃戝叧
- /// 1:A鍗忚缃戝叧
+ /// 0:涓�绔彛
+ /// 1:Link鍗忚缃戝叧
/// </summary>
public int GatewayType
{
@@ -151,7 +174,7 @@
//#endif
if (HomeGateway == null)
return -1;
- if (HomeGateway.gatewayType == "AGATEWAY")
+ if (HomeGateway.gatewayType != "BUSUDPGATEWAY")
{
return 1;
}
--
Gitblit v1.8.0