合并了全部的代码

黄学彪

2019-11-04 c7698e163e43cea9e7f8ee45f8e3f91c9265cca4

 ZigbeeApp/Shared/Phone/Device/Account/AccountRegisterSuccess.cs

@@ -1,4 +1,5 @@
using System;
using System.Text;
using Shared.Common;
using Shared.Phone.UserView;

@@ -11,7 +12,7 @@
        /// </summary>
        /// <param name="account"></param>
        /// <param name="password"></param>
        public void Show(string account, string password)
        public void Show(string account, string password,string OpenID="")
        {
            var dialog = new FrameLayout()
            {
@@ -85,7 +86,7 @@
            };
            AddChidren(willLogin);

            AutoLogin(account, password);
            AutoLogin(account, password,OpenID);
        }

        /// <summary>
@@ -93,7 +94,7 @@
        /// </summary>
        /// <param name="account"></param>
        /// <param name="password"></param>
        private void AutoLogin(string account, string password)
        private void AutoLogin(string account, string password, string OpenID = "")
        {
            new System.Threading.Thread(() =>
            {
@@ -106,10 +107,14 @@
                        CommonPage.Loading.Start(Language.StringByID(R.MyInternationalizationString.Logining));
                        Action action = async () => {
                            var loginSuccess = await HomePage.Instance.LoginByPWDAsync(account, password);
                            if (loginSuccess == 1)
                            if (loginSuccess==1)
                            {
                                new System.Threading.Thread(async () =>
                                {
                                    if (string.IsNullOrEmpty(OpenID)==false)
                                    {
                                        BindAuthUser(Config.Instance.Guid, OpenID);
                                    }
                                    ZigBee.Common.Application.Init();

                                    //登录成功
@@ -125,6 +130,9 @@
                                    {
                                        UserPage.Instance.Fresh();
                                        CommonPage.Loading.Hide();
                                        this.RemoveFromParent();
                                        CommonPage.Instance.RemoveViewByTag("Register");
                                        CommonPage.Instance.RemoveViewByTag("Login");
                                    });
                                })
                                { IsBackground = true }.Start();
@@ -149,13 +157,32 @@
                    finally
                    {
                        CommonPage.Loading.Hide();
                        this.RemoveFromParent();
                        CommonPage.Instance.RemoveViewByTag("Register");
                        CommonPage.Instance.RemoveViewByTag("Login");
                    }
                });
            })
            { IsBackground = true }.Start();
        }

        /// <summary>
        /// 绑定
        /// </summary>
        /// <param name="guid"></param>
        /// <param name="openId"></param>
        private void BindAuthUser(string guid, string openId)
        {
            new System.Threading.Thread(async () =>
            {
                var auth = new SendDataToServer.BindAuthUser
                {
                    AccountGuid = guid,
                    OpenID = openId
                };
                var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(auth);
                var revert = await CommonPage.Instance.RequestHttpsZigbeeAsync("ZigbeeUsers/BindAuthUserToAccount", Encoding.UTF8.GetBytes(requestJson));
            })
            {
                IsBackground = true
            }.Start();
        }
    }
}