合并一个版本

黄学彪

2019-12-17 5986f63b75bd81c6cef262c670e9251c038cbf5d

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/ProgressFormBar.cs

@@ -29,7 +29,14 @@
                return m_Current;

            }

        }



        /// <summary>

        /// 消息控件单击的事件

        /// </summary>

        public Action MsgClickEvent = null;

        /// <summary>

        /// 界面关闭的事件

        /// </summary>

        public Action CloseEvent = null;

        /// <summary>

        /// 容器控件

        /// </summary>

@@ -76,6 +83,7 @@
            this.oldScrollEnabled = UserView.HomePage.Instance.ScrollEnabled;

            UserView.HomePage.Instance.ScrollEnabled = false;

            Shared.Common.CommonPage.BackKeyCanClick = false;



            this.oldPrigressVisible = Common.CommonPage.Loading.Visible;

            if (oldPrigressVisible == true)

            {

@@ -103,6 +111,10 @@
            btnText.TextColor = UserCenterColor.Current.TextGrayColor1;

            btnText.TextAlignment = TextAlignment.Center;

            frameBack.AddChidren(btnText);

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

            {

                this.MsgClickEvent?.Invoke();

            };



            //进度条

            var btnProRow = new FrameLayout();

@@ -248,6 +260,10 @@
                btnProgressView = null;

                frameProgress = null;

                btnProgressBar = null;

                this.MsgClickEvent = null;

                //关闭事件

                this.CloseEvent?.Invoke();

                this.CloseEvent = null;

            });

        }