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();
@@ -113,17 +107,28 @@
                MenuButtonSelect(0);
            };
            allMenuButton.SelectAction = allAction;

#if DEBUG
            //测试提前当前推送ID
            allMenuButton.ImageButton.MouseLongEventHandler = (sender, e) =>
            {
                CopyToClipboard("推送ID：" + OnAppConfig.Instance.PushId);
            };
#endif
            #endregion
#if DEBUG

            #region 分享与功能
                CopyToClipboard("推送ID：" + OnAppConfig.Instance.PushId);
#else
                //检测是否获取推送ID成功，提示推送注册是否正常
                if (string.IsNullOrEmpty(OnAppConfig.Instance.PushId))
                {
                    Utlis.ShowTip(Language.StringByID(StringId.PushException));
                }
                else
                {
                    Utlis.ShowTip(Language.StringByID(StringId.PushNormal));
                }
#endif

            };
#endregion

#region 分享与功能
            shareMenuButton = new MenuButton()
            {
                X = allMenuButton.Right,
@@ -138,9 +143,9 @@
                MenuButtonSelect(1);
            };
            shareMenuButton.SelectAction = shateAction;
            #endregion
#endregion

            #region 报警类
#region 报警类
            alarmMenuButton = new MenuButton()
            {
                X = shareMenuButton.Right,
@@ -155,9 +160,9 @@
                MenuButtonSelect(2);
            };
            alarmMenuButton.SelectAction = alarmAction;
            #endregion
#endregion

            #region 系统信息
#region 系统信息
            systemMenuButton = new MenuButton()
            {
                X = alarmMenuButton.Right,
@@ -172,7 +177,7 @@
                MenuButtonSelect(3);
            };
            systemMenuButton.SelectAction = systemAction;
            #endregion
#endregion

        }

@@ -533,7 +538,7 @@
            }
        }

        #region 测试
#region 测试
#if DEBUG
        /// <summary>
        /// 
@@ -608,7 +613,7 @@

#endif

        #endregion
#endregion

        /// <summary>
        /// 标记所有推送消息已读
@@ -637,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>
@@ -652,7 +657,7 @@
        /// </summary>
        void UnregisterGetPushMessageAction()
        {
            HDLCommon.GetPushMessageAction = null;
            //HDLCommon.GetPushMessageAction = null;
        }

#if DEBUG