From 4a8ff39b0fab0627ef8f7459587d514cc01c3676 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期一, 20 十月 2025 10:52:02 +0800
Subject: [PATCH] Merge branch 'wuhuyancao' of http://139.186.142.91:10010/r/productDev/dmvisit into wuhuyancao
---
keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/face/FaceActivity.java | 181 +++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 175 insertions(+), 6 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..a1e6dba 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
@@ -13,10 +13,12 @@
import android.view.View;
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.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;
@@ -51,6 +53,9 @@
private GlMantleSurfacView glMantleSurfacView;
private BDFaceImageConfig bdFaceImageConfig;
private BDFaceCheckConfig bdFaceCheckConfig;
+ //0锛氬彇锛�1锛氳繕
+ private int flag ;
+ private int status;
@Override
public int getLayoutId() {
@@ -63,8 +68,11 @@
normalConfig();
getDB().setModel(getVM());
mContext = this;
- FaceSDKManager.getInstance().initDataBases(this);
- initFaceCheck();
+ flag = MApplication.getLoginBean().getFlag();
+ statusFsm(flag==0?0:2);
+ //todo wmf 瑙ｅ紑
+ /*FaceSDKManager.getInstance().initDataBases(this);
+ initFaceCheck();*/
initView();
}
@@ -73,12 +81,170 @@
//getPermission();
}
+ @Override
+ protected void timeChange(String djs) {
+ getDB().tvDjs.setText(djs);
+ }
+
+ private void statusFsm(int toStatus){
+ status = toStatus;
+ switch (status){
+ case 0:
+ //鍙�-绠＄悊鍛樹汉鑴搁獙璇�
+ getDB().clLogin.setVisibility(View.VISIBLE);
+ getDB().tvTitle.setText("绠＄悊鍛樿韩浠介獙璇�");
+ getDB().vSl.setBackgroundResource(R.mipmap.ic_viewfinder);
+ getDB().tvTip.setText("璇蜂繚鎸佹鑴稿湪鍙栨櫙妗嗕腑锛屽苟鏍规嵁鎸囩ず瀹屾垚璇嗗埆");
+ getDB().clRemind.setVisibility(View.VISIBLE);
+ getDB().btSk.setVisibility(View.VISIBLE);
+
+ getDB().clSjRl.setVisibility(View.GONE);
+ getDB().clSjSk.setVisibility(View.GONE);
+ getDB().clTip1.setVisibility(View.GONE);
+ break;
+ case 1:
+ //鍙�-绠＄悊鍛樺埛鍗￠獙璇�
+ getDB().clLogin.setVisibility(View.VISIBLE);
+ getDB().tvTitle.setText("绠＄悊鍛樿韩浠介獙璇�");
+ getDB().vSl.setBackgroundResource(R.mipmap.ic_shuaka2);
+ getDB().tvTip.setText("璇峰皢IC鍗¤创杩戝埛鍗″尯锛屽仠鐣�1-2绉�");
+ getDB().clRemind.setVisibility(View.GONE);
+ getDB().btSk.setVisibility(View.GONE);
+
+ getDB().clSjRl.setVisibility(View.GONE);
+ getDB().clSjSk.setVisibility(View.VISIBLE);
+ getDB().clTip1.setVisibility(View.GONE);
+ break;
+ case 5:
+ //鍙�-鍙告満楠岃瘉鏂瑰紡閫夋嫨椤�
+ getDB().clLogin.setVisibility(View.VISIBLE);
+ getDB().tvTitle.setText("鍙告満韬唤楠岃瘉");
+ getDB().vSl.setBackgroundResource(R.mipmap.ic_face);
+ getDB().tvTip.setText("璇蜂繚鎸佹鑴稿湪鍙栨櫙妗嗕腑锛屽苟鏍规嵁鎸囩ず瀹屾垚璇嗗埆");
+ getDB().clRemind.setVisibility(View.VISIBLE);
+ getDB().btSk.setVisibility(View.GONE);
+
+ getDB().clSjRl.setVisibility(View.VISIBLE);
+ getDB().clSjSk.setVisibility(View.GONE);
+ getDB().clTip1.setVisibility(View.GONE);
+ break;
+ case 2:
+ //鍙�-鍙告満浜鸿劯楠岃瘉
+ getDB().clLogin.setVisibility(View.VISIBLE);
+ getDB().tvTitle.setText("鍙告満韬唤楠岃瘉");
+ getDB().vSl.setBackgroundResource(R.mipmap.ic_viewfinder);
+ getDB().tvTip.setText("璇蜂繚鎸佹鑴稿湪鍙栨櫙妗嗕腑锛屽苟鏍规嵁鎸囩ず瀹屾垚璇嗗埆");
+ getDB().clRemind.setVisibility(View.VISIBLE);
+ getDB().btSk.setVisibility(View.VISIBLE);
+
+ getDB().clSjRl.setVisibility(View.GONE);
+ getDB().clSjSk.setVisibility(View.GONE);
+ getDB().clTip1.setVisibility(View.GONE);
+ break;
+ case 3:
+ //鍙�-鍙告満鍒峰崱楠岃瘉
+ getDB().clLogin.setVisibility(View.VISIBLE);
+ getDB().tvTitle.setText("鍙告満韬唤楠岃瘉");
+ getDB().vSl.setBackgroundResource(R.mipmap.ic_shuaka2);
+ getDB().tvTip.setText("璇峰皢IC鍗¤创杩戝埛鍗″尯锛屽仠鐣�1-2绉�");
+ getDB().clRemind.setVisibility(View.GONE);
+ getDB().btSk.setVisibility(View.GONE);
+
+ getDB().clSjRl.setVisibility(View.GONE);
+ getDB().clSjSk.setVisibility(View.VISIBLE);
+ getDB().clTip1.setVisibility(View.GONE);
+ break;
+ case 4:
+ //鍙�-鍙告満閰掔簿妫�娴�
+ getDB().clLogin.setVisibility(View.VISIBLE);
+ getDB().tvTitle.setText("閰掔簿妫�娴�");
+ getDB().vSl.setBackgroundResource(R.mipmap.ic_jiujingjiance);
+ getDB().tvTip.setText("璇锋嬁璧烽厭绮炬娴嬩华鍚规皵");
+ getDB().clRemind.setVisibility(View.GONE);
+ getDB().btSk.setVisibility(View.GONE);
+
+ getDB().clSjRl.setVisibility(View.GONE);
+ getDB().clSjSk.setVisibility(View.GONE);
+ getDB().clTip1.setVisibility(View.GONE);
+ break;
+ case 6:
+ //鍙�-鍙告満閰掔簿妫�娴嬪け璐�
+ getDB().clTip1.setVisibility(View.VISIBLE);
+ break;
+ case 7:
+ //杩�-鍙告満浜鸿劯楠岃瘉
+ getDB().clLogin.setVisibility(View.VISIBLE);
+ getDB().tvTitle.setText("鍙告満韬唤楠岃瘉");
+ getDB().vSl.setBackgroundResource(R.mipmap.ic_viewfinder);
+ getDB().tvTip.setText("璇蜂繚鎸佹鑴稿湪鍙栨櫙妗嗕腑锛屽苟鏍规嵁鎸囩ず瀹屾垚璇嗗埆");
+ getDB().clRemind.setVisibility(View.VISIBLE);
+ getDB().btSk.setVisibility(View.VISIBLE);
+
+ getDB().clSjSk.setVisibility(View.GONE);
+ getDB().clSjRl.setVisibility(View.GONE);
+ getDB().clTip1.setVisibility(View.GONE);
+ break;
+ case 8:
+ //杩�-鍙告満鍒峰崱楠岃瘉
+ getDB().clLogin.setVisibility(View.VISIBLE);
+ getDB().tvTitle.setText("鍙告満韬唤楠岃瘉");
+ getDB().vSl.setBackgroundResource(R.mipmap.ic_shuaka2);
+ getDB().tvTip.setText("璇峰皢IC鍗¤创杩戝埛鍗″尯锛屽仠鐣�1-2绉�");
+ getDB().clRemind.setVisibility(View.GONE);
+ getDB().btSk.setVisibility(View.GONE);
+
+ getDB().clSjSk.setVisibility(View.VISIBLE);
+ getDB().clSjRl.setVisibility(View.GONE);
+ getDB().clTip1.setVisibility(View.GONE);
+ break;
+ default:
+ break;
+ }
+ }
+
private Bitmap bitmap;
private byte[] secondFeature = new byte[512];
@Override
protected void doRegister(int type, ActionEventData data) {
switch (type){
case 1:
+ //鍒囨崲鍒板埛鍗�
+ if("0".equals(flag)){
+ 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("0".equals(flag)){
+ if(status==1){
+ statusFsm(5);
+ }else if(status==3){
+ statusFsm(6);
+ }
+ }else {
+ startActivity(KeyCabinetActivity.class);
+ finish();
+ }
+
+ //todo wmf
+ //statusFsm("0".equals(flag)?);
+ break;
+ case 5:
+ startActivity(KeyCabinetActivity.class);
finish();
break;
default:
@@ -113,7 +279,8 @@
@Override
protected void onResume() {
super.onResume();
- startTestOpenDebugRegisterFunction();
+ //todo wmf 瑙ｅ紑
+ //startTestOpenDebugRegisterFunction();
}
private void startTestOpenDebugRegisterFunction() {
@@ -254,7 +421,8 @@
//CameraPreviewManager.getInstance().destroy();
faceDetectCallBack = null;
glMantleSurfacView = null;
- FaceSDKManager.getInstance().destroy();
+ //todo wmf 瑙ｅ紑
+ //FaceSDKManager.getInstance().destroy();
}
private int resultCount = 0;
@@ -299,7 +467,7 @@
} else {
//浼樺厛浼氬憳
if("0".equals(user.getGroupId())){
-
+11
}else {
if (isCompareCheck) {
getDB().clFail.setVisibility(View.VISIBLE);
@@ -352,6 +520,7 @@
super.onPause();
isPause = false;
isTimePause = true;
- CameraPreviewManager.getInstance().stopPreview();
+ //todo wmf 瑙ｅ紑
+ //CameraPreviewManager.getInstance().stopPreview();
}
}
\ No newline at end of file
--
Gitblit v1.9.3