From 3cebdfad56d78ba04a214fccd1b942a010aeba77 Mon Sep 17 00:00:00 2001
From: tzy <274116637@qq.com>
Date: 星期五, 26 三月 2021 09:42:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/temp-wxr' into dev-tzy
---
HDL_ON/UI/MainPage.cs | 30 ++++++++++++++++++------------
1 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index 979bce0..65444e3 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -18,15 +18,9 @@
/// </summary>
public static PageLayout BasePageView { get; set; }
/// <summary>
- /// DisplayCompleted
- /// </summary>
- public static bool DisplayCompleted = false;
-
- //public static UserInfo LoginUser;
- /// <summary>
/// 鐗堟湰鍙�
/// </summary>
- public static string VersionString = "1.1.0319";
+ public static string VersionString = "1.1.0324";
///// <summary>
///// 瀹㈡埛绔被鍨�
///// </summary>
@@ -40,6 +34,10 @@
/// 澶╂皵鍒锋柊action
/// </summary>
public static Action RefreshAir;
+ /// <summary>
+ /// 鍥為��椤甸潰action 娌℃湁闇�瑕佸彲浠ヤ笉鐢�
+ /// </summary>
+ public static Action ReturnRefreshAction;
/// <summary>
/// 鏃犵櫥褰曟ā寮�
/// </summary>
@@ -198,13 +196,21 @@
{
if (e < BasePageView.ChildrenCount - 1)
{
- MainPage.BasePageView.GetChildren(MainPage.BasePageView.ChildrenCount - 1).RemoveFromParent();
- }
-
- while (e < BasePageView.ChildrenCount - 1)
- {
BasePageView.GetChildren(BasePageView.ChildrenCount - 1).RemoveFromParent();
}
+ try
+ {
+ ReturnRefreshAction?.Invoke();
+ ReturnRefreshAction = null;
+ }
+ catch (Exception ex)
+ {
+ Log($"鍚庨��浜嬩欢寮傚父:{ex.Message}");
+ }
+ //while (e < BasePageView.ChildrenCount - 1)
+ //{
+ // BasePageView.GetChildren(BasePageView.ChildrenCount - 1).RemoveFromParent();
+ //}
};
BasePageView.MouseDownEventHandler += (sender, e) =>
{
--
Gitblit v1.8.0