diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index e1b69e7491f61d3dc29dce3b616c2ceb12137584..0000000000000000000000000000000000000000 Binary files a/.DS_Store and /dev/null differ diff --git a/.gitignore b/.gitignore index f1b67e93314eeae73030183251f3e48b25c5b54a..4804871ba7396cff3fea064ab4bf1ccd761796cd 100644 --- a/.gitignore +++ b/.gitignore @@ -34,4 +34,5 @@ build/ .vscode/ /models/ -/images/ \ No newline at end of file +/images/ +.DS_Store \ No newline at end of file diff --git a/src/main/java/com/github/javpower/javavision/service/FaceService.java b/src/main/java/com/github/javpower/javavision/service/FaceService.java index 2e23d5f5c5cd67f73f9187409dc19c3af5804912..ef10dba11cbe4b4a29388c1d391ce28f27b3ea6e 100644 --- a/src/main/java/com/github/javpower/javavision/service/FaceService.java +++ b/src/main/java/com/github/javpower/javavision/service/FaceService.java @@ -79,21 +79,23 @@ public class FaceService { if(CollectionUtil.isNotEmpty(allJson)){ String path = getPath(file); List faceObjects = FaceDetectUtil.faceDetect(path); - FaceObject faceObject = faceObjects.get(0); - Float[] feature = faceObject.getFeature().toArray(new Float[0]); - FaceParam res=null; - float ff=0f; - for (FaceParam v : allJson) { - Float[] feature1 = v.getFeature().toArray(new Float[0]); - float v1 = FaceSimilarityCalculator.calculateCosineSimilarity(feature, feature1); - if(v1>ff){ - ff=v1; - res=v; + if (CollectionUtil.isNotEmpty(faceObjects)){ + FaceObject faceObject = faceObjects.get(0); + Float[] feature = faceObject.getFeature().toArray(new Float[0]); + FaceParam res=null; + float ff=0f; + for (FaceParam v : allJson) { + Float[] feature1 = v.getFeature().toArray(new Float[0]); + float v1 = FaceSimilarityCalculator.calculateCosineSimilarity(feature, feature1); + if(v1>ff){ + ff=v1; + res=v; + } + } + if(ff>0.8f){ + personObject.setPersonName(res.getPersonName()); + personObject.setPersonId(res.getPersonId()); } - } - if(ff>0.8f){ - personObject.setPersonName(res.getPersonName()); - personObject.setPersonId(res.getPersonId()); } } return personObject;