diff --git a/fingerPrint/fingerPrint.csproj b/fingerPrint/fingerPrint.csproj index 189f057..f41153d 100644 --- a/fingerPrint/fingerPrint.csproj +++ b/fingerPrint/fingerPrint.csproj @@ -57,13 +57,6 @@ - - Form - - - Form1.cs - - ResXFileCodeGenerator diff --git a/fingerPrint/fingerPrint.csproj b/fingerPrint/fingerPrint.csproj index 189f057..f41153d 100644 --- a/fingerPrint/fingerPrint.csproj +++ b/fingerPrint/fingerPrint.csproj @@ -57,13 +57,6 @@ - - Form - - - Form1.cs - - ResXFileCodeGenerator diff --git a/irisDataBase/app.config b/irisDataBase/app.config new file mode 100644 index 0000000..12e70e5 --- /dev/null +++ b/irisDataBase/app.config @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/fingerPrint/fingerPrint.csproj b/fingerPrint/fingerPrint.csproj index 189f057..f41153d 100644 --- a/fingerPrint/fingerPrint.csproj +++ b/fingerPrint/fingerPrint.csproj @@ -57,13 +57,6 @@ - - Form - - - Form1.cs - - ResXFileCodeGenerator diff --git a/irisDataBase/app.config b/irisDataBase/app.config new file mode 100644 index 0000000..12e70e5 --- /dev/null +++ b/irisDataBase/app.config @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/irisDataBase/irisDataBase.csproj b/irisDataBase/irisDataBase.csproj index 1e5bfde..97cd8ce 100644 --- a/irisDataBase/irisDataBase.csproj +++ b/irisDataBase/irisDataBase.csproj @@ -31,8 +31,8 @@ 4 - - ..\bin\Debug\MySql.Data.dll + + ..\packages\MySql.Data.6.7.9\lib\net40\MySql.Data.dll False @@ -92,5 +92,9 @@ + + + + \ No newline at end of file diff --git a/fingerPrint/fingerPrint.csproj b/fingerPrint/fingerPrint.csproj index 189f057..f41153d 100644 --- a/fingerPrint/fingerPrint.csproj +++ b/fingerPrint/fingerPrint.csproj @@ -57,13 +57,6 @@ - - Form - - - Form1.cs - - ResXFileCodeGenerator diff --git a/irisDataBase/app.config b/irisDataBase/app.config new file mode 100644 index 0000000..12e70e5 --- /dev/null +++ b/irisDataBase/app.config @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/irisDataBase/irisDataBase.csproj b/irisDataBase/irisDataBase.csproj index 1e5bfde..97cd8ce 100644 --- a/irisDataBase/irisDataBase.csproj +++ b/irisDataBase/irisDataBase.csproj @@ -31,8 +31,8 @@ 4 - - ..\bin\Debug\MySql.Data.dll + + ..\packages\MySql.Data.6.7.9\lib\net40\MySql.Data.dll False @@ -92,5 +92,9 @@ + + + + \ No newline at end of file diff --git a/irisDataBase/packages.config b/irisDataBase/packages.config new file mode 100644 index 0000000..77dce52 --- /dev/null +++ b/irisDataBase/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/fingerPrint/fingerPrint.csproj b/fingerPrint/fingerPrint.csproj index 189f057..f41153d 100644 --- a/fingerPrint/fingerPrint.csproj +++ b/fingerPrint/fingerPrint.csproj @@ -57,13 +57,6 @@ - - Form - - - Form1.cs - - ResXFileCodeGenerator diff --git a/irisDataBase/app.config b/irisDataBase/app.config new file mode 100644 index 0000000..12e70e5 --- /dev/null +++ b/irisDataBase/app.config @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/irisDataBase/irisDataBase.csproj b/irisDataBase/irisDataBase.csproj index 1e5bfde..97cd8ce 100644 --- a/irisDataBase/irisDataBase.csproj +++ b/irisDataBase/irisDataBase.csproj @@ -31,8 +31,8 @@ 4 - - ..\bin\Debug\MySql.Data.dll + + ..\packages\MySql.Data.6.7.9\lib\net40\MySql.Data.dll False @@ -92,5 +92,9 @@ + + + + \ No newline at end of file diff --git a/irisDataBase/packages.config b/irisDataBase/packages.config new file mode 100644 index 0000000..77dce52 --- /dev/null +++ b/irisDataBase/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/irisDoor/app.config b/irisDoor/app.config new file mode 100644 index 0000000..12e70e5 --- /dev/null +++ b/irisDoor/app.config @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/fingerPrint/fingerPrint.csproj b/fingerPrint/fingerPrint.csproj index 189f057..f41153d 100644 --- a/fingerPrint/fingerPrint.csproj +++ b/fingerPrint/fingerPrint.csproj @@ -57,13 +57,6 @@ - - Form - - - Form1.cs - - ResXFileCodeGenerator diff --git a/irisDataBase/app.config b/irisDataBase/app.config new file mode 100644 index 0000000..12e70e5 --- /dev/null +++ b/irisDataBase/app.config @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/irisDataBase/irisDataBase.csproj b/irisDataBase/irisDataBase.csproj index 1e5bfde..97cd8ce 100644 --- a/irisDataBase/irisDataBase.csproj +++ b/irisDataBase/irisDataBase.csproj @@ -31,8 +31,8 @@ 4 - - ..\bin\Debug\MySql.Data.dll + + ..\packages\MySql.Data.6.7.9\lib\net40\MySql.Data.dll False @@ -92,5 +92,9 @@ + + + + \ No newline at end of file diff --git a/irisDataBase/packages.config b/irisDataBase/packages.config new file mode 100644 index 0000000..77dce52 --- /dev/null +++ b/irisDataBase/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/irisDoor/app.config b/irisDoor/app.config new file mode 100644 index 0000000..12e70e5 --- /dev/null +++ b/irisDoor/app.config @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/irisDoor/irisDoor.csproj b/irisDoor/irisDoor.csproj index 97b6122..ac7505a 100644 --- a/irisDoor/irisDoor.csproj +++ b/irisDoor/irisDoor.csproj @@ -34,8 +34,8 @@ ..\bin\Debug\ImageFormatter.dll - - ..\bin\Debug\MySql.Data.dll + + ..\packages\MySql.Data.6.7.9\lib\net40\MySql.Data.dll @@ -56,5 +56,9 @@ irisHelper + + + + \ No newline at end of file diff --git a/fingerPrint/fingerPrint.csproj b/fingerPrint/fingerPrint.csproj index 189f057..f41153d 100644 --- a/fingerPrint/fingerPrint.csproj +++ b/fingerPrint/fingerPrint.csproj @@ -57,13 +57,6 @@ - - Form - - - Form1.cs - - ResXFileCodeGenerator diff --git a/irisDataBase/app.config b/irisDataBase/app.config new file mode 100644 index 0000000..12e70e5 --- /dev/null +++ b/irisDataBase/app.config @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/irisDataBase/irisDataBase.csproj b/irisDataBase/irisDataBase.csproj index 1e5bfde..97cd8ce 100644 --- a/irisDataBase/irisDataBase.csproj +++ b/irisDataBase/irisDataBase.csproj @@ -31,8 +31,8 @@ 4 - - ..\bin\Debug\MySql.Data.dll + + ..\packages\MySql.Data.6.7.9\lib\net40\MySql.Data.dll False @@ -92,5 +92,9 @@ + + + + \ No newline at end of file diff --git a/irisDataBase/packages.config b/irisDataBase/packages.config new file mode 100644 index 0000000..77dce52 --- /dev/null +++ b/irisDataBase/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/irisDoor/app.config b/irisDoor/app.config new file mode 100644 index 0000000..12e70e5 --- /dev/null +++ b/irisDoor/app.config @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/irisDoor/irisDoor.csproj b/irisDoor/irisDoor.csproj index 97b6122..ac7505a 100644 --- a/irisDoor/irisDoor.csproj +++ b/irisDoor/irisDoor.csproj @@ -34,8 +34,8 @@ ..\bin\Debug\ImageFormatter.dll - - ..\bin\Debug\MySql.Data.dll + + ..\packages\MySql.Data.6.7.9\lib\net40\MySql.Data.dll @@ -56,5 +56,9 @@ irisHelper + + + + \ No newline at end of file diff --git a/irisDoor/packages.config b/irisDoor/packages.config new file mode 100644 index 0000000..77dce52 --- /dev/null +++ b/irisDoor/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/fingerPrint/fingerPrint.csproj b/fingerPrint/fingerPrint.csproj index 189f057..f41153d 100644 --- a/fingerPrint/fingerPrint.csproj +++ b/fingerPrint/fingerPrint.csproj @@ -57,13 +57,6 @@ - - Form - - - Form1.cs - - ResXFileCodeGenerator diff --git a/irisDataBase/app.config b/irisDataBase/app.config new file mode 100644 index 0000000..12e70e5 --- /dev/null +++ b/irisDataBase/app.config @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/irisDataBase/irisDataBase.csproj b/irisDataBase/irisDataBase.csproj index 1e5bfde..97cd8ce 100644 --- a/irisDataBase/irisDataBase.csproj +++ b/irisDataBase/irisDataBase.csproj @@ -31,8 +31,8 @@ 4 - - ..\bin\Debug\MySql.Data.dll + + ..\packages\MySql.Data.6.7.9\lib\net40\MySql.Data.dll False @@ -92,5 +92,9 @@ + + + + \ No newline at end of file diff --git a/irisDataBase/packages.config b/irisDataBase/packages.config new file mode 100644 index 0000000..77dce52 --- /dev/null +++ b/irisDataBase/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/irisDoor/app.config b/irisDoor/app.config new file mode 100644 index 0000000..12e70e5 --- /dev/null +++ b/irisDoor/app.config @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/irisDoor/irisDoor.csproj b/irisDoor/irisDoor.csproj index 97b6122..ac7505a 100644 --- a/irisDoor/irisDoor.csproj +++ b/irisDoor/irisDoor.csproj @@ -34,8 +34,8 @@ ..\bin\Debug\ImageFormatter.dll - - ..\bin\Debug\MySql.Data.dll + + ..\packages\MySql.Data.6.7.9\lib\net40\MySql.Data.dll @@ -56,5 +56,9 @@ irisHelper + + + + \ No newline at end of file diff --git a/irisDoor/packages.config b/irisDoor/packages.config new file mode 100644 index 0000000..77dce52 --- /dev/null +++ b/irisDoor/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/irisRefactor/App.config b/irisRefactor/App.config index 2b5f8f1..0884344 100644 --- a/irisRefactor/App.config +++ b/irisRefactor/App.config @@ -59,8 +59,8 @@ - - + + @@ -154,8 +154,13 @@ - + - \ No newline at end of file + + + + + + \ No newline at end of file diff --git a/fingerPrint/fingerPrint.csproj b/fingerPrint/fingerPrint.csproj index 189f057..f41153d 100644 --- a/fingerPrint/fingerPrint.csproj +++ b/fingerPrint/fingerPrint.csproj @@ -57,13 +57,6 @@ - - Form - - - Form1.cs - - ResXFileCodeGenerator diff --git a/irisDataBase/app.config b/irisDataBase/app.config new file mode 100644 index 0000000..12e70e5 --- /dev/null +++ b/irisDataBase/app.config @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/irisDataBase/irisDataBase.csproj b/irisDataBase/irisDataBase.csproj index 1e5bfde..97cd8ce 100644 --- a/irisDataBase/irisDataBase.csproj +++ b/irisDataBase/irisDataBase.csproj @@ -31,8 +31,8 @@ 4 - - ..\bin\Debug\MySql.Data.dll + + ..\packages\MySql.Data.6.7.9\lib\net40\MySql.Data.dll False @@ -92,5 +92,9 @@ + + + + \ No newline at end of file diff --git a/irisDataBase/packages.config b/irisDataBase/packages.config new file mode 100644 index 0000000..77dce52 --- /dev/null +++ b/irisDataBase/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/irisDoor/app.config b/irisDoor/app.config new file mode 100644 index 0000000..12e70e5 --- /dev/null +++ b/irisDoor/app.config @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/irisDoor/irisDoor.csproj b/irisDoor/irisDoor.csproj index 97b6122..ac7505a 100644 --- a/irisDoor/irisDoor.csproj +++ b/irisDoor/irisDoor.csproj @@ -34,8 +34,8 @@ ..\bin\Debug\ImageFormatter.dll - - ..\bin\Debug\MySql.Data.dll + + ..\packages\MySql.Data.6.7.9\lib\net40\MySql.Data.dll @@ -56,5 +56,9 @@ irisHelper + + + + \ No newline at end of file diff --git a/irisDoor/packages.config b/irisDoor/packages.config new file mode 100644 index 0000000..77dce52 --- /dev/null +++ b/irisDoor/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/irisRefactor/App.config b/irisRefactor/App.config index 2b5f8f1..0884344 100644 --- a/irisRefactor/App.config +++ b/irisRefactor/App.config @@ -59,8 +59,8 @@ - - + + @@ -154,8 +154,13 @@ - + - \ No newline at end of file + + + + + + \ No newline at end of file diff --git a/irisRefactor/FrmService/Form2.designer.cs b/irisRefactor/FrmService/Form2.designer.cs index a15ce17..8854b96 100644 --- a/irisRefactor/FrmService/Form2.designer.cs +++ b/irisRefactor/FrmService/Form2.designer.cs @@ -207,11 +207,11 @@ // this.type_label.AutoSize = true; this.type_label.BackColor = System.Drawing.Color.Transparent; - this.type_label.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.type_label.ForeColor = System.Drawing.Color.White; + this.type_label.Font = new System.Drawing.Font("微软雅黑", 24F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.type_label.ForeColor = System.Drawing.Color.Lime; this.type_label.Location = new System.Drawing.Point(510, 355); this.type_label.Name = "type_label"; - this.type_label.Size = new System.Drawing.Size(20, 31); + this.type_label.Size = new System.Drawing.Size(26, 41); this.type_label.TabIndex = 134; this.type_label.Text = "."; // diff --git a/fingerPrint/fingerPrint.csproj b/fingerPrint/fingerPrint.csproj index 189f057..f41153d 100644 --- a/fingerPrint/fingerPrint.csproj +++ b/fingerPrint/fingerPrint.csproj @@ -57,13 +57,6 @@ - - Form - - - Form1.cs - - ResXFileCodeGenerator diff --git a/irisDataBase/app.config b/irisDataBase/app.config new file mode 100644 index 0000000..12e70e5 --- /dev/null +++ b/irisDataBase/app.config @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/irisDataBase/irisDataBase.csproj b/irisDataBase/irisDataBase.csproj index 1e5bfde..97cd8ce 100644 --- a/irisDataBase/irisDataBase.csproj +++ b/irisDataBase/irisDataBase.csproj @@ -31,8 +31,8 @@ 4 - - ..\bin\Debug\MySql.Data.dll + + ..\packages\MySql.Data.6.7.9\lib\net40\MySql.Data.dll False @@ -92,5 +92,9 @@ + + + + \ No newline at end of file diff --git a/irisDataBase/packages.config b/irisDataBase/packages.config new file mode 100644 index 0000000..77dce52 --- /dev/null +++ b/irisDataBase/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/irisDoor/app.config b/irisDoor/app.config new file mode 100644 index 0000000..12e70e5 --- /dev/null +++ b/irisDoor/app.config @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/irisDoor/irisDoor.csproj b/irisDoor/irisDoor.csproj index 97b6122..ac7505a 100644 --- a/irisDoor/irisDoor.csproj +++ b/irisDoor/irisDoor.csproj @@ -34,8 +34,8 @@ ..\bin\Debug\ImageFormatter.dll - - ..\bin\Debug\MySql.Data.dll + + ..\packages\MySql.Data.6.7.9\lib\net40\MySql.Data.dll @@ -56,5 +56,9 @@ irisHelper + + + + \ No newline at end of file diff --git a/irisDoor/packages.config b/irisDoor/packages.config new file mode 100644 index 0000000..77dce52 --- /dev/null +++ b/irisDoor/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/irisRefactor/App.config b/irisRefactor/App.config index 2b5f8f1..0884344 100644 --- a/irisRefactor/App.config +++ b/irisRefactor/App.config @@ -59,8 +59,8 @@ - - + + @@ -154,8 +154,13 @@ - + - \ No newline at end of file + + + + + + \ No newline at end of file diff --git a/irisRefactor/FrmService/Form2.designer.cs b/irisRefactor/FrmService/Form2.designer.cs index a15ce17..8854b96 100644 --- a/irisRefactor/FrmService/Form2.designer.cs +++ b/irisRefactor/FrmService/Form2.designer.cs @@ -207,11 +207,11 @@ // this.type_label.AutoSize = true; this.type_label.BackColor = System.Drawing.Color.Transparent; - this.type_label.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.type_label.ForeColor = System.Drawing.Color.White; + this.type_label.Font = new System.Drawing.Font("微软雅黑", 24F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.type_label.ForeColor = System.Drawing.Color.Lime; this.type_label.Location = new System.Drawing.Point(510, 355); this.type_label.Name = "type_label"; - this.type_label.Size = new System.Drawing.Size(20, 31); + this.type_label.Size = new System.Drawing.Size(26, 41); this.type_label.TabIndex = 134; this.type_label.Text = "."; // diff --git a/irisRefactor/fingerThread/FingerIdentifyTh.cs b/irisRefactor/fingerThread/FingerIdentifyTh.cs index 83ad79a..542694e 100644 --- a/irisRefactor/fingerThread/FingerIdentifyTh.cs +++ b/irisRefactor/fingerThread/FingerIdentifyTh.cs @@ -30,8 +30,11 @@ { int retCode = ProMemory.fingerPrintModule.DoCapture(); LogHelper.WriteDebugLog(MethodBase.GetCurrentMethod().DeclaringType, "FingerIdentify Result: " + retCode); + if (retCode > 0) { + CaptureWorking = false; + JObject personFound = new JObject(); ProMemory.fingerPrintModule.FingerPrintZkMgr.UserFingerList.TryGetValue(retCode, out personFound); string personId = personFound.GetValue("personId").ToString(); @@ -40,28 +43,23 @@ else if (ProMemory.formType == "2") Form2.GetInstance().Success(personId, 3); - CaptureWorking = false; - // 识别成功界面显示一段时间 Thread.Sleep(ProMemory.appConfig.ShowTimeSuccess); ProMemory.cameraController.ContinuousShot_TriggerOff(); CaptureWorking = true; - } else if (retCode == zkfperrdef.ZKFP_ERR_VERIFY_FP || retCode == zkfperrdef.ZKFP_ERR_FAIL) + } + else if (retCode == zkfperrdef.ZKFP_ERR_VERIFY_FP || retCode == zkfperrdef.ZKFP_ERR_FAIL) { if (ProMemory.formType == "1") Form1.GetInstance().Failure(); else if (ProMemory.formType == "2") Form2.GetInstance().Failure(); - CaptureWorking = false; - Thread.Sleep(ProMemory.appConfig.ShowTimeFailure); ProMemory.cameraController.ContinuousShot_TriggerOff(); - - CaptureWorking = true; } - + Thread.Sleep(200); } } diff --git a/fingerPrint/fingerPrint.csproj b/fingerPrint/fingerPrint.csproj index 189f057..f41153d 100644 --- a/fingerPrint/fingerPrint.csproj +++ b/fingerPrint/fingerPrint.csproj @@ -57,13 +57,6 @@ - - Form - - - Form1.cs - - ResXFileCodeGenerator diff --git a/irisDataBase/app.config b/irisDataBase/app.config new file mode 100644 index 0000000..12e70e5 --- /dev/null +++ b/irisDataBase/app.config @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/irisDataBase/irisDataBase.csproj b/irisDataBase/irisDataBase.csproj index 1e5bfde..97cd8ce 100644 --- a/irisDataBase/irisDataBase.csproj +++ b/irisDataBase/irisDataBase.csproj @@ -31,8 +31,8 @@ 4 - - ..\bin\Debug\MySql.Data.dll + + ..\packages\MySql.Data.6.7.9\lib\net40\MySql.Data.dll False @@ -92,5 +92,9 @@ + + + + \ No newline at end of file diff --git a/irisDataBase/packages.config b/irisDataBase/packages.config new file mode 100644 index 0000000..77dce52 --- /dev/null +++ b/irisDataBase/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/irisDoor/app.config b/irisDoor/app.config new file mode 100644 index 0000000..12e70e5 --- /dev/null +++ b/irisDoor/app.config @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/irisDoor/irisDoor.csproj b/irisDoor/irisDoor.csproj index 97b6122..ac7505a 100644 --- a/irisDoor/irisDoor.csproj +++ b/irisDoor/irisDoor.csproj @@ -34,8 +34,8 @@ ..\bin\Debug\ImageFormatter.dll - - ..\bin\Debug\MySql.Data.dll + + ..\packages\MySql.Data.6.7.9\lib\net40\MySql.Data.dll @@ -56,5 +56,9 @@ irisHelper + + + + \ No newline at end of file diff --git a/irisDoor/packages.config b/irisDoor/packages.config new file mode 100644 index 0000000..77dce52 --- /dev/null +++ b/irisDoor/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/irisRefactor/App.config b/irisRefactor/App.config index 2b5f8f1..0884344 100644 --- a/irisRefactor/App.config +++ b/irisRefactor/App.config @@ -59,8 +59,8 @@ - - + + @@ -154,8 +154,13 @@ - + - \ No newline at end of file + + + + + + \ No newline at end of file diff --git a/irisRefactor/FrmService/Form2.designer.cs b/irisRefactor/FrmService/Form2.designer.cs index a15ce17..8854b96 100644 --- a/irisRefactor/FrmService/Form2.designer.cs +++ b/irisRefactor/FrmService/Form2.designer.cs @@ -207,11 +207,11 @@ // this.type_label.AutoSize = true; this.type_label.BackColor = System.Drawing.Color.Transparent; - this.type_label.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.type_label.ForeColor = System.Drawing.Color.White; + this.type_label.Font = new System.Drawing.Font("微软雅黑", 24F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.type_label.ForeColor = System.Drawing.Color.Lime; this.type_label.Location = new System.Drawing.Point(510, 355); this.type_label.Name = "type_label"; - this.type_label.Size = new System.Drawing.Size(20, 31); + this.type_label.Size = new System.Drawing.Size(26, 41); this.type_label.TabIndex = 134; this.type_label.Text = "."; // diff --git a/irisRefactor/fingerThread/FingerIdentifyTh.cs b/irisRefactor/fingerThread/FingerIdentifyTh.cs index 83ad79a..542694e 100644 --- a/irisRefactor/fingerThread/FingerIdentifyTh.cs +++ b/irisRefactor/fingerThread/FingerIdentifyTh.cs @@ -30,8 +30,11 @@ { int retCode = ProMemory.fingerPrintModule.DoCapture(); LogHelper.WriteDebugLog(MethodBase.GetCurrentMethod().DeclaringType, "FingerIdentify Result: " + retCode); + if (retCode > 0) { + CaptureWorking = false; + JObject personFound = new JObject(); ProMemory.fingerPrintModule.FingerPrintZkMgr.UserFingerList.TryGetValue(retCode, out personFound); string personId = personFound.GetValue("personId").ToString(); @@ -40,28 +43,23 @@ else if (ProMemory.formType == "2") Form2.GetInstance().Success(personId, 3); - CaptureWorking = false; - // 识别成功界面显示一段时间 Thread.Sleep(ProMemory.appConfig.ShowTimeSuccess); ProMemory.cameraController.ContinuousShot_TriggerOff(); CaptureWorking = true; - } else if (retCode == zkfperrdef.ZKFP_ERR_VERIFY_FP || retCode == zkfperrdef.ZKFP_ERR_FAIL) + } + else if (retCode == zkfperrdef.ZKFP_ERR_VERIFY_FP || retCode == zkfperrdef.ZKFP_ERR_FAIL) { if (ProMemory.formType == "1") Form1.GetInstance().Failure(); else if (ProMemory.formType == "2") Form2.GetInstance().Failure(); - CaptureWorking = false; - Thread.Sleep(ProMemory.appConfig.ShowTimeFailure); ProMemory.cameraController.ContinuousShot_TriggerOff(); - - CaptureWorking = true; } - + Thread.Sleep(200); } } diff --git a/irisRefactor/irisRefactor.csproj b/irisRefactor/irisRefactor.csproj index 3d466bd..f8dfc39 100644 --- a/irisRefactor/irisRefactor.csproj +++ b/irisRefactor/irisRefactor.csproj @@ -11,7 +11,7 @@ irisRefactor v4.0 512 - true + false true @@ -62,7 +62,7 @@ ..\commonDll\AxInterop.MC_DISPLib.dll - + ..\commonDll\Interop.MC_DISPLib.dll True @@ -96,25 +96,8 @@ False ..\bin\Debug\MvCameraControl.Net.dll - - False - ..\..\superSocket\SupperSocketServer\SupperSocketServer\dll\MySql.Data.dll - - - False - bin\x86\Debug\MySql.Data.EntityFramework.dll - - - False - bin\x86\Debug\MySQL.Data.EntityFrameworkCore.dll - - - False - bin\x86\Debug\MySQL.Data.EntityFrameworkCore.Design.dll - - - False - bin\x86\Debug\MySql.Web.dll + + ..\packages\MySql.Data.6.7.9\lib\net40\MySql.Data.dll False @@ -278,7 +261,7 @@ aximp False - - - + + @@ -154,8 +154,13 @@ - + - \ No newline at end of file + + + + + + \ No newline at end of file diff --git a/irisRefactor/FrmService/Form2.designer.cs b/irisRefactor/FrmService/Form2.designer.cs index a15ce17..8854b96 100644 --- a/irisRefactor/FrmService/Form2.designer.cs +++ b/irisRefactor/FrmService/Form2.designer.cs @@ -207,11 +207,11 @@ // this.type_label.AutoSize = true; this.type_label.BackColor = System.Drawing.Color.Transparent; - this.type_label.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.type_label.ForeColor = System.Drawing.Color.White; + this.type_label.Font = new System.Drawing.Font("微软雅黑", 24F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.type_label.ForeColor = System.Drawing.Color.Lime; this.type_label.Location = new System.Drawing.Point(510, 355); this.type_label.Name = "type_label"; - this.type_label.Size = new System.Drawing.Size(20, 31); + this.type_label.Size = new System.Drawing.Size(26, 41); this.type_label.TabIndex = 134; this.type_label.Text = "."; // diff --git a/irisRefactor/fingerThread/FingerIdentifyTh.cs b/irisRefactor/fingerThread/FingerIdentifyTh.cs index 83ad79a..542694e 100644 --- a/irisRefactor/fingerThread/FingerIdentifyTh.cs +++ b/irisRefactor/fingerThread/FingerIdentifyTh.cs @@ -30,8 +30,11 @@ { int retCode = ProMemory.fingerPrintModule.DoCapture(); LogHelper.WriteDebugLog(MethodBase.GetCurrentMethod().DeclaringType, "FingerIdentify Result: " + retCode); + if (retCode > 0) { + CaptureWorking = false; + JObject personFound = new JObject(); ProMemory.fingerPrintModule.FingerPrintZkMgr.UserFingerList.TryGetValue(retCode, out personFound); string personId = personFound.GetValue("personId").ToString(); @@ -40,28 +43,23 @@ else if (ProMemory.formType == "2") Form2.GetInstance().Success(personId, 3); - CaptureWorking = false; - // 识别成功界面显示一段时间 Thread.Sleep(ProMemory.appConfig.ShowTimeSuccess); ProMemory.cameraController.ContinuousShot_TriggerOff(); CaptureWorking = true; - } else if (retCode == zkfperrdef.ZKFP_ERR_VERIFY_FP || retCode == zkfperrdef.ZKFP_ERR_FAIL) + } + else if (retCode == zkfperrdef.ZKFP_ERR_VERIFY_FP || retCode == zkfperrdef.ZKFP_ERR_FAIL) { if (ProMemory.formType == "1") Form1.GetInstance().Failure(); else if (ProMemory.formType == "2") Form2.GetInstance().Failure(); - CaptureWorking = false; - Thread.Sleep(ProMemory.appConfig.ShowTimeFailure); ProMemory.cameraController.ContinuousShot_TriggerOff(); - - CaptureWorking = true; } - + Thread.Sleep(200); } } diff --git a/irisRefactor/irisRefactor.csproj b/irisRefactor/irisRefactor.csproj index 3d466bd..f8dfc39 100644 --- a/irisRefactor/irisRefactor.csproj +++ b/irisRefactor/irisRefactor.csproj @@ -11,7 +11,7 @@ irisRefactor v4.0 512 - true + false true @@ -62,7 +62,7 @@ ..\commonDll\AxInterop.MC_DISPLib.dll - + ..\commonDll\Interop.MC_DISPLib.dll True @@ -96,25 +96,8 @@ False ..\bin\Debug\MvCameraControl.Net.dll - - False - ..\..\superSocket\SupperSocketServer\SupperSocketServer\dll\MySql.Data.dll - - - False - bin\x86\Debug\MySql.Data.EntityFramework.dll - - - False - bin\x86\Debug\MySQL.Data.EntityFrameworkCore.dll - - - False - bin\x86\Debug\MySQL.Data.EntityFrameworkCore.Design.dll - - - False - bin\x86\Debug\MySql.Web.dll + + ..\packages\MySql.Data.6.7.9\lib\net40\MySql.Data.dll False @@ -278,7 +261,7 @@ aximp False -