From 38ab16c66df6fc523f2c385fd583a2f2e86a781c Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期三, 29 四月 2020 17:58:45 +0800
Subject: [PATCH] 2020-4-29-1
---
ZigbeeApp/Shared/Phone/Login/AccountLogin.cs | 432 +++++++++++++++++++++++++++---------------------------
1 files changed, 216 insertions(+), 216 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Login/AccountLogin.cs b/ZigbeeApp/Shared/Phone/Login/AccountLogin.cs
index 368a762..8bafd8e 100755
--- a/ZigbeeApp/Shared/Phone/Login/AccountLogin.cs
+++ b/ZigbeeApp/Shared/Phone/Login/AccountLogin.cs
@@ -1,31 +1,31 @@
-锘縰sing System;
-using Shared.Common;
-using Shared.Phone.UserView;
-using Shared.Phone.Device.CommonForm;
+锘縰sing System;
+using Shared.Common;
+using Shared.Phone.UserView;
+using Shared.Phone.Device.CommonForm;
using Shared.Phone.UserCenter;
-namespace Shared.Phone.Login
-{
- /// <summary>
- /// 鐧诲綍鐣岄潰
- /// </summary>
- public class AccountLogin : FrameLayout
+namespace Shared.Phone.Login
+{
+ /// <summary>
+ /// 鐧诲綍鐣岄潰
+ /// </summary>
+ public class AccountLogin : FrameLayoutBase
{
- #region 鈻� 鍙橀噺澹版槑___________________________
-
+ #region 鈻� 鍙橀噺澹版槑___________________________
+
/// <summary>
/// 閿欒鎻愮ず鎺т欢
- /// </summary>
- private NormalViewControl btnErrorMsg = null;
+ /// </summary>
+ private NormalViewControl btnErrorMsg = null;
/// <summary>
/// 鏄惁鍚屾剰闅愮鍗忚
- /// </summary>
- private bool isAgreePrivacyPolicy = true;
-
- #endregion
+ /// </summary>
+ private bool isAgreePrivacyPolicy = true;
- #region 鈻� 鍒濆鍖朹____________________________
-
+ #endregion
+
+ #region 鈻� 鍒濆鍖朹____________________________
+
/// <summary>
/// 鐣岄潰鏄剧ず
/// </summary>
@@ -36,57 +36,57 @@
{
return;
}
- CommonPage.Instance.IsDrawerLockMode = true;
- this.Tag = "Login";
-
- //鐣岄潰涓婇儴鐨勯粦鑹插浘鐗�
- var btnTopBlackPic = new NormalViewControl(this.Width, Application.GetRealHeight(619), false);
- btnTopBlackPic.UnSelectedImagePath = "Account/Logo_loginBG.png";
- this.AddChidren(btnTopBlackPic);
-
- //涓棿娴呯櫧鑹茬殑鑳屾櫙
- var frameMidBack = new FrameLayout();
- frameMidBack.Y = btnTopBlackPic.Bottom;
- frameMidBack.Height = this.Height - btnTopBlackPic.Bottom;
- frameMidBack.BackgroundColor = ZigbeeColor.Current.GXCGrayBackgroundColor;
- this.AddChidren(frameMidBack);
-
- //HdlHome鐨勫浘鏍�
- var btnLogoIcon = new PicViewControl(184, 184);
- btnLogoIcon.Y = Application.GetRealHeight(230);
- btnLogoIcon.UnSelectedImagePath = "Account/Logo_White.png";
+ CommonPage.Instance.IsDrawerLockMode = true;
+ this.Tag = "Login";
+
+ //鐣岄潰涓婇儴鐨勯粦鑹插浘鐗�
+ var btnTopBlackPic = new NormalViewControl(this.Width, Application.GetRealHeight(619), false);
+ btnTopBlackPic.UnSelectedImagePath = "Account/Logo_loginBG.png";
+ this.AddChidren(btnTopBlackPic);
+
+ //涓棿娴呯櫧鑹茬殑鑳屾櫙
+ var frameMidBack = new FrameLayout();
+ frameMidBack.Y = btnTopBlackPic.Bottom;
+ frameMidBack.Height = this.Height - btnTopBlackPic.Bottom;
+ frameMidBack.BackgroundColor = ZigbeeColor.Current.GXCGrayBackgroundColor;
+ this.AddChidren(frameMidBack);
+
+ //HdlHome鐨勫浘鏍�
+ var btnLogoIcon = new PicViewControl(184, 184);
+ btnLogoIcon.Y = Application.GetRealHeight(230);
+ btnLogoIcon.UnSelectedImagePath = "Account/Logo_White.png";
btnLogoIcon.Gravity = Gravity.CenterHorizontal;
- this.AddChidren(btnLogoIcon);
- //Hdl Home
+ this.AddChidren(btnLogoIcon);
+ //Hdl Home
var btnLogoName = new NormalViewControl(300, 69, true);
btnLogoName.Y = btnLogoIcon.Bottom;
btnLogoName.Gravity = Gravity.CenterHorizontal;
btnLogoName.TextID = R.MyInternationalizationString.AppName;
btnLogoName.TextColor = ZigbeeColor.Current.GXCTextWhiteColor;
btnLogoName.TextAlignment = TextAlignment.Center;
- btnLogoName.TextSize = 16;
+ btnLogoName.TextSize = 16;
this.AddChidren(btnLogoName);
//1:鎵嬫満鍙� 2锛氶偖绠�
int selectIndex = account.Contains("@") == false ? 1 : 2;
//鍒濆鍖� 鎵嬫満璐﹀彿鐧婚檰绐楀彛
- var frameAccLoginPhoneback = this.InitAccoutLoginWindow(frameMidBack, selectIndex == 1 ? account : string.Empty, 1);
+ var frameAccLoginPhoneback = this.InitAccoutLoginWindow(frameMidBack, selectIndex == 1 ? account : string.Empty, 1);
//鍒濆鍖� 閭璐﹀彿鐧婚檰绐楀彛
var frameEmailLoginPhoneback = this.InitAccoutLoginWindow(frameMidBack, selectIndex == 1 ? string.Empty : account, 2);
//鍒濆鍖� 鎵嬫満璐﹀彿楠岃瘉鐮佺櫥闄嗙獥鍙�
- var frameAccCodeLoginPhoneback = this.InitCodeLoginWindow(frameMidBack, selectIndex == 1 ? account : string.Empty, 1);
+ var frameAccCodeLoginPhoneback = this.InitCodeLoginWindow(frameMidBack, selectIndex == 1 ? account : string.Empty, 1);
//鍒濆鍖� 閭璐﹀彿楠岃瘉鐮佺櫥闄嗙獥鍙�
- var frameEmailCodeLoginPhoneback = this.InitCodeLoginWindow(frameMidBack, selectIndex == 1 ? string.Empty : account, 2);
-
- //瀹氫箟杩欎袱涓笢瑗�,鏄负浜嗗噺灏戝垽鏂殑浠ｇ爜
- var framePhone = frameAccLoginPhoneback;
- var frameEmail = frameEmailLoginPhoneback;
-
- //閭,鎵嬫満鍙风殑鍒囨崲鎺т欢
- var sitchControl = new Controls.PhoneEmailSelectControl();
- sitchControl.Y = Application.GetRealHeight(559);
- this.AddChidren(sitchControl);
+ var frameEmailCodeLoginPhoneback = this.InitCodeLoginWindow(frameMidBack, selectIndex == 1 ? string.Empty : account, 2);
+
+ //瀹氫箟杩欎袱涓笢瑗�,鏄负浜嗗噺灏戝垽鏂殑浠ｇ爜
+ var framePhone = frameAccLoginPhoneback;
+ var frameEmail = frameEmailLoginPhoneback;
+
+ //閭,鎵嬫満鍙风殑鍒囨崲鎺т欢
+ var sitchControl = new Controls.PhoneEmailSelectControl();
+ sitchControl.Y = Application.GetRealHeight(559);
+ this.AddChidren(sitchControl);
sitchControl.SelectMenuEvent += (selectMenu) =>
{
selectIndex = selectMenu;
@@ -102,26 +102,26 @@
framePhone.Visible = false;
frameEmail.Visible = true;
}
- };
- //鎵ц鍒濆鍖�
- sitchControl.InitControl(ZigbeeColor.Current.GXCButtonSelectedColor, selectIndex);
-
- //閿欒鎻愮ず鎺т欢
- this.btnErrorMsg = new NormalViewControl(700, 60, true);
- btnErrorMsg.Y = frameAccLoginPhoneback.Y - Application.GetRealHeight(60 + 3);
- btnErrorMsg.X = Application.GetRealWidth(288);
- btnErrorMsg.TextColor = ZigbeeColor.Current.GXCTextRed;
- btnErrorMsg.IsBold = true;
+ };
+ //鎵ц鍒濆鍖�
+ sitchControl.InitControl(ZigbeeColor.Current.GXCButtonSelectedColor, selectIndex);
+
+ //閿欒鎻愮ず鎺т欢
+ this.btnErrorMsg = new NormalViewControl(700, 60, true);
+ btnErrorMsg.Y = frameAccLoginPhoneback.Y - Application.GetRealHeight(60 + 3);
+ btnErrorMsg.X = Application.GetRealWidth(288);
+ btnErrorMsg.TextColor = ZigbeeColor.Current.GXCTextRed;
+ btnErrorMsg.IsBold = true;
frameMidBack.AddChidren(btnErrorMsg);
//楠岃瘉鐮佺櫥闄�
//1:璐﹀彿鐧婚檰 2:楠岃瘉鐮佺櫥闄�
int codeDiv = 1;
- var btnLoginByCode = new NormalViewControl(300, 100, true);
+ var btnLoginByCode = new NormalViewControl(300, 100, true);
btnLoginByCode.X = Application.GetRealWidth(98);
- btnLoginByCode.Y = frameAccLoginPhoneback.Bottom + Application.GetRealHeight(21);
- btnLoginByCode.TextID = R.MyInternationalizationString.LoginByCode;
- btnLoginByCode.TextColor = UserCenterColor.Current.TextGrayColor3;
+ btnLoginByCode.Y = frameAccLoginPhoneback.Bottom + Application.GetRealHeight(21);
+ btnLoginByCode.TextID = R.MyInternationalizationString.LoginByCode;
+ btnLoginByCode.TextColor = UserCenterColor.Current.TextGrayColor3;
btnLoginByCode.TextSize = 12;
frameMidBack.AddChidren(btnLoginByCode);
btnLoginByCode.ButtonClickEvent += (sender, e) =>
@@ -155,12 +155,12 @@
};
//娉ㄥ唽鐢ㄦ埛
- var btnRegister = new NormalViewControl(300, 100, true);
- btnRegister.Y = btnLoginByCode.Y;
- btnRegister.X = frameMidBack.Width - Application.GetRealWidth(98 + 300);
- btnRegister.TextID = R.MyInternationalizationString.Register;
- btnRegister.TextColor = UserCenterColor.Current.TextGrayColor3;
- btnRegister.TextSize = 12;
+ var btnRegister = new NormalViewControl(300, 100, true);
+ btnRegister.Y = btnLoginByCode.Y;
+ btnRegister.X = frameMidBack.Width - Application.GetRealWidth(98 + 300);
+ btnRegister.TextID = R.MyInternationalizationString.Register;
+ btnRegister.TextColor = UserCenterColor.Current.TextGrayColor3;
+ btnRegister.TextSize = 12;
btnRegister.TextAlignment = TextAlignment.CenterRight;
frameMidBack.AddChidren(btnRegister);
btnRegister.ButtonClickEvent += (sender, e) =>
@@ -171,9 +171,9 @@
};
//寰俊鍥炬爣
- var btnWebChat = new IconViewControl(115);
- btnWebChat.Y = frameMidBack.Height - Application.GetRealHeight(69) - btnWebChat.IconSize;
- btnWebChat.UnSelectedImagePath = "Account/Wechat.png";
+ var btnWebChat = new IconViewControl(115);
+ btnWebChat.Y = frameMidBack.Height - Application.GetRealHeight(69) - btnWebChat.IconSize;
+ btnWebChat.UnSelectedImagePath = "Account/Wechat.png";
btnWebChat.Gravity = Gravity.CenterHorizontal;
frameMidBack.AddChidren(btnWebChat);
btnWebChat.ButtonClickEvent += (sender, e) =>
@@ -189,7 +189,7 @@
var btnTiyan = new NormalViewControl(300, 100, true);
btnTiyan.Y = btnLoginByCode.Y;
btnTiyan.TextAlignment = TextAlignment.Center;
- btnTiyan.TextColor = UserCenterColor.Current.TextGrayColor3;
+ btnTiyan.TextColor = UserCenterColor.Current.TextGrayColor3;
btnTiyan.TextSize = 12;
btnTiyan.Gravity = Gravity.CenterHorizontal;
btnTiyan.Text = "娓稿浣撻獙";
@@ -213,16 +213,16 @@
};
}
- #endregion
+ #endregion
- #region 鈻� 鍒濆鍖栬处鍙风櫥闄嗙獥鍙________________
-
+ #region 鈻� 鍒濆鍖栬处鍙风櫥闄嗙獥鍙________________
+
/// <summary>
/// 鍒濆鍖栬处鍙风櫥闄嗙獥鍙�
/// </summary>
/// <param name="frameMidBack">涓棿娴呰壊鐨勮儗鏅鍣�</param>
/// <param name="i_account">鐧婚檰璐﹀彿</param>
- /// <param name="i_div">1:鎵嬫満鍙� 2:閭</param>
+ /// <param name="i_div">1:鎵嬫満鍙� 2:閭</param>
private FrameLayout InitAccoutLoginWindow(FrameLayout frameMidBack, string i_account, int i_div)
{
//鐧婚檰鎸夐挳
@@ -339,9 +339,9 @@
//闅愯棌鎴栬�呮樉绀哄瘑鐮佺殑鍥炬爣
var btnHiden = new IconViewControl(92);
btnHiden.X = rowPassword.Width - Application.GetRealWidth(46) - btnHiden.IconSize;
- btnHiden.SelectedImagePath = "Account/UnhidePwd.png";
+ btnHiden.SelectedImagePath = "Account/UnhidePwd.png";
btnHiden.UnSelectedImagePath = "Account/HidePwd.png";
- btnHiden.Gravity = Gravity.CenterVertical;
+ btnHiden.Gravity = Gravity.CenterVertical;
rowPassword.AddChidren(btnHiden);
btnHiden.ButtonClickEvent += (sender, e) =>
{
@@ -370,13 +370,13 @@
};
//蹇樿瀵嗙爜?
- var btnForgot = new NormalViewControl(250, 90, true);
- btnForgot.Y = rowPassword.Bottom + Application.GetRealHeight(15);
- btnForgot.X = frameWhiteBack.Width - Application.GetRealWidth(250 + 35);
- btnForgot.TextSize = 12;
- btnForgot.TextColor = UserCenterColor.Current.TextGrayColor3;
- btnForgot.TextAlignment = TextAlignment.CenterRight;
- btnForgot.TextID = R.MyInternationalizationString.ForgotPWD_1;
+ var btnForgot = new NormalViewControl(250, 90, true);
+ btnForgot.Y = rowPassword.Bottom + Application.GetRealHeight(15);
+ btnForgot.X = frameWhiteBack.Width - Application.GetRealWidth(250 + 35);
+ btnForgot.TextSize = 12;
+ btnForgot.TextColor = UserCenterColor.Current.TextGrayColor3;
+ btnForgot.TextAlignment = TextAlignment.CenterRight;
+ btnForgot.TextID = R.MyInternationalizationString.ForgotPWD_1;
frameWhiteBack.AddChidren(btnForgot);
btnForgot.ButtonClickEvent += (sender, e) =>
{
@@ -401,7 +401,7 @@
return frameBack;
}
- #endregion
+ #endregion
#region 鈻� 鍒濆鍖栭獙璇佺爜鐧婚檰绐楀彛_______________
@@ -410,7 +410,7 @@
/// </summary>
/// <param name="frameMidBack">涓棿娴呰壊鐨勮儗鏅鍣�</param>
/// <param name="i_account">鐧婚檰璐﹀彿</param>
- /// <param name="i_div">1:鎵嬫満鍙� 2:閭</param>
+ /// <param name="i_div">1:鎵嬫満鍙� 2:閭</param>
private FrameLayout InitCodeLoginWindow(FrameLayout frameMidBack, string i_account, int i_div)
{
//鐧婚檰鎸夐挳
@@ -542,18 +542,18 @@
txtAccount.TextChangeEventHandler(sender, e);
};
//绔栫嚎
- var btnLine2 = new NormalViewControl(1, Application.GetRealHeight(66), false);
+ var btnLine2 = new NormalViewControl(1, Application.GetRealHeight(66), false);
btnLine2.X = Application.GetRealWidth(611);
btnLine2.Gravity = Gravity.CenterVertical;
btnLine2.BackgroundColor = ZigbeeColor.Current.GXCLineColor;
rowVerCode.AddChidren(btnLine2);
//鑾峰彇楠岃瘉鐮�
- var btnSendCode = new NormalViewControl(250, 70, true);
- btnSendCode.X = btnLine2.Right + Application.GetRealWidth(36);
- btnSendCode.Gravity = Gravity.CenterVertical;
+ var btnSendCode = new NormalViewControl(250, 70, true);
+ btnSendCode.X = btnLine2.Right + Application.GetRealWidth(36);
+ btnSendCode.Gravity = Gravity.CenterVertical;
btnSendCode.TextID = R.MyInternationalizationString.SendVerificationCode;
btnSendCode.TextColor = UserCenterColor.Current.TextGrayColor3;
- btnSendCode.TextAlignment = TextAlignment.Center;
+ btnSendCode.TextAlignment = TextAlignment.Center;
btnSendCode.IsBold = true;
rowVerCode.AddChidren(btnSendCode);
btnSendCode.ButtonClickEvent += async (sender, e) =>
@@ -589,13 +589,13 @@
};
//蹇樿瀵嗙爜?
- var btnForgot = new NormalViewControl(250, 90, true);
- btnForgot.Y = rowVerCode.Bottom + Application.GetRealHeight(15);
- btnForgot.X = frameWhiteBack.Width - Application.GetRealWidth(250 + 35);
- btnForgot.TextSize = 12;
- btnForgot.TextColor = UserCenterColor.Current.TextGrayColor3;
- btnForgot.TextAlignment = TextAlignment.CenterRight;
- btnForgot.TextID = R.MyInternationalizationString.ForgotPWD_1;
+ var btnForgot = new NormalViewControl(250, 90, true);
+ btnForgot.Y = rowVerCode.Bottom + Application.GetRealHeight(15);
+ btnForgot.X = frameWhiteBack.Width - Application.GetRealWidth(250 + 35);
+ btnForgot.TextSize = 12;
+ btnForgot.TextColor = UserCenterColor.Current.TextGrayColor3;
+ btnForgot.TextAlignment = TextAlignment.CenterRight;
+ btnForgot.TextID = R.MyInternationalizationString.ForgotPWD_1;
frameWhiteBack.AddChidren(btnForgot);
btnForgot.ButtonClickEvent += (sender, e) =>
{
@@ -619,7 +619,7 @@
return frameBack;
}
- #endregion
+ #endregion
#region 鈻� 鏈嶅姟鍗忚___________________________
@@ -630,7 +630,7 @@
private void AddServiceAgreementControl(FrameLayout frameBack)
{
var frameRow = new FrameLayout();
- frameRow.Height = Application.GetMinRealAverage(110);
+ frameRow.Height = this.GetPictrueRealSize(110);
frameRow.Y = Application.GetRealHeight(959);
frameRow.Gravity = Gravity.CenterHorizontal;
@@ -708,7 +708,7 @@
btnIcon.SelectedImagePath = "Item/Check1Selected.png";
//璁＄畻琛屾帶浠剁殑瀹藉害
- frameRow.Width = fontWidth + Application.GetMinRealAverage(42) + Application.GetRealWidth(23) - speceilValue * 3;
+ frameRow.Width = fontWidth + this.GetPictrueRealSize(42) + Application.GetRealWidth(23) - speceilValue * 3;
frameBack.AddChidren(frameRow);
//鍥炬爣鎺т欢鍒濆鍖�
@@ -737,14 +737,14 @@
#endregion
- #region 鈻� 璐﹀彿瀵嗙爜鐧婚檰_______________________
+ #region 鈻� 璐﹀彿瀵嗙爜鐧婚檰_______________________
/// <summary>
/// 璐﹀彿瀵嗙爜鐧婚檰
/// </summary>
/// <param name="i_account">璐﹀彿</param>
- /// <param name="i_psw">瀵嗙爜</param>
- /// <param name="i_div">1:鎵嬫満鍙� 2:閭</param>
+ /// <param name="i_psw">瀵嗙爜</param>
+ /// <param name="i_div">1:鎵嬫満鍙� 2:閭</param>
private void LoginByAccountAndPsw(string i_account, string i_psw, int i_div)
{
//妫�娴嬭处鍙�
@@ -774,59 +774,59 @@
});
}
- /// <summary>
- /// 妫�娴嬭緭鍏ョ殑璐﹀彿
- /// </summary>
- /// <param name="i_areaCode">鍦板尯鐮�</param>
- /// <param name="i_account">璐﹀彿</param>
- /// <param name="i_div">1:鎵嬫満鍙� 2:閭</param>
- /// <returns></returns>
- private bool CheckInputAccount(string i_areaCode, string i_account, int i_div)
- {
+ /// <summary>
+ /// 妫�娴嬭緭鍏ョ殑璐﹀彿
+ /// </summary>
+ /// <param name="i_areaCode">鍦板尯鐮�</param>
+ /// <param name="i_account">璐﹀彿</param>
+ /// <param name="i_div">1:鎵嬫満鍙� 2:閭</param>
+ /// <returns></returns>
+ private bool CheckInputAccount(string i_areaCode, string i_account, int i_div)
+ {
if (i_div == 1)
{
//妫�娴嬫墜鏈�
- if (i_areaCode != string.Empty && AccountLogic.Instance.CheckPhoneWithZone(i_account, i_areaCode) == false)
- {
- btnErrorMsg.TextID = R.MyInternationalizationString.ThePhoneError;
- return false;
+ if (i_areaCode != string.Empty && AccountLogic.Instance.CheckPhoneWithZone(i_account, i_areaCode) == false)
+ {
+ btnErrorMsg.TextID = R.MyInternationalizationString.ThePhoneError;
+ return false;
}
//妫�娴嬫墜鏈�
- if (i_areaCode == string.Empty && AccountLogic.Instance.CheckPhone(i_account) == false)
- {
- btnErrorMsg.TextID = R.MyInternationalizationString.ThePhoneError;
- return false;
+ if (i_areaCode == string.Empty && AccountLogic.Instance.CheckPhone(i_account) == false)
+ {
+ btnErrorMsg.TextID = R.MyInternationalizationString.ThePhoneError;
+ return false;
}
- }
- else
+ }
+ else
{
//妫�娴嬮偖绠�
- if (AccountLogic.Instance.CheckEmail(i_account) == false)
- {
- btnErrorMsg.TextID = R.MyInternationalizationString.TheEmailError;
- return false;
+ if (AccountLogic.Instance.CheckEmail(i_account) == false)
+ {
+ btnErrorMsg.TextID = R.MyInternationalizationString.TheEmailError;
+ return false;
}
- }
- return true;
+ }
+ return true;
}
- #endregion
+ #endregion
- #region 鈻� 寰俊鐧婚檰___________________________
+ #region 鈻� 寰俊鐧婚檰___________________________
- /// <summary>
- /// 寰俊鐧诲綍
- /// </summary>
- private void LoginByWechat()
+ /// <summary>
+ /// 寰俊鐧诲綍
+ /// </summary>
+ private void LoginByWechat()
{
#if Android
com.hdl.home.Application.WXLogin();
com.hdl.home.WXEntryActivity.RespAction = (authStr) =>
{
#endif
-#if iOS
+#if iOS
Home.IOS.AppDelegate.WXLogin();
- Home.IOS.AppDelegate.RespAction = (authStr) =>
+ Home.IOS.AppDelegate.RespAction = (authStr) =>
{
#endif
if (authStr == null)
@@ -873,19 +873,19 @@
};
}
- /// <summary>
- /// 鏄惁宸茬粦瀹�
- /// </summary>
- /// <param name="authStr"></param>
- /// <returns></returns>
- private async System.Threading.Tasks.Task<bool> isBindAuthAsync(string authStr)
- {
- var authRes = Newtonsoft.Json.JsonConvert.DeserializeObject<Common.ResponseEntity.AuthUserRes>(authStr);
- var auth = new SendDataToServer.AuthUser()
- {
- AccessToken = authRes.access_token,
- RefreshToken = authRes.refresh_token,
- OpenID = authRes.openid
+ /// <summary>
+ /// 鏄惁宸茬粦瀹�
+ /// </summary>
+ /// <param name="authStr"></param>
+ /// <returns></returns>
+ private async System.Threading.Tasks.Task<bool> isBindAuthAsync(string authStr)
+ {
+ var authRes = Newtonsoft.Json.JsonConvert.DeserializeObject<Common.ResponseEntity.AuthUserRes>(authStr);
+ var auth = new SendDataToServer.AuthUser()
+ {
+ AccessToken = authRes.access_token,
+ RefreshToken = authRes.refresh_token,
+ OpenID = authRes.openid
};
//鑾峰彇寰俊鏄电О
var strUrl = "https://api.weixin.qq.com/sns/userinfo?access_token=" + authRes.access_token;
@@ -897,44 +897,44 @@
}
var receipData = System.Text.Encoding.UTF8.GetString(byteData);
var nickData = Newtonsoft.Json.JsonConvert.DeserializeObject<UserCenter.NicknameInfo>(receipData);
- auth.UserName = nickData.nickname;
-
- var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(auth);
- var revertObj = await CommonPage.Instance.RequestHttpsZigbeeAsync("ZigbeeUsers/InsertOrUpdateAuthUser", System.Text.Encoding.UTF8.GetBytes(requestJson));
- if (revertObj == null)
- {
- return false;
- }
- var stateCodeStr = revertObj.StateCode.ToUpper();
- if (stateCodeStr == "SUCCESS")
- {
- var responseDataObj = Newtonsoft.Json.JsonConvert.DeserializeObject<Shared.Common.ResponseEntity.UserLoginRes>(revertObj.ResponseData.ToString());
+ auth.UserName = nickData.nickname;
+
+ var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(auth);
+ var revertObj = await CommonPage.Instance.RequestHttpsZigbeeAsync("ZigbeeUsers/InsertOrUpdateAuthUser", System.Text.Encoding.UTF8.GetBytes(requestJson));
+ if (revertObj == null)
+ {
+ return false;
+ }
+ var stateCodeStr = revertObj.StateCode.ToUpper();
+ if (stateCodeStr == "SUCCESS")
+ {
+ var responseDataObj = Newtonsoft.Json.JsonConvert.DeserializeObject<Shared.Common.ResponseEntity.UserLoginRes>(revertObj.ResponseData.ToString());
var revertData = responseDataObj;
//鏍囪涓婁竴娆℃槸涓嶆槸鍚屼竴涓处鍙风櫥闄�
- UserCenter.UserCenterResourse.ResidenceOption.TheSameLoginAccount = Config.Instance.Guid == revertData.Guid;
- Config.Instance.Account = revertData.Account;
- Config.Instance.MD5PWD = revertData.MD5PWD;
- Config.Instance.Guid = revertData.Guid;
- Config.Instance.LoginDateTime = DateTime.Now;
- Config.Instance.Save();
- return true;
- }
- else
- {
- return false;
- }
+ UserCenter.UserCenterResourse.ResidenceOption.TheSameLoginAccount = Config.Instance.Guid == revertData.Guid;
+ Config.Instance.Account = revertData.Account;
+ Config.Instance.MD5PWD = revertData.MD5PWD;
+ Config.Instance.Guid = revertData.Guid;
+ Config.Instance.LoginDateTime = DateTime.Now;
+ Config.Instance.Save();
+ return true;
+ }
+ else
+ {
+ return false;
+ }
}
- #endregion
+ #endregion
- #region 鈻� 楠岃瘉鐮佺櫥闄哶________________________
+ #region 鈻� 楠岃瘉鐮佺櫥闄哶________________________
/// <summary>
/// 楠岃瘉鐮佺櫥闄�
/// </summary>
/// <param name="i_account">璐﹀彿</param>
- /// <param name="i_verCode">楠岃瘉鐮�</param>
- /// <param name="i_div">1:鎵嬫満鍙� 2:閭</param>
+ /// <param name="i_verCode">楠岃瘉鐮�</param>
+ /// <param name="i_div">1:鎵嬫満鍙� 2:閭</param>
private async void LoginByVerCode(string i_account, string i_verCode, int i_div)
{
var pra = new SendDataToServer.LoginValidCodeOBJ()
@@ -947,15 +947,15 @@
var result = await CommonFormResouce.LoginByCode(pra);
//澶勭悊鐧婚檰鎴愬姛鐨勬暟鎹�
this.AdjustLoginSuccessData(result, pra, i_account, string.Empty, i_div);
- }
-
+ }
+
/// <summary>
/// 鍙戦�侀獙璇佺爜
/// </summary>
/// <param name="btnSendCode">鍙戦�佹寜閽�</param>
/// <param name="account">璐﹀彿</param>
/// <param name="i_div">1:鎵嬫満鍙� 2:閭</param>
- /// <returns></returns>
+ /// <returns></returns>
private async System.Threading.Tasks.Task<bool> SendVerCode(NormalViewControl btnSendCode, string account, int i_div)
{
//涓嶈兘鍐嶇偣鍑�
@@ -1027,12 +1027,12 @@
});
return false;
- }
-
+ }
+
/// <summary>
/// 寮�鍚彂閫侀獙璇佺爜鐨勫�掕鏃�
/// </summary>
- /// <param name="btnSendCode"></param>
+ /// <param name="btnSendCode"></param>
private void StartSendVerCodeTimeOutThread(NormalViewControl btnSendCode)
{
HdlThreadLogic.Current.RunThread(() =>
@@ -1059,9 +1059,9 @@
});
}
- #endregion
+ #endregion
- #region 鈻� 澶勭悊鐧婚檰鎴愬姛鐨勬暟鎹甠________________
+ #region 鈻� 澶勭悊鐧婚檰鎴愬姛鐨勬暟鎹甠________________
/// <summary>
/// 澶勭悊鐧婚檰鎴愬姛鐨勬暟鎹�
@@ -1069,8 +1069,8 @@
/// <param name="revertObj">浜戠杩斿洖鐨勬暟鎹�</param>
/// <param name="pra">鎺ュ彛璇锋眰鍙傛暟</param>
/// <param name="i_account">璐﹀彿</param>
- /// <param name="i_psw">瀵嗙爜锛岄獙璇佺爜鐧婚檰鏃�,璁剧疆涓� string.Empty</param>
- /// <param name="i_div">1:鎵嬫満鍙� 2:閭</param>
+ /// <param name="i_psw">瀵嗙爜锛岄獙璇佺爜鐧婚檰鏃�,璁剧疆涓� string.Empty</param>
+ /// <param name="i_div">1:鎵嬫満鍙� 2:閭</param>
private async void AdjustLoginSuccessData(Common.ResponseEntity.ResponsePack revertObj, object pra,
string i_account, string i_psw, int i_div)
{
@@ -1137,15 +1137,15 @@
//璇ョ敤鎴峰睘浜庤皟璇曡处鍙凤紝骞舵湭鍚敤
btnErrorMsg.TextID = R.MyInternationalizationString.NOTENABLE;
}
- else if (stateCodeStr == "PARAMETEROREMPTY")
- {
- //鎻愪緵鐨勫弬鏁伴敊璇�
- btnErrorMsg.TextID = R.MyInternationalizationString.PARAMETEROREMPTY;
+ else if (stateCodeStr == "PARAMETEROREMPTY")
+ {
+ //鎻愪緵鐨勫弬鏁伴敊璇�
+ btnErrorMsg.TextID = R.MyInternationalizationString.PARAMETEROREMPTY;
}
- else if (stateCodeStr == "VALIDCODEANDPHONENOEQUAL")
- {
- //楠岃瘉鐮侀敊璇紝璇烽噸鏂拌緭鍏�
- btnErrorMsg.TextID = R.MyInternationalizationString.VALIDCODEANDPHONENOEQUAL;
+ else if (stateCodeStr == "VALIDCODEANDPHONENOEQUAL")
+ {
+ //楠岃瘉鐮侀敊璇紝璇烽噸鏂拌緭鍏�
+ btnErrorMsg.TextID = R.MyInternationalizationString.VALIDCODEANDPHONENOEQUAL;
}
else if (stateCodeStr == "USERNAMEORPWDERROR")
{
@@ -1157,10 +1157,10 @@
//璐﹀彿涓嶅瓨鍦�
btnErrorMsg.TextID = R.MyInternationalizationString.ACCOUNTNOEXISTS;
}
- else if (stateCodeStr == "NORECORD" && i_psw == string.Empty)
- {
- //璇峰厛鑾峰彇楠岃瘉鐮�
- btnErrorMsg.TextID = R.MyInternationalizationString.NORECORD;
+ else if (stateCodeStr == "NORECORD" && i_psw == string.Empty)
+ {
+ //璇峰厛鑾峰彇楠岃瘉鐮�
+ btnErrorMsg.TextID = R.MyInternationalizationString.NORECORD;
}
else if (stateCodeStr == "YOUDATANOISLOCALREGION")
{
@@ -1190,14 +1190,14 @@
});
}
- #endregion
+ #endregion
- #region 鈻� 涓�鑸柟娉昣__________________________
-
+ #region 鈻� 涓�鑸柟娉昣__________________________
+
/// <summary>
/// 妫�娴嬮殣绉佸崗璁�
/// </summary>
- /// <returns></returns>
+ /// <returns></returns>
private bool CheckPrivacyPolicy()
{
if (isAgreePrivacyPolicy == false)
@@ -1208,8 +1208,8 @@
return false;
}
return true;
- }
-
- #endregion
- }
-}
+ }
+
+ #endregion
+ }
+}
--
Gitblit v1.8.0