From 23ee4f8c373f9abecf079ef9d4297d8b6cd8d5e6 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 16 十二月 2020 15:16:00 +0800
Subject: [PATCH] Merge branch 'NewFilePath'
---
HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs | 71 ++++++++++++++++++++++++++++++++---
1 files changed, 65 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs b/HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs
index 4ea4cbd..87d2684 100644
--- a/HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs
@@ -4,7 +4,9 @@
using System.Collections.Generic;
using System.Threading;
using HDL_ON.DAL.Server;
-
+#if DEBUG
+using Xamarin.Essentials;
+#endif
namespace HDL_ON.UI
{
/// <summary>
@@ -42,6 +44,17 @@
/// </summary>
List<PushMessageInfo> PushMessageInfoList = new List<PushMessageInfo>();
+ /// <summary>
+ /// 椤甸潰鍏抽棴鏃堕棿
+ /// </summary>
+ Action backAction;
+
+ public override void RemoveFromParent()
+ {
+ UnregisterGetPushMessageAction();
+ base.RemoveFromParent();
+ backAction?.Invoke();
+ }
/// <summary>
///
@@ -58,12 +71,13 @@
/// <param name="backAction"></param>
public void LoadPage(Action backAction)
{
- new TopViewDiv(bodyView, Language.StringByID(StringId.MessageCenter)).LoadTopView(backAction);
+ this.backAction = backAction;
+ new TopViewDiv(bodyView, Language.StringByID(StringId.MessageCenter)).LoadTopView();
AddTopMenuView();
AddMessageView();
MenuButtonSelect(showMesType);
-
+ RegisterGetPushMessageAction();
//娴嬭瘯浠ｇ爜
//AddEmptyTipView();
//TestLoad();
@@ -99,6 +113,14 @@
MenuButtonSelect(0);
};
allMenuButton.SelectAction = allAction;
+
+#if DEBUG
+ //娴嬭瘯鎻愬墠褰撳墠鎺ㄩ�両D
+ allMenuButton.ImageButton.MouseLongEventHandler = (sender, e) =>
+ {
+ CopyToClipboard("鎺ㄩ�両D锛�" + OnAppConfig.Instance.PushId);
+ };
+#endif
#endregion
#region 鍒嗕韩涓庡姛鑳�
@@ -323,7 +345,7 @@
{
new Alert(pushMessageInfo.messageTitle, pushMessageInfo.messageContent, Language.StringByID(StringId.Close)).Show();
};
-
+ rowView.MouseUpEventHandler = eventHandler;
btnTilte.MouseUpEventHandler = eventHandler;
btnSubtitle.MouseUpEventHandler = eventHandler;
}
@@ -426,7 +448,8 @@
bodyScrolView.RemoveAll();
PushMessageInfoList.Clear();
YearMark = "";//鏍囪娓呯┖
- if (string.IsNullOrEmpty(UserInfo.Current.PushId)) {
+ if (string.IsNullOrEmpty(OnAppConfig.Instance.PushId))
+ {
AddEmptyTipView();
return;
}
@@ -590,7 +613,8 @@
/// <summary>
/// 鏍囪鎵�鏈夋帹閫佹秷鎭凡璇�
/// </summary>
- void PushSerivceMarkAllMessageRead() {
+ void PushSerivceMarkAllMessageRead()
+ {
new Thread(() =>
{
var result = new HttpServerRequest().PushSerivceMarkAllMessageRead();
@@ -608,6 +632,41 @@
{ IsBackground = true }.Start();
}
+ /// <summary>
+ /// 娉ㄥ唽鏀跺埌鎺ㄩ�佺洃鍚�
+ /// </summary>
+ void RegisterGetPushMessageAction()
+ {
+ HDLCommon.GetPushMessageAction = () =>
+ {
+ if (bodyView != null)
+ {
+ //Utlis.WriteLine("GetPushMessageAction M鏀跺埌鎺ㄩ��");
+ GetPushMessageList(showMesType);
+ }
+ };
+ }
+
+ /// <summary>
+ /// 鍙栨秷鏀跺埌鎺ㄩ�佺洃鍚�
+ /// </summary>
+ void UnregisterGetPushMessageAction()
+ {
+ HDLCommon.GetPushMessageAction = null;
+ }
+
+#if DEBUG
+
+ /// <summary>
+ /// 澶嶅埗鍒板壀鍒囨澘
+ /// </summary>
+ /// <param name="text"></param>
+ void CopyToClipboard(string text)
+ {
+ Clipboard.SetTextAsync(text);
+ Utlis.ShowTip(text + "\n" + Language.StringByID(StringId.CopySuccess));
+ }
+#endif
}
--
Gitblit v1.8.0