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

xm

2020-07-14 d87400af518ebc9274f4447f06476959c3aa5102

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

@@ -97,7 +97,7 @@
                }

                listDirectory.Sort();



                listAllFile = HdlAutoBackupLogic.GetFileFromDirectory(directory.TrimEnd('/'));

                listAllFile = HdlFileLogic.Current.GetFileFromDirectory(directory.TrimEnd('/'));

                listAllFile.Sort();

            }



@@ -185,6 +185,20 @@
            }

            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) =>

            {