From ea285ffe71284f5499e870f89c65b710d2d6a79c Mon Sep 17 00:00:00 2001
From: lss <lsc@hdlchina.com.cn>
Date: 星期一, 27 六月 2022 10:54:32 +0800
Subject: [PATCH] Merge branch 'wxr0114' of http://59.41.255.150:6688/r/~wxr/OnPro into wxr0114
---
HDL_ON/Entity/DB_ResidenceData.cs | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index 75d6fc6..0113d52 100644
--- a/HDL_ON/Entity/DB_ResidenceData.cs
+++ b/HDL_ON/Entity/DB_ResidenceData.cs
@@ -156,11 +156,12 @@
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>
/// 鏄惁鏀寔浜鸿劯閫氳
@@ -415,7 +416,7 @@
}
- #region oid鍒楄〃 a鍗忚杞琤us鍗忚鎺у埗浣跨敤
+#region oid鍒楄〃 a鍗忚杞琤us鍗忚鎺у埗浣跨敤
/// <summary>
/// oid鏁版嵁淇濆瓨鐨勬枃浠跺悕
/// </summary>
@@ -467,8 +468,12 @@
Common.FileUtlis.Files.WriteFileByBytes(OidSavePathName, oidBytes);
}
- #endregion
+#endregion
+ /// <summary>
+ /// 鍦烘櫙绛涢�夋椂锛岄�夋嫨鐨勬埧闂�
+ /// </summary>
+ public string sceneChooseRoomId = "";
/// <summary>
--
Gitblit v1.8.0