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

xm

2020-05-13 99da2604f81af29afc6b3c6f4f128b4e5a8a5649

 ZigbeeApp/Shared/Phone/Login/AccountRegister.cs

@@ -308,7 +308,7 @@
                {
                    var registerSuccess = new AccountRegisterSuccess();
                    CommonPage.Instance.AddChidren(registerSuccess);
                    registerSuccess.Show(account, pwdRow.PasswrodET.Text.Trim(), OpenID);
                    registerSuccess.ShowForm(account, pwdRow.PasswrodET.Text.Trim(), OpenID);
                }
                else if (stateCodeStr == "EXIST")
                {