From ffba2c405154eb6de9be00d9b5632e8a33ffc366 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期四, 30 十月 2025 18:09:26 +0800
Subject: [PATCH] 改bug
---
keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/face/FaceActivity.java | 409 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 370 insertions(+), 39 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 55e1458..e935ae4 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
@@ -9,19 +9,35 @@
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
+import android.text.Editable;
+import android.text.SpannableString;
+import android.text.Spanned;
import android.text.TextUtils;
+import android.text.TextWatcher;
+import android.text.style.TextAppearanceSpan;
import android.view.View;
+import android.view.ViewTreeObserver;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.TextView;
+import android.widget.Toast;
import com.baidu.idl.main.facesdk.model.BDFaceSDKCommon;
+import com.doumee.keyCabinet.MApplication;
import com.doumee.keyCabinet.R;
import com.doumee.keyCabinet.base.MyBaseActivity;
import com.doumee.keyCabinet.databinding.FaceActivityBinding;
+import com.doumee.keyCabinet.event.FaceStatusChangeEvent;
+import com.doumee.keyCabinet.event.JiujinBeginEvent;
+import com.doumee.keyCabinet.event.JiujinResultEvent;
import com.doumee.keyCabinet.event.TimeClockEvent;
+import com.doumee.keyCabinet.ui.keyCabinet.KeyCabinetActivity;
import com.doumee.keyCabinet.utils.BraceletLogUtils;
import com.doumee.keyCabinet.utils.face.FaceUtils;
import com.doumee.keyCabinet.utils.face.model.SingleBaseConfig;
import com.doumee.lib_coremodel.bean.event.ActionEventData;
import com.doumee.lib_coremodel.util.SpUtil;
+import com.doumee.lib_coremodel.util.StringUtil;
+import com.doumee.lib_coremodel.view.ToastView;
import com.example.datalibrary.callback.CameraDataCallback;
import com.example.datalibrary.callback.FaceDetectCallBack;
import com.example.datalibrary.gatecamera.CameraPreviewManager;
@@ -32,8 +48,13 @@
import com.example.datalibrary.model.LivenessModel;
import com.example.datalibrary.model.User;
import com.example.datalibrary.utils.FaceOnDrawTexturViewUtil;
+import com.example.datalibrary.utils.ToastUtils;
+import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+
+import java.math.BigDecimal;
import dagger.hilt.android.AndroidEntryPoint;
@@ -51,6 +72,9 @@
private GlMantleSurfacView glMantleSurfacView;
private BDFaceImageConfig bdFaceImageConfig;
private BDFaceCheckConfig bdFaceCheckConfig;
+ //0锛氬彇锛�1锛氳繕
+ private int flag ;
+ private int status;
@Override
public int getLayoutId() {
@@ -63,14 +87,159 @@
normalConfig();
getDB().setModel(getVM());
mContext = this;
+ flag = MApplication.getLoginBean().getFlag();
FaceSDKManager.getInstance().initDataBases(this);
initFaceCheck();
initView();
+ if(flag==0){
+ if(MApplication.getConfigBean().getDoubleAuth()==1){
+ statusFsm(0);
+ }else {
+ statusFsm(2);
+ }
+ }else {
+ statusFsm(7);
+ }
+ getDB().tvDjs.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ statusFsm(status);
+ }
+ });
}
@Override
public void initData(@Nullable Bundle savedInstanceState) {
//getPermission();
+ }
+
+ @Override
+ protected void timeChange(String djs) {
+ getDB().tvDjs.setText(djs);
+ }
+
+ private SpannableString getErrPhoneText(){
+ String phone = MApplication.getConfigBean().getLinkPhone();
+ String text = "濡傛湁闂璇疯仈绯荤鐞嗗憳"+phone;
+ SpannableString styledText = new SpannableString(text);
+ styledText.setSpan(new TextAppearanceSpan(this, R.style.style_tip3), 0, text.length()-phone.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+ styledText.setSpan(new TextAppearanceSpan(this,R.style.style_tip1), text.length()-phone.length()+1, text.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+ return styledText;
+ }
+
+ private void statusFsm(int toStatus){
+ status = toStatus;
+ isToChose = false;
+ switch (toStatus){
+ case 0:
+ //鍙�-绠＄悊鍛樹汉鑴搁獙璇�
+ getDB().tvTitle.setText("绠＄悊鍛樿韩浠介獙璇�");
+ getDB().clCard.setVisibility(View.GONE);
+ getDB().clFace.setVisibility(View.VISIBLE);
+ setFaceModel(0);
+ break;
+ case 1:
+ //鍙�-绠＄悊鍛樺埛鍗￠獙璇�
+ getDB().etEwm.setText("");
+ getDB().etEwm.requestFocus();
+ getDB().tvTitle.setText("绠＄悊鍛樿韩浠介獙璇�");
+ getDB().clFace.setVisibility(View.GONE);
+ getDB().clCard.setVisibility(View.VISIBLE);
+ setFaceModel(2);
+ break;
+ case 5:
+ //鍙�-鍙告満楠岃瘉鏂瑰紡閫夋嫨椤�
+ getDB().tvTitle.setText("鍙告満韬唤楠岃瘉");
+ getDB().clFace.setVisibility(View.GONE);
+ getDB().clCard.setVisibility(View.GONE);
+ getDB().clTip1.setVisibility(View.GONE);
+ getDB().clSjXuan.setVisibility(View.VISIBLE);
+ getDB().clSjXuan.invalidate();
+ getDB().clSjXuan.requestLayout();
+ break;
+ case 2:
+ //鍙�-鍙告満浜鸿劯楠岃瘉
+ getDB().tvTitle.setText("鍙告満韬唤楠岃瘉");
+ getDB().clCard.setVisibility(View.GONE);
+ getDB().clSjXuan.setVisibility(View.GONE);
+ getDB().clFace.setVisibility(View.VISIBLE);
+ setFaceModel(1);
+ break;
+ case 3:
+ //鍙�-鍙告満鍒峰崱楠岃瘉
+ getDB().etEwm.setText("");
+ getDB().etEwm.requestFocus();
+ getDB().tvTitle.setText("鍙告満韬唤楠岃瘉");
+ getDB().clFace.setVisibility(View.GONE);
+ getDB().clSjXuan.setVisibility(View.GONE);
+ getDB().clCard.setVisibility(View.VISIBLE);
+ setFaceModel(2);
+ break;
+ case 4:
+ //鍙�-鍙告満閰掔簿妫�娴�
+ getDB().tvTitle.setText("閰掔簿妫�娴�");
+ getDB().clFace.setVisibility(View.GONE);
+ getDB().clCard.setVisibility(View.GONE);
+ getDB().clSjXuan.setVisibility(View.GONE);
+ getDB().clTip1.setVisibility(View.GONE);
+ getDB().clJiu.setVisibility(View.VISIBLE);
+ getDB().clJiu.invalidate();
+ getDB().clJiu.requestLayout();
+ if(MApplication.getConfigBean()!=null&&MApplication.getConfigBean().getCabinetConfigDataVO()!=null&&
+ MApplication.getConfigBean().getCabinetConfigDataVO().getConcentration()!=null){
+ //寮�濮嬫娴�
+ EventBus.getDefault().post(new JiujinBeginEvent());
+ }else {
+ ToastView.show(this,"鏈幏鍙栧埌閰掔簿娴撳害鎶ヨ鍊�");
+ statusFsm(6);
+ }
+ break;
+ case 6:
+ //鍙�-鍙告満閰掔簿妫�娴嬪け璐�
+ //Toast.makeText(mContext, "鍙告満閰掔簿妫�娴嬪け璐�", Toast.LENGTH_SHORT).show();
+ getDB().clJiu.setVisibility(View.GONE);
+ getDB().tvJg1.setText("閰掔簿妫�娴嬪紓甯革紝璇烽噸鏂版娴�");
+ getDB().clTip1.setVisibility(View.VISIBLE);
+ break;
+ case 7:
+ //杩�-鍙告満浜鸿劯楠岃瘉
+ getDB().tvTitle.setText("鍙告満韬唤楠岃瘉");
+ getDB().clCard.setVisibility(View.GONE);
+ getDB().clFace.setVisibility(View.VISIBLE);
+ setFaceModel(1);
+ break;
+ case 8:
+ //杩�-鍙告満鍒峰崱楠岃瘉
+ getDB().etEwm.setText("");
+ getDB().etEwm.requestFocus();
+ getDB().tvTitle.setText("鍙告満韬唤楠岃瘉");
+ getDB().clFace.setVisibility(View.GONE);
+ getDB().clCard.setVisibility(View.VISIBLE);
+ setFaceModel(2);
+ break;
+ case 9:
+ //鍙�-鍙告満閰掔簿妫�娴嬪け璐�
+ getDB().clJiu.setVisibility(View.GONE);
+ getDB().tvJg1.setText("閰掔簿妫�娴嬭秴鏍�");
+ getDB().clTip1.setVisibility(View.VISIBLE);
+ break;
+ default:
+ break;
+ }
+ }
+
+ private void setFaceModel(int faceModel){
+ if(faceModel==0){
+ //绠＄悊鍛�
+ FaceSDKManager.getInstance().setGroupId("0");
+ isToChose = false;
+ }else if(faceModel==1){
+ //鍙告満
+ FaceSDKManager.getInstance().setGroupId("1");
+ isToChose = false;
+ }else {
+ isToChose = true;
+ }
}
private Bitmap bitmap;
@@ -79,7 +248,54 @@
protected void doRegister(int type, ActionEventData data) {
switch (type){
case 1:
- finish();
+ //鍒囨崲鍒板埛鍗�
+ if(flag==0){
+ if(status==0){
+ statusFsm(1);
+ }else if(status==2){
+ statusFsm(3);
+ }
+ }else {
+ statusFsm(8);
+ }
+ break;
+ case 2:
+ //鍒囨崲鍙告満鍒峰崱
+ statusFsm(3);
+ break;
+ case 3:
+ //鍒囨崲鍙告満浜鸿劯
+ statusFsm(2);
+ break;
+ case 4:
+ //鍒囨崲鍒颁汉鑴�
+ if(flag==0){
+ if(status==1){
+ statusFsm(0);
+ }else if(status==3){
+ statusFsm(2);
+ }
+ }else {
+ statusFsm(7);
+ }
+ break;
+ case 5:
+ statusFsm(4);
+ break;
+ case 6:
+ //绠＄悊鍛榠c鍗℃垚鍔�
+ statusFsm(5);
+ break;
+ case 7:
+ //鍙告満ic鍗℃垚鍔�
+ if(flag==0) {
+ //鍙�
+ statusFsm(4);
+ }else {
+ //杩�
+ startActivity(KeyCabinetActivity.class);
+ finish();
+ }
break;
default:
break;
@@ -107,8 +323,55 @@
SingleBaseConfig.getBaseConfig().getMirrorVideoRGB() , SingleBaseConfig.getBaseConfig().isOpenGl());
CameraPreviewManager.getInstance().startPreview(glMantleSurfacView,
SingleBaseConfig.getBaseConfig().getRgbVideoDirection() , PREFER_WIDTH, PERFER_HEIGH);
+ getDB().tvJg2.setText(getErrPhoneText(), TextView.BufferType.SPANNABLE);
+ //ic鍗¤鍙�
+ getDB().etEwm.requestFocus();
+ getDB().etEwm.setFocusable(true);
+ getDB().etEwm.setShowSoftInputOnFocus(true);
+ hideSoftKeyboard(getDB().etEwm);
+ getDB().etEwm.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
+ @Override
+ public void onGlobalLayout() {
+ hideSoftKeyboard(getDB().etEwm);
+ }
+ });
+ getDB().etEwm.addTextChangedListener(new TextWatcher() {
+ @Override
+ public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+
+ }
+
+ @Override
+ public void onTextChanged(CharSequence s, int start, int before, int count) {
+
+ }
+
+ @Override
+ public void afterTextChanged(Editable s) {
+ String m = s.toString();
+ if(TextUtils.isEmpty(m)){
+ return;
+ }
+ if(status!=1&&status!=3&&status!=8){
+ return;
+ }
+ if(handler.hasMessages(5)){
+ handler.removeMessages(5);
+ }
+ handler.sendEmptyMessageDelayed(5,500);
+ }
+ });
}
+
+ private void hideSoftKeyboard(View view) {
+ InputMethodManager imm = (InputMethodManager)
+ getSystemService(Context.INPUT_METHOD_SERVICE);
+ if (imm != null) {
+ imm.hideSoftInputFromWindow(view.getWindowToken(), 0);
+ }
+ }
+
@Override
protected void onResume() {
@@ -149,9 +412,7 @@
handler.sendEmptyMessageDelayed(1,4000);
glMantleSurfacView.setFrame();
bdFaceImageConfig.setData(data);
- //蹇呴』浼氬憳
- String groupId = "0";
- FaceSDKManager.getInstance().onDetectCheck(groupId,bdFaceImageConfig, null, null,
+ FaceSDKManager.getInstance().onDetectCheck(bdFaceImageConfig, null, null,
bdFaceCheckConfig, faceDetectCallBack);
}
}
@@ -172,19 +433,25 @@
@Override
public void onTip(int code, String msg) {
- getDB().clFail.setVisibility(View.VISIBLE);
+ if(isToChose){
+ return;
+ }
+ /*getDB().clFail.setVisibility(View.VISIBLE);
getDB().tv4.setText(msg);
- handler.sendEmptyMessageDelayed(0,1000);
+ handler.sendEmptyMessageDelayed(0,1000);*/
System.out.println("==isOk==>onTip:"+msg);
}
@Override
public void onFaceDetectDarwCallback(LivenessModel livenessModel) {
//System.out.println("==rgbInstance==>onFaceDetectDarwCallback");
+ if(isToChose){
+ return;
+ }
if (isCompareCheck) {
- getDB().clFail.setVisibility(View.VISIBLE);
+ /*getDB().clFail.setVisibility(View.VISIBLE);
getDB().tv4.setText(getString(R.string.face_tip2));
- handler.sendEmptyMessageDelayed(0,1000);
+ handler.sendEmptyMessageDelayed(0,1000);*/
}
// 缁樺埗浜鸿劯妗�
showFrame(livenessModel);
@@ -217,6 +484,39 @@
break;
case 1:
//isCheckFace = false;
+ break;
+ case 3:
+ getDB().clJiujinProgress.setVisibility(View.GONE);
+ //Toast.makeText(mContext, "閰掔簿妫�鏌ヨ繑鍥�", Toast.LENGTH_SHORT).show();
+ if(new BigDecimal(MApplication.getConfigBean().getCabinetConfigDataVO().getConcentration())
+ .compareTo(resultEvent.getConcentration())>=0){
+ //閰掔簿閫氳繃
+ getDB().clJiujinOk.setVisibility(View.VISIBLE);
+ handler.sendEmptyMessageDelayed(4,1000);
+ }else {
+ //閰掔簿涓嶉�氳繃
+ getVM().alcoholTestAlarm(resultEvent.getConcentration().toString());
+ //Toast.makeText(mContext, "閰掔簿妫�娴嬭秴鏍�", Toast.LENGTH_SHORT).show();
+ statusFsm(9);
+ }
+ break;
+ case 4:
+ startActivity(KeyCabinetActivity.class);
+ finish();
+ break;
+ case 5:
+ String m = getDB().etEwm.getText().toString();
+ int index = m.indexOf("\r");
+ if(index!=-1){
+ m = m.substring(0,index);
+ }
+ if(!TextUtils.isEmpty(m)){
+ getVM().getMemberIdByCode(m,status==1?"0":"1");
+ }
+ getDB().etEwm.setText("");
+ getDB().etEwm.requestFocus();
+ break;
+ default:
break;
}
}
@@ -251,7 +551,7 @@
handler.removeCallbacksAndMessages(null);
handler = null;
dataCallback = null;
- //CameraPreviewManager.getInstance().destroy();
+ CameraPreviewManager.getInstance().destroy();
faceDetectCallBack = null;
glMantleSurfacView = null;
FaceSDKManager.getInstance().destroy();
@@ -270,11 +570,14 @@
runOnUiThread(new Runnable() {
@Override
public void run() {
+ if(isToChose) {
+ return;
+ }
if (livenessModel == null) {
if (isCompareCheck) {
- getDB().clFail.setVisibility(View.VISIBLE);
+ /*getDB().clFail.setVisibility(View.VISIBLE);
getDB().tv4.setText(getString(R.string.face_tip2));
- handler.sendEmptyMessageDelayed(0,1000);
+ handler.sendEmptyMessageDelayed(0,1000);*/
}
System.out.println("======>浜鸿劯璇嗗埆澶辫触");
return;
@@ -282,37 +585,21 @@
if (livenessModel.isQualityCheck()){
//鏄惁閫氳繃璐ㄩ噺妫�娴�
if (isCompareCheck) {
- getDB().clFail.setVisibility(View.VISIBLE);
+ /*getDB().clFail.setVisibility(View.VISIBLE);
getDB().tv4.setText(getString(R.string.face_tip2));
- handler.sendEmptyMessageDelayed(0,1000);
+ handler.sendEmptyMessageDelayed(0,1000);*/
}
} else {
User user = livenessModel.getUser();
if (user == null) {
mUser = null;
if (isCompareCheck) {
- getDB().clFail.setVisibility(View.VISIBLE);
+ /*getDB().clFail.setVisibility(View.VISIBLE);
getDB().tv4.setText(getString(R.string.face_tip2));
- handler.sendEmptyMessageDelayed(0,1000);
+ handler.sendEmptyMessageDelayed(0,1000);*/
}
} else {
- //浼樺厛浼氬憳
- if("0".equals(user.getGroupId())){
-
- }else {
- if (isCompareCheck) {
- getDB().clFail.setVisibility(View.VISIBLE);
- getDB().tv4.setText(getString(R.string.face_tip2));
- handler.sendEmptyMessageDelayed(0,1000);
- }
- resultCount++;
- if (resultCount >= 3) {
- resultCount = 0;
- }else {
- return;
- }
- }
mUser = user;
if (isCompareCheck) {
getDB().clFail.setVisibility(View.GONE);
@@ -325,19 +612,38 @@
nameText.setTextColor(Color.parseColor("#0dc6ff"));
nameText.setText(FileUtils.spotString(user.getUserName()) + " 娆㈣繋鎮�");*/
}
- if(!isToChose) {
- isToChose = true;
- //璇嗗埆鎴愬姛锛岃烦杞�
- Bundle bundle = new Bundle();
- bundle.putString("busId", user.getUserId());
- bundle.putString("type", "0");
- //Toast.makeText(mContext, user.getUserName(), Toast.LENGTH_SHORT).show();
- //startActivity(ChoseTicketActivity.class, bundle);
+ isToChose = true;
+ //璇嗗埆鎴愬姛锛岃烦杞�
+ if(status==0){
+ //鍙�-绠＄悊鍛�
+ MApplication.getLoginBean().setAutoMemberId(Integer.parseInt(user.getUserId()));
+ //handler.sendEmptyMessageDelayed(7,0);
+ EventBus.getDefault().post(new FaceStatusChangeEvent(5));
+ }else if(status==2){
+ //鍙�-鍙告満
+ CameraPreviewManager.getInstance().stopPreview();
+ MApplication.getLoginBean().setMemberId(Integer.parseInt(user.getUserId()));
+ MApplication.getLoginBean().setAuthType(0);
+ //handler.sendEmptyMessageDelayed(8,0);
+ EventBus.getDefault().post(new FaceStatusChangeEvent(4));
+ }else if(status==7){
+ //杩�-鍙告満
+ MApplication.getLoginBean().setMemberId(Integer.parseInt(user.getUserId()));
+ MApplication.getLoginBean().setAuthType(0);
+ startActivity(KeyCabinetActivity.class);
+ finish();
}
}
}
}
});
+ }
+
+ @Subscribe(threadMode = ThreadMode.MAIN)
+ public void FaceStatusChangeEvent(FaceStatusChangeEvent e){
+ if(!isFinishing()){
+ statusFsm(e.getStatus());
+ }
}
boolean isToChose = false;
@@ -354,4 +660,29 @@
isTimePause = true;
CameraPreviewManager.getInstance().stopPreview();
}
+
+ private JiujinResultEvent resultEvent;
+ @Subscribe(threadMode = ThreadMode.MAIN)
+ public void JiujinResultEvent(JiujinResultEvent e){
+ if(!isFinishing()){
+ //Toast.makeText(mContext, "閰掔簿妫�娴嬭繑鍥烇細"+e.isOk(), Toast.LENGTH_SHORT).show();
+ if(!e.isOk()){
+ getDB().clJiujinProgress.setVisibility(View.GONE);
+ statusFsm(6);
+ }else {
+ getDB().clJiujinProgress.setVisibility(View.VISIBLE);
+ if(resultEvent==null){
+ resultEvent = e;
+ }else if(resultEvent.getConcentration().compareTo(e.getConcentration())<0){
+ //鍊兼洿澶�
+ resultEvent = e;
+ }
+ if(handler.hasMessages(3)){
+ handler.removeMessages(3);
+ }
+ handler.sendEmptyMessageDelayed(3,1000);
+ }
+ }
+ }
+
}
\ No newline at end of file
--
Gitblit v1.9.3