From eda3fb873e59544ff36301b51e05aef64f87b0f9 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 八月 2021 13:21:21 +0800
Subject: [PATCH] Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into newBranch1
---
HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs | 33 ++++++++++++++++++++++-----------
1 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs b/HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs
old mode 100755
new mode 100644
index d61b913..f00ffbe
--- a/HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs
@@ -134,7 +134,7 @@
};
#endregion
-#region 鍒嗕韩涓庡姛鑳�
+ #region 鍒嗕韩涓庡姛鑳�
shareMenuButton = new MenuButton()
{
X = allMenuButton.Right,
@@ -144,12 +144,13 @@
shareMenuButton.ImageButton.SelectedImagePath = "Collection/MesCenter/ShareOn.png";
shareMenuButton.ImageButton.UnSelectedImagePath = "Collection/MesCenter/Share.png";
shareMenuButton.TextButton.TextID = StringId.SharingAndFunctionality;
+ shareMenuButton.TextButton.IsMoreLines = true;
Action shateAction = () =>
{
MenuButtonSelect(1);
};
shareMenuButton.SelectAction = shateAction;
-#endregion
+ #endregion
#region 鎶ヨ绫�
alarmMenuButton = new MenuButton()
@@ -302,7 +303,8 @@
TextAlignment = TextAlignment.CenterLeft,
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.TextFontSize,
- Text = pushMessageInfo.messageContent
+ Text = pushMessageInfo.messageContent,
+ //IsMoreLines = true,
};
rowView.AddChidren(btnTilte);
//
@@ -357,13 +359,14 @@
btnDatetime.Text = GetUnixToDateTime(pushMessageInfo.createTime);
- EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
- {
- new Alert(pushMessageInfo.messageTitle, pushMessageInfo.messageContent, Language.StringByID(StringId.Close)).Show();
- };
- rowView.MouseUpEventHandler = eventHandler;
- btnTilte.MouseUpEventHandler = eventHandler;
- btnSubtitle.MouseUpEventHandler = eventHandler;
+ //2020-12-23 鍘绘帀鐐瑰嚮寮圭獥浜嬩欢
+ //EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
+ //{
+ // new Alert(pushMessageInfo.messageTitle, pushMessageInfo.messageContent, Language.StringByID(StringId.Close)).Show();
+ //};
+ //rowView.MouseUpEventHandler = eventHandler;
+ //btnTilte.MouseUpEventHandler = eventHandler;
+ //btnSubtitle.MouseUpEventHandler = eventHandler;
}
@@ -464,7 +467,15 @@
void GetPushMessageList(int queryType = 0)
{
bodyScrolView.RemoveAll();
- PushMessageInfoList.Clear();
+ if(PushMessageInfoList == null)
+ {
+ PushMessageInfoList = new List<PushMessageInfo>();
+ }
+ else
+ {
+ PushMessageInfoList.Clear();
+ }
+
YearMark = "";//鏍囪娓呯┖
if (string.IsNullOrEmpty(OnAppConfig.Instance.PushId))
{
--
Gitblit v1.8.0