From 6fa9d69da922c8049f5acfcbb9ce9fd26811024c Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期四, 16 四月 2020 17:10:57 +0800
Subject: [PATCH] 请合并代码
---
ZigbeeApp/Shared/Phone/Login/AccountRegister.cs | 33 ++++++++++++++++++---------------
1 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/ZigbeeApp20200414/Shared/Phone/Login/AccountRegister.cs b/ZigbeeApp/Shared/Phone/Login/AccountRegister.cs
similarity index 96%
rename from ZigbeeApp20200414/Shared/Phone/Login/AccountRegister.cs
rename to ZigbeeApp/Shared/Phone/Login/AccountRegister.cs
index b4e0464..fbd8451 100755
--- a/ZigbeeApp20200414/Shared/Phone/Login/AccountRegister.cs
+++ b/ZigbeeApp/Shared/Phone/Login/AccountRegister.cs
@@ -54,7 +54,7 @@
/// <summary>
/// 璐﹀彿
/// </summary>
- private string account;
+ private string account = string.Empty;
/// <summary>
/// OpenID
/// </summary>
@@ -239,7 +239,7 @@
codeRow = new CodeForRegisterRowForm();
codeRow.Init(accountCodeFrameLayout, 29, 530);
codeRow.VerificationCodeET.TextChangeEventHandler += Code_TextChange;
- codeRow.SendCodeBtn.MouseUpEventHandler += SendCode_MouseUpEventAsync;
+ codeRow.SendCodeBtn.ButtonClickEvent += SendCode_MouseUpEventAsync;
}
#endregion
@@ -375,11 +375,16 @@
errorBtn.Text = string.Empty;
if ((sender as EditText).Text.Trim().Length > 0)
{
- codeRow.SendCodeBtn.Enable = codeRow.SendCodeBtn.IsSelected = true;
+ if (codeRow.SendCodeBtn.CanClick == false)
+ {
+ codeRow.SendCodeBtn.CanClick = true;
+ codeRow.SendCodeBtn.BackgroundColor = 0xFFFC744B;
+ }
}
else
{
- codeRow.SendCodeBtn.Enable = codeRow.SendCodeBtn.IsSelected = false;
+ codeRow.SendCodeBtn.CanClick = false;
+ codeRow.SendCodeBtn.BackgroundColor = 0xFFFEBCA9;
}
account = (sender as EditText).Text.Trim();
}
@@ -430,7 +435,7 @@
}
CommonPage.Loading.Start();
- (sender as Button).Enable = false;
+ (sender as UserCenter.NormalViewControl).CanClick = false;
try
{
int companyInt = 0;
@@ -452,7 +457,8 @@
var requestRevertObj = await CommonFormResouce.RegisterSendVerCode(reqDto);
if (requestRevertObj == null)
{
- CommonPage.Instance.FailureToServer();
+ CommonPage.Instance.FailureToServer();
+ (sender as UserCenter.NormalViewControl).CanClick = true;
return;
}
var stateCodeStr = requestRevertObj.StateCode.ToUpper();
@@ -461,35 +467,32 @@
codeRow.TimeBegin();
var alert = new Alert(Language.StringByID(R.MyInternationalizationString.TIP), Language.StringByID(R.MyInternationalizationString.SendVerificationCodeSuccess), Language.StringByID(R.MyInternationalizationString.Confrim));
alert.Show();
+ return;
}
- else if (stateCodeStr == "PARAMETEROREMPTY")
+
+ if (stateCodeStr == "PARAMETEROREMPTY")
{
//鎻愪緵鐨勫弬鏁伴敊璇�
errorBtn.TextID = R.MyInternationalizationString.PARAMETEROREMPTY;
- (sender as Button).Enable = true;
}
else if (stateCodeStr == "SENDFAIL")
{
//楠岃瘉鐮佸彂閫佸け璐�
- errorBtn.TextID = R.MyInternationalizationString.SENDFAIL;
- (sender as Button).Enable = true;
+ errorBtn.TextID = R.MyInternationalizationString.SENDFAIL;
}
else if (stateCodeStr == "EXIST")
{
//璐﹀彿瀛樺湪
- errorBtn.TextID = R.MyInternationalizationString.AccountHasBeenRegistered;
- (sender as Button).Enable = true;
+ errorBtn.TextID = R.MyInternationalizationString.AccountHasBeenRegistered;
}
else
{
- errorBtn.TextID = R.MyInternationalizationString.RequestServerFailed;
- (sender as Button).Enable = true;
+ errorBtn.TextID = R.MyInternationalizationString.RequestServerFailed;
}
}
catch
{
errorBtn.TextID = R.MyInternationalizationString.RequestServerFailed;
- (sender as Button).Enable = true;
}
finally
{
--
Gitblit v1.8.0