From d53f7315de145266e6465d9f95d11d1712b9a91b Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 18 十二月 2020 20:55:28 +0800
Subject: [PATCH] 20201218-6

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

diff --git a/HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs b/HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs
old mode 100644
new mode 100755
index 87d2684..d61b913
--- a/HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs
@@ -113,17 +113,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 +149,9 @@
                 MenuButtonSelect(1);
             };
             shareMenuButton.SelectAction = shateAction;
-            #endregion
+#endregion
 
-            #region 鎶ヨ绫�
+#region 鎶ヨ绫�
             alarmMenuButton = new MenuButton()
             {
                 X = shareMenuButton.Right,
@@ -155,9 +166,9 @@
                 MenuButtonSelect(2);
             };
             alarmMenuButton.SelectAction = alarmAction;
-            #endregion
+#endregion
 
-            #region 绯荤粺淇℃伅
+#region 绯荤粺淇℃伅
             systemMenuButton = new MenuButton()
             {
                 X = alarmMenuButton.Right,
@@ -172,7 +183,7 @@
                 MenuButtonSelect(3);
             };
             systemMenuButton.SelectAction = systemAction;
-            #endregion
+#endregion
 
         }
 
@@ -210,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)
@@ -282,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),
@@ -305,7 +321,7 @@
                 TextAlignment = TextAlignment.CenterLeft,
                 TextColor = CSS_Color.PromptingColor1,
                 TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
-                Text = pushMessageInfo.messageContent
+                Text = pushMessageInfo.messageTitle
             };
             rowView.AddChidren(btnSubtitle);
 
@@ -348,6 +364,8 @@
             rowView.MouseUpEventHandler = eventHandler;
             btnTilte.MouseUpEventHandler = eventHandler;
             btnSubtitle.MouseUpEventHandler = eventHandler;
+
+           
         }
 
         /// <summary>
@@ -424,7 +442,7 @@
             };
             VerticalScrolViewMiddle.AddChidren(bgView);
 
-            var yearBtn = new Button()
+            var yearBtn = new TextButton()
             {
                 X = Application.GetRealWidth(16),
                 Y = Application.GetRealHeight(16),
@@ -434,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>
@@ -533,7 +551,7 @@
             }
         }
 
-        #region 娴嬭瘯
+#region 娴嬭瘯
 #if DEBUG
         /// <summary>
         /// 
@@ -608,7 +626,7 @@
 
 #endif
 
-        #endregion
+#endregion
 
         /// <summary>
         /// 鏍囪鎵�鏈夋帹閫佹秷鎭凡璇�

--
Gitblit v1.8.0