人脸识别+采集分开处理

app/src/main/java/com/sw/platecabinet/activity/LoginByFaceActivity.kt

@@ -208,10 +208,10 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
         if (userFaceInfo == null) return false
         val headBmp = userFaceInfo.headBmp
         if (headBmp == null) return false
-        if (headBmp.width <= 200 || headBmp.height <= 200) {
-            loadLogInfo("collectFace,isFitData:拿到人脸提取特征数据照片过小-----------")
-            return false
-        }
+//        if (headBmp.width <= 200 || headBmp.height <= 200) {
+//            loadLogInfo("collectFace,isFitData:拿到人脸提取特征数据照片过小-----------")
+//            return false
+//        }
         return true
     }
 
@@ -224,6 +224,14 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
                     return@setCallback
                 }
                 if (this.userFaceInfo == null && isFitData(userFaceInfo)) {
+                    val headBmp = userFaceInfo.headBmp
+                    if (headBmp.width <= 200 || headBmp.height <= 200) {
+                        loadLogInfo("collectFace,isFitData:拿到人脸提取特征数据照片过小w:${headBmp.width},h:${headBmp.height}-----------")
+                        binding.llCollectButton.visible()
+                        binding.btnRetry.gone()
+                        binding.btnCollect.text = "重新采集"
+                        return@setCallback
+                    }
                     recognizeViewModel.updateRegisterStatus(RecognizeViewModel.REGISTER_STATUS_DONE)
                     this.userFaceInfo = userFaceInfo
                     getFaceDataBlock()
@@ -369,17 +377,19 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
         binding.tvToInit.text = ""
         binding.tvSimilarValue.text = ""
         binding.llCollectButton.visible()
+        binding.btnRetry.visible()
         binding.btnCollect.run {
             visible()
-            if (tag == "1") {
-                binding.btnRetry.gone()
-                text = "重新采集"
-                tag = "1"
-            } else {
-                binding.btnRetry.visible()
-                "新用户采集"
-                tag = "1"
-            }
+            text = "新用户采集"
+//            if (tag == "1") {
+//                binding.btnRetry.gone()
+//                text = "重新采集"
+//                tag = "1"
+//            } else {
+//                binding.btnRetry.visible()
+//                "新用户采集"
+//                tag = "1"
+//            }
         }
     }