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 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; } } keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/face/FaceActivity.java
@@ -99,7 +99,11 @@ statusFsm(2); } }else { 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: //切换司机刷卡 if(flag==0) { statusFsm(3); }else { statusFsm(8); } break; case 3: //切换司机人脸 if(flag==0) { statusFsm(2); }else { statusFsm(7); } break; case 4: //切换到人脸