From 5986f63b75bd81c6cef262c670e9251c038cbf5d Mon Sep 17 00:00:00 2001 From: 黄学彪 <hxb@hdlchina.com.cn> Date: 星期二, 17 十二月 2019 17:21:07 +0800 Subject: [PATCH] 合并一个版本 --- ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/ProgressFormBar.cs | 18 +++++++++++++++++- 1 files changed, 17 insertions(+), 1 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..652c262 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,6 +83,7 @@ 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) { @@ -103,6 +111,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 +260,10 @@ btnProgressView = null; frameProgress = null; btnProgressBar = null; + this.MsgClickEvent = null; + //鍏抽棴浜嬩欢 + this.CloseEvent?.Invoke(); + this.CloseEvent = null; }); } -- Gitblit v1.8.0