2020-4-27-1

陈嘉乐

2020-04-27 18b93d511dc764b469d7c4a7e755f7274f89cdb4

 ZigbeeApp/Shared/Phone/Login/AccountLoginByCode.cs

@@ -331,16 +331,14 @@
                        var responseDataObj = Newtonsoft.Json.JsonConvert.DeserializeObject<Shared.Common.ResponseEntity.UserLoginRes>(requestRevetLoginCodeOBJ.ResponseData.ToString());
                        var revertData = responseDataObj;
                        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>
@@ -640,14 +638,12 @@
            {
                var responseDataObj = Newtonsoft.Json.JsonConvert.DeserializeObject<Shared.Common.ResponseEntity.UserLoginRes>(revertObj.ResponseData.ToString());
                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;
            }