Commit 43c1f7c8 by 陶然

优化相机拍照后文件下载问题

parent 6de5be6f
...@@ -60,7 +60,7 @@ namespace Kivii.Canon ...@@ -60,7 +60,7 @@ namespace Kivii.Canon
try try
{ {
IsInit = false; IsInit = false;
MainCamera.CloseSession(); MainCamera?.CloseSession();
MainCamera?.Dispose(); MainCamera?.Dispose();
APIHandler?.Dispose(); APIHandler?.Dispose();
} }
...@@ -109,27 +109,32 @@ namespace Kivii.Canon ...@@ -109,27 +109,32 @@ namespace Kivii.Canon
{ {
try try
{ {
string dir = null; Info.FileName = $"{DateTime.Now.ToString("ssfff")}_{Info.FileName}";
Invoke((Action)delegate { dir = SavePathTextBox.Text; }); //string dir = null;
sender.DownloadFile(Info, dir); var steam = sender.DownloadFile(Info);
//Invoke((Action)delegate { dir = SavePathTextBox.Text; });
//sender.DownloadFile(Info, dir);
Invoke((Action)delegate { MainProgressBar.Value = 0; }); Invoke((Action)delegate { MainProgressBar.Value = 0; });
if (DownloadCompletely != null)
//延时等待图片下载完毕后抛出事件
var task = Task.Run(async delegate
{ {
var filePath = $"{dir}\\{Info.FileName}"; DownloadCompletely(steam, EventArgs.Empty);
await Task.Delay(500); }
if (!File.Exists(filePath)) ////延时等待图片下载完毕后抛出事件
{ //var task = Task.Run(async delegate
return; //{
} // var filePath = $"{dir}\\{Info.FileName}";
if (DownloadCompletely != null) // await Task.Delay(500);
{ // if (!File.Exists(filePath))
DownloadCompletely(filePath, EventArgs.Empty); // {
} // return;
// }
return; // if (DownloadCompletely != null)
}); // {
// DownloadCompletely(steam, EventArgs.Empty);
// }
// return;
//});
} }
catch (Exception ex) { ReportError(ex.Message, false); } catch (Exception ex) { ReportError(ex.Message, false); }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment