合并全部代码完成

黄学彪

2019-11-28 3a26f6025130dcaae4aa82ea19b16ad902450eb8

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

@@ -503,11 +503,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;

@@ -520,12 +520,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);

@@ -533,11 +533,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;

            }

        }