同步了全部的代码

黄学彪

2019-11-18 16604a593202f2f87adf71abd57d036fe7da3b52

 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>