合并了全部的代码

黄学彪

2019-11-04 c7698e163e43cea9e7f8ee45f8e3f91c9265cca4

 ZigbeeApp/Shared/Phone/Device/Account/AccountRegister.cs

@@ -55,6 +55,10 @@
        /// 账号
        /// </summary>
        private string account;
        /// <summary>
        /// OpenID
        /// </summary>
        public string OpenID;

        #endregion

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