2021-07-06 1.更新

JLChen

2021-07-06 d72ca686a3e262693f8a6e45e747e8e8da43335b

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

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

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

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

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

            AddTopMenuView();
            AddMessageView();
@@ -107,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,
@@ -127,14 +144,15 @@
            shareMenuButton.ImageButton.SelectedImagePath = "Collection/MesCenter/ShareOn.png";
            shareMenuButton.ImageButton.UnSelectedImagePath = "Collection/MesCenter/Share.png";
            shareMenuButton.TextButton.TextID = StringId.SharingAndFunctionality;
            shareMenuButton.TextButton.IsMoreLines = true;
            Action shateAction = () =>
            {
                MenuButtonSelect(1);
            };
            shareMenuButton.SelectAction = shateAction;
            #endregion
#endregion

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

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

        }

@@ -204,9 +222,9 @@
            if (selectId == 0)
            {
                allMenuButton.IsSelected = true;
                shareMenuButton.IsSelected = false;
                alarmMenuButton.IsSelected = false;
                systemMenuButton.IsSelected = false;
                shareMenuButton.IsSelected = true;
                alarmMenuButton.IsSelected = true;
                systemMenuButton.IsSelected = true;

            }
            else if (selectId == 1)
@@ -276,21 +294,27 @@
            VerticalScrolViewMiddle.AddChidren(rowView);

            //标题
            var btnTilte = new Button()
            var btnTilte = new TextButton()
            {
                X = Application.GetRealWidth(16),
                Y = Application.GetRealHeight(12),
                Width = Application.GetRealWidth(320),
                Height = Application.GetRealHeight(20),
                Width = Application.GetRealWidth(343),
                Height = Application.GetRealWidth(20),
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = CSS_Color.FirstLevelTitleColor,
                TextSize = CSS_FontSize.TextFontSize,
                Text = pushMessageInfo.messageTitle
                Text = pushMessageInfo.messageContent,
                //IsMoreLines = true,
            };
            rowView.AddChidren(btnTilte);
            //
            var needHeight = btnTilte.GetMoreLineNeedHeight();
            btnTilte.IsMoreLines = true;
            btnTilte.Height = needHeight;
            rowView.Height = Application.GetRealHeight(45) + needHeight;

            //副标题
            var btnSubtitle = new Button()
            var btnSubtitle = new TextButton()
            {
                X = Application.GetRealWidth(16),
                Y = btnTilte.Bottom + Application.GetRealHeight(4),
@@ -299,7 +323,7 @@
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = CSS_Color.PromptingColor1,
                TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
                Text = pushMessageInfo.messageContent
                Text = pushMessageInfo.messageTitle
            };
            rowView.AddChidren(btnSubtitle);

@@ -335,13 +359,16 @@


            btnDatetime.Text = GetUnixToDateTime(pushMessageInfo.createTime);
            EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
            {
                new Alert(pushMessageInfo.messageTitle, pushMessageInfo.messageContent, Language.StringByID(StringId.Close)).Show();
            };
            rowView.MouseUpEventHandler = eventHandler;
            btnTilte.MouseUpEventHandler = eventHandler;
            btnSubtitle.MouseUpEventHandler = eventHandler;
            //2020-12-23 去掉点击弹窗事件
            //EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
            //{
            //    new Alert(pushMessageInfo.messageTitle, pushMessageInfo.messageContent, Language.StringByID(StringId.Close)).Show();
            //};
            //rowView.MouseUpEventHandler = eventHandler;
            //btnTilte.MouseUpEventHandler = eventHandler;
            //btnSubtitle.MouseUpEventHandler = eventHandler;

           
        }

        /// <summary>
@@ -418,7 +445,7 @@
            };
            VerticalScrolViewMiddle.AddChidren(bgView);

            var yearBtn = new Button()
            var yearBtn = new TextButton()
            {
                X = Application.GetRealWidth(16),
                Y = Application.GetRealHeight(16),
@@ -428,9 +455,9 @@
                TextColor = CSS_Color.FirstLevelTitleColor,
                TextSize = CSS_FontSize.EmphasisFontSize_FirstLevel,
                IsBold = true,
                Text = yearStr
            };
            bgView.AddChidren(yearBtn);
            yearBtn.Text = yearStr + Language.StringByID(StringId.Years);
        }

        /// <summary>
@@ -440,7 +467,15 @@
        void GetPushMessageList(int queryType = 0)
        {
            bodyScrolView.RemoveAll();
            PushMessageInfoList.Clear();
            if(PushMessageInfoList == null)
            {
                PushMessageInfoList = new List<PushMessageInfo>();
            }
            else
            {
                PushMessageInfoList.Clear();
            }
          
            YearMark = "";//标记清空
            if (string.IsNullOrEmpty(OnAppConfig.Instance.PushId))
            {
@@ -527,7 +562,7 @@
            }
        }

        #region 测试
#region 测试
#if DEBUG
        /// <summary>
        /// 
@@ -602,7 +637,7 @@

#endif

        #endregion
#endregion

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

#if DEBUG