diff --git a/app/src/main/java/com/bonus/canteen/face/util/CompareResult.java b/app/src/main/java/com/bonus/canteen/face/util/CompareResult.java index 84ed793..4f4be03 100644 --- a/app/src/main/java/com/bonus/canteen/face/util/CompareResult.java +++ b/app/src/main/java/com/bonus/canteen/face/util/CompareResult.java @@ -116,4 +116,20 @@ public class CompareResult { public void setIsContract(int isContract) { this.isContract = isContract; } + + public String toString() { + return "CompareResult{" + + "userName='" + userName + '\'' + + ", similar=" + similar + + ", trackId=" + trackId + + ", facePath='" + facePath + '\'' + + ", idCard='" + idCard + '\'' + + ", isTrain=" + isTrain + + ", isContract=" + isContract + + ", isToWork='" + isToWork + '\'' + + ", isOffWork='" + isOffWork + '\'' + + ", isFurloughPerson='" + isFurloughPerson + '\'' + + ", workerType='" + workerType + '\'' + + '}'; + } } diff --git a/app/src/main/java/com/bonus/canteen/face/util/FaceServer.java b/app/src/main/java/com/bonus/canteen/face/util/FaceServer.java index 7b2b311..d1ecaca 100644 --- a/app/src/main/java/com/bonus/canteen/face/util/FaceServer.java +++ b/app/src/main/java/com/bonus/canteen/face/util/FaceServer.java @@ -130,6 +130,14 @@ public class FaceServer { bean.getIsOffWork(), bean.getIsFurloughPerson(), bean.getWorkerType())); } } + }else{ + faceRegisterInfoList = new ArrayList<>(); + UserFeatureManager.clearUserFeature(context); + String data = "AID6RAAAoEG+CmM9ODxqPNx9NL1Azwc+d7+ZPH3LkDzL7cq9HyNTPc/wjryOtgQ99cjJPVTzjz1JbwQ9Gnq4vU0portpeDS9YBSDvPqY/b34ap89i6HgvQwIiz2urhE+dnnKPeCjt7twJn87IzekPWhENT7xK5M81jnxvJTZXT1Q8rU92dKVPTxOQjyqOLG89VWXvZ+F0r3Xaig++oe8PKQmW7yN4vK81hSKvdpSOD2Jzzi6L2eOvV0xBzzx5ew8+YppvG4YvD1TgLK8OV5SvZEG8LxmkFo9FT++PUYcxbyalwk7tCo2PCVeNj1ohoo7PZ+JPLDa97x8Ly88OFVgvQB/27b8j2g9uhOZPMCs2jz8xrq9EfwHPpWXiTwb4ty9aTCrPeXPBT1yPvy8nqDuPbIfxb1kT+o8XUSnvRaIi73tW6C9xN5hPe3L3bs+FkY9hX7Lvaix3rwA9g493yVBPK6JPbxmOwu9Xan5PFxNiD0iJqA6B3CcvKS1qb2KZcY99az9u6zjcLwDPU28br/QOrVHtLy0vfu8KFj4vK4gQDwSBPY8CqxVPUAzgj1+ECC8KzqNu+P2uDyHF+Y9dZbdPQXdirwmbQ89Rm40PW4wEz0xV8K88GWXvNb9XrzCR7W9bCjsvZRZkj2Mut08jURuPSrLdr0bfzq9mthCPcfcVL1x+a+9QOO1PXvwWby4voO6l76RvdLXiL2k20k927Fbu3RrlT19WEm9Y5reveplsjv3l4c9NkMuPeWygTzotEg9HqZsvUWHA76y7hK8950QvcgSWbxwrqw8coO6PfTbzTyBBg699yObPXToKz6rqrE91DXMvC2uWTwim0k9TTOlPGYou72e6xG+dF/3vAvdpL2e4F+9rMasvY2CmjwrPbw7wpPQPU18CjwpGS87F1fRvLlNlz0ab2w9W2yzPd4nITwzAa+9U2VYPZAFtj0YBbY947nnPTcJjryi1LE9T9cJvZmNpD3xz2o9x+gkvc3uJT0Iya29F79/vIkAyjxSYnw9YiSeO4fmmLxipbo8u7R5vclu4zxl9ZQ8Xy2vOzcbNz3BXg48Oj7wPaDvjbxXxqg7mX3ovVYcX70iqr688sgCPTQ5Aj3/osA9DQwPvXpjOj2iDGo9oc54PagSY70OBha+FZPOvPip3bw9nRe+Do+ePXY2a72PsXo98ZfOu+fTb727Jri9YJQBvZ+NTjygB9K80guHPAisGL5M9gQ9xecXPVEcpL2ghLg8qHlhvREAZ73dONO9IisJPRHqSD1b8VK7h2FSvcqBt7sjGBA9MwQmPGLbCL2BPBo+7pYpPM86JbtVxxO8xGYhvc9lRD3duyO9BVkiOtYCtz177bY8Pc5yvUdmZD0S+ho4"; + byte[] feature = Base64.decode(data, Base64.DEFAULT); + faceRegisterInfoList.add(new FaceRegisterInfo(feature, "张天强", "342221199711168218", + "/lnyst/uploads/2025/03/26/6053d182-fb27-4c1d-98d0-af16d8c7ea22.jpg", 0, 0, "0", + "0", "0", "0")); } } diff --git a/app/src/main/java/com/bonus/canteen/presentation/MyPresentation.java b/app/src/main/java/com/bonus/canteen/presentation/MyPresentation.java index 2addb22..f36a720 100644 --- a/app/src/main/java/com/bonus/canteen/presentation/MyPresentation.java +++ b/app/src/main/java/com/bonus/canteen/presentation/MyPresentation.java @@ -229,7 +229,8 @@ public class MyPresentation extends Presentation { menuAdapter = new PayMenuAdapter(context, salesMenuEntityList); mListView.setAdapter(menuAdapter); menuAdapter.notifyDataSetChanged(); - + compareResultList = new ArrayList<>(); + adapter = new FaceSearchResultAdapter(compareResultList, context); previewView = findViewById(R.id.texture_preview); faceRectView = findViewById(R.id.face_rect_view); @@ -793,6 +794,7 @@ public class MyPresentation extends Presentation { public void subscribe(ObservableEmitter emitter) { Log.i(TAG, "subscribe: fr search start = " + System.currentTimeMillis() + " trackId = " + requestId); CompareResult compareResult = FaceServer.getInstance().getCollectionFaceLib(frFace); + Log.i(TAG, "compareResult = " + compareResult.toString()); Log.i(TAG, "subscribe: fr search end = " + System.currentTimeMillis() + " trackId = " + requestId); emitter.onNext(compareResult); } @@ -816,9 +818,10 @@ public class MyPresentation extends Presentation { } return; } - + Log.e(TAG, "compareResult is not null"); // Log.i(TAG, "onNext: fr search get result = " + System.currentTimeMillis() + " trackId = " + requestId + " similar = " + compareResult.getSimilar()); if (compareResult.getSimilar() > SIMILAR_THRESHOLD) { + Log.d(TAG,"compareResult.getSimilar() > SIMILAR_THRESHOLD"); boolean isAdded = false; if (compareResultList == null) { Log.d(TAG,"compareResultList == null"); @@ -858,6 +861,7 @@ public class MyPresentation extends Presentation { Log.d(TAG, requestId + " 通过:" + compareResult.getUserName() ); } } else { + Log.d(TAG,"compareResult.getSimilar() < SIMILAR_THRESHOLD"); if(faceHelper != null) { faceHelper.setName(requestId, "未通过:" + "未注册人员"); Log.d(TAG, requestId + " 未通过:" + "未注册人员" );