Commit fcda55ca by 陶然

init

parent 4cf4d563
......@@ -48,6 +48,7 @@
this.cbxResolution = new System.Windows.Forms.ComboBox();
this.btnSwitch = new System.Windows.Forms.Button();
this.plVsp = new System.Windows.Forms.Panel();
this.vspCamView = new Kivii.Sample.ImageUploader.Controls.VideoSourcePlayer();
this.plRight = new System.Windows.Forms.Panel();
this.gbPhotoList = new System.Windows.Forms.GroupBox();
this.flpPhotos = new System.Windows.Forms.FlowLayoutPanel();
......@@ -56,6 +57,7 @@
this.plMain = new System.Windows.Forms.Panel();
this.gbPhotoView = new System.Windows.Forms.GroupBox();
this.panel1 = new System.Windows.Forms.Panel();
this.picDisPlay = new Kivii.Sample.ImageUploader.Controls.PanelEx();
this.plDisplay = new System.Windows.Forms.Panel();
this.cbxTurn = new System.Windows.Forms.ComboBox();
this.btnEditor = new System.Windows.Forms.Button();
......@@ -65,8 +67,6 @@
this.btnShot = new System.Windows.Forms.Button();
this.btnCanon = new System.Windows.Forms.Button();
this.btnDelete = new System.Windows.Forms.Button();
this.picDisPlay = new Kivii.Sample.ImageUploader.Controls.PanelEx();
this.vspCamView = new Kivii.Sample.ImageUploader.Controls.VideoSourcePlayer();
this.plLeft.SuspendLayout();
this.gbSample.SuspendLayout();
this.plSearchReport.SuspendLayout();
......@@ -319,6 +319,17 @@
this.plVsp.Size = new System.Drawing.Size(370, 350);
this.plVsp.TabIndex = 0;
//
// vspCamView
//
this.vspCamView.Dock = System.Windows.Forms.DockStyle.Fill;
this.vspCamView.Location = new System.Drawing.Point(0, 0);
this.vspCamView.Margin = new System.Windows.Forms.Padding(4);
this.vspCamView.Name = "vspCamView";
this.vspCamView.Size = new System.Drawing.Size(370, 350);
this.vspCamView.TabIndex = 0;
this.vspCamView.Text = "vspCamView";
this.vspCamView.VideoSource = null;
//
// plRight
//
this.plRight.Controls.Add(this.gbPhotoList);
......@@ -420,6 +431,17 @@
this.panel1.Size = new System.Drawing.Size(804, 831);
this.panel1.TabIndex = 4;
//
// picDisPlay
//
this.picDisPlay.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
this.picDisPlay.Dock = System.Windows.Forms.DockStyle.Fill;
this.picDisPlay.EnableSelection = false;
this.picDisPlay.Location = new System.Drawing.Point(0, 0);
this.picDisPlay.Name = "picDisPlay";
this.picDisPlay.SelectionBounds = new System.Drawing.Rectangle(0, 0, 0, 0);
this.picDisPlay.Size = new System.Drawing.Size(804, 831);
this.picDisPlay.TabIndex = 5;
//
// plDisplay
//
this.plDisplay.Controls.Add(this.cbxTurn);
......@@ -551,28 +573,6 @@
this.btnDelete.EnabledChanged += new System.EventHandler(this.btnEnabled_EnabledChanged);
this.btnDelete.Click += new System.EventHandler(this.btnDelete_Click);
//
// picDisPlay
//
this.picDisPlay.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
this.picDisPlay.Dock = System.Windows.Forms.DockStyle.Fill;
this.picDisPlay.EnableSelection = false;
this.picDisPlay.Location = new System.Drawing.Point(0, 0);
this.picDisPlay.Name = "picDisPlay";
this.picDisPlay.SelectionBounds = new System.Drawing.Rectangle(0, 0, 0, 0);
this.picDisPlay.Size = new System.Drawing.Size(804, 831);
this.picDisPlay.TabIndex = 5;
//
// vspCamView
//
this.vspCamView.Dock = System.Windows.Forms.DockStyle.Fill;
this.vspCamView.Location = new System.Drawing.Point(0, 0);
this.vspCamView.Margin = new System.Windows.Forms.Padding(4);
this.vspCamView.Name = "vspCamView";
this.vspCamView.Size = new System.Drawing.Size(370, 350);
this.vspCamView.TabIndex = 0;
this.vspCamView.Text = "vspCamView";
this.vspCamView.VideoSource = null;
//
// FrmMain
//
this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
......
......@@ -711,10 +711,10 @@ namespace Kivii.Sample.ImageUploader
MessageBox.Show("登陆前先退出原连接");
return;
}
btnLogin.Enabled = false;
if (tbxServiceUrl.Text.IsNullOrEmpty()) return;
if (tbxUserName.Text.IsNullOrEmpty()) return;
if (tbxPassword.Text.IsNullOrEmpty()) return;
btnLogin.Enabled = false;
_client = new JsonServiceClient(tbxServiceUrl.Text);
var auth = new Authenticate { UserName = tbxUserName.Text, Password = tbxPassword.Text, provider = "Kivii" };
var task = _client.PostAsync(auth);
......@@ -1033,10 +1033,11 @@ namespace Kivii.Sample.ImageUploader
private void CanonForm_DownloadCompletely(object sender, EventArgs e)
{
var stream = (Stream)sender;
var mStream = new MemoryStream();
stream.CopyTo(mStream);
//FileInfo fileInfo = new FileInfo(stream);
// 捕获当前帧
Bitmap bitmap = new Bitmap(stream);
Bitmap bitmap = new Bitmap(mStream);
if (bitmap == null) return;
var picName = $"{DateTime.Now.ToString("mmssfff")}";
string reportId = string.Empty;
......
......@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
//可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值
//通过使用 "*",如下所示:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("5.4.2024.6040")]
[assembly: AssemblyFileVersion("5.4.2024.6040")]
[assembly: AssemblyVersion("5.4.2024.6250")]
[assembly: AssemblyFileVersion("5.4.2024.6250")]
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