2020-04-28-1

陈嘉乐

2020-04-28 3272ca5b51e19f7f8a827b0f68400570a547fe60

 ZigbeeApp/Shared/Phone/Login/AccountLoginByCode.cs

@@ -303,7 +303,7 @@
                if (CheckAccount(account) == false)
                {
                    return;
                }
                }

                var reqLoginByCode = new SendDataToServer.LoginValidCodeOBJ()
                {
                    Account = account,
@@ -311,7 +311,7 @@
                    Language = CommonPage.ZigBeeLanguage,
                    AreaCode = int.Parse(CommonPage.PhoneZoneStr)
                };
                var requestRevetLoginCodeOBJ = await CommonFormResouce.LoginByCode(reqLoginByCode);
                var requestRevetLoginCodeOBJ = await CommonFormResouce.LoginByCode(reqLoginByCode);

                if (requestRevetLoginCodeOBJ == null)
                {
                    CommonPage.Instance.FailureToServer();
@@ -330,17 +330,15 @@
                    {
                        var responseDataObj = Newtonsoft.Json.JsonConvert.DeserializeObject<Shared.Common.ResponseEntity.UserLoginRes>(requestRevetLoginCodeOBJ.ResponseData.ToString());
                        var revertData = responseDataObj;
                        Config.ReFresh();
                        Config.ReFresh();

                        //标记上一次是不是同一个账号登陆

                        UserCenter.UserCenterResourse.ResidenceOption.TheSameLoginAccount = Config.Instance.Guid == revertData.Guid;
                        Config.Instance.Password = string.Empty;
                        Config.Instance.Account = revertData.Account;
                        Config.Instance.Guid = revertData.Guid;
                        Config.Instance.MD5PWD = revertData.MD5PWD;
                        Config.Instance.LoginDateTime = DateTime.Now;
                        Config.Instance.LoginToken = revertData.Token;
                        if (Config.Instance.AccountList.Find((obj) => obj == revertData.Account) == null)
                        {
                            Config.Instance.AccountList.Add(revertData.Account);
                        }
                        //需要把登录后返回的md5密码 赋值生成Token  因为用户没有输入密码
                        Config.Instance.MD5PWD = revertData.MD5PWD;
                        Config.Instance.Save();
@@ -433,7 +431,7 @@
            this.RemoveFromParent();
            var login = new AccountLogin();
            Shared.Common.CommonPage.Instance.AddChidren(login);
            login.Show();
            login.ShowForm();
        }

        /// <summary>
@@ -512,14 +510,14 @@
                else
                {
                    new System.Threading.Thread(async () =>
                    {
                        var re = await isBindAuthAsync(authStr);
                    {

                        var re = await isBindAuthAsync(authStr);

                        if (re)
                        {
                            Application.RunOnMainThread(() =>
                            {
                                //直接登录
                                HomePage.Instance.ShowLoginLoadView();
                        {

                            Application.RunOnMainThread(() =>

                            {

                                //直接登录

                                HomePage.Instance.ShowLoginLoadView();

                            });
                            var resultRegID = await Shared.Common.CommonPage.Instance.PushRegID();
                            var homes = await House.GetHomeLists();
@@ -580,7 +578,7 @@
                            ZigBee.Common.Application.Init();
                            //刷新个人中心的内存及线程
                            await UserCenter.UserCenterLogic.InitUserCenterMenmoryAndThread();
                            Shared.Common.Room.InitAllRoom();
                            UserCenter.HdlRoomLogic.Current.InitAllRoom();
                            Application.RunOnMainThread(() =>
                            {
                                this.RemoveFromParent();
@@ -639,15 +637,13 @@
            if (stateCodeStr == "SUCCESS")
            {
                var responseDataObj = Newtonsoft.Json.JsonConvert.DeserializeObject<Shared.Common.ResponseEntity.UserLoginRes>(revertObj.ResponseData.ToString());
                var revertData = responseDataObj;
                var revertData = responseDataObj;

                //标记上一次是不是同一个账号登陆

                UserCenter.UserCenterResourse.ResidenceOption.TheSameLoginAccount = Config.Instance.Guid == revertData.Guid;
                Config.Instance.Account = revertData.Account;
                Config.Instance.MD5PWD = revertData.MD5PWD;
                Config.Instance.Guid = revertData.Guid;
                Config.Instance.LoginDateTime = DateTime.Now;
                if (Config.Instance.AccountList.Find((obj) => obj == revertData.Account) == null)
                {
                    Config.Instance.AccountList.Add(revertData.Account);
                }
                Config.Instance.Save();
                return true;
            }