From 944b87b6bcccb095cd73f13f4410fb20faf48f74 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期三, 25 十二月 2019 11:21:06 +0800
Subject: [PATCH] 2019.12.25
---
ZigbeeApp/Shared/Phone/Device/Account/AccountRegisterSuccess.cs | 53 +++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 39 insertions(+), 14 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Account/AccountRegisterSuccess.cs b/ZigbeeApp/Shared/Phone/Device/Account/AccountRegisterSuccess.cs
old mode 100755
new mode 100644
index d94509b..dba9a55
--- a/ZigbeeApp/Shared/Phone/Device/Account/AccountRegisterSuccess.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Account/AccountRegisterSuccess.cs
@@ -1,4 +1,5 @@
锘縰sing System;
+using System.Text;
using Shared.Common;
using Shared.Phone.UserView;
@@ -11,7 +12,7 @@
/// </summary>
/// <param name="account"></param>
/// <param name="password"></param>
- public void Show(string account, string password)
+ public void Show(string account, string password,string OpenID="")
{
var dialog = new FrameLayout()
{
@@ -85,7 +86,7 @@
};
AddChidren(willLogin);
- AutoLogin(account, password);
+ AutoLogin(account, password,OpenID);
}
/// <summary>
@@ -93,7 +94,7 @@
/// </summary>
/// <param name="account"></param>
/// <param name="password"></param>
- private void AutoLogin(string account, string password)
+ private void AutoLogin(string account, string password, string OpenID = "")
{
new System.Threading.Thread(() =>
{
@@ -102,29 +103,34 @@
{
try
{
- UserPage.Instance.Fresh();
+ HomePage.Instance.ShowLoginLoadView();
+
CommonPage.Loading.Start(Language.StringByID(R.MyInternationalizationString.Logining));
Action action = async () => {
var loginSuccess = await HomePage.Instance.LoginByPWDAsync(account, password);
- if (loginSuccess == 1)
+ if (loginSuccess==1)
{
new System.Threading.Thread(async () =>
{
- ZigBee.Common.Application.Init();
-
+ if (string.IsNullOrEmpty(OpenID)==false)
+ {
+ BindAuthUser(Config.Instance.Guid, OpenID);
+ }
//鐧诲綍鎴愬姛
- var homes = await House.GetHomeLists();
-
+ var homes = await House.GetHomeLists();
+ ZigBee.Common.Application.Init();
//鍒锋柊涓汉涓績鐨勫唴瀛樺強绾跨▼
await UserCenter.UserCenterLogic.InitUserCenterMenmoryAndThread();
- Shared.Common.Room.CanInitAllRoom = true;
Shared.Common.Room.InitAllRoom();
Application.RunOnMainThread(() =>
{
- UserPage.Instance.Fresh();
CommonPage.Loading.Hide();
+ this.RemoveFromParent();
+ CommonPage.Instance.RemoveViewByTag("Register");
+ CommonPage.Instance.RemoveViewByTag("Login");
+ UserPage.Instance.Fresh();
});
})
{ IsBackground = true }.Start();
@@ -149,13 +155,32 @@
finally
{
CommonPage.Loading.Hide();
- this.RemoveFromParent();
- CommonPage.Instance.RemoveViewByTag("Register");
- CommonPage.Instance.RemoveViewByTag("Login");
}
});
})
{ IsBackground = true }.Start();
}
+
+ /// <summary>
+ /// 缁戝畾
+ /// </summary>
+ /// <param name="guid"></param>
+ /// <param name="openId"></param>
+ private void BindAuthUser(string guid, string openId)
+ {
+ new System.Threading.Thread(async () =>
+ {
+ var auth = new SendDataToServer.BindAuthUser
+ {
+ AccountGuid = guid,
+ OpenID = openId
+ };
+ var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(auth);
+ var revert = await CommonPage.Instance.RequestHttpsZigbeeAsync("ZigbeeUsers/BindAuthUserToAccount", Encoding.UTF8.GetBytes(requestJson));
+ })
+ {
+ IsBackground = true
+ }.Start();
+ }
}
}
--
Gitblit v1.8.0