Commit 5c0f6133 by Neo Turing

优化

parent 9153f31e
......@@ -38,7 +38,7 @@ namespace Kivii.Sample.ImageUploader
private List<DbFile> photos = new List<DbFile>();
private Report currentReport = null;
private DbFile currentPhoto = null;
private CanonForm canonForm = null;
//private CanonForm canonForm = null;
public FrmMain()
{
......@@ -993,11 +993,9 @@ namespace Kivii.Sample.ImageUploader
private void btnCanon_Click(object sender, EventArgs e)
{
if (canonForm == null)
{
canonForm = new CanonForm();
var canonForm = new CanonForm();
canonForm.DownloadCompletely += CanonForm_DownloadCompletely;
}
canonForm.ShowDialog();
}
......@@ -1013,7 +1011,7 @@ namespace Kivii.Sample.ImageUploader
// 捕获当前帧
Bitmap bitmap = System.Drawing.Image.FromFile(filePath) as Bitmap;
if (bitmap == null) return;
var picName = fileInfo.Name;
var picName = $"{DateTime.Now.ToString("mmssfff")}_{fileInfo.Name}";
string reportId = string.Empty;
if (currentReport != null)
{
......
......@@ -136,7 +136,7 @@
<Content Include="Camera.ico" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Kivii.Client.Canon.V4.5\Src\Kivii.Client.Canon.V4.5.csproj">
<ProjectReference Include="..\..\Kivii.Client.Canon\Src\Kivii.Client.Canon.V4.5.csproj">
<Project>{08fa5081-59f1-4e6a-b44c-309ef67159e6}</Project>
<Name>Kivii.Client.Canon.V4.5</Name>
</ProjectReference>
......
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