合并了IOS的代码

hxb

2022-08-30 25429f085093d89d543a0b90e30d0d62d1b7dac9

 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;

@@ -111,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