Merge branch 'dev-tzy' into dev-2020xm

xm

2020-07-14 d87400af518ebc9274f4447f06476959c3aa5102

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

@@ -55,18 +55,8 @@
        /// </summary>

        public void Save()

        {

            try

            {

                var data = Newtonsoft.Json.JsonConvert.SerializeObject(this);

                var byteData = System.Text.Encoding.UTF8.GetBytes(data);

                string fullName = UserCenterLogic.CombinePath(DirNameResourse.LocalMemoryDirectory, DirNameResourse.ResidenceOptionFile);

                //写入内容

                Shared.IO.FileUtils.WriteFileByBytes(fullName, byteData);

            }

            catch (Exception ex)

            {

                HdlLogLogic.Current.WriteLog(ex);

            }

            //写入内容

            HdlFileLogic.Current.SaveFileContent(DirNameResourse.ResidenceOptionFile, this);

        }



        /// <summary>

@@ -75,14 +65,14 @@
        /// <returns></returns>

        public ResidenceOptionClass Load()

        {

            string fileName = UserCenterLogic.CombinePath(DirNameResourse.LocalMemoryDirectory, DirNameResourse.ResidenceOptionFile);

            string fileName = DirNameResourse.ResidenceOptionFile;

            if (System.IO.File.Exists(fileName) == false)

            {

                return new ResidenceOptionClass();

            }

            try

            {

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

                var varByte = HdlFileLogic.Current.ReadFileByteContent(fileName);

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

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