gxc
2019-11-04 b7b3e92bed9c4553e30e2901a1877f088a5f8823
ZigbeeApp/Shared/Phone/Device/Account/AccountLogin.cs
@@ -492,70 +492,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>