Revert "Merge branch 'dev-tzy' into DEV_GXC"

gxc

2019-10-28 1c4904d77f484c075080942d87785481b52b6fb2

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

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



            //删除文件

            string strroot = Common.Config.Instance.FullPath;

            string strroot = UserCenterResourse.LocalRootPath;

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

            foreach (var file in listData)

            {

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



            //删除文件

            string strroot = Common.Config.Instance.FullPath;

            string strroot = UserCenterResourse.LocalRootPath;

            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 = Common.Config.Instance.FullPath;
            string strroot = UserCenterResourse.LocalRootPath;
            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 = Common.Config.Instance.FullPath;
            string strroot = UserCenterResourse.LocalRootPath;
            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)

        {

            //根目录

            string strroot = Common.Config.Instance.FullPath;

            if (strroot == string.Empty)

            if (UserCenterResourse.LocalRootPath == 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)

        {

            //根目录

            string strroot = Common.Config.Instance.FullPath;

            if (strroot == string.Empty)

            if (UserCenterResourse.LocalRootPath == string.Empty)

            {

                return;

            }

            //根目录

            string strroot = UserCenterResourse.LocalRootPath;

            //自动删除备份目录

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



@@ -341,15 +341,15 @@
                await HdlShardLogic.Current.SynchronizeDeleteSharedContent();

                return 0;

            }

            //创建一个空文件

            var file = System.IO.File.Create(checkFile);

            file.Close();



            //暂时不支持成员

            if (UserCenterResourse.UserInfo.AuthorityNo == 3)

            {

                //同步服务器的分享内容

                await HdlShardLogic.Current.SynchronizeDbSharedContent();

                //创建一个空文件(标识已经完成同步)

                var file = System.IO.File.Create(checkFile);

                file.Close();

                return 1;

            }



@@ -357,15 +357,14 @@
            var data = await HdlBackupLogic.Current.GetBackupListNameFromDB(1);

            if (data == null)

            {

                //异常,删除检测文件

                System.IO.File.Delete(checkFile);

                return -1;

            }

            if (data.Count == 0)

            {

                //同步服务器的分享内容

                await HdlShardLogic.Current.SynchronizeDbSharedContent();

                //创建一个空文件(标识已经完成同步)

                var file = System.IO.File.Create(checkFile);

                file.Close();

                return 1;

            }

            //自动备份只有一个

@@ -391,11 +390,6 @@


            //同步服务器的取消了的分享内容

            await HdlShardLogic.Current.SynchronizeDeleteSharedContent();



            //创建一个空文件(标识已经完成同步)

            var file2 = System.IO.File.Create(checkFile);

            file2.Close();



            return 1;

        }



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

                return;

            }

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



            List<string> listFile1 = GetFileFromDirectory(path);