From 3272ca5b51e19f7f8a827b0f68400570a547fe60 Mon Sep 17 00:00:00 2001 From: 陈嘉乐 <cjl@hdlchina.com.cn> Date: 星期二, 28 四月 2020 15:02:44 +0800 Subject: [PATCH] 2020-04-28-1 --- ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/ProgressFormBar.cs | 24 ++++++++++++++++++++++-- 1 files changed, 22 insertions(+), 2 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/ProgressFormBar.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/ProgressFormBar.cs index 22d6a8f..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> @@ -76,17 +83,22 @@ 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; 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); @@ -103,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(); @@ -248,6 +264,10 @@ btnProgressView = null; frameProgress = null; btnProgressBar = null; + this.MsgClickEvent = null; + //鍏抽棴浜嬩欢 + this.CloseEvent?.Invoke(); + this.CloseEvent = null; }); } -- Gitblit v1.8.0