From c0021397eeb8335d6d1f20990c71533c3d94e7af Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期五, 10 一月 2020 17:02:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into DEV_GXC

---
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/EditorCommonForm.cs |   22 ++++++++++++++++++++++
 1 files changed, 22 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..978c5e4 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>

--
Gitblit v1.8.0