From 6fa9d69da922c8049f5acfcbb9ce9fd26811024c Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期四, 16 四月 2020 17:10:57 +0800
Subject: [PATCH] 请合并代码
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/ProgressFormBar.cs | 72 +++++++++++++++++++++++++----------
1 files changed, 51 insertions(+), 21 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..539ff34 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/ProgressFormBar.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/ProgressFormBar.cs
@@ -29,7 +29,14 @@
return m_Current;
}
}
-
+ /// <summary>
+ /// 娑堟伅鎺т欢鍗曞嚮鐨勪簨浠�
+ /// </summary>
+ public Action MsgClickEvent = null;
+ /// <summary>
+ /// 鐣岄潰鍏抽棴鐨勪簨浠�
+ /// </summary>
+ public Action CloseEvent = null;
/// <summary>
/// 瀹瑰櫒鎺т欢
/// </summary>
@@ -58,6 +65,10 @@
/// 鍘熸潵鐨勬粦鍔ㄦ爣璇�
/// </summary>
private bool oldScrollEnabled = false;
+ /// <summary>
+ /// 鍘熸潵鐨勯偅涓渾褰㈣繘搴︽潯鏄惁鍙
+ /// </summary>
+ private bool oldPrigressVisible = false;
#endregion
@@ -68,23 +79,26 @@
/// </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 nowForm = UserView.HomePage.Instance.GetChildren(UserView.HomePage.Instance.ChildrenCount - 1);
+ //if (nowForm != null && (nowForm is ViewGroup) == true)
+ //{
+ // ((ViewGroup)nowForm).AddChidren(bodyFrameLayout);
+ //}
var frameBack = new FrameLayout();
frameBack.Width = Application.GetRealWidth(674);
@@ -92,7 +106,7 @@
frameBack.BackgroundColor = UserCenterColor.Current.White;
frameBack.Gravity = Gravity.CenterHorizontal;
frameBack.Y = Application.GetRealHeight(683);
- frameBack.Radius = 6;
+ frameBack.Radius = (uint)Application.GetRealHeight(17);
bodyFrameLayout.AddChidren(frameBack);
//杩涘害鏄剧ず鏂囨湰
@@ -101,6 +115,10 @@
btnText.TextColor = UserCenterColor.Current.TextGrayColor1;
btnText.TextAlignment = TextAlignment.Center;
frameBack.AddChidren(btnText);
+ btnText.ButtonClickEvent += (sender, e) =>
+ {
+ this.MsgClickEvent?.Invoke();
+ };
//杩涘害鏉�
var btnProRow = new FrameLayout();
@@ -114,7 +132,6 @@
this.btnProgressBar = new FrameLayout();
btnProgressBar.Width = 0;
btnProgressBar.Height = btnProRow.Height;
- btnProgressBar.Radius = btnProRow.Radius;
btnProgressBar.BackgroundColor = 0xfffb744a;
btnProgressBar.Radius = (uint)Application.GetRealHeight(29) / 2;
btnProRow.AddChidren(btnProgressBar);
@@ -129,7 +146,7 @@
var btnProgressPic = new PicViewControl(84, 60);
btnProgressPic.UnSelectedImagePath = "Item/ProgressMsg.png";
frameProgress.AddChidren(btnProgressPic);
- this.btnProgressView = new NormalViewControl(84, 32, true);
+ this.btnProgressView = new NormalViewControl(84, 45, true);
btnProgressView.TextSize = 10;
btnProgressView.TextAlignment = TextAlignment.Center;
btnProgressView.Text = "0%";
@@ -172,7 +189,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 +201,10 @@
/// <param name="value"></param>
private void SetValueEx(decimal value)
{
+ if (btnProgressBar == null)
+ {
+ return;
+ }
HdlThreadLogic.Current.RunMain(() =>
{
int width = (int)(value * ProRowWidth);
@@ -223,21 +244,30 @@
/// </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;
btnProgressView = null;
frameProgress = null;
btnProgressBar = null;
+ this.MsgClickEvent = null;
+ //鍏抽棴浜嬩欢
+ this.CloseEvent?.Invoke();
+ this.CloseEvent = null;
});
}
--
Gitblit v1.8.0