Merge remote-tracking branch 'origin/dev-tzy' into dev-2020xm

xm

2020-05-07 c1de48884fa145a16a0f8bcee93274dcfaa0ff82

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

@@ -228,21 +228,20 @@
                //关闭进度条

                this.CloseProgressBar();



                if (result == false)

                HdlThreadLogic.Current.RunMain(() =>

                {

                    contr.SetErrorMsg(string.Empty);

                }

                else

                {

                    UserCenterResourse.AccountOption.PswAuthentication = psw;

                    UserCenterResourse.AccountOption.Save();



                    HdlThreadLogic.Current.RunMain(() =>

                    if (result == false)

                    {

                        contr.SetErrorMsg(string.Empty);

                    }

                    else

                    {

                        UserCenterResourse.AccountOption.PswAuthentication = psw;

                        UserCenterResourse.AccountOption.Save();

                        //界面关闭

                        this.CloseForm();

                    });

                }

                    }

                });

            });

        }