From 025f806542921dcaa6719453f208e8a9dda8d450 Mon Sep 17 00:00:00 2001
From: weimingfei <fei_gaming@sina.com>
Date: 星期四, 21 五月 2026 09:25:51 +0800
Subject: [PATCH] 钥匙柜关门修改前
---
keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/face/FaceActivity.java | 37 ++++++++++++++++++++++++++++++++-----
1 files changed, 32 insertions(+), 5 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 c7ffe76..4d159ce 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
@@ -99,7 +99,11 @@
statusFsm(2);
}
}else {
- statusFsm(7);
+ if(MApplication.getConfigBean().getReturnDoubleAuth()==1){
+ statusFsm(0);
+ }else {
+ statusFsm(7);
+ }
}
getDB().tvDjs.setOnClickListener(new View.OnClickListener() {
@Override
@@ -213,6 +217,7 @@
getDB().tvTitle.setText("鍙告満韬唤楠岃瘉");
getDB().clCard.setVisibility(View.GONE);
getDB().clFace.setVisibility(View.VISIBLE);
+ getDB().clSjXuan.setVisibility(View.GONE);
setFaceModel(1);
break;
case 8:
@@ -268,11 +273,19 @@
break;
case 2:
//鍒囨崲鍙告満鍒峰崱
- statusFsm(3);
+ if(flag==0) {
+ statusFsm(3);
+ }else {
+ statusFsm(8);
+ }
break;
case 3:
//鍒囨崲鍙告満浜鸿劯
- statusFsm(2);
+ if(flag==0) {
+ statusFsm(2);
+ }else {
+ statusFsm(7);
+ }
break;
case 4:
//鍒囨崲鍒颁汉鑴�
@@ -297,7 +310,14 @@
//鍙告満ic鍗℃垚鍔�
if(flag==0) {
//鍙�
- statusFsm(4);
+ if(MApplication.getConfigBean()!=null&&MApplication.getConfigBean().getAlcoholStatus()==1) {
+ //闈為厭绮炬娴�
+ startActivity(KeyCabinetActivity.class);
+ finish();
+ }else {
+ //閰掔簿妫�娴�
+ statusFsm(4);
+ }
}else {
//杩�
startActivity(KeyCabinetActivity.class);
@@ -651,7 +671,14 @@
MApplication.getLoginBean().setMemberId(Integer.parseInt(user.getUserId()));
MApplication.getLoginBean().setAuthType(0);
//handler.sendEmptyMessageDelayed(8,0);
- EventBus.getDefault().post(new FaceStatusChangeEvent(4));
+ if(MApplication.getConfigBean()!=null&&MApplication.getConfigBean().getAlcoholStatus()==1) {
+ //闈為厭绮炬娴�
+ startActivity(KeyCabinetActivity.class);
+ finish();
+ }else {
+ //閰掔簿妫�娴�
+ EventBus.getDefault().post(new FaceStatusChangeEvent(4));
+ }
}else if(status==7){
//杩�-鍙告満
MApplication.getLoginBean().setMemberId(Integer.parseInt(user.getUserId()));
--
Gitblit v1.9.3