From c26d742cef5ac268ca902b6605512b6476a26bc2 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期四, 05 十二月 2019 15:22:27 +0800
Subject: [PATCH] 2019.12.5
---
ZigbeeApp/Shared/Phone/Device/Account/AccountRegister.cs | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 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..ff9b5c3
--- a/ZigbeeApp/Shared/Phone/Device/Account/AccountRegister.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Account/AccountRegister.cs
@@ -55,12 +55,17 @@
/// 璐﹀彿
/// </summary>
private string account;
+ /// <summary>
+ /// OpenID
+ /// </summary>
+ public string OpenID;
#endregion
#region 鈼� 鏋勯�犳柟娉昣________________________
public AccountRegister()
{
+ CommonPage.Instance.IsDrawerLockMode = true;
BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor;
Tag = "Register";
}
@@ -124,7 +129,7 @@
Width = Application.GetRealWidth(942),
Gravity = Gravity.CenterHorizontal,
BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor,
- Radius = (uint)Application.GetRealHeight(30)
+ Radius = (uint)Application.GetRealHeight(17)
};
bodyFrameLayout.AddChidren(accountCodeFL);
@@ -186,6 +191,8 @@
phoneEmailForm.SelectedPhone.IsSelected = phoneEmailForm.SelectedEmail.IsSelected = false;
registerBtn.Enable = registerBtn.IsSelected = false;
(sender as Button).IsSelected = true;
+ account = string.Empty;
+ errorBtn.Text = string.Empty;
if ((sender as Button).Tag.ToString() == "Phone")
{
AddPhoneOrEmailFL(accountCodeFL, "Phone");
@@ -204,7 +211,6 @@
private void AddPhoneOrEmailFL(FrameLayout accountCodeFrameLayout, string phoneOrEmail)
{
accountCodeFrameLayout.RemoveAll();
-
if (phoneOrEmail == "Phone")
{
phoneRow = new PhoneRowForm();
@@ -281,7 +287,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")
{
@@ -341,7 +347,7 @@
/// <param name="mouseEventArgs">The ${ParameterType} instance containing the event data.</param>
private void Account_TextChange(object sender, string mouseEventArgs)
{
- errorBtn.Text = "";
+ errorBtn.Text = string.Empty;
if ((sender as EditText).Text.Trim().Length > 0)
{
//IsRightAccount = true;
@@ -362,7 +368,7 @@
/// <param name="mouseEventArgs">The ${ParameterType} instance containing the event data.</param>
private void Code_TextChange(object sender, string mouseEventArgs)
{
- errorBtn.Text = "";
+ errorBtn.Text = string.Empty;
if ((sender as EditText).Text.Trim().Length > 0)
{
registerBtn.Enable = registerBtn.IsSelected = true;
--
Gitblit v1.8.0