From ac334861efbf06933e95c62ced0484410f34bece Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期五, 29 十一月 2019 18:00:32 +0800
Subject: [PATCH] 2019.11.29
---
ZigbeeApp/Shared/Phone/Device/Account/AccountLogin.cs | 110 ++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 77 insertions(+), 33 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Account/AccountLogin.cs b/ZigbeeApp/Shared/Phone/Device/Account/AccountLogin.cs
index 745be0e..60bcdc4 100644
--- a/ZigbeeApp/Shared/Phone/Device/Account/AccountLogin.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Account/AccountLogin.cs
@@ -1,14 +1,7 @@
锘縰sing System;
-using System.Collections.Generic;
-using System.Net;
-using System.Text;
-using uPLibrary.Networking.M2Mqtt;
using Shared.Common;
-using Shared.IO;
using Shared.Phone.UserView;
-using System.Net.Http;
using Shared.Phone.Device.CommonForm;
-using Com.Tencent.MM.Sdk.Openapi;
namespace Shared.Phone.Device.Account
{
@@ -90,6 +83,7 @@
/// </summary>
public AccountLogin()
{
+ CommonPage.Instance.IsDrawerLockMode = true;
BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor;
Tag = "Login";
}
@@ -268,7 +262,8 @@
Y = Application.GetRealHeight(1737),
Width = Application.GetMinRealAverage(115),
Height = Application.GetMinRealAverage(115),
- UnSelectedImagePath = "Account/Wechat.png"
+ UnSelectedImagePath = "Account/Wechat.png",
+ Gravity=Gravity.CenterHorizontal
};
midFrameLayout.AddChidren(wechatBtn);
@@ -280,7 +275,7 @@
Height = Application.GetMinRealAverage(115),
UnSelectedImagePath = "Account/QQ.png"
};
- midFrameLayout.AddChidren(qqBtn);
+ //midFrameLayout.AddChidren(qqBtn);
#endregion
@@ -330,7 +325,7 @@
}
else
{
- Login(phoneRow.AccountET.Text.Trim(), pwdRow.PasswrodET.Text.Trim());
+ Login(emailRow.AccountET.Text.Trim(), pwdRow.PasswrodET.Text.Trim());
}
}
@@ -373,9 +368,8 @@
{
return;
}
- this.RemoveFromParent();
- UserPage.Instance.Fresh();
+ HomePage.Instance.ShowLoginLoadView();
new System.Threading.Thread(async () =>
{
@@ -404,12 +398,13 @@
var homes = await House.GetHomeLists();
//鍒锋柊涓汉涓績鐨勫唴瀛樺強绾跨▼
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("Login");
+ UserPage.Instance.Fresh();
});
})
{ IsBackground = true }.Start();
@@ -492,8 +487,70 @@
private void LoginByWechat(object sender, MouseEventArgs mouseEventArgs)
{
#if Android
- com.hdl.home.Application.WXLogin();
- com.hdl.home.WXEntryActivity.RespAction = (authStr) =>
+ //var alert = new Alert(Language.StringByID(R.MyInternationalizationString.TIP),
+ // Language.StringByID(R.MyInternationalizationString.LoginByWechat),
+ // Language.StringByID(R.MyInternationalizationString.Cancel),
+ // Language.StringByID(R.MyInternationalizationString.Confrim));
+ //alert.Show();
+ //alert.ResultEventHandler += (send, e) =>
+ //{
+ //if (e)
+ //{
+ com.hdl.home.Application.WXLogin();
+ com.hdl.home.WXEntryActivity.RespAction = (authStr) =>
+ {
+ if (authStr == null)
+ {
+
+ }
+ else
+ {
+ new System.Threading.Thread(async () =>
+ {
+ var re = await isBindAuthAsync(authStr);
+ if (re)
+ {
+ //鐩存帴鐧诲綍
+ Application.RunOnMainThread(() =>
+ {
+ HomePage.Instance.ShowLoginLoadView();
+ });
+ //鍚姩ZigBee
+ ZigBee.Common.Application.Init();
+ var resultRegID = await Shared.Common.CommonPage.Instance.PushRegID();
+ var homes = await House.GetHomeLists();
+ //鍒锋柊涓汉涓績鐨勫唴瀛樺強绾跨▼
+ await UserCenter.UserCenterLogic.InitUserCenterMenmoryAndThread();
+ Shared.Common.Room.InitAllRoom();
+ Application.RunOnMainThread(() =>
+ {
+ this.RemoveFromParent();
+ CommonPage.Instance.RemoveViewByTag("Login");
+ UserPage.Instance.Fresh();
+ });
+ }
+ else
+ {
+ var authRes = Newtonsoft.Json.JsonConvert.DeserializeObject<Common.ResponseEntity.AuthUserRes>(authStr);
+ Application.RunOnMainThread(() =>
+ {
+ var registerPage = new AccountRegister();
+ Shared.Common.CommonPage.Instance.AddChidren(registerPage);
+ registerPage.OpenID = authRes.openid;
+ registerPage.Show();
+ });
+ }
+ })
+ { IsBackground = true }.Start();
+ }
+ };
+ //}
+ //};
+#endif
+
+#if iOS
+ GateWay.Ios.AppDelegate.WXLogin();
+ GateWay.Ios.AppDelegate.RespAction = (authStr) =>
{
if (authStr == null)
{
@@ -505,7 +562,7 @@
{
var re = await isBindAuthAsync(authStr);
- if(re)
+ if (re)
{
//鐩存帴鐧诲綍
//this.RemoveFromParent();
@@ -517,7 +574,6 @@
var homes = await House.GetHomeLists();
//鍒锋柊涓汉涓績鐨勫唴瀛樺強绾跨▼
await UserCenter.UserCenterLogic.InitUserCenterMenmoryAndThread();
- Shared.Common.Room.CanInitAllRoom = true;
Shared.Common.Room.InitAllRoom();
Application.RunOnMainThread(() =>
{
@@ -527,21 +583,6 @@
}
else
{
- //var authRes = Newtonsoft.Json.JsonConvert.DeserializeObject<Common.ResponseEntity.AuthUserRes>(authStr);
- //new System.Threading.Thread(async () =>
- //{
- // var auth = new SendDataToServer.BindAuthUser
- // {
- // AccountGuid = "5573cd78-31fc-4fd7-a25a-5c3b19bdbcfe",
- // OpenID = authRes.openid
- // };
- // var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(auth);
- // var revert = await CommonPage.Instance.RequestHttpsZigbeeAsync("ZigbeeUsers/BindAuthUserToAccount", Encoding.UTF8.GetBytes(requestJson));
- //})
- //{
- // IsBackground = true
- //}.Start();
-
var authRes = Newtonsoft.Json.JsonConvert.DeserializeObject<Common.ResponseEntity.AuthUserRes>(authStr);
Application.RunOnMainThread(() =>
{
@@ -556,6 +597,9 @@
}
};
#endif
+
+
+
}
/// <summary>
--
Gitblit v1.8.0