From 09dfbfd9b77ec887c17b10f15799a1d3f56e4e17 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 15 十二月 2020 12:04:42 +0800
Subject: [PATCH] 2020-12-15-1
---
HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs | 181 +++++++++++++++++++++++++++++++++++++--------
1 files changed, 149 insertions(+), 32 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs b/HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs
index 212b147..d398b7e 100644
--- a/HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs
@@ -20,7 +20,7 @@
/// <summary>
/// 鍐呭涓虹┖鎻愮ずView
/// </summary>
- EmptyTipView emptyTipView;
+ FrameLayout emptyTipView;
/// <summary>
/// menuView
@@ -55,13 +55,18 @@
/// <summary>
///
/// </summary>
- public void LoadPage()
+ /// <param name="backAction"></param>
+ public void LoadPage(Action backAction)
{
- new TopViewDiv(bodyView, Language.StringByID(StringId.MessageCenter)).LoadTopView();
+ new TopViewDiv(bodyView, Language.StringByID(StringId.MessageCenter)).LoadTopView(backAction);
AddTopMenuView();
AddMessageView();
MenuButtonSelect(showMesType);
+
+ //娴嬭瘯浠ｇ爜
+ //AddEmptyTipView();
+ //TestLoad();
}
/// <summary>
@@ -222,13 +227,24 @@
/// </summary>
void AddEmptyTipView()
{
- emptyTipView = new EmptyTipView()
+ emptyTipView = new FrameLayout()
+ {
+ Height = bodyScrolView.Height,
+ Width = bodyScrolView.Width,
+ };
+ bodyScrolView.AddChidren(emptyTipView);
+
+ var tipView = new EmptyTipView()
{
Gravity = Gravity.Center
};
- messageView.AddChidren(emptyTipView);
+ emptyTipView.AddChidren(tipView);
}
+ /// <summary>
+ /// 骞翠唤鏍囪
+ /// </summary>
+ string YearMark = "";
/// <summary>
/// 鍔犺浇鎶ヨ淇℃伅RowView
/// </summary>
@@ -284,7 +300,7 @@
};
rowView.AddChidren(btnDatetime);
- var lineView = new LineView(rowView.Height);
+ var lineView = new LineView(rowView.Height - Application.GetRealHeight(1));
rowView.AddChidren(lineView);
//鍒犻櫎鎸夐挳
@@ -302,13 +318,31 @@
};
- btnDatetime.Text = Utlis.UnixToDateTime(pushMessageInfo.createTime).ToString("yyyy/MM/dd HH:mm:ss");
- //EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
- //{
- //};
+ 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;
+ }
- //btnTilte.MouseUpEventHandler = eventHandler;
- //btnSubtitle.MouseUpEventHandler = eventHandler;
+ /// <summary>
+ /// 鏃堕棿鏍煎紡杞崲澶勭悊
+ /// </summary>
+ /// <param name="time">姣鏃堕棿鎴�</param>
+ /// <returns></returns>
+ string GetUnixToDateTime(long time)
+ {
+ try
+ {
+ return Utlis.UnixToDateTimeWithFormatMS(time, "MM/dd HH:mm");
+ }
+ catch (Exception ex)
+ {
+ return "";
+ }
}
/// <summary>
@@ -318,6 +352,7 @@
void DeleteThePush(PushMessageInfo pushMessageInfo, RowLayout rowView)
{
var waitPage = new Loading();
+ bodyView.AddChidren(waitPage);
waitPage.Start(Language.StringByID(StringId.PleaseWait));
new Thread(() =>
@@ -388,10 +423,17 @@
/// <param name="queryType"></param>
void GetPushMessageList(int queryType = 0)
{
- var waitPage = new Loading();
- waitPage.Start(Language.StringByID(StringId.PleaseWait));
bodyScrolView.RemoveAll();
PushMessageInfoList.Clear();
+ YearMark = "";//鏍囪娓呯┖
+ if (string.IsNullOrEmpty(OnAppConfig.Instance.PushId)) {
+ AddEmptyTipView();
+ return;
+ }
+
+ var waitPage = new Loading();
+ bodyView.AddChidren(waitPage);
+ waitPage.Start(Language.StringByID(StringId.PleaseWait));
new Thread(() =>
{
@@ -407,6 +449,7 @@
{
ParseAndDisplayPushList();
+ PushSerivceMarkAllMessageRead();
}
else
{
@@ -448,11 +491,27 @@
{
foreach (var info in PushMessageInfoList)
{
+ //骞翠唤瑙ｆ瀽 鍒ゆ柇鏄惁闇�瑕佹坊鍔犲勾浠芥爣棰�
+ var mesYear = Utlis.UnixToDateTimeYearMS(info.createTime);
+ if (string.IsNullOrEmpty(YearMark))
+ {
+ //鍒氬紑濮媃earMark鏍囪涓虹┖锛屾坊鍔犵涓�涓勾浠芥爣棰�
+ YearMark = mesYear;
+ AddYearRowView(bodyScrolView, YearMark);
+ }
+ else if (YearMark != mesYear)
+ {
+ //褰撳墠淇℃伅骞翠唤鍜屼箣鍓嶇殑涓嶄竴鏍凤紝閲嶆柊娣诲姞涓�涓勾浠芥爣棰�
+ YearMark = mesYear;
+ AddYearRowView(bodyScrolView, YearMark);
+ }
+
AddRowView(bodyScrolView, info);
}
}
#region 娴嬭瘯
+#if DEBUG
/// <summary>
///
/// </summary>
@@ -462,7 +521,7 @@
{
messageTitle = "鎶ヨ淇℃伅",
messageContent = "闂ㄩ攣琚墦寮�",
- createTime = 1606895454,
+ createTime = 1606900275,
});
PushMessageInfoList.Add(new PushMessageInfo()
@@ -479,19 +538,77 @@
createTime = 1606895454,
});
- AddYearRowView(bodyScrolView, "2020骞�");
- foreach (var info in PushMessageInfoList)
+ PushMessageInfoList.Add(new PushMessageInfo()
{
- AddRowView(bodyScrolView, info);
- }
+ messageTitle = "鎶ヨ淇℃伅2019",
+ messageContent = "闂ㄩ攣琚墦寮�",
+ createTime = 1575277874,
+ });
- AddYearRowView(bodyScrolView, "2019骞�");
- foreach (var info in PushMessageInfoList)
+ PushMessageInfoList.Add(new PushMessageInfo()
{
- AddRowView(bodyScrolView, info);
- }
+ messageTitle = "鎶ヨ淇℃伅2019",
+ messageContent = "闂ㄩ攣琚墦寮�",
+ createTime = 1572685874,
+ });
+
+ PushMessageInfoList.Add(new PushMessageInfo()
+ {
+ messageTitle = "鎶ヨ淇℃伅2018",
+ messageContent = "闂ㄩ攣琚墦寮�",
+ createTime = 1541149874,
+ });
+
+ PushMessageInfoList.Add(new PushMessageInfo()
+ {
+ messageTitle = "鎶ヨ淇℃伅2017",
+ messageContent = "闂ㄩ攣琚墦寮�",
+ createTime = 1509613874,
+ });
+
+ PushMessageInfoList.Add(new PushMessageInfo()
+ {
+ messageTitle = "鎶ヨ淇℃伅2017",
+ messageContent = "闂ㄩ攣琚墦寮�",
+ createTime = 1509613874,
+ });
+
+ PushMessageInfoList.Add(new PushMessageInfo()
+ {
+ messageTitle = "鎶ヨ淇℃伅2017",
+ messageContent = "闂ㄩ攣琚墦寮�",
+ createTime = 1506935474,
+ });
+
+ ParseAndDisplayPushList();
}
+
+#endif
+
#endregion
+
+ /// <summary>
+ /// 鏍囪鎵�鏈夋帹閫佹秷鎭凡璇�
+ /// </summary>
+ void PushSerivceMarkAllMessageRead() {
+ new Thread(() =>
+ {
+ var result = new HttpServerRequest().PushSerivceMarkAllMessageRead();
+ if (result)
+ {
+ Utlis.WriteLine("鏍囪鎴愬姛");
+ }
+ else
+ {
+ Utlis.WriteLine("鏍囪澶辫触");
+ }
+
+
+ })
+ { IsBackground = true }.Start();
+ }
+
+
}
/// <summary>
@@ -513,7 +630,7 @@
///
/// Default锛氬垎浜笌鍔熻兘锛汚larm锛氭姤璀︾被锛汸rompt锛氱郴缁熸秷鎭�
/// </summary>
- public int pushType;
+ public string pushType;
/// <summary>
/// 娑堟伅涓婚
/// </summary>
@@ -522,14 +639,14 @@
/// 娑堟伅鍐呭
/// </summary>
public string messageContent;
- /// <summary>
- /// 鎵╁睍鏁版嵁
- /// </summary>
- public string messageExpand;
- /// <summary>
- /// 娑堟伅绫诲瀷锛�0锛氭彁绀猴紱1锛氭姤璀︼紱2锛氫赴鏋楀彲鏄璁插懠鍙紱3锛氬己鍒朵笅绾挎帹閫�
- /// </summary>
- public string messageType;
+ ///// <summary>
+ ///// 鎵╁睍鏁版嵁
+ ///// </summary>
+ //public string messageExpand;
+ ///// <summary>
+ ///// 娑堟伅绫诲瀷锛�0锛氭彁绀猴紱1锛氭姤璀︼紱2锛氫赴鏋楀彲鏄璁插懠鍙紱3锛氬己鍒朵笅绾挎帹閫�
+ ///// </summary>
+ //public string messageType;
/// <summary>
/// 鏄惁宸茶
/// </summary>
--
Gitblit v1.8.0