2020-07-10-01

陈嘉乐

2020-07-10 48ba446936b51fffafa7c3600c0dadc6ac0e8c20

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

@@ -12,6 +12,10 @@
        #region ■ 变量声明___________________________



        /// <summary>

        /// 密码改变事件

        /// </summary>

        public Action<string> PasswordChangedEvent = null;

        /// <summary>

        /// 用户账号

        /// </summary>

        private int pswNo = 0;

@@ -68,8 +72,6 @@
                    string msg = this.CheckPassword(firstPsw, pssword);

                    if (msg != string.Empty)

                    {

                        //请重复输入新安防密码

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

                        //设置错误信息

                        pswControl.SetErrorMsg(msg);

                        return;

@@ -113,11 +115,19 @@


            //界面直接关闭

            this.CloseForm();

            //关闭编辑界面

            this.CloseFormByFormName("PasswordUserEditorForm");



            var form = new PasswordUserEditorForm();

            form.AddForm(this.pswNo, pswValue1, i_titleText);

            if (UserCenterResourse.DicActionForm.ContainsKey("PasswordUserEditorForm") == false)

            {

                var form = new PasswordUserEditorForm();

                form.AddForm(this.pswNo, pswValue1, i_titleText);

            }

            else

            {

                //回调函数

                this.PasswordChangedEvent?.Invoke(pswValue1);

                this.PasswordChangedEvent = null;



            }

        }



        #endregion