From 026ed1573ad8b9ba28f0e2c0bf0c9cd85f1dd2ed Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 02 十二月 2020 16:32:00 +0800
Subject: [PATCH] 2020-12-02 1.增加子账号设备分享。 2.房间删除时间优化。3.消息中心接口对接。4.版本检测更新接口对接。
---
HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs | 128 ++++++++++++++++++++++++++++--------------
1 files changed, 86 insertions(+), 42 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs b/HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs
index 602b8eb..212b147 100644
--- a/HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs
@@ -34,9 +34,9 @@
/// <summary>
/// 鏄剧ず鐨勬秷鎭被鍨�
- /// 1鍏ㄩ儴 2鍒嗕韩涓庡姛鑳� 3鎶ヨ绫� 4绯荤粺淇℃伅
+ /// 0鍏ㄩ儴 1鍒嗕韩涓庡姛鑳� 2鎶ヨ绫� 3绯荤粺淇℃伅
/// </summary>
- int showMesType = 1;
+ int showMesType = 0;
/// <summary>
/// 鎺ㄩ�佹秷鎭垪琛�
/// </summary>
@@ -61,9 +61,7 @@
AddTopMenuView();
AddMessageView();
- MenuButtonSelect(1);
- //TestLoad();
- GetPushMessageList();
+ MenuButtonSelect(showMesType);
}
/// <summary>
@@ -93,7 +91,7 @@
allMenuButton.TextButton.TextID = StringId.All;
Action allAction = () =>
{
- MenuButtonSelect(1);
+ MenuButtonSelect(0);
};
allMenuButton.SelectAction = allAction;
#endregion
@@ -110,7 +108,7 @@
shareMenuButton.TextButton.TextID = StringId.SharingAndFunctionality;
Action shateAction = () =>
{
- MenuButtonSelect(2);
+ MenuButtonSelect(1);
};
shareMenuButton.SelectAction = shateAction;
#endregion
@@ -127,7 +125,7 @@
alarmMenuButton.TextButton.TextID = StringId.AlarmType;
Action alarmAction = () =>
{
- MenuButtonSelect(3);
+ MenuButtonSelect(2);
};
alarmMenuButton.SelectAction = alarmAction;
#endregion
@@ -144,7 +142,7 @@
systemMenuButton.TextButton.TextID = StringId.SystemMessage;
Action systemAction = () =>
{
- MenuButtonSelect(4);
+ MenuButtonSelect(3);
};
systemMenuButton.SelectAction = systemAction;
#endregion
@@ -177,12 +175,12 @@
/// <summary>
///
/// </summary>
- /// <param name="selectId">1鍏ㄩ儴 2鍒嗕韩涓庡姛鑳� 3鎶ヨ绫� 4绯荤粺淇℃伅</param>
+ /// <param name="selectId">0鍏ㄩ儴 1鍒嗕韩涓庡姛鑳� 2鎶ヨ绫� 3绯荤粺淇℃伅</param>
void MenuButtonSelect(int selectId)
{
showMesType = selectId;
- if (selectId == 1)
+ if (selectId == 0)
{
allMenuButton.IsSelected = true;
shareMenuButton.IsSelected = false;
@@ -190,7 +188,7 @@
systemMenuButton.IsSelected = false;
}
- else if (selectId == 2)
+ else if (selectId == 1)
{
allMenuButton.IsSelected = false;
shareMenuButton.IsSelected = true;
@@ -198,14 +196,14 @@
systemMenuButton.IsSelected = false;
}
- else if (selectId == 3)
+ else if (selectId == 2)
{
allMenuButton.IsSelected = false;
shareMenuButton.IsSelected = false;
alarmMenuButton.IsSelected = true;
systemMenuButton.IsSelected = false;
}
- else if (selectId == 4)
+ else if (selectId == 3)
{
allMenuButton.IsSelected = false;
shareMenuButton.IsSelected = false;
@@ -213,6 +211,8 @@
systemMenuButton.IsSelected = true;
}
+
+ GetPushMessageList(showMesType);
}
@@ -281,7 +281,6 @@
TextAlignment = TextAlignment.CenterRight,
TextColor = CSS_Color.PromptingColor1,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- Text = pushMessageInfo.createTime
};
rowView.AddChidren(btnDatetime);
@@ -299,15 +298,60 @@
rowView.AddRightView(deleteBtn);
deleteBtn.MouseUpEventHandler = (sender, e) =>
{
- rowView.RemoveFromParent();
+ DeleteThePush(pushMessageInfo, rowView);
};
+
+ btnDatetime.Text = Utlis.UnixToDateTime(pushMessageInfo.createTime).ToString("yyyy/MM/dd HH:mm:ss");
//EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
//{
//};
//btnTilte.MouseUpEventHandler = eventHandler;
//btnSubtitle.MouseUpEventHandler = eventHandler;
+ }
+
+ /// <summary>
+ /// 鍒犻櫎鎺ㄩ�佹秷鎭�
+ /// <param name="pushMessageInfo"></param>
+ /// <param name="rowView"></param>
+ void DeleteThePush(PushMessageInfo pushMessageInfo, RowLayout rowView)
+ {
+ var waitPage = new Loading();
+ waitPage.Start(Language.StringByID(StringId.PleaseWait));
+
+ new Thread(() =>
+ {
+ try
+ {
+ var result = new HttpServerRequest().PushSerivceDeleteMessage(pushMessageInfo.id);
+ if (result)
+ {
+ PushMessageInfoList.Remove(pushMessageInfo);
+ //鍒犻櫎鎴愬姛
+ Application.RunOnMainThread(() =>
+ {
+ rowView.RemoveFromParent();
+ });
+
+ }
+ }
+ catch (Exception ex)
+ {
+ }
+ finally
+ {
+ Application.RunOnMainThread(() =>
+ {
+ if (waitPage != null)
+ {
+ waitPage.RemoveFromParent();
+ waitPage = null;
+ }
+ });
+ }
+ })
+ { IsBackground = true }.Start();
}
/// <summary>
@@ -339,9 +383,10 @@
}
/// <summary>
- ///
+ /// 鏌ヨ鎺ㄩ�佽褰�
/// </summary>
- void GetPushMessageList()
+ /// <param name="queryType"></param>
+ void GetPushMessageList(int queryType = 0)
{
var waitPage = new Loading();
waitPage.Start(Language.StringByID(StringId.PleaseWait));
@@ -352,7 +397,7 @@
{
try
{
- var result = new HttpServerRequest().PushSerivceGetPushmessagelist();
+ var result = new HttpServerRequest().PushSerivceGetPushmessagelist(queryType);
if (result.Code == StateCode.SUCCESS)
{
PushMessageInfoList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<PushMessageInfo>>(result.Data.ToString());
@@ -401,10 +446,9 @@
/// </summary>
void ParseAndDisplayPushList()
{
- //
- if (showMesType == 1)
+ foreach (var info in PushMessageInfoList)
{
-
+ AddRowView(bodyScrolView, info);
}
}
@@ -418,21 +462,21 @@
{
messageTitle = "鎶ヨ淇℃伅",
messageContent = "闂ㄩ攣琚墦寮�",
- createTime = "11鏈�30 10:50",
+ createTime = 1606895454,
});
PushMessageInfoList.Add(new PushMessageInfo()
{
messageTitle = "鎶ヨ淇℃伅1",
messageContent = "闂ㄩ攣琚墦寮�",
- createTime = "11鏈�30 11:50",
+ createTime = 1606895454,
});
PushMessageInfoList.Add(new PushMessageInfo()
{
messageTitle = "鎶ヨ淇℃伅2",
messageContent = "闂ㄩ攣琚墦寮�",
- createTime = "11鏈�30 12:50",
+ createTime = 1606895454,
});
AddYearRowView(bodyScrolView, "2020骞�");
@@ -450,21 +494,30 @@
#endregion
}
-
/// <summary>
- /// 鎺ㄩ�佹秷鎭被鍨�
+ /// 鎺ㄩ�佹秷鎭被鍨嬭鎯�
/// </summary>
[System.Serializable]
public class PushMessageInfo
{
/// <summary>
- /// 璁板綍Id
+ /// 璁板綍id
/// </summary>
public string id;
/// <summary>
- /// 鏄惁宸茶
+ /// 鎺ㄩ�乀oken璁板綍Id
/// </summary>
- public bool isRead;
+ public string pushId;
+ /// <summary>
+ /// 浜戠瀹氫箟 鎺ㄩ�佺被鍨嬶紱0锛氶粯璁わ紱1锛氭姤璀︼紱2锛氭彁绀猴紱3锛氭柊闂伙紱4锛氭帹鑽愶紱
+ ///
+ /// Default锛氬垎浜笌鍔熻兘锛汚larm锛氭姤璀︾被锛汸rompt锛氱郴缁熸秷鎭�
+ /// </summary>
+ public int pushType;
+ /// <summary>
+ /// 娑堟伅涓婚
+ /// </summary>
+ public string messageTitle;
/// <summary>
/// 娑堟伅鍐呭
/// </summary>
@@ -474,26 +527,17 @@
/// </summary>
public string messageExpand;
/// <summary>
- /// 娑堟伅涓婚
- /// </summary>
- public string messageTitle;
- /// <summary>
/// 娑堟伅绫诲瀷锛�0锛氭彁绀猴紱1锛氭姤璀︼紱2锛氫赴鏋楀彲鏄璁插懠鍙紱3锛氬己鍒朵笅绾挎帹閫�
/// </summary>
public string messageType;
/// <summary>
- /// 鎺ㄩ�乀oken璁板綍Id
+ /// 鏄惁宸茶
/// </summary>
- public string pushId;
- /// <summary>
- /// 鎺ㄩ�佺被鍨嬶紱0锛氶粯璁わ紱1锛氭姤璀︼紱2锛氭彁绀猴紱3锛氭柊闂伙紱4锛氭帹鑽愶紱
- /// </summary>
- public string pushType;
+ public bool isRead;
/// <summary>
/// 鎺ㄩ�佹椂闂�
/// </summary>
- public string createTime;
-
+ public long createTime;
}
}
--
Gitblit v1.8.0