请合并代码

xm

2020-04-16 6fa9d69da922c8049f5acfcbb9ce9fd26811024c

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

@@ -79,6 +79,10 @@
        {
            m_value += value;
            int value2 = (int)((m_value / Max) * 100);
            if (value2 > 100)

            {

                value2 = 100;

            }

            SetValue(value2.ToString() + "%");
        }

@@ -92,6 +96,10 @@
        {
            m_value += value;
            int value2 = (int)((m_value / Max) * 100);
            if (value2 > 100)

            {

                value2 = 100;

            }

            SetValue(value2.ToString() + "% " + text);
        }