From 993ecf49ae04ccea89f6bc4a32cfc0c45def1215 Mon Sep 17 00:00:00 2001
From: 温居城 <wenjucheng@wenjuchengdeMacBook-Pro.local>
Date: 星期三, 27 十月 2021 14:23:30 +0800
Subject: [PATCH] 2021-10-27-01
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/ProgressBar.cs | 168 +++++++++++++++++++++++++++++--------------------------
1 files changed, 88 insertions(+), 80 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/ProgressBar.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/ProgressBar.cs
old mode 100755
new mode 100644
index 1b60ac2..716b366
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/ProgressBar.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/ProgressBar.cs
@@ -14,61 +14,61 @@
/// 褰撳墠鍊�
/// </summary>
private static decimal m_value = 0;
- /// <summary>
- /// 寮哄埗涓嶆樉绀鸿繘搴︽潯
+ /// <summary>
+ /// 寮哄埗涓嶆樉绀鸿繘搴︽潯
/// </summary>
private static bool notShow = false;
- /// <summary>
- /// 寮哄埗涓嶅叧闂繘搴︽潯
+ /// <summary>
+ /// 寮哄埗涓嶅叧闂繘搴︽潯
/// </summary>
private static bool notClose = false;
- /// <summary>
- /// 鐗规畩闇�姹傦細寮哄埗涓嶅彉鏇磋繘搴︽潯鐨勫��
+ /// <summary>
+ /// 鐗规畩闇�姹傦細寮哄埗涓嶅彉鏇磋繘搴︽潯鐨勫��
/// </summary>
private static bool notSetValue = false;
- /// <summary>
- /// 闄勫姞鏂囨湰
+ /// <summary>
+ /// 闄勫姞鏂囨湰
/// </summary>
private static string appendText = string.Empty;
- /// <summary>
- /// 鏄剧ず杩涘害鏉�
- /// </summary>
+ /// <summary>
+ /// 鏄剧ず杩涘害鏉�
+ /// </summary>
/// <param name="text">鍒濆鏂囨湰</param>
public static void Show(string text = "")
- {
+ {
m_value = 0;
- Application.RunOnMainThread(() =>
- {
- if (Common.CommonPage.Loading.Visible == false && notShow == false)
- {
- Common.CommonPage.Loading.Start(text);
- }
- });
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ if (Common.CommonPage.Loading.Visible == false && notShow == false)
+ {
+ Common.CommonPage.Loading.Start(text);
+ }
+ }, ShowErrorMode.NO);
}
- /// <summary>
- /// 闅愯棌杩涘害鏉�
- /// </summary>
+ /// <summary>
+ /// 闅愯棌杩涘害鏉�
+ /// </summary>
/// <param name="coerce">寮哄埗鍏抽棴</param>
public static void Close(bool coerce = false)
- {
+ {
m_value = 0;
Max = 0;
- if (coerce == true)
- {
- notClose = false;
+ if (coerce == true)
+ {
+ notClose = false;
}
- Application.RunOnMainThread(() =>
- {
- if (Common.CommonPage.Loading.Visible == true && notClose == false)
- {
- Common.CommonPage.Loading.Hide();
- notShow = false;
- notClose = false;
- notSetValue = false;
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ if (Common.CommonPage.Loading.Visible == true && notClose == false)
+ {
+ Common.CommonPage.Loading.Hide();
+ notShow = false;
+ notClose = false;
+ notSetValue = false;
}
- });
+ }, ShowErrorMode.NO);
}
/// <summary>
@@ -79,10 +79,14 @@
{
m_value += value;
int value2 = (int)((m_value / Max) * 100);
+ if (value2 > 100)
+ {
+ value2 = 100;
+ }
SetValue(value2.ToString() + "%");
- }
-
+ }
+
/// <summary>
/// 杩涘害鍊艰瀹�
/// </summary>
@@ -92,6 +96,10 @@
{
m_value += value;
int value2 = (int)((m_value / Max) * 100);
+ if (value2 > 100)
+ {
+ value2 = 100;
+ }
SetValue(value2.ToString() + "% " + text);
}
@@ -102,65 +110,65 @@
/// <param name="text">Text.</param>
public static void SetValue(string text)
{
- if (notSetValue == true)
- {
- return;
+ if (notSetValue == true)
+ {
+ return;
}
- Application.RunOnMainThread(() =>
+ HdlThreadLogic.Current.RunMain(() =>
{
//loading.Text = text;
Common.CommonPage.Loading.Text = text + appendText;
- });
- }
-
+ }, ShowErrorMode.NO);
+ }
+
/// <summary>
/// 璁惧畾杩涘害鍊兼渶澶х殑鍊硷紙鍒嗘瘝锛�
/// </summary>
/// <param name="maxValue">璁惧畾杩涘害鍊兼渶澶х殑鍊硷紙鍒嗘瘝锛�</param>
public static void SetMaxValue(decimal maxValue)
- {
+ {
Max = maxValue;
}
- /// <summary>
- /// 寮哄埗璁剧疆涓嶅啀鏄剧ず杩涘害鏉★紝鐩村埌杩涘害鏉″彲浠ュ叧闂垨鑰呭啀娆¤缃�
- /// </summary>
+ /// <summary>
+ /// 寮哄埗璁剧疆涓嶅啀鏄剧ず杩涘害鏉★紝鐩村埌杩涘害鏉″彲浠ュ叧闂垨鑰呭啀娆¤缃�
+ /// </summary>
/// <param name="i_notShow">鏄惁寮哄埗涓嶆樉绀�</param>
- public static void SetShowBarFlag(bool i_notShow)
- {
- notShow = i_notShow;
- }
-
- /// <summary>
- /// 寮哄埗璁剧疆涓嶅啀鍏抽棴杩涘害鏉★紝鐩村埌杩涘害鏉″彲浠ュ叧闂垨鑰呭啀娆¤缃�
- /// </summary>
- /// <param name="i_notClose">鏄惁寮哄埗涓嶅叧闂�</param>
- public static void SetCloseBarFlag(bool i_notClose)
- {
- notClose = i_notClose;
- }
-
- /// <summary>
- /// 寮哄埗璁剧疆涓嶅彉鏇磋繘搴︽潯鐨勫�硷紝鐩村埌杩涘害鏉″彲浠ュ叧闂垨鑰呭啀娆¤缃�
- /// </summary>
- /// <param name="i_notSetvalue">鏄惁寮哄埗涓嶅彉鏇磋繘搴︽潯鐨勫��</param>
- public static void SetSetValueFlag(bool i_notSetvalue)
- {
- notSetValue = i_notSetvalue;
+ public static void SetShowBarFlag(bool i_notShow)
+ {
+ notShow = i_notShow;
}
- /// <summary>
- /// 鍦ㄨ繘搴︽潯閲岄潰闄勫姞鑷畾涔夋枃鏈�
- /// </summary>
+ /// <summary>
+ /// 寮哄埗璁剧疆涓嶅啀鍏抽棴杩涘害鏉★紝鐩村埌杩涘害鏉″彲浠ュ叧闂垨鑰呭啀娆¤缃�
+ /// </summary>
+ /// <param name="i_notClose">鏄惁寮哄埗涓嶅叧闂�</param>
+ public static void SetCloseBarFlag(bool i_notClose)
+ {
+ notClose = i_notClose;
+ }
+
+ /// <summary>
+ /// 寮哄埗璁剧疆涓嶅彉鏇磋繘搴︽潯鐨勫�硷紝鐩村埌杩涘害鏉″彲浠ュ叧闂垨鑰呭啀娆¤缃�
+ /// </summary>
+ /// <param name="i_notSetvalue">鏄惁寮哄埗涓嶅彉鏇磋繘搴︽潯鐨勫��</param>
+ public static void SetSetValueFlag(bool i_notSetvalue)
+ {
+ notSetValue = i_notSetvalue;
+ }
+
+ /// <summary>
+ /// 鍦ㄨ繘搴︽潯閲岄潰闄勫姞鑷畾涔夋枃鏈�
+ /// </summary>
/// <param name="i_text"></param>
- public static void SetAppendText(string i_text)
- {
- appendText = i_text;
- if (appendText != string.Empty)
- {
- //澶氬姞涓�涓┖鏍�
- appendText = " " + appendText;
- }
+ public static void SetAppendText(string i_text)
+ {
+ appendText = i_text;
+ if (appendText != string.Empty)
+ {
+ //澶氬姞涓�涓┖鏍�
+ appendText = " " + appendText;
+ }
}
}
}
--
Gitblit v1.8.0