From f1c3921b08bb22ac6f5db22d620e01d7e8e5c49f Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期一, 30 十二月 2019 13:32:33 +0800
Subject: [PATCH] 2019-12-30-1
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/ProgressFormBar.cs | 45 ++++++++++++++++++++++++++++-----------------
1 files changed, 28 insertions(+), 17 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/ProgressFormBar.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/ProgressFormBar.cs
index 4d6dd4c..a1e6520 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/ProgressFormBar.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/ProgressFormBar.cs
@@ -58,6 +58,10 @@
/// 鍘熸潵鐨勬粦鍔ㄦ爣璇�
/// </summary>
private bool oldScrollEnabled = false;
+ /// <summary>
+ /// 鍘熸潵鐨勯偅涓渾褰㈣繘搴︽潯鏄惁鍙
+ /// </summary>
+ private bool oldPrigressVisible = false;
#endregion
@@ -68,23 +72,21 @@
/// </summary>
private void InitProgressFormBar()
{
- var nowForm = UserView.HomePage.Instance.GetChildren(UserView.HomePage.Instance.ChildrenCount - 1);
- if (nowForm == null || (nowForm is ViewGroup) == false)
- {
- //杩欑鎯呭喌搴旇涓嶅瓨鍦�
- var alert = new ShowMsgControl(ShowMsgType.Error, "ERROR:Not Found The ActionForm!");
- alert.Show();
- return;
- }
//瀹夊崜鍙互鐐瑰嚮绯荤粺鐨勮繑鍥為敭
this.oldScrollEnabled = UserView.HomePage.Instance.ScrollEnabled;
UserView.HomePage.Instance.ScrollEnabled = false;
Shared.Common.CommonPage.BackKeyCanClick = false;
+ this.oldPrigressVisible = Common.CommonPage.Loading.Visible;
+ if (oldPrigressVisible == true)
+ {
+ //鍦嗗舰杩涘害鏉′复鏃跺叧闂�
+ Common.CommonPage.Loading.Hide();
+ }
//瀹瑰櫒
bodyFrameLayout = new FrameLayout();
bodyFrameLayout.BackgroundColor = UserCenterColor.Current.DialogBackColor;
- ((ViewGroup)nowForm).AddChidren(bodyFrameLayout);
+ Common.CommonPage.Instance.AddChidren(bodyFrameLayout);
var frameBack = new FrameLayout();
frameBack.Width = Application.GetRealWidth(674);
@@ -172,7 +174,7 @@
/// </summary>
/// <param name="value">杩涘害鍊�,鍐呴儴浼氶櫎浠axValue</param>
/// <param name="maxValue">鏈�澶у��</param>
- public void SetValue2(decimal value, decimal maxValue)
+ public void SetValue(decimal value, decimal maxValue)
{
decimal result = value / maxValue;
this.SetValueEx(result);
@@ -184,6 +186,10 @@
/// <param name="value"></param>
private void SetValueEx(decimal value)
{
+ if (btnProgressBar == null)
+ {
+ return;
+ }
HdlThreadLogic.Current.RunMain(() =>
{
int width = (int)(value * ProRowWidth);
@@ -223,15 +229,20 @@
/// </summary>
public void Close()
{
- if (this.oldScrollEnabled == true)
- {
- //濡傛灉瀹冨師鏉ュ氨鏄笉鍙互婊戝姩鐨勮瘽锛屼笉澶勭悊
- UserView.HomePage.Instance.ScrollEnabled = true;
- }
- Shared.Common.CommonPage.BackKeyCanClick = true;
-
HdlThreadLogic.Current.RunMain(() =>
{
+ if (this.oldScrollEnabled == true)
+ {
+ //濡傛灉瀹冨師鏉ュ氨鏄笉鍙互婊戝姩鐨勮瘽锛屼笉澶勭悊
+ UserView.HomePage.Instance.ScrollEnabled = true;
+ }
+ Shared.Common.CommonPage.BackKeyCanClick = true;
+ if (this.oldPrigressVisible == true)
+ {
+ //濡傛灉鍘熸潵鐨勮繘搴︽潯鏄彲瑙佺殑璇�,杩樺師鍥炲幓
+ Common.CommonPage.Loading.Start(Common.CommonPage.Loading.Text);
+ }
+
bodyFrameLayout?.RemoveFromParent();
bodyFrameLayout = null;
btnText = null;
--
Gitblit v1.8.0