From 961442a5800420d2262e7a17bde610196a2c3eb7 Mon Sep 17 00:00:00 2001
From: weimingfei <fei_gaming@sina.com>
Date: 星期一, 16 三月 2026 11:01:17 +0800
Subject: [PATCH] 钥匙柜还手环增加管理员验证
---
keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/face/FaceActivity.java | 19 ++++++++++++++++---
keyCabinet-android/app/build.gradle | 4 ++--
keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/bean/DevConfigBean.java | 11 +++++++++++
3 files changed, 29 insertions(+), 5 deletions(-)
diff --git a/keyCabinet-android/app/build.gradle b/keyCabinet-android/app/build.gradle
index 3058d27..a2e8a7e 100644
--- a/keyCabinet-android/app/build.gradle
+++ b/keyCabinet-android/app/build.gradle
@@ -10,8 +10,8 @@
applicationId "com.doumee.keyCabinet"
minSdkVersion build_versions.min_sdk
targetSdkVersion build_versions.target_sdk
- versionCode 2
- versionName "1.0.2"
+ versionCode 3
+ versionName "1.0.3"
//鏀寔vectorDrawables鐭㈤噺鍥�
vectorDrawables.useSupportLibrary = true
diff --git a/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/bean/DevConfigBean.java b/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/bean/DevConfigBean.java
index 97830f9..6ecb295 100644
--- a/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/bean/DevConfigBean.java
+++ b/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/bean/DevConfigBean.java
@@ -16,6 +16,9 @@
//鏄惁鍙岄噸楠岃瘉 0鍚� 1鏄�
private int doubleAuth;
+ //褰掕繕閽ュ寵鍙岄噸楠岃瘉 0鍚� 1鏄�
+ private int returnDoubleAuth;
+
//閰掔簿妫�娴嬪紑鍚細0=寮�鍚紱1=鍏抽棴
private int alcoholStatus;
@@ -126,4 +129,12 @@
public void setAlcoholStatus(int alcoholStatus) {
this.alcoholStatus = alcoholStatus;
}
+
+ public int getReturnDoubleAuth() {
+ return returnDoubleAuth;
+ }
+
+ public void setReturnDoubleAuth(int returnDoubleAuth) {
+ this.returnDoubleAuth = returnDoubleAuth;
+ }
}
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 471c2cd..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:
//鍒囨崲鍒颁汉鑴�
--
Gitblit v1.9.3