Merge branch 'tzy' into NewFilePath

wxr

2020-12-17 6ec12a036c96a200fc0a941967d6b4d07592f863

 HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs

@@ -44,16 +44,11 @@
        /// </summary>
        List<PushMessageInfo> PushMessageInfoList = new List<PushMessageInfo>();

        /// <summary>
        /// 页面关闭时间
        /// </summary>
        Action backAction;

        public override void RemoveFromParent()
        {
            UnregisterGetPushMessageAction();
            base.RemoveFromParent();
            backAction?.Invoke();
        }

        /// <summary>
@@ -71,8 +66,7 @@
        /// <param name="backAction"></param>
        public void LoadPage(Action backAction)
        {
            this.backAction = backAction;
            new TopViewDiv(bodyView, Language.StringByID(StringId.MessageCenter)).LoadTopView();
            new TopViewDiv(bodyView, Language.StringByID(StringId.MessageCenter)).LoadTopView(backAction);

            AddTopMenuView();
            AddMessageView();
@@ -648,14 +642,14 @@
        /// </summary>
        void RegisterGetPushMessageAction()
        {
            HDLCommon.GetPushMessageAction = () =>
            {
                if (bodyView != null)
                {
                    //Utlis.WriteLine("GetPushMessageAction M收到推送");
                    GetPushMessageList(showMesType);
                }
            };
            //HDLCommon.GetPushMessageAction = () =>
            //{
            //    if (bodyView != null)
            //    {
            //        Utlis.WriteLine("GetPushMessageAction M收到推送");
            //        GetPushMessageList(showMesType);
            //    }
            //};
        }

        /// <summary>
@@ -663,7 +657,7 @@
        /// </summary>
        void UnregisterGetPushMessageAction()
        {
            HDLCommon.GetPushMessageAction = null;
            //HDLCommon.GetPushMessageAction = null;
        }

#if DEBUG