From 66a9965c44ecc32a6696abca876ab9d1cd091584 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期五, 28 二月 2020 15:25:13 +0800
Subject: [PATCH] 2020.2.28
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/DialogCommonForm.cs | 74 +++++++++++++++++++++++++-----------
1 files changed, 51 insertions(+), 23 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/DialogCommonForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/DialogCommonForm.cs
index 932a5f7..1274659 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/DialogCommonForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/DialogCommonForm.cs
@@ -9,37 +9,47 @@
/// </summary>
public class DialogCommonForm : CommonFormBase
{
- #region 鈻� 鍙橀噺澹版槑___________________________
-
- /// <summary>
- /// bodyFrameLayout
- /// </summary>
+ #region 鈻� 鍙橀噺澹版槑___________________________
+
+ /// <summary>
+ /// bodyFrameLayout
+ /// </summary>
public FrameLayout bodyFrameLayout = null;
/// <summary>
/// 鐐瑰嚮鑳屾櫙鐨勬椂鍊欙紝鍏抽棴鐣岄潰
/// </summary>
public bool CloseFormByClickBack = true;
+ /// <summary>
+ /// 鍘熸潵鐨勬粦鍔ㄦ爣璇�
+ /// </summary>
+ private bool oldScrollEnabled = false;
#endregion
- #region 鈻� 鍒濆鍖朹____________________________
+ #region 鈻� 鍒濆鍖朹____________________________
- /// <summary>
- /// 鍒濆鍖栫晫闈㈡鏋�
- /// </summary>
- public override void InitForm()
- {
- base.InitForm();
-
- bodyFrameLayout = new FrameLayout();
- bodyFrameLayout.BackgroundColor = UserCenterColor.Current.DialogBackColor;
+ /// <summary>
+ /// 鍒濆鍖栫晫闈㈡鏋�
+ /// </summary>
+ public override void InitForm()
+ {
+ this.oldScrollEnabled = UserView.HomePage.Instance.ScrollEnabled;
+ UserView.HomePage.Instance.ScrollEnabled = false;
+
+ base.InitForm();
+
+ bodyFrameLayout = new FrameLayout();
+ bodyFrameLayout.BackgroundColor = UserCenterColor.Current.DialogBackColor;
this.AddChidren(bodyFrameLayout);
- bodyFrameLayout.MouseUpEventHandler += (sender, e) =>
+ if (CloseFormByClickBack == true)
{
- //鍏抽棴鑷韩
- this.CloseForm();
- };
+ bodyFrameLayout.MouseUpEventHandler += (sender, e) =>
+ {
+ //鍏抽棴鑷韩
+ this.CloseForm();
+ };
+ }
}
#endregion
@@ -52,10 +62,10 @@
/// <param name="parameter">鍚姩鍙傛暟锛氬弬鏁扮敱鎸囧畾鐢婚潰鐨凷howForm鍑芥暟鎵�鎸囧畾</param>
public override void AddForm(params object[] parameter)
{
- //妫�娴嬭兘鍚﹁拷鍔犵敾闈�
- if (UserCenterLogic.CheckCanAddForm(this) == false)
- {
- return;
+ //妫�娴嬭兘鍚﹁拷鍔犵敾闈�
+ if (UserCenterLogic.CheckCanAddForm(this) == false)
+ {
+ return;
}
var nowForm = UserView.HomePage.Instance.GetChildren(UserView.HomePage.Instance.ChildrenCount - 1);
if (nowForm == null || (nowForm is ViewGroup) == false)
@@ -74,5 +84,23 @@
}
#endregion
+
+ #region 鈻� 鍏抽棴鐣岄潰___________________________
+
+ /// <summary>
+ /// 鍏抽棴鐣岄潰
+ /// </summary>
+ public override void CloseFormBefore()
+ {
+ if (this.oldScrollEnabled == true)
+ {
+ //濡傛灉瀹冨師鏉ュ氨鏄笉鍙互婊戝姩鐨勮瘽锛屼笉澶勭悊
+ UserView.HomePage.Instance.ScrollEnabled = true;
+ }
+
+ base.CloseFormBefore();
+ }
+
+ #endregion
}
}
--
Gitblit v1.8.0