合并了代码

黄学彪

2019-12-13 6cbd0936d3245fd7c433884ac9c1f5448a7cf657

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlBackupLogic.cs

@@ -577,12 +577,26 @@
            {

                try

                {

                    //删除本地全部Log

                    Global.CreateEmptyDirectory(Path.Combine(DirNameResourse.LocalMemoryDirectory, DirNameResourse.LogDirectory), true);

                    var listAllFile = HdlAutoBackupLogic.GetFileFromDirectory(upPath);

                    if (listAllFile.Count > 10)

                    {

                        listAllFile.Sort();

                        while (listAllFile.Count >= 10)

                        {

                            System.IO.File.Delete(listAllFile[0]);

                            listAllFile.RemoveAt(0);

                        }

                    }

                }

                catch { }

            }

            ProgressFormBar.Current.Close();



            HdlThreadLogic.Current.RunMain(() =>

            {

                var contr = new ShowMsgControl(ShowMsgType.Tip, "Log上传成功");

                contr.Show();

            });



            return result;

        }

@@ -639,12 +653,15 @@
                return false;

            }



            if (listFile.Contains(DirNameResourse.ShowOptionMenuFile) == true)

            //检测

            string checkKeys = UserCenterLogic.EncryptPassword(UserCenterResourse.FileEncryptKey, DirNameResourse.ShowOptionMenuFile + UserCenterResourse.UserInfo.Account);

            if (listFile.Contains(checkKeys) == true)

            {

                //显示主页隐藏菜单(Debug用)

                UserCenterResourse.HideOption.CenterHideMenu = 1;

            }

            if (listFile.Contains(DirNameResourse.DetailedLogFile) == true)

            checkKeys = UserCenterLogic.EncryptPassword(UserCenterResourse.FileEncryptKey, DirNameResourse.DetailedLogFile + UserCenterResourse.UserInfo.Account);

            if (listFile.Contains(checkKeys) == true)

            {

                //出力详细Log(Debug用)

                UserCenterResourse.HideOption.DetailedLog = 1;