From ed2f4a97aa48cdb4a013d2a389877f52eb3eccdf Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期二, 29 十月 2019 13:15:59 +0800
Subject: [PATCH] Merge branch 'DEV_GXC' of http://172.16.1.23:6688/r/~xm/HomeApp into DEV_GXC
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/ProgressBar.cs | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/ProgressBar.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/ProgressBar.cs
index 1b60ac2..a652601 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/ProgressBar.cs
+++ b/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);
}
--
Gitblit v1.8.0