From b94f318b1cb5c3618dd53b5240c1d999c8427b71 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期五, 29 十一月 2019 13:09:25 +0800
Subject: [PATCH] 2019.11.29
---
ZigbeeApp/Shared/Phone/Device/Account/AccountLoginByCode.cs | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Account/AccountLoginByCode.cs b/ZigbeeApp/Shared/Phone/Device/Account/AccountLoginByCode.cs
old mode 100755
new mode 100644
index a7232bc..6f5a457
--- a/ZigbeeApp/Shared/Phone/Device/Account/AccountLoginByCode.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Account/AccountLoginByCode.cs
@@ -87,6 +87,7 @@
/// </summary>
public AccountLoginByCode()
{
+ CommonPage.Instance.IsDrawerLockMode = true;
Tag = "Login";
BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor;
t = new Timer();
@@ -176,7 +177,7 @@
Width = Application.GetRealWidth(942),
Gravity = Gravity.CenterHorizontal,
BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor,
- Radius = (uint)Application.GetRealHeight(30)
+ Radius = (uint)Application.GetRealHeight(17)
};
midFrameLayout.AddChidren(accountCodeFL);
@@ -216,7 +217,7 @@
LoginByAccountPWDBtn = new Button()
{
X = Application.GetRealWidth(98),
- Y = Application.GetRealHeight(1446),
+ Y = Application.GetRealHeight(1466),
Width = Application.GetRealWidth(300),
Height = Application.GetRealHeight(49),
TextID = R.MyInternationalizationString.LoginByAccountPWD,
@@ -229,7 +230,7 @@
registerBtn = new Button()
{
X = Application.GetRealWidth(738),
- Y = Application.GetRealHeight(1446),
+ Y = Application.GetRealHeight(1466),
Width = Application.GetRealWidth(244),
Height = Application.GetRealHeight(49),
TextID = R.MyInternationalizationString.Register,
@@ -298,11 +299,8 @@
{
return;
}
- this.RemoveFromParent();
- Application.MainPage?.RemoveViewByTag("Login");
- UserPage.Instance.Fresh();
-
+ HomePage.Instance.ShowLoginLoadView();
new System.Threading.Thread(async () =>
{
//鍚姩ZigBee
@@ -331,10 +329,11 @@
//鍒锋柊涓汉涓績鐨勫唴瀛樺強绾跨▼
await UserCenter.UserCenterLogic.InitUserCenterMenmoryAndThread();
- Shared.Common.Room.CanInitAllRoom = true;
Shared.Common.Room.InitAllRoom();
Application.RunOnMainThread(() =>
{
+ this.RemoveFromParent();
+ CommonPage.Instance.RemoveViewByTag("Login");
UserPage.Instance.Fresh();
CommonPage.Loading.Hide();
});
@@ -437,7 +436,7 @@
private void AddPhoneOrEmailFL(FrameLayout accountCodeFrameLayout, string phoneOrEmail)
{
accountCodeFrameLayout.RemoveAll();
-
+ account = string.Empty;
if (phoneOrEmail == "Phone")
{
phoneRow = new PhoneRowForm();
@@ -471,13 +470,13 @@
{
IsRightAccount = true;
codeRow.SendCodeBtn.Enable = codeRow.SendCodeBtn.IsSelected = true;
+ account= (sender as EditText).Text.Trim();
}
else
{
IsRightAccount = false;
codeRow.SendCodeBtn.Enable = codeRow.SendCodeBtn.IsSelected = false;
}
- account = (sender as EditText).Text.Trim();
}
/// <summary>
--
Gitblit v1.8.0