From b47f91b91bc5371bba0c8801dbd648772ab331fc Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 11 十一月 2022 13:54:15 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into wjc
---
HDL_ON/Entity/DB_ResidenceData.cs | 62 ++++++++++++++++++++++++-------
1 files changed, 48 insertions(+), 14 deletions(-)
diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index 7e9c6f8..d3df31b 100644
--- a/HDL_ON/Entity/DB_ResidenceData.cs
+++ b/HDL_ON/Entity/DB_ResidenceData.cs
@@ -54,11 +54,33 @@
}
}
+ [Newtonsoft.Json.JsonIgnore]
+ private List<ShowFunction> showFunctions;
+
/// <summary>
/// 鍔熻兘绫诲瀷鍒楄〃
/// </summary>
[Newtonsoft.Json.JsonIgnore]
- public List<ShowFunction> functionTypeList = new List<ShowFunction>();
+ public List<ShowFunction> functionTypeList
+ {
+ get
+ {
+ if (showFunctions == null)
+ {
+ showFunctions = 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,ShowFunction.Acst,
+ ShowFunction.MechanicalArm };
+ }
+ return showFunctions;
+ }
+ }
static DB_ResidenceData instance;
public static DB_ResidenceData Instance
@@ -70,16 +92,6 @@
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()
@@ -119,7 +131,8 @@
ShowFunction.FreshAir,ShowFunction.DoorLock,
ShowFunction.Panel,ShowFunction.SecurityMonitoring,
ShowFunction.Sensor,ShowFunction.VideoIntercom,
- ShowFunction.SecurityCenter
+ ShowFunction.SecurityCenter,ShowFunction.Acst,
+ ShowFunction.MechanicalArm
});
instance.SupportFacePass = false;
instance.SaveResidenceData();
@@ -155,11 +168,28 @@
///鍒囨崲浣忓畢娓呯┖鍓嶄綇瀹呯紦瀛樿嚜鍔ㄥ寲鍒楄〃锛�
HDL_ON.UI.UI2.Intelligence.Automation.Logic.LogicList.Clear();
DAL.Mqtt.MqttClient.DisConnectRemote("閫�鍑虹櫥褰曪紝鎴栬�呭垏鎹綇瀹�");
+
+#if IOS
+ //閫�鍑哄叏瑙嗛�氱櫥褰�
+ Shared.IOS.HDLFVSDK.Video.Logout();
+ //閲嶇疆榛樿涓嶆敮鎸佸叏瑙嗛��
+ Entity.DB_ResidenceData.Instance.SupportFVDevice = false;
+#endif
}
/// <summary>
/// 鏄惁鏀寔浜鸿劯閫氳
/// </summary>
public bool SupportFacePass = false;
+
+ /// <summary>
+ /// 鏄惁鏀寔璁垮绠＄悊
+ /// </summary>
+ public bool SupportVisitorManage = false;
+
+ /// <summary>
+ /// 鏄惁鏀寔鍏ㄨ閫�
+ /// </summary>
+ public bool SupportFVDevice = false;
/// <summary>
/// 缃戝叧璇︾粏淇℃伅
@@ -399,7 +429,7 @@
}
- #region oid鍒楄〃 a鍗忚杞琤us鍗忚鎺у埗浣跨敤
+#region oid鍒楄〃 a鍗忚杞琤us鍗忚鎺у埗浣跨敤
/// <summary>
/// oid鏁版嵁淇濆瓨鐨勬枃浠跺悕
/// </summary>
@@ -451,8 +481,12 @@
Common.FileUtlis.Files.WriteFileByBytes(OidSavePathName, oidBytes);
}
- #endregion
+#endregion
+ /// <summary>
+ /// 鍦烘櫙绛涢�夋椂锛岄�夋嫨鐨勬埧闂�
+ /// </summary>
+ public string sceneChooseRoomId = "";
/// <summary>
--
Gitblit v1.8.0