diff --git a/ICS/CardReader.cs b/ICS/CardReader.cs index 0b7e62b..9ea7269 100644 --- a/ICS/CardReader.cs +++ b/ICS/CardReader.cs @@ -8,6 +8,7 @@ using System.Linq; using System.Runtime.InteropServices; using System.Text; +using System.Threading; using System.Windows.Forms; namespace ICS @@ -37,14 +38,14 @@ { string result = ""; CardInfo cardInfo = null; - + int iPort = 1001; try { //身份证读卡器初始化 - if (cardReaderInited == false) + //if (cardReaderInited == false) { int iRet = -1; ; - int iPort = 1001; + iRet = SDT_OpenPort(iPort); if (iRet != 0x90) { @@ -66,6 +67,7 @@ UInt32 puiPHMsgLen = 0; int st = 0; st = SDT_StartFindIDCard(1001, CardPUCIIN, 1); + Thread.Sleep(200); if (st == 0x9f) { st = SDT_SelectIDCard(1001, pucManaMsg, 1); @@ -126,7 +128,8 @@ if (cardInfo != null) { result = JsonConvert.SerializeObject(cardInfo); - } + } + SDT_ClosePort(iPort); } return result; } @@ -184,7 +187,7 @@ try { //身份证读卡器初始化 - if (cardReaderInited2 == false) + //if (cardReaderInited2 == false) { int AutoSearchReader = InitCommExt(); if (AutoSearchReader > 0) diff --git a/ICS/CardReader.cs b/ICS/CardReader.cs index 0b7e62b..9ea7269 100644 --- a/ICS/CardReader.cs +++ b/ICS/CardReader.cs @@ -8,6 +8,7 @@ using System.Linq; using System.Runtime.InteropServices; using System.Text; +using System.Threading; using System.Windows.Forms; namespace ICS @@ -37,14 +38,14 @@ { string result = ""; CardInfo cardInfo = null; - + int iPort = 1001; try { //身份证读卡器初始化 - if (cardReaderInited == false) + //if (cardReaderInited == false) { int iRet = -1; ; - int iPort = 1001; + iRet = SDT_OpenPort(iPort); if (iRet != 0x90) { @@ -66,6 +67,7 @@ UInt32 puiPHMsgLen = 0; int st = 0; st = SDT_StartFindIDCard(1001, CardPUCIIN, 1); + Thread.Sleep(200); if (st == 0x9f) { st = SDT_SelectIDCard(1001, pucManaMsg, 1); @@ -126,7 +128,8 @@ if (cardInfo != null) { result = JsonConvert.SerializeObject(cardInfo); - } + } + SDT_ClosePort(iPort); } return result; } @@ -184,7 +187,7 @@ try { //身份证读卡器初始化 - if (cardReaderInited2 == false) + //if (cardReaderInited2 == false) { int AutoSearchReader = InitCommExt(); if (AutoSearchReader > 0) diff --git a/ICS/Form1.Designer.cs b/ICS/Form1.Designer.cs index b25c0ef..b9182aa 100644 --- a/ICS/Form1.Designer.cs +++ b/ICS/Form1.Designer.cs @@ -38,7 +38,6 @@ this.label1 = new System.Windows.Forms.Label(); this.notifyIcon1 = new System.Windows.Forms.NotifyIcon(this.components); this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); - this.wizard1 = new DevComponents.DotNetBar.Wizard(); this.axIrisDevCtrl1 = new AxIrisDevCtrlLib.AxIrisDevCtrl(); this.irisColCtrl1 = new IrisCtrl.IrisColCtrl(); this.label_initDev = new System.Windows.Forms.Label(); @@ -143,36 +142,6 @@ this.contextMenuStrip1.Name = "contextMenuStrip1"; this.contextMenuStrip1.Size = new System.Drawing.Size(61, 4); // - // wizard1 - // - this.wizard1.CancelButtonText = "Cancel"; - this.wizard1.FinishButtonTabIndex = 3; - // - // - // - this.wizard1.FooterStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.wizard1.HeaderCaptionFont = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.wizard1.HeaderDescriptionFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.wizard1.HeaderDescriptionIndent = 16; - // - // - // - this.wizard1.HeaderStyle.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - this.wizard1.HeaderStyle.BackColorGradientAngle = 90; - this.wizard1.HeaderStyle.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Etched; - this.wizard1.HeaderStyle.BorderBottomWidth = 1; - this.wizard1.HeaderStyle.BorderColor = System.Drawing.SystemColors.Control; - this.wizard1.HeaderStyle.BorderLeftWidth = 1; - this.wizard1.HeaderStyle.BorderRightWidth = 1; - this.wizard1.HeaderStyle.BorderTopWidth = 1; - this.wizard1.HeaderStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.wizard1.HeaderStyle.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; - this.wizard1.HeaderStyle.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; - this.wizard1.Location = new System.Drawing.Point(0, 0); - this.wizard1.Name = "Wizard"; - this.wizard1.Size = new System.Drawing.Size(548, 375); - this.wizard1.TabIndex = 0; - // // axIrisDevCtrl1 // this.axIrisDevCtrl1.Enabled = true; @@ -216,8 +185,8 @@ this.ClientSize = new System.Drawing.Size(639, 330); this.Controls.Add(this.label_initDev); this.Controls.Add(this.panel_title); - this.Controls.Add(this.irisColCtrl1); this.Controls.Add(this.axIrisDevCtrl1); + this.Controls.Add(this.irisColCtrl1); this.DoubleBuffered = true; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; this.Name = "Form1"; diff --git a/ICS/CardReader.cs b/ICS/CardReader.cs index 0b7e62b..9ea7269 100644 --- a/ICS/CardReader.cs +++ b/ICS/CardReader.cs @@ -8,6 +8,7 @@ using System.Linq; using System.Runtime.InteropServices; using System.Text; +using System.Threading; using System.Windows.Forms; namespace ICS @@ -37,14 +38,14 @@ { string result = ""; CardInfo cardInfo = null; - + int iPort = 1001; try { //身份证读卡器初始化 - if (cardReaderInited == false) + //if (cardReaderInited == false) { int iRet = -1; ; - int iPort = 1001; + iRet = SDT_OpenPort(iPort); if (iRet != 0x90) { @@ -66,6 +67,7 @@ UInt32 puiPHMsgLen = 0; int st = 0; st = SDT_StartFindIDCard(1001, CardPUCIIN, 1); + Thread.Sleep(200); if (st == 0x9f) { st = SDT_SelectIDCard(1001, pucManaMsg, 1); @@ -126,7 +128,8 @@ if (cardInfo != null) { result = JsonConvert.SerializeObject(cardInfo); - } + } + SDT_ClosePort(iPort); } return result; } @@ -184,7 +187,7 @@ try { //身份证读卡器初始化 - if (cardReaderInited2 == false) + //if (cardReaderInited2 == false) { int AutoSearchReader = InitCommExt(); if (AutoSearchReader > 0) diff --git a/ICS/Form1.Designer.cs b/ICS/Form1.Designer.cs index b25c0ef..b9182aa 100644 --- a/ICS/Form1.Designer.cs +++ b/ICS/Form1.Designer.cs @@ -38,7 +38,6 @@ this.label1 = new System.Windows.Forms.Label(); this.notifyIcon1 = new System.Windows.Forms.NotifyIcon(this.components); this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); - this.wizard1 = new DevComponents.DotNetBar.Wizard(); this.axIrisDevCtrl1 = new AxIrisDevCtrlLib.AxIrisDevCtrl(); this.irisColCtrl1 = new IrisCtrl.IrisColCtrl(); this.label_initDev = new System.Windows.Forms.Label(); @@ -143,36 +142,6 @@ this.contextMenuStrip1.Name = "contextMenuStrip1"; this.contextMenuStrip1.Size = new System.Drawing.Size(61, 4); // - // wizard1 - // - this.wizard1.CancelButtonText = "Cancel"; - this.wizard1.FinishButtonTabIndex = 3; - // - // - // - this.wizard1.FooterStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.wizard1.HeaderCaptionFont = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.wizard1.HeaderDescriptionFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.wizard1.HeaderDescriptionIndent = 16; - // - // - // - this.wizard1.HeaderStyle.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - this.wizard1.HeaderStyle.BackColorGradientAngle = 90; - this.wizard1.HeaderStyle.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Etched; - this.wizard1.HeaderStyle.BorderBottomWidth = 1; - this.wizard1.HeaderStyle.BorderColor = System.Drawing.SystemColors.Control; - this.wizard1.HeaderStyle.BorderLeftWidth = 1; - this.wizard1.HeaderStyle.BorderRightWidth = 1; - this.wizard1.HeaderStyle.BorderTopWidth = 1; - this.wizard1.HeaderStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.wizard1.HeaderStyle.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; - this.wizard1.HeaderStyle.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; - this.wizard1.Location = new System.Drawing.Point(0, 0); - this.wizard1.Name = "Wizard"; - this.wizard1.Size = new System.Drawing.Size(548, 375); - this.wizard1.TabIndex = 0; - // // axIrisDevCtrl1 // this.axIrisDevCtrl1.Enabled = true; @@ -216,8 +185,8 @@ this.ClientSize = new System.Drawing.Size(639, 330); this.Controls.Add(this.label_initDev); this.Controls.Add(this.panel_title); - this.Controls.Add(this.irisColCtrl1); this.Controls.Add(this.axIrisDevCtrl1); + this.Controls.Add(this.irisColCtrl1); this.DoubleBuffered = true; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; this.Name = "Form1"; diff --git a/ICS/Form1.cs b/ICS/Form1.cs index c65db61..2a2c6ef 100644 --- a/ICS/Form1.cs +++ b/ICS/Form1.cs @@ -190,7 +190,7 @@ string eyeType = "3"; if (value.Length > 2) eyeType = value.Substring(value.Length - 1); string collType = "{\"eyeType\":\"" + eyeType + "\"}"; - irisColCtrl1.StartCapture(collType); + axIrisDevCtrl1.StartCapture(collType); } } // 停止采集 @@ -254,18 +254,30 @@ } else if (reValue.Contains("ReadIdCard")) { + //int iRet = -1; ; + //int iPort = 1001; + //iRet = CardReader.SDT_OpenPort(iPort); + //if (iRet != 0x90) + //{ + // CardReader.cardReaderInited = false; + // CardReader.cardReaderInited2 = false; + // MessageBox.Show("身份证读卡器初始化失败！", "提示"); + // CardReader.SDT_ClosePort(iPort); + // return; + //} string sendMsg = ""; - if (ConfigHelper.GetAppConfig("cardReaderType") == "w") + //if (ConfigHelper.GetAppConfig("cardReaderType") == "w") { sendMsg = CardReader.readCardInfo(); } - else if (ConfigHelper.GetAppConfig("cardReaderType") == "b") - { - sendMsg = CardReader.readCardInfo2(); - } + //else if (ConfigHelper.GetAppConfig("cardReaderType") == "b") + //{ + // sendMsg = CardReader.readCardInfo2(); + //} if (sendMsg == "") sendMsg = "{\"message\":\"fail\"}"; SendMsgToClient(reValue, sendMsg); + //CardReader.SDT_ClosePort(iPort); } } catch (Exception ex)