From bfb3d0d4879dca8c59ff287c92f5113162f3a33a Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期二, 27 八月 2024 15:22:48 +0800
Subject: [PATCH] 代码备份
---
OnPro/HDL_ON/Entity/DB_ResidenceData.cs | 33 ++++++---------------------------
1 files changed, 6 insertions(+), 27 deletions(-)
diff --git a/OnPro/HDL_ON/Entity/DB_ResidenceData.cs b/OnPro/HDL_ON/Entity/DB_ResidenceData.cs
index 3fe97ad..63820e1 100644
--- a/OnPro/HDL_ON/Entity/DB_ResidenceData.cs
+++ b/OnPro/HDL_ON/Entity/DB_ResidenceData.cs
@@ -29,7 +29,7 @@
{
if (MainPage.NoLoginMode)
{
- return new RegionInfoRes() { homeName = "HDL Home" ,id = "text000001"};
+ return new RegionInfoRes() { homeName = "My Home" ,id = "text000001"};
}
else
{
@@ -68,17 +68,8 @@
{
dddd = new List<ShowFunction>(){
ShowFunction.Light,ShowFunction.AC,ShowFunction.Curtain,
- ShowFunction.FloorHeating,ShowFunction.Music,
- ShowFunction.Electric,ShowFunction.Environmental,
- ShowFunction.EnergyMonitoring,ShowFunction.IpCam,
- ShowFunction.FreshAir,ShowFunction.DoorLock,
- ShowFunction.Panel,
- ShowFunction.Sensor,ShowFunction.VideoIntercom,
- ShowFunction.SecurityCenter,ShowFunction.Acst,
- ShowFunction.MechanicalArm ,
- ShowFunction.SecurityMonitoring,
- ShowFunction.VideoDoorLock,
- ShowFunction.Series,
+ ShowFunction.FloorHeating,
+ ShowFunction.FreshAir,
};
}
return dddd;
@@ -96,7 +87,7 @@
{
instance = new DB_ResidenceData();
instance.SaveResidenceData();
- instance.residenceImage = "Classification/Room/HomePagebg.png";
+ instance.residenceImage = "Classification/Room/Roombg.png";
instance.HomeGateway = new HomeGatewayInfo()
{
homeId = "1396717478877241345",
@@ -135,7 +126,7 @@
instance = new DB_ResidenceData { };
return instance;
}
- instance.residenceImage = "Classification/Room/HomePagebg.png";
+ instance.residenceImage = "Classification/Room/Roombg.png";
//鍒濆鍖栦綇瀹呭姛鑳芥暟鎹�
SpatialInfo.CurrentSpatial.InitRoomListFunctions();
@@ -196,19 +187,7 @@
{
get
{
- //#if DEBUG
- //return 0;
- //#endif
- if (HomeGateway == null)
- return -1;
- if (HomeGateway.gatewayType != "BUSUDPGATEWAY")
- {
- return 1;
- }
- else
- {
- return 0;
- }
+ return 1;
}
}
/// <summary>
--
Gitblit v1.8.0