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 | 65 +++++++++++++++++---------------
1 files changed, 35 insertions(+), 30 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs b/HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs
index 87d2684..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();
@@ -113,17 +107,28 @@
MenuButtonSelect(0);
};
allMenuButton.SelectAction = allAction;
-
-#if DEBUG
//娴嬭瘯鎻愬墠褰撳墠鎺ㄩ�両D
allMenuButton.ImageButton.MouseLongEventHandler = (sender, e) =>
{
- CopyToClipboard("鎺ㄩ�両D锛�" + OnAppConfig.Instance.PushId);
- };
-#endif
- #endregion
+#if DEBUG
- #region 鍒嗕韩涓庡姛鑳�
+ CopyToClipboard("鎺ㄩ�両D锛�" + OnAppConfig.Instance.PushId);
+#else
+ //妫�娴嬫槸鍚﹁幏鍙栨帹閫両D鎴愬姛锛屾彁绀烘帹閫佹敞鍐屾槸鍚︽甯�
+ if (string.IsNullOrEmpty(OnAppConfig.Instance.PushId))
+ {
+ Utlis.ShowTip(Language.StringByID(StringId.PushException));
+ }
+ else
+ {
+ Utlis.ShowTip(Language.StringByID(StringId.PushNormal));
+ }
+#endif
+
+ };
+#endregion
+
+#region 鍒嗕韩涓庡姛鑳�
shareMenuButton = new MenuButton()
{
X = allMenuButton.Right,
@@ -138,9 +143,9 @@
MenuButtonSelect(1);
};
shareMenuButton.SelectAction = shateAction;
- #endregion
+#endregion
- #region 鎶ヨ绫�
+#region 鎶ヨ绫�
alarmMenuButton = new MenuButton()
{
X = shareMenuButton.Right,
@@ -155,9 +160,9 @@
MenuButtonSelect(2);
};
alarmMenuButton.SelectAction = alarmAction;
- #endregion
+#endregion
- #region 绯荤粺淇℃伅
+#region 绯荤粺淇℃伅
systemMenuButton = new MenuButton()
{
X = alarmMenuButton.Right,
@@ -172,7 +177,7 @@
MenuButtonSelect(3);
};
systemMenuButton.SelectAction = systemAction;
- #endregion
+#endregion
}
@@ -533,7 +538,7 @@
}
}
- #region 娴嬭瘯
+#region 娴嬭瘯
#if DEBUG
/// <summary>
///
@@ -608,7 +613,7 @@
#endif
- #endregion
+#endregion
/// <summary>
/// 鏍囪鎵�鏈夋帹閫佹秷鎭凡璇�
@@ -637,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>
@@ -652,7 +657,7 @@
/// </summary>
void UnregisterGetPushMessageAction()
{
- HDLCommon.GetPushMessageAction = null;
+ //HDLCommon.GetPushMessageAction = null;
}
#if DEBUG
--
Gitblit v1.8.0