From 99253403b560f761d5f9af8b4f5140496996433a Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 20 十一月 2020 16:49:50 +0800
Subject: [PATCH] 新云端的代码Ver1.0
---
ZigbeeApp/Shared/Phone/Login/AccountRegisterResultForm.cs | 213 ++++++++++++++++++++++++++--------------------------
1 files changed, 106 insertions(+), 107 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Login/AccountRegisterSuccess.cs b/ZigbeeApp/Shared/Phone/Login/AccountRegisterResultForm.cs
old mode 100755
new mode 100644
similarity index 89%
rename from ZigbeeApp/Shared/Phone/Login/AccountRegisterSuccess.cs
rename to ZigbeeApp/Shared/Phone/Login/AccountRegisterResultForm.cs
index 4186077..eb24b6d
--- a/ZigbeeApp/Shared/Phone/Login/AccountRegisterSuccess.cs
+++ b/ZigbeeApp/Shared/Phone/Login/AccountRegisterResultForm.cs
@@ -1,18 +1,18 @@
锘縰sing System;
using System.Text;
using Shared.Common;
-using Shared.Phone.UserCenter;
+using Shared.Phone.UserCenter;
using Shared.Phone.UserView;
namespace Shared.Phone.Login
{
- /// <summary>
- /// 璐﹀彿娉ㄥ唽鎴愬姛鐨勬彁绀虹晫闈�
+ /// <summary>
+ /// 璐﹀彿娉ㄥ唽鎴愬姛鐨勬彁绀虹晫闈�
/// </summary>
- public class AccountRegisterSuccess : FrameLayout
- {
- #region 鈻� 鍒濆鍖朹____________________________
-
+ public class AccountRegisterResultForm : FrameLayout
+ {
+ #region 鈻� 鍒濆鍖朹____________________________
+
/// <summary>
/// 鍒濆鍖�
/// </summary>
@@ -22,72 +22,72 @@
public void ShowForm(string account, string password, string OpenID = "")
{
//鏁翠釜鑳屾櫙
- var frameBack = new FrameLayout();
+ var frameBack = new FrameLayout();
frameBack.BackgroundColor = ZigbeeColor.Current.GXCDailogBackGroundColor;
this.AddChidren(frameBack);
//涓婇儴榛戣壊閮ㄥ垎
var frameBlack = new FrameLayout();
- frameBlack.Y = Application.GetRealHeight(527);
- frameBlack.Width = Application.GetRealWidth(688);
- frameBlack.Height = Application.GetRealHeight(274);
- frameBlack.Gravity = Gravity.CenterHorizontal;
+ frameBlack.Y = Application.GetRealHeight(527);
+ frameBlack.Width = Application.GetRealWidth(688);
+ frameBlack.Height = Application.GetRealHeight(274);
+ frameBlack.Gravity = Gravity.CenterHorizontal;
frameBlack.BackgroundColor = ZigbeeColor.Current.GXCBlackBackgroundColor;
frameBlack.SetCornerWithSameRadius(Application.GetRealHeight(17), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
this.AddChidren(frameBlack);
//涓嬮儴鐧借壊閮ㄥ垎
- var frameWhite = new FrameLayout();
- frameWhite.Y = frameBlack.Bottom;
- frameWhite.Width = Application.GetRealWidth(688);
- frameWhite.Height = Application.GetRealHeight(579);
- frameWhite.Gravity = Gravity.CenterHorizontal;
+ var frameWhite = new FrameLayout();
+ frameWhite.Y = frameBlack.Bottom;
+ frameWhite.Width = Application.GetRealWidth(688);
+ frameWhite.Height = Application.GetRealHeight(579);
+ frameWhite.Gravity = Gravity.CenterHorizontal;
frameWhite.BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor;
frameWhite.SetCornerWithSameRadius(Application.GetRealHeight(17), HDLUtils.RectCornerBottomLeft | HDLUtils.RectCornerBottomRight);
this.AddChidren(frameWhite);
//璐﹀彿澶村儚
- var btnAccountIcon = new PicViewControl(294, 316);
- btnAccountIcon.Y = Application.GetRealHeight(648);
- btnAccountIcon.Gravity = Gravity.CenterHorizontal;
+ var btnAccountIcon = new PicViewControl(294, 316);
+ btnAccountIcon.Y = Application.GetRealHeight(648);
+ btnAccountIcon.Gravity = Gravity.CenterHorizontal;
btnAccountIcon.UnSelectedImagePath = "Account/Cat.png";
this.AddChidren(btnAccountIcon);
//璐﹀彿
- var btnAccount = new NormalViewControl(500, 80, true);
- btnAccount.Y = btnAccountIcon.Bottom;
- btnAccount.Gravity = Gravity.CenterHorizontal;
- btnAccount.Text = account;
- btnAccount.TextColor = ZigbeeColor.Current.GXCTextGrayColor2;
+ var btnAccount = new NormalViewControl(500, 80, true);
+ btnAccount.Y = btnAccountIcon.Bottom;
+ btnAccount.Gravity = Gravity.CenterHorizontal;
+ btnAccount.Text = account;
+ btnAccount.TextColor = ZigbeeColor.Current.GXCTextGrayColor2;
btnAccount.TextAlignment = TextAlignment.Center;
this.AddChidren(btnAccount);
//鎭枩娉ㄥ唽鎴愬姛锛�
- var btnTip = new NormalViewControl(500, 80, true);
- btnTip.Y = Application.GetRealHeight(1143);
- btnTip.Gravity = Gravity.CenterHorizontal;
- btnTip.TextID = R.MyInternationalizationString.RegisterSuccessTip;
- btnTip.TextColor = ZigbeeColor.Current.GXCTextBlackColor2;
- btnTip.TextAlignment = TextAlignment.Center;
+ var btnTip = new NormalViewControl(500, 80, true);
+ btnTip.Y = Application.GetRealHeight(1143);
+ btnTip.Gravity = Gravity.CenterHorizontal;
+ btnTip.TextID = R.MyInternationalizationString.RegisterSuccessTip;
+ btnTip.TextColor = ZigbeeColor.Current.GXCTextBlackColor2;
+ btnTip.TextAlignment = TextAlignment.Center;
btnTip.TextSize = 16;
btnTip.IsBold = true;
this.AddChidren(btnTip);
//鍗冲皢鑷姩鐧诲綍
- var btnWillLogin = new NormalViewControl(500, 80, true);
- btnWillLogin.Y = btnTip.Bottom + Application.GetRealHeight(15);
- btnWillLogin.Gravity = Gravity.CenterHorizontal;
- btnWillLogin.TextID = R.MyInternationalizationString.WillAutoLogin;
+ var btnWillLogin = new NormalViewControl(500, 80, true);
+ btnWillLogin.Y = btnTip.Bottom + Application.GetRealHeight(15);
+ btnWillLogin.Gravity = Gravity.CenterHorizontal;
+ btnWillLogin.TextID = R.MyInternationalizationString.WillAutoLogin;
btnWillLogin.TextColor = ZigbeeColor.Current.GXCTextGrayColor;
btnWillLogin.TextAlignment = TextAlignment.Center;
AddChidren(btnWillLogin);
HdlThreadLogic.Current.RunThread(() =>
- {
- System.Threading.Thread.Sleep(2000);
- //2绉掑悗鑷姩鐧诲綍
- this.LoginByAccountAndPsw(account, password, OpenID);
- });
- }
-
+ {
+ System.Threading.Thread.Sleep(2000);
+ //2绉掑悗鑷姩鐧诲綍
+ this.LoginByAccountAndPsw(account, password, OpenID);
+ });
+ }
+
#endregion
-
- #region 鈻� 鑷姩鐧诲綍___________________________
-
+
+ #region 鈻� 鑷姩鐧诲綍___________________________
+
/// <summary>
/// AutoLogin
/// </summary>
@@ -96,60 +96,59 @@
private void LoginByAccountAndPsw(string account, string password, string OpenID = "")
{
HdlThreadLogic.Current.RunMain(() =>
- {
- //鎵撳紑鍚姩椤�
- CommonPage.Loading.Start(Language.StringByID(R.MyInternationalizationString.Logining));
-
- HdlThreadLogic.Current.RunThread(() =>
- {
- //璐﹀彿瀵嗙爜鐧婚檰
- var loginSuccess = HomePage.Instance.LoginByPWDAsync(account, password);
- if (loginSuccess == 1)
- {
- if (string.IsNullOrEmpty(OpenID) == false)
- {
- //缁戝畾绗笁鏂�
- BindAuthUser(Config.Instance.Guid, OpenID);
- }
- var homes = HdlResidenceLogic.Current.GetHomeListsFromDb(false);
-
- //鍒锋柊涓汉涓績鐨勫唴瀛樺強绾跨▼
- bool result = UserCenterLogic.InitUserCenterMenmoryAndThread();
-
- //鍚姩ZigBee
- ZigBee.Common.Application.Init();
-
- HdlThreadLogic.Current.RunMain(() =>
- {
- CommonPage.Loading.Hide();
- this.RemoveFromParent();
- CommonPage.Instance.RemoveViewByTag("Register");
- CommonPage.Instance.RemoveViewByTag("Login");
- if (result == true)
- {
- //false:寮�鍚簡璋冭瘯鍔熻兘
- UserPage.Instance.ReFreshControl();
- }
- });
- }
- else
- {
- HdlThreadLogic.Current.RunMain(() =>
- {
- //鏈櫥褰曟垚鍔熷脊鍑虹櫥褰曠晫闈� 鍚屾椂闇�瑕佹爣璁颁负鏈櫥褰曠姸鎬�
- Config.Instance.LoginDateTime = new DateTime(1970, 1, 1);
- Config.Instance.Save();
- var login = new AccountLoginForm();
- CommonPage.Instance.AddChidren(login);
- login.ShowForm(account);
- });
- }
- });
+ {
+ //鎵撳紑鍚姩椤�
+ HdlControlLogic.Current.ShowLoginLoadView();
+ CommonPage.Loading.Start(Language.StringByID(R.MyInternationalizationString.Logining));
+
+ HdlThreadLogic.Current.RunThread(() =>
+ {
+ //璐﹀彿瀵嗙爜鐧婚檰
+ var result = HdlAccountLogic.Current.LoginByPassword(account, password);
+ if (result != null && result.Code == HttpMessageEnum.A鎴愬姛)
+ {
+ if (string.IsNullOrEmpty(OpenID) == false)
+ {
+ //缁戝畾绗笁鏂�
+ BindAuthUser(Config.Instance.Guid, OpenID);
+ }
+ //鍒锋柊涓汉涓績鐨勫唴瀛樺強绾跨▼
+ bool result2 = HdlUserCenterLogic.Current.InitUserCenterMenmoryAndThread(true);
+
+ //鍚姩ZigBee
+ ZigBee.Common.Application.Init();
+
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ CommonPage.Loading.Hide();
+ this.RemoveFromParent();
+ CommonPage.Instance.RemoveViewByTag("Register");
+ CommonPage.Instance.RemoveViewByTag("Login");
+ if (result2 == true)
+ {
+ //false:寮�鍚簡璋冭瘯鍔熻兘
+ UserPage.Instance.ReFreshControl();
+ }
+ });
+ }
+ else
+ {
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ //鏈櫥褰曟垚鍔熷脊鍑虹櫥褰曠晫闈� 鍚屾椂闇�瑕佹爣璁颁负鏈櫥褰曠姸鎬�
+ Config.Instance.LoginDateTime = new DateTime(1970, 1, 1);
+ Config.Instance.Save();
+ var login = new AccountLoginForm();
+ CommonPage.Instance.AddChidren(login);
+ login.ShowForm(account);
+ });
+ }
+ });
});
- }
-
- #endregion
-
+ }
+
+ #endregion
+
#region 鈻� 缁戝畾绗笁鏂筥________________________
/// <summary>
@@ -158,15 +157,15 @@
/// <param name="guid"></param>
/// <param name="openId"></param>
private void BindAuthUser(string guid, string openId)
- {
- var auth = new SendDataToServer.BindAuthUser();
- auth.AccountGuid = guid;
- auth.OpenID = openId;
-
- var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(auth);
- CommonPage.Instance.RequestHttpsZigbeeAsync("ZigbeeUsers/BindAuthUserToAccount", Encoding.UTF8.GetBytes(requestJson));
- }
-
+ {
+ //鈽嗐優銉笺偗鈽� 缁戝畾寰俊
+ //var auth = new SendDataToServer.BindAuthUser();
+ //auth.AccountGuid = guid;
+ //auth.OpenID = openId;
+
+ //HdlHttpLogic.Current.RequestHttpsZigbeeAsync("ZigbeeUsers/BindAuthUserToAccount", RestSharp.Method.POST, auth, null, null);
+ }
+
#endregion
}
}
--
Gitblit v1.8.0