Skip to content

孙克 / RC1250-AssemblyLine

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 8f727f6b 由 LN
选项

1

1 个父辈 45f62419
内嵌 并排
正在显示 8 个修改的文件 包含 255 行增加 和 253 行删除
source/AssemblyLineClient/FrmProvidingEquip.Designer.cs
...@@ -587,7 +587,7 @@ ...@@ -587,7 +587,7 @@
this.groupBox2.TabStop = false; this.groupBox2.TabStop = false;
this.groupBox2.Text = "升降轴位置配置"; this.groupBox2.Text = "升降轴位置配置";
// //
// btnBoxP // btnP3
// //
this.btnP3.BackColor = System.Drawing.SystemColors.Control; this.btnP3.BackColor = System.Drawing.SystemColors.Control;
this.btnP3.Cursor = System.Windows.Forms.Cursors.Default; this.btnP3.Cursor = System.Windows.Forms.Cursors.Default;
...@@ -595,7 +595,7 @@ ...@@ -595,7 +595,7 @@
this.btnP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnP3.ForeColor = System.Drawing.SystemColors.ControlText; this.btnP3.ForeColor = System.Drawing.SystemColors.ControlText;
this.btnP3.Location = new System.Drawing.Point(316, 76); this.btnP3.Location = new System.Drawing.Point(316, 76);
this.btnP3.Name = "btnBoxP"; this.btnP3.Name = "btnP3";
this.btnP3.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnP3.Size = new System.Drawing.Size(163, 34); this.btnP3.Size = new System.Drawing.Size(163, 34);
this.btnP3.TabIndex = 312; this.btnP3.TabIndex = 312;
...@@ -603,7 +603,7 @@ ...@@ -603,7 +603,7 @@
this.btnP3.UseVisualStyleBackColor = true; this.btnP3.UseVisualStyleBackColor = true;
this.btnP3.Click += new System.EventHandler(this.btnBoxP_Click); this.btnP3.Click += new System.EventHandler(this.btnBoxP_Click);
// //
// txtBoxP // txtP3
// //
this.txtP3.BackColor = System.Drawing.SystemColors.Window; this.txtP3.BackColor = System.Drawing.SystemColors.Window;
this.txtP3.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtP3.Cursor = System.Windows.Forms.Cursors.IBeam;
...@@ -611,7 +611,7 @@ ...@@ -611,7 +611,7 @@
this.txtP3.ForeColor = System.Drawing.SystemColors.WindowText; this.txtP3.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtP3.Location = new System.Drawing.Point(483, 80); this.txtP3.Location = new System.Drawing.Point(483, 80);
this.txtP3.MaxLength = 12; this.txtP3.MaxLength = 12;
this.txtP3.Name = "txtBoxP"; this.txtP3.Name = "txtP3";
this.txtP3.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtP3.Size = new System.Drawing.Size(111, 26); this.txtP3.Size = new System.Drawing.Size(111, 26);
this.txtP3.TabIndex = 311; this.txtP3.TabIndex = 311;
...@@ -619,13 +619,14 @@ ...@@ -619,13 +619,14 @@
// //
// btnSave // btnSave
// //
this.btnSave.BackColor = System.Drawing.SystemColors.Control;
this.btnSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSave.Location = new System.Drawing.Point(180, 136); this.btnSave.Location = new System.Drawing.Point(180, 136);
this.btnSave.Name = "btnSave"; this.btnSave.Name = "btnSave";
this.btnSave.Size = new System.Drawing.Size(110, 34); this.btnSave.Size = new System.Drawing.Size(110, 34);
this.btnSave.TabIndex = 310; this.btnSave.TabIndex = 310;
this.btnSave.Text = "保存位置"; this.btnSave.Text = "保存位置";
this.btnSave.UseVisualStyleBackColor = true; this.btnSave.UseVisualStyleBackColor = false;
// //
// txtP1 // txtP1
// //
...@@ -680,7 +681,7 @@ ...@@ -680,7 +681,7 @@
this.label4.Text = "料盘尺寸："; this.label4.Text = "料盘尺寸：";
this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
// //
// btnMoveto // btnP2
// //
this.btnP2.BackColor = System.Drawing.SystemColors.Control; this.btnP2.BackColor = System.Drawing.SystemColors.Control;
this.btnP2.Cursor = System.Windows.Forms.Cursors.Default; this.btnP2.Cursor = System.Windows.Forms.Cursors.Default;
...@@ -688,7 +689,7 @@ ...@@ -688,7 +689,7 @@
this.btnP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnP2.ForeColor = System.Drawing.SystemColors.ControlText; this.btnP2.ForeColor = System.Drawing.SystemColors.ControlText;
this.btnP2.Location = new System.Drawing.Point(12, 76); this.btnP2.Location = new System.Drawing.Point(12, 76);
this.btnP2.Name = "btnMoveto"; this.btnP2.Name = "btnP2";
this.btnP2.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnP2.Size = new System.Drawing.Size(163, 34); this.btnP2.Size = new System.Drawing.Size(163, 34);
this.btnP2.TabIndex = 306; this.btnP2.TabIndex = 306;
...@@ -696,7 +697,7 @@ ...@@ -696,7 +697,7 @@
this.btnP2.UseVisualStyleBackColor = true; this.btnP2.UseVisualStyleBackColor = true;
this.btnP2.Click += new System.EventHandler(this.btnMoveto_Click); this.btnP2.Click += new System.EventHandler(this.btnMoveto_Click);
// //
// txtSizePosition // txtP2
// //
this.txtP2.BackColor = System.Drawing.SystemColors.Window; this.txtP2.BackColor = System.Drawing.SystemColors.Window;
this.txtP2.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtP2.Cursor = System.Windows.Forms.Cursors.IBeam;
...@@ -704,7 +705,7 @@ ...@@ -704,7 +705,7 @@
this.txtP2.ForeColor = System.Drawing.SystemColors.WindowText; this.txtP2.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtP2.Location = new System.Drawing.Point(179, 80); this.txtP2.Location = new System.Drawing.Point(179, 80);
this.txtP2.MaxLength = 12; this.txtP2.MaxLength = 12;
this.txtP2.Name = "txtSizePosition"; this.txtP2.Name = "txtP2";
this.txtP2.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtP2.Size = new System.Drawing.Size(111, 26); this.txtP2.Size = new System.Drawing.Size(111, 26);
this.txtP2.TabIndex = 305; this.txtP2.TabIndex = 305;
......
source/AssemblyLineClient/useControl/AxisMoveControl.Designer.cs
...@@ -29,44 +29,44 @@ ...@@ -29,44 +29,44 @@
private void InitializeComponent() private void InitializeComponent()
{ {
this.groupAxis = new System.Windows.Forms.GroupBox(); this.groupAxis = new System.Windows.Forms.GroupBox();
this.panel1 = new System.Windows.Forms.Panel();
this.label5 = new System.Windows.Forms.Label();
this.txtServoStatue = new System.Windows.Forms.TextBox();
this.label24 = new System.Windows.Forms.Label(); this.label24 = new System.Windows.Forms.Label();
this.txtAlarmStatus = new System.Windows.Forms.TextBox();
this.btnReadPosition = new System.Windows.Forms.Button();
this.label3 = new System.Windows.Forms.Label();
this.txtLimit2 = new System.Windows.Forms.TextBox(); this.txtLimit2 = new System.Windows.Forms.TextBox();
this.txtBusyStatus = new System.Windows.Forms.TextBox();
this.label22 = new System.Windows.Forms.Label(); this.label22 = new System.Windows.Forms.Label();
this.label8 = new System.Windows.Forms.Label();
this.btnGetAlarm = new System.Windows.Forms.Button();
this.label10 = new System.Windows.Forms.Label();
this.txtHomeStatus = new System.Windows.Forms.TextBox();
this.lblCountPulse = new System.Windows.Forms.TextBox();
this.txtLimit1 = new System.Windows.Forms.TextBox(); this.txtLimit1 = new System.Windows.Forms.TextBox();
this.comboBox1 = new System.Windows.Forms.ComboBox();
this.label6 = new System.Windows.Forms.Label();
this.txtHomeSingle = new System.Windows.Forms.TextBox();
this.label11 = new System.Windows.Forms.Label(); this.label11 = new System.Windows.Forms.Label();
this.txtHomeStatus = new System.Windows.Forms.TextBox(); this.txtHomeSingle = new System.Windows.Forms.TextBox();
this.label10 = new System.Windows.Forms.Label(); this.label6 = new System.Windows.Forms.Label();
this.txtBusyStatus = new System.Windows.Forms.TextBox(); this.btnComAlarmClear = new System.Windows.Forms.Button();
this.label3 = new System.Windows.Forms.Label(); this.btnAxisReturnHome = new System.Windows.Forms.Button();
this.txtAlarmStatus = new System.Windows.Forms.TextBox(); this.comboBox1 = new System.Windows.Forms.ComboBox();
this.btnGetAlarm = new System.Windows.Forms.Button();
this.btnReadPosition = new System.Windows.Forms.Button();
this.lblServerOn = new System.Windows.Forms.Label(); this.lblServerOn = new System.Windows.Forms.Label();
this.label8 = new System.Windows.Forms.Label();
this.btnOpenAxis = new System.Windows.Forms.Button(); this.btnOpenAxis = new System.Windows.Forms.Button();
this.btnCloseAxis = new System.Windows.Forms.Button(); this.btnCloseAxis = new System.Windows.Forms.Button();
this.lblCountPulse = new System.Windows.Forms.TextBox();
this.txtASpeed = new System.Windows.Forms.TextBox(); this.txtASpeed = new System.Windows.Forms.TextBox();
this.label47 = new System.Windows.Forms.Label(); this.label47 = new System.Windows.Forms.Label();
this.btnAxisVMove = new System.Windows.Forms.Button(); this.btnAxisVMove = new System.Windows.Forms.Button();
this.btnAxisRMove = new System.Windows.Forms.Button(); this.btnAxisRMove = new System.Windows.Forms.Button();
this.btnAxisReturnHome = new System.Windows.Forms.Button();
this.btnAxisAMove = new System.Windows.Forms.Button(); this.btnAxisAMove = new System.Windows.Forms.Button();
this.btnComAlarmClear = new System.Windows.Forms.Button();
this.txtAPosition = new System.Windows.Forms.TextBox(); this.txtAPosition = new System.Windows.Forms.TextBox();
this.label48 = new System.Windows.Forms.Label(); this.label48 = new System.Windows.Forms.Label();
this.btnAxisStop = new System.Windows.Forms.Button();
this.txtAxisValue = new System.Windows.Forms.TextBox(); this.txtAxisValue = new System.Windows.Forms.TextBox();
this.txtAxisDeviceName = new System.Windows.Forms.TextBox(); this.txtAxisDeviceName = new System.Windows.Forms.TextBox();
this.label45 = new System.Windows.Forms.Label(); this.label45 = new System.Windows.Forms.Label();
this.label46 = new System.Windows.Forms.Label(); this.label46 = new System.Windows.Forms.Label();
this.label49 = new System.Windows.Forms.Label(); this.label49 = new System.Windows.Forms.Label();
this.panel1 = new System.Windows.Forms.Panel(); this.btnAxisStop = new System.Windows.Forms.Button();
this.label5 = new System.Windows.Forms.Label();
this.txtServoStatue = new System.Windows.Forms.TextBox();
this.groupAxis.SuspendLayout(); this.groupAxis.SuspendLayout();
this.panel1.SuspendLayout(); this.panel1.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
...@@ -99,6 +99,51 @@ ...@@ -99,6 +99,51 @@
this.groupAxis.TabStop = false; this.groupAxis.TabStop = false;
this.groupAxis.Text = "伺服运动"; this.groupAxis.Text = "伺服运动";
// //
// panel1
//
this.panel1.Controls.Add(this.label5);
this.panel1.Controls.Add(this.txtServoStatue);
this.panel1.Controls.Add(this.label24);
this.panel1.Controls.Add(this.txtAlarmStatus);
this.panel1.Controls.Add(this.btnReadPosition);
this.panel1.Controls.Add(this.label3);
this.panel1.Controls.Add(this.txtLimit2);
this.panel1.Controls.Add(this.txtBusyStatus);
this.panel1.Controls.Add(this.label22);
this.panel1.Controls.Add(this.label8);
this.panel1.Controls.Add(this.btnGetAlarm);
this.panel1.Controls.Add(this.label10);
this.panel1.Controls.Add(this.txtHomeStatus);
this.panel1.Controls.Add(this.lblCountPulse);
this.panel1.Controls.Add(this.txtLimit1);
this.panel1.Controls.Add(this.label11);
this.panel1.Controls.Add(this.txtHomeSingle);
this.panel1.Controls.Add(this.label6);
this.panel1.Controls.Add(this.btnComAlarmClear);
this.panel1.Controls.Add(this.btnAxisReturnHome);
this.panel1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.panel1.Location = new System.Drawing.Point(11, 167);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(584, 163);
this.panel1.TabIndex = 219;
//
// label5
//
this.label5.AutoSize = true;
this.label5.Location = new System.Drawing.Point(56, 24);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(59, 17);
this.label5.TabIndex = 328;
this.label5.Text = "伺服状态:";
//
// txtServoStatue
//
this.txtServoStatue.Enabled = false;
this.txtServoStatue.Location = new System.Drawing.Point(121, 21);
this.txtServoStatue.Name = "txtServoStatue";
this.txtServoStatue.Size = new System.Drawing.Size(25, 23);
this.txtServoStatue.TabIndex = 327;
//
// label24 // label24
// //
this.label24.AutoSize = true; this.label24.AutoSize = true;
...@@ -109,6 +154,39 @@ ...@@ -109,6 +154,39 @@
this.label24.Text = "负极限信号:"; this.label24.Text = "负极限信号:";
this.label24.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label24.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
// //
// txtAlarmStatus
//
this.txtAlarmStatus.Enabled = false;
this.txtAlarmStatus.Location = new System.Drawing.Point(122, 57);
this.txtAlarmStatus.Name = "txtAlarmStatus";
this.txtAlarmStatus.Size = new System.Drawing.Size(25, 23);
this.txtAlarmStatus.TabIndex = 285;
//
// btnReadPosition
//
this.btnReadPosition.BackColor = System.Drawing.SystemColors.Control;
this.btnReadPosition.Cursor = System.Windows.Forms.Cursors.Default;
this.btnReadPosition.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnReadPosition.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnReadPosition.ForeColor = System.Drawing.SystemColors.ControlText;
this.btnReadPosition.Location = new System.Drawing.Point(343, 15);
this.btnReadPosition.Name = "btnReadPosition";
this.btnReadPosition.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnReadPosition.Size = new System.Drawing.Size(110, 34);
this.btnReadPosition.TabIndex = 278;
this.btnReadPosition.Text = "读取位置";
this.btnReadPosition.UseVisualStyleBackColor = true;
this.btnReadPosition.Click += new System.EventHandler(this.btnReadPosition_Click);
//
// label3
//
this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(54, 60);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(59, 17);
this.label3.TabIndex = 286;
this.label3.Text = "报警状态:";
//
// txtLimit2 // txtLimit2
// //
this.txtLimit2.Enabled = false; this.txtLimit2.Enabled = false;
...@@ -117,6 +195,14 @@ ...@@ -117,6 +195,14 @@
this.txtLimit2.Size = new System.Drawing.Size(25, 23); this.txtLimit2.Size = new System.Drawing.Size(25, 23);
this.txtLimit2.TabIndex = 313; this.txtLimit2.TabIndex = 313;
// //
// txtBusyStatus
//
this.txtBusyStatus.Enabled = false;
this.txtBusyStatus.Location = new System.Drawing.Point(122, 90);
this.txtBusyStatus.Name = "txtBusyStatus";
this.txtBusyStatus.Size = new System.Drawing.Size(25, 23);
this.txtBusyStatus.TabIndex = 288;
//
// label22 // label22
// //
this.label22.AutoSize = true; this.label22.AutoSize = true;
...@@ -127,41 +213,59 @@ ...@@ -127,41 +213,59 @@
this.label22.Text = "正极限信号:"; this.label22.Text = "正极限信号:";
this.label22.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label22.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
// //
// txtLimit1 // label8
// //
this.txtLimit1.Enabled = false; this.label8.AutoSize = true;
this.txtLimit1.Location = new System.Drawing.Point(251, 90); this.label8.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtLimit1.Name = "txtLimit1"; this.label8.Location = new System.Drawing.Point(156, 24);
this.txtLimit1.Size = new System.Drawing.Size(25, 23); this.label8.Name = "label8";
this.txtLimit1.TabIndex = 309; this.label8.Size = new System.Drawing.Size(59, 17);
this.label8.TabIndex = 255;
this.label8.Text = "实时位置:";
// //
// comboBox1 // btnGetAlarm
// //
this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.btnGetAlarm.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.comboBox1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnGetAlarm.Location = new System.Drawing.Point(343, 61);
this.comboBox1.FormattingEnabled = true; this.btnGetAlarm.Name = "btnGetAlarm";
this.comboBox1.Location = new System.Drawing.Point(89, 36); this.btnGetAlarm.Size = new System.Drawing.Size(110, 34);
this.comboBox1.Name = "comboBox1"; this.btnGetAlarm.TabIndex = 284;
this.comboBox1.Size = new System.Drawing.Size(227, 28); this.btnGetAlarm.Text = "读报状态";
this.comboBox1.TabIndex = 301; this.btnGetAlarm.UseVisualStyleBackColor = true;
this.comboBox1.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged); this.btnGetAlarm.Click += new System.EventHandler(this.btnGetAlarm_Click);
// //
// label6 // label10
// //
this.label6.AutoSize = true; this.label10.AutoSize = true;
this.label6.Location = new System.Drawing.Point(183, 60); this.label10.Location = new System.Drawing.Point(47, 93);
this.label6.Name = "label6"; this.label10.Name = "label10";
this.label6.Size = new System.Drawing.Size(59, 17); this.label10.Size = new System.Drawing.Size(66, 17);
this.label6.TabIndex = 300; this.label10.TabIndex = 289;
this.label6.Text = "原点信号:"; this.label10.Text = "BUSY状态:";
// //
// txtHomeSingle // txtHomeStatus
// //
this.txtHomeSingle.Enabled = false; this.txtHomeStatus.Enabled = false;
this.txtHomeSingle.Location = new System.Drawing.Point(251, 57); this.txtHomeStatus.Location = new System.Drawing.Point(122, 123);
this.txtHomeSingle.Name = "txtHomeSingle"; this.txtHomeStatus.Name = "txtHomeStatus";
this.txtHomeSingle.Size = new System.Drawing.Size(25, 23); this.txtHomeStatus.Size = new System.Drawing.Size(25, 23);
this.txtHomeSingle.TabIndex = 297; this.txtHomeStatus.TabIndex = 291;
//
// lblCountPulse
//
this.lblCountPulse.Location = new System.Drawing.Point(219, 21);
this.lblCountPulse.Name = "lblCountPulse";
this.lblCountPulse.ReadOnly = true;
this.lblCountPulse.Size = new System.Drawing.Size(88, 23);
this.lblCountPulse.TabIndex = 38;
//
// txtLimit1
//
this.txtLimit1.Enabled = false;
this.txtLimit1.Location = new System.Drawing.Point(251, 90);
this.txtLimit1.Name = "txtLimit1";
this.txtLimit1.Size = new System.Drawing.Size(25, 23);
this.txtLimit1.TabIndex = 309;
// //
// label11 // label11
// //
...@@ -172,74 +276,60 @@ ...@@ -172,74 +276,60 @@
this.label11.TabIndex = 292; this.label11.TabIndex = 292;
this.label11.Text = "HOME-CMP状态:"; this.label11.Text = "HOME-CMP状态:";
// //
// txtHomeStatus // txtHomeSingle
//
this.txtHomeStatus.Enabled = false;
this.txtHomeStatus.Location = new System.Drawing.Point(122, 123);
this.txtHomeStatus.Name = "txtHomeStatus";
this.txtHomeStatus.Size = new System.Drawing.Size(25, 23);
this.txtHomeStatus.TabIndex = 291;
//
// label10
//
this.label10.AutoSize = true;
this.label10.Location = new System.Drawing.Point(47, 93);
this.label10.Name = "label10";
this.label10.Size = new System.Drawing.Size(66, 17);
this.label10.TabIndex = 289;
this.label10.Text = "BUSY状态:";
//
// txtBusyStatus
// //
this.txtBusyStatus.Enabled = false; this.txtHomeSingle.Enabled = false;
this.txtBusyStatus.Location = new System.Drawing.Point(122, 90); this.txtHomeSingle.Location = new System.Drawing.Point(251, 57);
this.txtBusyStatus.Name = "txtBusyStatus"; this.txtHomeSingle.Name = "txtHomeSingle";
this.txtBusyStatus.Size = new System.Drawing.Size(25, 23); this.txtHomeSingle.Size = new System.Drawing.Size(25, 23);
this.txtBusyStatus.TabIndex = 288; this.txtHomeSingle.TabIndex = 297;
// //
// label3 // label6
// //
this.label3.AutoSize = true; this.label6.AutoSize = true;
this.label3.Location = new System.Drawing.Point(54, 60); this.label6.Location = new System.Drawing.Point(183, 60);
this.label3.Name = "label3"; this.label6.Name = "label6";
this.label3.Size = new System.Drawing.Size(59, 17); this.label6.Size = new System.Drawing.Size(59, 17);
this.label3.TabIndex = 286; this.label6.TabIndex = 300;
this.label3.Text = "报警状态:"; this.label6.Text = "原点信号:";
// //
// txtAlarmStatus // btnComAlarmClear
// //
this.txtAlarmStatus.Enabled = false; this.btnComAlarmClear.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.txtAlarmStatus.Location = new System.Drawing.Point(122, 57); this.btnComAlarmClear.Location = new System.Drawing.Point(343, 107);
this.txtAlarmStatus.Name = "txtAlarmStatus"; this.btnComAlarmClear.Name = "btnComAlarmClear";
this.txtAlarmStatus.Size = new System.Drawing.Size(25, 23); this.btnComAlarmClear.Size = new System.Drawing.Size(110, 34);
this.txtAlarmStatus.TabIndex = 285; this.btnComAlarmClear.TabIndex = 50;
this.btnComAlarmClear.Text = "清除报警";
this.btnComAlarmClear.UseVisualStyleBackColor = true;
this.btnComAlarmClear.Click += new System.EventHandler(this.btnComAlarmClear_Click);
// //
// btnGetAlarm // btnAxisReturnHome
// //
this.btnGetAlarm.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnAxisReturnHome.BackColor = System.Drawing.SystemColors.Control;
this.btnGetAlarm.Location = new System.Drawing.Point(343, 61); this.btnAxisReturnHome.Cursor = System.Windows.Forms.Cursors.Default;
this.btnGetAlarm.Name = "btnGetAlarm"; this.btnAxisReturnHome.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnGetAlarm.Size = new System.Drawing.Size(110, 34); this.btnAxisReturnHome.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnGetAlarm.TabIndex = 284; this.btnAxisReturnHome.ForeColor = System.Drawing.SystemColors.ControlText;
this.btnGetAlarm.Text = "读报状态"; this.btnAxisReturnHome.Location = new System.Drawing.Point(463, 15);
this.btnGetAlarm.UseVisualStyleBackColor = true; this.btnAxisReturnHome.Name = "btnAxisReturnHome";
this.btnGetAlarm.Click += new System.EventHandler(this.btnGetAlarm_Click); this.btnAxisReturnHome.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnAxisReturnHome.Size = new System.Drawing.Size(110, 34);
this.btnAxisReturnHome.TabIndex = 247;
this.btnAxisReturnHome.Text = "原点返回";
this.btnAxisReturnHome.UseVisualStyleBackColor = true;
this.btnAxisReturnHome.Click += new System.EventHandler(this.btnAxisReturnHome_Click);
// //
// btnReadPosition // comboBox1
// //
this.btnReadPosition.BackColor = System.Drawing.SystemColors.Control; this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.btnReadPosition.Cursor = System.Windows.Forms.Cursors.Default; this.comboBox1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnReadPosition.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.comboBox1.FormattingEnabled = true;
this.btnReadPosition.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.comboBox1.Location = new System.Drawing.Point(89, 36);
this.btnReadPosition.ForeColor = System.Drawing.SystemColors.ControlText; this.comboBox1.Name = "comboBox1";
this.btnReadPosition.Location = new System.Drawing.Point(343, 15); this.comboBox1.Size = new System.Drawing.Size(227, 28);
this.btnReadPosition.Name = "btnReadPosition"; this.comboBox1.TabIndex = 301;
this.btnReadPosition.RightToLeft = System.Windows.Forms.RightToLeft.No; this.comboBox1.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged);
this.btnReadPosition.Size = new System.Drawing.Size(110, 34);
this.btnReadPosition.TabIndex = 278;
this.btnReadPosition.Text = "读取位置";
this.btnReadPosition.UseVisualStyleBackColor = true;
this.btnReadPosition.Click += new System.EventHandler(this.btnReadPosition_Click);
// //
// lblServerOn // lblServerOn
// //
...@@ -252,16 +342,6 @@ ...@@ -252,16 +342,6 @@
this.lblServerOn.Size = new System.Drawing.Size(0, 19); this.lblServerOn.Size = new System.Drawing.Size(0, 19);
this.lblServerOn.TabIndex = 268; this.lblServerOn.TabIndex = 268;
// //
// label8
//
this.label8.AutoSize = true;
this.label8.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label8.Location = new System.Drawing.Point(156, 24);
this.label8.Name = "label8";
this.label8.Size = new System.Drawing.Size(59, 17);
this.label8.TabIndex = 255;
this.label8.Text = "实时位置:";
//
// btnOpenAxis // btnOpenAxis
// //
this.btnOpenAxis.BackColor = System.Drawing.SystemColors.Control; this.btnOpenAxis.BackColor = System.Drawing.SystemColors.Control;
...@@ -294,14 +374,6 @@ ...@@ -294,14 +374,6 @@
this.btnCloseAxis.UseVisualStyleBackColor = true; this.btnCloseAxis.UseVisualStyleBackColor = true;
this.btnCloseAxis.Click += new System.EventHandler(this.btnCloseAxis_Click); this.btnCloseAxis.Click += new System.EventHandler(this.btnCloseAxis_Click);
// //
// lblCountPulse
//
this.lblCountPulse.Location = new System.Drawing.Point(219, 21);
this.lblCountPulse.Name = "lblCountPulse";
this.lblCountPulse.ReadOnly = true;
this.lblCountPulse.Size = new System.Drawing.Size(88, 23);
this.lblCountPulse.TabIndex = 38;
//
// txtASpeed // txtASpeed
// //
this.txtASpeed.AcceptsReturn = true; this.txtASpeed.AcceptsReturn = true;
...@@ -363,22 +435,6 @@ ...@@ -363,22 +435,6 @@
this.btnAxisRMove.UseVisualStyleBackColor = true; this.btnAxisRMove.UseVisualStyleBackColor = true;
this.btnAxisRMove.Click += new System.EventHandler(this.btnAxisRMove_Click); this.btnAxisRMove.Click += new System.EventHandler(this.btnAxisRMove_Click);
// //
// btnAxisReturnHome
//
this.btnAxisReturnHome.BackColor = System.Drawing.SystemColors.Control;
this.btnAxisReturnHome.Cursor = System.Windows.Forms.Cursors.Default;
this.btnAxisReturnHome.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnAxisReturnHome.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnAxisReturnHome.ForeColor = System.Drawing.SystemColors.ControlText;
this.btnAxisReturnHome.Location = new System.Drawing.Point(463, 15);
this.btnAxisReturnHome.Name = "btnAxisReturnHome";
this.btnAxisReturnHome.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnAxisReturnHome.Size = new System.Drawing.Size(110, 34);
this.btnAxisReturnHome.TabIndex = 247;
this.btnAxisReturnHome.Text = "原点返回";
this.btnAxisReturnHome.UseVisualStyleBackColor = true;
this.btnAxisReturnHome.Click += new System.EventHandler(this.btnAxisReturnHome_Click);
//
// btnAxisAMove // btnAxisAMove
// //
this.btnAxisAMove.BackColor = System.Drawing.SystemColors.Control; this.btnAxisAMove.BackColor = System.Drawing.SystemColors.Control;
...@@ -395,17 +451,6 @@ ...@@ -395,17 +451,6 @@
this.btnAxisAMove.UseVisualStyleBackColor = true; this.btnAxisAMove.UseVisualStyleBackColor = true;
this.btnAxisAMove.Click += new System.EventHandler(this.btnAxisAMove_Click); this.btnAxisAMove.Click += new System.EventHandler(this.btnAxisAMove_Click);
// //
// btnComAlarmClear
//
this.btnComAlarmClear.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnComAlarmClear.Location = new System.Drawing.Point(343, 107);
this.btnComAlarmClear.Name = "btnComAlarmClear";
this.btnComAlarmClear.Size = new System.Drawing.Size(110, 34);
this.btnComAlarmClear.TabIndex = 50;
this.btnComAlarmClear.Text = "清除报警";
this.btnComAlarmClear.UseVisualStyleBackColor = true;
this.btnComAlarmClear.Click += new System.EventHandler(this.btnComAlarmClear_Click);
//
// txtAPosition // txtAPosition
// //
this.txtAPosition.BackColor = System.Drawing.SystemColors.Window; this.txtAPosition.BackColor = System.Drawing.SystemColors.Window;
...@@ -434,22 +479,6 @@ ...@@ -434,22 +479,6 @@
this.label48.Text = "目标位置:"; this.label48.Text = "目标位置:";
this.label48.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label48.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
// //
// btnAxisStop
//
this.btnAxisStop.BackColor = System.Drawing.SystemColors.Control;
this.btnAxisStop.Cursor = System.Windows.Forms.Cursors.Default;
this.btnAxisStop.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnAxisStop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnAxisStop.ForeColor = System.Drawing.SystemColors.ControlText;
this.btnAxisStop.Location = new System.Drawing.Point(474, 119);
this.btnAxisStop.Name = "btnAxisStop";
this.btnAxisStop.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnAxisStop.Size = new System.Drawing.Size(110, 34);
this.btnAxisStop.TabIndex = 246;
this.btnAxisStop.Text = " 停止运动";
this.btnAxisStop.UseVisualStyleBackColor = true;
this.btnAxisStop.Click += new System.EventHandler(this.btnAxisStop_Click);
//
// txtAxisValue // txtAxisValue
// //
this.txtAxisValue.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtAxisValue.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
...@@ -508,57 +537,28 @@ ...@@ -508,57 +537,28 @@
this.label49.Text = "AC伺服:"; this.label49.Text = "AC伺服:";
this.label49.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label49.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
// //
// panel1 // btnAxisStop
//
this.panel1.Controls.Add(this.label5);
this.panel1.Controls.Add(this.txtServoStatue);
this.panel1.Controls.Add(this.label24);
this.panel1.Controls.Add(this.txtAlarmStatus);
this.panel1.Controls.Add(this.btnReadPosition);
this.panel1.Controls.Add(this.label3);
this.panel1.Controls.Add(this.txtLimit2);
this.panel1.Controls.Add(this.txtBusyStatus);
this.panel1.Controls.Add(this.label22);
this.panel1.Controls.Add(this.label8);
this.panel1.Controls.Add(this.btnGetAlarm);
this.panel1.Controls.Add(this.label10);
this.panel1.Controls.Add(this.txtHomeStatus);
this.panel1.Controls.Add(this.lblCountPulse);
this.panel1.Controls.Add(this.txtLimit1);
this.panel1.Controls.Add(this.label11);
this.panel1.Controls.Add(this.txtHomeSingle);
this.panel1.Controls.Add(this.label6);
this.panel1.Controls.Add(this.btnComAlarmClear);
this.panel1.Controls.Add(this.btnAxisReturnHome);
this.panel1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.panel1.Location = new System.Drawing.Point(11, 167);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(608, 163);
this.panel1.TabIndex = 219;
//
// label5
//
this.label5.AutoSize = true;
this.label5.Location = new System.Drawing.Point(56, 24);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(59, 17);
this.label5.TabIndex = 328;
this.label5.Text = "伺服状态:";
//
// txtServoStatue
// //
this.txtServoStatue.Enabled = false; this.btnAxisStop.BackColor = System.Drawing.SystemColors.Control;
this.txtServoStatue.Location = new System.Drawing.Point(121, 21); this.btnAxisStop.Cursor = System.Windows.Forms.Cursors.Default;
this.txtServoStatue.Name = "txtServoStatue"; this.btnAxisStop.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.txtServoStatue.Size = new System.Drawing.Size(25, 23); this.btnAxisStop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtServoStatue.TabIndex = 327; this.btnAxisStop.ForeColor = System.Drawing.SystemColors.ControlText;
this.btnAxisStop.Location = new System.Drawing.Point(474, 119);
this.btnAxisStop.Name = "btnAxisStop";
this.btnAxisStop.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnAxisStop.Size = new System.Drawing.Size(110, 34);
this.btnAxisStop.TabIndex = 246;
this.btnAxisStop.Text = " 停止运动";
this.btnAxisStop.UseVisualStyleBackColor = true;
this.btnAxisStop.Click += new System.EventHandler(this.btnAxisStop_Click);
// //
// AxisMoveControl // AxisMoveControl
// //
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.Controls.Add(this.groupAxis); this.Controls.Add(this.groupAxis);
this.Name = "AxisMoveControl"; this.Name = "AxisMoveControl";
this.Size = new System.Drawing.Size(664, 351); this.Size = new System.Drawing.Size(625, 351);
this.groupAxis.ResumeLayout(false); this.groupAxis.ResumeLayout(false);
this.groupAxis.PerformLayout(); this.groupAxis.PerformLayout();
this.panel1.ResumeLayout(false); this.panel1.ResumeLayout(false);
......
source/AssemblyLineClient/useControl/AxisMoveControl.cs
...@@ -123,14 +123,32 @@ namespace OnlineStore.AssemblyLine ...@@ -123,14 +123,32 @@ namespace OnlineStore.AssemblyLine
private void comboBox1_SelectedIndexChanged(object sender, EventArgs e) private void comboBox1_SelectedIndexChanged(object sender, EventArgs e)
{ {
if (comboBox1.SelectedIndex > 0) if (comboBox1.SelectedIndex >= 0)
{ {
ConfigMoveAxis axis = axisList[comboBox1.SelectedIndex].Config; ConfigMoveAxis axis = axisList[comboBox1.SelectedIndex].Config;
PortName = axis.DeviceName; PortName = axis.DeviceName;
SlvAddr = axis.GetAxisValue(); SlvAddr = axis.GetAxisValue();
txtAxisDeviceName.Text = PortName; txtAxisDeviceName.Text = PortName;
txtAxisValue.Text = SlvAddr.ToString(); txtAxisValue.Text = SlvAddr.ToString();
Color color = Color.Black;
if (comboBox1.SelectedIndex.Equals(0))
{
color = Color.Red;
}
else if (comboBox1.SelectedIndex.Equals(1))
{
color = Color.Blue;
}
btnOpenAxis.ForeColor = color;
btnCloseAxis.ForeColor = color;
btnAxisAMove.ForeColor = color;
btnAxisRMove.ForeColor = color;
btnAxisVMove.ForeColor = color;
btnAxisReturnHome.ForeColor = color;
btnAxisStop.ForeColor = color;
btnComAlarmClear.ForeColor = color;
btnReadPosition.ForeColor = color;
btnGetAlarm.ForeColor = color;
} }
} }
......
source/Common/Common.csproj
...@@ -58,8 +58,6 @@ ...@@ -58,8 +58,6 @@
<Compile Include="util\ConfigAppSettings.cs" /> <Compile Include="util\ConfigAppSettings.cs" />
<Compile Include="util\FormUtil.cs" /> <Compile Include="util\FormUtil.cs" />
<Compile Include="util\HttpHelper.cs" /> <Compile Include="util\HttpHelper.cs" />
<Compile Include="util\HumitureController.cs" />
<Compile Include="util\HumitureServer.cs" />
<Compile Include="util\JsonHelper.cs" /> <Compile Include="util\JsonHelper.cs" />
<Compile Include="util\LogUtil.cs" /> <Compile Include="util\LogUtil.cs" />
<Compile Include="util\MyWebClient.cs"> <Compile Include="util\MyWebClient.cs">
......
source/DeviceLibrary/assemblyLine/ProvidingEquip.cs
...@@ -158,8 +158,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -158,8 +158,8 @@ namespace OnlineStore.DeviceLibrary
} }
isInPro = false; isInPro = false;
} }
protected override void ResetProcess( ) protected override void ResetProcess()
{ {
if (MoveInfo.IsInWait) if (MoveInfo.IsInWait)
{ {
...@@ -175,8 +175,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -175,8 +175,8 @@ namespace OnlineStore.DeviceLibrary
{ {
case LineMoveStep.MH_UpDownHomeMove: case LineMoveStep.MH_UpDownHomeMove:
MoveInfo.NextMoveStep(LineMoveStep.MH_UpDownCylinder_Up); MoveInfo.NextMoveStep(LineMoveStep.MH_UpDownCylinder_Up);
LogInfo(MoveInfo.MoveType+" ： (上下轴原点返回完成，上下轴走到待机点 )开始"); LogInfo(MoveInfo.MoveType + " ： (上下轴原点返回完成，上下轴走到待机点 )开始");
UpdownUpMove(); UpdownUpMove();
break; break;
case LineMoveStep.MH_UpDownCylinder_Up: case LineMoveStep.MH_UpDownCylinder_Up:
...@@ -198,10 +198,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -198,10 +198,10 @@ namespace OnlineStore.DeviceLibrary
lineStatus = LineStatus.Debugging; lineStatus = LineStatus.Debugging;
} }
else else
{ {
lineStatus = LineStatus.StoreOnline; lineStatus = LineStatus.StoreOnline;
} }
break; break;
default: break; default: break;
} }
......
source/DeviceLibrary/assemblyLine/ProvidingEquip_Partial.cs
...@@ -278,7 +278,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -278,7 +278,7 @@ namespace OnlineStore.DeviceLibrary
MoveInfo.NextMoveStep(LineMoveStep.PO_05_WaitBox); MoveInfo.NextMoveStep(LineMoveStep.PO_05_WaitBox);
LogInfo("出料PO_05_WaitBox【" + posId + "】处理（等待可以移栽） 更新盘号【" + num + "】为空盘"); LogInfo("出料PO_05_WaitBox【" + posId + "】处理（等待可以移栽） 更新盘号【" + num + "】为空盘");
MoveInfo.WaitList.Add(WaitResultInfo.WaitBoxCanReviceTray()); MoveInfo.WaitList.Add(WaitResultInfo.WaitBoxCanReviceTray());
TrayManager.UpdateTrayInfo(num ); TrayManager.UpdateTrayInfo(num);
//阻挡气缸移动 //阻挡气缸移动
InStoreLog("放托盘（放开阻挡）：SecondMoveInfo=MO_13_TopCylinder_Down 物品已移走，顶升气缸1下降）"); InStoreLog("放托盘（放开阻挡）：SecondMoveInfo=MO_13_TopCylinder_Down 物品已移走，顶升气缸1下降）");
...@@ -325,7 +325,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -325,7 +325,7 @@ namespace OnlineStore.DeviceLibrary
//出料皮带线停止出库 //出料皮带线停止出库
LineManager.Line.DLineStopOut(Config.DLineEquipNum, Config.DLineLineNum); LineManager.Line.DLineStopOut(Config.DLineEquipNum, Config.DLineLineNum);
} }
else if( MoveInfo.MoveStep.Equals(LineMoveStep.PO_10_BeforeAfterCylinderAfter)) else if (MoveInfo.MoveStep.Equals(LineMoveStep.PO_10_BeforeAfterCylinderAfter))
{ {
LogInfo("出料【" + posId + "】处理完成！"); LogInfo("出料【" + posId + "】处理完成！");
runStatus = LineRunStatus.Runing; runStatus = LineRunStatus.Runing;
......
source/DeviceLibrary/assemblymanager/ALineManager.cs
...@@ -56,6 +56,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -56,6 +56,7 @@ namespace OnlineStore.DeviceLibrary
DeviceConfig.SubDOList = new Dictionary<int, Dictionary<string, ConfigIO>>(); DeviceConfig.SubDOList = new Dictionary<int, Dictionary<string, ConfigIO>>();
DeviceConfig.ProIOIpMap = new Dictionary<string, string>(); DeviceConfig.ProIOIpMap = new Dictionary<string, string>();
DeviceConfig.ProRFIpMap = new Dictionary<string, string>(); DeviceConfig.ProRFIpMap = new Dictionary<string, string>();
moveECMap = new Dictionary<int, MoveEquip_Config>(); moveECMap = new Dictionary<int, MoveEquip_Config>();
feedingECMap = new Dictionary<int, FeedingEquip_Config>(); feedingECMap = new Dictionary<int, FeedingEquip_Config>();
providingECMap = new Dictionary<int, ProvidingEquip_Config>(); providingECMap = new Dictionary<int, ProvidingEquip_Config>();
......
source/DeviceLibrary/deviceLibrary/halcon/CodeManager.cs
...@@ -12,11 +12,8 @@ using System.Windows.Forms; ...@@ -12,11 +12,8 @@ using System.Windows.Forms;
namespace OnlineStore.DeviceLibrary namespace OnlineStore.DeviceLibrary
{ {
public class CodeManager public class CodeManager
{ {
public static List<string> codeTypeList = new List<string>();
// public static List<string> cameraNameList = new List<string>();
public static List<string> codeTypeList = new List<string>();
public static List<string> balserNameList = new List<string>(); public static List<string> balserNameList = new List<string>();
public static List<string> hikNameList = new List<string>(); public static List<string> hikNameList = new List<string>();
...@@ -25,24 +22,12 @@ namespace OnlineStore.DeviceLibrary ...@@ -25,24 +22,12 @@ namespace OnlineStore.DeviceLibrary
/// 初始化摄像机名称和二维码类型 /// 初始化摄像机名称和二维码类型
/// </summary> /// </summary>
public static void LoadConfig() public static void LoadConfig()
{ {
// string nameStr = ConfigAppSettings.GetValue(Setting_Init.CameraName); string codeStr = ConfigAppSettings.GetValue(Setting_Init.CodeType);
string codeStr = ConfigAppSettings.GetValue(Setting_Init.CodeType);
// cameraNameList = new List<string>();
codeTypeList = new List<string>(); codeTypeList = new List<string>();
HDLogUtil.LogName = "RollingLogFileAppender"; HDLogUtil.LogName = "RollingLogFileAppender";
try try
{ {
//string[] nameArray = nameStr.Split(spiltChar);
//foreach (string str in nameArray)
//{
// if (str.Trim().Equals(""))
// {
// continue;
// }
// //LogUtil.info("加载到配置摄像机名称：" + str.Trim());
// cameraNameList.Add(str.Trim());
//}
string[] codeArray = codeStr.Split(spiltChar); string[] codeArray = codeStr.Split(spiltChar);
foreach (string str in codeArray) foreach (string str in codeArray)
{ {
...@@ -55,8 +40,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -55,8 +40,7 @@ namespace OnlineStore.DeviceLibrary
} }
LoadCamera(false); LoadCamera(false);
CodeLibrary.HDCodeLearnHelper.LoadConfig("", codeStr); CodeLibrary.HDCodeLearnHelper.LoadConfig("", codeStr);
} }
catch (Exception ex) catch (Exception ex)
{ {
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!