From 6ec12a036c96a200fc0a941967d6b4d07592f863 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 17 十二月 2020 14:31:17 +0800
Subject: [PATCH] Merge branch 'tzy' into NewFilePath
---
HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs | 26 ++++++++++----------------
1 files changed, 10 insertions(+), 16 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs b/HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs
index f130b5b..f830a1f 100644
--- a/HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs
@@ -44,16 +44,11 @@
/// </summary>
List<PushMessageInfo> PushMessageInfoList = new List<PushMessageInfo>();
- /// <summary>
- /// 椤甸潰鍏抽棴鏃堕棿
- /// </summary>
- Action backAction;
public override void RemoveFromParent()
{
UnregisterGetPushMessageAction();
base.RemoveFromParent();
- backAction?.Invoke();
}
/// <summary>
@@ -71,8 +66,7 @@
/// <param name="backAction"></param>
public void LoadPage(Action backAction)
{
- this.backAction = backAction;
- new TopViewDiv(bodyView, Language.StringByID(StringId.MessageCenter)).LoadTopView();
+ new TopViewDiv(bodyView, Language.StringByID(StringId.MessageCenter)).LoadTopView(backAction);
AddTopMenuView();
AddMessageView();
@@ -648,14 +642,14 @@
/// </summary>
void RegisterGetPushMessageAction()
{
- HDLCommon.GetPushMessageAction = () =>
- {
- if (bodyView != null)
- {
- //Utlis.WriteLine("GetPushMessageAction M鏀跺埌鎺ㄩ��");
- GetPushMessageList(showMesType);
- }
- };
+ //HDLCommon.GetPushMessageAction = () =>
+ //{
+ // if (bodyView != null)
+ // {
+ // Utlis.WriteLine("GetPushMessageAction M鏀跺埌鎺ㄩ��");
+ // GetPushMessageList(showMesType);
+ // }
+ //};
}
/// <summary>
@@ -663,7 +657,7 @@
/// </summary>
void UnregisterGetPushMessageAction()
{
- HDLCommon.GetPushMessageAction = null;
+ //HDLCommon.GetPushMessageAction = null;
}
#if DEBUG
--
Gitblit v1.8.0