From 9eec81850e418a3c16410b4870910bde142b06e3 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 14 九月 2022 15:50:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/Dev-Branch' into wjc
---
HDL_ON/Entity/DB_ResidenceData.cs | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index e05e640..0113d52 100644
--- a/HDL_ON/Entity/DB_ResidenceData.cs
+++ b/HDL_ON/Entity/DB_ResidenceData.cs
@@ -155,11 +155,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 +416,7 @@
}
- #region oid鍒楄〃 a鍗忚杞琤us鍗忚鎺у埗浣跨敤
+#region oid鍒楄〃 a鍗忚杞琤us鍗忚鎺у埗浣跨敤
/// <summary>
/// oid鏁版嵁淇濆瓨鐨勬枃浠跺悕
/// </summary>
@@ -451,7 +468,7 @@
Common.FileUtlis.Files.WriteFileByBytes(OidSavePathName, oidBytes);
}
- #endregion
+#endregion
/// <summary>
/// 鍦烘櫙绛涢�夋椂锛岄�夋嫨鐨勬埧闂�
--
Gitblit v1.8.0