From 4b378188ce972df432b23d9cb73babb6cc0679c6 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 17 一月 2020 14:56:15 +0800
Subject: [PATCH] 合并代码 ver.10086
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/EditorCommonForm.cs | 25 +++++++++++++++++++++++++
1 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/EditorCommonForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/EditorCommonForm.cs
index 1308333..0340111 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/EditorCommonForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/EditorCommonForm.cs
@@ -26,6 +26,25 @@
/// </summary>
public FrameLayout bodyFrameLayout = null;
/// <summary>
+ /// 宸︽粦浣胯兘
+ /// </summary>
+ private bool m_ScrollEnabled = true;
+ /// <summary>
+ /// 宸︽粦浣胯兘
+ /// </summary>
+ public bool ScrollEnabled
+ {
+ get { return m_ScrollEnabled; }
+ set
+ {
+ if (UserView.HomePage.Instance.ScrollEnabled != value)
+ {
+ UserView.HomePage.Instance.ScrollEnabled = value;
+ this.m_ScrollEnabled = value;
+ }
+ }
+ }
+ /// <summary>
/// 缂撳瓨鍚姩鍙傛暟
/// </summary>
private object[] m_parameter = null;
@@ -46,6 +65,9 @@
//鍒濆鍖栦腑閮ㄦ帶浠�
this.InitBodyFrameLayout();
+
+ //鍒濆宸︽粦浣胯兘鍙�
+ this.ScrollEnabled = true;
}
/// <summary>
@@ -172,6 +194,9 @@
/// </summary>
public override void CloseFormBefore()
{
+ //宸︽粦浣胯兘
+ this.ScrollEnabled = true;
+
this.m_parameter = null;
//娓呯┖bodyFrame
this.ClearBodyFrame();
--
Gitblit v1.8.0