Merge branch 'dev-tzy' into dev-2020xm

xm

2020-07-14 d87400af518ebc9274f4447f06476959c3aa5102

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

@@ -12,7 +12,7 @@
        #region ■ 变量声明___________________________



        /// <summary>

        /// 进图条能否往回走(默认可以)

        /// 进度条能否往回走(默认可以)

        /// </summary>

        public bool ProgressBarGoback = true;

        /// <summary>

@@ -35,6 +35,22 @@
        /// 模式区分

        /// </summary>

        private int m_ModeDiv = -1;



        /// <summary>

        /// 进度条是否可视

        /// </summary>

        public new bool Visible

        {

            get { return base.Visible; }

            set

            {

                if (this.frameProgressBack != null)

                {

                    this.frameProgressBack.Visible = value;

                }

                base.Visible = value;

            }

        }



        #endregion



@@ -143,10 +159,12 @@
        /// <param name="value"></param>

        private void SetValueEx(decimal value)

        {

            if (btnProgressBar == null || this.m_ModeDiv != 1 || value > 1)

            if (btnProgressBar == null || this.m_ModeDiv != 1)

            {

                return;

            }

            if (value > 1) { value = 1; }



            HdlThreadLogic.Current.RunMain(() =>

            {

                int width = (int)(value * this.Width);