Skip to content

刘韬 / 1069_MIMO_PlUS

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 86b74e27 由 张东亮
选项

led设置

1 个父辈 927669a5
内嵌 并排
正在显示 3 个修改的文件 包含 17 行增加 和 15 行删除
DeviceLibrary/DeviceLibrary/CodeManager.cs
...@@ -287,8 +287,8 @@ namespace DeviceLibrary ...@@ -287,8 +287,8 @@ namespace DeviceLibrary
string code = ConfigHelper.Config.Get("CamTestReel_barcode", "RW0000015"); string code = ConfigHelper.Config.Get("CamTestReel_barcode", "RW0000015");
int codeThreshold = ConfigHelper.Config.Get("CamTestReel_barcodeThreshold", 2); int codeThreshold = ConfigHelper.Config.Get("CamTestReel_barcodeThreshold", 2);
if (ConfigHelper.Config.Get("CamTestReel_debug", false)) //if (ConfigHelper.Config.Get("CamTestReel_debug", false))
srcimg = SaveImageToFile("test", cameraName, bmp); // srcimg = SaveImageToFile("test", cameraName, bmp);
bool hasReel = false; bool hasReel = false;
RemoteDecodeHelper.RemoteDecodeParam remoteDecodeParam = new RemoteDecodeHelper.RemoteDecodeParam RemoteDecodeHelper.RemoteDecodeParam remoteDecodeParam = new RemoteDecodeHelper.RemoteDecodeParam
{ {
...@@ -347,7 +347,7 @@ namespace DeviceLibrary ...@@ -347,7 +347,7 @@ namespace DeviceLibrary
if (bmp != null) if (bmp != null)
bmp.Dispose(); bmp.Dispose();
if (!string.IsNullOrEmpty(logtxt)) if (!string.IsNullOrEmpty(logtxt))
LogUtil.error(logtxt); LogUtil.info(logtxt);
Monitor.Exit(testLocObj); Monitor.Exit(testLocObj);
} }
} }
......
TheMachine/Form1.cs
...@@ -293,7 +293,7 @@ namespace TheMachine ...@@ -293,7 +293,7 @@ namespace TheMachine
{ {
Camera._cam.CaptureOnImage(cameraName, out Bitmap bmp, true); Camera._cam.CaptureOnImage(cameraName, out Bitmap bmp, true);
LogUtil.error($"测试拍照:{cameraName}完成"); LogUtil.error($"测试拍照:{cameraName}完成");
bmp.Dispose(); bmp?.Dispose();
} }
catch (Exception ex) catch (Exception ex)
{ {
......
TheMachine/SettingControl.Designer.cs
...@@ -39,8 +39,8 @@ namespace TheMachine ...@@ -39,8 +39,8 @@ namespace TheMachine
this.tp = new System.Windows.Forms.TableLayoutPanel(); this.tp = new System.Windows.Forms.TableLayoutPanel();
this.cb_usefixpos = new System.Windows.Forms.CheckBox(); this.cb_usefixpos = new System.Windows.Forms.CheckBox();
this.button1 = new System.Windows.Forms.Button(); this.button1 = new System.Windows.Forms.Button();
this.uC_SetUserPassword1 = new TheMachine.UC_SetUserPassword();
this.uC_LedConfig1 = new TheMachine.UC_LedConfig(); this.uC_LedConfig1 = new TheMachine.UC_LedConfig();
this.uC_SetUserPassword1 = new TheMachine.UC_SetUserPassword();
this.tp.SuspendLayout(); this.tp.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
// //
...@@ -159,28 +159,30 @@ namespace TheMachine ...@@ -159,28 +159,30 @@ namespace TheMachine
this.button1.Visible = false; this.button1.Visible = false;
this.button1.Click += new System.EventHandler(this.button1_Click_1); this.button1.Click += new System.EventHandler(this.button1_Click_1);
// //
// uC_LedConfig1
//
this.uC_LedConfig1.AutoScroll = true;
this.uC_LedConfig1.Config = null;
this.uC_LedConfig1.Location = new System.Drawing.Point(16, 248);
this.uC_LedConfig1.Name = "uC_LedConfig1";
this.uC_LedConfig1.Size = new System.Drawing.Size(859, 440);
this.uC_LedConfig1.TabIndex = 9;
this.uC_LedConfig1.Tag = "not";
//
// uC_SetUserPassword1 // uC_SetUserPassword1
// //
this.uC_SetUserPassword1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.uC_SetUserPassword1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.uC_SetUserPassword1.Location = new System.Drawing.Point(327, 3); this.uC_SetUserPassword1.Location = new System.Drawing.Point(327, 3);
this.uC_SetUserPassword1.Margin = new System.Windows.Forms.Padding(5); this.uC_SetUserPassword1.Margin = new System.Windows.Forms.Padding(5);
this.uC_SetUserPassword1.Name = "uC_SetUserPassword1"; this.uC_SetUserPassword1.Name = "uC_SetUserPassword1";
this.uC_SetUserPassword1.Size = new System.Drawing.Size(405, 276); this.uC_SetUserPassword1.Size = new System.Drawing.Size(393, 237);
this.uC_SetUserPassword1.TabIndex = 8; this.uC_SetUserPassword1.TabIndex = 8;
this.uC_SetUserPassword1.Tag = "not"; this.uC_SetUserPassword1.Tag = "not";
// //
// uC_LedConfig1
//
this.uC_LedConfig1.Config = null;
this.uC_LedConfig1.Location = new System.Drawing.Point(13, 287);
this.uC_LedConfig1.Name = "uC_LedConfig1";
this.uC_LedConfig1.Size = new System.Drawing.Size(859, 440);
this.uC_LedConfig1.TabIndex = 9;
this.uC_LedConfig1.Tag = "not";
//
// SettingControl // SettingControl
// //
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.AutoScroll = true;
this.Controls.Add(this.uC_LedConfig1); this.Controls.Add(this.uC_LedConfig1);
this.Controls.Add(this.uC_SetUserPassword1); this.Controls.Add(this.uC_SetUserPassword1);
this.Controls.Add(this.button1); this.Controls.Add(this.button1);
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!