合并了新代码

黄学彪

2019-12-12 7e863a33397f317ffc3ffd9288496d0e4f16aa66

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/AccountOption.cs

@@ -116,15 +116,23 @@
            {

                return new AccountOption();

            }

            var varByte = Shared.IO.FileUtils.ReadFile(fileName);

            string strValue = System.Text.Encoding.UTF8.GetString(varByte);

            var info = Newtonsoft.Json.JsonConvert.DeserializeObject<AccountOption>(strValue);

            //解密密码

            string hdlKey = "hD1(La3o";

            info.PswAuthentication = UserCenterLogic.DecryptPassword(hdlKey, info.PswAuthentication);

            info.GestureAuthentication = UserCenterLogic.DecryptPassword(hdlKey, info.GestureAuthentication);

            try

            {

                var varByte = Shared.IO.FileUtils.ReadFile(fileName);

                string strValue = System.Text.Encoding.UTF8.GetString(varByte);

                var info = Newtonsoft.Json.JsonConvert.DeserializeObject<AccountOption>(strValue);

                //解密密码

                string hdlKey = "hD1(La3o";

                info.PswAuthentication = UserCenterLogic.DecryptPassword(hdlKey, info.PswAuthentication);

                info.GestureAuthentication = UserCenterLogic.DecryptPassword(hdlKey, info.GestureAuthentication);



            return info;

                return info;

            }

            catch (Exception ex)

            {

                HdlLogLogic.Current.WriteLog(ex);

                return new AccountOption();

            }

        }



        /// <summary>