From 16604a593202f2f87adf71abd57d036fe7da3b52 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 18 十一月 2019 10:39:42 +0800
Subject: [PATCH] 同步了全部的代码
---
ZigbeeApp/Shared/Phone/Device/Account/AccountLogin.cs | 77 ++++++++++++++++++++++++++++++++------
1 files changed, 65 insertions(+), 12 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Account/AccountLogin.cs b/ZigbeeApp/Shared/Phone/Device/Account/AccountLogin.cs
index a7280e5..c396c94 100755
--- a/ZigbeeApp/Shared/Phone/Device/Account/AccountLogin.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Account/AccountLogin.cs
@@ -261,7 +261,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);
@@ -273,7 +274,7 @@
Height = Application.GetMinRealAverage(115),
UnSelectedImagePath = "Account/QQ.png"
};
- midFrameLayout.AddChidren(qqBtn);
+ //midFrameLayout.AddChidren(qqBtn);
#endregion
@@ -485,15 +486,15 @@
private void LoginByWechat(object sender, MouseEventArgs mouseEventArgs)
{
#if Android
- 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)
- {
+ //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) =>
{
@@ -505,7 +506,6 @@
{
new System.Threading.Thread(async () =>
{
-
var re = await isBindAuthAsync(authStr);
if (re)
{
@@ -542,10 +542,63 @@
{ IsBackground = true }.Start();
}
};
+ //}
+ //};
+#endif
+
+#if iOS
+ GateWay.Ios.AppDelegate.WXLogin();
+ GateWay.Ios.AppDelegate.RespAction = (authStr) =>
+ {
+ if (authStr == null)
+ {
+
+ }
+ else
+ {
+ new System.Threading.Thread(async () =>
+ {
+
+ 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();
}
};
#endif
+
+
}
/// <summary>
--
Gitblit v1.8.0