2019-12-30-1

WJC

2019-12-30 f1c3921b08bb22ac6f5db22d620e01d7e8e5c49f

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

@@ -58,6 +58,10 @@
        /// 原来的滑动标识

        /// </summary>

        private bool oldScrollEnabled = false;

        /// <summary>

        /// 原来的那个圆形进度条是否可见

        /// </summary>

        private bool oldPrigressVisible = false;



        #endregion



@@ -68,23 +72,21 @@
        /// </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 frameBack = new FrameLayout();

            frameBack.Width = Application.GetRealWidth(674);

@@ -172,7 +174,7 @@
        /// </summary>

        /// <param name="value">进度值,内部会除以maxValue</param>

        /// <param name="maxValue">最大值</param>

        public void SetValue2(decimal value, decimal maxValue)

        public void SetValue(decimal value, decimal maxValue)

        {

            decimal result = value / maxValue;

            this.SetValueEx(result);

@@ -184,6 +186,10 @@
        /// <param name="value"></param>

        private void SetValueEx(decimal value)

        {

            if (btnProgressBar == null)

            {

                return;

            }

            HdlThreadLogic.Current.RunMain(() =>

            {

                int width = (int)(value * ProRowWidth);

@@ -223,15 +229,20 @@
        /// </summary>

        public void Close()

        {

            if (this.oldScrollEnabled == true)

            {

                //如果它原来就是不可以滑动的话，不处理

                UserView.HomePage.Instance.ScrollEnabled = true;

            }

            Shared.Common.CommonPage.BackKeyCanClick = true;



            HdlThreadLogic.Current.RunMain(() =>

            {

                if (this.oldScrollEnabled == true)

                {

                    //如果它原来就是不可以滑动的话，不处理

                    UserView.HomePage.Instance.ScrollEnabled = true;

                }

                Shared.Common.CommonPage.BackKeyCanClick = true;

                if (this.oldPrigressVisible == true)

                {

                    //如果原来的进度条是可见的话,还原回去

                    Common.CommonPage.Loading.Start(Common.CommonPage.Loading.Text);

                }



                bodyFrameLayout?.RemoveFromParent();

                bodyFrameLayout = null;

                btnText = null;