合并完成代码

黄学彪

2019-10-28 8b4d79ca03495e522a1953e04ca17527f33c853a

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSafeguardLogic.cs

@@ -1639,9 +1639,9 @@
                //设置提示信息:请输入用户密码

                Dialogform.SetTipText(Language.StringByID(R.MyInternationalizationString.uPleaseInputUserPassword));

                //确认按钮

                Dialogform.ComfirmClickEvent += (() =>

                Dialogform.ComfirmClickEvent += ((textValue) =>

                {

                    if (Dialogform.InputText == string.Empty)

                    if (textValue == string.Empty)

                    {

                        this.ShowErrorMsg(Language.StringByID(R.MyInternationalizationString.uPleaseInputUserPassword));

                        return;

@@ -1649,7 +1649,7 @@
                    Dialogform.CloseDialog();



                    //用户密码

                    pasword = Dialogform.InputText;

                    pasword = textValue;

                    //加密密码

                    this.UserPassword = pasword;

                });