From 0ee75b88cfe03e46289de0de96e8ed4580c797d3 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 27 九月 2022 14:04:21 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into dev--wxr
---
HDL_ON/Entity/DB_ResidenceData.cs | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index bbe27bd..cd346ad 100644
--- a/HDL_ON/Entity/DB_ResidenceData.cs
+++ b/HDL_ON/Entity/DB_ResidenceData.cs
@@ -78,7 +78,7 @@
ShowFunction.FreshAir,ShowFunction.DoorLock,
ShowFunction.Panel,ShowFunction.SecurityMonitoring,
ShowFunction.Sensor,ShowFunction.VideoIntercom,
- ShowFunction.SecurityCenter
+ ShowFunction.SecurityCenter,ShowFunction.Acst,
});
instance.SaveResidenceData();
instance.residenceImage = "Classification/Room/Roombg.png";
@@ -119,7 +119,7 @@
ShowFunction.FreshAir,ShowFunction.DoorLock,
ShowFunction.Panel,ShowFunction.SecurityMonitoring,
ShowFunction.Sensor,ShowFunction.VideoIntercom,
- ShowFunction.SecurityCenter
+ ShowFunction.SecurityCenter,ShowFunction.Acst,
});
instance.SupportFacePass = false;
instance.SaveResidenceData();
@@ -470,6 +470,10 @@
#endregion
+ /// <summary>
+ /// 鍦烘櫙绛涢�夋椂锛岄�夋嫨鐨勬埧闂�
+ /// </summary>
+ public string sceneChooseRoomId = "";
/// <summary>
--
Gitblit v1.8.0