Merge branch 'CJL' into NewFilePath

wxr

2020-12-16 f5a49299caaf1fdca7503ae682da13c6fda887c6

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

@@ -113,17 +113,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 +149,9 @@
                MenuButtonSelect(1);
            };
            shareMenuButton.SelectAction = shateAction;
            #endregion
#endregion

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

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

        }

@@ -533,7 +544,7 @@
            }
        }

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

#endif

        #endregion
#endregion

        /// <summary>
        /// 标记所有推送消息已读