From 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期四, 02 一月 2020 19:51:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into DEV_GXC
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/NormalControls/MessageManagementControl.cs | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/NormalControls/MessageManagementControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/NormalControls/MessageManagementControl.cs
old mode 100755
new mode 100644
index 381530e..96e17d1
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/NormalControls/MessageManagementControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/NormalControls/MessageManagementControl.cs
@@ -14,6 +14,7 @@
/// </summary>
public MessageManagementControl()
{
+
this.Height = Application.GetMinRealAverage(69);
this.Width = Application.GetMinRealAverage(69);
this.UnSelectedImagePath = "Item/MessageManagement.png";
@@ -55,8 +56,11 @@
HdlThreadLogic.Current.RunThread(async () =>
{
string nowHomeId = Common.Config.Instance.Home.Id;
- var result = await UserCenterLogic.GetByteResponseDataByRequestHttps("ZigbeeUsers/GetPushMessageRecord", false, "", new List<string>() { "NotSetAgain" });
- if (result == null)
+ var pra = new MessageInfoPra();
+ pra.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
+
+ var result = await UserCenterLogic.GetResponseDataByRequestHttps("MessageCenter/GetMessageCenterPagger", false, pra, new List<string>() { "NotSetAgain", "NotCheck" });
+ if (string.IsNullOrEmpty(result) == true)
{
//鍑洪敊锛岄渶瑕侀噸鏂拌鍙�
ControlCommonResourse.ReadMessageAgain = true;
@@ -67,14 +71,12 @@
//妫�娴嬶細鍒囨崲浜嗕綇瀹咃紵锛�
return;
}
- var strdata = System.Text.Encoding.UTF8.GetString(result);
- var revertObj = Newtonsoft.Json.JsonConvert.DeserializeObject<Common.ResponseEntity.ResponsePack>(strdata);
- var dataInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<List<MessageRecordInfo>>(revertObj.ResponseData.ToString());
-
- for (int i = 0; i < dataInfo.Count; i++)
+ var dataInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<MessageCentetInfo>(result);
+ for (int i = 0; i < dataInfo.PageData.Count; i++)
{
- if (dataInfo[i].IsRead == 0)
+ if (dataInfo.PageData[i].IsReading == false)
{
+ ControlCommonResourse.HadNewMessage = true;
Application.RunOnMainThread(() =>
{
//鏈夋柊娑堟伅
@@ -92,7 +94,7 @@
public override void RemoveFromParent()
{
ControlCommonResourse.listMessageManaContr.Remove(this);
-
+
base.RemoveFromParent();
}
}
--
Gitblit v1.8.0