diff --git a/HisenceYoloDetection/MainForm.cs b/HisenceYoloDetection/MainForm.cs index da57d3e..4e41ada 100644 --- a/HisenceYoloDetection/MainForm.cs +++ b/HisenceYoloDetection/MainForm.cs @@ -191,9 +191,9 @@ namespace HisenceYoloDetection { string s1 = "0##Ec04060##20¡æ##Rapide15mns"; - string s2 = "ECO4060##20¡ãC##Rapide15mns"; + string s2 = "ECOmns"; - bool st = ManagerModelHelper.StrMatch2(s1, s2); + bool st = ManagerModelHelper.StrMatch(s1, s2); //Rect rect = new Rect(0, 0, 0, 0); //string path2 = "D:\\Hisence\\SQLImages\\W80WXWJ060539V0WW80WX120293\\2\\W80WXWJ060539V0WW80WX120293result.jpg"; @@ -2868,15 +2868,18 @@ namespace HisenceYoloDetection SQLStr = SQlxK_HisenceWord.OneblockMainWord; if (!saveimage) { - OneIF = ManagerModelHelper.StrMatch2(xK_HisenceWord.OneblockMainWord, SQLStr); - if (!OneIF) + bool ssD= ManagerModelHelper.StrMatch(xK_HisenceWord.OneblockMainWord, SQLStr); + bool OneIF1 = ManagerModelHelper.StrMatch2(xK_HisenceWord.OneblockMainWord, SQLStr); + if (!OneIF1||!ssD) { + OneIF = false; //ÏÔʾ´íÎóµÄ°å DisplayResult(mLcut); Defet_OnDetectionDone(mLcut.ResultMap.ToMat(), 1); } else { + OneIF = true; Defet_OnDetectionDone(OKMat, 1); }