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/Common/ApiUtlis.cs | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/Common/ApiUtlis.cs b/HDL_ON/Common/ApiUtlis.cs
index e175781..00f630a 100644
--- a/HDL_ON/Common/ApiUtlis.cs
+++ b/HDL_ON/Common/ApiUtlis.cs
@@ -5,6 +5,7 @@
using HDL_ON.DAL.Server;
using HDL_ON.Entity;
using HDL_ON.UI.UI2.FuntionControlView.Video;
+using HDL_ON.UI.UI2.Intelligence.Automation;
using Newtonsoft.Json;
using Shared;
@@ -88,6 +89,8 @@
waitPage.Start(Language.StringByID(StringId.PleaseWait));
string code = StateCode.SUCCESS;
+
+ Inverter.Ins.H5Page = null;//閲嶇疆鍏変紡椤甸潰
var downloadDataThread = new System.Threading.Thread(() =>
{
@@ -318,7 +321,8 @@
{ IsBackground = true }.Start();
//===================璇诲彇閫昏緫鍒楄〃==========================
- UI.UI2.Intelligence.Automation.MainView.GetLogicList();
+ Logic.LogicList.Clear();//涓婚〉涓嬫媺寮哄埗鍒锋柊鑷姩鍖栧垪琛�
+ //UI.UI2.Intelligence.Automation.MainView.GetLogicList();
//===================璇诲彇鍙瀵硅鏁版嵁==========================
//鍒ゆ柇鏄惁鏈夊彲瑙嗗璁叉暟鎹紝鏈夊垯鏄剧ず鍙瀵硅icon
@@ -348,10 +352,10 @@
DB_ResidenceData.Instance.SaveResidenceData();
Entity.DB_ResidenceData.Instance.SupportFVDevice = true;
-
}
else if (video.interphoneType == InterphoneType.FREEVIEW.ToString())
- {//涓哄叏瑙嗛�氬彲瑙嗗璁�
+ {
+ //涓哄叏瑙嗛�氬彲瑙嗗璁�
DB_ResidenceData.Instance.SupportFacePass = true;
Entity.DB_ResidenceData.Instance.SupportVisitorManage = true;
Entity.DB_ResidenceData.Instance.SupportFVDevice = true;
--
Gitblit v1.8.0