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

xm

2020-07-14 d87400af518ebc9274f4447f06476959c3aa5102

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

@@ -124,7 +124,7 @@
            HdlThreadLogic.Current.RunMain(() =>

            {

                btnText.Text = msg;

            });

            }, ShowErrorMode.NO);

        }



        #endregion

@@ -137,7 +137,7 @@
        /// <param name="value">此值为百分比值(也就是小于或者等于1的)</param>

        public void SetValue(decimal value)

        {

            this.btnProgressBar.SetValue(value);

            this.btnProgressBar?.SetValue(value);

        }



        /// <summary>

@@ -147,7 +147,7 @@
        /// <param name="maxValue">最大值</param>

        public void SetValue(decimal value, decimal maxValue)

        {

            this.btnProgressBar.SetValue(value, maxValue);

            this.btnProgressBar?.SetValue(value, maxValue);

        }



        #endregion

@@ -165,7 +165,7 @@
                {

                    //初始化进度条

                    this.InitProgressFormBar();

                });

                }, ShowErrorMode.NO);

            }

        }



@@ -200,7 +200,7 @@
                //关闭事件

                this.CloseEvent?.Invoke();

                this.CloseEvent = null;

            });

            }, ShowErrorMode.NO);

        }



        #endregion