Merge remote-tracking branch 'origin/dev-tzy' into DEV_GXC

gxc

2020-01-02 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/NormalControls/MessageManagementControl.cs

old mode 100755
new mode 100644
@@ -14,17 +14,22 @@
        /// </summary>

        public MessageManagementControl()

        {



            this.Height = Application.GetMinRealAverage(69);

            this.Width = Application.GetMinRealAverage(69);

            this.UnSelectedImagePath = "Item/MessageManagement.png";

            this.SelectedImagePath = "Item/MessageManagementSelected.png";

            this.ButtonClickEvent += (sender, e) =>

            {

                //点击后,清空状态

                this.IsSelected = false;

                ControlCommonResourse.HadNewMessage = false;



                var form = new UserMain.MessageManagementForm();

                form.AddForm();

            };

            //添加缓存

            ControlCommonResourse.listMessageManaContr.Add(this);

            //刷新状态

            this.RefreshStatu();

        }

@@ -34,8 +39,63 @@
        /// </summary>

        public void RefreshStatu()

        {

            //暂时测试

            this.IsSelected = true;

            if (ControlCommonResourse.HadNewMessage == true)

            {

                //如果已经有新消息过来了,就不用读了

                ControlCommonResourse.ReadMessageAgain = false;

                this.IsSelected = true;

                return;

            }

            if (ControlCommonResourse.ReadMessageAgain == false)

            {

                //无需再次读取

                return;

            }

            ControlCommonResourse.ReadMessageAgain = false;



            HdlThreadLogic.Current.RunThread(async () =>

            {

                string nowHomeId = Common.Config.Instance.Home.Id;

                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;

                    return;

                }

                if (nowHomeId != Common.Config.Instance.Home.Id)

                {

                    //检测：切换了住宅？？

                    return;

                }

                var dataInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<MessageCentetInfo>(result);

                for (int i = 0; i < dataInfo.PageData.Count; i++)

                {

                    if (dataInfo.PageData[i].IsReading == false)

                    {

                        ControlCommonResourse.HadNewMessage = true;

                        Application.RunOnMainThread(() =>

                        {

                            //有新消息

                            this.IsSelected = true;

                        });

                        break;

                    }

                }

            });

        }



        /// <summary>

        /// 控件移除

        /// </summary>

        public override void RemoveFromParent()

        {

            ControlCommonResourse.listMessageManaContr.Remove(this);

            
            base.RemoveFromParent();

        }

    }

}