From a7adf98ff4ac801342853b1f9231cc1ab5acebf3 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期四, 14 十一月 2019 17:25:42 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into DEV_GXC
---
ZigbeeApp/Shared/Phone/Device/Account/AccountLogin.cs | 106 ++++++++++++++++++++++++-----------------------------
1 files changed, 48 insertions(+), 58 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Account/AccountLogin.cs b/ZigbeeApp/Shared/Phone/Device/Account/AccountLogin.cs
index 745be0e..a7280e5 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
{
@@ -492,70 +485,67 @@
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 (authStr == null)
+ if (e)
{
-
- }
- else
- {
- new System.Threading.Thread(async () =>
+ com.hdl.home.Application.WXLogin();
+ com.hdl.home.WXEntryActivity.RespAction = (authStr) =>
{
-
- var re = await isBindAuthAsync(authStr);
- if(re)
+ if (authStr == null)
{
- //鐩存帴鐧诲綍
- //this.RemoveFromParent();
- //UserPage.Instance.Fresh();
- //鍚姩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.CanInitAllRoom = true;
- Shared.Common.Room.InitAllRoom();
- Application.RunOnMainThread(() =>
- {
- this.RemoveFromParent();
- UserPage.Instance.Fresh();
- });
}
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(() =>
+ new System.Threading.Thread(async () =>
{
- var registerPage = new AccountRegister();
- Shared.Common.CommonPage.Instance.AddChidren(registerPage);
- registerPage.OpenID = authRes.openid;
- registerPage.Show();
- });
+
+ var re = await isBindAuthAsync(authStr);
+ if (re)
+ {
+ //鐩存帴鐧诲綍
+ //this.RemoveFromParent();
+
+ //UserPage.Instance.Fresh();
+ //鍚姩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.CanInitAllRoom = true;
+ Shared.Common.Room.InitAllRoom();
+ Application.RunOnMainThread(() =>
+ {
+ this.RemoveFromParent();
+ 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();
}
- })
- { IsBackground = true }.Start();
+ };
}
};
#endif
+
}
/// <summary>
--
Gitblit v1.8.0