From e90209beae6a4e822cecb18e6889f8bda23f630e Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 14 十二月 2020 11:16:06 +0800
Subject: [PATCH] 合并了晾衣架(非新云端)
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/NormalControls/MessageManagementControl.cs | 37 ++++++++++++++++++++-----------------
1 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Common/Controls/NormalControls/MessageManagementControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/NormalControls/MessageManagementControl.cs
similarity index 66%
rename from ZigbeeApp/Shared/Phone/Common/Controls/NormalControls/MessageManagementControl.cs
rename to ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/NormalControls/MessageManagementControl.cs
index 722b3d7..80c1fa1 100644
--- a/ZigbeeApp/Shared/Phone/Common/Controls/NormalControls/MessageManagementControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/NormalControls/MessageManagementControl.cs
@@ -2,7 +2,7 @@
using System.Collections.Generic;
using System.Text;
-namespace Shared.Phone
+namespace Shared.Phone.UserCenter
{
/// <summary>
/// 娑堟伅涓績鎺т欢
@@ -26,13 +26,13 @@
{
//鐐瑰嚮鍚�,娓呯┖鐘舵��
this.IsSelected = false;
- HdlControlResourse.HadNewMessage = false;
+ ControlCommonResourse.HadNewMessage = false;
- var form = new UserCenter.UserMain.MessageManagementForm();
+ var form = new UserMain.MessageManagementForm();
form.AddForm();
};
//娣诲姞缂撳瓨
- HdlControlResourse.listMessageManaContr.Add(this);
+ ControlCommonResourse.listMessageManaContr.Add(this);
//鍒锋柊鐘舵��
this.RefreshStatu();
}
@@ -49,29 +49,31 @@
return;
}
- if (HdlControlResourse.HadNewMessage == true)
+ if (ControlCommonResourse.HadNewMessage == true)
{
//濡傛灉宸茬粡鏈夋柊娑堟伅杩囨潵浜�,灏变笉鐢ㄨ浜�
- HdlControlResourse.ReadMessageAgain = false;
+ ControlCommonResourse.ReadMessageAgain = false;
this.IsSelected = true;
return;
}
- if (HdlControlResourse.ReadMessageAgain == false)
+ if (ControlCommonResourse.ReadMessageAgain == false)
{
//鏃犻渶鍐嶆璇诲彇
return;
}
- HdlControlResourse.ReadMessageAgain = false;
+ ControlCommonResourse.ReadMessageAgain = false;
HdlThreadLogic.Current.RunThread(() =>
{
- //鑾峰彇娑堟伅鍒楄〃
string nowHomeId = Common.Config.Instance.Home.Id;
- var listMsg = HdlMessageLogic.Current.GetListMessageFromDb();
- if (listMsg == null)
+ var pra = new MessageInfoPra();
+ pra.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
+
+ var result = UserCenterLogic.GetResponseDataByRequestHttps("MessageCenter/GetMessageCenterPagger", false, pra, new List<string>() { "NotCheck" }, false);
+ if (string.IsNullOrEmpty(result) == true)
{
//鍑洪敊锛岄渶瑕侀噸鏂拌鍙�
- HdlControlResourse.ReadMessageAgain = true;
+ ControlCommonResourse.ReadMessageAgain = true;
return;
}
if (nowHomeId != Common.Config.Instance.Home.Id)
@@ -79,16 +81,17 @@
//妫�娴嬶細鍒囨崲浜嗕綇瀹咃紵锛�
return;
}
- for (int i = 0; i < listMsg.Count; i++)
+ var dataInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<MessageCentetInfo>(result);
+ for (int i = 0; i < dataInfo.PageData.Count; i++)
{
- if (listMsg[i].IsRead == false)
+ if (dataInfo.PageData[i].IsReading == false)
{
- if (listMsg[i].MessageTitle == "/DoorLock/DoorLockOperatingEventNotificationCommand")
+ if (dataInfo.PageData[i].Topic == "/DoorLock/DoorLockOperatingEventNotificationCommand")
{
//鏆傛椂涓嶅鐞嗚繖涓富棰�
continue;
}
- HdlControlResourse.HadNewMessage = true;
+ ControlCommonResourse.HadNewMessage = true;
HdlThreadLogic.Current.RunMain(() =>
{
//鏈夋柊娑堟伅
@@ -105,7 +108,7 @@
/// </summary>
public override void RemoveFromParent()
{
- HdlControlResourse.listMessageManaContr.Remove(this);
+ ControlCommonResourse.listMessageManaContr.Remove(this);
base.RemoveFromParent();
}
--
Gitblit v1.8.0