From 0f13be8b24ef37fe16cd34c8411a907f93b7f304 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 28 十一月 2023 09:35:42 +0800
Subject: [PATCH] Merge branch 'Wxr-V2.4.2' into Google-2023-11-17-1

---
 HDL_ON/Entity/DB_ResidenceData.cs |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index 6e556a8..f80f413 100644
--- a/HDL_ON/Entity/DB_ResidenceData.cs
+++ b/HDL_ON/Entity/DB_ResidenceData.cs
@@ -74,10 +74,9 @@
                                     ShowFunction.FreshAir,ShowFunction.DoorLock,
                                     ShowFunction.Panel,
                                     ShowFunction.Sensor,ShowFunction.VideoIntercom,
-                                    ShowFunction.SecurityCenter,ShowFunction.Acst,
+                                    ShowFunction.SecurityCenter,
                                     ShowFunction.MechanicalArm ,
-                                    ShowFunction.SecurityMonitoring,
-                                    ShowFunction.VideoDoorLock,
+                                    ShowFunction.Series,
                     };
                 }
                 return dddd;
@@ -95,7 +94,7 @@
                     {
                         instance = new DB_ResidenceData();
                         instance.SaveResidenceData();
-                        instance.residenceImage = "Classification/Room/Roombg.png";
+                        instance.residenceImage = "Classification/Room/HomePagebg.png";
                         instance.HomeGateway = new HomeGatewayInfo()
                         {
                             homeId = "1396717478877241345",
@@ -134,7 +133,7 @@
                         instance = new DB_ResidenceData { };
                         return instance;
                     }
-                    instance.residenceImage = "Classification/Room/Roombg.png";
+                    instance.residenceImage = "Classification/Room/HomePagebg.png";
                     //鍒濆鍖栦綇瀹呭姛鑳芥暟鎹�
                     SpatialInfo.CurrentSpatial.InitRoomListFunctions();
 

--
Gitblit v1.8.0