From 94d6591af7870ba0f1f7797310c07581d6fcd0b4 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期五, 04 十一月 2022 16:27:14 +0800
Subject: [PATCH] 2022年11月04日16:26:44

---
 HDL_ON/Common/ApiUtlis.cs |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/HDL_ON/Common/ApiUtlis.cs b/HDL_ON/Common/ApiUtlis.cs
index 38f4711..ce80e93 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,6 +321,7 @@
                     { IsBackground = true }.Start();
 
                     //===================璇诲彇閫昏緫鍒楄〃==========================
+                    Logic.LogicList.Clear();//涓婚〉涓嬫媺寮哄埗鍒锋柊鑷姩鍖栧垪琛�
                     UI.UI2.Intelligence.Automation.MainView.GetLogicList();
 
                     //===================璇诲彇鍙瀵硅鏁版嵁==========================
@@ -403,6 +407,9 @@
 
                     //======================瀹夐槻====================
                     GetSecurityList();
+                    //======================娉ㄥ唽鎺ㄩ��====================
+                    httpRequest.RegisteredPush();
+
 
                 }
                 catch (Exception ex)
@@ -439,7 +446,7 @@
                 {
                     while (endTime > DateTime.Now)
                     {
-                        if (DownloadDataComplete)
+                        if (DownloadDataComplete && complateDevice && complateScene)
                         {
                             break;
                         }

--
Gitblit v1.8.0