From 603cb36a5123e46656b06a5deb8d7ac7ff81307f Mon Sep 17 00:00:00 2001
From: 554325746@qq.com <554325746@qq.com>
Date: 星期三, 25 十二月 2019 08:48:51 +0800
Subject: [PATCH] a

---
 app/src/main/java/com/basic/security/utils/FacePosition.java |   25 ++++++++++++++++---------
 1 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/com/basic/security/utils/FacePosition.java b/app/src/main/java/com/basic/security/utils/FacePosition.java
index d72b390..1115b94 100644
--- a/app/src/main/java/com/basic/security/utils/FacePosition.java
+++ b/app/src/main/java/com/basic/security/utils/FacePosition.java
@@ -98,33 +98,40 @@
 
     public boolean detectScoreCanSignUp() { // 寰楀垎鏄惁鍙互娉ㄥ唽
         boolean detectScoreCanSignUp = false;
-//        System.out.println("FacePosition.detectScoreCanSignUp score="+score);
+//        System1.out.println("FacePosition.detectScoreCanSignUp score="+score);
         if (Constants.needIdCardModule) {
             if (Constants.isNewIDCardReader) {
                 detectScoreCanSignUp = haveFaceAngleHintForSignUp() == null && detectScore >= 0.80;
-                System.out.println("FacePosition.detectScoreCanSignUp 1 detectScoreCanSignUp=" + detectScoreCanSignUp);
+                System1.out.println("FacePosition.detectScoreCanSignUp 1 detectScoreCanSignUp=" + detectScoreCanSignUp);
                 return detectScoreCanSignUp;
             }
         }
 //        detectScoreCanSignUp = haveFaceAngleHintForSignUp() == null && detectScore >= 0.95 && featureData != null;
         detectScoreCanSignUp = haveFaceAngleHintForSignUp() == null && detectScore >= 0.8 && featureData != null;
         if (detectScoreCanSignUp) {
-//            System.out.println("FacePosition.detectScoreCanSignUp detectScoreCanSignUp="+detectScoreCanSignUp + ", && featureData =" + featureData);
+//            System1.out.println("FacePosition.detectScoreCanSignUp detectScoreCanSignUp="+detectScoreCanSignUp + ", && featureData =" + featureData);
         }
-//        System.out.println("FacePosition.detectScoreCanSignUp 2 detectScoreCanSignUp="+detectScoreCanSignUp + " detectScore >= 0.95 " + detectScore);
+//        System1.out.println("FacePosition.detectScoreCanSignUp 2 detectScoreCanSignUp="+detectScoreCanSignUp + " detectScore >= 0.95 " + detectScore);
         return detectScoreCanSignUp;
     }
 
     public boolean detectScoreCanSignUp1() { // 寰楀垎鏄惁鍙互娉ㄥ唽
-//        System.out.println("FacePosition.detectScoreCanSignUp score="+score);
+        String haveFaceAngleHintForSignUp = haveFaceAngleHintForSignUp();
+//        System1.out.println("FacePosition.detectScoreCanSignUp score="+score);
         if (Constants.needIdCardModule) {
             if (Constants.isNewIDCardReader) {
-                return haveFaceAngleHintForSignUp() == null && detectScore >= 0.80;
+                return haveFaceAngleHintForSignUp == null && detectScore >= 0.80;
             }
         }
-        boolean detectScoreCanSignUp = haveFaceAngleHintForSignUp() == null && detectScore >= 0.8 && featureData != null;
-        if (detectScoreCanSignUp) {
-//            System.out.println("FacePosition.detectScoreCanSignUp detectScoreCanSignUp="+detectScoreCanSignUp + ", && featureData =" + featureData);
+        boolean isKnownPerson = false;
+        if (compareFeatureResult != null && compareFeatureResult.person != null) {
+            isKnownPerson = true;
+        }
+        boolean detectScoreCanSignUp =
+                isKnownPerson || (haveFaceAngleHintForSignUp == null &&
+                        detectScore >= 0.8 && featureData != null);
+        if (!detectScoreCanSignUp && haveFaceAngleHintForSignUp != null) {
+//            System1.out.println("FacePosition.detectScoreCanSignUp1 haveFaceAngleHintForSignUp=" + haveFaceAngleHintForSignUp);
         }
         return detectScoreCanSignUp;
     }

--
Gitblit v1.8.0