2020.2.28

gxc

2020-02-28 66a9965c44ecc32a6696abca876ab9d1cd091584

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

@@ -58,15 +58,15 @@
                return 0;

            }



            //开启进度条

            ProgressBar.SetMaxValue(listEditor.Count + listDelete.Count);

            ProgressBar.Show();

            //开启进度条 正在上传备份文件

            ProgressFormBar.Current.Start();

            ProgressFormBar.Current.SetMsg(Language.StringByID(R.MyInternationalizationString.uBackupFileUploading));



            //上传文件到云端

            bool result = await UpLoadBackupFileToDB(listEditor);

            if (result == false)

            {

                ProgressBar.Close();

                ProgressFormBar.Current.Close();

                return -1;

            }



@@ -74,11 +74,11 @@
            result = await DoDeleteFileFromDB(listDelete);

            if (result == false)

            {

                ProgressBar.Close();

                ProgressFormBar.Current.Close();

                return -1;

            }



            ProgressBar.Close();

            ProgressFormBar.Current.Close();



            return 1;

        }

@@ -90,9 +90,11 @@
        /// <returns></returns>

        private async static Task<bool> UpLoadBackupFileToDB(List<string> listFile)

        {

            int listFileCount = listFile.Count;

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

            foreach (string file in listFile)

            for (int i = 0; i < listFile.Count; i++)

            {

                string file = listFile[i];

                var datainfo = new FileInfoData();

                datainfo.BackupFileName = file;

                datainfo.BackupFileContent = ReadDirctoryFileByName(backUpDir, file);

@@ -110,7 +112,7 @@
                    return false;

                }

                //设置进度值

                ProgressBar.SetValue(list.Count);

                ProgressFormBar.Current.SetValue(i + 1, listFileCount);

            }

            return true;

        }

@@ -327,7 +329,7 @@
        #region ■ 同步数据___________________________



        /// <summary>

        /// 同步云端数据(仅限APP启动之后) -1：异常   0:已经同步过，不需要同步  1：正常同步  
        /// 同步云端数据(仅限APP启动之后) -1：异常   0:已经同步过，不需要同步  1：正常同步  2:没有自动备份数据

        /// </summary>

        /// <returns></returns>

        public static async Task<int> SynchronizeDbAutoBackupData()

@@ -366,13 +368,14 @@
                //创建一个空文件(标识已经完成同步)

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

                file.Close();

                return 1;

                return 2;

            }

            //自动备份只有一个

            string backId = data[0].Id;



            //强制指定文本附加信息：账号数据同步中

            ProgressBar.SetAppendText(Language.StringByID(R.MyInternationalizationString.uAccountDataIsSynchronizing));

            //账号数据同步中

            ProgressFormBar.Current.Start();

            ProgressFormBar.Current.SetMsg(Language.StringByID(R.MyInternationalizationString.uAccountDataIsSynchronizing));



            //从云端获取备份的文件，然后存入本地指定的临时文件夹

            string tempDir = await HdlBackupLogic.Current.GetBackFileFromDBAndSetToLocation(backId);

@@ -392,6 +395,9 @@
            //创建一个空文件(标识已经完成同步)

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

            file2.Close();



            //重新刷新住宅对象

            UserCenterLogic.RefreshHomeObject();



            return 1;

        }

@@ -500,11 +506,11 @@
            string fullName = UserCenterLogic.CombinePath(DirNameResourse.LocalMemoryDirectory, DirNameResourse.AutoBackupNotPromptedFile);

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

            {

                //Application.RunOnMainThread(() =>

                //{

                //    var form = new HdlBackup.HdlAutoBackupSettionForm();

                //    form.AddForm();

                //});

                HdlThreadLogic.Current.RunMain(() =>

                {

                    var form = new HdlBackup.HdlAutoBackupForm();

                    form.AddForm();

                });

                return;

            }

            BackupNotPrompted info = null;

@@ -517,12 +523,12 @@
            }

            if (info.Day == 0)

            {

                //Application.RunOnMainThread(() =>

                //{

                //    var form = new HdlBackup.HdlAutoBackupSettionForm();

                //    form.AddForm();

                //});

                //return;

                HdlThreadLogic.Current.RunMain(() =>

                {

                    var form = new HdlBackup.HdlAutoBackupForm();

                    form.AddForm();

                });

                return;

            }



            DateTime oldTime = Convert.ToDateTime(info.OldDay);

@@ -530,11 +536,12 @@
            //时间已经超过

            if (intDay > info.Day)

            {

                //Application.RunOnMainThread(() =>

                //{

                //    var form = new HdlBackup.HdlAutoBackupSettionForm();

                //    form.AddForm();

                //});

                HdlThreadLogic.Current.RunMain(() =>

                {

                    var form = new HdlBackup.HdlAutoBackupForm();

                    form.AddForm();

                });

                return;

            }

        }