251011
This commit is contained in:
@@ -12,13 +12,13 @@
|
|||||||
<add key="NVRPort" value="8000" />
|
<add key="NVRPort" value="8000" />
|
||||||
<add key="NVRUserName" value="admin" />
|
<add key="NVRUserName" value="admin" />
|
||||||
<add key="NVRPw" value="glico@2025" />
|
<add key="NVRPw" value="glico@2025" />
|
||||||
<add key="NVRVideoSavePath" value="D:\" />
|
<add key="NVRVideoSavePath" value="Y:\" />
|
||||||
<add key="InsCheckPort" value="COM10" />
|
<add key="InsCheckPort" value="COM10" />
|
||||||
<add key="InsCheckRate" value="9600" />
|
<add key="InsCheckRate" value="9600" />
|
||||||
<!-- Jellyfin 配置 -->
|
<!-- Jellyfin 配置 -->
|
||||||
<add key="JellyfinBaseUrl" value="http://192.168.0.30:8096" />
|
<add key="JellyfinBaseUrl" value="http://192.168.0.30:8096" />
|
||||||
<add key="JellyfinApiKey" value="" />
|
<add key="JellyfinApiKey" value="f4285acda9f94efca46a6e4d0a0273c0" />
|
||||||
<add key="JellyfinParentId" value="" />
|
<add key="JellyfinParentId" value="68097683e08d87d675fbebdd7d8d4cb0" />
|
||||||
<add key="JellyfinPollIntervalMs" value="5000" />
|
<add key="JellyfinPollIntervalMs" value="5000" />
|
||||||
<add key="JellyfinPollMaxWaitMs" value="600000" />
|
<add key="JellyfinPollMaxWaitMs" value="600000" />
|
||||||
</appSettings>
|
</appSettings>
|
||||||
|
|||||||
40
FATrace.OEMApp/MainApp.Designer.cs
generated
40
FATrace.OEMApp/MainApp.Designer.cs
generated
@@ -56,6 +56,8 @@
|
|||||||
materialCard3 = new ReaLTaiizor.Controls.MaterialCard();
|
materialCard3 = new ReaLTaiizor.Controls.MaterialCard();
|
||||||
label8 = new Label();
|
label8 = new Label();
|
||||||
materialCard2 = new ReaLTaiizor.Controls.MaterialCard();
|
materialCard2 = new ReaLTaiizor.Controls.MaterialCard();
|
||||||
|
btnRawStopLoadVideo = new Button();
|
||||||
|
DownloadProgressBarMain = new ProgressBar();
|
||||||
btnTestAction = new Button();
|
btnTestAction = new Button();
|
||||||
label7 = new Label();
|
label7 = new Label();
|
||||||
txtRURawName = new TextBox();
|
txtRURawName = new TextBox();
|
||||||
@@ -82,7 +84,7 @@
|
|||||||
btnStopLoadVideo = new Button();
|
btnStopLoadVideo = new Button();
|
||||||
btnLoadVideo = new Button();
|
btnLoadVideo = new Button();
|
||||||
btnNVRLogin = new Button();
|
btnNVRLogin = new Button();
|
||||||
DownloadProgressBarMain = new ProgressBar();
|
listViewRULog = new ListView();
|
||||||
materialTabControl1.SuspendLayout();
|
materialTabControl1.SuspendLayout();
|
||||||
tabPage1.SuspendLayout();
|
tabPage1.SuspendLayout();
|
||||||
materialCard4.SuspendLayout();
|
materialCard4.SuspendLayout();
|
||||||
@@ -386,6 +388,8 @@
|
|||||||
// materialCard2
|
// materialCard2
|
||||||
//
|
//
|
||||||
materialCard2.BackColor = Color.FromArgb(255, 255, 255);
|
materialCard2.BackColor = Color.FromArgb(255, 255, 255);
|
||||||
|
materialCard2.Controls.Add(listViewRULog);
|
||||||
|
materialCard2.Controls.Add(btnRawStopLoadVideo);
|
||||||
materialCard2.Controls.Add(DownloadProgressBarMain);
|
materialCard2.Controls.Add(DownloadProgressBarMain);
|
||||||
materialCard2.Controls.Add(btnTestAction);
|
materialCard2.Controls.Add(btnTestAction);
|
||||||
materialCard2.Controls.Add(label7);
|
materialCard2.Controls.Add(label7);
|
||||||
@@ -403,6 +407,23 @@
|
|||||||
materialCard2.Size = new Size(864, 348);
|
materialCard2.Size = new Size(864, 348);
|
||||||
materialCard2.TabIndex = 0;
|
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
|
||||||
//
|
//
|
||||||
btnTestAction.Location = new Point(41, 223);
|
btnTestAction.Location = new Point(41, 223);
|
||||||
@@ -427,7 +448,7 @@
|
|||||||
//
|
//
|
||||||
txtRURawName.Location = new Point(154, 123);
|
txtRURawName.Location = new Point(154, 123);
|
||||||
txtRURawName.Name = "txtRURawName";
|
txtRURawName.Name = "txtRURawName";
|
||||||
txtRURawName.Size = new Size(446, 32);
|
txtRURawName.Size = new Size(387, 32);
|
||||||
txtRURawName.TabIndex = 3;
|
txtRURawName.TabIndex = 3;
|
||||||
//
|
//
|
||||||
// label6
|
// label6
|
||||||
@@ -444,7 +465,7 @@
|
|||||||
//
|
//
|
||||||
txtRUInBagCode.Location = new Point(154, 65);
|
txtRUInBagCode.Location = new Point(154, 65);
|
||||||
txtRUInBagCode.Name = "txtRUInBagCode";
|
txtRUInBagCode.Name = "txtRUInBagCode";
|
||||||
txtRUInBagCode.Size = new Size(446, 32);
|
txtRUInBagCode.Size = new Size(387, 32);
|
||||||
txtRUInBagCode.TabIndex = 1;
|
txtRUInBagCode.TabIndex = 1;
|
||||||
//
|
//
|
||||||
// label5
|
// label5
|
||||||
@@ -686,12 +707,13 @@
|
|||||||
btnNVRLogin.UseVisualStyleBackColor = true;
|
btnNVRLogin.UseVisualStyleBackColor = true;
|
||||||
btnNVRLogin.Click += btnNVRLogin_Click;
|
btnNVRLogin.Click += btnNVRLogin_Click;
|
||||||
//
|
//
|
||||||
// DownloadProgressBarMain
|
// listViewRULog
|
||||||
//
|
//
|
||||||
DownloadProgressBarMain.Location = new Point(1, 324);
|
listViewRULog.Location = new Point(557, 9);
|
||||||
DownloadProgressBarMain.Name = "DownloadProgressBarMain";
|
listViewRULog.Name = "listViewRULog";
|
||||||
DownloadProgressBarMain.Size = new Size(862, 23);
|
listViewRULog.Size = new Size(290, 309);
|
||||||
DownloadProgressBarMain.TabIndex = 6;
|
listViewRULog.TabIndex = 8;
|
||||||
|
listViewRULog.UseCompatibleStateImageBehavior = false;
|
||||||
//
|
//
|
||||||
// MainApp
|
// MainApp
|
||||||
//
|
//
|
||||||
@@ -784,5 +806,7 @@
|
|||||||
private TextBox txtIOInputTime;
|
private TextBox txtIOInputTime;
|
||||||
private Button btnTestAction;
|
private Button btnTestAction;
|
||||||
private ProgressBar DownloadProgressBarMain;
|
private ProgressBar DownloadProgressBarMain;
|
||||||
|
private Button btnRawStopLoadVideo;
|
||||||
|
private ListView listViewRULog;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -83,7 +83,7 @@ namespace FATrace.OEMApp
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// 当前登录用户
|
/// 当前登录用户
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string CurUserName { get; set; }
|
public string CurUserName { get; set; } = "Admin";
|
||||||
|
|
||||||
#region 视频处理变量
|
#region 视频处理变量
|
||||||
|
|
||||||
@@ -106,12 +106,12 @@ namespace FATrace.OEMApp
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// 内包条码
|
/// 内包条码
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string CurInBagCode { get; set; }
|
public string CurInBagCode { get; set; } = "AAAAAA";
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 内包条码 原料名称
|
/// 内包条码 原料名称
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string CurInBagRawName { get; set; }
|
public string CurInBagRawName { get; set; } = "添加剂Test";
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
@@ -438,7 +438,9 @@ namespace FATrace.OEMApp
|
|||||||
/// <param name="e"></param>
|
/// <param name="e"></param>
|
||||||
private void btnTestAction_Click(object sender, EventArgs e)
|
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)
|
if (Result.Result)
|
||||||
{
|
{
|
||||||
HkCameraClient.NVRLoadVideoProcessEventHandler -= HkCameraClient_NVRLoadVideoProcessEventHandler;
|
HkCameraClient.NVRLoadVideoProcessEventHandler -= HkCameraClient_NVRLoadVideoProcessEventHandler;
|
||||||
@@ -524,5 +526,9 @@ namespace FATrace.OEMApp
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void btnRawStopLoadVideo_Click(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
HkCameraClient.Sdk_NET_DVR_StopGetFile();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -128,7 +128,7 @@
|
|||||||
AAEAAAD/////AQAAAAAAAAAMAgAAAEZTeXN0ZW0uV2luZG93cy5Gb3JtcywgQ3VsdHVyZT1uZXV0cmFs
|
AAEAAAD/////AQAAAAAAAAAMAgAAAEZTeXN0ZW0uV2luZG93cy5Gb3JtcywgQ3VsdHVyZT1uZXV0cmFs
|
||||||
LCBQdWJsaWNLZXlUb2tlbj1iNzdhNWM1NjE5MzRlMDg5BQEAAAAmU3lzdGVtLldpbmRvd3MuRm9ybXMu
|
LCBQdWJsaWNLZXlUb2tlbj1iNzdhNWM1NjE5MzRlMDg5BQEAAAAmU3lzdGVtLldpbmRvd3MuRm9ybXMu
|
||||||
SW1hZ2VMaXN0U3RyZWFtZXIBAAAABERhdGEHAgIAAAAJAwAAAA8DAAAAaiEAAAJNU0Z0AUkBTAIBAQgB
|
SW1hZ2VMaXN0U3RyZWFtZXIBAAAABERhdGEHAgIAAAAJAwAAAA8DAAAAaiEAAAJNU0Z0AUkBTAIBAQgB
|
||||||
AAEwAQEBMAEBARABAAEQAQAE/wEhAQAI/wFCAU0BNgcAATYDAAEoAwABQAMAATADAAEBAQABIAYAATD/
|
AAFAAQEBQAEBARABAAEQAQAE/wEhAQAI/wFCAU0BNgcAATYDAAEoAwABQAMAATADAAEBAQABIAYAATD/
|
||||||
AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AFIAAdsBlgESAf8B2wGWARIB/wQAAxIBGANJAYgB
|
AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AFIAAdsBlgESAf8B2wGWARIB/wQAAxIBGANJAYgB
|
||||||
2wGWARIB/wHbAZYBEgH/AdsBlgESAf8B2wGWARIB/wHbAZYBEgH/AdsBlgESAf8B2wGWARIB/wQAAdsB
|
2wGWARIB/wHbAZYBEgH/AdsBlgESAf8B2wGWARIB/wHbAZYBEgH/AdsBlgESAf8B2wGWARIB/wQAAdsB
|
||||||
lgESAf8B2wGWARIB/wHbAZYBEgH/AdsBlgESAf8B2wGWARIB/wHbAZYBEgH/AdsBlgESAf8UAAHbAZYB
|
lgESAf8B2wGWARIB/wHbAZYBEgH/AdsBlgESAf8B2wGWARIB/wHbAZYBEgH/AdsBlgESAf8UAAHbAZYB
|
||||||
@@ -217,7 +217,7 @@
|
|||||||
2wGWARIB/wHbAZYBEgH/AdsBlgESAf8B2wGWARIB/wHbAZYBEgH/AdsBlgESAf8B2wGWARIB/wMqAUAY
|
2wGWARIB/wHbAZYBEgH/AdsBlgESAf8B2wGWARIB/wHbAZYBEgH/AdsBlgESAf8B2wGWARIB/wMqAUAY
|
||||||
AAHbAZYBEgH/AdsBlgESAf8B2wGWARIB/wgAAdsBlgESAf8B2wGWARIB/wHbAZYBEgH/AdsBlgESAf8B
|
AAHbAZYBEgH/AdsBlgESAf8B2wGWARIB/wgAAdsBlgESAf8B2wGWARIB/wHbAZYBEgH/AdsBlgESAf8B
|
||||||
2wGWARIB/xgAAdsBlgESAf8B2wGWARIB/wHbAZYBEgH/AdsBlgESAf8B2wGWARIB/wHbAZYBEgH/AdsB
|
2wGWARIB/xgAAdsBlgESAf8B2wGWARIB/wHbAZYBEgH/AdsBlgESAf8B2wGWARIB/wHbAZYBEgH/AdsB
|
||||||
lgESAf8B2wGWARIB/wJ8AVMB+BAAAXkBbwFRAfcB2wGWARIB/wwAAzMBUAHbAZYBEgH/BAAB2wGWARIB
|
lgESAf8B2wGWARIB/wJ8AVcB+BAAAXUBbwFRAfcB2wGWARIB/wwAAzMBUAHbAZYBEgH/BAAB2wGWARIB
|
||||||
/xAAAdsBlgESAf8QAAJbAVkBwCAAAkcBRgGAAyoBQBQAAdsBlgESAf8B2wGWARIB/wHbAZYBEgH/AdsB
|
/xAAAdsBlgESAf8QAAJbAVkBwCAAAkcBRgGAAyoBQBQAAdsBlgESAf8B2wGWARIB/wHbAZYBEgH/AdsB
|
||||||
lgESAf8MAAHbAZYBEgH/AdsBlgESAf8B2wGWARIB/wHbAZYBEgH/AdsBlgESAf8IAAHbAZYBEgH/AdsB
|
lgESAf8MAAHbAZYBEgH/AdsBlgESAf8B2wGWARIB/wHbAZYBEgH/AdsBlgESAf8IAAHbAZYBEgH/AdsB
|
||||||
lgESAf8B2wGWARIB/wHbAZYBEgH/AdsBlgESAf8B2wGWARIB/wHbAZYBEgH/AdsBlgESAf8B2wGWARIB
|
lgESAf8B2wGWARIB/wHbAZYBEgH/AdsBlgESAf8B2wGWARIB/wHbAZYBEgH/AdsBlgESAf8B2wGWARIB
|
||||||
|
|||||||
Reference in New Issue
Block a user