diff --git a/FATrace.OEMApp/App.config b/FATrace.OEMApp/App.config
index 13db503..723b472 100644
--- a/FATrace.OEMApp/App.config
+++ b/FATrace.OEMApp/App.config
@@ -12,13 +12,13 @@
-
+
-
-
+
+
diff --git a/FATrace.OEMApp/MainApp.Designer.cs b/FATrace.OEMApp/MainApp.Designer.cs
index 78f59df..014aae5 100644
--- a/FATrace.OEMApp/MainApp.Designer.cs
+++ b/FATrace.OEMApp/MainApp.Designer.cs
@@ -56,6 +56,8 @@
materialCard3 = new ReaLTaiizor.Controls.MaterialCard();
label8 = new Label();
materialCard2 = new ReaLTaiizor.Controls.MaterialCard();
+ btnRawStopLoadVideo = new Button();
+ DownloadProgressBarMain = new ProgressBar();
btnTestAction = new Button();
label7 = new Label();
txtRURawName = new TextBox();
@@ -82,7 +84,7 @@
btnStopLoadVideo = new Button();
btnLoadVideo = new Button();
btnNVRLogin = new Button();
- DownloadProgressBarMain = new ProgressBar();
+ listViewRULog = new ListView();
materialTabControl1.SuspendLayout();
tabPage1.SuspendLayout();
materialCard4.SuspendLayout();
@@ -386,6 +388,8 @@
// materialCard2
//
materialCard2.BackColor = Color.FromArgb(255, 255, 255);
+ materialCard2.Controls.Add(listViewRULog);
+ materialCard2.Controls.Add(btnRawStopLoadVideo);
materialCard2.Controls.Add(DownloadProgressBarMain);
materialCard2.Controls.Add(btnTestAction);
materialCard2.Controls.Add(label7);
@@ -403,6 +407,23 @@
materialCard2.Size = new Size(864, 348);
materialCard2.TabIndex = 0;
//
+ // btnRawStopLoadVideo
+ //
+ btnRawStopLoadVideo.Location = new Point(189, 223);
+ btnRawStopLoadVideo.Name = "btnRawStopLoadVideo";
+ btnRawStopLoadVideo.Size = new Size(142, 44);
+ btnRawStopLoadVideo.TabIndex = 7;
+ btnRawStopLoadVideo.Text = "停止下载";
+ btnRawStopLoadVideo.UseVisualStyleBackColor = true;
+ btnRawStopLoadVideo.Click += btnRawStopLoadVideo_Click;
+ //
+ // DownloadProgressBarMain
+ //
+ DownloadProgressBarMain.Location = new Point(1, 324);
+ DownloadProgressBarMain.Name = "DownloadProgressBarMain";
+ DownloadProgressBarMain.Size = new Size(862, 23);
+ DownloadProgressBarMain.TabIndex = 6;
+ //
// btnTestAction
//
btnTestAction.Location = new Point(41, 223);
@@ -427,7 +448,7 @@
//
txtRURawName.Location = new Point(154, 123);
txtRURawName.Name = "txtRURawName";
- txtRURawName.Size = new Size(446, 32);
+ txtRURawName.Size = new Size(387, 32);
txtRURawName.TabIndex = 3;
//
// label6
@@ -444,7 +465,7 @@
//
txtRUInBagCode.Location = new Point(154, 65);
txtRUInBagCode.Name = "txtRUInBagCode";
- txtRUInBagCode.Size = new Size(446, 32);
+ txtRUInBagCode.Size = new Size(387, 32);
txtRUInBagCode.TabIndex = 1;
//
// label5
@@ -686,12 +707,13 @@
btnNVRLogin.UseVisualStyleBackColor = true;
btnNVRLogin.Click += btnNVRLogin_Click;
//
- // DownloadProgressBarMain
+ // listViewRULog
//
- DownloadProgressBarMain.Location = new Point(1, 324);
- DownloadProgressBarMain.Name = "DownloadProgressBarMain";
- DownloadProgressBarMain.Size = new Size(862, 23);
- DownloadProgressBarMain.TabIndex = 6;
+ listViewRULog.Location = new Point(557, 9);
+ listViewRULog.Name = "listViewRULog";
+ listViewRULog.Size = new Size(290, 309);
+ listViewRULog.TabIndex = 8;
+ listViewRULog.UseCompatibleStateImageBehavior = false;
//
// MainApp
//
@@ -784,5 +806,7 @@
private TextBox txtIOInputTime;
private Button btnTestAction;
private ProgressBar DownloadProgressBarMain;
+ private Button btnRawStopLoadVideo;
+ private ListView listViewRULog;
}
}
\ No newline at end of file
diff --git a/FATrace.OEMApp/MainApp.cs b/FATrace.OEMApp/MainApp.cs
index 11fc400..9022452 100644
--- a/FATrace.OEMApp/MainApp.cs
+++ b/FATrace.OEMApp/MainApp.cs
@@ -83,7 +83,7 @@ namespace FATrace.OEMApp
///
/// 当前登录用户
///
- public string CurUserName { get; set; }
+ public string CurUserName { get; set; } = "Admin";
#region 视频处理变量
@@ -106,12 +106,12 @@ namespace FATrace.OEMApp
///
/// 内包条码
///
- public string CurInBagCode { get; set; }
+ public string CurInBagCode { get; set; } = "AAAAAA";
///
/// 内包条码 原料名称
///
- public string CurInBagRawName { get; set; }
+ public string CurInBagRawName { get; set; } = "添加剂Test";
#endregion
@@ -438,7 +438,9 @@ namespace FATrace.OEMApp
///
private void btnTestAction_Click(object sender, EventArgs e)
{
- var Result = HkCameraClient.Sdk_NET_DVR_GetFileByTime_V40(DateTime.Now.AddMinutes(-5), DateTime.Now, NVRCom.GetVideoName(HkCameraClient.NVRVideoSavePath, "cODE"));
+ CurrentVideoPath = NVRCom.GetVideoName(HkCameraClient.NVRVideoSavePath, "CODE");
+
+ var Result = HkCameraClient.Sdk_NET_DVR_GetFileByTime_V40(DateTime.Now.AddMinutes(-5), DateTime.Now, CurrentVideoPath);
if (Result.Result)
{
HkCameraClient.NVRLoadVideoProcessEventHandler -= HkCameraClient_NVRLoadVideoProcessEventHandler;
@@ -524,5 +526,9 @@ namespace FATrace.OEMApp
});
}
+ private void btnRawStopLoadVideo_Click(object sender, EventArgs e)
+ {
+ HkCameraClient.Sdk_NET_DVR_StopGetFile();
+ }
}
}
diff --git a/FATrace.OEMApp/MainApp.resx b/FATrace.OEMApp/MainApp.resx
index f3c7b73..107bc89 100644
--- a/FATrace.OEMApp/MainApp.resx
+++ b/FATrace.OEMApp/MainApp.resx
@@ -128,7 +128,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAEZTeXN0ZW0uV2luZG93cy5Gb3JtcywgQ3VsdHVyZT1uZXV0cmFs
LCBQdWJsaWNLZXlUb2tlbj1iNzdhNWM1NjE5MzRlMDg5BQEAAAAmU3lzdGVtLldpbmRvd3MuRm9ybXMu
SW1hZ2VMaXN0U3RyZWFtZXIBAAAABERhdGEHAgIAAAAJAwAAAA8DAAAAaiEAAAJNU0Z0AUkBTAIBAQgB
- AAEwAQEBMAEBARABAAEQAQAE/wEhAQAI/wFCAU0BNgcAATYDAAEoAwABQAMAATADAAEBAQABIAYAATD/
+ AAFAAQEBQAEBARABAAEQAQAE/wEhAQAI/wFCAU0BNgcAATYDAAEoAwABQAMAATADAAEBAQABIAYAATD/
AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AFIAAdsBlgESAf8B2wGWARIB/wQAAxIBGANJAYgB
2wGWARIB/wHbAZYBEgH/AdsBlgESAf8B2wGWARIB/wHbAZYBEgH/AdsBlgESAf8B2wGWARIB/wQAAdsB
lgESAf8B2wGWARIB/wHbAZYBEgH/AdsBlgESAf8B2wGWARIB/wHbAZYBEgH/AdsBlgESAf8UAAHbAZYB
@@ -217,7 +217,7 @@
2wGWARIB/wHbAZYBEgH/AdsBlgESAf8B2wGWARIB/wHbAZYBEgH/AdsBlgESAf8B2wGWARIB/wMqAUAY
AAHbAZYBEgH/AdsBlgESAf8B2wGWARIB/wgAAdsBlgESAf8B2wGWARIB/wHbAZYBEgH/AdsBlgESAf8B
2wGWARIB/xgAAdsBlgESAf8B2wGWARIB/wHbAZYBEgH/AdsBlgESAf8B2wGWARIB/wHbAZYBEgH/AdsB
- lgESAf8B2wGWARIB/wJ8AVMB+BAAAXkBbwFRAfcB2wGWARIB/wwAAzMBUAHbAZYBEgH/BAAB2wGWARIB
+ lgESAf8B2wGWARIB/wJ8AVcB+BAAAXUBbwFRAfcB2wGWARIB/wwAAzMBUAHbAZYBEgH/BAAB2wGWARIB
/xAAAdsBlgESAf8QAAJbAVkBwCAAAkcBRgGAAyoBQBQAAdsBlgESAf8B2wGWARIB/wHbAZYBEgH/AdsB
lgESAf8MAAHbAZYBEgH/AdsBlgESAf8B2wGWARIB/wHbAZYBEgH/AdsBlgESAf8IAAHbAZYBEgH/AdsB
lgESAf8B2wGWARIB/wHbAZYBEgH/AdsBlgESAf8B2wGWARIB/wHbAZYBEgH/AdsBlgESAf8B2wGWARIB