From ea8f01fd99a2ef85bf96623c1bf90e84128cbe5c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期六, 28 八月 2021 10:27:10 +0800
Subject: [PATCH] Merge branch 'WJC' into wxr7
---
HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs | 106 ++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 89 insertions(+), 17 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs b/HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs
index d61b913..eb5f464 100644
--- a/HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs
@@ -27,16 +27,17 @@
/// <summary>
/// menuView
/// </summary>
- FrameLayout menuView;
+ HorizontalScrolViewLayout menuView;//2021-08-27 澧炲姞澶氫簡涓�涓彍鍗曟寜閽墍浠ユ敼涓烘粴鍔ㄦ帶浠�
MenuButton allMenuButton;
MenuButton shareMenuButton;
MenuButton alarmMenuButton;
MenuButton systemMenuButton;
+ MenuButton propertyMenuButton;//澧炲姞鐗╀笟閫氱煡鎸夐挳
FrameLayout messageView;
/// <summary>
/// 鏄剧ず鐨勬秷鎭被鍨�
- /// 0鍏ㄩ儴 1鍒嗕韩涓庡姛鑳� 2鎶ヨ绫� 3绯荤粺淇℃伅
+ /// 0鍏ㄩ儴 1鍒嗕韩涓庡姛鑳� 2鎶ヨ绫� 3绯荤粺淇℃伅 4鐗╀笟鍏憡
/// </summary>
int showMesType = 0;
/// <summary>
@@ -89,14 +90,21 @@
void AddTopMenuView()
{
- menuView = new FrameLayout()
+ menuView = new HorizontalScrolViewLayout()
{
Y = Application.GetRealHeight(64),
Height = Application.GetRealWidth(117),
BackgroundColor = CSS_Color.MainBackgroundColor,
+ HorizontalScrollBarEnabled = false//闅愯棌婊氬姩鏉�
};
bodyView.AddChidren(menuView);
+ //宸adding View
+ menuView.AddChidren(new Button()
+ {
+ Width = Application.GetRealWidth(15),
+ BackgroundColor = CSS_Color.viewTranslucence
+ });
#region 鍏ㄩ儴鎸夐挳
allMenuButton = new MenuButton()
@@ -134,7 +142,7 @@
};
#endregion
-#region 鍒嗕韩涓庡姛鑳�
+ #region 鍒嗕韩涓庡姛鑳�
shareMenuButton = new MenuButton()
{
X = allMenuButton.Right,
@@ -144,12 +152,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()
@@ -183,7 +192,31 @@
MenuButtonSelect(3);
};
systemMenuButton.SelectAction = systemAction;
-#endregion
+ #endregion
+
+ #region 鐗╀笟閫氱煡
+ propertyMenuButton = new MenuButton()
+ {
+ X = systemMenuButton.Right,
+ Y = Application.GetRealWidth(16),
+ };
+ //menuView.AddChidren(propertyMenuButton); //鍏堝睆钄�
+ propertyMenuButton.ImageButton.SelectedImagePath = "Collection/MesCenter/SystemOn.png";
+ propertyMenuButton.ImageButton.UnSelectedImagePath = "Collection/MesCenter/System.png";
+ propertyMenuButton.TextButton.TextID = StringId.SystemMessage;
+ Action propertyAction = () =>
+ {
+ MenuButtonSelect(4);
+ };
+ propertyMenuButton.SelectAction = propertyAction;
+ #endregion
+
+ //鍏堝睆钄�
+ ////鍙硃addingView
+ //menuView.AddChidren(new Button() {
+ // Width = Application.GetRealWidth(15),
+ // BackgroundColor = CSS_Color.viewTranslucence
+ //});
}
@@ -213,7 +246,7 @@
/// <summary>
///
/// </summary>
- /// <param name="selectId">0鍏ㄩ儴 1鍒嗕韩涓庡姛鑳� 2鎶ヨ绫� 3绯荤粺淇℃伅</param>
+ /// <param name="selectId">0鍏ㄩ儴 1鍒嗕韩涓庡姛鑳� 2鎶ヨ绫� 3绯荤粺淇℃伅 4鐗╀笟閫氱煡</param>
void MenuButtonSelect(int selectId)
{
showMesType = selectId;
@@ -224,6 +257,7 @@
shareMenuButton.IsSelected = true;
alarmMenuButton.IsSelected = true;
systemMenuButton.IsSelected = true;
+ propertyMenuButton.IsSelected = true;
}
else if (selectId == 1)
@@ -232,6 +266,7 @@
shareMenuButton.IsSelected = true;
alarmMenuButton.IsSelected = false;
systemMenuButton.IsSelected = false;
+ propertyMenuButton.IsSelected = false;
}
else if (selectId == 2)
@@ -240,6 +275,7 @@
shareMenuButton.IsSelected = false;
alarmMenuButton.IsSelected = true;
systemMenuButton.IsSelected = false;
+ propertyMenuButton.IsSelected = false;
}
else if (selectId == 3)
{
@@ -247,6 +283,16 @@
shareMenuButton.IsSelected = false;
alarmMenuButton.IsSelected = false;
systemMenuButton.IsSelected = true;
+ propertyMenuButton.IsSelected = false;
+
+ }
+ else if (selectId == 4)
+ {
+ allMenuButton.IsSelected = false;
+ shareMenuButton.IsSelected = false;
+ alarmMenuButton.IsSelected = false;
+ systemMenuButton.IsSelected = false;
+ propertyMenuButton.IsSelected = true;
}
@@ -302,7 +348,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 +404,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 +512,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))
{
@@ -483,7 +539,13 @@
var result = new HttpServerRequest().PushSerivceGetPushmessagelist(queryType);
if (result.Code == StateCode.SUCCESS)
{
- PushMessageInfoList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<PushMessageInfo>>(result.Data.ToString());
+ //PushMessageInfoList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<PushMessageInfo>>(result.Data.ToString());
+ //2021-08-28 鏀逛负鍒嗛〉鎺ュ彛
+ var mPushMesList = Newtonsoft.Json.JsonConvert.DeserializeObject<PushMessageInfoList>(result.Data.ToString());
+ if(mPushMesList != null) {
+ PushMessageInfoList = mPushMesList.list;
+ }
+
Application.RunOnMainThread(() =>
{
if (PushMessageInfoList != null && PushMessageInfoList.Count > 0)
@@ -734,4 +796,14 @@
public long createTime;
}
+
+ /// <summary>
+ // 鎺ㄩ�佹秷鎭垎椤靛璞�
+ /// </summary>
+ public class PushMessageInfoList : BasePagingObj
+ {
+ public List<PushMessageInfo> list = new List<PushMessageInfo>();
+
+ }
+
}
--
Gitblit v1.8.0