XCKJ
/
EI-Image-Viewer-Api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

代码修改

Test.EIImageViewer
hang 2023-05-31 16:59:16 +08:00
parent 1df6110649
commit e981929767
1 changed files with 39 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
PublishSite/PublishForm.cs
View File

@ -38,7 +38,7 @@ namespace PublishSite
.WriteTo.File("logs\\log.txt", rollingInterval: RollingInterval.Day) .WriteTo.File("logs\\log.txt", rollingInterval: RollingInterval.Day)
.CreateLogger(); .CreateLogger();
uiContext = SynchronizationContext.Current;
} }
@ -52,6 +52,8 @@ namespace PublishSite
public string Password = ""; public string Password = "";
SynchronizationContext uiContext;
private void WinformLog(string message, Color? color = null) private void WinformLog(string message, Color? color = null)
{ {
if (InvokeRequired) if (InvokeRequired)
@ -637,7 +639,14 @@ namespace PublishSite
private async void startServiceBtn_Click(object sender, EventArgs e) private async void startServiceBtn_Click(object sender, EventArgs e)
{ {
startServiceBtn.Enabled = false; //startServiceBtn.Enabled = false;
uiContext.Post((state) =>
{
// 访问控件并更新它们
startServiceBtn.Enabled = false;
}, null);
await Task.Run(() => await Task.Run(() =>
{ {
@ -680,12 +689,22 @@ namespace PublishSite
}); });
startServiceBtn.Enabled = true; uiContext.Post((state) =>
{
// 访问控件并更新它们
startServiceBtn.Enabled = true;
}, null);
//startServiceBtn.Enabled = true;
} }
private async void stopServiceBtn_Click(object sender, EventArgs e) private async void stopServiceBtn_Click(object sender, EventArgs e)
{ {
startServiceBtn.Enabled = false; //startServiceBtn.Enabled = false;
uiContext.Post((state) =>
{
// 访问控件并更新它们
startServiceBtn.Enabled = false;
}, null);
await Task.Run(() => await Task.Run(() =>
{ {
if (rb_local.Checked) if (rb_local.Checked)
@ -726,7 +745,13 @@ namespace PublishSite
} }
}); });
startServiceBtn.Enabled = true; //startServiceBtn.Enabled = true;
uiContext.Post((state) =>
{
// 访问控件并更新它们
startServiceBtn.Enabled = true;
}, null);
} }
#endregion #endregion
@ -969,7 +994,7 @@ namespace PublishSite
private async void sshNetCorePublishBtn2_Click(object sender, EventArgs e) private async void sshNetCorePublishBtn2_Click(object sender, EventArgs e)
{ {
if (string.IsNullOrEmpty(publishFolderTBox.Text) || !File.Exists(publishFolderTBox.Text)) if (string.IsNullOrEmpty(publishFolderTBox.Text))
{ {
WinformLog($"请选择存在的文件夹才能开始发布", Color.Red); WinformLog($"请选择存在的文件夹才能开始发布", Color.Red);
return; return;
@ -995,8 +1020,14 @@ namespace PublishSite
try try
{ {
//将文件夹里的内容打包成压缩包 await Task.Run( () =>
ZipFile.CreateFromDirectory(localSourceFolder, filePath); {
//将文件夹里的内容打包成压缩包
ZipFile.CreateFromDirectory(localSourceFolder, filePath);
});
} }
catch (Exception ex) catch (Exception ex)
{ {