From 01c46e7bfe9aa8fb20b29f70c83c03a307af548a Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 22 十二月 2020 16:35:16 +0800
Subject: [PATCH] 2020-12-22 1.更新。

---
 HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs |   65 +++++++++++++++++++++-----------
 1 files changed, 43 insertions(+), 22 deletions(-)

diff --git a/HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs b/HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs
index f830a1f..b743deb 100644
--- a/HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs
@@ -44,11 +44,16 @@
         /// </summary>
         List<PushMessageInfo> PushMessageInfoList = new List<PushMessageInfo>();
 
+        /// <summary>
+        /// 椤甸潰鍏抽棴鏃堕棿
+        /// </summary>
+        Action backAction;
 
         public override void RemoveFromParent()
         {
             UnregisterGetPushMessageAction();
             base.RemoveFromParent();
+            backAction?.Invoke();
         }
 
         /// <summary>
@@ -66,7 +71,8 @@
         /// <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();
@@ -215,9 +221,9 @@
             if (selectId == 0)
             {
                 allMenuButton.IsSelected = true;
-                shareMenuButton.IsSelected = false;
-                alarmMenuButton.IsSelected = false;
-                systemMenuButton.IsSelected = false;
+                shareMenuButton.IsSelected = true;
+                alarmMenuButton.IsSelected = true;
+                systemMenuButton.IsSelected = true;
 
             }
             else if (selectId == 1)
@@ -287,21 +293,26 @@
             VerticalScrolViewMiddle.AddChidren(rowView);
 
             //鏍囬
-            var btnTilte = new Button()
+            var btnTilte = new TextButton()
             {
                 X = Application.GetRealWidth(16),
                 Y = Application.GetRealHeight(12),
-                Width = Application.GetRealWidth(320),
-                Height = Application.GetRealHeight(20),
+                Width = Application.GetRealWidth(343),
+                Height = Application.GetRealWidth(20),
                 TextAlignment = TextAlignment.CenterLeft,
                 TextColor = CSS_Color.FirstLevelTitleColor,
                 TextSize = CSS_FontSize.TextFontSize,
-                Text = pushMessageInfo.messageTitle
+                Text = pushMessageInfo.messageContent
             };
             rowView.AddChidren(btnTilte);
+            //
+            var needHeight = btnTilte.GetMoreLineNeedHeight();
+            btnTilte.IsMoreLines = true;
+            btnTilte.Height = needHeight;
+            rowView.Height = Application.GetRealHeight(45) + needHeight;
 
             //鍓爣棰�
-            var btnSubtitle = new Button()
+            var btnSubtitle = new TextButton()
             {
                 X = Application.GetRealWidth(16),
                 Y = btnTilte.Bottom + Application.GetRealHeight(4),
@@ -310,7 +321,7 @@
                 TextAlignment = TextAlignment.CenterLeft,
                 TextColor = CSS_Color.PromptingColor1,
                 TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
-                Text = pushMessageInfo.messageContent
+                Text = pushMessageInfo.messageTitle
             };
             rowView.AddChidren(btnSubtitle);
 
@@ -353,6 +364,8 @@
             rowView.MouseUpEventHandler = eventHandler;
             btnTilte.MouseUpEventHandler = eventHandler;
             btnSubtitle.MouseUpEventHandler = eventHandler;
+
+           
         }
 
         /// <summary>
@@ -429,7 +442,7 @@
             };
             VerticalScrolViewMiddle.AddChidren(bgView);
 
-            var yearBtn = new Button()
+            var yearBtn = new TextButton()
             {
                 X = Application.GetRealWidth(16),
                 Y = Application.GetRealHeight(16),
@@ -439,9 +452,9 @@
                 TextColor = CSS_Color.FirstLevelTitleColor,
                 TextSize = CSS_FontSize.EmphasisFontSize_FirstLevel,
                 IsBold = true,
-                Text = yearStr
             };
             bgView.AddChidren(yearBtn);
+            yearBtn.Text = yearStr + Language.StringByID(StringId.Years);
         }
 
         /// <summary>
@@ -451,7 +464,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))
             {
@@ -642,14 +663,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>
@@ -657,7 +678,7 @@
         /// </summary>
         void UnregisterGetPushMessageAction()
         {
-            //HDLCommon.GetPushMessageAction = null;
+            HDLCommon.GetPushMessageAction = null;
         }
 
 #if DEBUG

--
Gitblit v1.8.0