新云端代码Ver1.2

黄学彪

2020-12-16 0d9f64668fd7350d6a21fd157e32009a96d98134

 ZigbeeApp/Shared/Phone/Common/Controls/NormalControls/MessageManagementControl.cs

File was renamed from ZigbeeApp/Shared/Phone/UserCenter/CommonBase/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();
        }