合并代码

黄学彪

2020-01-10 9064c76e6a795ae735cac52d98bed178a27c2a87

 ZigbeeApp/Shared/Phone/UserCenter/Password/EditorGesturePasswordForm.cs

@@ -30,7 +30,7 @@
        public void ShowForm()

        {

            //界面右划不可

            UserView.HomePage.Instance.ScrollEnabled = false;

            this.ScrollEnabled = false;



            //设置头部信息

            base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uGestureAuthentication));

@@ -260,21 +260,6 @@
                    });

                }

            });

        }



        #endregion



        #region ■ 界面关闭___________________________



        /// <summary>

        /// 界面关闭

        /// </summary>

        public override void CloseFormBefore()

        {

            //界面右划可

            UserView.HomePage.Instance.ScrollEnabled = true;



            base.CloseFormBefore();

        }



        #endregion