From 3a26f6025130dcaae4aa82ea19b16ad902450eb8 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 28 十一月 2019 11:43:47 +0800
Subject: [PATCH] 合并全部代码完成
---
ZigbeeApp/Shared/Phone/Device/Account/AccountLoginByCode.cs | 22 +++++++++-------------
1 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Account/AccountLoginByCode.cs b/ZigbeeApp/Shared/Phone/Device/Account/AccountLoginByCode.cs
index a7232bc..78a13f4 100755
--- a/ZigbeeApp/Shared/Phone/Device/Account/AccountLoginByCode.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Account/AccountLoginByCode.cs
@@ -176,7 +176,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 +216,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 +229,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,15 +298,10 @@
{
return;
}
- this.RemoveFromParent();
- Application.MainPage?.RemoveViewByTag("Login");
- UserPage.Instance.Fresh();
-
+ HomePage.Instance.ShowLoginLoadView();
new System.Threading.Thread(async () =>
{
- //鍚姩ZigBee
- ZigBee.Common.Application.Init();
var responseDataObj = Newtonsoft.Json.JsonConvert.DeserializeObject<Shared.Common.ResponseEntity.UserLoginRes>(requestRevetLoginCodeOBJ.ResponseData.ToString());
var revertData = responseDataObj;
Config.ReFresh();
@@ -326,15 +321,17 @@
Config.Instance.MD5PWD = revertData.MD5PWD;
Config.Instance.Save();
var resultRegID = await CommonPage.Instance.PushRegID();
- var homes = await House.GetHomeLists();
-
+ var homes = await House.GetHomeLists();
+ //鍚姩ZigBee
+ ZigBee.Common.Application.Init();
//鍒锋柊涓汉涓績鐨勫唴瀛樺強绾跨▼
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();
});
@@ -477,7 +474,6 @@
IsRightAccount = false;
codeRow.SendCodeBtn.Enable = codeRow.SendCodeBtn.IsSelected = false;
}
- account = (sender as EditText).Text.Trim();
}
/// <summary>
--
Gitblit v1.8.0