From a7adf98ff4ac801342853b1f9231cc1ab5acebf3 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期四, 14 十一月 2019 17:25:42 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into DEV_GXC
---
ZigbeeApp/Shared/Phone/Device/Account/AccountRegister.cs | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Account/AccountRegister.cs b/ZigbeeApp/Shared/Phone/Device/Account/AccountRegister.cs
old mode 100755
new mode 100644
index b8d089e..815216b
--- a/ZigbeeApp/Shared/Phone/Device/Account/AccountRegister.cs
+++ b/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")
{
--
Gitblit v1.8.0