From a5b3c4bae726ef6770d4bfcbf2f4b50a37ed4a15 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 06 三月 2020 15:31:36 +0800
Subject: [PATCH] 删除了郭雪城的 DeviceUi 这个类
---
ZigbeeApp/Shared/Phone/Device/Account/AccountLogin.cs | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Account/AccountLogin.cs b/ZigbeeApp/Shared/Phone/Device/Account/AccountLogin.cs
old mode 100755
new mode 100644
index 2db0b49..655fb6f
--- a/ZigbeeApp/Shared/Phone/Device/Account/AccountLogin.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Account/AccountLogin.cs
@@ -174,7 +174,7 @@
phoneEmailForm = new PhoneEmailForm();
phoneEmailForm.Init(midFrameLayout);
-
+
//閿欒鎻愮ずBtn
loginErrorBtn = new Button()
@@ -289,6 +289,11 @@
if (string.IsNullOrEmpty(account) == false && AccountLogic.Instance.CheckEmail(account) == true)
{
SelectPhoneOrEmail_MouseUpEvent(phoneEmailForm.SelectedEmail, null);
+ this.account = string.Empty;
+ }
+ else
+ {
+ this.account = string.Empty;
}
}
@@ -411,7 +416,7 @@
//鍚姩ZigBee
ZigBee.Common.Application.Init();
- Shared.Common.Room.InitAllRoom();
+ UserCenter.HdlRoomLogic.Current.InitAllRoom();
Application.RunOnMainThread(() =>
{
CommonPage.Loading.Hide();
@@ -560,7 +565,7 @@
await UserCenter.UserCenterLogic.InitUserCenterMenmoryAndThread();
//鍚姩ZigBee
ZigBee.Common.Application.Init();
- Shared.Common.Room.InitAllRoom();
+ UserCenter.HdlRoomLogic.Current.InitAllRoom();
Application.RunOnMainThread(() =>
{
this.RemoveFromParent();
@@ -613,7 +618,7 @@
ZigBee.Common.Application.Init();
//鍒锋柊涓汉涓績鐨勫唴瀛樺強绾跨▼
await UserCenter.UserCenterLogic.InitUserCenterMenmoryAndThread();
- Shared.Common.Room.InitAllRoom();
+ UserCenter.HdlRoomLogic.Current.InitAllRoom();
Application.RunOnMainThread(() =>
{
this.RemoveFromParent();
@@ -803,7 +808,7 @@
private void Pwd_TextChange(object sender,string mouseEventArgs)
{
loginErrorBtn.Text = string.Empty;
- if (1 <= pwdRow.PasswrodET.Text.Trim().Length && pwdRow.PasswrodET.Text.Trim().Length <= 16 && (phoneRow.AccountET.Text.Trim().Length > 0 || emailRow.AccountET.Text.Trim().Length>0))
+ if (1 <= pwdRow.PasswrodET.Text.Trim().Length && pwdRow.PasswrodET.Text.Trim().Length <= 16 && (phoneRow.AccountET.Text.Trim().Length > 0 || emailRow?.AccountET.Text.Trim().Length>0))
{
loginBtn.Enable = loginBtn.IsSelected = true;
}
@@ -811,7 +816,7 @@
{
pwdRow.PasswrodET.Text = mouseEventArgs.Remove(16);
}
- else if (pwdRow.PasswrodET.Text.Trim().Length > 16 && phoneRow.AccountET.Text.Trim().Length > 0)
+ else if (pwdRow.PasswrodET.Text.Trim().Length > 16 && (phoneRow.AccountET.Text.Trim().Length > 0 || emailRow?.AccountET.Text.Trim().Length > 0))
{
loginBtn.Enable = loginBtn.IsSelected = true;
pwdRow.PasswrodET.Text = mouseEventArgs.Remove(16);
--
Gitblit v1.8.0