From 0d9f64668fd7350d6a21fd157e32009a96d98134 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期三, 16 十二月 2020 13:09:08 +0800
Subject: [PATCH] 新云端代码Ver1.2

---
 ZigbeeApp/Shared/Phone/Common/Controls/NormalControls/MessageManagementControl.cs |   37 +++++++++++++++++--------------------
 1 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/NormalControls/MessageManagementControl.cs b/ZigbeeApp/Shared/Phone/Common/Controls/NormalControls/MessageManagementControl.cs
similarity index 66%
rename from ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/NormalControls/MessageManagementControl.cs
rename to ZigbeeApp/Shared/Phone/Common/Controls/NormalControls/MessageManagementControl.cs
index 80c1fa1..722b3d7 100644
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/NormalControls/MessageManagementControl.cs
+++ b/ZigbeeApp/Shared/Phone/Common/Controls/NormalControls/MessageManagementControl.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace Shared.Phone.UserCenter
+namespace Shared.Phone
 {
     /// <summary>
     /// 娑堟伅涓績鎺т欢
@@ -26,13 +26,13 @@
                 {
                     //鐐瑰嚮鍚�,娓呯┖鐘舵��
                     this.IsSelected = false;
-                    ControlCommonResourse.HadNewMessage = false;
+                    HdlControlResourse.HadNewMessage = false;
 
-                    var form = new UserMain.MessageManagementForm();
+                    var form = new UserCenter.UserMain.MessageManagementForm();
                     form.AddForm();
                 };
                 //娣诲姞缂撳瓨
-                ControlCommonResourse.listMessageManaContr.Add(this);
+                HdlControlResourse.listMessageManaContr.Add(this);
                 //鍒锋柊鐘舵��
                 this.RefreshStatu();
             }
@@ -49,31 +49,29 @@
                 return;
             }
 
-            if (ControlCommonResourse.HadNewMessage == true)
+            if (HdlControlResourse.HadNewMessage == true)
             {
                 //濡傛灉宸茬粡鏈夋柊娑堟伅杩囨潵浜�,灏变笉鐢ㄨ浜�
-                ControlCommonResourse.ReadMessageAgain = false;
+                HdlControlResourse.ReadMessageAgain = false;
                 this.IsSelected = true;
                 return;
             }
-            if (ControlCommonResourse.ReadMessageAgain == false)
+            if (HdlControlResourse.ReadMessageAgain == false)
             {
                 //鏃犻渶鍐嶆璇诲彇
                 return;
             }
-            ControlCommonResourse.ReadMessageAgain = false;
+            HdlControlResourse.ReadMessageAgain = false;
 
             HdlThreadLogic.Current.RunThread(() =>
             {
+                //鑾峰彇娑堟伅鍒楄〃
                 string nowHomeId = Common.Config.Instance.Home.Id;
-                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)
+                var listMsg = HdlMessageLogic.Current.GetListMessageFromDb();
+                if (listMsg == null)
                 {
                     //鍑洪敊锛岄渶瑕侀噸鏂拌鍙�
-                    ControlCommonResourse.ReadMessageAgain = true;
+                    HdlControlResourse.ReadMessageAgain = true;
                     return;
                 }
                 if (nowHomeId != Common.Config.Instance.Home.Id)
@@ -81,17 +79,16 @@
                     //妫�娴嬶細鍒囨崲浜嗕綇瀹咃紵锛�
                     return;
                 }
-                var dataInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<MessageCentetInfo>(result);
-                for (int i = 0; i < dataInfo.PageData.Count; i++)
+                for (int i = 0; i < listMsg.Count; i++)
                 {
-                    if (dataInfo.PageData[i].IsReading == false)
+                    if (listMsg[i].IsRead == false)
                     {
-                        if (dataInfo.PageData[i].Topic == "/DoorLock/DoorLockOperatingEventNotificationCommand")
+                        if (listMsg[i].MessageTitle == "/DoorLock/DoorLockOperatingEventNotificationCommand")
                         {
                             //鏆傛椂涓嶅鐞嗚繖涓富棰�
                             continue;
                         }
-                        ControlCommonResourse.HadNewMessage = true;
+                        HdlControlResourse.HadNewMessage = true;
                         HdlThreadLogic.Current.RunMain(() =>
                         {
                             //鏈夋柊娑堟伅
@@ -108,7 +105,7 @@
         /// </summary>
         public override void RemoveFromParent()
         {
-            ControlCommonResourse.listMessageManaContr.Remove(this);
+            HdlControlResourse.listMessageManaContr.Remove(this);
 
             base.RemoveFromParent();
         }

--
Gitblit v1.8.0