From da22725d616af0f3081670c76195eaf57794bc29 Mon Sep 17 00:00:00 2001
From: chenqiyang <1406175257@qq.com>
Date: 星期三, 18 五月 2022 16:03:33 +0800
Subject: [PATCH] Merge branch 'dev-CQY' into dev 1.调整全视通与自研的逻辑 2.增加获取可视对讲第三方账号接口
---
HDL_ON/Entity/DB_ResidenceData.cs | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index 75d6fc6..e477a7d 100644
--- a/HDL_ON/Entity/DB_ResidenceData.cs
+++ b/HDL_ON/Entity/DB_ResidenceData.cs
@@ -156,10 +156,13 @@
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>
@@ -175,7 +178,8 @@
/// <summary>
/// 鏄惁鏀寔鍏ㄨ閫�
/// </summary>
- public bool SupportFVDevice = false;
+ [Newtonsoft.Json.JsonIgnore]
+ public bool SupportFVDevice = true;
/// <summary>
/// 缃戝叧璇︾粏淇℃伅
--
Gitblit v1.8.0