From 273bd8b4fb918a4303207215b2b8369fbc275000 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 08 十二月 2020 18:58:44 +0800
Subject: [PATCH] Merge branch 'CJL-NEW'
---
HDL_ON/UI/UI1-Login/RegisterPage.cs | 241 +++++++++++++++++++++++++----------------------
1 files changed, 129 insertions(+), 112 deletions(-)
diff --git a/HDL_ON/UI/UI1-Login/RegisterPage.cs b/HDL_ON/UI/UI1-Login/RegisterPage.cs
index 6cdac76..eb9b2f2 100644
--- a/HDL_ON/UI/UI1-Login/RegisterPage.cs
+++ b/HDL_ON/UI/UI1-Login/RegisterPage.cs
@@ -206,8 +206,22 @@
string registerPhone;
string registerEmail;
#endregion
- public RegisterPage()
+
+ /// <summary>
+ /// 鍥炶皟浜嬩欢
+ /// 璐﹀彿锛屽瘑鐮侊紝鏄惁鎵嬫満
+ /// account锛宲assword锛宨sPhone
+ /// </summary>
+ Action<string, string, bool> AutoLoginAction;
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="autoLoginAction">娉ㄥ唽鎴愬姛鍥炶皟浜嬩欢</param>
+ public RegisterPage(Action<string, string, bool> autoLoginAction)
{
+ AutoLoginAction = autoLoginAction;
+
bodyView = new FrameLayout()
{
BackgroundColor = CSS_Color.MainBackgroundColor,
@@ -709,127 +723,130 @@
Thread.Sleep(1500);
Application.RunOnMainThread(() =>
{
- //鍒涘缓鐧诲綍绾跨▼
- var loginThread = LoadThread_Login(account, password);
- waitPage = new Loading();
- new PublicAssmebly().LoadPage_WaitPage(loginThread, bodyView, waitPage);
+ ////鍒涘缓鐧诲綍绾跨▼
+ //var loginThread = LoadThread_Login(account, password);
+ //waitPage = new Loading();
+ //new PublicAssmebly().LoadPage_WaitPage(loginThread, bodyView, waitPage);
dialog.Close();
+
+ var isPhone = registerType == 0;
+ AutoLoginAction?.Invoke(account, password, isPhone);
});
})
{ IsBackground = true }.Start();
}
- #region 鐧诲綍绾跨▼閮ㄥ垎
- /// <summary>
- /// 鍔犺浇鐧诲綍绾跨▼
- /// </summary>
- Thread LoadThread_Login(string account,string password)
- {
- var loginThread = new Thread(() =>
- {
- try
- {
- //鐧诲綍
- var loginResult = LoadMethod_Login(account,password);
- if (loginResult)
- {
- //鑾峰彇浣忓畢淇℃伅
- var getResidencesResult = LoadMethod_GetResidences();
- if (getResidencesResult)
- {
- /*
- * Wait : 鎺ㄩ�佹敞鍐�
- */
+ //#region 鐧诲綍绾跨▼閮ㄥ垎
+ ///// <summary>
+ ///// 鍔犺浇鐧诲綍绾跨▼
+ ///// </summary>
+ //Thread LoadThread_Login(string account,string password)
+ //{
+ // var loginThread = new Thread(() =>
+ // {
+ // try
+ // {
+ // //鐧诲綍
+ // var loginResult = LoadMethod_Login(account,password);
+ // if (loginResult)
+ // {
+ // //鑾峰彇浣忓畢淇℃伅
+ // var getResidencesResult = LoadMethod_GetResidences();
+ // if (getResidencesResult)
+ // {
+ // /*
+ // * Wait : 鎺ㄩ�佹敞鍐�
+ // */
- Application.RunOnMainThread(() =>
- {
- waitPage.RemoveFromParent();
- waitPage = null;
+ // Application.RunOnMainThread(() =>
+ // {
+ // waitPage.RemoveFromParent();
+ // waitPage = null;
- //璺宠浆椤甸潰----
- MainPage.GoUserPage();
- });
- }
- }
- }
- catch (Exception ex)
- {
- MainPage.Log($"LoginPage : {ex.Message}");
- }
- })
- { IsBackground = true };
- return loginThread;
- }
+ // //璺宠浆椤甸潰----
+ // MainPage.GoUserPage();
+ // });
+ // }
+ // }
+ // }
+ // catch (Exception ex)
+ // {
+ // MainPage.Log($"LoginPage : {ex.Message}");
+ // }
+ // })
+ // { IsBackground = true };
+ // return loginThread;
+ //}
- /// <summary>
- /// 璋冪敤鐧诲綍鎺ュ彛鐧诲綍
- /// </summary>
- bool LoadMethod_Login(string account, string password)
- {
- var result = false;
- //璋冪敤鐧诲綍鎺ュ彛
- var loginResult = pm.LoginByPassword(account, password);
- if (loginResult.Code == StateCode.SUCCESS)
- {
- var revertData = Newtonsoft.Json.JsonConvert.DeserializeObject<UserLoginRes>(loginResult.Data.ToString());
- // UserInfo.Current = new UserInfo
- //{
- // userType = revertData.userType,
- // accountString = account,
- // password = password,
- // lastTime = DateTime.Now,
- // ID = revertData.userId,
- // loginTokenString = revertData.headerPrefix + revertData.accessToken,
- // refreshToken = revertData.refreshToken,
- // userName = revertData.name
- //};
- UserInfo.Current.userType = revertData.userType;
- UserInfo.Current.AccountString = account;
- //UserInfo.Current.password = password;
- UserInfo.Current.LastTime = DateTime.Now;
- UserInfo.Current.ID = revertData.userId;
- UserInfo.Current.LoginTokenString = revertData.headerPrefix + revertData.accessToken;
- UserInfo.Current.RefreshToken = revertData.refreshToken;
- UserInfo.Current.userName = revertData.name;
+ ///// <summary>
+ ///// 璋冪敤鐧诲綍鎺ュ彛鐧诲綍
+ ///// </summary>
+ //bool LoadMethod_Login(string account, string password)
+ //{
+ // var result = false;
+ // //璋冪敤鐧诲綍鎺ュ彛
+ // var loginResult = pm.LoginByPassword(account, password);
+ // if (loginResult.Code == StateCode.SUCCESS)
+ // {
+ // var revertData = Newtonsoft.Json.JsonConvert.DeserializeObject<UserLoginRes>(loginResult.Data.ToString());
+ // // UserInfo.Current = new UserInfo
+ // //{
+ // // userType = revertData.userType,
+ // // accountString = account,
+ // // password = password,
+ // // lastTime = DateTime.Now,
+ // // ID = revertData.userId,
+ // // loginTokenString = revertData.headerPrefix + revertData.accessToken,
+ // // refreshToken = revertData.refreshToken,
+ // // userName = revertData.name
+ // //};
+ // UserInfo.Current.userType = revertData.userType;
+ // UserInfo.Current.AccountString = account;
+ // //UserInfo.Current.password = password;
+ // UserInfo.Current.LastTime = DateTime.Now;
+ // UserInfo.Current.ID = revertData.userId;
+ // UserInfo.Current.LoginTokenString = revertData.headerPrefix + revertData.accessToken;
+ // UserInfo.Current.RefreshToken = revertData.refreshToken;
+ // UserInfo.Current.userName = revertData.name;
- UserInfo.Current.SaveUserInfo();
- MainPage.Log("鐧诲綍鎴愬姛銆�");
- result = true;
- }
- else
- {
- //鐧诲綍澶辫触
- IMessageCommon.Current.ShowErrorInfoAlter(loginResult.Code);
- Application.RunOnMainThread(() =>
- {
- btnPasswordViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2;
- btnPasswordViewBottomLine.Height = Application.GetRealHeight(2);
- });
- }
- return result;
- }
+ // UserInfo.Current.SaveUserInfo();
+ // MainPage.Log("鐧诲綍鎴愬姛銆�");
+ // result = true;
+ // }
+ // else
+ // {
+ // //鐧诲綍澶辫触
+ // IMessageCommon.Current.ShowErrorInfoAlter(loginResult.Code);
+ // Application.RunOnMainThread(() =>
+ // {
+ // btnPasswordViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2;
+ // btnPasswordViewBottomLine.Height = Application.GetRealHeight(2);
+ // });
+ // }
+ // return result;
+ //}
- /// <summary>
- /// 鑾峰彇浣忓畢鍒楄〃
- /// </summary>
- bool LoadMethod_GetResidences()
- {
- var result = false;
- var responsePack = pm.GetHomePager();
- if (responsePack == StateCode.SUCCESS)
- {
- //2020-11-13 寰呯‘璁わ紝娌℃湁浣忓畢锛屼笉绠楃櫥褰曟垚鍔�
- if (UserInfo.Current.regionList != null && UserInfo.Current.regionList.Count > 0)
- {
- result = true;
- }
- }
- else
- {
- IMessageCommon.Current.ShowErrorInfoAlter(responsePack);
- }
- return result;
- }
- #endregion
+ ///// <summary>
+ ///// 鑾峰彇浣忓畢鍒楄〃
+ ///// </summary>
+ //bool LoadMethod_GetResidences()
+ //{
+ // var result = false;
+ // var responsePack = pm.GetHomePager();
+ // if (responsePack == StateCode.SUCCESS)
+ // {
+ // //2020-11-13 寰呯‘璁わ紝娌℃湁浣忓畢锛屼笉绠楃櫥褰曟垚鍔�
+ // if (UserInfo.Current.regionList != null && UserInfo.Current.regionList.Count > 0)
+ // {
+ // result = true;
+ // }
+ // }
+ // else
+ // {
+ // IMessageCommon.Current.ShowErrorInfoAlter(responsePack);
+ // }
+ // return result;
+ //}
+ //#endregion
}
}
\ No newline at end of file
--
Gitblit v1.8.0