首次合并了全部的代码

黄学彪

2019-10-15 2bf5ec775cb57d8015bee58c745a1e48081ff1b1

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

@@ -151,7 +151,7 @@
            }



            //删除文件

            string strroot = UserCenterResourse.LocalRootPath;

            string strroot = Common.Config.Instance.FullPath;

            var backPath = System.IO.Path.Combine(strroot, DirNameResourse.LocalMemoryDirectory, DirNameResourse.AutoBackupdeleteDirectory);

            foreach (var file in listData)

            {

@@ -183,7 +183,7 @@
            }



            //删除文件

            string strroot = UserCenterResourse.LocalRootPath;

            string strroot = Common.Config.Instance.FullPath;

            var backPath = System.IO.Path.Combine(strroot, DirNameResourse.LocalMemoryDirectory, DirNameResourse.AutoBackupDirectory);

            foreach (var file in listData)

            {

@@ -219,7 +219,7 @@
        /// <returns></returns>

        public static List<string> GetAutoBackupEditorFile()

        {

            string strroot = UserCenterResourse.LocalRootPath;
            string strroot = Common.Config.Instance.FullPath;
            var path = System.IO.Path.Combine(strroot, DirNameResourse.LocalMemoryDirectory, DirNameResourse.AutoBackupDirectory);



            return GetFileFromDirectory(path);

@@ -231,7 +231,7 @@
        /// <returns></returns>

        public static List<string> GetAutoBackupDeleteFile()

        {

            string strroot = UserCenterResourse.LocalRootPath;
            string strroot = Common.Config.Instance.FullPath;
            var path = System.IO.Path.Combine(strroot, DirNameResourse.LocalMemoryDirectory, DirNameResourse.AutoBackupdeleteDirectory);



            return GetFileFromDirectory(path);

@@ -269,12 +269,12 @@
        /// <param name="fileName">文件的名字,不含路径</param>

        public static void AddOrEditorFile(string fileName)

        {

            if (UserCenterResourse.LocalRootPath == string.Empty)

            //根目录

            string strroot = Common.Config.Instance.FullPath;

            if (strroot == string.Empty)

            {

                return;

            }

            //根目录

            string strroot = UserCenterResourse.LocalRootPath;

            //自动备份目录

            string strBackPath = System.IO.Path.Combine(strroot, DirNameResourse.LocalMemoryDirectory, DirNameResourse.AutoBackupDirectory);



@@ -306,12 +306,12 @@
        /// <param name="fileName">文件的名字,不含路径</param>

        public static void DeleteFile(string fileName)

        {

            if (UserCenterResourse.LocalRootPath == string.Empty)

            //根目录

            string strroot = Common.Config.Instance.FullPath;

            if (strroot == string.Empty)

            {

                return;

            }

            //根目录

            string strroot = UserCenterResourse.LocalRootPath;

            //自动删除备份目录

            string strBackPath = System.IO.Path.Combine(strroot, DirNameResourse.LocalMemoryDirectory, DirNameResourse.AutoBackupdeleteDirectory);



@@ -477,7 +477,7 @@
                //暂不支持成员

                return;

            }

            string strroot = UserCenterResourse.LocalRootPath;
            string strroot = Common.Config.Instance.FullPath;
            var path = System.IO.Path.Combine(strroot, DirNameResourse.LocalMemoryDirectory, DirNameResourse.AutoBackupDirectory);



            List<string> listFile1 = GetFileFromDirectory(path);