From ba92b976c7fb9f8bbe4a1bf9d06fa8468d26be58 Mon Sep 17 00:00:00 2001
From: weimingfei <fei_gaming@sina.com>
Date: 星期一, 15 十二月 2025 18:01:13 +0800
Subject: [PATCH] 指纹钥匙柜人脸报错
---
keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/face/FaceActivity.java | 65 +++++++++++++++-----------------
1 files changed, 31 insertions(+), 34 deletions(-)
diff --git a/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/face/FaceActivity.java b/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/face/FaceActivity.java
index 97fb266..b763f31 100644
--- a/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/face/FaceActivity.java
+++ b/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/face/FaceActivity.java
@@ -5,6 +5,7 @@
import android.content.Context;
import android.graphics.Bitmap;
+import android.graphics.Color;
import android.hardware.Camera;
import android.os.Bundle;
import android.os.Handler;
@@ -15,6 +16,7 @@
import android.text.Spanned;
import android.text.TextUtils;
import android.text.TextWatcher;
+import android.text.format.DateUtils;
import android.text.style.TextAppearanceSpan;
import android.view.View;
import android.view.ViewTreeObserver;
@@ -29,6 +31,7 @@
import com.doumee.keyCabinet.dao.DaoManager;
import com.doumee.keyCabinet.dao.FingerPrintDo;
import com.doumee.keyCabinet.databinding.FaceActivityBinding;
+import com.doumee.keyCabinet.event.FaceCheckResultEvent;
import com.doumee.keyCabinet.event.FaceStatusChangeEvent;
import com.doumee.keyCabinet.event.HttpEvent;
import com.doumee.keyCabinet.event.JiujinBeginEvent;
@@ -37,6 +40,7 @@
import com.doumee.keyCabinet.event.TimeClockEvent;
import com.doumee.keyCabinet.ui.keyCabinet.KeyCabinetActivity;
import com.doumee.keyCabinet.utils.BraceletLogUtils;
+import com.doumee.keyCabinet.utils.CrashHandler;
import com.doumee.keyCabinet.utils.face.FaceUtils;
import com.doumee.keyCabinet.utils.face.model.SingleBaseConfig;
import com.doumee.keyCabinet.utils.usb.DevComm;
@@ -57,6 +61,7 @@
import com.example.datalibrary.model.LivenessModel;
import com.example.datalibrary.model.User;
import com.example.datalibrary.utils.FaceOnDrawTexturViewUtil;
+import com.example.datalibrary.utils.FileUtils;
import com.example.datalibrary.utils.ToastUtils;
import org.greenrobot.eventbus.EventBus;
@@ -64,6 +69,7 @@
import org.greenrobot.eventbus.ThreadMode;
import java.math.BigDecimal;
+import java.util.Date;
import java.util.HashMap;
import java.util.List;
@@ -318,10 +324,12 @@
switch (type){
case 1:
if(flag==0){
- //鍒囨崲鍒扮鐞嗗憳鍒峰崱
+ //Toast.makeText(mContext, "status:" + status, Toast.LENGTH_SHORT).show();
if(status==0||status==10){
+ //鍒囨崲鍒扮鐞嗗憳鍒峰崱
statusFsm(1);
}else if(status==2||status==11){
+ //鍒囨崲鍒板徃鏈哄埛鍗�
statusFsm(3);
}
}else {
@@ -331,8 +339,12 @@
break;
case 9:
//鎸囩汗楠岃瘉
- if(status==0) {
- statusFsm(10);
+ if(flag==0){
+ if(status==0) {
+ statusFsm(10);
+ }else {
+ statusFsm(11);
+ }
}else {
statusFsm(12);
}
@@ -365,6 +377,7 @@
case 4:
//鍒囨崲鍒颁汉鑴�
if(flag==0){
+ //Toast.makeText(mContext, "status:" + status, Toast.LENGTH_SHORT).show();
if(status==1||status==10){
statusFsm(0);
}else if(status==3||status==11){
@@ -557,7 +570,7 @@
if(handler.hasMessages(1)){
handler.removeMessages(1);
}
- checkOpenDebugResult(livenessModel);
+ EventBus.getDefault().post(new FaceCheckResultEvent(livenessModel));
}
});
}catch (RuntimeException e){
@@ -572,6 +585,9 @@
@Override
public void onTip(int code, String msg) {
+ if(1==code) {
+ SpUtil.saveString(CrashHandler.FILE_NAME + StringUtil.DateToStr(new Date()), msg);
+ }
if(isToChose){
return;
}
@@ -713,6 +729,13 @@
}
}
+ @Subscribe(threadMode = ThreadMode.MAIN)
+ public void FaceCheckResultEvent(FaceCheckResultEvent e){
+ if(!isFinishing()){
+ checkOpenDebugResult(e.getLivenessModel());
+ }
+ }
+
private int resultCount = 0;
// ***************寮�鍙戞ā寮忕粨鏋滆緭鍑�*************
private void checkOpenDebugResult(final LivenessModel livenessModel) {
@@ -728,46 +751,25 @@
return;
}
if (livenessModel == null) {
- if (isCompareCheck) {
- /*getDB().clFail.setVisibility(View.VISIBLE);
- getDB().tv4.setText(getString(R.string.face_tip2));
- handler.sendEmptyMessageDelayed(0,1000);*/
- }
- //System.out.println("======>浜鸿劯璇嗗埆澶辫触");
+
return;
}
if (livenessModel.isQualityCheck()) {
//鏄惁閫氳繃璐ㄩ噺妫�娴�
- if (isCompareCheck) {
- /*getDB().clFail.setVisibility(View.VISIBLE);
- getDB().tv4.setText(getString(R.string.face_tip2));
- handler.sendEmptyMessageDelayed(0,1000);*/
- }
+
} else {
User user = livenessModel.getUser();
if (user == null) {
mUser = null;
//EventBus.getDefault().post(new HttpEvent("浜鸿劯鐢ㄦ埛妫�娴嬪け璐�------->"+(status==0?"绠＄悊鍛樹汉鑴告娴嬶細":"鍙告満浜鸿劯妫�娴嬶細")));
- if (isCompareCheck) {
- /*getDB().clFail.setVisibility(View.VISIBLE);
- getDB().tv4.setText(getString(R.string.face_tip2));
- handler.sendEmptyMessageDelayed(0,1000);*/
- }
-
} else {
mUser = user;
- /*EventBus.getDefault().post(new HttpEvent("浜鸿劯鐢ㄦ埛------->"+(status==0?"绠＄悊鍛樹汉鑴告娴嬶細":"鍙告満浜鸿劯妫�娴嬶細")
- +(user.getGroupId().equals("0")?"绠＄悊鍛�":"鍙告満")));*/
+ //EventBus.getDefault().post(new HttpEvent("浜鸿劯鐢ㄦ埛------->"+(status==0?"绠＄悊鍛樹汉鑴告娴嬶細":"鍙告満浜鸿劯妫�娴嬶細")+(user.getGroupId().equals("0")?"绠＄悊鍛�":"鍙告満")));
if (isCompareCheck) {
getDB().clFail.setVisibility(View.GONE);
if (handler.hasMessages(0)) {
handler.removeMessages(0);
}
- /*textHuanying.setVisibility(View.GONE);
- userNameLayout.setVisibility(View.VISIBLE);
- nameImage.setImageResource(R.mipmap.ic_tips_gate_success);
- nameText.setTextColor(Color.parseColor("#0dc6ff"));
- nameText.setText(FileUtils.spotString(user.getUserName()) + " 娆㈣繋鎮�");*/
}
isToChose = true;
//璇嗗埆鎴愬姛锛岃烦杞�
@@ -979,12 +981,7 @@
EventBus.getDefault().post(new HttpEvent("杩炴帴璁惧澶辫触3," + mDevComm.Run_GetDeviceInfo(w_strInfo)));
}
} else {
- runOnUiThread(new Runnable() {
- @Override
- public void run() {
- EventBus.getDefault().post(new HttpEvent("杩炴帴璁惧澶辫触4,"+mDevComm.Run_TestConnection()));
- }
- });
+ EventBus.getDefault().post(new HttpEvent("杩炴帴璁惧澶辫触4,"+mDevComm.Run_TestConnection()));
mDevComm.CloseComm();
}
}
--
Gitblit v1.9.3