From 064501c0cbf8643cfb2bdb2c295055189cf3287f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 21 十二月 2020 19:42:53 +0800
Subject: [PATCH] Merge branch 'CJL' into NewFilePath
---
HDL_ON/UI/MainPage.cs | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
old mode 100755
new mode 100644
index eb169f9..a9a1860
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -26,7 +26,7 @@
/// <summary>
/// 鐗堟湰鍙�
/// </summary>
- public static string VersionString = "1.0.0924";
+ public static string VersionString = "1.0.0124";
///// <summary>
///// 瀹㈡埛绔被鍨�
///// </summary>
@@ -53,6 +53,10 @@
/// 0:鏃犵綉缁�
/// </summary>
public static int InternetStatus = 2;
+ /// <summary>
+ /// 鏄惁杩涘叆鍚庡彴
+ /// </summary>
+ public static bool IsEnterBackground = false;
///// <summary>
///// 鍏徃浠ｇ爜
@@ -255,6 +259,8 @@
Entity.FunctionList.List.DownloadFunctionList();
//璇诲彇浜戠鍦烘櫙鏁版嵁
Entity.FunctionList.List.DownloadSceneList();
+ //璇诲彇閫昏緫鍒楄〃
+ UI.UI2.Intelligence.Automation.MainView.GetLogicList();
#endregion
})
--
Gitblit v1.8.0