合并代码

黄学彪

2020-01-10 9064c76e6a795ae735cac52d98bed178a27c2a87

 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>