From 4e4017b2e55c70c32bd725fc9c9bda335ddc59f6 Mon Sep 17 00:00:00 2001
From: weimingfei <fei_gaming@sina.com>
Date: 星期三, 10 十二月 2025 17:09:47 +0800
Subject: [PATCH] 钥匙柜酒精检测控制
---
keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/face/FaceActivity.java | 53 ++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 48 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 e935ae4..471c2cd 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
@@ -27,6 +27,7 @@
import com.doumee.keyCabinet.base.MyBaseActivity;
import com.doumee.keyCabinet.databinding.FaceActivityBinding;
import com.doumee.keyCabinet.event.FaceStatusChangeEvent;
+import com.doumee.keyCabinet.event.HttpEvent;
import com.doumee.keyCabinet.event.JiujinBeginEvent;
import com.doumee.keyCabinet.event.JiujinResultEvent;
import com.doumee.keyCabinet.event.TimeClockEvent;
@@ -120,6 +121,12 @@
private SpannableString getErrPhoneText(){
String phone = MApplication.getConfigBean().getLinkPhone();
+ if(phone==null){
+ String text = "濡傛湁闂璇疯仈绯荤鐞嗗憳";
+ SpannableString styledText = new SpannableString(text);
+ styledText.setSpan(new TextAppearanceSpan(this, R.style.style_tip3), 0, text.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+ return styledText;
+ }
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);
@@ -130,6 +137,7 @@
private void statusFsm(int toStatus){
status = toStatus;
isToChose = false;
+ getDB().etEwm.requestFocus();
switch (toStatus){
case 0:
//鍙�-绠＄悊鍛樹汉鑴搁獙璇�
@@ -141,7 +149,6 @@
case 1:
//鍙�-绠＄悊鍛樺埛鍗￠獙璇�
getDB().etEwm.setText("");
- getDB().etEwm.requestFocus();
getDB().tvTitle.setText("绠＄悊鍛樿韩浠介獙璇�");
getDB().clFace.setVisibility(View.GONE);
getDB().clCard.setVisibility(View.VISIBLE);
@@ -198,7 +205,7 @@
//鍙�-鍙告満閰掔簿妫�娴嬪け璐�
//Toast.makeText(mContext, "鍙告満閰掔簿妫�娴嬪け璐�", Toast.LENGTH_SHORT).show();
getDB().clJiu.setVisibility(View.GONE);
- getDB().tvJg1.setText("閰掔簿妫�娴嬪紓甯革紝璇烽噸鏂版娴�");
+ getDB().tvJg1.setText("閰掔簿妫�娴嬫搷浣滀笉褰擄紝璇烽噸鏂版娴�");
getDB().clTip1.setVisibility(View.VISIBLE);
break;
case 7:
@@ -290,12 +297,27 @@
//鍙告満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);
finish();
}
+ break;
+ case 8:
+ getDB().message.setText(data.getData().get("obj").toString());
+ getDB().message.setVisibility(View.VISIBLE);
+ handler.sendEmptyMessageDelayed(6,2000);
+ getDB().message.invalidate();
+ getDB().message.requestLayout();
+ EventBus.getDefault().post(new HttpEvent("ic鍗�+++++++"+data.getData().get("type").toString()));
break;
default:
break;
@@ -328,7 +350,7 @@
//ic鍗¤鍙�
getDB().etEwm.requestFocus();
getDB().etEwm.setFocusable(true);
- getDB().etEwm.setShowSoftInputOnFocus(true);
+ getDB().etEwm.setShowSoftInputOnFocus(false);
hideSoftKeyboard(getDB().etEwm);
getDB().etEwm.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
@Override
@@ -336,6 +358,7 @@
hideSoftKeyboard(getDB().etEwm);
}
});
+
getDB().etEwm.addTextChangedListener(new TextWatcher() {
@Override
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
@@ -354,6 +377,8 @@
return;
}
if(status!=1&&status!=3&&status!=8){
+ getDB().etEwm.setText("");
+ getDB().etEwm.requestFocus();
return;
}
if(handler.hasMessages(5)){
@@ -498,6 +523,8 @@
getVM().alcoholTestAlarm(resultEvent.getConcentration().toString());
//Toast.makeText(mContext, "閰掔簿妫�娴嬭秴鏍�", Toast.LENGTH_SHORT).show();
statusFsm(9);
+ //鍐嶆娴嬶紝灏嗗０闊冲叧闂�
+ EventBus.getDefault().post(new JiujinBeginEvent());
}
break;
case 4:
@@ -515,6 +542,9 @@
}
getDB().etEwm.setText("");
getDB().etEwm.requestFocus();
+ break;
+ case 6:
+ getDB().message.setVisibility(View.GONE);
break;
default:
break;
@@ -593,6 +623,7 @@
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));
@@ -601,6 +632,8 @@
} else {
mUser = user;
+ /*EventBus.getDefault().post(new HttpEvent("浜鸿劯鐢ㄦ埛------->"+(status==0?"绠＄悊鍛樹汉鑴告娴嬶細":"鍙告満浜鸿劯妫�娴嬶細")
+ +(user.getGroupId().equals("0")?"绠＄悊鍛�":"鍙告満")));*/
if (isCompareCheck) {
getDB().clFail.setVisibility(View.GONE);
if(handler.hasMessages(0)) {
@@ -625,7 +658,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()));
@@ -665,6 +705,9 @@
@Subscribe(threadMode = ThreadMode.MAIN)
public void JiujinResultEvent(JiujinResultEvent e){
if(!isFinishing()){
+ if(status!=4&&status!=6){
+ return;
+ }
//Toast.makeText(mContext, "閰掔簿妫�娴嬭繑鍥烇細"+e.isOk(), Toast.LENGTH_SHORT).show();
if(!e.isOk()){
getDB().clJiujinProgress.setVisibility(View.GONE);
--
Gitblit v1.9.3