请合并代码

xm

2020-04-16 6fa9d69da922c8049f5acfcbb9ce9fd26811024c

 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>

@@ -72,29 +79,26 @@
        /// </summary>

        private void InitProgressFormBar()

        {

            var nowForm = UserView.HomePage.Instance.GetChildren(UserView.HomePage.Instance.ChildrenCount - 1);

            if (nowForm == null || (nowForm is ViewGroup) == false)

            {

                //这种情况应该不存在

                var alert = new ShowMsgControl(ShowMsgType.Error, "ERROR:Not Found The ActionForm!");

                alert.Show();

                return;

            }

            //安卓可以点击系统的返回键

            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)

            {

                //圆形进度条临时关闭

                Common.CommonPage.Loading.Hide();

            }



            //容器

            bodyFrameLayout = new FrameLayout();

            bodyFrameLayout.BackgroundColor = UserCenterColor.Current.DialogBackColor;

            ((ViewGroup)nowForm).AddChidren(bodyFrameLayout);

            Common.CommonPage.Instance.AddChidren(bodyFrameLayout);

            //var nowForm = UserView.HomePage.Instance.GetChildren(UserView.HomePage.Instance.ChildrenCount - 1);

            //if (nowForm != null && (nowForm is ViewGroup) == true)

            //{

            //    ((ViewGroup)nowForm).AddChidren(bodyFrameLayout);

            //}



            var frameBack = new FrameLayout();

            frameBack.Width = Application.GetRealWidth(674);

@@ -102,7 +106,7 @@
            frameBack.BackgroundColor = UserCenterColor.Current.White;

            frameBack.Gravity = Gravity.CenterHorizontal;

            frameBack.Y = Application.GetRealHeight(683);

            frameBack.Radius = 6;

            frameBack.Radius = (uint)Application.GetRealHeight(17);

            bodyFrameLayout.AddChidren(frameBack);



            //进度显示文本

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

            btnText.TextAlignment = TextAlignment.Center;

            frameBack.AddChidren(btnText);

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

            {

                this.MsgClickEvent?.Invoke();

            };



            //进度条

            var btnProRow = new FrameLayout();

@@ -124,7 +132,6 @@
            this.btnProgressBar = new FrameLayout();

            btnProgressBar.Width = 0;

            btnProgressBar.Height = btnProRow.Height;

            btnProgressBar.Radius = btnProRow.Radius;

            btnProgressBar.BackgroundColor = 0xfffb744a;

            btnProgressBar.Radius = (uint)Application.GetRealHeight(29) / 2;

            btnProRow.AddChidren(btnProgressBar);

@@ -139,7 +146,7 @@
            var btnProgressPic = new PicViewControl(84, 60);

            btnProgressPic.UnSelectedImagePath = "Item/ProgressMsg.png";

            frameProgress.AddChidren(btnProgressPic);

            this.btnProgressView = new NormalViewControl(84, 32, true);

            this.btnProgressView = new NormalViewControl(84, 45, true);

            btnProgressView.TextSize = 10;

            btnProgressView.TextAlignment = TextAlignment.Center;

            btnProgressView.Text = "0%";

@@ -257,6 +264,10 @@
                btnProgressView = null;

                frameProgress = null;

                btnProgressBar = null;

                this.MsgClickEvent = null;

                //关闭事件

                this.CloseEvent?.Invoke();

                this.CloseEvent = null;

            });

        }