diff --git a/irisRefactor/IrisThread/IdentifyTh.cs b/irisRefactor/IrisThread/IdentifyTh.cs index 0981e1a..891f135 100644 --- a/irisRefactor/IrisThread/IdentifyTh.cs +++ b/irisRefactor/IrisThread/IdentifyTh.cs @@ -77,7 +77,19 @@ else if (ProMemory.formType == "2") Form2.GetInstance().Success(personId); + // 识别成功界面显示一段时间 Thread.Sleep(ProMemory.appConfig.ShowTimeSuccess); + + // 清除识别队列 + lock(ProMemory.irisConfig.QueueIdentify) + { + ProMemory.irisConfig.QueueIdentify.Clear(); + } + + lock(ProMemory.irisConfig.QueueFace) + { + ProMemory.irisConfig.QueueFace.Clear(); + } } ProMemory.identifyConfig.InitConfig(); diff --git a/irisRefactor/IrisThread/IdentifyTh.cs b/irisRefactor/IrisThread/IdentifyTh.cs index 0981e1a..891f135 100644 --- a/irisRefactor/IrisThread/IdentifyTh.cs +++ b/irisRefactor/IrisThread/IdentifyTh.cs @@ -77,7 +77,19 @@ else if (ProMemory.formType == "2") Form2.GetInstance().Success(personId); + // 识别成功界面显示一段时间 Thread.Sleep(ProMemory.appConfig.ShowTimeSuccess); + + // 清除识别队列 + lock(ProMemory.irisConfig.QueueIdentify) + { + ProMemory.irisConfig.QueueIdentify.Clear(); + } + + lock(ProMemory.irisConfig.QueueFace) + { + ProMemory.irisConfig.QueueFace.Clear(); + } } ProMemory.identifyConfig.InitConfig(); diff --git a/irisRefactor/IrisThread/PreIdentifyTh.cs b/irisRefactor/IrisThread/PreIdentifyTh.cs index 4a24ad8..bd14b84 100644 --- a/irisRefactor/IrisThread/PreIdentifyTh.cs +++ b/irisRefactor/IrisThread/PreIdentifyTh.cs @@ -91,15 +91,17 @@ LogHelper.WriteInfoLog(MethodBase.GetCurrentMethod().DeclaringType, "未知人员温度:" + ProMemory.tempString.ToString()); } + LogHelper.WriteInfoLog(MethodBase.GetCurrentMethod().DeclaringType, "识别超时[" + ProMemory.identifyConfig.IdentifyTaskId + "]"); + // 判断是否已经识别成功了 - //if (ProMemory.identifyConfig.IdentifyStart == 0) - //{ - if (ProMemory.formType == "1") + if (ProMemory.identifyConfig.IdentifyStart != 0) + { + if (ProMemory.formType == "1") Form1.GetInstance().Failure(); else if (ProMemory.formType == "2") Form2.GetInstance().Failure(); Thread.Sleep(ProMemory.appConfig.ShowTimeFailure); - //} + } // 将变量清零 ProMemory.identifyConfig.InitConfig(); @@ -170,16 +172,17 @@ LogHelper.WriteInfoLog(MethodBase.GetCurrentMethod().DeclaringType, "未知人员温度:" + ProMemory.tempString.ToString()); } + LogHelper.WriteInfoLog(MethodBase.GetCurrentMethod().DeclaringType, "识别超时[" + ProMemory.identifyConfig.IdentifyTaskId + "]"); + // 判断是否已经识别成功了 - //if (ProMemory.identifyConfig.IdentifyStart == 0) - //{ + if (ProMemory.identifyConfig.IdentifyStart != 0) + { if (ProMemory.formType == "1") Form1.GetInstance().Failure(); else if (ProMemory.formType == "2") Form2.GetInstance().Failure(); - Thread.Sleep(ProMemory.appConfig.ShowTimeFailure); - //} + } // 将变量清零 ProMemory.identifyConfig.InitConfig();