2019-11-01-2

WJC

2019-11-01 6f16607efe766271c69a4f3f96fb928fe25f112c

 ZigbeeApp/Shared/Phone/UserCenter/Safety/EdtiorUserPasswordForm.cs

@@ -22,7 +22,7 @@
        /// <summary>

        /// 密码输入控件

        /// </summary>

        private PsswordInputControl pswControl = null;

        private PswNumberInputControl pswControl = null;



        #endregion



@@ -52,11 +52,11 @@
            this.ClearBodyFrame();



            //请输入新安防密码

            pswControl = new PsswordInputControl(Language.StringByID(R.MyInternationalizationString.uPleaseInputNewSafetyPassword), 4);

            pswControl = new PswNumberInputControl(Language.StringByID(R.MyInternationalizationString.uPleaseInputNewSafetyPassword), 4);

            bodyFrameLayout.AddChidren(pswControl);

            pswControl.InitControl();



            pswControl.ActionPswFinish += (pssword) =>

            pswControl.FinishInputEvent += (pssword) =>

            {

                if (firstPsw != string.Empty)

                {

@@ -79,12 +79,6 @@
                    //请重复输入新安防密码

                    pswControl.ResetControlInfo(Language.StringByID(R.MyInternationalizationString.uPleaseRepeatInputNewSafetyPassword));

                }

            };



            //取消

            pswControl.ActionCancel += () =>

            {

                this.CloseForm();

            };

        }



@@ -143,7 +137,7 @@
            if (pswValue1 != pswValue2)

            {

                //两次输入的密码不一致

                return Language.StringByID(R.MyInternationalizationString.SecondPswNotEqual);

                return Language.StringByID(R.MyInternationalizationString.SecondPswNotEqual1);

            }

            return string.Empty;

        }