Merge branch 'dev-tzy' into dev-2020xm

xm

2020-07-14 d87400af518ebc9274f4447f06476959c3aa5102

 ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionFileListForm.cs

@@ -57,7 +57,7 @@
        {

            this.ClearBodyFrame();



            var listAllFile = HdlAutoBackupLogic.GetFileFromDirectory(directory);

            var listAllFile = HdlFileLogic.Current.GetFileFromDirectory(directory);

            listAllFile.Sort();



            var listView = new VerticalListControl(23);

@@ -90,7 +90,7 @@
                    }

                });

            };

            if (directory == UserCenterLogic.CombinePath())

            if (directory == Common.Config.Instance.FullPath)

            {

                btnButon.CanClick = false;

            }

@@ -118,12 +118,26 @@
            }

            row1.frameTable.AddRightArrow();



            var btnUpLoad = row1.AddEditorControl();

            btnUpLoad.Text = "上传";

            btnUpLoad.ButtonClickEvent += (sender, e) =>

            {

                this.ShowMassage(ShowMsgType.Confirm, "是否上传该文件(测试)?", () =>

                {

                    HdlThreadLogic.Current.RunThread(() =>

                    {

                        string tagrtFile = System.IO.Path.Combine(directory, fileName);

                        HdlBackupLogic.Current.UpLoadByteDataToOptionBackup(fileName, HdlFileLogic.Current.ReadFileByteContent(tagrtFile));

                    });

                });

            };



            var btnDelete = row1.AddDeleteControl();

            btnDelete.ButtonClickEvent += (sender, e) =>

            {

                this.ShowMassage(ShowMsgType.Confirm, "是否清除该缓存文件", () =>

                {

                    var myFile = UserCenterLogic.CombinePath(directory, fileName);

                    var myFile = System.IO.Path.Combine(Common.Config.Instance.FullPath, directory, fileName);

                    try

                    {

                        System.IO.File.Delete(myFile);

@@ -140,7 +154,7 @@
            row1.frameTable.ButtonClickEvent += (sender, e) =>

            {

                var form = new HideOptionFileContentForm();

                form.AddForm(UserCenterLogic.CombinePath(directory, fileName));

                form.AddForm(System.IO.Path.Combine(Common.Config.Instance.FullPath, directory, fileName));

            };

        }